d_a_npc_sola OK (#2814)

* d_a_npc_sola OK

* delete NONMATCHING comment

* Fix: Add forgotten joint name

configure.py

@@ -1920,7 +1920,7 @@ config.libs = [
     ActorRel(NonMatching, "d_a_npc_shoe", extra_cflags=[DANPCF_C_HACK]),
     ActorRel(MatchingFor("GZ2E01", "GZ2P01", "GZ2J01"), "d_a_npc_shop0"),
     ActorRel(MatchingFor("GZ2E01", "GZ2P01", "GZ2J01"), "d_a_npc_shop_maro"),
-    ActorRel(NonMatching, "d_a_npc_sola"),
+    ActorRel(MatchingFor("GZ2E01", "GZ2P01", "GZ2J01"), "d_a_npc_sola"),
     ActorRel(MatchingFor("GZ2E01", "GZ2P01", "GZ2J01"), "d_a_npc_soldierA", extra_cflags=[DANPCF_C_HACK]),
     ActorRel(NonMatching, "d_a_npc_soldierB"),
     ActorRel(MatchingFor("GZ2E01", "GZ2P01", "GZ2J01"), "d_a_npc_sq"),

include/d/actor/d_a_npc_sola.h

@@ -11,59 +11,102 @@
  * @details
  *
  */
-class daNpc_solA_c : public fopAc_ac_c {
+
+class daNpc_solA_c : public daNpcT_c {
 public:
+    typedef int (daNpc_solA_c::*cutFunc)(int);
+    typedef int (daNpc_solA_c::*actionFunc)(void*);
+
+    enum Joint {
+        /* 0x00 */ JNT_CENTER,
+        /* 0x01 */ JNT_BACKBONE1,
+        /* 0x02 */ JNT_BACKBONE2,
+        /* 0x03 */ JNT_NECK,
+        /* 0x04 */ JNT_HEAD,
+        /* 0x05 */ JNT_SHOULDERL,
+        /* 0x06 */ JNT_ARM1L,
+        /* 0x07 */ JNT_ARM2L,
+        /* 0x08 */ JNT_HANDL,
+        /* 0x09 */ JNT_FINGERL,
+        /* 0x0A */ JNT_THUMBL,
+        /* 0x0B */ JNT_SHOULDERR,
+        /* 0x0C */ JNT_ARM1R,
+        /* 0x0D */ JNT_ARM2R,
+        /* 0x0E */ JNT_HANDR,
+        /* 0x0F */ JNT_FINGERR,
+        /* 0x10 */ JNT_THUMBR,
+        /* 0x11 */ JNT_WAIST,
+        /* 0x12 */ JNT_LEG1L,
+        /* 0x13 */ JNT_LEG2L,
+        /* 0x14 */ JNT_FOOTL,
+        /* 0x15 */ JNT_LEG1R,
+        /* 0x16 */ JNT_LEG2R,
+        /* 0x17 */ JNT_FOOTR,
+        /* 0x18 */ JNT_SAYA,
+    };
+
     /* 80AECBAC */ ~daNpc_solA_c();
-    /* 80AECCD0 */ void create();
-    /* 80AECF58 */ void CreateHeap();
-    /* 80AED0F8 */ void Delete();
-    /* 80AED12C */ void Execute();
+    /* 80AECCD0 */ int create();
+    /* 80AECF58 */ int CreateHeap();
+    /* 80AED0F8 */ int Delete();
+    /* 80AED12C */ int Execute();
     /* 80AED14C */ void Draw();
-    /* 80AED1E8 */ void createHeapCallBack(fopAc_ac_c*);
-    /* 80AED208 */ void ctrlJointCallBack(J3DJoint*, int);
+    /* 80AED1E8 */ static BOOL createHeapCallBack(fopAc_ac_c*);
+    /* 80AED208 */ static BOOL ctrlJointCallBack(J3DJoint*, int);
     /* 80AED260 */ bool getType();
-    /* 80AED268 */ void getFlowNodeNo();
-    /* 80AED284 */ void isDelete();
+    /* 80AED268 */ int getFlowNodeNo();
+    /* 80AED284 */ int isDelete();
     /* 80AED294 */ void reset();
     /* 80AED3B8 */ void setParam();
     /* 80AED4A4 */ void setAfterTalkMotion();
     /* 80AED504 */ void srchActors();
-    /* 80AED508 */ void evtTalk();
-    /* 80AED608 */ void evtCutProc();
+    /* 80AED508 */ BOOL evtTalk();
+    /* 80AED608 */ BOOL evtCutProc();
     /* 80AED6D0 */ void action();
     /* 80AED758 */ void beforeMove();
     /* 80AED7D0 */ void setAttnPos();
     /* 80AED9DC */ void setCollision();
-    /* 80AEDABC */ bool drawDbgInfo();
+    /* 80AEDABC */ int drawDbgInfo();
     /* 80AEDAC4 */ void drawOtherMdl();
-    /* 80AEDAC8 */ void selectAction();
-    /* 80AEDB10 */ void chkAction(int (daNpc_solA_c::*)(void*));
-    /* 80AEDB3C */ void setAction(int (daNpc_solA_c::*)(void*));
-    /* 80AEDBE4 */ void wait(void*);
-    /* 80AEDD60 */ void talk(void*);
-    /* 80AEEF40 */ daNpc_solA_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**);
-    /* 80AEF07C */ s32 getHeadJointNo();
-    /* 80AEF084 */ s32 getNeckJointNo();
-    /* 80AEF08C */ bool getBackboneJointNo();
+    /* 80AEDAC8 */ int selectAction();
+    /* 80AEDB10 */ int chkAction(int (daNpc_solA_c::*)(void*));
+    /* 80AEDB3C */ int setAction(int (daNpc_solA_c::*)(void*));
+    /* 80AEDBE4 */ int wait(void*);
+    /* 80AEDD60 */ int talk(void*);
+    /* 80AEEF40 */ daNpc_solA_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) {}
+    /* 80AEF084 */ s32 getHeadJointNo() { return JNT_HEAD; }
+    /* 80AEF084 */ s32 getNeckJointNo() { return JNT_NECK; }
+    /* 80AEF094 */ s32 getBackboneJointNo() { return JNT_BACKBONE1; }
 
     static char* mCutNameList[1];
-    static u8 mCutList[12];
+    static cutFunc mCutList[1];
 
 private:
-    /* 0x568 */ u8 field_0x568[0xfa0 - 0x568];
+    /* 0xE40 */ u8 field_0xe40[0xe44 - 0xe40];
+    /* 0xE44 */ dCcD_Cyl mCyl;
+    /* 0xF80 */ u8 field_0xf80;
+    /* 0xF84 */ actionFunc mNextAction;
+    /* 0xF90 */ actionFunc mAction;
+    /* 0xF9c */ u8 field_0xf9c;
 };
 
 STATIC_ASSERT(sizeof(daNpc_solA_c) == 0xfa0);
 
-class daNpc_solA_Param_c {
-public:
-    /* 80AEF094 */ ~daNpc_solA_Param_c();
-
-    static u8 const m[140];
+struct daNpc_solA_HIOParam {
+    /* 0x00 */ daNpcT_HIOParam common;
 };
 
+class daNpc_solA_Param_c {
+public:
+    /* 80AEF094 */ virtual ~daNpc_solA_Param_c() {}
+
+    static daNpc_solA_HIOParam const m;
+};
 
 #endif /* D_A_NPC_SOLA_H */