d_a_e_ym, d_a_e_oc, and d_a_npc_hanjo equivalent, d_a_npc_ashB work (#2368)

* d_a_e_ym, d_a_e_oc, and d_a_npc_hanjo equivalent, d_a_npc_ashB work

* Updates to PR based on feedback, plus fix debug build

Author: YunataSavior

configure.py

@@ -1652,7 +1652,7 @@ def MatchingFor(*versions):
     ActorRel(NonMatching, "d_a_e_mm_mt"),
     ActorRel(NonMatching, "d_a_e_ms"),
     ActorRel(NonMatching, "d_a_e_nz"),
-    ActorRel(NonMatching, "d_a_e_oc"),
+    ActorRel(Equivalent, "d_a_e_oc"),
     ActorRel(MatchingFor("GZ2E01"), "d_a_e_oct_bg"),
     ActorRel(Equivalent, "d_a_e_ot"), # weak func order
     ActorRel(MatchingFor("GZ2E01"), "d_a_e_ph"),
@@ -1689,7 +1689,7 @@ def MatchingFor(*versions):
     ActorRel(NonMatching, "d_a_e_yg"),
     ActorRel(NonMatching, "d_a_e_yh"),
     ActorRel(Equivalent, "d_a_e_yk"), # weak func order
-    ActorRel(NonMatching, "d_a_e_ym"),
+    ActorRel(Equivalent, "d_a_e_ym"),
     ActorRel(MatchingFor("GZ2E01"), "d_a_e_ym_tag"),
     ActorRel(NonMatching, "d_a_e_ymb"),
     ActorRel(NonMatching, "d_a_e_yr"),
@@ -1752,7 +1752,7 @@ def MatchingFor(*versions):
     ActorRel(NonMatching, "d_a_npc_grz"),
     ActorRel(NonMatching, "d_a_npc_guard"),
     ActorRel(NonMatching, "d_a_npc_gwolf"),
-    ActorRel(NonMatching, "d_a_npc_hanjo"),
+    ActorRel(Equivalent, "d_a_npc_hanjo"),
     ActorRel(MatchingFor("GZ2E01"), "d_a_npc_henna0"),
     ActorRel(NonMatching, "d_a_npc_hoz"),
     ActorRel(NonMatching, "d_a_npc_impal"),

include/d/actor/d_a_npc.h

@@ -1033,6 +1033,7 @@ class daNpcF_c : public fopAc_ac_c {
         /* 5 */ LOOK_ATTN,
     };
 
+    daNpcF_c() { initialize(); }
     /* 80152014 */ BOOL execute();
     /* 801522AC */ int draw(BOOL, BOOL, f32, _GXColorS10*, BOOL);
     /* 80152614 */ static void tgHitCallBack(fopAc_ac_c*, dCcD_GObjInf*, fopAc_ac_c*,
@@ -1091,7 +1092,7 @@ class daNpcF_c : public fopAc_ac_c {
     /* 80155BC8 */ virtual void setParam();
     /* 80155BC0 */ virtual BOOL main();
     /* 80155BD8 */ virtual BOOL ctrlBtk();
-    /* 80155BBC */ virtual void adjustShapeAngle();
+    /* 80155BBC */ virtual void adjustShapeAngle() {}
     /* 8015276C */ virtual void setMtx();
     /* 801527FC */ virtual void setMtx2();
     /* 80155BB8 */ virtual void setAttnPos();

include/d/actor/d_a_npc_ashB.h

@@ -137,7 +137,7 @@ STATIC_ASSERT(sizeof(daNpcAshB_c) == 0xdf0);
 
 class daNpcAshB_Param_c {
 public:
-    /* 80962078 */ virtual ~daNpcAshB_Param_c();
+    /* 80962078 */ virtual ~daNpcAshB_Param_c() {}
 
     struct param {
         /* 0x00 */ f32 mAttnOffsetY;

include/d/actor/d_a_npc_hanjo.h

@@ -179,7 +179,7 @@ class daNpc_Hanjo_c : public daNpcT_c {
     static dCcD_SrcGObjInf const mStoneCcDObjInfo;
     static char* mCutNameList[6];
     static cutFunc mCutList[6];
-    static u8 mStoneCcDSph[64];
+    static dCcD_SrcSph mStoneCcDSph;
 private:
     /* 0x0E40 */ int field_0x0E40;
     /* 0x0E44 */ J3DModel* mModel1;

src/d/actor/d_a_e_oc.cpp

@@ -2508,32 +2508,30 @@ static int useHeapInit(fopAc_ac_c* i_this) {
 
 /* 80734DA8-807352AC 0088C8 0504+00 1/1 0/0 0/0 .text            create__8daE_OC_cFv */
 cPhs__Step daE_OC_c::create() {
-    // NONMATCHING. regalloc issue
-    f32 mult_val = 100.0f;
-    fopAc_ac_c* a_this = this;
     fopAcM_SetupActor(this, daE_OC_c);
     field_0x6b4 = fopAcM_GetParam(this) & 0xff;
     if (field_0x6b4 == 0xff) {
         field_0x6b4 = 0;
     }
-    u8 range_sel = (fopAcM_GetParam(this) >> 8 & 0xff);
-    if (range_sel == 0x1) {
+
+    u8 u_var = ((fopAcM_GetParam(this) & 0xff00) >> 8);
+    if (u_var == 0x1) {
         mPlayerRange = l_HIO.field_0x0c;
     } else {
         mPlayerRange = l_HIO.field_0x08;
     }
-    field_0x6e0 = fopAcM_GetParam(this) >> 0x10;
+    field_0x6e0 = (fopAcM_GetParam(this) & 0xff0000) >> 0x10;
     if (field_0x6e0 != 0xff) {
         if (dComIfGs_isSwitch(field_0x6e0, fopAcM_GetRoomNo(this))) {
             return cPhs_ERROR_e;
         }
     }
-    field_0x6e1 = fopAcM_GetParam(this) >> 0x18;
-    u8 u_var = current.angle.x;
+    field_0x6e1 = (fopAcM_GetParam(this) & 0xff000000) >> 0x18;
+    u_var = current.angle.x & 0xff;
     if (u_var == 0xff) {
         u_var = 0;
     }
-    mMoveRange = mult_val * u_var;
+    mMoveRange = 100.0f * u_var;
     u_var = current.angle.x >> 8 & 0xff;
     if (u_var == 0xff || u_var == 0) {
         mName = "E_OC";
@@ -2557,7 +2555,8 @@ cPhs__Step daE_OC_c::create() {
             fopAcM_SetMtx(this, mpMorf->getModel()->getBaseTRMtx());
             fopAcM_SetMin(this, -200.0f, -200.0f, -200.0f);
             fopAcM_SetMax(this, 200.0f, 200.0f, 200.0f);
-            mAcch.Set(&current.pos, &old.pos, a_this, 1, &mAcchCir, &speed, NULL, NULL);
+            mAcch.Set(fopAcM_GetPosition_p(this), fopAcM_GetOldPosition_p(this), this, 1, &mAcchCir,
+                      fopAcM_GetSpeed_p(this), NULL, NULL);
             if (0 == strcmp("D_MN05", dComIfGp_getStartStageName())
                 && dComIfGp_getStartStageRoomNo() == 0xc) {
                 mAcchCir.SetWallH(95.0f);
@@ -2566,12 +2565,11 @@ cPhs__Step daE_OC_c::create() {
             }
             mAcchCir.SetWallR(100.0f);
             if (mName == "E_OC") {
-                health = 40;
-                field_0x560 = 40;
+                field_0x560 = health = 40;
             } else {
-                health = 220;
-                field_0x560 = 220;
+                field_0x560 = health = 220;
             }
+
             mStts.Init(100.0f, 0, this);
             mSphs_cc[0].Set(E_OC_n::cc_sph_src);
             mSphs_cc[0].SetStts(&mStts);
@@ -2593,8 +2591,7 @@ cPhs__Step daE_OC_c::create() {
             mSound.setEnemyName("E_oc");
             mpSound = &mSound;
             field_0xe5a = 1;
-            shape_angle.x = 0;
-            current.angle.x = 0;
+            current.angle.x = shape_angle.x = 0;
             gravity = -5.0f;
             switch (field_0x6b4) {
                 case 2:

src/d/actor/d_a_e_ym.cpp

@@ -3227,7 +3227,6 @@ static int useHeapInit(fopAc_ac_c* i_this) {
 
 /* 80813EA4-808143A0 00BE64 04FC+00 2/2 0/0 0/0 .text            checkBeforeBg__8daE_YM_cFs */
 u8 daE_YM_c::checkBeforeBg(s16 i_rot_val) {
-    // NONMATCHING - regalloc
     dBgS_LinChk lin_chk;
     cXyz my_vec_0;
     cXyz my_vec_1;
@@ -3275,16 +3274,15 @@ u8 daE_YM_c::checkBeforeBg(s16 i_rot_val) {
         mDoMtx_stack_c::multVec(&my_vec_0, &my_vec_1);
         my_vec_3 = current.pos + my_vec_1;
         cXyz inside_vec(0.0f, 0.0f, 80.0f);
-        cLib_offsetPos(&my_vec_2, &my_vec_3, field_0x668.z, &inside_vec);
+        cLib_offsetPos(&my_vec_2, &my_vec_3, (s16)field_0x668.z, &inside_vec);
         lin_chk.Set(&my_vec_3, &my_vec_2, NULL);
         if (dComIfG_Bgsp().LineCross(&lin_chk) == 0) {
             return 1;
         }
         cM3dGPla plane;
         dComIfG_Bgsp().GetTriPla(lin_chk, &plane);
         cXyz* p_vec = plane.GetNP();
-        f32 absxz_val = p_vec->absXZ();
-        s16 tan_val = cM_atan2s(absxz_val, p_vec->y) + -0x8000;
+        s16 tan_val = cM_atan2s(p_vec->absXZ(), p_vec->y) + -0x8000;
         if (abs(tan_val + 0x4000) <= 0x1555) {
             if (field_0x668.z != (s16)(cM_atan2s(p_vec->x, p_vec->z) + 0x8000)) {
                 return 1;
@@ -3395,25 +3393,24 @@ void daE_YM_c::setHideType() {
 
 /* 80814BA4-80815224 00CB64 0680+00 2/1 0/0 0/0 .text            create__8daE_YM_cFv */
 int daE_YM_c::create() {
-    // NONMATCHING - regalloc
     fopAcM_SetupActor(this, daE_YM_c);
 
     mType = fopAcM_GetParam(this);
     if (mType == 0xFF) {
         mType = 0;
     }
 
-    mSwitchBit = fopAcM_GetParam(this) >> 0x18;
+    mSwitchBit = (fopAcM_GetParam(this) & 0xff000000) >> 24;
 
-    u8 prm2 = fopAcM_GetParam(this) >> 0x10;
+    u8 prm2 = (fopAcM_GetParam(this) & 0xff0000) >> 16;
     if (prm2 == 0xFF) {
         prm2 = 0;
     }
 
     field_0x6e0 = prm2 * 100.0f;
 
-    u8 prm1 = fopAcM_GetParam(this) >> 0x8;
-    u8 tmp0 = (current.angle.z >> 8) & 0xff;
+    u8 prm1 = (fopAcM_GetParam(this) & 0xff00) >> 8;
+    u8 tmp0 = (current.angle.z & 0xff00) >> 8;
     mTagNo = current.angle.z;
     field_0x6a1 = 1;
     if ((current.angle.x & 3) != 0) {
@@ -3424,7 +3421,7 @@ int daE_YM_c::create() {
         field_0x6cb = 1;
     }
 
-    field_0x6a3 = (current.angle.x >> 8) & 0xff;
+    field_0x6a3 = (current.angle.x & 0xff00) >> 8;
 
     if (mSwitchBit != 0xFF && dComIfGs_isSwitch(mSwitchBit, fopAcM_GetRoomNo(this))) {
 #ifdef DEBUG
@@ -3448,10 +3445,9 @@ int daE_YM_c::create() {
     }
 
     if (phase == cPhs_COMPLEATE_e) {
-        current.angle.z = 0;
-        current.angle.x = 0;
-        shape_angle.z = 0;
-        shape_angle.x = 0;
+        OS_REPORT("E_YM PARAM %x %x %x \n", fopAcM_GetParam(this), current.angle.z, current.angle.x);
+        current.angle.x = current.angle.z = 0;
+        shape_angle.x = shape_angle.z = 0;
 
         if (!fopAcM_entrySolidHeap(this, useHeapInit, 0x28B0)) {
             return cPhs_ERROR_e;
@@ -3469,12 +3465,11 @@ int daE_YM_c::create() {
         fopAcM_SetMin(this, -200.0f, -100.0f, -200.0f);
         fopAcM_SetMax(this, 200.0f, 100.0f, 200.0f);
 
-        mAcch.Set(&current.pos, &old.pos, this, 1, &mAcchCir, &speed, NULL, NULL);
+        mAcch.Set(fopAcM_GetPosition_p(this), fopAcM_GetOldPosition_p(this), this, 1, &mAcchCir,
+                  fopAcM_GetSpeed_p(this), NULL, NULL);
         mAcch.OnLineCheck();
         mAcchCir.SetWall(30.0f, 60.0f);
-
-        health = 10;
-        field_0x560 = 10;
+        field_0x560 = health = 10;
 
         mStts.Init(100, 0, this);
         mSphCc.Set(E_YM_n::cc_sph_src);

src/d/actor/d_a_npc.cpp

@@ -5188,11 +5188,6 @@ void daNpcF_c::setAttnPos() {
     /* empty function */
 }
 
-/* 80155BBC-80155BC0 1504FC 0004+00 2/0 0/0 0/0 .text            adjustShapeAngle__8daNpcF_cFv */
-void daNpcF_c::adjustShapeAngle() {
-    /* empty function */
-}
-
 /* 80155BC0-80155BC8 150500 0008+00 2/0 0/0 0/0 .text            main__8daNpcF_cFv */
 BOOL daNpcF_c::main() {
     return true;