From 9767e76ba049ce20ac0d2236758f050bcd36d90f Mon Sep 17 00:00:00 2001
From: Max Roncace <me@caseif.net>
Date: Mon, 22 Dec 2025 18:41:19 -0500
Subject: GCN data 100% matching (#2987)

* Update GZ2J01 symbols from linked DOL

* GCN data 100% matching

* Run dtk apply
---
 include/JSystem/JKernel/JKRArchive.h | 2 +-
 include/d/actor/d_a_obj_tornado2.h   | 2 +-
 include/d/actor/d_a_tag_kago_fall.h  | 2 +-
 include/d/d_s_logo.h                 | 2 ++
 4 files changed, 5 insertions(+), 3 deletions(-)

(limited to 'include')

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 {
-- 
cgit v1.2.3