diff options
| author | emilybrooks <emilybrooksemilybrooks@gmail.com> | 2024-03-10 15:27:50 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-03-10 15:27:50 -0700 |
| commit | abd5ecba65e19c3fe08e8c481549538071024251 (patch) | |
| tree | 6777753580e518d36719f65334ba1bb57f5d0521 /include | |
| parent | 55a27a19353e0d5a0d8706ad1a5fcb877290b949 (diff) | |
ac_sum_hal_chest02 OK (#153)
* initial commit
* started draw function
* fully matching
* fix compile errors
Diffstat (limited to 'include')
| -rw-r--r-- | include/m_common_data.h | 12 | ||||
| -rw-r--r-- | include/tables/dmatables/dmadata_table_jp.h | 4 |
2 files changed, 13 insertions, 3 deletions
diff --git a/include/m_common_data.h b/include/m_common_data.h index ced543a..ac54467 100644 --- a/include/m_common_data.h +++ b/include/m_common_data.h @@ -25,6 +25,7 @@ struct Game_Play; struct struct_809AEFA4; struct ToolClip; struct ShadowData; +struct FurnitureActor; typedef UNK_RET (*CommonData_unk_1004C_unk_04)(struct ActorOverlay*, const struct struct_801161E8_jp*, size_t, s32); typedef UNK_RET (*CommonData_unk_1004C_unk_08)(void); @@ -85,6 +86,13 @@ typedef struct CommonData_unk_10080 { /* 0x04 */ CommonData_unk_10080_unk_04 unk_04; } CommonData_unk_10080; // size >= 0x8 +typedef UNK_RET (*CommonData_unk_1008C_unk_34)(struct FurnitureActor* furnitureActor, struct Actor* myHouseActor, struct Game_Play* game_play, f32 arg0, f32 arg1); + +typedef struct CommonData_unk_1008C { + /* 0x00 */ UNK_TYPE1 unk_00[0x34]; + /* 0x34 */ CommonData_unk_1008C_unk_34 unk_34; // open close proc +} CommonData_unk_1008C; // size >= 0x8 + typedef UNK_RET (*CommonData_unk_10098_unk_4)(struct ActorOverlay*, size_t); typedef UNK_RET (*CommonData_unk_10098_unk_8)(void); typedef UNK_PTR (*CommonData_unk_10098_unk_0C)(void); @@ -217,7 +225,9 @@ typedef struct CommonData { /* 0x10078 */ CommonData_unk_10078* unk_10078; /* 0x1007C */ UNK_TYPE1 unk_1007C[0x4]; /* 0x10080 */ CommonData_unk_10080* unk_10080; - /* 0x10084 */ UNK_TYPE1 unk_10084[0x14]; + /* 0x10084 */ UNK_TYPE1 unk_10084[0x8]; + /* 0x1008C */ CommonData_unk_1008C* unk_1008C; + /* 0x10090 */ UNK_TYPE1 unk_10090[0x8]; /* 0x10098 */ CommonData_unk_10098* unk_10098; /* 0x1009C */ UNK_TYPE1 unk_1009C[0x4]; /* 0x100A0 */ struct ToolClip* toolClip; diff --git a/include/tables/dmatables/dmadata_table_jp.h b/include/tables/dmatables/dmadata_table_jp.h index 21afbce..876c72b 100644 --- a/include/tables/dmatables/dmadata_table_jp.h +++ b/include/tables/dmatables/dmadata_table_jp.h @@ -1362,8 +1362,8 @@ DEFINE_DMA_ENTRY(ovl__0092F760, "ovl__0092F760") DEFINE_DMA_ENTRY(ovl__0092F760_reloc, "ovl__0092F760_reloc") DEFINE_DMA_ENTRY(ovl__0092FAF0, "ovl__0092FAF0") DEFINE_DMA_ENTRY(ovl__0092FAF0_reloc, "ovl__0092FAF0_reloc") -DEFINE_DMA_ENTRY(ovl__0092FE80, "ovl__0092FE80") -DEFINE_DMA_ENTRY(ovl__0092FE80_reloc, "ovl__0092FE80_reloc") +DEFINE_DMA_ENTRY(ovl_sum_hal_chest02, "ovl__0092FE80") +DEFINE_DMA_ENTRY(ovl_sum_hal_chest02_reloc, "ovl__0092FE80_reloc") DEFINE_DMA_ENTRY(ovl__00930210, "ovl__00930210") DEFINE_DMA_ENTRY(ovl__00930210_reloc, "ovl__00930210_reloc") DEFINE_DMA_ENTRY(ovl__009305A0, "ovl__009305A0") |