Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Decompile lib func_us_801D064C #2173

Merged
merged 5 commits into from
Feb 4, 2025
Merged

Decompile lib func_us_801D064C #2173

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f4213a5
Decompile `lib` func_us_801D064C
Feb 4, 2025
fc96630
small change
Feb 4, 2025
fae661a
This matches for both PSP and PSX
Feb 4, 2025
f3bc1ae
small clean up
Feb 4, 2025
f454253
Merge branch 'master' into Decompile/lib/func_us_801D064C
sozud Feb 4, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 17 additions & 0 deletions include/entity.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2757,6 +2757,22 @@ typedef struct {
/* 0x88 */ u8 unk88[1]; // This is not the true size.
} ET_801B15C0;

typedef struct {
/* 0x7C */ struct Primitive* unk7C;
/* 0x80 */ u8 unk80;
/* 0x81 */ u8 unk81;
/* 0x82 */ u8 : 8;
/* 0x83 */ u8 : 8;
/* 0x84 */ u16 unk84;
/* 0x86 */ u16 : 16;
/* 0x88 */ u32 : 32;
/* 0x8C */ u32 : 32;
/* 0x90 */ u32 : 32;
/* 0x94 */ u32 : 32;
/* 0x98 */ u32 : 32;
/* 0x9C */ struct Entity* unk9C;
} ET_801D064C;

typedef union { // offset=0x7C
struct Primitive* prim;
ET_Placeholder ILLEGAL;
Expand Down Expand Up @@ -2998,6 +3014,7 @@ typedef union { // offset=0x7C
ET_Marionette marionette;
ET_801B6F30 et_801B6F30;
ET_801B15C0 et_801B15C0;
ET_801D064C et_801D064C;
} Ext;

#define SYNC_FIELD(struct1, struct2, field) \
Expand Down
2 changes: 2 additions & 0 deletions src/st/lib/lib.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,8 @@ typedef enum EntityIDs {
/* 0x44 */ E_SKELETON_THROWN_BONE,
/* 0x45 */ E_SKELETON_PIECES,
/* 0x48 */ E_ID_48 = 0x48,
/* 0x4D */ E_ID_4D = 0x4D,
/* 0x4E */ E_ID_4E,
} EntityIDs;

extern void EntityExplosionVariants(Entity* entity);
Expand Down
Loading
Loading