d_a_npc_yamid equivalent (#2574)

* initial work

* more work

* d_a_npc_yamid equivalent

* configure.py updated

* comment indent fix

configure.py

@@ -1856,7 +1856,7 @@ config.libs = [
     ActorRel(NonMatching, "d_a_npc_uri"),
     ActorRel(MatchingFor("GZ2E01"), "d_a_npc_worm", extra_cflags=['-pragma "nosyminline off"']),
     ActorRel(NonMatching, "d_a_npc_wrestler", extra_cflags=[DANPCF_C_HACK]),
-    ActorRel(NonMatching, "d_a_npc_yamid"),
+    ActorRel(Equivalent, "d_a_npc_yamid"), # weak function order
     ActorRel(NonMatching, "d_a_npc_yamis"),
     ActorRel(NonMatching, "d_a_npc_yamit"),
     ActorRel(Equivalent, "d_a_npc_yelia"), # weak function order

include/d/actor/d_a_npc_yamid.h

@@ -10,68 +10,122 @@
  *
  * @details
  *
- */
-class daNpc_yamiD_c : public fopAc_ac_c {
+*/
+
+struct daNpc_yamiD_HIOParam {
+    /* 0x0 */ daNpcT_HIOParam common;
+};
+
+class daNpc_yamiD_Param_c {
 public:
+    /* 80B45FE0 */ virtual ~daNpc_yamiD_Param_c() {}
+
+    static daNpc_yamiD_HIOParam const m;
+};
+
+class daNpc_yamiD_c : public daNpcT_c {
+public:
+    typedef BOOL (daNpc_yamiD_c::*cutFunc)(int);
+    typedef int (daNpc_yamiD_c::*actionFunc)(void*);
+
     /* 80B42F4C */ ~daNpc_yamiD_c();
-    /* 80B43084 */ void create();
-    /* 80B43338 */ void CreateHeap();
-    /* 80B43788 */ void Delete();
-    /* 80B437BC */ void Execute();
-    /* 80B437DC */ void Draw();
-    /* 80B43884 */ void createHeapCallBack(fopAc_ac_c*);
-    /* 80B438A4 */ void ctrlJointCallBack(J3DJoint*, int);
-    /* 80B438FC */ void getType();
-    /* 80B43934 */ void getFlowNodeNo();
-    /* 80B43998 */ void isDelete();
+    /* 80B43084 */ cPhs__Step create();
+    /* 80B43338 */ int CreateHeap();
+    /* 80B43788 */ int Delete();
+    /* 80B437BC */ int Execute();
+    /* 80B437DC */ int Draw();
+    /* 80B43884 */ static int createHeapCallBack(fopAc_ac_c*);
+    /* 80B438A4 */ static int ctrlJointCallBack(J3DJoint*, int);
+    /* 80B438FC */ u8 getType();
+    /* 80B43934 */ u32 getFlowNodeNo();
+    /* 80B43998 */ BOOL isDelete();
     /* 80B43A20 */ void reset();
     /* 80B43C34 */ void afterJntAnm(int);
     /* 80B43CC0 */ void setParam();
     /* 80B43DBC */ void setAfterTalkMotion();
     /* 80B43E1C */ void srchActors();
-    /* 80B43E28 */ void evtTalk();
-    /* 80B43F0C */ void evtCutProc();
+    /* 80B43E28 */ BOOL evtTalk();
+    /* 80B43F0C */ BOOL evtCutProc();
     /* 80B43FD4 */ void action();
     /* 80B440C0 */ void beforeMove();
     /* 80B44138 */ void setAttnPos();
     /* 80B44364 */ void setCollision();
-    /* 80B44498 */ bool drawDbgInfo();
+    /* 80B44498 */ int drawDbgInfo();
     /* 80B444A0 */ void drawGhost();
-    /* 80B4450C */ void selectAction();
-    /* 80B44554 */ void chkAction(int (daNpc_yamiD_c::*)(void*));
-    /* 80B44580 */ void setAction(int (daNpc_yamiD_c::*)(void*));
-    /* 80B44628 */ void wait(void*);
-    /* 80B44900 */ void talk(void*);
-    /* 80B44AF8 */ void cutStopper(int);
-    /* 80B44B8C */ void _cutStopper_Init(int const&);
-    /* 80B44BD4 */ void _cutStopper_Main(int const&);
-    /* 80B45E74 */ daNpc_yamiD_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**);
-    /* 80B45F34 */ u16 getEyeballMaterialNo();
-    /* 80B45F3C */ s32 getHeadJointNo();
-    /* 80B45F44 */ s32 getNeckJointNo();
-    /* 80B45F4C */ bool getBackboneJointNo();
-    /* 80B45F54 */ void checkChangeJoint(int);
-    /* 80B45F64 */ void checkRemoveJoint(int);
-    /* 80B45F74 */ void evtEndProc();
+    /* 80B4450C */ int selectAction();
+    /* 80B44554 */ BOOL chkAction(int (daNpc_yamiD_c::*)(void*));
+    /* 80B44580 */ int setAction(int (daNpc_yamiD_c::*)(void*));
+    /* 80B44628 */ int wait(void*);
+    /* 80B44900 */ int talk(void*);
+    /* 80B44AF8 */ BOOL cutStopper(int);
+    /* 80B44B8C */ BOOL _cutStopper_Init(int const&);
+    /* 80B44BD4 */ BOOL _cutStopper_Main(int const&);
+    /* 80B45E74 */ daNpc_yamiD_c(
+            daNpcT_faceMotionAnmData_c const* i_faceMotionAnmData,
+            daNpcT_motionAnmData_c const* i_motionAnmData,
+            daNpcT_MotionSeqMngr_c::sequenceStepData_c const* i_faceMotionSequenceData,
+            int i_faceMotionStepNum,
+            daNpcT_MotionSeqMngr_c::sequenceStepData_c const* i_motionSequenceData,
+            int i_motionStepNum,
+            daNpcT_evtData_c const* i_evtData,
+            char** i_arcNames)
+        : daNpcT_c(i_faceMotionAnmData, i_motionAnmData, i_faceMotionSequenceData,
+        i_faceMotionStepNum, i_motionSequenceData, i_motionStepNum, i_evtData,
+        i_arcNames) {}
+    /* 80B45F34 */ u16 getEyeballMaterialNo() { return 1; }
+    /* 80B45F3C */ s32 getHeadJointNo() { return 4; }
+    /* 80B45F44 */ s32 getNeckJointNo() { return 3; }
+    /* 80B45F4C */ s32 getBackboneJointNo() { return 1; }
+    /* 80B45F54 */ BOOL checkChangeJoint(int i_joint) { return i_joint == 4; }
+    /* 80B45F64 */ BOOL checkRemoveJoint(int i_joint) { return i_joint == 6; }
+    /* 80B45F74 */ BOOL evtEndProc() {
+                        mJntAnm.lookNone(0);
+                        eventInfo.setIdx(0);
+                        mEvtNo = 0;
+                        return TRUE;
+                    }
 
-    static void* mCutNameList[2];
-    static u8 mCutList[24];
+    u32 getPathID() { return (fopAcM_GetParam(this) & 0xFF00) >> 8; }
+    int getSwitchBitNo() { return (fopAcM_GetParam(this) >> 16) & 0xFF; }
+    BOOL _is_vanish_prm() {
+        u8 uVar1 = ((fopAcM_GetParam(this) >> 28)) ? 1 : 0;
+        int iVar1 = uVar1;
+        if (iVar1 == 15) {
+            iVar1 = 0;
+        }
+        return iVar1;
+        
+    }
+    bool is_vanish() { return mVanish; }
+    void vanish_on() { mVanish = 1; }
+    void vanish_off() { mVanish = 0; }
+    void on_CoHit() {
+        field_0xe44.OnCoSetBit();
+        field_0xe44.OnTgSetBit();
+    }
+    void off_CoHit() {
+        field_0xe44.OffCoSetBit();
+        field_0xe44.OffTgSetBit();
+    }
+
+    static char* mCutNameList[2];
+    static cutFunc mCutList[2];
 
 private:
-    /* 0x568 */ u8 field_0x568[0xfcc - 0x568];
+    /* 0xE40 */ u8 field_0xe40[0xe44 - 0xe40];
+    /* 0xE44 */ dCcD_Cyl field_0xe44;
+    /* 0xF80 */ u8 mType;
+    /* 0xF81 */ s8 mVanish;
+    /* 0xF82 */ s8 field_0xf82;
+    /* 0xF83 */ u8 field_0xf83;
+    /* 0xF84 */ actionFunc mNextAction;
+    /* 0xF90 */ actionFunc mAction;
+    /* 0xF9C */ daNpcT_Path_c mPath;
+    /* 0xFC4 */ u8 field_0xfc4;
+    /* 0xFC8 */ int field_0xfc8;
 };
 
 STATIC_ASSERT(sizeof(daNpc_yamiD_c) == 0xfcc);
 
-class daNpc_yamiD_Param_c {
-public:
-    /* 80B45FE0 */ ~daNpc_yamiD_Param_c();
-
-    static u8 const m[140];
-};
-
 
 #endif /* D_A_NPC_YAMID_H */