Minor work on octhashi/sekizoa I had lying around (#2314)

* Minor octhashi changes

* Minor work on sekizoa

2 files changed, 27 insertions, 16 deletions

diff --git a/include/d/actor/d_a_obj_octhashi.h b/include/d/actor/d_a_obj_octhashi.h
index 3be94388cd..b6e1018a82 100644
--- a/include/d/actor/d_a_obj_octhashi.h
+++ b/include/d/actor/d_a_obj_octhashi.h
@@ -1,8 +1,10 @@
 #ifndef D_A_OBJ_OCTHASHI_H
 #define D_A_OBJ_OCTHASHI_H
 
+#include "SSystem/SComponent/c_phase.h"
 #include "d/d_bg_s_movebg_actor.h"
-#include "d/d_com_inf_game.h"
+#include "d/d_cc_d.h"
+#include "d/d_cc_uty.h"
 
 /**
  * @ingroup actors-objects
@@ -52,14 +54,15 @@ public:
     /* 0x6e8 */ s16 field_0x6e8;
     /* 0x6ec */ Z2Creature mSound;
 private:
-    /* 0x77c */ u8 field_0x77c[4];
-    /* 0x780 */ J3DModel* mpModel[8];
-    /* 0x7a0 */ u8 field_0x7a0[0x7a4 - 0x7a0];
-    /* 0x7a4 */ request_of_phase_process_class mPhaseReq;
-    /* 0x7ac */ dCcD_Stts field_0x7ac[8];
-    /* 0x98c */ dCcD_Sph mColliders[8];
+    /* 0x077c */ u8 field_0x77c[4];
+    /* 0x0780 */ J3DModel* mpModel[8];
+    /* 0x07a0 */ u8 field_0x7a0[0x7a4 - 0x7a0];
+    /* 0x07a4 */ request_of_phase_process_class mPhaseReq;
+    /* 0x07ac */ dCcD_Stts field_0x7ac[8];
+    /* 0x098c */ dCcD_Sph mColliders[8];
     /* 0x134c */ dCcD_Cyl mCyl;
-    /* 0x1488 */ u8 field_0x1488[0x14b0 - 0x1488];
+    /* 0x1488 */ dCcU_AtInfo field_0x1488;
+    /* 0x148C */ int field_0x148c;
 };
 
 STATIC_ASSERT(sizeof(daObjOCTHASHI_c) == 0x14b0);
diff --git a/include/d/actor/d_a_obj_sekizoa.h b/include/d/actor/d_a_obj_sekizoa.h
index 1ccd6e5386..3b80baf0f2 100644
--- a/include/d/actor/d_a_obj_sekizoa.h
+++ b/include/d/actor/d_a_obj_sekizoa.h
@@ -13,6 +13,8 @@
  */
 class daObj_Sekizoa_c : public daNpcT_c {
 public:
+    typedef void (daObj_Sekizoa_c::*cutFunc)(int);
+
     /* 80CCE34C */ ~daObj_Sekizoa_c();
     /* 80CCE570 */ void create();
     /* 80CCE8B0 */ void CreateHeap();
@@ -48,14 +50,14 @@ public:
     /* 80CD3F08 */ void wait(void*);
     /* 80CD425C */ void puzzle(void*);
     /* 80CD45B0 */ void talk(void*);
-    /* 80CD5A40 */ daObj_Sekizoa_c(daNpcT_faceMotionAnmData_c const*, daNpcT_motionAnmData_c const*,
-                                   daNpcT_MotionSeqMngr_c::sequenceStepData_c const*, int,
-                                   daNpcT_MotionSeqMngr_c::sequenceStepData_c const*, int,
-                                   daNpcT_evtData_c const*, char**);
+    /* 80CD5A40 */ daObj_Sekizoa_c(daNpcT_faceMotionAnmData_c const* param_1, daNpcT_motionAnmData_c const* param_2,
+             daNpcT_MotionSeqMngr_c::sequenceStepData_c const* param_3, int param_4,
+             daNpcT_MotionSeqMngr_c::sequenceStepData_c const* param_5, int param_6, daNpcT_evtData_c const* param_7,
+             char** param_8) : daNpcT_c(param_1,param_2,param_3,param_4,param_5,param_6,param_7,param_8){}
     /* 80CD5B84 */ void chkGoal();
 
-    /* 80CD5B7C */ s32 getBackboneJointNo();
-    /* 80CD5B74 */ s32 getHeadJointNo();
+    /* 80CD5B7C */ s32 getBackboneJointNo() { return 1; }
+    /* 80CD5B74 */ s32 getHeadJointNo() { return 3; }
     /* 80CCF358 */ void afterJntAnm(int);
     /* 80CCF3E4 */ void setParam();
     /* 80CCF6BC */ BOOL checkChangeEvt();
@@ -124,8 +126,8 @@ public:
         return type;
     }
 
-    static void* mCutNameList[9];
-    static u8 mCutList[108];
+    static char* mCutNameList[9];
+    static cutFunc mCutList[9];
 
     /* 0x0E40 */ u8 field_0xe40[0x10C8 - 0xE40];
     /* 0x10C8 */ u8 field_0x10c8;
@@ -136,4 +138,10 @@ public:
     /* 0x1174 */ u8 field_0x1174[0x1180 - 0x1174];
 };
 
+struct daObj_Sekizoa_Param_c {
+    /* 80CD5C30 */ virtual ~daObj_Sekizoa_Param_c() {}
+
+    static u8 const m[156];
+};
+
 #endif /* D_A_OBJ_SEKIZOA_H */