diff options
| author | notyouraveragehooman <65437533+notyouraveragehooman@users.noreply.github.com> | 2020-08-09 16:20:59 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-09 16:20:59 -0700 |
| commit | 149ae2e2d242909a982eebc05e95128698a13d0d (patch) | |
| tree | a46a3bf9c799f33ab489a1494e66097377c33ad6 /include | |
| parent | 133984ad5b5b85c339095dcec2a0dc1a18533231 (diff) | |
| parent | 001845ba3a226c33ceb7479c1cf8bc5fa182700a (diff) | |
Merge branch 'master' into master
Diffstat (limited to 'include')
| -rw-r--r-- | include/entity.h | 2 | ||||
| -rw-r--r-- | include/functions.h | 2 | ||||
| -rw-r--r-- | include/manager.h | 23 | ||||
| -rw-r--r-- | include/player.h | 4 |
4 files changed, 28 insertions, 3 deletions
diff --git a/include/entity.h b/include/entity.h index 04e09d94..cf31480e 100644 --- a/include/entity.h +++ b/include/entity.h @@ -70,7 +70,7 @@ typedef struct Entity { /* */ u8 flipX : 2; //0x10 /* */ u8 flipY : 2; //0x40 /* */ } PACKED spriteOrientation; - /*0x1c*/ u8 filler[1]; + /*0x1c*/ u8 field_0x1c; /*0x1d*/ u8 field_0x1d; /*0x1e*/ u8 frameIndex; /*0x1f*/ u8 lastFrameIndex; diff --git a/include/functions.h b/include/functions.h index f2d59d59..0a1eac64 100644 --- a/include/functions.h +++ b/include/functions.h @@ -193,7 +193,7 @@ extern void sub_080A70AC(void*); extern void sub_080A7114(u32); extern void sub_08001242(void); extern u32 sub_08003FC4(Entity*, u32); -extern u8 sub_080043E8(Entity*); +extern u32 sub_080043E8(Entity*); extern void sub_08001290(Entity*, u32); extern void sub_08004488(u32); extern void sub_08004596(Entity*, u32); diff --git a/include/manager.h b/include/manager.h index 66b1c363..dfb5f1ff 100644 --- a/include/manager.h +++ b/include/manager.h @@ -4,6 +4,29 @@ #include "global.h" typedef struct { + u8 unk_00[0x0a]; + u8 unk_0a; + u8 unk_0b; + u8 unk_0c; + u8 unk_0d; + u8 unk_0e; + u8 unk_0f[0x11]; + u16 unk_20; + u16 unk_22; + u16 unk_24; + u16 unk_26; + u8 unk_28[0x0D]; + u8 unk_35; + u16 unk_36; + u8 unk_38; + u8 unk_39; + u8 unk_3a; + u8 unk_3b; + u16 unk_3c; + u16 unk_3e; +} Manager; + +typedef struct { u16 field_0x00; u16 field_0x02; u8 field_0x04; diff --git a/include/player.h b/include/player.h index f3c49bfd..75c0b6c7 100644 --- a/include/player.h +++ b/include/player.h @@ -35,7 +35,9 @@ typedef struct { /* */ u32 noMinishCap : 1; /* */ u32 pullingState : 1; /* */ u32 windyState : 1; - /* */ u32 filler10 : 4; + /* */ u32 filler6 : 1; + /* */ u32 unk7 : 1; + /* */ u32 filler8 : 2; /* */ u32 slipperyState : 1; /* */ u32 filler11 : 5; /* */ u32 filler11b : 16; |