d_a_npc_seic almost equivalent (#2432)

* Data work and fopacmsetup

* d_a_npc_seic almost equivalent

* Now equivalent and configure.py updated

2 files changed, 107 insertions, 35 deletions

diff --git a/include/d/actor/d_a_npc_seib.h b/include/d/actor/d_a_npc_seib.h
index d1d2b580a5..1be33d5f2e 100644
--- a/include/d/actor/d_a_npc_seib.h
+++ b/include/d/actor/d_a_npc_seib.h
@@ -16,7 +16,7 @@ class daNpc_seiB_Param_c {
 public:
     /* 80AC6FB8 */ virtual ~daNpc_seiB_Param_c() {};
     struct Data {
-        /* 0x00 */ u32 field_0x00;
+        /* 0x00 */ f32 field_0x00;
         /* 0x04 */ f32 mGravity;
         /* 0x08 */ f32 mScale;
         /* 0x0C */ f32 field_0xc;
diff --git a/include/d/actor/d_a_npc_seic.h b/include/d/actor/d_a_npc_seic.h
index ff63bd854e..97f15be403 100644
--- a/include/d/actor/d_a_npc_seic.h
+++ b/include/d/actor/d_a_npc_seic.h
@@ -11,54 +11,126 @@
  * @details
  *
  */
-class daNpc_seiC_c : public fopAc_ac_c {
+
+ struct daNpc_seiC_HIOParam {
+    /* 0x00 */ f32 field_0x00;
+    /* 0x04 */ f32 mGravity;
+    /* 0x08 */ f32 mScale;
+    /* 0x0C */ f32 field_0x0c;
+    /* 0x10 */ f32 mSttsWeight;
+    /* 0x14 */ f32 mCylH;
+    /* 0x18 */ f32 mWallH;
+    /* 0x1C */ f32 mWallR;
+    /* 0x20 */ f32 field_0x20;
+    /* 0x24 */ f32 field_0x24;
+    /* 0x28 */ f32 field_0x28;
+    /* 0x2C */ f32 field_0x2c;
+    /* 0x30 */ f32 field_0x30;
+    /* 0x34 */ f32 field_0x34;
+    /* 0x38 */ f32 field_0x38;
+    /* 0x3C */ f32 field_0x3c;
+    /* 0x40 */ f32 field_0x40;
+    /* 0x44 */ f32 mMorfFrames;
+    /* 0x48 */ f32 field_0x48;
+    /* 0x4C */ f32 field_0x4c;
+    /* 0x50 */ f32 field_0x50;
+    /* 0x54 */ f32 field_0x54;
+    /* 0x58 */ f32 field_0x58;
+    /* 0x5C */ f32 field_0x5c;
+    /* 0x60 */ f32 field_0x60;
+    /* 0x64 */ f32 field_0x64;
+    /* 0x68 */ f32 field_0x68;
+    /* 0x6C */ f32 field_0x6c;
+    /* 0x70 */ f32 field_0x70;
+    /* 0x74 */ f32 field_0x74;
+    /* 0x78 */ f32 field_0x78;
+    /* 0x7C */ f32 field_0x7c;
+    /* 0x80 */ f32 field_0x80;
+    /* 0x84 */ f32 field_0x84;
+    /* 0x88 */ f32 field_0x88;
+    /* 0x8C */ f32 field_0x8c;
+    /* 0x90 */ f32 field_0x90;
+};
+
+class daNpc_seiC_Param_c {
+    public:
+        /* 80AC91B0 */ virtual ~daNpc_seiC_Param_c() {};
+
+        static const daNpc_seiC_HIOParam m;
+};
+
+class daNpc_seiC_HIO_c
+#ifdef DEBUG
+: public mDoHIO_entry_c 
+#endif
+{
 public:
+    void genMessage(JORMContext*);
+
+    #ifdef DEBUG
+    /* 0x08 */ daNpc_seiC_HIOParam field_0x8;
+    /* 0x94 */ f32 field_0x94;                  // "強制会話距離" "Forced conversation distance" | Slider
+    /* 0x98 */ f32 field_0x98;                  // "会話距離" "Conversation distance" | Slider
+    #endif
+};
+
+class daNpc_seiC_c : public daNpcT_c {
+public:
+    typedef int (daNpc_seiC_c::*cutFunc)(int);
+    typedef int (daNpc_seiC_c::*actionFunc)(void*);
+    
+
+    enum Type {
+        TYPE_0,
+        TYPE_1,
+    };
+
     /* 80AC754C */ ~daNpc_seiC_c();
-    /* 80AC75E8 */ void create();
-    /* 80AC7828 */ void CreateHeap();
-    /* 80AC7980 */ void Delete();
-    /* 80AC79B4 */ void Execute();
-    /* 80AC79D4 */ void Draw();
-    /* 80AC7A68 */ void createHeapCallBack(fopAc_ac_c*);
-    /* 80AC7A88 */ void getType();
-    /* 80AC7AA8 */ void getFlowNodeNo();
-    /* 80AC7AC4 */ bool isDelete();
+    /* 80AC75E8 */ int create();
+    /* 80AC7828 */ int CreateHeap();
+    /* 80AC7980 */ int Delete();
+    /* 80AC79B4 */ int Execute();
+    /* 80AC79D4 */ int Draw();
+    /* 80AC7A68 */ static int createHeapCallBack(fopAc_ac_c*);
+    /* 80AC7A88 */ u8 getType();
+    /* 80AC7AA8 */ u32 getFlowNodeNo();
+    /* 80AC7AC4 */ int isDelete();
     /* 80AC7ACC */ void reset();
     /* 80AC7C1C */ void setParam();
     /* 80AC7D48 */ void srchActors();
-    /* 80AC7D4C */ void evtTalk();
-    /* 80AC7E4C */ void evtCutProc();
+    /* 80AC7D4C */ BOOL evtTalk();
+    /* 80AC7E4C */ BOOL evtCutProc();
     /* 80AC7F14 */ void action();
     /* 80AC7F9C */ void beforeMove();
     /* 80AC801C */ void setAttnPos();
-    /* 80AC8078 */ bool drawDbgInfo();
-    /* 80AC8080 */ void afterSetMotionAnm(int, int, f32, int);
-    /* 80AC8218 */ void selectAction();
-    /* 80AC8260 */ void chkAction(int (daNpc_seiC_c::*)(void*));
-    /* 80AC828C */ void setAction(int (daNpc_seiC_c::*)(void*));
+    /* 80AC8078 */ int drawDbgInfo();
+    /* 80AC8080 */ bool afterSetMotionAnm(int, int, f32, int);
+    /* 80AC8218 */ int selectAction();
+    /* 80AC8260 */ int chkAction(int (daNpc_seiC_c::*)(void*));
+    /* 80AC828C */ int setAction(int (daNpc_seiC_c::*)(void*));
     /* 80AC8334 */ void ctrlWaitAnm();
-    /* 80AC8338 */ void wait(void*);
-    /* 80AC8364 */ void talk(void*);
-    /* 80AC916C */ daNpc_seiC_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**);
+    /* 80AC8338 */ int wait(void*);
+    /* 80AC8364 */ int talk(void*);
+    /* 80AC916C */ daNpc_seiC_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) {};
 
-    static void* mCutNameList;
-    static u8 mCutList[12];
+    static char* mCutNameList;
+    static cutFunc mCutList[1];
 
 private:
-    /* 0x568 */ u8 field_0x568[0xe64 - 0x568];
+    /* 0xE40 */ daNpc_seiC_HIO_c* field_0xe40;
+    /* 0xE44 */ u8 mType;
+    /* 0xE45 */ u8 field_0xe45[0xe48 - 0xe45];
+    /* 0xE48 */ actionFunc mAction;
+    /* 0xE54 */ actionFunc mAction2;
+    /* 0xE60 */ int field_0xe60;
 };
 
 STATIC_ASSERT(sizeof(daNpc_seiC_c) == 0xe64);
 
-class daNpc_seiC_Param_c {
-public:
-    /* 80AC91B0 */ ~daNpc_seiC_Param_c();
-
-    static u8 const m[148];
-};
-
-
 #endif /* D_A_NPC_SEIC_H */