diff options
| author | Max Roncace <me@caseif.net> | 2025-12-22 18:41:19 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-12-22 15:41:19 -0800 |
| commit | 9767e76ba049ce20ac0d2236758f050bcd36d90f (patch) | |
| tree | 30519a089779dd789f5564adef5afb27a163a190 /include | |
| parent | 8fece471c6d5203aa09d5c280584096adc1b8539 (diff) | |
GCN data 100% matching (#2987)
* Update GZ2J01 symbols from linked DOL
* GCN data 100% matching
* Run dtk apply
Diffstat (limited to 'include')
| -rw-r--r-- | include/JSystem/JKernel/JKRArchive.h | 2 | ||||
| -rw-r--r-- | include/d/actor/d_a_obj_tornado2.h | 2 | ||||
| -rw-r--r-- | include/d/actor/d_a_tag_kago_fall.h | 2 | ||||
| -rw-r--r-- | include/d/d_s_logo.h | 2 |
4 files changed, 5 insertions, 3 deletions
diff --git a/include/JSystem/JKernel/JKRArchive.h b/include/JSystem/JKernel/JKRArchive.h index 234e8a5390..ee54335886 100644 --- a/include/JSystem/JKernel/JKRArchive.h +++ b/include/JSystem/JKernel/JKRArchive.h @@ -131,7 +131,6 @@ protected: JKRArchive(s32, EMountMode); public: - virtual ~JKRArchive(); bool getDirEntry(SDirEntry*, u32) const; void* getIdxResource(u32); void* getResource(u16); @@ -167,6 +166,7 @@ public: /* vt[17] */ virtual void* fetchResource(void*, u32, SDIFileEntry*, u32*) = 0; /* vt[18] */ virtual void setExpandSize(SDIFileEntry*, u32); /* vt[19] */ virtual u32 getExpandSize(SDIFileEntry*) const; + virtual ~JKRArchive(); u32 countFile() const { return mArcInfoBlock->num_file_entries; } s32 countDirectory() const { return mArcInfoBlock->num_nodes; } diff --git a/include/d/actor/d_a_obj_tornado2.h b/include/d/actor/d_a_obj_tornado2.h index 6d208576fb..1cc3a75a7a 100644 --- a/include/d/actor/d_a_obj_tornado2.h +++ b/include/d/actor/d_a_obj_tornado2.h @@ -49,7 +49,7 @@ public: /* 0x73C */ WIND_INFLUENCE mWindInfluence; /* 0x768 */ f32 mDefaultRadius; /* 0x76C */ f32 mDefaultLength; - /* 0x770 */ int mTimer; + /* 0x770 */ s32 mTimer; /* 0x774 */ f32 mWindPower; /* 0x778 */ bool mColumnOn; /* 0x778 */ JPABaseEmitter* mParticles[3]; diff --git a/include/d/actor/d_a_tag_kago_fall.h b/include/d/actor/d_a_tag_kago_fall.h index 95fc3a8624..34dd042340 100644 --- a/include/d/actor/d_a_tag_kago_fall.h +++ b/include/d/actor/d_a_tag_kago_fall.h @@ -13,7 +13,7 @@ public: int create(); int execute(); - void setActionMode(ActionMode mode, u8 state); + void setActionMode(u8 mode, u8 state); void actionWaitRiver(); void actionWaitFall(); int _delete(); diff --git a/include/d/d_s_logo.h b/include/d/d_s_logo.h index 6512a45b2d..0a611b83c3 100644 --- a/include/d/d_s_logo.h +++ b/include/d/d_s_logo.h @@ -15,6 +15,8 @@ class dLog_HIO_c { public: dLog_HIO_c(); virtual ~dLog_HIO_c(); + + u8 field_0x4[0x8 - 0x4]; }; // Size: 0x8 class dScnLogo_c : public scene_class { |