From 4b53476cf2ac34fc881529400192326fc8b19c2c Mon Sep 17 00:00:00 2001
From: LagoLunatic <LagoLunatic@users.noreply.github.com>
Date: Tue, 19 Aug 2025 17:18:01 -0400
Subject: [PATCH] Fix duplicate dADM_CharTbl class

---
 include/d/d_com_inf_game.h     | 73 +---------------------------------
 include/d/d_s_actor_data_mng.h | 34 +++++++++++++++-
 2 files changed, 33 insertions(+), 74 deletions(-)

diff --git a/include/d/d_com_inf_game.h b/include/d/d_com_inf_game.h
index c636635b9..dc032bf98 100644
--- a/include/d/d_com_inf_game.h
+++ b/include/d/d_com_inf_game.h
@@ -11,6 +11,7 @@
 #include "d/d_map.h"
 #include "d/d_particle.h"
 #include "d/d_resorce.h"
+#include "d/d_s_actor_data_mng.h"
 #include "d/d_save.h"
 #include "d/d_stage.h"
 #include "d/d_vibration.h"
@@ -116,78 +117,6 @@ public:
     /* 0x10 */ u16 mWaveFrame;
 };
 
-class dADM_CharTbl : public cDT {
-public:
-    s32 GetNITEM0()  { return mIndex_N_ITEM0; }
-    s32 GetNITEM1()  { return mIndex_N_ITEM1; }
-    s32 GetNITEM2()  { return mIndex_N_ITEM2; }
-    s32 GetNITEM3()  { return mIndex_N_ITEM3; }
-    s32 GetNITEM4()  { return mIndex_N_ITEM4; }
-    s32 GetNITEM5()  { return mIndex_N_ITEM5; }
-    s32 GetNITEM6()  { return mIndex_N_ITEM6; }
-    s32 GetNITEM7()  { return mIndex_N_ITEM7; }
-    s32 GetNITEM8()  { return mIndex_N_ITEM8; }
-    s32 GetNITEM9()  { return mIndex_N_ITEM9; }
-    s32 GetNITEM10() { return mIndex_N_ITEM10; }
-    s32 GetNITEM11() { return mIndex_N_ITEM11; }
-    s32 GetNITEM12() { return mIndex_N_ITEM12; }
-    s32 GetNITEM13() { return mIndex_N_ITEM13; }
-    s32 GetNITEM14() { return mIndex_N_ITEM14; }
-    s32 GetNITEM15() { return mIndex_N_ITEM15; }
-    s32 GetPercent() { return mIndex_percent; }
-    s32 GetITEM0() { return mIndex_ITEM0; }
-    s32 GetITEM1() { return mIndex_ITEM1; }
-    s32 GetITEM2() { return mIndex_ITEM2; }
-    s32 GetITEM3() { return mIndex_ITEM3; }
-    s32 GetITEM4() { return mIndex_ITEM4; }
-    s32 GetITEM5() { return mIndex_ITEM5; }
-    s32 GetITEM6() { return mIndex_ITEM6; }
-    s32 GetITEM7() { return mIndex_ITEM7; }
-
-private:
-    /* 0x28 */ s32 mIndex_ARG;
-    /* 0x2C */ s32 mIndex_N_ITEM0;
-    /* 0x30 */ s32 mIndex_N_ITEM1;
-    /* 0x34 */ s32 mIndex_N_ITEM2;
-    /* 0x38 */ s32 mIndex_N_ITEM3;
-    /* 0x3C */ s32 mIndex_N_ITEM4;
-    /* 0x40 */ s32 mIndex_N_ITEM5;
-    /* 0x44 */ s32 mIndex_N_ITEM6;
-    /* 0x48 */ s32 mIndex_N_ITEM7;
-    /* 0x4C */ s32 mIndex_N_ITEM8;
-    /* 0x50 */ s32 mIndex_N_ITEM9;
-    /* 0x54 */ s32 mIndex_N_ITEM10;
-    /* 0x58 */ s32 mIndex_N_ITEM11;
-    /* 0x5C */ s32 mIndex_N_ITEM12;
-    /* 0x60 */ s32 mIndex_N_ITEM13;
-    /* 0x64 */ s32 mIndex_N_ITEM14;
-    /* 0x68 */ s32 mIndex_N_ITEM15;
-    /* 0x6C */ s32 mIndex_percent;
-    /* 0x70 */ s32 mIndex_ITEM0;
-    /* 0x74 */ s32 mIndex_ITEM1;
-    /* 0x78 */ s32 mIndex_ITEM2;
-    /* 0x7C */ s32 mIndex_ITEM3;
-    /* 0x80 */ s32 mIndex_ITEM4;
-    /* 0x84 */ s32 mIndex_ITEM5;
-    /* 0x88 */ s32 mIndex_ITEM6;
-    /* 0x8C */ s32 mIndex_ITEM7;
-};
-STATIC_ASSERT(sizeof(dADM_CharTbl) == 0x90);
-
-class dADM {
-public:
-    /* 0x00 */ int mBlockCount;
-    /* 0x04 */ void* mpData;
-    /* 0x08 */ dADM_CharTbl mCharTbl;
-
-public:
-    dADM();
-    void FindTag(u32, u32*, u32*);
-    void SetData(void*);
-
-    virtual ~dADM();
-};
-
 class dComIfG_camera_info_class {
 public:
     dComIfG_camera_info_class() {}
diff --git a/include/d/d_s_actor_data_mng.h b/include/d/d_s_actor_data_mng.h
index 29e2d2241..bd18f3968 100644
--- a/include/d/d_s_actor_data_mng.h
+++ b/include/d/d_s_actor_data_mng.h
@@ -2,6 +2,7 @@
 #define D_S_ACTOR_DATA_MNG
 
 #include "SSystem/SComponent/c_data_tbl.h"
+#include "global.h"
 
 class dADM_CharTbl : public cDT {
 public:
@@ -15,14 +16,43 @@ public:
     void SetData(u32, u32, u32, u32, u32, u32, u32);
     void SetUpIndex();
     int GetNameIndex2(const char*, int) const;
+
+    s32 GetNITEM0()  { return mIndex_N_ITEM[0]; }
+    s32 GetNITEM1()  { return mIndex_N_ITEM[1]; }
+    s32 GetNITEM2()  { return mIndex_N_ITEM[2]; }
+    s32 GetNITEM3()  { return mIndex_N_ITEM[3]; }
+    s32 GetNITEM4()  { return mIndex_N_ITEM[4]; }
+    s32 GetNITEM5()  { return mIndex_N_ITEM[5]; }
+    s32 GetNITEM6()  { return mIndex_N_ITEM[6]; }
+    s32 GetNITEM7()  { return mIndex_N_ITEM[7]; }
+    s32 GetNITEM8()  { return mIndex_N_ITEM[8]; }
+    s32 GetNITEM9()  { return mIndex_N_ITEM[9]; }
+    s32 GetNITEM10() { return mIndex_N_ITEM[10]; }
+    s32 GetNITEM11() { return mIndex_N_ITEM[11]; }
+    s32 GetNITEM12() { return mIndex_N_ITEM[12]; }
+    s32 GetNITEM13() { return mIndex_N_ITEM[13]; }
+    s32 GetNITEM14() { return mIndex_N_ITEM[14]; }
+    s32 GetNITEM15() { return mIndex_N_ITEM[15]; }
+    s32 GetPercent() { return mIndex_percent; }
+    s32 GetITEM0() { return mIndex_ITEM[0]; }
+    s32 GetITEM1() { return mIndex_ITEM[1]; }
+    s32 GetITEM2() { return mIndex_ITEM[2]; }
+    s32 GetITEM3() { return mIndex_ITEM[3]; }
+    s32 GetITEM4() { return mIndex_ITEM[4]; }
+    s32 GetITEM5() { return mIndex_ITEM[5]; }
+    s32 GetITEM6() { return mIndex_ITEM[6]; }
+    s32 GetITEM7() { return mIndex_ITEM[7]; }
 };
 
+STATIC_ASSERT(sizeof(dADM_CharTbl) == 0x90);
+
 class dADM {
 public:
-    /* 0x00 */ s32 mBlockCount;
-    /* 0x04 */ void *mpData;
+    /* 0x00 */ int mBlockCount;
+    /* 0x04 */ void* mpData;
     /* 0x08 */ dADM_CharTbl mCharTbl;
 
+public:
     dADM();
     virtual ~dADM();
     bool FindTag(u32, u32*, u32*);