d_a_npc_post matching (#2792)

* initial work

* matching

* changed draw ifdef

* enums added

* enum change

config/GZ2E01/rels/d_a_npc_post/symbols.txt

@@ -212,6 +212,7 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa
 @3839 = .bss:0x00000048; // type:object size:0xC scope:local
 l_HIO = .bss:0x00000054; // type:object size:0x4 scope:global data:4byte
 @4753 = .bss:0x00000058; // type:object size:0xC scope:local
+init$2635 = .bss:0x00000064; // type:object size:0x1 scope:local align:1
 prtclScl$4752 = .bss:0x00000068; // type:object size:0xC scope:local
 sInstance__40JASGlobalInstance<19JASDefaultBankTable> = .bss:0x00000074; // type:object size:0x4 scope:global
 sInstance__35JASGlobalInstance<14JASAudioThread> = .bss:0x00000078; // type:object size:0x4 scope:global

configure.py

@@ -1903,7 +1903,7 @@ config.libs = [
     ActorRel(NonMatching, "d_a_npc_pachi_taro"),
     ActorRel(NonMatching, "d_a_npc_passer"),
     ActorRel(NonMatching, "d_a_npc_passer2"),
-    ActorRel(NonMatching, "d_a_npc_post"),
+    ActorRel(MatchingFor("GZ2E01", "GZ2P01", "GZ2J01"), "d_a_npc_post"),
     ActorRel(NonMatching, "d_a_npc_pouya"),
     ActorRel(MatchingFor("GZ2E01", "GZ2P01", "GZ2J01"), "d_a_npc_prayer", extra_cflags=[DANPCF_C_HACK]),
     ActorRel(MatchingFor("GZ2E01", "GZ2P01", "GZ2J01"), "d_a_npc_raca"),

include/d/actor/d_a_npc_post.h

@@ -10,73 +10,173 @@
  *
  * @details
  *
- */
-class daNpc_Post_c : public fopAc_ac_c {
+*/
+
+struct daNpc_Post_HIOParam {
+    /* 0x00 */ daNpcT_HIOParam common;
+    /* 0x8C */ f32 run_spd;
+    /* 0x90 */ s16 nod_interval;
+};
+
+class daNpc_Post_Param_c {
 public:
+    /* 80AAD120 */ virtual ~daNpc_Post_Param_c() {}
+
+    static daNpc_Post_HIOParam const m;
+};
+
+#if DEBUG
+class daNpc_Post_HIO_c : public mDoHIO_entry_c {
+public:
+    daNpc_Post_HIO_c();
+    void listenPropertyEvent(const JORPropertyEvent*);
+    void genMessage(JORMContext*);
+
+    /* 0x8 */ daNpc_Post_HIOParam m;
+};
+#define NPC_POST_HIO_CLASS daNpc_Post_HIO_c
+#else
+#define NPC_POST_HIO_CLASS daNpc_Post_Param_c
+#endif
+
+class daNpc_Post_c : public daNpcT_c {
+public:
+    enum Material {
+        /* 0x0 */ MAT_SC_EYE,
+        /* 0x1 */ MAT_EYEBALL,
+        /* 0x2 */ MAT_POST_BODY_M,
+        /* 0x3 */ MAT_POST_FACE_M,
+    };
+
+    enum Joint {
+        /* 0x00 */ JNT_CENTER,
+        /* 0x01 */ JNT_BACKBONE1,
+        /* 0x02 */ JNT_BACKBONE2,
+        /* 0x03 */ JNT_NECK,
+        /* 0x04 */ JNT_HEAD,
+        /* 0x05 */ JNT_CHIN,
+        /* 0x06 */ JNT_MAYU_L,
+        /* 0x07 */ JNT_MAYU_R,
+        /* 0x08 */ JNT_MOUTH,
+        /* 0x09 */ JNT_SHOULDERL,
+        /* 0x0A */ JNT_ARML1,
+        /* 0x0B */ JNT_ARML2,
+        /* 0x0C */ JNT_HANDL,
+        /* 0x0D */ JNT_FINGERL,
+        /* 0x0E */ JNT_THAMBL,
+        /* 0x0F */ JNT_SHOULDERR,
+        /* 0x10 */ JNT_ARMR1,
+        /* 0x11 */ JNT_ARMR2,
+        /* 0x12 */ JNT_HANDR,
+        /* 0x13 */ JNT_FINGERR,
+        /* 0x14 */ JNT_THAMBR,
+        /* 0x15 */ JNT_WAIST,
+        /* 0x16 */ JNT_LEGL1,
+        /* 0x17 */ JNT_LEGL2,
+        /* 0x18 */ JNT_FOOTL,
+        /* 0x19 */ JNT_LEGR1,
+        /* 0x1A */ JNT_LEGR2,
+        /* 0x1B */ JNT_FOOTR,
+    };
+
+    typedef int (daNpc_Post_c::*actionFunc)(void*);
+    typedef int (daNpc_Post_c::*cutFunc)(int);
+
     /* 80AA8C8C */ ~daNpc_Post_c();
-    /* 80AA8DE8 */ void create();
-    /* 80AA90B0 */ void CreateHeap();
-    /* 80AA9634 */ void Delete();
-    /* 80AA9668 */ void Execute();
-    /* 80AA9688 */ void Draw();
-    /* 80AA971C */ void createHeapCallBack(fopAc_ac_c*);
-    /* 80AA973C */ void ctrlJointCallBack(J3DJoint*, int);
-    /* 80AA9794 */ void getType();
-    /* 80AA97E0 */ void isDelete();
+    /* 80AA8DE8 */ cPhs__Step create();
+    /* 80AA90B0 */ int CreateHeap();
+    /* 80AA9634 */ int Delete();
+    /* 80AA9668 */ int Execute();
+    /* 80AA9688 */ int Draw();
+    /* 80AA971C */ static int createHeapCallBack(fopAc_ac_c*);
+    /* 80AA973C */ static int ctrlJointCallBack(J3DJoint*, int);
+    /* 80AA9794 */ u8 getType();
+    /* 80AA97E0 */ BOOL isDelete();
     /* 80AA9828 */ void reset();
     /* 80AA99F0 */ void afterJntAnm(int);
     /* 80AA9A7C */ void setParam();
-    /* 80AA9BA4 */ void checkChangeEvt();
+    /* 80AA9BA4 */ BOOL checkChangeEvt();
     /* 80AA9C58 */ void setAfterTalkMotion();
     /* 80AA9D04 */ void srchActors();
-    /* 80AA9D98 */ void evtTalk();
-    /* 80AA9E98 */ void evtCutProc();
+    /* 80AA9D98 */ BOOL evtTalk();
+    /* 80AA9E98 */ BOOL evtCutProc();
     /* 80AA9F60 */ void action();
     /* 80AAA058 */ void beforeMove();
     /* 80AAA124 */ void afterMoved();
     /* 80AAA1E4 */ void setAttnPos();
     /* 80AAA570 */ void setCollision();
-    /* 80AAA714 */ bool drawDbgInfo();
+    /* 80AAA714 */ int drawDbgInfo();
     /* 80AAA71C */ void drawOtherMdl();
-    /* 80AAA8A4 */ void setFlagAnm(int, int, f32);
-    /* 80AAA968 */ void afterSetMotionAnm(int, int, f32, int);
-    /* 80AAA99C */ void selectAction();
-    /* 80AAA9E4 */ void chkAction(int (daNpc_Post_c::*)(void*));
-    /* 80AAAA10 */ void setAction(int (daNpc_Post_c::*)(void*));
-    /* 80AAAAB8 */ void chkPullOutLetter1();
-    /* 80AAAB2C */ void chkPullOutLetter2();
+    /* 80AAA8A4 */ BOOL setFlagAnm(int, int, f32);
+    /* 80AAA968 */ bool afterSetMotionAnm(int, int, f32, int);
+    /* 80AAA99C */ BOOL selectAction();
+    /* 80AAA9E4 */ BOOL chkAction(actionFunc);
+    /* 80AAAA10 */ BOOL setAction(actionFunc);
+    /* 80AAAAB8 */ BOOL chkPullOutLetter1();
+    /* 80AAAB2C */ BOOL chkPullOutLetter2();
     /* 80AAABA0 */ void pullOutLetter();
-    /* 80AAAC64 */ void cutDeliver(int);
-    /* 80AAB61C */ void wait(void*);
-    /* 80AABC24 */ void talk(void*);
-    /* 80AACFF0 */ daNpc_Post_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**);
-    /* 80AAD0D0 */ u16 getEyeballMaterialNo();
-    /* 80AAD0D8 */ s32 getHeadJointNo();
-    /* 80AAD0E0 */ s32 getNeckJointNo();
-    /* 80AAD0E8 */ bool getBackboneJointNo();
-    /* 80AAD0F0 */ void checkChangeJoint(int);
-    /* 80AAD100 */ void checkRemoveJoint(int);
-    /* 80AAD110 */ s32 getFootLJointNo();
-    /* 80AAD118 */ s32 getFootRJointNo();
+    /* 80AAAC64 */ int cutDeliver(int);
+    /* 80AAB61C */ int wait(void*);
+    /* 80AABC24 */ int talk(void*);
+    int test(void*);
+    /* 80AACFF0 */ daNpc_Post_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) {
+        OS_REPORT("|%06d:%x|daNpc_Post_c -> コンストラクト\n", g_Counter.mCounter0, this);
+    }
+    /* 80AAD0D0 */ u16 getEyeballMaterialNo() { return MAT_EYEBALL; }
+    /* 80AAD0D8 */ s32 getHeadJointNo() { return JNT_HEAD; }
+    /* 80AAD0E0 */ s32 getNeckJointNo() { return JNT_NECK; }
+    /* 80AAD0E8 */ s32 getBackboneJointNo() { return JNT_BACKBONE1; }
+    /* 80AAD0F0 */ BOOL checkChangeJoint(int i_joint) { return i_joint == JNT_HEAD; }
+    /* 80AAD100 */ BOOL checkRemoveJoint(int i_joint) { return i_joint == JNT_MOUTH; }
+    /* 80AAD110 */ s32 getFootLJointNo() { return JNT_FOOTL; }
+    /* 80AAD118 */ s32 getFootRJointNo() { return JNT_FOOTR; }
+
+    u32 getFlowNodeNo() {
+        u16 nodeNo = home.angle.x;
+        u32 rv;
+        if (nodeNo == 0xffff) {
+            rv = -1;
+        } else {
+            rv = nodeNo;
+        }
+        return rv;
+    }
+
+    u8 getBitSW() { return (fopAcM_GetParam(this) & 0xFF00) >> 8; }
 
     static char* mCutNameList[2];
-    static u8 mCutList[24];
+    static cutFunc mCutList[2];
 
 private:
-    /* 0x568 */ u8 field_0x568[0x1018 - 0x568];
+    /* 0x0E40 */ mDoExt_McaMorfSO* mpFlagModelMorf;
+    /* 0x0E44 */ NPC_POST_HIO_CLASS* mHIO;
+    /* 0x0E48 */ J3DModel* mpLetterModels[2];
+    /* 0x0E50 */ dCcD_Cyl mCyl;
+    /* 0x0F8C */ u8 mType;
+    /* 0x0F90 */ daNpcT_ActorMngr_c mActorMngrs[4];
+    /* 0x0FB0 */ daNpcT_Path_c mPath;
+    /* 0x0FD8 */ actionFunc mNextAction;
+    /* 0x0FE4 */ actionFunc mAction;
+    /* 0x0FF0 */ cXyz mActorPos;
+    /* 0x0FFC */ cXyz field_0xffc;
+    /* 0x1008 */ f32 mPrevPosY;
+    /* 0x100C */ int mNodTimer;
+    /* 0x1010 */ u8 mLetterADispFlag;
+    /* 0x1011 */ u8 mLetterBDispFlag;
+    /* 0x1012 */ u8 mFlagModelDispFlag;
+    /* 0x1013 */ u8 mSitFlag;
+    /* 0x1014 */ u8 field_0x1014;
 };
 
 STATIC_ASSERT(sizeof(daNpc_Post_c) == 0x1018);
 
-class daNpc_Post_Param_c {
-public:
-    /* 80AAD120 */ ~daNpc_Post_Param_c();
-
-    static u8 const m[148];
-};
-
-
 #endif /* D_A_NPC_POST_H */

include/d/actor/d_a_tag_evtarea.h

@@ -44,6 +44,8 @@ public:
 
     u8 getBitSW2() { return (home.angle.x & 0xff00) >> 8; }
 
+    void noEffect() { field_0x56c = 1; }
+
 private:
     /* 0x568 vtable */
     /* 0x56C */ u8 field_0x56c;

include/m_Do/m_Do_audio.h

@@ -55,6 +55,10 @@ inline void mDoAud_bgmStart(u32 i_bgmID) {
     Z2AudioMgr::getInterface()->bgmStart(i_bgmID, 0, 0);
 }
 
+inline void mDoAud_bgmAllMute(u32 i_count) {
+    Z2AudioMgr::getInterface()->bgmAllMute(i_count, 0.0f);
+}
+
 inline void mDoAud_subBgmStart(u32 i_bgmID) {
     Z2AudioMgr::getInterface()->subBgmStart(i_bgmID);
 }