d_a_e_hp almost matching (#2585)

8 files changed, 101 insertions, 22 deletions

diff --git a/include/SSystem/SComponent/c_bg_s_lin_chk.h b/include/SSystem/SComponent/c_bg_s_lin_chk.h
index b7d116f2e2..1c0b26c4a5 100644
--- a/include/SSystem/SComponent/c_bg_s_lin_chk.h
+++ b/include/SSystem/SComponent/c_bg_s_lin_chk.h
@@ -39,9 +39,9 @@ public:
     cXyz* GetCrossP() { return &mLin.GetEndP(); }
     cM3dGLin* GetLinP() { return &mLin; }
     bool ChkBackFlag() const { return mBackFlag; }
-    void onBackFlag() { mBackFlag = true; }
+    void OnBackFlag() { mBackFlag = true; }
     bool ChkFrontFlag() const { return mFrontFlag; }
-    void onFrontFlag() { mFrontFlag = true; }
+    void OnFrontFlag() { mFrontFlag = true; }
     bool GetPreWallChk() const { return mPreWallChk; }
     bool GetPreGroundChk() const { return mPreGroundChk; }
     bool GetPreRoofChk() const { return mPreRoofChk; }
diff --git a/include/d/actor/d_a_e_hb.h b/include/d/actor/d_a_e_hb.h
index a826621cbf..bf355b11f3 100644
--- a/include/d/actor/d_a_e_hb.h
+++ b/include/d/actor/d_a_e_hb.h
@@ -77,8 +77,12 @@ public:
 
 STATIC_ASSERT(sizeof(e_hb_class) == 0x1268);
 
-class daE_HB_HIO_c {
+class daE_HB_HIO_c : public JORReflexible {
 public:
+#if DEBUG
+    virtual void genMessage(JORMContext*);
+#endif
+
     /* 804FBD6C */ daE_HB_HIO_c();
     /* 805005D0 */ virtual ~daE_HB_HIO_c() {}
 
diff --git a/include/d/actor/d_a_e_hp.h b/include/d/actor/d_a_e_hp.h
index cbce6d8794..ad001cf6d7 100644
--- a/include/d/actor/d_a_e_hp.h
+++ b/include/d/actor/d_a_e_hp.h
@@ -1,6 +1,9 @@
 #ifndef D_A_E_HP_H
 #define D_A_E_HP_H
 
+#include "d/d_bg_s_acch.h"
+#include "d/d_cc_d.h"
+#include "d/d_cc_uty.h"
 #include "f_op/f_op_actor_mng.h"
 
 /**
@@ -12,14 +15,15 @@
  * 
  */
 class daE_HP_c : public fopEn_enemy_c {
-    /* 806E5E30 */ void ctrlJoint(J3DJoint*, J3DModel*);
-    /* 806E5ED0 */ void JointCallBack(J3DJoint*, int);
-    /* 806E5F1C */ void LampCtrlJoint(J3DJoint*, J3DModel*);
-    /* 806E5FCC */ void LampJointCallBack(J3DJoint*, int);
-    /* 806E6018 */ void draw();
+public:
+    /* 806E5E30 */ int ctrlJoint(J3DJoint*, J3DModel*);
+    /* 806E5ED0 */ static int JointCallBack(J3DJoint*, int);
+    /* 806E5F1C */ int LampCtrlJoint(J3DJoint*, J3DModel*);
+    /* 806E5FCC */ static int LampJointCallBack(J3DJoint*, int);
+    /* 806E6018 */ int draw();
     /* 806E6514 */ void setBck(int, u8, f32, f32);
     /* 806E65C0 */ void setActionMode(int, int);
-    /* 806E65CC */ void mChkDistance(f32);
+    /* 806E65CC */ bool mChkDistance(f32);
     /* 806E673C */ void damage_check();
     /* 806E6948 */ void executeWait();
     /* 806E6C74 */ void executeMove();
@@ -31,20 +35,86 @@ class daE_HP_c : public fopEn_enemy_c {
     /* 806E814C */ void action();
     /* 806E89C0 */ void mtx_set();
     /* 806E8DE0 */ void cc_set();
-    /* 806E8FEC */ void execute();
-    /* 806E9198 */ void _delete();
-    /* 806E9240 */ void CreateHeap();
-    /* 806E951C */ void create();
+    /* 806E8FEC */ int execute();
+    /* 806E9198 */ int _delete();
+    /* 806E9240 */ int CreateHeap();
+    /* 806E951C */ int create();
     /* 806E9900 */ daE_HP_c();
-private:
-    /* 0x5ac */ u8 field_0x5ac[0xdfc - 0x5ac];
+
+    /* 0x5AC */ request_of_phase_process_class mPhaseReq;
+    /* 0x5B4 */ mDoExt_McaMorfSO* mpMorfSO;
+    /* 0x5B8 */ mDoExt_invisibleModel mInvModel;
+    /* 0x5C0 */ J3DModel* mpModel;
+    /* 0x5C4 */ mDoExt_McaMorf* mpMorf;
+    /* 0x5C8 */ Z2CreatureEnemy mSound1;
+    /* 0x66C */ Z2CreatureEnemy mSound2;
+    /* 0x710 */ s32 mAction;
+    /* 0x714 */ s32 movemode;
+    /* 0x718 */ u32 field_0x718;
+    /* 0x71C */ u8 field_0x71c;
+    /* 0x71D */ u8 field_0x71d;
+    /* 0x71E */ u8 field_0x71e;
+    /* 0x71F */ u8 field_0x71f;
+    /* 0x720 */ cXyz field_0x720;
+    /* 0x72C */ cXyz field_0x72c;
+    /* 0x738 */ cXyz field_0x738;
+    /* 0x744 */ cXyz field_0x744;
+    /* 0x750 */ cXyz field_0x750;
+    /* 0x75C */ cXyz field_0x75c;
+    /* 0x768 */ f32 field_0x768;
+    /* 0x76C */ csXyz field_0x76c;
+    /* 0x772 */ csXyz field_0x772;
+    /* 0x778 */ s16 field_0x778;
+    /* 0x77A */ u8 arg0;
+    /* 0x77B */ u8 bitSw;
+    /* 0x77C */ u8 field_0x77c;
+    /* 0x780 */ s32 field_0x780;
+    /* 0x784 */ u32 field_0x784;
+    /* 0x788 */ u8 field_0x788;
+    /* 0x789 */ u8 field_0x789;
+    /* 0x78A */ u8 field_0x78a;
+    /* 0x78B */ u8 field_0x78b;
+    /* 0x78C */ u8 mNight;
+    /* 0x78D */ u8 field_0x78d;
+    /* 0x790 */ f32 field_0x790;
+    /* 0x794 */ f32 field_0x794;
+    /* 0x798 */ f32 field_0x798;
+    /* 0x79C */ f32 mDisHani;
+    /* 0x7A0 */ f32 field_0x7a0;
+    /* 0x7A4 */ f32 field_0x7a4;
+    /* 0x7A8 */ s16 field_0x7a8;
+    /* 0x7AA */ s16 field_0x7aa;
+    /* 0x7AC */ dBgS_AcchCir mAcchCir;
+    /* 0x7EC */ dBgS_ObjAcch mObjAcch;
+    /* 0x9C4 */ dCcD_Stts mStts;
+    /* 0xA00 */ dCcD_Cyl mCyl1;
+    /* 0xB3C */ dCcD_Cyl mCyl2;
+    /* 0xC78 */ dCcD_Sph mSph;
+    /* 0xDB0 */ dCcU_AtInfo mAtInfo;
+    /* 0xDD4 */ s32 field_0xdd4[2];
+    /* 0xDDC */ u32 field_0xddc;
+    /* 0xDE0 */ cXyz field_0xde0;
+    /* 0xDEC */ u8 field_0xdec[0xdf9 - 0xdec];
+    /* 0xDF9 */ u8 field_0xdf9;
 };
 
 STATIC_ASSERT(sizeof(daE_HP_c) == 0xdfc);
 
-class daE_HP_HIO_c {
+class daE_HP_HIO_c : public JORReflexible {
+public:
     /* 806E5DEC */ daE_HP_HIO_c();
-    /* 806E9D38 */ ~daE_HP_HIO_c();
+    /* 806E9D38 */ virtual ~daE_HP_HIO_c() {}
+
+#if DEBUG
+    void genMessage(JORMContext*);
+#endif
+
+    s8 mChild;
+    f32 modelSize;
+    s16 waitTimeAfterAttack;
+    s16 resurrectionTime;
+    s16 attackDelayOnApproach;
+    u8 rangeDisplay;
 };
 
 
diff --git a/include/d/actor/d_a_npc_ykm.h b/include/d/actor/d_a_npc_ykm.h
index 592425dd2d..c839b791ac 100644
--- a/include/d/actor/d_a_npc_ykm.h
+++ b/include/d/actor/d_a_npc_ykm.h
@@ -44,8 +44,6 @@ public:
 
     /* 80B5D6C8 */ virtual ~daNpc_ykM_Param_c() {}
 
-    void genMessage(JORMContext*);
-
     static daNpc_ykM_HIOParam const m;
 };
 
diff --git a/include/d/d_com_inf_game.h b/include/d/d_com_inf_game.h
index 1fdae3c74f..5e204866ad 100644
--- a/include/d/d_com_inf_game.h
+++ b/include/d/d_com_inf_game.h
@@ -3558,7 +3558,7 @@ inline int dComIfGp_evmng_startDemo(int param_0) {
     return dComIfGp_getPEvtManager()->setStartDemo(param_0);
 }
 
-inline void dComIfGp_event_setTalkPartner(fopAc_ac_c* i_actor) {
+inline void dComIfGp_event_setTalkPartner(void* i_actor) {
     g_dComIfG_gameInfo.play.getEvent().setPtT(i_actor);
 }
 
diff --git a/include/d/d_event.h b/include/d/d_event.h
index cc0bf739f4..fa759c5540 100644
--- a/include/d/d_event.h
+++ b/include/d/d_event.h
@@ -105,7 +105,13 @@ public:
     void setGtItm(u8 itemNo);
 
     u16 chkFlag2(u16 flag) { return flag & mFlag2; }
-    BOOL runCheck() { return mEventStatus != 0; }
+    BOOL runCheck() {
+#if DEBUG
+        return mEventStatus != 0 || mDebugStb != 0;
+#else
+        return mEventStatus != 0;
+#endif
+    }
     f32 getCullRate() { return mCullRate; }
     u16 chkEventFlag(u16 flag) { return flag & mEventFlag; }
     void onEventFlag(u16 flag) { mEventFlag |= flag; }
diff --git a/include/f_op/f_op_actor_mng.h b/include/f_op/f_op_actor_mng.h
index 2b103073da..12c179e77d 100644
--- a/include/f_op/f_op_actor_mng.h
+++ b/include/f_op/f_op_actor_mng.h
@@ -511,7 +511,7 @@ fopAcM_prm_class* createAppend(u16 i_setId, u32 i_parameters, const cXyz* i_pos,
 
 void fopAcM_Log(fopAc_ac_c const* i_actor, char const* i_message);
 
-void fopAcM_delete(fopAc_ac_c* i_actor);
+s32 fopAcM_delete(fopAc_ac_c* i_actor);
 
 s32 fopAcM_delete(fpc_ProcID i_actorID);
 
diff --git a/include/m_Do/m_Do_ext.h b/include/m_Do/m_Do_ext.h
index 514134953e..a39164ac1f 100644
--- a/include/m_Do/m_Do_ext.h
+++ b/include/m_Do/m_Do_ext.h
@@ -255,6 +255,7 @@ private:
 
 class mDoExt_invisibleModel {
 public:
+    mDoExt_invisibleModel() {}
     /* 8000E53C */ int create(J3DModel* i_model, u8 param_1);
     /* 8000E6C8 */ void entryJoint(cXyz*);
     /* 8000E7C0 */ void entryDL(cXyz*);