Fix the dTg_c class to not override the common four lifecycle methods

zeldaret · Sep 11, 2024 · 0ba0cc1 · 0ba0cc1
1 parent d068ec1
commit 0ba0cc1
Show file tree

Hide file tree

Showing 11 changed files with 68 additions and 28 deletions.
diff --git a/config/SOUE01/rels/d_t_light_shaft_effNP/symbols.txt b/config/SOUE01/rels/d_t_light_shaft_effNP/symbols.txt
@@ -2,10 +2,10 @@ _prolog = .text:0x00000000; // type:function size:0x2C scope:global
 _epilog = .text:0x00000030; // type:function size:0x2C scope:global
 _unresolved = .text:0x00000060; // type:function size:0x4 scope:global
 dTgLightShaftEff_c_classInit__Fv = .text:0x00000070; // type:function size:0x4C
-create__5dTg_cFv = .text:0x000000C0; // type:function size:0x8
-doDelete__5dTg_cFv = .text:0x000000D0; // type:function size:0x8
-actorExecute__5dTg_cFv = .text:0x000000E0; // type:function size:0x8
-draw__5dTg_cFv = .text:0x000000F0; // type:function size:0x8
+create__18dTgLightShaftEff_cFv = .text:0x000000C0; // type:function size:0x8
+doDelete__18dTgLightShaftEff_cFv = .text:0x000000D0; // type:function size:0x8
+actorExecute__18dTgLightShaftEff_cFv = .text:0x000000E0; // type:function size:0x8
+draw__18dTgLightShaftEff_cFv = .text:0x000000F0; // type:function size:0x8
 __dt__18dTgLightShaftEff_cFv = .text:0x00000100; // type:function size:0x5C
 _ctors = .ctors:0x00000000; // type:label scope:global
 _dtors = .dtors:0x00000000; // type:label scope:global

diff --git a/config/SOUE01/rels/d_t_map_instNP/symbols.txt b/config/SOUE01/rels/d_t_map_instNP/symbols.txt
@@ -3,9 +3,9 @@ _epilog = .text:0x00000030; // type:function size:0x2C scope:global
 _unresolved = .text:0x00000060; // type:function size:0x4 scope:global
 dTgMapInst_c_classInit__Fv = .text:0x00000070; // type:function size:0x4C
 create__12dTgMapInst_cFv = .text:0x000000C0; // type:function size:0x10
-doDelete__5dTg_cFv = .text:0x000000D0; // type:function size:0x8
-actorExecute__5dTg_cFv = .text:0x000000E0; // type:function size:0x8
-draw__5dTg_cFv = .text:0x000000F0; // type:function size:0x8
+doDelete__12dTgMapInst_cFv = .text:0x000000D0; // type:function size:0x8
+actorExecute__12dTgMapInst_cFv = .text:0x000000E0; // type:function size:0x8
+draw__12dTgMapInst_cFv = .text:0x000000F0; // type:function size:0x8
 __dt__12dTgMapInst_cFv = .text:0x00000100; // type:function size:0x5C
 _ctors = .ctors:0x00000000; // type:label scope:global
 _dtors = .dtors:0x00000000; // type:label scope:global

diff --git a/config/SOUE01/rels/d_t_tackleNP/symbols.txt b/config/SOUE01/rels/d_t_tackleNP/symbols.txt
@@ -2,10 +2,10 @@ _prolog = .text:0x00000000; // type:function size:0x2C scope:global
 _epilog = .text:0x00000030; // type:function size:0x2C scope:global
 _unresolved = .text:0x00000060; // type:function size:0x4 scope:global
 dTgTackle_c_classInit__Fv = .text:0x00000070; // type:function size:0x4C
-create__5dTg_cFv = .text:0x000000C0; // type:function size:0x8
-doDelete__5dTg_cFv = .text:0x000000D0; // type:function size:0x8
-actorExecute__5dTg_cFv = .text:0x000000E0; // type:function size:0x8
-draw__5dTg_cFv = .text:0x000000F0; // type:function size:0x8
+create__11dTgTackle_cFv = .text:0x000000C0; // type:function size:0x8
+doDelete__11dTgTackle_cFv = .text:0x000000D0; // type:function size:0x8
+actorExecute__11dTgTackle_cFv = .text:0x000000E0; // type:function size:0x8
+draw__11dTgTackle_cFv = .text:0x000000F0; // type:function size:0x8
 __dt__11dTgTackle_cFv = .text:0x00000100; // type:function size:0x5C
 _ctors = .ctors:0x00000000; // type:label scope:global
 _dtors = .dtors:0x00000000; // type:label scope:global

diff --git a/include/d/tg/d_t_light_shaft_eff.h b/include/d/tg/d_t_light_shaft_eff.h
@@ -7,6 +7,11 @@ class dTgLightShaftEff_c : public dTg_c {
 public:
     dTgLightShaftEff_c() {}
     virtual ~dTgLightShaftEff_c() {}
+
+    virtual int create() override;
+    virtual int doDelete() override;
+    virtual int actorExecute() override;
+    virtual int draw() override;
 };
 
 #endif
diff --git a/include/d/tg/d_t_map_inst.h b/include/d/tg/d_t_map_inst.h
@@ -9,6 +9,9 @@ class dTgMapInst_c : public dTg_c {
     virtual ~dTgMapInst_c() {}
 
     virtual int create() override;
+    virtual int doDelete() override;
+    virtual int actorExecute() override;
+    virtual int draw() override;
 
     u8 field_0xfc;
 };

diff --git a/include/d/tg/d_t_tackle.h b/include/d/tg/d_t_tackle.h
@@ -7,6 +7,11 @@ class dTgTackle_c : public dTg_c {
 public:
     dTgTackle_c() {}
     virtual ~dTgTackle_c() {}
+
+    virtual int create() override;
+    virtual int doDelete() override;
+    virtual int actorExecute() override;
+    virtual int draw() override;
 };
 
 #endif
diff --git a/include/d/tg/d_tg.h b/include/d/tg/d_tg.h
@@ -6,18 +6,6 @@
 class dTg_c : public dAcBase_c {
 public:
     virtual ~dTg_c() {}
-    virtual int draw() override {
-        return 1;
-    }
-    virtual int actorExecute() override {
-        return 1;
-    }
-    virtual int doDelete() override {
-        return 1;
-    }
-    virtual int create() override {
-        return 1;
-    }
 };
 
 #endif
diff --git a/src/REL/d/t/d_t_genki_dws_tgt.cpp b/src/REL/d/t/d_t_genki_dws_tgt.cpp
@@ -6,10 +6,7 @@
 #include <toBeSorted/scgame.h>
 
 
-// Maybe this is dTg_c and it is empty?
-class UnkIntermediateClass : public dAcBase_c {};
-
-class dTgGenkiDwsTgt_c : public UnkIntermediateClass {
+class dTgGenkiDwsTgt_c : public dTg_c {
 public:
     dTgGenkiDwsTgt_c() : mDowsingTarget(this, DowsingTarget::SLOT_NONE) {}
     virtual ~dTgGenkiDwsTgt_c() {}

diff --git a/src/REL/d/t/d_t_light_shaft_eff.cpp b/src/REL/d/t/d_t_light_shaft_eff.cpp
@@ -2,4 +2,18 @@
 
 SPECIAL_ACTOR_PROFILE(TAG_LIGHT_SHAFT_EFF, dTgLightShaftEff_c, fProfile::TAG_LIGHT_SHAFT_EFF, 0x025E, 0, 0);
 
-// clang-format on
+int dTgLightShaftEff_c::create() {
+    return SUCCEEDED;
+}
+
+int dTgLightShaftEff_c::doDelete() {
+    return 1;
+}
+
+int dTgLightShaftEff_c::actorExecute() {
+    return 1;
+}
+
+int dTgLightShaftEff_c::draw() {
+    return 1;
+}
diff --git a/src/REL/d/t/d_t_map_inst.cpp b/src/REL/d/t/d_t_map_inst.cpp
@@ -4,5 +4,17 @@ SPECIAL_ACTOR_PROFILE(TAG_MAP_INST, dTgMapInst_c, fProfile::TAG_MAP_INST, 0x021d
 
 int dTgMapInst_c::create() {
     field_0xfc = params & 0xff;
+    return SUCCEEDED;
+}
+
+int dTgMapInst_c::doDelete() {
+    return 1;
+}
+
+int dTgMapInst_c::actorExecute() {
+    return 1;
+}
+
+int dTgMapInst_c::draw() {
     return 1;
 }
diff --git a/src/REL/d/t/d_t_tackle.cpp b/src/REL/d/t/d_t_tackle.cpp
@@ -1,3 +1,19 @@
 #include <d/tg/d_t_tackle.h>
 
 SPECIAL_ACTOR_PROFILE(TACKLE_TAG, dTgTackle_c, fProfile::TACKLE_TAG, 0x0241, 0, 0);
+
+int dTgTackle_c::create() {
+    return SUCCEEDED;
+}
+
+int dTgTackle_c::doDelete() {
+    return 1;
+}
+
+int dTgTackle_c::actorExecute() {
+    return 1;
+}
+
+int dTgTackle_c::draw() {
+    return 1;
+}