CLLT and progress in TLKT (#132)

* feat: wip soontm

* feat: enhance TLTK

* feat: complete TLKT

* fix: refactor went wild

* fix: update MLCK

* fix: hmmm

* fix: continue reverse wrong refactor

* style: remove comment

* feat: delink destructors of ActorUnkTLKTnCLLT_Base

include/Actor/ActorUnkCLLT.hpp

@@ -1,34 +1,31 @@
-//! TODO: This file was generated automatically and might contain errors
-
 #pragma once
 
 #include "Actor/Actor.hpp"
 #include "Actor/ActorProfile.hpp"
+#include "ActorUnkTLKT.hpp"
 #include "global.h"
-#include "types.h"
 
-class ActorUnkCLLT_C4 : public Actor_C4 {
-public:
-    ActorUnkCLLT_C4(Actor *param1);
-
-    /* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override;
-    /* 04 */ virtual bool vfunc_04() override;
-    /* 08 */ virtual void vfunc_08() override;
-    /* 0C */ virtual void vfunc_0C(unk32 param1) override;
+enum ActorUnkCLLTState_ {
+    ActorUnkCLLTState_0 = 0,
+    ActorUnkCLLTState_1 = 1,
+    ActorUnkCLLTState_2 = 2,
+    ActorUnkCLLTState_3 = 3,
+    ActorUnkCLLTState_4 = 4,
+    ActorUnkCLLTState_5 = 5,
+    ActorUnkCLLTState_Max,
 };
 
-class ActorUnkCLLT : public Actor {
+class ActorUnkCLLT : public ActorUnkTLKTnCLLT_Base {
 public:
     /* 00 (base) */
-    /* 94 */
+    /* 9C */ UnkSystem1_ov000_Derived2 mUnk_9C;
+    /* D0 */
 
     ActorUnkCLLT();
 
-    /* 4C */ virtual ~ActorUnkCLLT() override;
-
-    void func_ov031_020fb38c(void);
-    void func_ov031_020fb3c8(void);
-    void func_ov031_020fb40c(void);
+    /* 58 */ virtual void vfunc_58() override;
+    /* 5C */ virtual void vfunc_5C() override;
+    /* 60 */ virtual void vfunc_60(ActorState state) override;
 };
 
 class ActorProfileUnkCLLT : public ActorProfile {
@@ -36,7 +33,6 @@ public:
     /* 00 (base) */
 
     ActorProfileUnkCLLT();
-    ~ActorProfileUnkCLLT();
 
     /* 0C */ virtual Actor *Create();
 

include/Actor/ActorUnkMLCK.hpp

@@ -2,6 +2,7 @@
 
 #include "Actor/Actor.hpp"
 #include "Actor/ActorProfile.hpp"
+#include "ActorUnkTLKT.hpp"
 #include "FileSelect/FileSelectUnkDraw.hpp"
 #include "global.h"
 #include "types.h"
@@ -20,18 +21,17 @@ public:
     /* 24 */ virtual void vfunc_24() override;                           // func_ov031_020fb2bc
 };
 
-class ActorUnkMLCK_D8 {
+class ActorUnkMLCK_D8 : public ActorUnkTLKT_9C_Base {
 public:
     /* 00 (vtable) */
-    /* 04 */ bool mUnk_04;
-    /* 05 */ bool mUnk_05;
     /* 08 */ ActorUnkMLCK *mUnk_08;
     /* 0C */
 
-    ActorUnkMLCK_D8(ActorUnkMLCK *actor) :
-        mUnk_04(true),
-        mUnk_05(true),
-        mUnk_08(actor) {}
+    ActorUnkMLCK_D8(ActorUnkMLCK *actor) {
+        this->mUnk_04b = true;
+        this->mUnk_05  = true;
+        this->mUnk_08  = actor;
+    }
 
     /* 00 */ virtual void vfunc2_00() override; // func_ov031_020fb1b0
     /* 04 */ virtual void vfunc2_04() override; // func_ov031_020fb1cc
@@ -79,6 +79,8 @@ public:
     /* 70 */ virtual void vfunc_70() override;
 };
 
+// multiple inheritance ?
+// ActorUnkMLCK_D8 ?
 class ActorUnkMLCK : public Actor_ov102_02184950 {
 public:
     /* 00 (base) */

include/Actor/ActorUnkTLKT.hpp

@@ -12,57 +12,63 @@ enum ActorUnkTLKTState_ {
     ActorUnkTLKTState_2 = 2,
     ActorUnkTLKTState_3 = 3,
     ActorUnkTLKTState_4 = 4,
-    ActorUnkTLKTState_MAX
+    ActorUnkTLKTState_5 = 5,
+    ActorUnkTLKTState_Max
 };
 
-class ActorUnkTLKT_Base : public Actor {
+class ActorUnkTLKTnCLLT_Base : public Actor {
 public:
     /* 00 (base) */
-    /* 94 */
+    /* 94 */ STRUCT_PAD(0x94, 0x9C);
+    /* 9C */
 
-    ActorUnkTLKT_Base(); // func_ov031_020e3da0
+    ActorUnkTLKTnCLLT_Base();
 
-    /* 18 */ virtual bool vfunc_18(unk32 param1) override; // func_ov031_020e3e18
-    /* 1C */ virtual void vfunc_1C() override;             // func_ov031_020e3e44
-    /* 20 */ virtual void vfunc_20() override;             // func_ov031_020e3e84
-    /* 24 */ virtual void vfunc_24() override;             // func_ov031_020e3ed8
-    // /* 4C */ virtual ~ActorUnkTLKT_Base() override; // func_ov031_020e40a8 & func_ov031_020e40bc
-    /* 54 */ virtual void vfunc_54();                 // func_ov031_020e3f50
-    /* 58 */ virtual void vfunc_58();                 // func_ov031_020e4074
-    /* 5C */ virtual void vfunc_5C();                 // func_ov031_020e4078
-    /* 60 */ virtual void vfunc_60(ActorState state); // func_ov031_020e407c
+    /* 18 */ virtual bool vfunc_18(unk32 param1) override;
+    /* 1C */ virtual void vfunc_1C() override;
+    /* 20 */ virtual void vfunc_20() override;
+    /* 24 */ virtual void vfunc_24() override;
+    /* 54 */ virtual void vfunc_54();
+    /* 58 */ virtual void vfunc_58();
+    /* 5C */ virtual void vfunc_5C();
+    /* 60 */ virtual void vfunc_60(ActorState state);
 
+    Actor *func_ov031_020e3df8();
     void func_ov031_020e3e6c();
 };
 
-class ActorUnkTLKT_9C : public MapObject_UnkStruct1 {
+class ActorUnkTLKT_9C_Base : public MapObject_UnkStruct1 {
 public:
     /* 00 (base) */
     /* 08 */
 
-    ActorUnkTLKT_9C() {
-        this->mUnk_04 = 0xFFFFFFFF;
-    }
+    /* 00 */ virtual void vfunc2_0C() override;
+};
+
+class ActorUnkTLKT_9C : public ActorUnkTLKT_9C_Base {
+public:
+    /* 00 (base) */
+    /* 08 */
 
     // data_ov031_02112eec
     /* 00 */ virtual void vfunc2_00() override;
+    /* 00 */ virtual void vfunc2_08() override;
 };
 
-class ActorUnkTLKT : public ActorUnkTLKT_Base {
+class ActorUnkTLKT : public ActorUnkTLKTnCLLT_Base, public ActorUnkTLKT_9C {
 public:
-    /* 00 (base) */
-    /* 94 */ STRUCT_PAD(0x94, 0x9C);
-    /* 9C */ ActorUnkTLKT_9C mUnk_9C;
+    /* 00 (base ActorUnkTLKTnCLLT_Base) */
+    /* 9C (base ActorUnkTLKT_9C) */
     /* A4 */
 
     ActorUnkTLKT();
 
-    /* 24 */ virtual void vfunc_24() override; // func_ov031_020e41ec
+    /* 24 */ virtual void vfunc_24() override;
     /* 4C */ virtual ~ActorUnkTLKT() override;
-    /* 58 */ virtual void vfunc_58() override;                 // func_ov031_020e4238
-    /* 60 */ virtual void vfunc_60(ActorState state) override; // func_ov031_020e4320
-    /* 64 */ virtual void vfunc_64();                          // func_ov031_020e42ac
-    /* 68 */ virtual void vfunc_68();                          // func_ov031_020e42f0
+    /* 58 */ virtual void vfunc_58() override;
+    /* 60 */ virtual void vfunc_60(ActorState state) override;
+    /* 64 */ virtual void vfunc_64();
+    /* 68 */ virtual void vfunc_68();
 
     void func_ov031_020e4274();
     void func_ov031_020e4514();

include/Actor/Actor_Derived1.hpp

@@ -9,8 +9,8 @@
 class ActorUnk_vfunc_B0 {
 public:
     /* 00 */ unk32 mUnk_00;
-    /* 04 */ unk32 mUnk_04;
-    /* 08 */ unk32 mUnk_08;
+    /* 04 */ MapObject_UnkStruct1 *mUnk_04;
+    /* 08 */ u16 mUnk_08;
     /* 0C */ unk32 mUnk_0C;
     /* 10 */ unk32 mUnk_10;
     /* 14 */ unk16 mUnk_14;
@@ -23,7 +23,7 @@ public:
     /* 23 */ unk8 mUnk_23;
     /* 24 */ Actor *mpActor;
     /* 28 */ unk32 mUnk_28;
-    /* 2C */ unk32 mUnk_2C;
+    /* 2C */ Actor *mUnk_2C;
     /* 30 */ unk16 mUnk_30;
     /* 32 */ unk16 mUnk_32;
     /* 34 */ VecFx32 mUnk_34;