diff --git a/include/d/actor/d_a_bomb.h b/include/d/actor/d_a_bomb.h index f45fa19d1..de91263ae 100644 --- a/include/d/actor/d_a_bomb.h +++ b/include/d/actor/d_a_bomb.h @@ -149,8 +149,8 @@ public: void setBombRestTime(s16 time); void setNoGravityTime(s16 time); static int prm_make(daBomb_c::State_e, bool, bool); - bool chk_state(daBomb_c::State_e) const; - void change_state(daBomb_c::State_e); + bool chk_state(State_e) const; + void change_state(State_e); int prm_get_state() const; bool get_explode_instant() const; bool prm_get_cheapEff() const; diff --git a/include/d/actor/d_a_gy_ctrl.h b/include/d/actor/d_a_gy_ctrl.h index dfee4a1b6..b3ddd77d2 100644 --- a/include/d/actor/d_a_gy_ctrl.h +++ b/include/d/actor/d_a_gy_ctrl.h @@ -5,6 +5,10 @@ class daGy_Ctrl_c : public fopAc_ac_c { public: + enum Proc_e { + + }; + void getMode() {} void isTargetPlayer() {} void isTargetPlayerShip() {} @@ -16,7 +20,7 @@ public: void lineCheck(cXyz*, cXyz*); void checkPath(); void setPathPos(); - void modeProc(daGy_Ctrl_c::Proc_e, int); + void modeProc(Proc_e, int); void modeSwWaitInit(); void modeSwWait(); void modeCreateInit(); diff --git a/include/d/actor/d_a_npc_ac1.h b/include/d/actor/d_a_npc_ac1.h index 913023b83..cbabb0b09 100644 --- a/include/d/actor/d_a_npc_ac1.h +++ b/include/d/actor/d_a_npc_ac1.h @@ -10,6 +10,10 @@ class daNpc_Ac1_c : public fopAc_ac_c { public: + struct anm_prm_c { + + }; + void nodeWngControl(J3DNode*, J3DModel*); void nodeArmControl(J3DNode*, J3DModel*); void nodeAc1Control(J3DNode*, J3DModel*); @@ -23,7 +27,7 @@ public: void iniTexPttrnAnm(bool); void plyTexPttrnAnm(); void setAnm_tex(signed char); - void setAnm_anm(daNpc_Ac1_c::anm_prm_c*); + void setAnm_anm(anm_prm_c*); void setAnm(); void chg_anmTag(); void control_anmTag(); diff --git a/include/d/actor/d_a_npc_aj1.h b/include/d/actor/d_a_npc_aj1.h index ab3156706..c4fc49b3b 100644 --- a/include/d/actor/d_a_npc_aj1.h +++ b/include/d/actor/d_a_npc_aj1.h @@ -7,6 +7,10 @@ class daNpc_Aj1_c : public fopAc_ac_c { public: + struct anm_prm_c { + + }; + void _nodeCB_Head(J3DNode*, J3DModel*); void _nodeCB_BackBone(J3DNode*, J3DModel*); void _XyCheckCB(int); @@ -22,7 +26,7 @@ public: void btpResID(int); void init_texPttrnAnm(signed char, bool); void play_texPttrnAnm(); - void setAnm_anm(daNpc_Aj1_c::anm_prm_c*); + void setAnm_anm(anm_prm_c*); void setAnm_NUM(int, int); void setAnm(); void chngAnmTag(); diff --git a/include/d/actor/d_a_npc_ba1.h b/include/d/actor/d_a_npc_ba1.h index 8d56bba15..b11d22a49 100644 --- a/include/d/actor/d_a_npc_ba1.h +++ b/include/d/actor/d_a_npc_ba1.h @@ -6,6 +6,10 @@ class daNpc_Ba1_c : public fopAc_ac_c { public: + struct anm_prm_c { + + }; + void holdEventOn() {} void nodeBa1Control(J3DNode*, J3DModel*); @@ -24,7 +28,7 @@ public: void iniTexPttrnAnm(bool); void plyTexPttrnAnm(); void setAnm_tex(signed char); - void setAnm_anm(daNpc_Ba1_c::anm_prm_c*); + void setAnm_anm(anm_prm_c*); void setAnm_NUM(int, int); void setAnm(); void chg_anmTag(); diff --git a/include/d/actor/d_a_npc_bj1.h b/include/d/actor/d_a_npc_bj1.h index c2d000dd8..85b451997 100644 --- a/include/d/actor/d_a_npc_bj1.h +++ b/include/d/actor/d_a_npc_bj1.h @@ -6,6 +6,10 @@ class daNpc_Bj1_c : public fopAc_ac_c { public: + struct anm_prm_c { + + }; + void nodeBj1Control(J3DNode*, J3DModel*); void nodePrpControl(J3DNode*, J3DModel*); void init_BJ4_0(); @@ -17,7 +21,7 @@ public: void setMtx_anmProc(); void setMtx(bool); void anmNum_toResID(int); - void setAnm_anm(daNpc_Bj1_c::anm_prm_c*); + void setAnm_anm(anm_prm_c*); void setAnm_NUM(int); void setAnm(); void setAnm_prp(signed char); diff --git a/include/d/actor/d_a_npc_bm1.h b/include/d/actor/d_a_npc_bm1.h index 58391ff65..ed5b5ccd2 100644 --- a/include/d/actor/d_a_npc_bm1.h +++ b/include/d/actor/d_a_npc_bm1.h @@ -6,6 +6,10 @@ class daNpc_Bm1_c : public fopAc_ac_c { public: + struct anm_prm_c { + + }; + void IamKakkuto() {} void IamSukketo() {} void clr_manzai() {} @@ -46,7 +50,7 @@ public: void iniTexPttrnAnm(bool); void plyTexPttrnAnm(); void setAnm_tex(signed char); - void setAnm_anm(daNpc_Bm1_c::anm_prm_c*); + void setAnm_anm(anm_prm_c*); void setAnm_NUM(int, int); void setAnm(); void setPlaySpd(float); @@ -190,8 +194,8 @@ public: /* 0x8FD */ u8 m8FD; /* 0x8FE */ u8 m8FE[0x900 - 0x8FE]; /* 0x900 */ u8 m900; - /* 0x901 */ daNpc_Bm1_c__Type mType; - /* 0x902 */ daNpc_Bm1_c__SpecificType mSpecificType; + /* 0x901 */ u8 mType; + /* 0x902 */ u8 mSpecificType; /* 0x903 */ u8 mSpawnCondition; /* 0x904 */ u8 m904[0x908 - 0x904]; }; diff --git a/include/d/actor/d_a_npc_co1.h b/include/d/actor/d_a_npc_co1.h index 65e274071..a05a1eede 100644 --- a/include/d/actor/d_a_npc_co1.h +++ b/include/d/actor/d_a_npc_co1.h @@ -6,6 +6,10 @@ class daNpc_Co1_c : public fopAc_ac_c { public: + struct anm_prm_c { + + }; + void nodeCo1Control(J3DNode*, J3DModel*); void init_CO1_0(); void createInit(); @@ -18,7 +22,7 @@ public: void iniTexPttrnAnm(bool); void plyTexPttrnAnm(); void setAnm_tex(signed char); - void setAnm_anm(daNpc_Co1_c::anm_prm_c*); + void setAnm_anm(anm_prm_c*); void setAnm_NUM(int, int); void setAnm(); void chg_anmTag(); diff --git a/include/d/actor/d_a_npc_de1.h b/include/d/actor/d_a_npc_de1.h index 035e551e1..80e989db3 100644 --- a/include/d/actor/d_a_npc_de1.h +++ b/include/d/actor/d_a_npc_de1.h @@ -5,10 +5,14 @@ class daNpc_De1_c : public fopAc_ac_c { public: + struct anm_prm_c { + + }; + void createInit(); void setMtx(); void anmResID(int, int*, int*); - void setAnm_anm(daNpc_De1_c::anm_prm_c*); + void setAnm_anm(anm_prm_c*); void setAnm_NUM(int); void setAnm(); void chngAnmTag(); diff --git a/include/d/actor/d_a_npc_gk1.h b/include/d/actor/d_a_npc_gk1.h index b6fa685ad..1457b0542 100644 --- a/include/d/actor/d_a_npc_gk1.h +++ b/include/d/actor/d_a_npc_gk1.h @@ -6,6 +6,10 @@ class daNpc_Gk1_c : public fopAc_ac_c { public: + struct anm_prm_c { + + }; + void _nodeCB_Head(J3DNode*, J3DModel*); void _nodeCB_Neck(J3DNode*, J3DModel*); void _nodeCB_BackBone(J3DNode*, J3DModel*); @@ -18,7 +22,7 @@ public: void setBtp(signed char, bool); void init_texPttrnAnm(signed char, bool); void play_btp_anm(); - void setAnm_anm(daNpc_Gk1_c::anm_prm_c*); + void setAnm_anm(anm_prm_c*); void setAnm(); void chngAnmTag(); void ctrlAnmTag(); diff --git a/include/d/actor/d_a_npc_gp1.h b/include/d/actor/d_a_npc_gp1.h index bfb044f43..ca7024dfe 100644 --- a/include/d/actor/d_a_npc_gp1.h +++ b/include/d/actor/d_a_npc_gp1.h @@ -6,6 +6,10 @@ class daNpc_Gp1_c : public fopAc_ac_c { public: + struct anm_prm_c { + + }; + void nodeGp1Control(J3DNode*, J3DModel*); void init_GP1_0(); void createInit(); @@ -16,7 +20,7 @@ public: void iniTexPttrnAnm(bool); void plyTexPttrnAnm(); void setAnm_tex(signed char); - void setAnm_anm(daNpc_Gp1_c::anm_prm_c*); + void setAnm_anm(anm_prm_c*); void setAnm_NUM(int, int); void setAnm(); void chg_anmTag(); diff --git a/include/d/actor/d_a_npc_hi1.h b/include/d/actor/d_a_npc_hi1.h index 360ab352a..891138ec4 100644 --- a/include/d/actor/d_a_npc_hi1.h +++ b/include/d/actor/d_a_npc_hi1.h @@ -6,6 +6,10 @@ class daNpc_Hi1_c : public fopAc_ac_c { public: + struct anm_prm_c { + + }; + void _nodeCB_Head(J3DNode*, J3DModel*); void _nodeCB_BackBone(J3DNode*, J3DModel*); void init_HI1_0(); @@ -20,7 +24,7 @@ public: void init_texPttrnAnm(signed char, bool); void play_btp_anm(); void play_btk_anm(); - void setAnm_anm(daNpc_Hi1_c::anm_prm_c*); + void setAnm_anm(anm_prm_c*); void setAnm_NUM(int, int); void setAnm(); void chngAnmTag(); diff --git a/include/d/actor/d_a_npc_jb1.h b/include/d/actor/d_a_npc_jb1.h index 5f91da8bb..cc2d5b95f 100644 --- a/include/d/actor/d_a_npc_jb1.h +++ b/include/d/actor/d_a_npc_jb1.h @@ -9,12 +9,18 @@ class daNpc_Jb1_c : public fopAc_ac_c { public: + struct anm_prm_c { + + }; + + typedef BOOL (daNpc_Jb1_c::*ActionFunc)(void*); + void init_JB1_0(); void createInit(); void setMtx(); void playBrkAnm(J3DAnmTevRegKey*, short*); void anmNum_toResID(int); - void setAnm_anm(daNpc_Jb1_c::anm_prm_c*); + void setAnm_anm(anm_prm_c*); void setAnm(); void chg_anmTag(); void control_anmTag(); @@ -59,7 +65,7 @@ public: /* 0x83C */ u8 m83C[0x848 - 0x83C]; /* 0x848 */ J3DAnmTevRegKey* mCurrentBrkAnim; /* 0x84C */ u8 m84C[0x85C - 0x84C]; - /* 0x85C */ StateFunc mCurStateFunc; + /* 0x85C */ ActionFunc mCurStateFunc; /* 0x868 */ u8 m868[0x8E0 - 0x868]; /* 0x8E0 */ cXyz mCurrentPos; /* 0x8EC */ csXyz mCurrentRot; diff --git a/include/d/actor/d_a_npc_kf1.h b/include/d/actor/d_a_npc_kf1.h index 8169be2e9..19b6deb47 100644 --- a/include/d/actor/d_a_npc_kf1.h +++ b/include/d/actor/d_a_npc_kf1.h @@ -7,6 +7,10 @@ class daNpc_Kf1_c : public fopAc_ac_c { public: + struct anm_prm_c { + + }; + void _nodeCB_Head(J3DNode*, J3DModel*); void _nodeCB_Neck(J3DNode*, J3DModel*); void _nodeCB_BackBone(J3DNode*, J3DModel*); @@ -19,7 +23,7 @@ public: void setBtp(signed char, bool); void init_texPttrnAnm(signed char, bool); void play_btp_anm(); - void setAnm_anm(daNpc_Kf1_c::anm_prm_c*); + void setAnm_anm(anm_prm_c*); void setAnm_NUM(int, int); void setAnm(); void chngAnmTag(); diff --git a/include/d/actor/d_a_npc_kk1.h b/include/d/actor/d_a_npc_kk1.h index e09be5012..8eaa50b37 100644 --- a/include/d/actor/d_a_npc_kk1.h +++ b/include/d/actor/d_a_npc_kk1.h @@ -6,6 +6,10 @@ class daNpc_Kk1_c : public fopAc_ac_c { public: + struct anm_prm_c { + + }; + void getSWbit() {} void _nodeCB_Head(J3DNode*, J3DModel*); @@ -20,7 +24,7 @@ public: void init_texPttrnAnm(signed char, bool); void play_btp_anm(); void play_eff_anm(); - void setAnm_anm(daNpc_Kk1_c::anm_prm_c*); + void setAnm_anm(anm_prm_c*); void setAnm_NUM(int, int); void setAnm(); void chngAnmTag(); diff --git a/include/d/actor/d_a_npc_km1.h b/include/d/actor/d_a_npc_km1.h index efc7b135f..9e1ad6d4b 100644 --- a/include/d/actor/d_a_npc_km1.h +++ b/include/d/actor/d_a_npc_km1.h @@ -5,6 +5,10 @@ class daNpc_Km1_c : public fopAc_ac_c { public: + struct anm_prm_c { + + }; + void getAttPos() {} void getBackboneJntNum() {} void getBackbone_x() {} @@ -22,7 +26,7 @@ public: void init_btp(bool, int); void initTexPatternAnm(bool); void playTexPatternAnm(); - void setAnm_anm(daNpc_Km1_c::anm_prm_c*); + void setAnm_anm(anm_prm_c*); void setAnm(); void chngAnmTag(); void ctrlAnmTag(); diff --git a/include/d/actor/d_a_npc_ko1.h b/include/d/actor/d_a_npc_ko1.h index afa9ebab0..131900ac5 100644 --- a/include/d/actor/d_a_npc_ko1.h +++ b/include/d/actor/d_a_npc_ko1.h @@ -6,6 +6,10 @@ class daNpc_Ko1_c : public fopAc_ac_c { public: + struct anm_prm_c { + + }; + void nodeHedControl(J3DNode*, J3DModel*); void nodeBlnControl(J3DNode*, J3DModel*); void nodeKo1Control(J3DNode*, J3DModel*); @@ -28,8 +32,8 @@ public: void iniTexPttrnAnm(bool); void plyTexPttrnAnm(); void setAnm_tex(signed char); - void setAnm_anm(daNpc_Ko1_c::anm_prm_c*); - void set_balloonAnm_anm(daNpc_Ko1_c::anm_prm_c*); + void setAnm_anm(anm_prm_c*); + void set_balloonAnm_anm(anm_prm_c*); void set_balloonAnm_NUM(int); void setAnm_NUM(int, int); void setAnm(); diff --git a/include/d/actor/d_a_npc_kp1.h b/include/d/actor/d_a_npc_kp1.h index 997642602..8de3e0720 100644 --- a/include/d/actor/d_a_npc_kp1.h +++ b/include/d/actor/d_a_npc_kp1.h @@ -5,6 +5,10 @@ class daNpc_Kp1_c : public fopAc_ac_c { public: + struct anm_prm_c { + + }; + void getAttPos() {} void getBackboneJntNum() {} void getBackbone_x() {} @@ -22,7 +26,7 @@ public: void init_btp(bool, int); void initTexPatternAnm(bool); void playTexPatternAnm(); - void setAnm_anm(daNpc_Kp1_c::anm_prm_c*); + void setAnm_anm(anm_prm_c*); void setAnm_NUM(int, int); void setAnm(); void chngAnmTag(); diff --git a/include/d/actor/d_a_npc_nz.h b/include/d/actor/d_a_npc_nz.h index 4f2da73df..da5fc10a5 100644 --- a/include/d/actor/d_a_npc_nz.h +++ b/include/d/actor/d_a_npc_nz.h @@ -6,6 +6,10 @@ class daNpc_Nz_c : public fopAc_ac_c { public: + enum Proc_e { + + }; + void modeProcInit(int) {} void NodeCallBack(J3DNode*, int); @@ -23,7 +27,7 @@ public: void modeWait(); void modeEventEsaInit(); void modeEventEsa(); - void modeProc(daNpc_Nz_c::Proc_e, int); + void modeProc(Proc_e, int); void createShopItem(unsigned char, unsigned char); void getShopItem(int); void deleteShopItem(); diff --git a/include/d/actor/d_a_npc_ob1.h b/include/d/actor/d_a_npc_ob1.h index 35c452d88..0b39c68c2 100644 --- a/include/d/actor/d_a_npc_ob1.h +++ b/include/d/actor/d_a_npc_ob1.h @@ -6,6 +6,10 @@ class daNpc_Ob1_c : public fopAc_ac_c { public: + struct anm_prm_c { + + }; + void nodeOb1Control(J3DNode*, J3DModel*); void init_OB1_0(); void init_OB1_1(); @@ -18,7 +22,7 @@ public: void iniTexPttrnAnm(bool); void plyTexPttrnAnm(); void setAnm_tex(signed char); - void setAnm_anm(daNpc_Ob1_c::anm_prm_c*); + void setAnm_anm(anm_prm_c*); void setAnm_NUM(int, int); void setAnm(); void chg_anmTag(); diff --git a/include/d/actor/d_a_npc_pf1.h b/include/d/actor/d_a_npc_pf1.h index 8314a9dbe..d29c75f16 100644 --- a/include/d/actor/d_a_npc_pf1.h +++ b/include/d/actor/d_a_npc_pf1.h @@ -6,6 +6,10 @@ class daNpc_Pf1_c : public fopAc_ac_c { public: + struct anm_prm_c { + + }; + void _nodeCB_Head(J3DNode*, J3DModel*); void _nodeCB_BackBone(J3DNode*, J3DModel*); void init_PF1_0(); @@ -17,7 +21,7 @@ public: void setBtp(signed char, bool); void init_texPttrnAnm(signed char, bool); void play_btp_anm(); - void setAnm_anm(daNpc_Pf1_c::anm_prm_c*); + void setAnm_anm(anm_prm_c*); void setAnm_NUM(int, int); void setAnm(); void chngAnmTag(); diff --git a/include/d/actor/d_a_npc_pm1.h b/include/d/actor/d_a_npc_pm1.h index b5e14247b..994a0704a 100644 --- a/include/d/actor/d_a_npc_pm1.h +++ b/include/d/actor/d_a_npc_pm1.h @@ -5,6 +5,10 @@ class daNpc_Pm1_c : public fopAc_ac_c { public: + struct anm_prm_c { + + }; + void getAttPos() {} void getBackboneJntNum() {} void getBackbone_x() {} @@ -22,7 +26,7 @@ public: void init_btp(bool, int); void initTexPatternAnm(bool); void playTexPatternAnm(); - void setAnm_anm(daNpc_Pm1_c::anm_prm_c*); + void setAnm_anm(anm_prm_c*); void setAnm(); void chngAnmTag(); void ctrlAnmTag(); diff --git a/include/d/actor/d_a_npc_so.h b/include/d/actor/d_a_npc_so.h index b00d8cf49..02c567a5f 100644 --- a/include/d/actor/d_a_npc_so.h +++ b/include/d/actor/d_a_npc_so.h @@ -6,6 +6,10 @@ class daNpc_So_c : public fopAc_ac_c { public: + enum Proc_e { + + }; + void cutAppearProc() {} void cutAppearStart() {} void cutDisappearProc() {} @@ -107,7 +111,7 @@ public: void modeGetRupee(); void modeEventTriForceInit(); void modeEventTriForce(); - void modeProc(daNpc_So_c::Proc_e, int); + void modeProc(Proc_e, int); void eventOrder(); void checkOrder(); void setScale(); diff --git a/include/d/actor/d_a_npc_ym1.h b/include/d/actor/d_a_npc_ym1.h index d535a50ac..e0bc841d0 100644 --- a/include/d/actor/d_a_npc_ym1.h +++ b/include/d/actor/d_a_npc_ym1.h @@ -9,6 +9,10 @@ class daNpc_Ym1_c : public fopAc_ac_c { public: + struct anm_prm_c { + + }; + void setKariFlg(); void _nodeCB_Head(J3DNode*, J3DModel*); void _nodeCB_BackBone(J3DNode*, J3DModel*); @@ -26,7 +30,7 @@ public: void btpResID(int); void init_texPttrnAnm(signed char, bool); void play_texPttrnAnm(); - void setAnm_anm(daNpc_Ym1_c::anm_prm_c*); + void setAnm_anm(anm_prm_c*); void setAnm_NUM(int, int); void setAnm(); void chngAnmTag(); diff --git a/include/d/actor/d_a_npc_yw1.h b/include/d/actor/d_a_npc_yw1.h index 80989bb43..e052a8d8a 100644 --- a/include/d/actor/d_a_npc_yw1.h +++ b/include/d/actor/d_a_npc_yw1.h @@ -6,6 +6,10 @@ class daNpc_Yw1_c : public fopAc_ac_c { public: + struct anm_prm_c { + + }; + void _nodeCB_Hair(J3DNode*, J3DModel*); void _nodeCB_Head(J3DNode*, J3DModel*); void _nodeCB_BackBone(J3DNode*, J3DModel*); @@ -21,7 +25,7 @@ public: void btpResID(int); void init_texPttrnAnm(signed char, bool); void play_texPttrnAnm(); - void setAnm_anm(daNpc_Yw1_c::anm_prm_c*); + void setAnm_anm(anm_prm_c*); void setAnm_NUM(int, int); void setAnm(); void chngAnmTag(); diff --git a/include/d/actor/d_a_npc_zk1.h b/include/d/actor/d_a_npc_zk1.h index 14e627491..4298d8260 100644 --- a/include/d/actor/d_a_npc_zk1.h +++ b/include/d/actor/d_a_npc_zk1.h @@ -6,6 +6,10 @@ class daNpc_Zk1_c : public fopAc_ac_c { public: + struct anm_prm_c { + + }; + void _nodeCB_Head(J3DNode*, J3DModel*); void _nodeCB_BackBone(J3DNode*, J3DModel*); void init_ZK1_0(); @@ -17,7 +21,7 @@ public: void setBtp(signed char, bool); void init_texPttrnAnm(signed char, bool); void play_btp_anm(); - void setAnm_anm(daNpc_Zk1_c::anm_prm_c*); + void setAnm_anm(anm_prm_c*); void setAnm(); void chngAnmTag(); void ctrlAnmTag(); diff --git a/include/d/actor/d_a_obj_ashut.h b/include/d/actor/d_a_obj_ashut.h index 39e5b7082..d062fda56 100644 --- a/include/d/actor/d_a_obj_ashut.h +++ b/include/d/actor/d_a_obj_ashut.h @@ -6,6 +6,10 @@ namespace daObjAshut { class Act_c : public fopAc_ac_c { public: + enum Mode_e { + + }; + void is_switch() const {} void prm_get_evId() const {} void prm_get_swSave() const {} @@ -26,7 +30,7 @@ namespace daObjAshut { void mode_lower(); void mode_l_u_init(); void mode_l_u(); - void mode_demoreq_init(daObjAshut::Act_c::Mode_e); + void mode_demoreq_init(Mode_e); void mode_demoreq(); void Execute(float(**)[3][4]); BOOL Draw(); diff --git a/include/d/actor/d_a_obj_barrel2.h b/include/d/actor/d_a_obj_barrel2.h index ef3b9c8d4..81bc0bc31 100644 --- a/include/d/actor/d_a_obj_barrel2.h +++ b/include/d/actor/d_a_obj_barrel2.h @@ -3,17 +3,23 @@ #include "f_op/f_op_actor.h" #include "d/d_cc_d.h" +#include "d/actor/d_a_obj_buoyflag.h" namespace daObjBarrel2 { + enum Type_e { + + }; + class Act_c : public fopAc_ac_c { public: + void attr() const {} void chk_item_give() const {} void delete_req() {} void exit_req() {} void get_item_id() {} - void make_coming(cXyz*, int, daObjBarrel2::Type_e, int, bool, short, daObjBuoyflag::Texture_e) {} - void make_prm(daObjBarrel2::Type_e, int, bool, bool, daObjBuoyflag::Texture_e) {} + void make_coming(cXyz*, int, Type_e, int, bool, short, daObjBuoyflag::Texture_e) {} + void make_prm(Type_e, int, bool, bool, daObjBuoyflag::Texture_e) {} void prm_get_buoy() const {} void prm_get_coming() const {} void prm_get_itemNo() const {} diff --git a/include/d/actor/d_a_obj_buoyflag.h b/include/d/actor/d_a_obj_buoyflag.h index d749906f4..68be49bcf 100644 --- a/include/d/actor/d_a_obj_buoyflag.h +++ b/include/d/actor/d_a_obj_buoyflag.h @@ -24,7 +24,7 @@ namespace daObjBuoyflag { roomNo, angle, NULL, -1, NULL ); } - static u32 prm_make(daObjBuoyflag::Type_e, daObjBuoyflag::Texture_e, bool) { + static u32 prm_make(Type_e, Texture_e, bool) { // TODO: placeholder function return 0; } @@ -35,8 +35,8 @@ namespace daObjBuoyflag { inline BOOL _draw(); inline BOOL _execute(); void jump_to_sea(float, float, short) {} - void make_barrel2_mine(unsigned int, cXyz*, int, csXyz*, daObjBuoyflag::Texture_e, bool) {} - void make_barrel2_norm(unsigned int, cXyz*, int, csXyz*, daObjBuoyflag::Texture_e) {} + void make_barrel2_mine(unsigned int, cXyz*, int, csXyz*, Texture_e, bool) {} + void make_barrel2_norm(unsigned int, cXyz*, int, csXyz*, Texture_e) {} void attr_type() const {} void prm_get_noCull() const {} void prm_get_texture() const {} diff --git a/include/d/actor/d_a_obj_canon.h b/include/d/actor/d_a_obj_canon.h index 69c04c378..e5ff236f8 100644 --- a/include/d/actor/d_a_obj_canon.h +++ b/include/d/actor/d_a_obj_canon.h @@ -6,6 +6,10 @@ class daObj_Canon_c : public fopAc_ac_c { public: + enum Proc_e { + + }; + void modeProcInit(int) {} void _nodeControl(J3DNode*, J3DModel*); @@ -27,7 +31,7 @@ public: void modeSwWait(); void modeAppearInit(); void modeAppear(); - void modeProc(daObj_Canon_c::Proc_e, int); + void modeProc(Proc_e, int); BOOL _execute(); void debugDraw(); BOOL _draw(); diff --git a/include/d/actor/d_a_obj_coming.h b/include/d/actor/d_a_obj_coming.h index a6c74082d..40ab82179 100644 --- a/include/d/actor/d_a_obj_coming.h +++ b/include/d/actor/d_a_obj_coming.h @@ -4,8 +4,24 @@ #include "f_op/f_op_actor.h" namespace daObjComing { + struct PrmBarrel2_c { + + }; + + struct Ctrl_c { + + }; + class Act_c : public fopAc_ac_c { public: + enum Ptn_e { + + }; + + struct MakeTmp_c { + + }; + void prm_get_always() const {} void prm_get_makeNum() const {} void prm_get_range() const {} @@ -21,18 +37,18 @@ namespace daObjComing { void chk_ship_range(const fopAc_ac_c*) const; void chk_ship_spd(const fopAc_ac_c*) const; void get_make_pos(const fopAc_ac_c*, cXyz*) const; - void chk_make_pos_gnd(const daObjComing::Act_c::MakeTmp_c*) const; - void chk_make_pos_wall(const daObjComing::Act_c::MakeTmp_c*) const; + void chk_make_pos_gnd(const MakeTmp_c*) const; + void chk_make_pos_wall(const MakeTmp_c*) const; void chk_make_pos_act(void*, void*); - void chk_make_pos(const daObjComing::Act_c::MakeTmp_c*) const; + void chk_make_pos(const MakeTmp_c*) const; void barrel2_get_ptn() const; - void barrel2_get_type(daObjComing::Act_c::Ptn_e); - void barrel2_get_item(daObjComing::Act_c::Ptn_e); - void barrel2_get_buoy(daObjComing::Act_c::Ptn_e); - void barrel2_get_param(daObjComing::PrmBarrel2_c*); - void mode_barrel2_wait(daObjComing::Ctrl_c*); - void mode_barrel2_appear(daObjComing::Ctrl_c*); - void mode_barrel2_leave(daObjComing::Ctrl_c*); + void barrel2_get_type(Ptn_e); + void barrel2_get_item(Ptn_e); + void barrel2_get_buoy(Ptn_e); + void barrel2_get_param(PrmBarrel2_c*); + void mode_barrel2_wait(Ctrl_c*); + void mode_barrel2_appear(Ctrl_c*); + void mode_barrel2_leave(Ctrl_c*); BOOL _execute(); BOOL _draw(); diff --git a/include/d/actor/d_a_obj_correct.h b/include/d/actor/d_a_obj_correct.h index fff43d562..97c30fcc8 100644 --- a/include/d/actor/d_a_obj_correct.h +++ b/include/d/actor/d_a_obj_correct.h @@ -5,6 +5,10 @@ #include "d/actor/d_a_obj_try.h" namespace daObjCorrect { + enum Type_e { + + }; + class Act_c : public fopAc_ac_c { public: void prm_get_evId() const {} @@ -14,8 +18,8 @@ namespace daObjCorrect { s32 _create(); BOOL _delete(); void chk_try_actor0(fopAc_ac_c*); - void chk_try_actor1(daObjTry::Act_c*, daObjTry::Type_e, float) const; - void chk_try_actor2(daObjTry::Act_c*, daObjTry::Type_e, bool, float, float) const; + void chk_try_actor1(Act_c*, Type_e, float) const; + void chk_try_actor2(Act_c*, Type_e, bool, float, float) const; void search_movebox(void*, void*); void search_tryColSun(void*, void*); void search_tryColMer(void*, void*); diff --git a/include/d/actor/d_a_obj_hlift.h b/include/d/actor/d_a_obj_hlift.h index ebad7a15e..5b09a1697 100644 --- a/include/d/actor/d_a_obj_hlift.h +++ b/include/d/actor/d_a_obj_hlift.h @@ -6,6 +6,10 @@ namespace daObjHlift { class Act_c : public fopAc_ac_c { public: + enum Mode_e { + + }; + void prm_get_dist() const {} void prm_get_evId() const {} void prm_get_size() const {} @@ -24,7 +28,7 @@ namespace daObjHlift { void mode_upper(); void mode_u_l_init(); void mode_u_l(); - void mode_demoreq_init(daObjHlift::Act_c::Mode_e); + void mode_demoreq_init(Mode_e); void mode_demoreq(); void set_mtx(); void init_mtx(); diff --git a/include/d/actor/d_a_obj_ikada.h b/include/d/actor/d_a_obj_ikada.h index 9a234e159..8e2e30640 100644 --- a/include/d/actor/d_a_obj_ikada.h +++ b/include/d/actor/d_a_obj_ikada.h @@ -15,6 +15,10 @@ class daObj_Ikada_c : public fopAc_ac_c { public: + enum Proc_e { + + }; + void getCranePos() {} void getFrame() {} void getMode() {} @@ -41,7 +45,7 @@ public: void incRopeCnt(int, int); void setRopePos(); void setMtx(); - void modeProc(daObj_Ikada_c::Proc_e, int); + void modeProc(Proc_e, int); void modeWaitInit(); void modeWait(); void modeCraneUpInit(); diff --git a/include/d/actor/d_a_obj_search.h b/include/d/actor/d_a_obj_search.h index 2d09dbc49..4c69272c2 100644 --- a/include/d/actor/d_a_obj_search.h +++ b/include/d/actor/d_a_obj_search.h @@ -7,6 +7,10 @@ namespace daObj_Search { class Act_c : public fopAc_ac_c { public: + enum Proc_e { + + }; + void getFindFlag() {} void isSecond() {} void modeProcInit(int) {} @@ -34,7 +38,7 @@ namespace daObj_Search { void modeFind2nd(); void modeSearchBdkInit(); void modeSearchBdk(); - void modeProc(daObj_Search::Act_c::Proc_e, int); + void modeProc(Proc_e, int); void attr() const; void SetArgData(); void CreateInit(); @@ -59,6 +63,11 @@ namespace daObj_Search { public: /* Place member variables here */ }; + + class Bgc_c { + public: + void wall_pos(const daObj_Search::Act_c*, cXyz*, cXyz*, bool*, float*); + }; }; #endif /* D_A_OBJ_SEARCH_H */ diff --git a/include/d/actor/d_a_obj_warpt.h b/include/d/actor/d_a_obj_warpt.h index ab34fde8a..004cce4bd 100644 --- a/include/d/actor/d_a_obj_warpt.h +++ b/include/d/actor/d_a_obj_warpt.h @@ -5,6 +5,10 @@ class daObj_Warpt_c : public fopAc_ac_c { public: + enum Proc_e { + + }; + void modeProcInit(int) {} void _createHeap(); @@ -36,7 +40,7 @@ public: void spWarp(); void modeEventOpenInit(); void modeEventOpen(); - void modeProc(daObj_Warpt_c::Proc_e, int); + void modeProc(Proc_e, int); BOOL _execute(); BOOL _draw(); void getArg(); diff --git a/include/d/actor/d_a_oship.h b/include/d/actor/d_a_oship.h index faeeb331e..20f58cd14 100644 --- a/include/d/actor/d_a_oship.h +++ b/include/d/actor/d_a_oship.h @@ -14,6 +14,10 @@ class daOship_c : public fopAc_ac_c { public: + enum Proc_e { + + }; + void getSw() {} void isSpecial() {} void modeProcInit(int) {} @@ -47,7 +51,7 @@ public: void modeAttack(); void modeDeleteInit(); void modeDelete(); - void modeProc(daOship_c::Proc_e, int); + void modeProc(Proc_e, int); BOOL _execute(); BOOL _draw(); void createInit(); diff --git a/include/d/actor/d_a_pz.h b/include/d/actor/d_a_pz.h index fb3ab1e29..032eb6f23 100644 --- a/include/d/actor/d_a_pz.h +++ b/include/d/actor/d_a_pz.h @@ -10,6 +10,10 @@ class daPz_c : public fopAc_ac_c { public: + enum Proc_e { + + }; + void getRightHandMatrix() {} void isAnm(signed char) {} void isEyeAnm(signed char) {} @@ -73,7 +77,7 @@ public: void modeTalk(); void modeFollowInit(); void modeFollow(); - void modeProc(daPz_c::Proc_e, int); + void modeProc(Proc_e, int); BOOL _execute(); void bowDraw(); void bodyDraw(); diff --git a/include/d/actor/d_a_tag_ghostship.h b/include/d/actor/d_a_tag_ghostship.h index 64b5f6b12..40b26dea5 100644 --- a/include/d/actor/d_a_tag_ghostship.h +++ b/include/d/actor/d_a_tag_ghostship.h @@ -5,13 +5,17 @@ class daTag_Gship_c : public fopAc_ac_c { public: + enum Proc_e { + + }; + void modeProcInit(int) {} void modeClearWaitInit(); void modeClearWait(); void modeClearEventInit(); void modeClearEvent(); - void modeProc(daTag_Gship_c::Proc_e, int); + void modeProc(Proc_e, int); BOOL _execute(); BOOL _draw(); void getArg(); diff --git a/include/d/d_lib.h b/include/d/d_lib.h index c55e3ece3..f5b3686cb 100644 --- a/include/d/d_lib.h +++ b/include/d/d_lib.h @@ -72,8 +72,16 @@ public: /* 0x22 */ s16 mAngleSpeed; }; -class dLib_circle_path_c; -class dLib_wave_c; +class dLib_wave_c { +public: + /* 0x00 */ s16 mAngX; + /* 0x02 */ s16 mAngZ; + /* 0x04 */ s16 mAnimX; + /* 0x06 */ s16 mAnimZ; + /* 0x08 */ s16 mRotX; + /* 0x0A */ s16 mRotZ; +}; + class dLib_anm_idx_c; void dLib_setCirclePath(dLib_circle_path_c*); diff --git a/src/d/actor/d_a_npc_jb1.cpp b/src/d/actor/d_a_npc_jb1.cpp index 1bd5017c0..8e6ca0b68 100644 --- a/src/d/actor/d_a_npc_jb1.cpp +++ b/src/d/actor/d_a_npc_jb1.cpp @@ -142,7 +142,7 @@ void daNpc_Jb1_c::event_proc(int) { } /* 00000B44-00000BF0 .text set_action__11daNpc_Jb1_cFM11daNpc_Jb1_cFPCvPvPv_iPv */ -void daNpc_Jb1_c::set_action(int (daNpc_Jb1_c::*)(void*), void*) { +void daNpc_Jb1_c::set_action(ActionFunc, void*) { /* Nonmatching */ } diff --git a/src/d/actor/d_a_obj_hole.cpp b/src/d/actor/d_a_obj_hole.cpp index 27ec1eb4b..2f63ed092 100644 --- a/src/d/actor/d_a_obj_hole.cpp +++ b/src/d/actor/d_a_obj_hole.cpp @@ -41,10 +41,18 @@ static daObj_Hole_HIO_c l_HIO; class daObj_Hole_c : public fopAc_ac_c { public: enum Proc_e { - PROC_MODE_WAIT, - PROC_MODE_EVENT + PROC_INIT = 0, + PROC_EXEC = 1 }; + enum Mode { + MODE_WAIT = 0, + MODE_EVENT = 1, + MODE_NULL, + }; + + void modeProcInit(int newMode) { modeProc(PROC_INIT, newMode); } + void setMtx(); void getPosAndAngle(); @@ -68,7 +76,7 @@ public: static const char m_arc_name[]; - /* 0x0290 */ s32 mState; + /* 0x0290 */ s32 mMode; /* 0x0294 */ u8 mHasModel; /* 0x0295 */ u8 mExitIdx; /* 0x0296 */ u16 mScaleLocal; @@ -105,7 +113,7 @@ void daObj_Hole_c::setMtx() { adjustPos.z = current.pos.z; adjustPos.y += l_HIO.m0010; - if (mState != 1) { + if (mMode != MODE_EVENT) { shape_angle.y = fopCamM_GetAngleY(dComIfGp_getCamera(0)) + 0x8000; } @@ -169,7 +177,7 @@ void daObj_Hole_c::modeWait() { } if (dLib_checkPlayerInCircle(current.pos, scale, 20.0f)) { - modeProc(PROC_MODE_WAIT, 1); + modeProcInit(MODE_EVENT); } } @@ -201,7 +209,7 @@ void daObj_Hole_c::modeEvent() { } /* 000005D0-000006C0 .text modeProc__12daObj_Hole_cFQ212daObj_Hole_c6Proc_ei */ -void daObj_Hole_c::modeProc(daObj_Hole_c::Proc_e mode, int i_nextState) { +void daObj_Hole_c::modeProc(daObj_Hole_c::Proc_e proc, int newMode) { typedef void (daObj_Hole_c::*daObjHole_mode_t)(void); struct mode_struct { @@ -223,18 +231,18 @@ void daObj_Hole_c::modeProc(daObj_Hole_c::Proc_e mode, int i_nextState) { } }; - if (mode == PROC_MODE_WAIT) { - mState = i_nextState; - (this->*mode_tbl[mState].init)(); + if (proc == PROC_INIT) { + mMode = newMode; + (this->*mode_tbl[mMode].init)(); } - else if (mode == PROC_MODE_EVENT) { - (this->*mode_tbl[mState].exec)(); + else if (proc == PROC_EXEC) { + (this->*mode_tbl[mMode].exec)(); } } /* 000006C0-00000700 .text _execute__12daObj_Hole_cFv */ s32 daObj_Hole_c::_execute() { - modeProc(PROC_MODE_EVENT, 2); + modeProc(PROC_EXEC, MODE_NULL); setMtx(); return 0; } @@ -263,7 +271,7 @@ s32 daObj_Hole_c::_draw() { /* 000007BC-00000864 .text createInit__12daObj_Hole_cFv */ void daObj_Hole_c::createInit() { - modeProc(PROC_MODE_WAIT, 0); + modeProcInit(MODE_WAIT); fopAcM_SetMtx(this, mpMdl->getBaseTRMtx()); fopAcM_setCullSizeFar(this, 10.0f);