diff --git a/include/d/actor/d_a_bomb.h b/include/d/actor/d_a_bomb.h index fc5a2f28d..bd8b16f8e 100644 --- a/include/d/actor/d_a_bomb.h +++ b/include/d/actor/d_a_bomb.h @@ -89,7 +89,7 @@ public: void eff_explode_normal(const csXyz*); void eff_explode_cheap(const csXyz*); void eff_explode(); - int procExplode_init(); + BOOL procExplode_init(); bool procExplode(); bool procCarry_init(); bool procCarry(); diff --git a/include/d/actor/d_a_branch.h b/include/d/actor/d_a_branch.h index 95e47d36a..a3e2892b4 100644 --- a/include/d/actor/d_a_branch.h +++ b/include/d/actor/d_a_branch.h @@ -25,8 +25,8 @@ public: void set_anim(int, int, int); void demoPlay(mDoExt_McaMorf*); - int CreateHeap(); - static int solidHeapCB(fopAc_ac_c*); + BOOL CreateHeap(); + static BOOL solidHeapCB(fopAc_ac_c*); MtxP getJointMtx(const char*); diff --git a/include/d/actor/d_a_fan.h b/include/d/actor/d_a_fan.h index b4038055a..b881079aa 100644 --- a/include/d/actor/d_a_fan.h +++ b/include/d/actor/d_a_fan.h @@ -15,7 +15,7 @@ public: void set_mtx(); void set_wind_length(f32); void set_cps(f32); - virtual int Execute(Mtx**); + virtual BOOL Execute(Mtx**); virtual BOOL Draw(); public: diff --git a/include/d/actor/d_a_hmlif.h b/include/d/actor/d_a_hmlif.h index 487bd2d5f..c3cbdabac 100644 --- a/include/d/actor/d_a_hmlif.h +++ b/include/d/actor/d_a_hmlif.h @@ -1,17 +1,17 @@ #ifndef D_A_HMLIF_H #define D_A_HMLIF_H -#include "f_op/f_op_actor.h" +#include "d/d_bg_s_movebg_actor.h" -class daHmlif_c : public fopAc_ac_c { +class daHmlif_c : public dBgS_MoveBgActor { public: - BOOL Delete(); + virtual BOOL Delete(); void daHmlifDelete(); - void CreateHeap(); - s32 Create(); + virtual BOOL CreateHeap(); + virtual BOOL Create(); cPhs_State daHmlifCreate(); void set_mtx(); - void Execute(float(**)[3][4]); + virtual BOOL Execute(Mtx**); void move(); void set_se(); void anim_play(); @@ -21,7 +21,7 @@ public: void set_next_pnt(); void setNextPath(); void chkSwitchPathType(); - BOOL Draw(); + virtual BOOL Draw(); public: /* Place member variables here */ diff --git a/include/d/actor/d_a_hys.h b/include/d/actor/d_a_hys.h index 6befebb8e..31ca8d0f3 100644 --- a/include/d/actor/d_a_hys.h +++ b/include/d/actor/d_a_hys.h @@ -1,23 +1,23 @@ #ifndef D_A_HYS_H #define D_A_HYS_H -#include "f_op/f_op_actor.h" +#include "d/d_bg_s_movebg_actor.h" -class daHys_c : public fopAc_ac_c { +class daHys_c : public dBgS_MoveBgActor { public: inline cPhs_State _create(); void set_mtx(); - BOOL Delete(); - void CreateHeap(); - s32 Create(); - void Execute(float(**)[3][4]); + virtual BOOL Delete(); + virtual BOOL CreateHeap(); + virtual BOOL Create(); + virtual BOOL Execute(Mtx**); void mode_proc_call(); void mode_wait(); void mode_sw_on_init(); void mode_sw_on(); void mode_wait_init(); - BOOL Draw(); + virtual BOOL Draw(); public: /* Place member variables here */ diff --git a/include/d/actor/d_a_obj_ashut.h b/include/d/actor/d_a_obj_ashut.h index 0c1da3456..a4d79403c 100644 --- a/include/d/actor/d_a_obj_ashut.h +++ b/include/d/actor/d_a_obj_ashut.h @@ -1,10 +1,10 @@ #ifndef D_A_OBJ_ASHUT_H #define D_A_OBJ_ASHUT_H -#include "f_op/f_op_actor.h" +#include "d/d_bg_s_movebg_actor.h" namespace daObjAshut { - class Act_c : public fopAc_ac_c { + class Act_c : public dBgS_MoveBgActor { public: enum Mode_e { @@ -14,10 +14,10 @@ namespace daObjAshut { void prm_get_evId() const {} void prm_get_swSave() const {} - void CreateHeap(); - s32 Create(); + virtual BOOL CreateHeap(); + virtual BOOL Create(); cPhs_State Mthd_Create(); - BOOL Delete(); + virtual BOOL Delete(); BOOL Mthd_Delete(); void set_mtx(); void init_mtx(); @@ -32,8 +32,8 @@ namespace daObjAshut { void mode_l_u(); void mode_demoreq_init(Mode_e); void mode_demoreq(); - void Execute(float(**)[3][4]); - BOOL Draw(); + virtual BOOL Execute(Mtx**); + virtual BOOL Draw(); public: /* Place member variables here */ diff --git a/include/d/actor/d_a_obj_aygr.h b/include/d/actor/d_a_obj_aygr.h index b4c28a3a7..a77c32310 100644 --- a/include/d/actor/d_a_obj_aygr.h +++ b/include/d/actor/d_a_obj_aygr.h @@ -1,22 +1,22 @@ #ifndef D_A_OBJ_AYGR_H #define D_A_OBJ_AYGR_H -#include "f_op/f_op_actor.h" +#include "d/d_bg_s_movebg_actor.h" namespace daObjAygr { - class Act_c : public fopAc_ac_c { + class Act_c : public dBgS_MoveBgActor { public: void prm_get_mdl() const {} - void CreateHeap(); - s32 Create(); + virtual BOOL CreateHeap(); + virtual BOOL Create(); cPhs_State Mthd_Create(); - BOOL Delete(); + virtual BOOL Delete(); BOOL Mthd_Delete(); void set_mtx(); void init_mtx(); - void Execute(float(**)[3][4]); - BOOL Draw(); + virtual BOOL Execute(Mtx**); + virtual BOOL Draw(); public: /* Place member variables here */ diff --git a/include/d/actor/d_a_obj_drift.h b/include/d/actor/d_a_obj_drift.h index 2da542650..258de1543 100644 --- a/include/d/actor/d_a_obj_drift.h +++ b/include/d/actor/d_a_obj_drift.h @@ -1,21 +1,22 @@ #ifndef D_A_OBJ_DRIFT_H #define D_A_OBJ_DRIFT_H +#include "d/d_bg_s_movebg_actor.h" #include "f_op/f_op_actor.h" #include "d/d_bg_w.h" namespace daObjDrift { - class Act_c : public fopAc_ac_c { + class Act_c : public dBgS_MoveBgActor { public: void prm_get_type() const {} - void CreateHeap(); - s32 Create(); + virtual BOOL CreateHeap(); + virtual BOOL Create(); cPhs_State Mthd_Create(); void make_flower(); void calc_flower_param(cXyz*, csXyz*); void set_flower_current(); - BOOL Delete(); + virtual BOOL Delete(); BOOL Mthd_Delete(); void mode_wait_init(); void mode_wait(); @@ -25,8 +26,8 @@ namespace daObjDrift { void init_mtx(); void rideCB(dBgW*, fopAc_ac_c*, fopAc_ac_c*); void set_current(); - void Execute(float(**)[3][4]); - BOOL Draw(); + virtual BOOL Execute(Mtx**); + virtual BOOL Draw(); public: /* Place member variables here */ diff --git a/include/d/actor/d_a_obj_ekskz.h b/include/d/actor/d_a_obj_ekskz.h index e26166a21..bca86d5e2 100644 --- a/include/d/actor/d_a_obj_ekskz.h +++ b/include/d/actor/d_a_obj_ekskz.h @@ -19,7 +19,7 @@ namespace daObjEkskz { BOOL Mthd_Delete(); void set_mtx(); void init_mtx(); - virtual BOOL Execute(float(**)[3][4]); + virtual BOOL Execute(Mtx**); virtual BOOL Draw(); public: diff --git a/include/d/actor/d_a_obj_hami2.h b/include/d/actor/d_a_obj_hami2.h index 11a527c5f..7b4c36881 100644 --- a/include/d/actor/d_a_obj_hami2.h +++ b/include/d/actor/d_a_obj_hami2.h @@ -1,17 +1,17 @@ #ifndef D_A_OBJ_HAMI2_H #define D_A_OBJ_HAMI2_H -#include "f_op/f_op_actor.h" +#include "d/d_bg_s_movebg_actor.h" namespace daObjHami2 { - class Act_c : public fopAc_ac_c { + class Act_c : public dBgS_MoveBgActor { public: void prm_get_swSave() const {} - void CreateHeap(); - s32 Create(); + virtual BOOL CreateHeap(); + virtual BOOL Create(); cPhs_State Mthd_Create(); - BOOL Delete(); + virtual BOOL Delete(); BOOL Mthd_Delete(); void set_mtx(); void init_mtx(); @@ -21,8 +21,8 @@ namespace daObjHami2 { void daObjHami2_open_stop(); void daObjHami2_close_demo_wait(); void daObjHami2_close_demo(); - void Execute(float(**)[3][4]); - BOOL Draw(); + virtual BOOL Execute(Mtx**); + virtual BOOL Draw(); public: /* Place member variables here */ diff --git a/include/d/actor/d_a_obj_hami3.h b/include/d/actor/d_a_obj_hami3.h index 572611b50..d42d68cfb 100644 --- a/include/d/actor/d_a_obj_hami3.h +++ b/include/d/actor/d_a_obj_hami3.h @@ -1,19 +1,19 @@ #ifndef D_A_OBJ_HAMI3_H #define D_A_OBJ_HAMI3_H -#include "f_op/f_op_actor.h" +#include "d/d_bg_s_movebg_actor.h" namespace daObjHami3 { - class Act_c : public fopAc_ac_c { + class Act_c : public dBgS_MoveBgActor { public: void prm_get_sound() const {} void prm_get_swSave() const {} void prm_get_swSave2() const {} - void CreateHeap(); - s32 Create(); + virtual BOOL CreateHeap(); + virtual BOOL Create(); cPhs_State Mthd_Create(); - BOOL Delete(); + virtual BOOL Delete(); BOOL Mthd_Delete(); void set_mtx(); void init_mtx(); @@ -23,8 +23,8 @@ namespace daObjHami3 { void daObjHami3_open_stop(); void daObjHami3_close_demo_wait(); void daObjHami3_close_demo(); - void Execute(float(**)[3][4]); - BOOL Draw(); + virtual BOOL Execute(Mtx**); + virtual BOOL Draw(); public: /* Place member variables here */ diff --git a/include/d/actor/d_a_obj_hlift.h b/include/d/actor/d_a_obj_hlift.h index f464c8886..3d1b6fd1f 100644 --- a/include/d/actor/d_a_obj_hlift.h +++ b/include/d/actor/d_a_obj_hlift.h @@ -1,10 +1,10 @@ #ifndef D_A_OBJ_HLIFT_H #define D_A_OBJ_HLIFT_H -#include "f_op/f_op_actor.h" +#include "d/d_bg_s_movebg_actor.h" namespace daObjHlift { - class Act_c : public fopAc_ac_c { + class Act_c : public dBgS_MoveBgActor { public: enum Mode_e { @@ -15,10 +15,10 @@ namespace daObjHlift { void prm_get_size() const {} void prm_get_swSave() const {} - void CreateHeap(); - s32 Create(); + virtual BOOL CreateHeap(); + virtual BOOL Create(); cPhs_State Mthd_Create(); - BOOL Delete(); + virtual BOOL Delete(); BOOL Mthd_Delete(); void mode_lower_init(); void mode_lower(); @@ -37,8 +37,8 @@ namespace daObjHlift { void vib_proc(); void chk_demo_end(); void se_whole(); - void Execute(float(**)[3][4]); - BOOL Draw(); + virtual BOOL Execute(Mtx**); + virtual BOOL Draw(); public: /* Place member variables here */ diff --git a/include/d/actor/d_a_obj_jump.h b/include/d/actor/d_a_obj_jump.h index 0871823e7..55debba0d 100644 --- a/include/d/actor/d_a_obj_jump.h +++ b/include/d/actor/d_a_obj_jump.h @@ -1,13 +1,14 @@ #ifndef D_A_OBJ_JUMP_H #define D_A_OBJ_JUMP_H +#include "d/d_bg_s_movebg_actor.h" #include "f_op/f_op_actor.h" #include "d/d_bg_w.h" class J3DNode; namespace daObjJump { - class Act_c : public fopAc_ac_c { + class Act_c : public dBgS_MoveBgActor { public: static u32 prm_make_b() { return 1; @@ -20,10 +21,10 @@ namespace daObjJump { void attr() const {} void prm_get_type() const {} - void CreateHeap(); - s32 Create(); + virtual BOOL CreateHeap(); + virtual BOOL Create(); cPhs_State Mthd_Create(); - BOOL Delete(); + virtual BOOL Delete(); BOOL Mthd_Delete(); void set_mtx(); void init_mtx(); @@ -44,11 +45,11 @@ namespace daObjJump { void mode_upper(); void mode_u_w_init(); void mode_u_w(); - void Execute(float(**)[3][4]); - BOOL Draw(); + virtual BOOL Execute(Mtx**); + virtual BOOL Draw(); public: - /* 0x290 */ u8 m290[0x336 - 0x290]; + /* 0x2C8 */ u8 m2C8[0x336 - 0x2C8]; /* 0x336 */ u8 m336; /* 0x337 */ u8 m337[0x358 - 0x337]; }; diff --git a/include/d/actor/d_a_obj_mkie.h b/include/d/actor/d_a_obj_mkie.h index 81a5fc770..410b2b2bb 100644 --- a/include/d/actor/d_a_obj_mkie.h +++ b/include/d/actor/d_a_obj_mkie.h @@ -1,10 +1,10 @@ #ifndef D_A_OBJ_MKIE_H #define D_A_OBJ_MKIE_H -#include "f_op/f_op_actor.h" +#include "d/d_bg_s_movebg_actor.h" namespace daObjMkie { - class Act_c : public fopAc_ac_c { + class Act_c : public dBgS_MoveBgActor { public: static u32 prm_make(u8 eventId, int swNo) { return swNo << 0x10 | (eventId | 0x3000); @@ -20,12 +20,12 @@ namespace daObjMkie { void prm_get_swSave() const {} void prm_get_type() const {} - void CreateHeap(); + virtual BOOL CreateHeap(); void init_cc(); void set_cc_pos(); - s32 Create(); + virtual BOOL Create(); cPhs_State Mthd_Create(); - BOOL Delete(); + virtual BOOL Delete(); BOOL Mthd_Delete(); void set_mtx(); void init_mtx(); @@ -40,11 +40,11 @@ namespace daObjMkie { void mode_demo_init(); void mode_demo(); void mode_proc_call(); - void Execute(float(**)[3][4]); - BOOL Draw(); + virtual BOOL Execute(Mtx**); + virtual BOOL Draw(); public: - /* 0x290 */ u8 m290[0xF58 - 0x290]; + /* 0x2C8 */ u8 m2C8[0xF58 - 0x2C8]; /* 0xF58 */ u8 mF58; /* 0xF59 */ u8 mF59[0xF64 - 0xF59]; }; diff --git a/include/d/actor/d_a_obj_mkiek.h b/include/d/actor/d_a_obj_mkiek.h index 8dcf6c679..6dd494003 100644 --- a/include/d/actor/d_a_obj_mkiek.h +++ b/include/d/actor/d_a_obj_mkiek.h @@ -1,26 +1,26 @@ #ifndef D_A_OBJ_MKIEK_H #define D_A_OBJ_MKIEK_H -#include "f_op/f_op_actor.h" +#include "d/d_bg_s_movebg_actor.h" namespace daObjMkiek { - class Act_c : public fopAc_ac_c { + class Act_c : public dBgS_MoveBgActor { public: void prm_get_sound() const {} void prm_get_swSave() const {} - void CreateHeap(); - s32 Create(); + virtual BOOL CreateHeap(); + virtual BOOL Create(); cPhs_State Mthd_Create(); - BOOL Delete(); + virtual BOOL Delete(); BOOL Mthd_Delete(); void set_mtx(); void init_mtx(); void check(); void demo_wait(); void demo(); - void Execute(float(**)[3][4]); - BOOL Draw(); + virtual BOOL Execute(Mtx**); + virtual BOOL Draw(); public: /* Place member variables here */ diff --git a/include/d/actor/d_a_obj_msdan_sub.h b/include/d/actor/d_a_obj_msdan_sub.h index 73977f7d6..10677295f 100644 --- a/include/d/actor/d_a_obj_msdan_sub.h +++ b/include/d/actor/d_a_obj_msdan_sub.h @@ -1,24 +1,24 @@ #ifndef D_A_OBJ_MSDAN_SUB_H #define D_A_OBJ_MSDAN_SUB_H -#include "f_op/f_op_actor.h" +#include "d/d_bg_s_movebg_actor.h" namespace daObjMsdanSub { - class Act_c : public fopAc_ac_c { + class Act_c : public dBgS_MoveBgActor { public: void prm_get_objNo() const {} void prm_get_size() const {} void prm_get_swSave() const {} - void CreateHeap(); - s32 Create(); + virtual BOOL CreateHeap(); + virtual BOOL Create(); cPhs_State Mthd_Create(); - BOOL Delete(); + virtual BOOL Delete(); BOOL Mthd_Delete(); void set_mtx(); void init_mtx(); - void Execute(float(**)[3][4]); - BOOL Draw(); + virtual BOOL Execute(Mtx**); + virtual BOOL Draw(); public: /* Place member variables here */ diff --git a/include/d/actor/d_a_obj_msdan_sub2.h b/include/d/actor/d_a_obj_msdan_sub2.h index b6ca85ec6..1aa53fd4a 100644 --- a/include/d/actor/d_a_obj_msdan_sub2.h +++ b/include/d/actor/d_a_obj_msdan_sub2.h @@ -1,23 +1,23 @@ #ifndef D_A_OBJ_MSDAN_SUB2_H #define D_A_OBJ_MSDAN_SUB2_H -#include "f_op/f_op_actor.h" +#include "d/d_bg_s_movebg_actor.h" namespace daObjMsdanSub2 { - class Act_c : public fopAc_ac_c { + class Act_c : public dBgS_MoveBgActor { public: void prm_get_objNo() const {} void prm_get_swSave() const {} - void CreateHeap(); - s32 Create(); + virtual BOOL CreateHeap(); + virtual BOOL Create(); cPhs_State Mthd_Create(); - BOOL Delete(); + virtual BOOL Delete(); BOOL Mthd_Delete(); void set_mtx(); void init_mtx(); - void Execute(float(**)[3][4]); - BOOL Draw(); + virtual BOOL Execute(Mtx**); + virtual BOOL Draw(); public: /* Place member variables here */ diff --git a/include/d/actor/d_a_obj_nest.h b/include/d/actor/d_a_obj_nest.h index 214360dd1..9f75616ff 100644 --- a/include/d/actor/d_a_obj_nest.h +++ b/include/d/actor/d_a_obj_nest.h @@ -1,24 +1,25 @@ #ifndef D_A_OBJ_NEST_H #define D_A_OBJ_NEST_H +#include "d/d_bg_s_movebg_actor.h" #include "f_op/f_op_actor.h" #include "d/d_bg_w.h" namespace daObjNest { - class Act_c : public fopAc_ac_c { + class Act_c : public dBgS_MoveBgActor { public: - void CreateHeap(); - s32 Create(); + virtual BOOL CreateHeap(); + virtual BOOL Create(); cPhs_State Mthd_Create(); - BOOL Delete(); + virtual BOOL Delete(); BOOL Mthd_Delete(); void set_mtx(); void init_mtx(); void rideCB(dBgW*, fopAc_ac_c*, fopAc_ac_c*); void vib_set(float); void vib_proc(); - void Execute(float(**)[3][4]); - BOOL Draw(); + virtual BOOL Execute(Mtx**); + virtual BOOL Draw(); public: /* Place member variables here */ diff --git a/include/d/actor/d_a_obj_ospbox.h b/include/d/actor/d_a_obj_ospbox.h index 87b52677b..f40a80507 100644 --- a/include/d/actor/d_a_obj_ospbox.h +++ b/include/d/actor/d_a_obj_ospbox.h @@ -1,18 +1,18 @@ #ifndef D_A_OBJ_OSPBOX_H #define D_A_OBJ_OSPBOX_H -#include "f_op/f_op_actor.h" +#include "d/d_bg_s_movebg_actor.h" namespace daObjOspbox { - class Act_c : public fopAc_ac_c { + class Act_c : public dBgS_MoveBgActor { public: void prm_get_itemNo() const {} void prm_get_spec() const {} - void CreateHeap(); - s32 Create(); + virtual BOOL CreateHeap(); + virtual BOOL Create(); cPhs_State Mthd_Create(); - BOOL Delete(); + virtual BOOL Delete(); BOOL Mthd_Delete(); void set_mtx(); void init_mtx(); @@ -21,8 +21,8 @@ namespace daObjOspbox { void sound_break(); void set_ground(); void init_ground(); - void Execute(float(**)[3][4]); - BOOL Draw(); + virtual BOOL Execute(Mtx**); + virtual BOOL Draw(); public: /* Place member variables here */ diff --git a/include/d/actor/d_a_obj_pirateship.h b/include/d/actor/d_a_obj_pirateship.h index 36a6fbf02..18e23b199 100644 --- a/include/d/actor/d_a_obj_pirateship.h +++ b/include/d/actor/d_a_obj_pirateship.h @@ -1,12 +1,13 @@ #ifndef D_A_OBJ_PIRATESHIP_H #define D_A_OBJ_PIRATESHIP_H +#include "d/d_bg_s_movebg_actor.h" #include "f_op/f_op_actor.h" namespace daObjPirateship { f32 getShipOffsetY(s16*, s16*, f32); - class Act_c : public fopAc_ac_c { + class Act_c : public dBgS_MoveBgActor { public: inline cPhs_State _create(); inline bool _delete(); @@ -18,18 +19,18 @@ namespace daObjPirateship { void pirateCreate(int*); void partsCreate(); void sound_proc(); - void CreateHeap(); + virtual BOOL CreateHeap(); void CreateWave(); void SetWave(); void DeleteWave(); - s32 Create(); - void Execute(float(**)[3][4]); - BOOL Draw(); - BOOL Delete(); + virtual BOOL Create(); + virtual BOOL Execute(Mtx**); + virtual BOOL Draw(); + virtual BOOL Delete(); void demo_move(); public: - /* 0x290 */ u8 m290[0x2CC - 0x290]; + /* 0x2C8 */ u8 m2C8[0x2CC - 0x2C8]; /* 0x2CC */ u8 m2CC; /* 0x2CD */ u8 m2CD[0x2CE - 0x2CD]; /* 0x2CE */ u8 m2CE; diff --git a/include/d/actor/d_a_obj_smplbg.h b/include/d/actor/d_a_obj_smplbg.h index 8fcc5fe4f..1498561dc 100644 --- a/include/d/actor/d_a_obj_smplbg.h +++ b/include/d/actor/d_a_obj_smplbg.h @@ -1,10 +1,10 @@ #ifndef D_A_OBJ_SMPLBG_H #define D_A_OBJ_SMPLBG_H -#include "f_op/f_op_actor.h" +#include "d/d_bg_s_movebg_actor.h" namespace daObjSmplbg { - class Act_c : public fopAc_ac_c { + class Act_c : public dBgS_MoveBgActor { public: void attr() const {} void isStop() {} @@ -12,16 +12,16 @@ namespace daObjSmplbg { void onStop() {} void prm_get_type() const {} - void CreateHeap(); - s32 Create(); + virtual BOOL CreateHeap(); + virtual BOOL Create(); cPhs_State Mthd_Create(); - BOOL Delete(); + virtual BOOL Delete(); BOOL Mthd_Delete(); void set_mtx(); void init_mtx(); void exec_qtkhd(); - void Execute(float(**)[3][4]); - BOOL Draw(); + virtual BOOL Execute(Mtx**); + virtual BOOL Draw(); public: /* Place member variables here */ diff --git a/include/d/actor/d_a_obj_stair.h b/include/d/actor/d_a_obj_stair.h index 430bea085..c4e203e54 100644 --- a/include/d/actor/d_a_obj_stair.h +++ b/include/d/actor/d_a_obj_stair.h @@ -1,9 +1,9 @@ #ifndef D_A_OBJ_STAIR_H #define D_A_OBJ_STAIR_H -#include "f_op/f_op_actor.h" +#include "d/d_bg_s_movebg_actor.h" -class daObj_Stair_c : public fopAc_ac_c { +class daObj_Stair_c : public dBgS_MoveBgActor { public: inline cPhs_State _create(); inline bool _delete(); @@ -11,11 +11,11 @@ public: inline bool _execute(); void set_mtx() {} - void CreateHeap(); - s32 Create(); - void Execute(float(**)[3][4]); - BOOL Draw(); - BOOL Delete(); + virtual BOOL CreateHeap(); + virtual BOOL Create(); + virtual BOOL Execute(Mtx**); + virtual BOOL Draw(); + virtual BOOL Delete(); public: /* Place member variables here */ diff --git a/include/d/actor/d_a_obj_swflat.h b/include/d/actor/d_a_obj_swflat.h index 996734dd1..3da3611a7 100644 --- a/include/d/actor/d_a_obj_swflat.h +++ b/include/d/actor/d_a_obj_swflat.h @@ -1,25 +1,25 @@ #ifndef D_A_OBJ_SWFLAT_H #define D_A_OBJ_SWFLAT_H -#include "f_op/f_op_actor.h" +#include "d/d_bg_s_movebg_actor.h" namespace daObjSwflat { - class Act_c : public fopAc_ac_c { + class Act_c : public dBgS_MoveBgActor { public: void prmGetSwNo() const {} void prmGetSwNo2() const {} void prmGetType() const {} - void CreateHeap(); - s32 Create(); + virtual BOOL CreateHeap(); + virtual BOOL Create(); cPhs_State Mthd_Create(); - BOOL Delete(); + virtual BOOL Delete(); BOOL Mthd_Delete(); void set_mtx(); void init_mtx(); - void Execute(float(**)[3][4]); - BOOL Draw(); - BOOL IsDelete(); + virtual BOOL Execute(Mtx**); + virtual BOOL Draw(); + virtual BOOL IsDelete(); public: /* Place member variables here */ diff --git a/include/d/actor/d_a_obj_tenmado.h b/include/d/actor/d_a_obj_tenmado.h index 37fa369f2..208d5ddb1 100644 --- a/include/d/actor/d_a_obj_tenmado.h +++ b/include/d/actor/d_a_obj_tenmado.h @@ -1,23 +1,23 @@ #ifndef D_A_OBJ_TENMADO_H #define D_A_OBJ_TENMADO_H -#include "f_op/f_op_actor.h" +#include "d/d_bg_s_movebg_actor.h" namespace daObjTenmado { - class Act_c : public fopAc_ac_c { + class Act_c : public dBgS_MoveBgActor { public: void prm_get_swSave() const {} void prm_get_swSave2() const {} - void CreateHeap(); - s32 Create(); + virtual BOOL CreateHeap(); + virtual BOOL Create(); cPhs_State Mthd_Create(); - BOOL Delete(); + virtual BOOL Delete(); BOOL Mthd_Delete(); void set_mtx(); void init_mtx(); - void Execute(float(**)[3][4]); - BOOL Draw(); + virtual BOOL Execute(Mtx**); + virtual BOOL Draw(); public: /* Place member variables here */ diff --git a/include/d/actor/d_a_obj_tide.h b/include/d/actor/d_a_obj_tide.h index b03790b66..4329ddbd0 100644 --- a/include/d/actor/d_a_obj_tide.h +++ b/include/d/actor/d_a_obj_tide.h @@ -1,18 +1,18 @@ #ifndef D_A_OBJ_TIDE_H #define D_A_OBJ_TIDE_H -#include "f_op/f_op_actor.h" +#include "d/d_bg_s_movebg_actor.h" namespace daObjTide { - class Act_c : public fopAc_ac_c { + class Act_c : public dBgS_MoveBgActor { public: void prm_get_swSave() const {} void prm_get_type() const {} - void CreateHeap(); - s32 Create(); + virtual BOOL CreateHeap(); + virtual BOOL Create(); cPhs_State Mthd_Create(); - BOOL Delete(); + virtual BOOL Delete(); BOOL Mthd_Delete(); void set_mtx(); void init_mtx(); @@ -36,8 +36,8 @@ namespace daObjTide { void se_stop_out(); void se_stop_up(); void se_pos_up(); - void Execute(float(**)[3][4]); - BOOL Draw(); + virtual BOOL Execute(Mtx**); + virtual BOOL Draw(); public: /* Place member variables here */ diff --git a/include/d/actor/d_a_obj_volcano.h b/include/d/actor/d_a_obj_volcano.h index 992e84b8a..cb06b61c1 100644 --- a/include/d/actor/d_a_obj_volcano.h +++ b/include/d/actor/d_a_obj_volcano.h @@ -1,21 +1,21 @@ #ifndef D_A_OBJ_VOLCANO_H #define D_A_OBJ_VOLCANO_H -#include "f_op/f_op_actor.h" +#include "d/d_bg_s_movebg_actor.h" class J3DMaterial; namespace daObjVolcano { - class Act_c : public fopAc_ac_c { + class Act_c : public dBgS_MoveBgActor { public: void prm_get_swSave() const {} void StartFire(); void StopFire(); - void CreateHeap(); - s32 Create(); + virtual BOOL CreateHeap(); + virtual BOOL Create(); cPhs_State Mthd_Create(); - BOOL Delete(); + virtual BOOL Delete(); BOOL Mthd_Delete(); void set_mtx(); void init_mtx(); @@ -27,9 +27,9 @@ namespace daObjVolcano { void daObjVolcano_freeze_main(); void daObjVolcano_fail_demo_wait(); void daObjVolcano_fail_demo_main(); - void Execute(float(**)[3][4]); + virtual BOOL Execute(Mtx**); void set_material(J3DMaterial*, unsigned char); - BOOL Draw(); + virtual BOOL Draw(); public: /* Place member variables here */ diff --git a/include/d/actor/d_a_steam_tag.h b/include/d/actor/d_a_steam_tag.h index f3587d6e0..f681c3622 100644 --- a/include/d/actor/d_a_steam_tag.h +++ b/include/d/actor/d_a_steam_tag.h @@ -29,7 +29,7 @@ public: inline BOOL execute(); const daSteamTag_mData* getData(); - s32 CreateInit(); + BOOL CreateInit(); BOOL createEmitter(); bool endEmitter(); diff --git a/include/d/actor/d_a_stone2.h b/include/d/actor/d_a_stone2.h index 449f2206d..013cab568 100644 --- a/include/d/actor/d_a_stone2.h +++ b/include/d/actor/d_a_stone2.h @@ -1,10 +1,10 @@ #ifndef D_A_STONE2_H #define D_A_STONE2_H -#include "f_op/f_op_actor.h" +#include "d/d_bg_s_movebg_actor.h" namespace daStone2 { - class Act_c : public fopAc_ac_c { + class Act_c : public dBgS_MoveBgActor { public: Act_c(); @@ -20,11 +20,11 @@ namespace daStone2 { void prmZ_init(); void is_switch() const; void on_switch() const; - void CreateHeap(); - s32 Create(); + virtual BOOL CreateHeap(); + virtual BOOL Create(); void chk_appear(); cPhs_State Mthd_Create(); - BOOL Delete(); + virtual BOOL Delete(); BOOL Mthd_Delete(); void set_mtx(); void init_mtx(); @@ -60,9 +60,9 @@ namespace daStone2 { void demo_run_init(); void demo_run(); void demo_proc_call(); - void Execute(float(**)[3][4]); + virtual BOOL Execute(Mtx**); void draw_shadow(); - BOOL Draw(); + virtual BOOL Draw(); public: /* Place member variables here */ diff --git a/include/d/actor/d_a_swhit0.h b/include/d/actor/d_a_swhit0.h index bdce06eeb..aeb969ca5 100644 --- a/include/d/actor/d_a_swhit0.h +++ b/include/d/actor/d_a_swhit0.h @@ -24,7 +24,7 @@ public: BOOL CreateHeap(); void decisionRtType(); - s32 CreateInit(); + BOOL CreateInit(); cPhs_State create(); s32 checkHit(); diff --git a/include/d/actor/d_a_tori_flag.h b/include/d/actor/d_a_tori_flag.h index a32051aa7..5f45e77b0 100644 --- a/include/d/actor/d_a_tori_flag.h +++ b/include/d/actor/d_a_tori_flag.h @@ -30,7 +30,7 @@ public: void set_mtx(); BOOL CreateHeap(); - s32 CreateInit(); + cPhs_State CreateInit(); static const char M_arcname[7]; diff --git a/include/f_pc/f_pc_manager.h b/include/f_pc/f_pc_manager.h index 533115fea..f18c70813 100644 --- a/include/f_pc/f_pc_manager.h +++ b/include/f_pc/f_pc_manager.h @@ -34,8 +34,7 @@ inline s16 fpcM_GetProfName(void* pProc) { } inline fpc_ProcID fpcM_Create(s16 procName, FastCreateReqFunc createFunc, void* params) { - return fpcSCtRq_Request(fpcLy_CurrentLayer(), procName, (stdCreateFunc)createFunc, NULL, - params); + return fpcSCtRq_Request(fpcLy_CurrentLayer(), procName, (stdCreateFunc)createFunc, NULL, params); } inline s16 fpcM_DrawPriority(void* pProc) { diff --git a/include/f_pc/f_pc_stdcreate_req.h b/include/f_pc/f_pc_stdcreate_req.h index 2be311618..b0696c5be 100644 --- a/include/f_pc/f_pc_stdcreate_req.h +++ b/include/f_pc/f_pc_stdcreate_req.h @@ -5,7 +5,7 @@ typedef struct layer_class layer_class; -typedef BOOL (*stdCreateFunc)(void*, void*); +typedef int (*stdCreateFunc)(void*, void*); typedef struct standard_create_request_class { /* 0x00 */ create_request base; @@ -25,6 +25,6 @@ cPhs_State fpcSCtRq_phase_Done(standard_create_request_class*); cPhs_State fpcSCtRq_Handler(standard_create_request_class* pStdCreateReq); BOOL fpcSCtRq_Delete(standard_create_request_class*); BOOL fpcSCtRq_Cancel(standard_create_request_class*); -fpc_ProcID fpcSCtRq_Request(layer_class* param_1, s16 param_2, stdCreateFunc param_3, void* param_4, void* param_5); +fpc_ProcID fpcSCtRq_Request(layer_class* i_layer, s16 i_procName, stdCreateFunc i_createFunc, void* param_4, void* i_append); #endif diff --git a/src/c/c_dylink.cpp b/src/c/c_dylink.cpp index d9341a775..0c0f62d84 100644 --- a/src/c/c_dylink.cpp +++ b/src/c/c_dylink.cpp @@ -456,7 +456,7 @@ const DynamicNameTableEntry DynamicNameTable[] = { }; /* 800227A0-800229E0 .text cCc_Init__Fv */ -s32 cCc_Init() { +BOOL cCc_Init() { JUT_ASSERT(0x2a, !DMC_initialized); JKRSolidHeap * pHeap = JKRSolidHeap::create(0x5648, mDoExt_getArchiveHeap(), false); diff --git a/src/d/actor/d_a_bomb3.inc b/src/d/actor/d_a_bomb3.inc index d86bb654a..310bbfdab 100644 --- a/src/d/actor/d_a_bomb3.inc +++ b/src/d/actor/d_a_bomb3.inc @@ -751,7 +751,7 @@ void daBomb_c::eff_explode() { } /* 800DB024-800DB630 .text procExplode_init__8daBomb_cFv */ -int daBomb_c::procExplode_init() { +BOOL daBomb_c::procExplode_init() { camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); camera->mCamera.ForceLockOff(fopAcM_GetID(this)); diff --git a/src/d/actor/d_a_branch.cpp b/src/d/actor/d_a_branch.cpp index 8f5c06ada..19bae8d60 100644 --- a/src/d/actor/d_a_branch.cpp +++ b/src/d/actor/d_a_branch.cpp @@ -54,13 +54,13 @@ void daBranch_c::demoPlay(mDoExt_McaMorf* morf) { } /* 00000228-00000248 .text solidHeapCB__10daBranch_cFP10fopAc_ac_c */ -int daBranch_c::solidHeapCB(fopAc_ac_c* i_this) { +BOOL daBranch_c::solidHeapCB(fopAc_ac_c* i_this) { daBranch_c* branch = static_cast(i_this); return branch->CreateHeap(); } /* 00000248-0000049C .text CreateHeap__10daBranch_cFv */ -int daBranch_c::CreateHeap() { +BOOL daBranch_c::CreateHeap() { int bmd[] = { KWOOD_00_BMD_WS, KWOOD_00_BMD_WB }; int bck[] = { KWOOD_00_BCK_SWING02, KWOOD_00_BCK_BREAK }; int bas[] = { KWOOD_00_BAS_SWING02, KWOOD_00_BAS_BREAK }; diff --git a/src/d/actor/d_a_fan.cpp b/src/d/actor/d_a_fan.cpp index 743a9a144..033793744 100644 --- a/src/d/actor/d_a_fan.cpp +++ b/src/d/actor/d_a_fan.cpp @@ -102,7 +102,7 @@ BOOL daFan_c::CreateHeap() { return TRUE; } -static int nodeCallBack(J3DNode*, int); +static BOOL nodeCallBack(J3DNode*, int); /* 0000040C-00000640 .text Create__7daFan_cFv */ BOOL daFan_c::Create() { @@ -135,7 +135,7 @@ BOOL daFan_c::Create() { } /* 00000640-000006F4 .text nodeCallBack__FP7J3DNodei */ -static int nodeCallBack(J3DNode* node, int calcTiming) { +static BOOL nodeCallBack(J3DNode* node, int calcTiming) { if (calcTiming == J3DNodeCBCalcTiming_In) { J3DJoint* joint = (J3DJoint*)node; u32 jntNo = joint->getJntNo(); @@ -209,7 +209,7 @@ void daFan_c::set_cps(f32 h) { } /* 00000E54-00001088 .text Execute__7daFan_cFPPA3_A4_f */ -int daFan_c::Execute(Mtx** mtxP) { +BOOL daFan_c::Execute(Mtx** mtxP) { s16 speed = m_fan_speed[mType]; f32 len = mFanSpeed / (f32)speed; diff --git a/src/d/actor/d_a_ghostship.cpp b/src/d/actor/d_a_ghostship.cpp index 2e988cef5..4b39f84c2 100644 --- a/src/d/actor/d_a_ghostship.cpp +++ b/src/d/actor/d_a_ghostship.cpp @@ -236,7 +236,7 @@ void daGhostship_c::getArg() { } /* 00000C8C-00000DFC .text daGhostshipCreate__FPv */ -static s32 daGhostshipCreate(void* i_actor) { +static cPhs_State daGhostshipCreate(void* i_actor) { daGhostship_c* i_this = static_cast(i_actor); fopAcM_SetupActor(i_this, daGhostship_c); diff --git a/src/d/actor/d_a_hmlif.cpp b/src/d/actor/d_a_hmlif.cpp index 7506fe122..a44a7e738 100644 --- a/src/d/actor/d_a_hmlif.cpp +++ b/src/d/actor/d_a_hmlif.cpp @@ -17,12 +17,12 @@ void daHmlif_c::daHmlifDelete() { } /* 000000D8-0000042C .text CreateHeap__9daHmlif_cFv */ -void daHmlif_c::CreateHeap() { +BOOL daHmlif_c::CreateHeap() { /* Nonmatching */ } /* 00000474-000007C8 .text Create__9daHmlif_cFv */ -s32 daHmlif_c::Create() { +BOOL daHmlif_c::Create() { /* Nonmatching */ } @@ -37,7 +37,7 @@ void daHmlif_c::set_mtx() { } /* 00000B80-00000BE4 .text Execute__9daHmlif_cFPPA3_A4_f */ -void daHmlif_c::Execute(float(**)[3][4]) { +BOOL daHmlif_c::Execute(Mtx**) { /* Nonmatching */ } diff --git a/src/d/actor/d_a_hys.cpp b/src/d/actor/d_a_hys.cpp index 0278106d2..0f671467b 100644 --- a/src/d/actor/d_a_hys.cpp +++ b/src/d/actor/d_a_hys.cpp @@ -12,12 +12,12 @@ BOOL daHys_c::Delete() { } /* 000000B8-00000250 .text CreateHeap__7daHys_cFv */ -void daHys_c::CreateHeap() { +BOOL daHys_c::CreateHeap() { /* Nonmatching */ } /* 00000250-00000368 .text Create__7daHys_cFv */ -s32 daHys_c::Create() { +BOOL daHys_c::Create() { /* Nonmatching */ } @@ -27,7 +27,7 @@ void daHys_c::set_mtx() { } /* 000003F8-000004A4 .text Execute__7daHys_cFPPA3_A4_f */ -void daHys_c::Execute(float(**)[3][4]) { +BOOL daHys_c::Execute(Mtx**) { /* Nonmatching */ } diff --git a/src/d/actor/d_a_npc_nz.cpp b/src/d/actor/d_a_npc_nz.cpp index f710e6e42..147c4b53c 100644 --- a/src/d/actor/d_a_npc_nz.cpp +++ b/src/d/actor/d_a_npc_nz.cpp @@ -523,7 +523,7 @@ static u32 daNpcNz_getShopBoughtMsg(u8 itemNo) { } /* 00001B38-00001B70 .text daNpc_Nz_ShopItemCreateCB__FPv */ -static int daNpc_Nz_ShopItemCreateCB(void* i_item) { +static cPhs_State daNpc_Nz_ShopItemCreateCB(void* i_item) { daShopItem_c* i_this = static_cast(i_item); i_this->hide(); i_this->setTevType(TEV_TYPE_ACTOR); diff --git a/src/d/actor/d_a_obj_ashut.cpp b/src/d/actor/d_a_obj_ashut.cpp index 664f13755..fade1890c 100644 --- a/src/d/actor/d_a_obj_ashut.cpp +++ b/src/d/actor/d_a_obj_ashut.cpp @@ -7,12 +7,12 @@ #include "d/d_procname.h" /* 00000078-0000012C .text CreateHeap__Q210daObjAshut5Act_cFv */ -void daObjAshut::Act_c::CreateHeap() { +BOOL daObjAshut::Act_c::CreateHeap() { /* Nonmatching */ } /* 0000012C-00000224 .text Create__Q210daObjAshut5Act_cFv */ -s32 daObjAshut::Act_c::Create() { +BOOL daObjAshut::Act_c::Create() { /* Nonmatching */ } @@ -97,7 +97,7 @@ void daObjAshut::Act_c::mode_demoreq() { } /* 00000BE4-00000D0C .text Execute__Q210daObjAshut5Act_cFPPA3_A4_f */ -void daObjAshut::Act_c::Execute(float(**)[3][4]) { +BOOL daObjAshut::Act_c::Execute(Mtx**) { /* Nonmatching */ } diff --git a/src/d/actor/d_a_obj_aygr.cpp b/src/d/actor/d_a_obj_aygr.cpp index 8731918ec..4b3efc835 100644 --- a/src/d/actor/d_a_obj_aygr.cpp +++ b/src/d/actor/d_a_obj_aygr.cpp @@ -7,12 +7,12 @@ #include "d/d_procname.h" /* 00000078-000002A4 .text CreateHeap__Q29daObjAygr5Act_cFv */ -void daObjAygr::Act_c::CreateHeap() { +BOOL daObjAygr::Act_c::CreateHeap() { /* Nonmatching */ } /* 000002A4-00000310 .text Create__Q29daObjAygr5Act_cFv */ -s32 daObjAygr::Act_c::Create() { +BOOL daObjAygr::Act_c::Create() { /* Nonmatching */ } @@ -42,7 +42,7 @@ void daObjAygr::Act_c::init_mtx() { } /* 00000674-000006B0 .text Execute__Q29daObjAygr5Act_cFPPA3_A4_f */ -void daObjAygr::Act_c::Execute(float(**)[3][4]) { +BOOL daObjAygr::Act_c::Execute(Mtx**) { /* Nonmatching */ } diff --git a/src/d/actor/d_a_obj_drift.cpp b/src/d/actor/d_a_obj_drift.cpp index f7bee92a6..bfdbfd82a 100644 --- a/src/d/actor/d_a_obj_drift.cpp +++ b/src/d/actor/d_a_obj_drift.cpp @@ -7,12 +7,12 @@ #include "d/d_procname.h" /* 000000EC-000001A0 .text CreateHeap__Q210daObjDrift5Act_cFv */ -void daObjDrift::Act_c::CreateHeap() { +BOOL daObjDrift::Act_c::CreateHeap() { /* Nonmatching */ } /* 000001A0-00000370 .text Create__Q210daObjDrift5Act_cFv */ -s32 daObjDrift::Act_c::Create() { +BOOL daObjDrift::Act_c::Create() { /* Nonmatching */ } @@ -87,7 +87,7 @@ void daObjDrift::Act_c::set_current() { } /* 00001104-000011D0 .text Execute__Q210daObjDrift5Act_cFPPA3_A4_f */ -void daObjDrift::Act_c::Execute(float(**)[3][4]) { +BOOL daObjDrift::Act_c::Execute(Mtx**) { /* Nonmatching */ } diff --git a/src/d/actor/d_a_obj_ekskz.cpp b/src/d/actor/d_a_obj_ekskz.cpp index 074758253..421d529a1 100644 --- a/src/d/actor/d_a_obj_ekskz.cpp +++ b/src/d/actor/d_a_obj_ekskz.cpp @@ -42,7 +42,7 @@ void daObjEkskz::Act_c::init_mtx() { } /* 00000DC0-00000FFC .text Execute__Q210daObjEkskz5Act_cFPPA3_A4_f */ -BOOL daObjEkskz::Act_c::Execute(float(**)[3][4]) { +BOOL daObjEkskz::Act_c::Execute(Mtx**) { /* Nonmatching */ } diff --git a/src/d/actor/d_a_obj_hami2.cpp b/src/d/actor/d_a_obj_hami2.cpp index bff25379d..4f938944d 100644 --- a/src/d/actor/d_a_obj_hami2.cpp +++ b/src/d/actor/d_a_obj_hami2.cpp @@ -13,12 +13,12 @@ static BOOL nodeCallBack(J3DNode*, int) { } /* 0000012C-0000032C .text CreateHeap__Q210daObjHami25Act_cFv */ -void daObjHami2::Act_c::CreateHeap() { +BOOL daObjHami2::Act_c::CreateHeap() { /* Nonmatching */ } /* 0000032C-0000042C .text Create__Q210daObjHami25Act_cFv */ -s32 daObjHami2::Act_c::Create() { +BOOL daObjHami2::Act_c::Create() { /* Nonmatching */ } @@ -78,7 +78,7 @@ void daObjHami2::Act_c::daObjHami2_close_demo() { } /* 00000A08-00000AB8 .text Execute__Q210daObjHami25Act_cFPPA3_A4_f */ -void daObjHami2::Act_c::Execute(float(**)[3][4]) { +BOOL daObjHami2::Act_c::Execute(Mtx**) { /* Nonmatching */ } diff --git a/src/d/actor/d_a_obj_hami3.cpp b/src/d/actor/d_a_obj_hami3.cpp index 3bf56724c..ff4ef1764 100644 --- a/src/d/actor/d_a_obj_hami3.cpp +++ b/src/d/actor/d_a_obj_hami3.cpp @@ -13,12 +13,12 @@ static BOOL nodeCallBack(J3DNode*, int) { } /* 0000012C-0000026C .text CreateHeap__Q210daObjHami35Act_cFv */ -void daObjHami3::Act_c::CreateHeap() { +BOOL daObjHami3::Act_c::CreateHeap() { /* Nonmatching */ } /* 0000026C-00000354 .text Create__Q210daObjHami35Act_cFv */ -s32 daObjHami3::Act_c::Create() { +BOOL daObjHami3::Act_c::Create() { /* Nonmatching */ } @@ -78,7 +78,7 @@ void daObjHami3::Act_c::daObjHami3_close_demo() { } /* 00000934-000009F4 .text Execute__Q210daObjHami35Act_cFPPA3_A4_f */ -void daObjHami3::Act_c::Execute(float(**)[3][4]) { +BOOL daObjHami3::Act_c::Execute(Mtx**) { /* Nonmatching */ } diff --git a/src/d/actor/d_a_obj_hlift.cpp b/src/d/actor/d_a_obj_hlift.cpp index dac4c8fb2..7ac556ee9 100644 --- a/src/d/actor/d_a_obj_hlift.cpp +++ b/src/d/actor/d_a_obj_hlift.cpp @@ -7,12 +7,12 @@ #include "d/d_procname.h" /* 00000078-000001BC .text CreateHeap__Q210daObjHlift5Act_cFv */ -void daObjHlift::Act_c::CreateHeap() { +BOOL daObjHlift::Act_c::CreateHeap() { /* Nonmatching */ } /* 000001BC-000002D0 .text Create__Q210daObjHlift5Act_cFv */ -s32 daObjHlift::Act_c::Create() { +BOOL daObjHlift::Act_c::Create() { /* Nonmatching */ } @@ -117,7 +117,7 @@ void daObjHlift::Act_c::se_whole() { } /* 00000E74-00000FD4 .text Execute__Q210daObjHlift5Act_cFPPA3_A4_f */ -void daObjHlift::Act_c::Execute(float(**)[3][4]) { +BOOL daObjHlift::Act_c::Execute(Mtx**) { /* Nonmatching */ } diff --git a/src/d/actor/d_a_obj_jump.cpp b/src/d/actor/d_a_obj_jump.cpp index ebff48b0a..f0a8772fb 100644 --- a/src/d/actor/d_a_obj_jump.cpp +++ b/src/d/actor/d_a_obj_jump.cpp @@ -7,12 +7,12 @@ #include "d/d_procname.h" /* 00000078-00000184 .text CreateHeap__Q29daObjJump5Act_cFv */ -void daObjJump::Act_c::CreateHeap() { +BOOL daObjJump::Act_c::CreateHeap() { /* Nonmatching */ } /* 00000184-0000033C .text Create__Q29daObjJump5Act_cFv */ -s32 daObjJump::Act_c::Create() { +BOOL daObjJump::Act_c::Create() { /* Nonmatching */ } @@ -127,7 +127,7 @@ void daObjJump::Act_c::mode_u_w() { } /* 00001338-000014B0 .text Execute__Q29daObjJump5Act_cFPPA3_A4_f */ -void daObjJump::Act_c::Execute(float(**)[3][4]) { +BOOL daObjJump::Act_c::Execute(Mtx**) { /* Nonmatching */ } diff --git a/src/d/actor/d_a_obj_mkie.cpp b/src/d/actor/d_a_obj_mkie.cpp index 730efd265..886794008 100644 --- a/src/d/actor/d_a_obj_mkie.cpp +++ b/src/d/actor/d_a_obj_mkie.cpp @@ -7,7 +7,7 @@ #include "d/d_procname.h" /* 00000078-00000250 .text CreateHeap__Q29daObjMkie5Act_cFv */ -void daObjMkie::Act_c::CreateHeap() { +BOOL daObjMkie::Act_c::CreateHeap() { /* Nonmatching */ } @@ -22,7 +22,7 @@ void daObjMkie::Act_c::set_cc_pos() { } /* 00000420-00000568 .text Create__Q29daObjMkie5Act_cFv */ -s32 daObjMkie::Act_c::Create() { +BOOL daObjMkie::Act_c::Create() { /* Nonmatching */ } @@ -107,7 +107,7 @@ void daObjMkie::Act_c::mode_proc_call() { } /* 000013DC-000014A0 .text Execute__Q29daObjMkie5Act_cFPPA3_A4_f */ -void daObjMkie::Act_c::Execute(float(**)[3][4]) { +BOOL daObjMkie::Act_c::Execute(Mtx**) { /* Nonmatching */ } diff --git a/src/d/actor/d_a_obj_mkiek.cpp b/src/d/actor/d_a_obj_mkiek.cpp index 9706b0d6c..1936fe301 100644 --- a/src/d/actor/d_a_obj_mkiek.cpp +++ b/src/d/actor/d_a_obj_mkiek.cpp @@ -7,12 +7,12 @@ #include "d/d_procname.h" /* 00000078-00000240 .text CreateHeap__Q210daObjMkiek5Act_cFv */ -void daObjMkiek::Act_c::CreateHeap() { +BOOL daObjMkiek::Act_c::CreateHeap() { /* Nonmatching */ } /* 00000240-00000314 .text Create__Q210daObjMkiek5Act_cFv */ -s32 daObjMkiek::Act_c::Create() { +BOOL daObjMkiek::Act_c::Create() { /* Nonmatching */ } @@ -57,7 +57,7 @@ void daObjMkiek::Act_c::demo() { } /* 00000C1C-00000D00 .text Execute__Q210daObjMkiek5Act_cFPPA3_A4_f */ -void daObjMkiek::Act_c::Execute(float(**)[3][4]) { +BOOL daObjMkiek::Act_c::Execute(Mtx**) { /* Nonmatching */ } diff --git a/src/d/actor/d_a_obj_msdan_sub.cpp b/src/d/actor/d_a_obj_msdan_sub.cpp index 520a23d2c..1fb970ac0 100644 --- a/src/d/actor/d_a_obj_msdan_sub.cpp +++ b/src/d/actor/d_a_obj_msdan_sub.cpp @@ -7,12 +7,12 @@ #include "d/d_procname.h" /* 00000078-0000012C .text CreateHeap__Q213daObjMsdanSub5Act_cFv */ -void daObjMsdanSub::Act_c::CreateHeap() { +BOOL daObjMsdanSub::Act_c::CreateHeap() { /* Nonmatching */ } /* 0000012C-00000304 .text Create__Q213daObjMsdanSub5Act_cFv */ -s32 daObjMsdanSub::Act_c::Create() { +BOOL daObjMsdanSub::Act_c::Create() { /* Nonmatching */ } @@ -42,7 +42,7 @@ void daObjMsdanSub::Act_c::init_mtx() { } /* 00000534-00000BB4 .text Execute__Q213daObjMsdanSub5Act_cFPPA3_A4_f */ -void daObjMsdanSub::Act_c::Execute(float(**)[3][4]) { +BOOL daObjMsdanSub::Act_c::Execute(Mtx**) { /* Nonmatching */ } diff --git a/src/d/actor/d_a_obj_msdan_sub2.cpp b/src/d/actor/d_a_obj_msdan_sub2.cpp index 69ff2f088..d209a0711 100644 --- a/src/d/actor/d_a_obj_msdan_sub2.cpp +++ b/src/d/actor/d_a_obj_msdan_sub2.cpp @@ -7,12 +7,12 @@ #include "d/d_procname.h" /* 00000078-0000012C .text CreateHeap__Q214daObjMsdanSub25Act_cFv */ -void daObjMsdanSub2::Act_c::CreateHeap() { +BOOL daObjMsdanSub2::Act_c::CreateHeap() { /* Nonmatching */ } /* 0000012C-000002E4 .text Create__Q214daObjMsdanSub25Act_cFv */ -s32 daObjMsdanSub2::Act_c::Create() { +BOOL daObjMsdanSub2::Act_c::Create() { /* Nonmatching */ } @@ -42,7 +42,7 @@ void daObjMsdanSub2::Act_c::init_mtx() { } /* 00000598-0000090C .text Execute__Q214daObjMsdanSub25Act_cFPPA3_A4_f */ -void daObjMsdanSub2::Act_c::Execute(float(**)[3][4]) { +BOOL daObjMsdanSub2::Act_c::Execute(Mtx**) { /* Nonmatching */ } diff --git a/src/d/actor/d_a_obj_nest.cpp b/src/d/actor/d_a_obj_nest.cpp index d95a62fab..c371230ee 100644 --- a/src/d/actor/d_a_obj_nest.cpp +++ b/src/d/actor/d_a_obj_nest.cpp @@ -7,12 +7,12 @@ #include "d/d_procname.h" /* 00000078-0000012C .text CreateHeap__Q29daObjNest5Act_cFv */ -void daObjNest::Act_c::CreateHeap() { +BOOL daObjNest::Act_c::CreateHeap() { /* Nonmatching */ } /* 0000012C-000001F0 .text Create__Q29daObjNest5Act_cFv */ -s32 daObjNest::Act_c::Create() { +BOOL daObjNest::Act_c::Create() { /* Nonmatching */ } @@ -57,7 +57,7 @@ void daObjNest::Act_c::vib_proc() { } /* 0000070C-0000075C .text Execute__Q29daObjNest5Act_cFPPA3_A4_f */ -void daObjNest::Act_c::Execute(float(**)[3][4]) { +BOOL daObjNest::Act_c::Execute(Mtx**) { /* Nonmatching */ } diff --git a/src/d/actor/d_a_obj_ospbox.cpp b/src/d/actor/d_a_obj_ospbox.cpp index a517c663a..097a68b35 100644 --- a/src/d/actor/d_a_obj_ospbox.cpp +++ b/src/d/actor/d_a_obj_ospbox.cpp @@ -7,12 +7,12 @@ #include "d/d_procname.h" /* 000000EC-000001A0 .text CreateHeap__Q211daObjOspbox5Act_cFv */ -void daObjOspbox::Act_c::CreateHeap() { +BOOL daObjOspbox::Act_c::CreateHeap() { /* Nonmatching */ } /* 000001A0-00000294 .text Create__Q211daObjOspbox5Act_cFv */ -s32 daObjOspbox::Act_c::Create() { +BOOL daObjOspbox::Act_c::Create() { /* Nonmatching */ } @@ -67,7 +67,7 @@ void daObjOspbox::Act_c::init_ground() { } /* 00001008-000010DC .text Execute__Q211daObjOspbox5Act_cFPPA3_A4_f */ -void daObjOspbox::Act_c::Execute(float(**)[3][4]) { +BOOL daObjOspbox::Act_c::Execute(Mtx**) { /* Nonmatching */ } diff --git a/src/d/actor/d_a_obj_pirateship.cpp b/src/d/actor/d_a_obj_pirateship.cpp index ca9e37ec7..194e212ea 100644 --- a/src/d/actor/d_a_obj_pirateship.cpp +++ b/src/d/actor/d_a_obj_pirateship.cpp @@ -39,7 +39,7 @@ void daObjPirateship::Act_c::sound_proc() { } /* 0000095C-00000A50 .text CreateHeap__Q215daObjPirateship5Act_cFv */ -void daObjPirateship::Act_c::CreateHeap() { +BOOL daObjPirateship::Act_c::CreateHeap() { /* Nonmatching */ } @@ -59,12 +59,12 @@ void daObjPirateship::Act_c::DeleteWave() { } /* 00000D38-00000DA4 .text Create__Q215daObjPirateship5Act_cFv */ -s32 daObjPirateship::Act_c::Create() { +BOOL daObjPirateship::Act_c::Create() { /* Nonmatching */ } /* 00000DA4-00000DB4 .text Execute__Q215daObjPirateship5Act_cFPPA3_A4_f */ -void daObjPirateship::Act_c::Execute(float(**)[3][4]) { +BOOL daObjPirateship::Act_c::Execute(Mtx**) { /* Nonmatching */ } diff --git a/src/d/actor/d_a_obj_smplbg.cpp b/src/d/actor/d_a_obj_smplbg.cpp index 43cb09ae2..e1ecdfa67 100644 --- a/src/d/actor/d_a_obj_smplbg.cpp +++ b/src/d/actor/d_a_obj_smplbg.cpp @@ -7,12 +7,12 @@ #include "d/d_procname.h" /* 00000078-00000144 .text CreateHeap__Q211daObjSmplbg5Act_cFv */ -void daObjSmplbg::Act_c::CreateHeap() { +BOOL daObjSmplbg::Act_c::CreateHeap() { /* Nonmatching */ } /* 00000144-0000032C .text Create__Q211daObjSmplbg5Act_cFv */ -s32 daObjSmplbg::Act_c::Create() { +BOOL daObjSmplbg::Act_c::Create() { /* Nonmatching */ } @@ -47,7 +47,7 @@ void daObjSmplbg::Act_c::exec_qtkhd() { } /* 0000061C-000006CC .text Execute__Q211daObjSmplbg5Act_cFPPA3_A4_f */ -void daObjSmplbg::Act_c::Execute(float(**)[3][4]) { +BOOL daObjSmplbg::Act_c::Execute(Mtx**) { /* Nonmatching */ } diff --git a/src/d/actor/d_a_obj_stair.cpp b/src/d/actor/d_a_obj_stair.cpp index 621e05000..6de2e56f7 100644 --- a/src/d/actor/d_a_obj_stair.cpp +++ b/src/d/actor/d_a_obj_stair.cpp @@ -18,17 +18,17 @@ void ride_call_back(dBgW*, fopAc_ac_c*, fopAc_ac_c*) { } /* 000001D8-000002C4 .text CreateHeap__13daObj_Stair_cFv */ -void daObj_Stair_c::CreateHeap() { +BOOL daObj_Stair_c::CreateHeap() { /* Nonmatching */ } /* 000002C4-000002D8 .text Create__13daObj_Stair_cFv */ -s32 daObj_Stair_c::Create() { +BOOL daObj_Stair_c::Create() { /* Nonmatching */ } /* 000002D8-00000410 .text Execute__13daObj_Stair_cFPPA3_A4_f */ -void daObj_Stair_c::Execute(float(**)[3][4]) { +BOOL daObj_Stair_c::Execute(Mtx**) { /* Nonmatching */ } diff --git a/src/d/actor/d_a_obj_swflat.cpp b/src/d/actor/d_a_obj_swflat.cpp index f89c81689..a41694768 100644 --- a/src/d/actor/d_a_obj_swflat.cpp +++ b/src/d/actor/d_a_obj_swflat.cpp @@ -12,12 +12,12 @@ daObjSwflat_HIO_c::daObjSwflat_HIO_c() { } /* 00000138-00000280 .text CreateHeap__Q211daObjSwflat5Act_cFv */ -void daObjSwflat::Act_c::CreateHeap() { +BOOL daObjSwflat::Act_c::CreateHeap() { /* Nonmatching */ } /* 000002C8-00000630 .text Create__Q211daObjSwflat5Act_cFv */ -s32 daObjSwflat::Act_c::Create() { +BOOL daObjSwflat::Act_c::Create() { /* Nonmatching */ } @@ -47,7 +47,7 @@ void daObjSwflat::Act_c::init_mtx() { } /* 00000B20-0000121C .text Execute__Q211daObjSwflat5Act_cFPPA3_A4_f */ -void daObjSwflat::Act_c::Execute(float(**)[3][4]) { +BOOL daObjSwflat::Act_c::Execute(Mtx**) { /* Nonmatching */ } diff --git a/src/d/actor/d_a_obj_tenmado.cpp b/src/d/actor/d_a_obj_tenmado.cpp index f7b1a1045..de3fecfb9 100644 --- a/src/d/actor/d_a_obj_tenmado.cpp +++ b/src/d/actor/d_a_obj_tenmado.cpp @@ -7,12 +7,12 @@ #include "d/d_procname.h" /* 00000078-000001B4 .text CreateHeap__Q212daObjTenmado5Act_cFv */ -void daObjTenmado::Act_c::CreateHeap() { +BOOL daObjTenmado::Act_c::CreateHeap() { /* Nonmatching */ } /* 000001B4-0000029C .text Create__Q212daObjTenmado5Act_cFv */ -s32 daObjTenmado::Act_c::Create() { +BOOL daObjTenmado::Act_c::Create() { /* Nonmatching */ } @@ -42,7 +42,7 @@ void daObjTenmado::Act_c::init_mtx() { } /* 00000530-00000694 .text Execute__Q212daObjTenmado5Act_cFPPA3_A4_f */ -void daObjTenmado::Act_c::Execute(float(**)[3][4]) { +BOOL daObjTenmado::Act_c::Execute(Mtx**) { /* Nonmatching */ } diff --git a/src/d/actor/d_a_obj_tide.cpp b/src/d/actor/d_a_obj_tide.cpp index ffc85f14b..3c01de2f2 100644 --- a/src/d/actor/d_a_obj_tide.cpp +++ b/src/d/actor/d_a_obj_tide.cpp @@ -7,12 +7,12 @@ #include "d/d_procname.h" /* 00000078-00000644 .text CreateHeap__Q29daObjTide5Act_cFv */ -void daObjTide::Act_c::CreateHeap() { +BOOL daObjTide::Act_c::CreateHeap() { /* Nonmatching */ } /* 0000068C-000007BC .text Create__Q29daObjTide5Act_cFv */ -s32 daObjTide::Act_c::Create() { +BOOL daObjTide::Act_c::Create() { /* Nonmatching */ } @@ -142,7 +142,7 @@ void daObjTide::Act_c::se_pos_up() { } /* 00001B78-00001C84 .text Execute__Q29daObjTide5Act_cFPPA3_A4_f */ -void daObjTide::Act_c::Execute(float(**)[3][4]) { +BOOL daObjTide::Act_c::Execute(Mtx**) { /* Nonmatching */ } diff --git a/src/d/actor/d_a_obj_volcano.cpp b/src/d/actor/d_a_obj_volcano.cpp index c8c49eca9..4e5078a60 100644 --- a/src/d/actor/d_a_obj_volcano.cpp +++ b/src/d/actor/d_a_obj_volcano.cpp @@ -17,12 +17,12 @@ void daObjVolcano::Act_c::StopFire() { } /* 00000470-00000758 .text CreateHeap__Q212daObjVolcano5Act_cFv */ -void daObjVolcano::Act_c::CreateHeap() { +BOOL daObjVolcano::Act_c::CreateHeap() { /* Nonmatching */ } /* 00000758-000009C8 .text Create__Q212daObjVolcano5Act_cFv */ -s32 daObjVolcano::Act_c::Create() { +BOOL daObjVolcano::Act_c::Create() { /* Nonmatching */ } @@ -92,7 +92,7 @@ void daObjVolcano::Act_c::daObjVolcano_fail_demo_main() { } /* 00001740-0000199C .text Execute__Q212daObjVolcano5Act_cFPPA3_A4_f */ -void daObjVolcano::Act_c::Execute(float(**)[3][4]) { +BOOL daObjVolcano::Act_c::Execute(Mtx**) { /* Nonmatching */ } diff --git a/src/d/actor/d_a_scene_change.cpp b/src/d/actor/d_a_scene_change.cpp index 373641b66..51054dc85 100644 --- a/src/d/actor/d_a_scene_change.cpp +++ b/src/d/actor/d_a_scene_change.cpp @@ -19,7 +19,7 @@ daSceneChgHIO_c::daSceneChgHIO_c() { } /* 00000118-000001A8 .text daSceneChgCreate__FPv */ -static s32 daSceneChgCreate(void* i_this) { +static cPhs_State daSceneChgCreate(void* i_this) { d_a_scene_change_c* scnChg = static_cast(i_this); fopAcM_SetupActor(scnChg, d_a_scene_change_c); diff --git a/src/d/actor/d_a_steam_tag.cpp b/src/d/actor/d_a_steam_tag.cpp index f4e2d426e..19ddb4b54 100644 --- a/src/d/actor/d_a_steam_tag.cpp +++ b/src/d/actor/d_a_steam_tag.cpp @@ -60,7 +60,7 @@ const daSteamTag_mData* daSteamTag_c::getData() { } /* 00000084-0000029C .text CreateInit__12daSteamTag_cFv */ -s32 daSteamTag_c::CreateInit() { +BOOL daSteamTag_c::CreateInit() { m29B = daSteamTag_prm::getSchBit(this); mEmitTimer = getData()->emit_time_min + cM_rndF(getData()->emit_time_range); mCreateTimer = cM_rndF(getData()->create_time_range);; diff --git a/src/d/actor/d_a_stone2.cpp b/src/d/actor/d_a_stone2.cpp index 80afefd8c..c0b3c8427 100644 --- a/src/d/actor/d_a_stone2.cpp +++ b/src/d/actor/d_a_stone2.cpp @@ -27,12 +27,12 @@ void daStone2::Act_c::on_switch() const { } /* 00000638-00000704 .text CreateHeap__Q28daStone25Act_cFv */ -void daStone2::Act_c::CreateHeap() { +BOOL daStone2::Act_c::CreateHeap() { /* Nonmatching */ } /* 00000704-000009C8 .text Create__Q28daStone25Act_cFv */ -s32 daStone2::Act_c::Create() { +BOOL daStone2::Act_c::Create() { /* Nonmatching */ } @@ -227,7 +227,7 @@ void daStone2::Act_c::demo_proc_call() { } /* 000023BC-00002574 .text Execute__Q28daStone25Act_cFPPA3_A4_f */ -void daStone2::Act_c::Execute(float(**)[3][4]) { +BOOL daStone2::Act_c::Execute(Mtx**) { /* Nonmatching */ } diff --git a/src/d/actor/d_a_swhit0.cpp b/src/d/actor/d_a_swhit0.cpp index 50cf82c42..5e6aef9c9 100644 --- a/src/d/actor/d_a_swhit0.cpp +++ b/src/d/actor/d_a_swhit0.cpp @@ -138,7 +138,7 @@ void daSwhit0_c::decisionRtType() { } /* 00000270-000004E8 .text CreateInit__10daSwhit0_cFv */ -s32 daSwhit0_c::CreateInit() { +BOOL daSwhit0_c::CreateInit() { setDrawMtx(); fopAcM_SetMtx(this, mpModel->getBaseTRMtx()); decisionRtType(); diff --git a/src/d/actor/d_a_tori_flag.cpp b/src/d/actor/d_a_tori_flag.cpp index f44aa481e..f546f782a 100644 --- a/src/d/actor/d_a_tori_flag.cpp +++ b/src/d/actor/d_a_tori_flag.cpp @@ -95,7 +95,7 @@ BOOL daTori_Flag_c::CreateHeap() { } /* 0000030C-000003A4 .text CreateInit__13daTori_Flag_cFv */ -s32 daTori_Flag_c::CreateInit() { +cPhs_State daTori_Flag_c::CreateInit() { mStts.Init(0xFF,0xFF,this); mCyl.Set(l_cyl_src); mCyl.SetStts(&mStts); @@ -106,7 +106,7 @@ s32 daTori_Flag_c::CreateInit() { set_mtx(); dKy_tevstr_init(&mClothTevStr, current.roomNo, 0xFF); fopAcM_SetMtx(this, mpModel->getBaseTRMtx()); - return 4; + return cPhs_COMPLEATE_e; } /* 000003C4-00000478 .text _create__13daTori_Flag_cFv */ diff --git a/src/d/d_event_manager.cpp b/src/d/d_event_manager.cpp index ca5f8d552..2f4b52809 100644 --- a/src/d/d_event_manager.cpp +++ b/src/d/d_event_manager.cpp @@ -770,9 +770,9 @@ dEv_seach_prm::dEv_seach_prm(const char* name, u32 mask, u32 value) { } /* 80075394-800753A8 .text dEv_extra_createCB__FPv */ -int dEv_extra_createCB(void* actor) { +cPhs_State dEv_extra_createCB(void* actor) { fopAcM_OnStatus((fopAc_ac_c*)actor, fopAcStts_UNK800_e); - return 4; + return cPhs_COMPLEATE_e; } /* 800753A8-80075450 .text dEv_talkman_get_action__Fi */ diff --git a/src/f_pc/f_pc_stdcreate_req.cpp b/src/f_pc/f_pc_stdcreate_req.cpp index 331a149de..a7cce4edd 100644 --- a/src/f_pc/f_pc_stdcreate_req.cpp +++ b/src/f_pc/f_pc_stdcreate_req.cpp @@ -54,7 +54,8 @@ cPhs_State fpcSCtRq_phase_IsComplete(standard_create_request_class* i_SCtReq) { /* 80040794-800407E4 .text fpcSCtRq_phase_PostMethod__FP29standard_create_request_class */ cPhs_State fpcSCtRq_phase_PostMethod(standard_create_request_class* i_SCtReq) { - if (i_SCtReq->mpCallBack != NULL && i_SCtReq->mpCallBack(i_SCtReq->base.mpRes, i_SCtReq->mpCallBackUserData) == FALSE) { + if (i_SCtReq->mpCallBack != NULL && + i_SCtReq->mpCallBack(i_SCtReq->base.mpRes, i_SCtReq->mpCallBackUserData) == 0) { return cPhs_INIT_e; } else { return cPhs_NEXT_e;