diff options
| author | kuchenmitsahne <25233413+kuchenmitsahne@users.noreply.github.com> | 2024-11-26 10:37:21 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-11-26 08:37:21 -0700 |
| commit | d38ac6a9d32e9b5c0e3caafbfc8d311a0f8f51f4 (patch) | |
| tree | 33ab1b41840e866e8dcb1257a5e871f88893bef1 /include | |
| parent | 0bab7e592c3dcbd4207c2c57c06819ec2b7c1bfa (diff) | |
ac_hanami_npc0 OK (#227)
* Standard actor functions and aHM0_ct_data functions OK
* Add scaffolding to Hanami_Npc0 struct
* func_809DE830_jp OK
* func_809DE434, func_809DE4A0_jp, func_809DE5BC_jp, func_809DE6B4_jp, func_809DE6C8_jp, func_809DE6EC_jp OK
* func_809DE538_jp OK with warnings
* func_809DE538_jp OK
* func_809DE714_jp OK with warnings
* func_809DE7D0_jp OK
* func_809DE8D0 OK
* func_809DE56C_jp OK with warnings
* func_809DE800_jp OK
* func_809DE978_jp OK
* func_809DE948_jp OK
* func_809DE744_jp OK
* func_809DE5DC_jp progress (nonmatching)
* Remove fake symbol D_809DEB1C_jp.
* Prepare for data import
* func_809DE5DC_jp OK, update func_809DE6EC_jp (all functions matching)
* Import data (44 differing words)
* Fix struct_809AEFA4, ac_hanami_npc0 OK
* Rename symbols + initial style pass
* Unify aHM0_*_proc function signatures
* Resolve warnings in aHM0_merry
* Update NPC actor functions + corresponding clip functions to use ActorFunc signature
* Fix aHM0_make_tumbler warning (none remain); minor cleanup
* Avoid format.py strangeness
* Fix typedef order
Diffstat (limited to 'include')
| -rw-r--r-- | include/m_clip.h | 12 | ||||
| -rw-r--r-- | include/unknown_structs.h | 3 |
2 files changed, 11 insertions, 4 deletions
diff --git a/include/m_clip.h b/include/m_clip.h index 0b56f69..2122083 100644 --- a/include/m_clip.h +++ b/include/m_clip.h @@ -34,12 +34,14 @@ typedef void (*Clip_unk_040_unk_C0)(struct Actor*, struct Game_Play*, struct str typedef UNK_RET (*Clip_unk_040_unk_C4)(struct Actor*, struct Game_Play*); typedef UNK_RET (*Clip_unk_040_unk_C8)(struct Actor*, struct Game_Play*); typedef UNK_RET (*Clip_unk_040_unk_CC)(struct Actor*, struct Game_Play*); -typedef UNK_RET (*Clip_unk_040_unk_D0)(void); -typedef UNK_RET (*Clip_unk_040_unk_E4)(void); +typedef void (*Clip_unk_040_unk_D0)(struct Actor*, struct Game_Play*); +typedef void (*Clip_unk_040_unk_E4)(struct Actor*, struct Game_Play*); typedef UNK_RET (*Clip_unk_040_unk_E8)(void); typedef UNK_RET (*Clip_unk_040_unk_EC)(struct ObjectStatus*, s16, s16); typedef UNK_RET (*Clip_unk_040_unk_F0)(struct ObjectStatus*, struct Actor*); typedef s32 (*Clip_unk_040_unk_F4)(struct ObjectStatus*, struct Actor*); +typedef UNK_RET (*Clip_unk_040_unk_104)(struct Actor*, UNK_TYPE4, UNK_TYPE, s32); +typedef UNK_RET (*Clip_unk_040_unk_110)(struct Actor*, struct Game_Play*, UNK_TYPE, UNK_TYPE); typedef UNK_RET (*Clip_unk_040_unk_118)(struct Actor*); typedef struct Clip_unk_040 { @@ -62,7 +64,11 @@ typedef struct Clip_unk_040 { /* 0x0EC */ Clip_unk_040_unk_EC unk_EC; /* 0x0F0 */ Clip_unk_040_unk_F0 unk_F0; /* 0x0F4 */ Clip_unk_040_unk_F4 unk_F4; - /* 0x0F8 */ UNK_TYPE1 unk_F8[0x20]; + /* 0x0F8 */ UNK_TYPE1 unk_F8[0xC]; + /* 0x104 */ Clip_unk_040_unk_104 unk_104; + /* 0x108 */ UNK_TYPE1 unk_108[0x8]; + /* 0x110 */ Clip_unk_040_unk_110 unk_110; + /* 0x114 */ UNK_TYPE1 unk_114[0x4]; /* 0x118 */ Clip_unk_040_unk_118 unk_118; } Clip_unk_040; // size >= 0x11C diff --git a/include/unknown_structs.h b/include/unknown_structs.h index ce3fdb0..dbc642b 100644 --- a/include/unknown_structs.h +++ b/include/unknown_structs.h @@ -28,7 +28,8 @@ typedef struct struct_809AEFA4 { /* 0x0C */ UNK_PTR unk_0C; /* 0x10 */ UNK_PTR unk_10; /* 0x14 */ UNK_PTR unk_14; -} struct_809AEFA4; // size >= 0x18 + /* 0x18 */ UNK_TYPE unk_18; +} struct_809AEFA4; // size = 0x1C // Maybe same struct as mMl? typedef struct struct_func_8085CE18_jp_arg4 { |