d_a_npc_fairy_seirei Equivalent (#2438)

* Prepare pulling main

* 100% match, equivalent only

* Remove line change

* Adressed review comments and clang formatting

Author: Stbn-antier

configure.py

@@ -1543,7 +1543,7 @@ def MatchingFor(*versions) -> bool:
     ActorRel(MatchingFor("GZ2E01"), "d_a_kytag14"),
     ActorRel(NonMatching, "d_a_mg_fish"),
     ActorRel(NonMatching, "d_a_npc_besu"),
-    ActorRel(NonMatching, "d_a_npc_fairy_seirei"),
+    ActorRel(Equivalent, "d_a_npc_fairy_seirei"),
     ActorRel(MatchingFor("GZ2E01"), "d_a_npc_fish"),
     ActorRel(NonMatching, "d_a_npc_henna"),
     ActorRel(NonMatching, "d_a_npc_kakashi"),

include/d/actor/d_a_npc_fairy_seirei.h

@@ -11,51 +11,79 @@
  * @details
  *
  */
-class daNpc_FairySeirei_c : public fopAc_ac_c {
+class daNpc_FairySeirei_c : public daNpcT_c {
 public:
+    typedef int (daNpc_FairySeirei_c::*cutFunc)(int);
+    typedef int (daNpc_FairySeirei_c::*actionFunc)(int);
+
     /* 8053FF6C */ ~daNpc_FairySeirei_c();
-    /* 8054006C */ void create();
-    /* 80540298 */ void Delete();
-    /* 805402CC */ void Execute();
-    /* 805402EC */ bool Draw();
-    /* 805402F4 */ void isDelete();
+    /* 8054006C */ int create();
+    /* 80540298 */ int Delete();
+    /* 805402CC */ int Execute();
+    /* 805402EC */ int Draw();
+    /* 805402F4 */ int isDelete();
     /* 80540334 */ void reset();
     /* 8054048C */ void setParam();
     /* 805405B0 */ void srchActors();
-    /* 805405B4 */ void evtTalk();
-    /* 805406BC */ void evtCutProc();
+    /* 805405B4 */ BOOL evtTalk();
+    /* 805406BC */ BOOL evtCutProc();
     /* 80540784 */ void action();
     /* 8054080C */ void beforeMove();
     /* 80540884 */ void setCollision();
     /* 80540988 */ void setAttnPos();
-    /* 80540A30 */ bool drawDbgInfo();
-    /* 80540A38 */ void selectAction();
-    /* 80540A80 */ void setAction(int (daNpc_FairySeirei_c::*)(int));
+    /* 80540A30 */ BOOL drawDbgInfo();
+    /* 80540A38 */ bool selectAction();
+    /* 80540A80 */ bool setAction(actionFunc);
     /* 80540B28 */ void setPrtcls();
-    /* 80540C54 */ void wait(int);
-    /* 80540CC0 */ void talk(int);
+    /* 80540C54 */ int wait(int);
+    /* 80540CC0 */ int talk(int);
     /* 80540E10 */ void _to_FairyCave();
-    /* 80541BE4 */ daNpc_FairySeirei_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**);
+    /* 80541BE4 */ daNpc_FairySeirei_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) {}
+
+    u8 getType() { return fopAcM_GetParam(this) & 0xFF; }
+
+    int getFlowNodeNo() {
+        u16 nodeNo = home.angle.x;
+        if (nodeNo == 0xffff) {
+            return -1;
+        }
+        return nodeNo;
+    }
+
+    BOOL chkAction(actionFunc i_action) { return (mExecuteFunc == i_action); }
 
-    static void* mCutNameList;
-    static u8 mCutList[12];
+    void ptcl_se() { mSound.startCreatureSoundLevel(Z2SE_FAIRY_STAY, 0, -1); }
+
+    int getSeneNo() { return (fopAcM_GetParam(this) >> 8) & 0xFF; }
+
+    static char* mCutNameList[1];
+    static cutFunc mCutList[1];
 
 private:
-    /* 0x568 */ u8 field_0x568[0xfb0 - 0x568];
+    /* 0xE40 */ u8 field_0xE40[4];
+    /* 0xE44 */ u8 mType;
+    /* 0xE48 */ dCcD_Cyl mCyl;
+    /* 0xF84 */ actionFunc mInitFunc;
+    /* 0xF90 */ actionFunc mExecuteFunc;
+    /* 0xF98 */ u32 mpEmitters[3];
+    /* 0xFA8 */ bool mTalking;
+    /* 0xFA9 */ u8 field_0xFA4[3];
+    /* 0xFAC */ u8 field_0xFAC;
 };
 
 STATIC_ASSERT(sizeof(daNpc_FairySeirei_c) == 0xfb0);
 
 class daNpc_FairySeirei_Param_c {
 public:
-    /* 80541D20 */ ~daNpc_FairySeirei_Param_c();
+    /* 80541D20 */ virtual ~daNpc_FairySeirei_Param_c() {}
 
-    static u8 const m[148];
+    static f32 const m[37];
 };
 
-
 #endif /* D_A_NPC_FAIRY_SEIREI_H */