diff options
| author | Henny022p <info@henny022.de> | 2022-01-16 23:28:59 +0100 |
|---|---|---|
| committer | Henny022p <info@henny022.de> | 2022-01-16 23:32:07 +0100 |
| commit | 8ad65efb7c228d934e515209fdff5515a30aade1 (patch) | |
| tree | 854785296d2d86a8b30c1c5167c46bcc606608aa /include | |
| parent | 2cf294d02dfa8a483827d4df65ea42834bf29cf5 (diff) | |
decomp kinstone menu
Diffstat (limited to 'include')
| -rw-r--r-- | include/enemy.h | 1 | ||||
| -rw-r--r-- | include/kinstone.h | 2 | ||||
| -rw-r--r-- | include/menu.h | 28 | ||||
| -rw-r--r-- | include/screen.h | 4 |
4 files changed, 27 insertions, 8 deletions
diff --git a/include/enemy.h b/include/enemy.h index 1b7d1a07..49d40b28 100644 --- a/include/enemy.h +++ b/include/enemy.h @@ -12,6 +12,7 @@ #include "entity.h" #include "projectile.h" +bool32 EnemyInit(Entity* this); extern u32 GetNextFunction(Entity*); extern void EnemyFunctionHandler(Entity*, EntityActionArray); extern void sub_08001324(Entity*); diff --git a/include/kinstone.h b/include/kinstone.h index 28b799dd..5d8e3ec8 100644 --- a/include/kinstone.h +++ b/include/kinstone.h @@ -7,7 +7,7 @@ extern void sub_08018C58(u32); typedef struct { u8 unk[4]; - u32 unk2; + u8* unk2; u32 unk4; } Unk_struct; extern Unk_struct gUnk_03003DF0[]; diff --git a/include/menu.h b/include/menu.h index e4c09e84..22902ca5 100644 --- a/include/menu.h +++ b/include/menu.h @@ -44,9 +44,14 @@ typedef struct { /*0x08*/ u16 transitionTimer; /*0x0a*/ u16 field_0xa; /*0x0c*/ u8* field_0xc; - /*0x10*/ u8 focusCoords[2]; - /*0x12*/ u8 field_0x12; - /*0x13*/ u8 unk13; + /*0x10*/ // u8 focusCoords[2]; + union { + s32 i; + u16 h[2]; + u8 a[4]; + } unk10; + /*0x12*/ // u8 field_0x12; + /*0x13*/ // u8 unk13; /*0x14*/ u8 unk14; /*0x15*/ u8 unk15; /*0x16*/ u8 unk16; @@ -54,9 +59,22 @@ typedef struct { /* */ // directly in the code. This happens when you take the address off the field with '&`. /* */ // Perhaps they had a macro to cast this to different sized arrays. /*0x17*/ u8 selectMtx; - /*0x18*/ u8 filler18[0x12]; + /*0x18*/ u16 unk18; + /*0x1a*/ union SplitHWord unk1a; + /*0x1c*/ u8 unk1c; + /*0x1s*/ u8 unk1d; + /*0x1e*/ u8 unk1e; + /*0x1f*/ s8 unk1f; + /*0x20*/ u8 unk20; + /*0x21*/ u8 unk21; + /*0x22*/ u8 filler22[6]; + /*0x28*/ u8 unk28; + /*0x29*/ u8 unk29; /*0x2a*/ u8 unk2a; - /*0x2c*/ int field_0x2c; + /*0x2b*/ u8 unk2b; + /*0x2c*/ s8 unk2c; + /*0x2d*/ u8 unk2d; + /*0x2e*/ union SplitHWord unk2e; } Menu; static_assert(sizeof(Menu) == 0x30); diff --git a/include/screen.h b/include/screen.h index a5b05623..fe17b183 100644 --- a/include/screen.h +++ b/include/screen.h @@ -68,8 +68,8 @@ typedef struct { } Screen; typedef struct { - u16 x; - u16 y; + s16 x; + s16 y; u16 _4; u16 _6; u16 _8; |