d_a_npc_grc equivalent (#2594)

* initial work

* d_a_npc_grc equivalent

* Fixed configure.py change

* pr cleanup

configure.py

@@ -1783,7 +1783,7 @@ config.libs = [
     ActorRel(NonMatching, "d_a_npc_fguard"),
     ActorRel(NonMatching, "d_a_npc_gnd"),
     ActorRel(NonMatching, "d_a_npc_gra"),
-    ActorRel(NonMatching, "d_a_npc_grc"),
+    ActorRel(Equivalent, "d_a_npc_grc", extra_cflags=[DANPCF_C_HACK]), # weak func order
     ActorRel(NonMatching, "d_a_npc_grd"),
     ActorRel(NonMatching, "d_a_npc_grm"),
     ActorRel(NonMatching, "d_a_npc_grmc"),

include/d/actor/d_a_npc_grc.h

@@ -10,67 +10,100 @@
  *
  * @details
  *
- */
-class daNpc_grC_c : public fopAc_ac_c {
+*/
+
+
+class daNpc_grC_c : public daNpcF_c {
 public:
+    typedef BOOL (daNpc_grC_c::*ActionFn)(void*);
+    typedef BOOL (daNpc_grC_c::*EventFn)(int);
+
     /* 809CB4CC */ daNpc_grC_c();
     /* 809CB6E0 */ ~daNpc_grC_c();
-    /* 809CB8E0 */ void create();
-    /* 809CBBD4 */ void CreateHeap();
-    /* 809CBDC4 */ void Delete();
-    /* 809CBDF8 */ void Execute();
-    /* 809CBE18 */ void Draw();
-    /* 809CBE8C */ void ctrlJoint(J3DJoint*, J3DModel*);
-    /* 809CC0C0 */ void createHeapCallBack(fopAc_ac_c*);
-    /* 809CC0E0 */ void ctrlJointCallBack(J3DJoint*, int);
+    /* 809CB8E0 */ cPhs__Step create();
+    /* 809CBBD4 */ int CreateHeap();
+    /* 809CBDC4 */ int Delete();
+    /* 809CBDF8 */ int Execute();
+    /* 809CBE18 */ int Draw();
+    /* 809CBE8C */ int ctrlJoint(J3DJoint*, J3DModel*);
+    /* 809CC0C0 */ static int createHeapCallBack(fopAc_ac_c*);
+    /* 809CC0E0 */ static int ctrlJointCallBack(J3DJoint*, int);
     /* 809CC12C */ void setParam();
-    /* 809CC26C */ void main();
-    /* 809CC3EC */ bool ctrlBtk();
+    /* 809CC26C */ BOOL main();
+    /* 809CC3EC */ BOOL ctrlBtk();
     /* 809CC3F4 */ void setAttnPos();
-    /* 809CC930 */ void setExpressionAnm(int, bool);
-    /* 809CCB78 */ void setExpressionBtp(int);
+    /* 809CC930 */ bool setExpressionAnm(int, bool);
+    /* 809CCB78 */ bool setExpressionBtp(int);
     /* 809CCCA4 */ void setExpression(int, f32);
-    /* 809CCCD0 */ bool setMotionAnm(int, f32);
+    /* 809CCCD0 */ void setMotionAnm(int, f32);
     /* 809CCE70 */ void setMotion(int, f32, int);
-    /* 809CCEB4 */ bool drawDbgInfo();
+    /* 809CCEB4 */ int drawDbgInfo();
     /* 809CCEBC */ void drawOtherMdls();
-    /* 809CCEC0 */ void getTypeFromParam();
-    /* 809CCF38 */ void isDelete();
+    /* 809CCEC0 */ u8 getTypeFromParam();
+    /* 809CCF38 */ BOOL isDelete();
     /* 809CCFBC */ void reset();
     /* 809CD1B4 */ void playExpression();
     /* 809CD4AC */ void playMotion();
-    /* 809CD794 */ void chkAction(int (daNpc_grC_c::*)(void*));
-    /* 809CD7C0 */ void setAction(int (daNpc_grC_c::*)(void*));
-    /* 809CD868 */ void selectAction();
+    /* 809CD794 */ BOOL chkAction(ActionFn);
+    /* 809CD7C0 */ BOOL setAction(ActionFn);
+    /* 809CD868 */ BOOL selectAction();
     /* 809CD960 */ void doNormalAction(int);
-    /* 809CDA74 */ void doEvent();
+    /* 809CDA74 */ BOOL doEvent();
     /* 809CDD50 */ void setLookMode(int);
     /* 809CDD74 */ void lookat();
-    /* 809CDFFC */ void chkFindPlayer();
+    /* 809CDFFC */ BOOL chkFindPlayer();
     /* 809CE12C */ void setExpressionTalkAfter();
-    /* 809CE1F8 */ void wait(void*);
-    /* 809CE3A8 */ void waitTW(void*);
-    /* 809CE490 */ void waitSpa(void*);
-    /* 809CE688 */ void waitBuyer(void*);
-    /* 809CE7C4 */ void talk(void*);
-    /* 809CEA6C */ void test(void*);
+    /* 809CE1F8 */ BOOL wait(void*);
+    /* 809CE3A8 */ BOOL waitTW(void*);
+    /* 809CE490 */ BOOL waitSpa(void*);
+    /* 809CE688 */ BOOL waitBuyer(void*);
+    /* 809CE7C4 */ BOOL talk(void*);
+    /* 809CEA6C */ BOOL test(void*);
     /* 809CEB50 */ void setPrtcl();
     /* 809CF4AC */ void adjustShapeAngle();
 
-    static void* mEvtCutNameList;
-    static u8 mEvtCutList[12];
+    static char* mEvtCutNameList;
+    static EventFn mEvtCutList[1];
 
 private:
-    /* 0x568 */ u8 field_0x568[0xe54 - 0x568];
+    /* 0xB48 */ Z2Creature mSound;
+    /* 0xBD8 */ int field_0xbd8;
+    /* 0xBDC */ daNpcF_Lookat_c mLookat;
+    /* 0xC78 */ dPaPo_c mPaPo;
+    /* 0xCB0 */ daNpcF_ActorMngr_c mActorMngr[2];
+    /* 0xCC0 */ u8 field_0xcc0[0xcc4 - 0xcc0];
+    /* 0xCC4 */ dCcD_Cyl mCyl;
+    /* 0xE00 */ ActionFn mNextAction;
+    /* 0xE0C */ ActionFn mAction;
+    /* 0xE18 */ request_of_phase_process_class mPhases[3];
+    /* 0xE30 */ int field_0xe30;
+    /* 0xE34 */ int field_0xe34;
+    /* 0xE38 */ int field_0xe38;
+    /* 0xE3C */ int field_0xe3c;
+    /* 0xE40 */ int mFlowID;
+    /* 0xE44 */ s16 mLookMode;
+    /* 0xE46 */ u16 mMode;
+    /* 0xE48 */ u8 mType;
+    /* 0xE4C */ fpc_ProcID mItemID;
+    /* 0xE50 */ bool mIsSpringWaterShopClosed;
+    /* 0xE51 */ bool field_0xe51;
 };
 
 STATIC_ASSERT(sizeof(daNpc_grC_c) == 0xe54);
 
+struct daNpc_grC_HIOParam {
+    /* 0x0 */ daNpcF_HIOParam common;
+};
+
+class daNpc_grC_HIO_c : public mDoHIO_entry_c {
+    /* 0x8 */ daNpc_grC_HIOParam field_0x8;
+};
+
 class daNpc_grC_Param_c {
 public:
-    /* 809CF4B0 */ ~daNpc_grC_Param_c();
+    /* 809CF4B0 */ virtual ~daNpc_grC_Param_c() {}
 
-    static u8 const m[108];
+    static daNpc_grC_HIOParam const m;
 };
 
 

include/d/d_event_manager.h

@@ -33,6 +33,10 @@ public:
 
 class dEvent_manager_c {
 public:
+    enum Event_Cut_Nums {
+        /* 0x1 */ NUM_EVT_CUTS_e = 0x1,
+    };
+
     void* getSubstance(dEvDtData_c* p_data, int type);
     void setDbgData(const char*);
     dEvent_manager_c();

src/d/actor/d_a_npc_shad.cpp

@@ -2013,7 +2013,7 @@ BOOL daNpcShad_c::EvCut_ToChantSpell2(int i_cutIndex) {
                 }
             } else if (step(home.angle.y, MOT_STEP, 15.0f)) {
                 setMotion(MOT_WAIT_A, -1.0f, FALSE);
-                mTurnMode = MOT_WAIT_A;
+                mTurnMode = 0;
             }
 
             break;