d_a_obj_maki matching (#2370)

* Matching daObj_Maki_HIO_c::daObj_Maki_HIO_c()

Matched daObj_Maki_HIO_c::daObj_Maki_HIO_c() and started work on daObj_Maki_HIO_c::~daObj_Maki_HIO_c()

* more work on d_a_obj_maki

More structures defined, work on all methods, some equivalent, just missing registers

* d_a_obj_maki Matching

Final work on maki to get it to Match 100%.

* d_a_obj_maki matching

d_a_obj_maki matching | * cleanup for PR

Author: tetrisdev

configure.py

@@ -2005,7 +2005,7 @@ def MatchingFor(*versions):
     ActorRel(NonMatching, "d_a_obj_lv9SwShutter"),
     ActorRel(MatchingFor("GZ2E01"), "d_a_obj_magLift"),
     ActorRel(NonMatching, "d_a_obj_magLiftRot"),
-    ActorRel(NonMatching, "d_a_obj_maki"),
+    ActorRel(MatchingFor("GZ2E01"), "d_a_obj_maki"),
     ActorRel(NonMatching, "d_a_obj_master_sword"),
     ActorRel(NonMatching, "d_a_obj_mato"),
     ActorRel(NonMatching, "d_a_obj_mhole"),

include/d/actor/d_a_obj_maki.h

@@ -1,7 +1,12 @@
 #ifndef D_A_OBJ_MAKI_H
 #define D_A_OBJ_MAKI_H
 
-#include "f_op/f_op_actor_mng.h"
+#include "JSystem/J3DGraphAnimator/J3DModel.h"
+#include "SSystem/SComponent/c_phase.h"
+#include "d/d_cc_d.h"
+#include "d/d_kankyo.h"
+#include "d/d_particle.h"
+#include "f_op/f_op_actor.h"
 
 /**
  * @ingroup actors-objects
@@ -12,16 +17,31 @@
  *
  */
 class obj_maki_class : public fopAc_ac_c {
-private:
-    /* 0x568 */ u8 field_0x568[0x730 - 0x568];
+public:
+    /* 0x568 */ request_of_phase_process_class mPhase;
+    /* 0x570 */ J3DModel* mModel1;
+    /* 0x574 */ mDoExt_brkAnm* mBrk;
+    /* 0x578 */ J3DModel* mModel2;
+    /* 0x57c */ u8 field_0x57c;
+    /* 0x57d */ u8 field_0x57d; // Undefined
+    /* 0x57e */ s16 field_0x57e;
+    /* 0x580 */ s16 field_0x580[2];
+    /* 0x584*/  dCcD_Stts mStts;
+    /* 0x5c0 */ dCcD_Sph mSph;
+    /* 0x6f8 */ u32 field_0x6f8[4];
+    /* 0x6fc */ u8 field_0x6fc[0x70c - 0x708]; // Undefined
+    /* 0x70c */ LIGHT_INFLUENCE mLightObj;
+    /* 0x72c */ u8 field_0x72c;
+    /* 0x72d */ u8 field_0x72d[0x730 - 0x72d]; //Undefined
 };
 
 STATIC_ASSERT(sizeof(obj_maki_class) == 0x730);
-
 class daObj_Maki_HIO_c {
 public:
     /* 80C8FE0C */ daObj_Maki_HIO_c();
-    /* 80C9089C */ ~daObj_Maki_HIO_c();
+    /* 80C9089C */ virtual ~daObj_Maki_HIO_c() {};
+
+    /* 0x04 */ s8 field_0x4;
 };