Improve various partially matched TUs (#2526)

hatal175 · web-flow · commit b83ff695890e · 2025-07-11T01:11:21.000-07:00
diff --git a/config/GZ2E01/rels/d_a_obj_hfuta/symbols.txt b/config/GZ2E01/rels/d_a_obj_hfuta/symbols.txt
@@ -35,8 +35,7 @@ _dtors = .dtors:0x00000000; // type:label scope:global
 @stringBase0 = .rodata:0x00000020; // type:object size:0xA scope:local data:string_table
 ...data.0 = .data:0x00000000; // type:label scope:local
 cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global
-@1787 = .data:0x0000000C; // type:object size:0x4 scope:local
-lbl_477_data_10 = .data:0x00000010; // type:object size:0x10
+lit_1787 = .data:0x0000000C; // type:object size:0x14 scope:local
 l_arcName = .data:0x00000020; // type:object size:0x4 scope:global data:4byte
 @3966 = .data:0x00000024; // type:object size:0xC scope:local
 @3967 = .data:0x00000030; // type:object size:0xC scope:local
diff --git a/config/GZ2E01/rels/d_a_obj_ice_s/symbols.txt b/config/GZ2E01/rels/d_a_obj_ice_s/symbols.txt
@@ -65,6 +65,6 @@ g_profile_Obj_Ice_s = .data:0x00000024; // type:object size:0x30 scope:global
 __vt__12daObjIce_s_c = .data:0x00000054; // type:object size:0x28 scope:global
 __vt__17daOBJ_ICE_S_HIO_c = .data:0x0000007C; // type:object size:0xC scope:global
 __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global
-lbl_480_bss_8 = .bss:0x00000008; // type:object size:0x1 data:byte
+l_HIOInit = .bss:0x00000008; // type:object size:0x1 data:byte
 @3639 = .bss:0x0000000C; // type:object size:0xC scope:local
 l_HIO = .bss:0x00000018; // type:object size:0x10 scope:global align:4 data:float
diff --git a/config/GZ2E01/rels/d_a_obj_lv4CandleDemoTag/symbols.txt b/config/GZ2E01/rels/d_a_obj_lv4CandleDemoTag/symbols.txt
@@ -39,8 +39,7 @@ __destroy_global_chain_reference = .dtors:0x00000000; // type:object size:0x4 sc
 _dtors = .dtors:0x00000000; // type:label scope:global
 ...data.0 = .data:0x00000000; // type:label scope:local
 cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global
-@1787 = .data:0x0000000C; // type:object size:0x4 scope:local
-lbl_523_data_10 = .data:0x00000010; // type:object size:0x10
+lit_1787 = .data:0x0000000C; // type:object size:0x14 scope:local
 @3702 = .data:0x00000020; // type:object size:0xC scope:local
 @3703 = .data:0x0000002C; // type:object size:0xC scope:local
 @3704 = .data:0x00000038; // type:object size:0xC scope:local
@@ -55,4 +54,4 @@ __vt__14mDoHIO_entry_c = .data:0x0000011C; // type:object size:0xC scope:global
 __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global
 @3632 = .bss:0x00000008; // type:object size:0xC scope:local
 l_HIO = .bss:0x00000014; // type:object size:0x8 scope:global data:2byte
-lbl_523_bss_1C = .bss:0x0000001C; // type:object size:0x1 data:byte
+l_HIOInit = .bss:0x0000001C; // type:object size:0x1 data:byte
diff --git a/config/GZ2J01/rels/d_a_obj_hfuta/symbols.txt b/config/GZ2J01/rels/d_a_obj_hfuta/symbols.txt
@@ -34,8 +34,7 @@ _dtors = .dtors:0x00000000; // type:label scope:global
 @3998 = .rodata:0x0000001C; // type:object size:0x4 scope:local
 @stringBase0 = .rodata:0x00000020; // type:object size:0xA scope:local data:string_table
 cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global
-@1787 = .data:0x0000000C; // type:object size:0x4 scope:local
-lbl_477_data_10 = .data:0x00000010; // type:object size:0x10
+lit_1787 = .data:0x0000000C; // type:object size:0x14 scope:local
 l_arcName = .data:0x00000020; // type:object size:0x4 scope:global data:4byte
 @3966 = .data:0x00000024; // type:object size:0xC scope:local
 @3967 = .data:0x00000030; // type:object size:0xC scope:local
diff --git a/config/GZ2J01/rels/d_a_obj_ice_s/symbols.txt b/config/GZ2J01/rels/d_a_obj_ice_s/symbols.txt
@@ -65,6 +65,6 @@ g_profile_Obj_Ice_s = .data:0x00000024; // type:object size:0x30 scope:global
 __vt__12daObjIce_s_c = .data:0x00000054; // type:object size:0x28 scope:global
 __vt__17daOBJ_ICE_S_HIO_c = .data:0x0000007C; // type:object size:0xC scope:global
 __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global
-lbl_480_bss_8 = .bss:0x00000008; // type:object size:0x1 data:byte
+l_HIOInit = .bss:0x00000008; // type:object size:0x1 data:byte
 @3639 = .bss:0x0000000C; // type:object size:0xC scope:local
 l_HIO = .bss:0x00000018; // type:object size:0x10 scope:global align:4 data:float
diff --git a/config/GZ2J01/rels/d_a_obj_lv4CandleDemoTag/symbols.txt b/config/GZ2J01/rels/d_a_obj_lv4CandleDemoTag/symbols.txt
@@ -38,8 +38,7 @@ _ctors = .ctors:0x00000000; // type:label scope:global
 __destroy_global_chain_reference = .dtors:0x00000000; // type:object size:0x4 scope:global
 _dtors = .dtors:0x00000000; // type:label scope:global
 cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global
-@1787 = .data:0x0000000C; // type:object size:0x4 scope:local
-lbl_523_data_10 = .data:0x00000010; // type:object size:0x10
+lit_1787 = .data:0x0000000C; // type:object size:0x14 scope:local
 @3702 = .data:0x00000020; // type:object size:0xC scope:local
 @3703 = .data:0x0000002C; // type:object size:0xC scope:local
 @3704 = .data:0x00000038; // type:object size:0xC scope:local
@@ -54,4 +53,4 @@ __vt__14mDoHIO_entry_c = .data:0x0000011C; // type:object size:0xC scope:global
 __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global
 @3632 = .bss:0x00000008; // type:object size:0xC scope:local
 l_HIO = .bss:0x00000014; // type:object size:0x8 scope:global data:2byte
-lbl_523_bss_1C = .bss:0x0000001C; // type:object size:0x1 data:byte
+l_HIOInit = .bss:0x0000001C; // type:object size:0x1 data:byte
diff --git a/config/GZ2P01/rels/d_a_obj_hfuta/symbols.txt b/config/GZ2P01/rels/d_a_obj_hfuta/symbols.txt
@@ -34,8 +34,7 @@ _dtors = .dtors:0x00000000; // type:label scope:global
 @3998 = .rodata:0x0000001C; // type:object size:0x4 scope:local
 @stringBase0 = .rodata:0x00000020; // type:object size:0xA scope:local data:string_table
 cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global
-@1787 = .data:0x0000000C; // type:object size:0x4 scope:local
-lbl_477_data_10 = .data:0x00000010; // type:object size:0x10
+lit_1787 = .data:0x0000000C; // type:object size:0x14 scope:local
 l_arcName = .data:0x00000020; // type:object size:0x4 scope:global data:4byte
 @3966 = .data:0x00000024; // type:object size:0xC scope:local
 @3967 = .data:0x00000030; // type:object size:0xC scope:local
diff --git a/config/GZ2P01/rels/d_a_obj_ice_s/symbols.txt b/config/GZ2P01/rels/d_a_obj_ice_s/symbols.txt
@@ -65,6 +65,6 @@ g_profile_Obj_Ice_s = .data:0x00000024; // type:object size:0x30 scope:global
 __vt__12daObjIce_s_c = .data:0x00000054; // type:object size:0x28 scope:global
 __vt__17daOBJ_ICE_S_HIO_c = .data:0x0000007C; // type:object size:0xC scope:global
 __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global
-lbl_480_bss_8 = .bss:0x00000008; // type:object size:0x1 data:byte
+l_HIOInit = .bss:0x00000008; // type:object size:0x1 data:byte
 @3639 = .bss:0x0000000C; // type:object size:0xC scope:local
 l_HIO = .bss:0x00000018; // type:object size:0x10 scope:global align:4 data:float
diff --git a/config/GZ2P01/rels/d_a_obj_lv4CandleDemoTag/symbols.txt b/config/GZ2P01/rels/d_a_obj_lv4CandleDemoTag/symbols.txt
@@ -38,8 +38,7 @@ _ctors = .ctors:0x00000000; // type:label scope:global
 __destroy_global_chain_reference = .dtors:0x00000000; // type:object size:0x4 scope:global
 _dtors = .dtors:0x00000000; // type:label scope:global
 cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global
-@1787 = .data:0x0000000C; // type:object size:0x4 scope:local
-lbl_523_data_10 = .data:0x00000010; // type:object size:0x10
+lit_1787 = .data:0x0000000C; // type:object size:0x14 scope:local
 @3702 = .data:0x00000020; // type:object size:0xC scope:local
 @3703 = .data:0x0000002C; // type:object size:0xC scope:local
 @3704 = .data:0x00000038; // type:object size:0xC scope:local
@@ -54,4 +53,4 @@ __vt__14mDoHIO_entry_c = .data:0x0000011C; // type:object size:0xC scope:global
 __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global
 @3632 = .bss:0x00000008; // type:object size:0xC scope:local
 l_HIO = .bss:0x00000014; // type:object size:0x8 scope:global data:2byte
-lbl_523_bss_1C = .bss:0x0000001C; // type:object size:0x1 data:byte
+l_HIOInit = .bss:0x0000001C; // type:object size:0x1 data:byte
diff --git a/config/RZDE01_00/rels/d_a_obj_ice_s/symbols.txt b/config/RZDE01_00/rels/d_a_obj_ice_s/symbols.txt
@@ -69,6 +69,6 @@ __RTTI__12daObjIce_s_c = .data:0x000000DC; // type:object size:0x8 scope:global
 lbl_480_data_E4 = .data:0x000000E4; // type:object size:0xA data:string
 lbl_480_data_EE = .data:0x000000EE; // type:object size:0xA data:string
 __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global
-lbl_480_bss_8 = .bss:0x00000008; // type:object size:0x1 data:byte
+l_HIOInit = .bss:0x00000008; // type:object size:0x1 data:byte
 @91760 = .bss:0x0000000C; // type:object size:0xC scope:local
 l_HIO = .bss:0x00000018; // type:object size:0x10 scope:global align:4 data:float
diff --git a/configure.py b/configure.py
@@ -1947,9 +1947,9 @@ def MatchingFor(*versions) -> bool:
     ActorRel(NonMatching, "d_a_obj_hasu2"),
     ActorRel(NonMatching, "d_a_obj_hata"),
     ActorRel(NonMatching, "d_a_obj_hb"),
-    ActorRel(NonMatching, "d_a_obj_hbombkoya"),
+    ActorRel(Equivalent, "d_a_obj_hbombkoya"),
     ActorRel(MatchingFor("GZ2E01"), "d_a_obj_heavySw"),
-    ActorRel(NonMatching, "d_a_obj_hfuta"),
+    ActorRel(MatchingFor("GZ2E01"), "d_a_obj_hfuta"),
     ActorRel(MatchingFor("GZ2E01"), "d_a_obj_hsTarget"),
     ActorRel(MatchingFor("GZ2E01"), "d_a_obj_ice_l"),
     ActorRel(NonMatching, "d_a_obj_ice_s"),
@@ -1986,7 +1986,7 @@ def MatchingFor(*versions) -> bool:
     ActorRel(Equivalent, "d_a_obj_laundry"), # weak func order
     ActorRel(MatchingFor("GZ2E01"), "d_a_obj_laundry_rope"),
     ActorRel(MatchingFor("GZ2E01"), "d_a_obj_lbox"),
-    ActorRel(NonMatching, "d_a_obj_lp"),
+    ActorRel(MatchingFor("GZ2E01"), "d_a_obj_lp"),
     ActorRel(MatchingFor("GZ2E01"), "d_a_obj_lv1Candle00"),
     ActorRel(MatchingFor("GZ2E01"), "d_a_obj_lv1Candle01"),
     ActorRel(MatchingFor("GZ2E01"), "d_a_obj_lv3Candle"),
@@ -1995,7 +1995,7 @@ def MatchingFor(*versions) -> bool:
     ActorRel(MatchingFor("GZ2E01"), "d_a_obj_lv3WaterB"),
     ActorRel(MatchingFor("GZ2E01"), "d_a_obj_lv3saka00"),
     ActorRel(MatchingFor("GZ2E01"), "d_a_obj_lv3waterEff"),
-    ActorRel(NonMatching, "d_a_obj_lv4CandleDemoTag"),
+    ActorRel(Equivalent, "d_a_obj_lv4CandleDemoTag"), # weak function order
     ActorRel(NonMatching, "d_a_obj_lv4CandleTag"),
     ActorRel(NonMatching, "d_a_obj_lv4EdShutter"),
     ActorRel(MatchingFor("GZ2E01"), "d_a_obj_lv4Gate"),
@@ -2040,7 +2040,7 @@ def MatchingFor(*versions) -> bool:
     ActorRel(MatchingFor("GZ2E01"), "d_a_obj_magLift"),
     ActorRel(MatchingFor("GZ2E01"), "d_a_obj_magLiftRot"),
     ActorRel(MatchingFor("GZ2E01"), "d_a_obj_maki"),
-    ActorRel(NonMatching, "d_a_obj_master_sword"),
+    ActorRel(Equivalent, "d_a_obj_master_sword"), #weak function and vtable order
     ActorRel(NonMatching, "d_a_obj_mato"),
     ActorRel(MatchingFor("GZ2E01"), "d_a_obj_mhole"),
     ActorRel(NonMatching, "d_a_obj_mie"),
@@ -2053,7 +2053,7 @@ def MatchingFor(*versions) -> bool:
     ActorRel(NonMatching, "d_a_obj_mvstair"),
     ActorRel(MatchingFor("GZ2E01"), "d_a_obj_myogan"),
     ActorRel(NonMatching, "d_a_obj_nagaisu"),
-    ActorRel(Equivalent, "d_a_obj_nan"),
+    ActorRel(Equivalent, "d_a_obj_nan"), # weak function order
     ActorRel(NonMatching, "d_a_obj_ndoor"),
     ActorRel(NonMatching, "d_a_obj_nougu"),
     ActorRel(Equivalent, "d_a_obj_octhashi"),
@@ -2073,7 +2073,7 @@ def MatchingFor(*versions) -> bool:
     ActorRel(MatchingFor("GZ2E01"), "d_a_obj_prop"),
     ActorRel(NonMatching, "d_a_obj_pumpkin"),
     ActorRel(MatchingFor("GZ2E01"), "d_a_obj_rcircle"),
-    ActorRel(NonMatching, "d_a_obj_rfHole"),
+    ActorRel(MatchingFor("GZ2E01"), "d_a_obj_rfHole"),
     ActorRel(MatchingFor("GZ2E01"), "d_a_obj_rgate"),
     ActorRel(MatchingFor("GZ2E01"), "d_a_obj_riverrock"),
     ActorRel(MatchingFor("GZ2E01"), "d_a_obj_rock"),
@@ -2090,7 +2090,7 @@ def MatchingFor(*versions) -> bool:
     ActorRel(NonMatching, "d_a_obj_scannon_ten"),
     ActorRel(MatchingFor("GZ2E01"), "d_a_obj_sekidoor"),
     ActorRel(MatchingFor("GZ2E01"), "d_a_obj_sekizo"),
-    ActorRel(Equivalent, "d_a_obj_sekizoa"),
+    ActorRel(Equivalent, "d_a_obj_sekizoa"), # weak function order
     ActorRel(MatchingFor("GZ2E01"), "d_a_obj_shield"),
     ActorRel(Equivalent, "d_a_obj_sm_door"), # vtable order
     ActorRel(NonMatching, "d_a_obj_smallkey"),
diff --git a/include/SSystem/SComponent/c_m3d_g_aab.h b/include/SSystem/SComponent/c_m3d_g_aab.h
@@ -26,9 +26,9 @@ class cM3dGAab {
     void CalcCenter(cXyz*) const;
     void PlusR(f32);
     const cXyz* GetMaxP(void) const { return &mMax; }
-    const cXyz* GetMaxP(void) { return &mMax; }
+    cXyz* GetMaxP(void) { return &mMax; }
     const cXyz* GetMinP(void) const { return &mMin; }
-    const cXyz* GetMinP(void) { return &mMin; }
+    cXyz* GetMinP(void) { return &mMin; }
     const f32 GetMaxX(void) const { return mMax.x; }
     const f32 GetMaxY(void) const { return mMax.y; }
     const f32 GetMaxZ(void) const { return mMax.z; }
diff --git a/include/d/actor/d_a_obj_hbombkoya.h b/include/d/actor/d_a_obj_hbombkoya.h
@@ -28,7 +28,7 @@ class daObjHBombkoya_c : public dBgS_MoveBgActor,
 
     /* 80C1B878 */ int create1st();
     /* 80C1BB7C */ bool setParticle(u16*, int, PSetTbl*, int, int);
-    /* 80C1C474 */ virtual ~daObjHBombkoya_c();
+    /* 80C1C474 */ virtual ~daObjHBombkoya_c() {}
 
     /* 80C1B938 */ virtual int CreateHeap();
     /* 80C1B9CC */ virtual int Create();
diff --git a/include/d/actor/d_a_obj_ice_s.h b/include/d/actor/d_a_obj_ice_s.h
@@ -60,7 +60,7 @@ STATIC_ASSERT(sizeof(daObjIce_s_c) == 0x644);
 class daOBJ_ICE_S_HIO_c {
 public:
     /* 80C209AC */ daOBJ_ICE_S_HIO_c();
-    /* 80C21A60 */ virtual ~daOBJ_ICE_S_HIO_c();
+    /* 80C21A60 */ virtual ~daOBJ_ICE_S_HIO_c() {}
 
     /* 0x4 */ s8 field_0x4;
     /* 0x8 */ f32 field_0x8;
diff --git a/include/d/actor/d_a_obj_lp.h b/include/d/actor/d_a_obj_lp.h
@@ -14,8 +14,8 @@
  
 struct wd_ss {
 public:
-    /* 80C559C8 */ ~wd_ss() {};
-    /* 80C55A04 */ wd_ss() {};
+    /* 80C559C8 */ ~wd_ss() {}
+    /* 80C55A04 */ wd_ss() {}
     
     /* 0x00 */ J3DModel* mpModel;
     /* 0x04 */ cXyz field_0x4;
@@ -31,15 +31,16 @@ struct wd_ss {
     /* 0x42 */ s16 field_0x42;
     /* 0x44 */ s16 field_0x44;
     /* 0x46 */ u8 field_0x46[0x4e - 0x46];
-    /* 0x4E */ u8 field_0x4e;
+    /* 0x4E */ s8 field_0x4e;
     /* 0x4F */ u8 field_0x4f;
     /* 0x50 */ int field_0x50;
 };
 
 STATIC_ASSERT(sizeof(wd_ss) == 0x54);
 
-class obj_lp_class : public fopAc_ac_c {
+class obj_lp_class {
 public:
+    /* 0x0000 */ fopAc_ac_c mActor;
     /* 0x0568 */ request_of_phase_process_class mPhase;
     /* 0x0570 */ u8 field_0x570;
     /* 0x0571 */ u8 field_0x571;
diff --git a/include/d/actor/d_a_obj_lv4CandleDemoTag.h b/include/d/actor/d_a_obj_lv4CandleDemoTag.h
@@ -15,6 +15,7 @@
  */
 class dalv4CandleDemoTag_c : public fopAc_ac_c, public request_of_phase_process_class, public dEvLib_callback_c {
 public:
+    typedef void (dalv4CandleDemoTag_c::*procFunc)();
     dalv4CandleDemoTag_c() : dEvLib_callback_c(this) {}
 
     /* 80C5CA58 */ void setBaseMtx();
@@ -39,7 +40,7 @@ class dalv4CandleDemoTag_c : public fopAc_ac_c, public request_of_phase_process_
     int getSwOK() { return shape_angle.x & 0xFF; }
     int getEventID() { return fopAcM_GetParamBit(this, 0x18, 8); }
 
-    /* 80C5D184 */ virtual ~dalv4CandleDemoTag_c();
+    /* 80C5D184 */ virtual ~dalv4CandleDemoTag_c() {}
     /* 80C5CF78 */ virtual bool eventStart();
 
 private:
@@ -56,7 +57,7 @@ STATIC_ASSERT(sizeof(dalv4CandleDemoTag_c) == 0x590);
 class dalv4CandleDemoTag_HIO_c : public mDoHIO_entry_c {
 public:
     /* 80C5C9EC */ dalv4CandleDemoTag_HIO_c();
-    /* 80C5D07C */ virtual ~dalv4CandleDemoTag_HIO_c();
+    /* 80C5D07C */ virtual ~dalv4CandleDemoTag_HIO_c() {}
 
     void genMessage(JORMContext*);
 
diff --git a/include/d/actor/d_a_obj_rfHole.h b/include/d/actor/d_a_obj_rfHole.h
@@ -28,7 +28,7 @@ class daRfHole_c : public dBgS_MoveBgActor {
     /* 80CB8FF8 */ int create();
     /* 80CB9148 */ static void rideCallBack(dBgW*, fopAc_ac_c*, fopAc_ac_c*);
     /* 80CB9194 */ int playerAreaCheck();
-    /* 80CB940C */ int Execute(f32 (**)[3][4]);
+    /* 80CB940C */ int Execute(Mtx**);
     /* 80CB9464 */ void holeProc();
     /* 80CB9520 */ void init_modeWait();
     /* 80CB952C */ void modeWait();
@@ -50,7 +50,6 @@ class daRfHole_c : public dBgS_MoveBgActor {
     /* 0x5AE */ u8 field_0x5ae;
     /* 0x5AF */ u8 field_0x5af;
     /* 0x5B0 */ s8 mRoofSoundOn;
-    /* 0x5B1 */ u8 field_0x5b1[0x5b4 - 0x5b1];
 };
 
 STATIC_ASSERT(sizeof(daRfHole_c) == 0x5b4);
diff --git a/src/d/actor/d_a_obj_hbombkoya.cpp b/src/d/actor/d_a_obj_hbombkoya.cpp
diff --git a/src/d/actor/d_a_obj_hfuta.cpp b/src/d/actor/d_a_obj_hfuta.cpp
diff --git a/src/d/actor/d_a_obj_ice_s.cpp b/src/d/actor/d_a_obj_ice_s.cpp
diff --git a/src/d/actor/d_a_obj_iceleaf.cpp b/src/d/actor/d_a_obj_iceleaf.cpp
diff --git a/src/d/actor/d_a_obj_lp.cpp b/src/d/actor/d_a_obj_lp.cpp
diff --git a/src/d/actor/d_a_obj_lv4CandleDemoTag.cpp b/src/d/actor/d_a_obj_lv4CandleDemoTag.cpp
diff --git a/src/d/actor/d_a_obj_rfHole.cpp b/src/d/actor/d_a_obj_rfHole.cpp
diff --git a/src/d/actor/d_a_obj_so.cpp b/src/d/actor/d_a_obj_so.cpp
