diff options
| author | notyouraveragehooman <65437533+notyouraveragehooman@users.noreply.github.com> | 2020-08-29 17:54:59 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-29 17:54:59 -0700 |
| commit | 550ca4177be3558bfceab66d4236bcef8aafcbce (patch) | |
| tree | c6a419fc9fb7c2a523ba1e918b8cde61858f203e /include | |
| parent | ae7968e0067118a4d1d40fc7ca42c74e90b996d1 (diff) | |
| parent | dba975b15b1ae95d7537137a0a9b714382c38abe (diff) | |
Merge pull request #80 from HookedBehemoth:beetle
decompile Beetle, DoorMimic and RockChuchu
Diffstat (limited to 'include')
| -rw-r--r-- | include/entity.h | 5 | ||||
| -rw-r--r-- | include/player.h | 13 |
2 files changed, 10 insertions, 8 deletions
diff --git a/include/entity.h b/include/entity.h index 0304f396..fc09651d 100644 --- a/include/entity.h +++ b/include/entity.h @@ -19,10 +19,7 @@ typedef struct { } EntityType; typedef struct { - u8 unknown[6]; - u8 field_0x6; - u8 field_0x7; - u8 unknown2[4]; + u8 unknown[8]; } BoundingBox; typedef struct Entity { diff --git a/include/player.h b/include/player.h index 77f9e59d..488ffba4 100644 --- a/include/player.h +++ b/include/player.h @@ -33,13 +33,15 @@ typedef struct { /*0x30*/ union { /* */ u32 all; /* */ struct { - /* */ u32 filler9 : 3; + /* */ u32 filler9 : 2; + /* */ u32 unk2 : 1; /* */ u32 noMinishCap : 1; /* */ u32 pullingState : 1; /* */ u32 windyState : 1; /* */ u32 filler6 : 1; /* */ u32 unk7 : 1; - /* */ u32 filler8 : 2; + /* */ u32 unk8 : 1; + /* */ u32 unk9 : 1; /* */ u32 slipperyState : 1; /* */ u32 filler11 : 5; /* */ u32 filler11b : 16; @@ -54,7 +56,9 @@ typedef struct { /* */ u8 swordBlueParticle : 1; /* */ u8 filler14 : 6; /*0x3f*/ u8 field_0x3f; - /*0x40*/ u8 field_0x40[75]; + /*0x40*/ u8 field_0x40[64]; + /*0x80*/ u16 field_0x80; + /*0x82*/ u8 field_0x82[9]; /*0x8b*/ u8 field_0x8b; /*0x8c*/ u32 field_0x8c; /*0x90*/ union SplitWord field_0x90; @@ -63,7 +67,8 @@ typedef struct { /*0xa9*/ u8 field_0xa9; /*0xaa*/ u8 field_0xaa; /*0xab*/ u8 field_0xab; - /*0xac*/ u32 field_0xac; + /*0xac*/ u16 field_0xac; + /*0xae*/ u16 field_0xae; } PlayerState; |