diff --git a/include/SSystem/SComponent/c_list_iter.h b/include/SSystem/SComponent/c_list_iter.h index b7ec8630f..73aaf2a31 100644 --- a/include/SSystem/SComponent/c_list_iter.h +++ b/include/SSystem/SComponent/c_list_iter.h @@ -5,7 +5,7 @@ typedef struct node_list_class node_list_class; -int cLsIt_Method(node_list_class* pList, cNdIt_MethodFunc pMethod, void* pUserData); +BOOL cLsIt_Method(node_list_class* pList, cNdIt_MethodFunc pMethod, void* pUserData); void* cLsIt_Judge(node_list_class* pList, cNdIt_JudgeFunc pJudge, void* pUserData); #endif /* C_LIST_ITER_H */ diff --git a/include/SSystem/SComponent/c_node_iter.h b/include/SSystem/SComponent/c_node_iter.h index fe68ac8f6..71d8fdf15 100644 --- a/include/SSystem/SComponent/c_node_iter.h +++ b/include/SSystem/SComponent/c_node_iter.h @@ -1,11 +1,12 @@ #ifndef C_NODE_ITER_H #define C_NODE_ITER_H +#include "dolphin/types.h" typedef struct node_class node_class; typedef int (*cNdIt_MethodFunc)(node_class* pNode, void* pUserData); -int cNdIt_Method(node_class* pNode, cNdIt_MethodFunc pMethod, void* pUserData); +BOOL cNdIt_Method(node_class* pNode, cNdIt_MethodFunc pMethod, void* pUserData); typedef void* (*cNdIt_JudgeFunc)(node_class* pNode, void* pUserData); void* cNdIt_Judge(node_class* pNode, cNdIt_JudgeFunc pJudge, void* pUserData); diff --git a/include/SSystem/SComponent/c_phase.h b/include/SSystem/SComponent/c_phase.h index 357605b50..f1d87ecee 100644 --- a/include/SSystem/SComponent/c_phase.h +++ b/include/SSystem/SComponent/c_phase.h @@ -1,10 +1,8 @@ #ifndef C_PHASE_H #define C_PHASE_H - -typedef int (*cPhs__Handler)(void*); - -enum cPhs__Step { +typedef int cPhs_State; +enum { /* 0x0 */ cPhs_INIT_e, /* 0x1 */ cPhs_LOADING_e, /* 0x2 */ cPhs_NEXT_e, @@ -13,20 +11,21 @@ enum cPhs__Step { /* 0x5 */ cPhs_ERROR_e, }; -typedef struct request_of_phase_process_class { - cPhs__Handler* mpHandlerTable; - int id; -} request_of_phase_process_class; +typedef cPhs_State (*cPhs__Handler)(void*); +typedef cPhs_State (*request_of_phase_process_fn)(void*); -typedef int (*request_of_phase_process_fn)(void*); +typedef struct request_of_phase_process_class { + /* 0x00 */ cPhs__Handler* mpHandlerTable; + /* 0x04 */ int id; // Index into the handler table +} request_of_phase_process_class; // Size: 0x08 void cPhs_Reset(request_of_phase_process_class* pPhase); void cPhs_Set(request_of_phase_process_class* pPhase, cPhs__Handler* pHandlerTable); void cPhs_UnCompleate(request_of_phase_process_class* pPhase); -int cPhs_Compleate(request_of_phase_process_class* pPhase); -int cPhs_Next(request_of_phase_process_class* pPhase); -int cPhs_Do(request_of_phase_process_class* pPhase, void* pUserData); -int cPhs_Handler(request_of_phase_process_class* pPhase, cPhs__Handler* pHandlerTable, +cPhs_State cPhs_Compleate(request_of_phase_process_class* pPhase); +cPhs_State cPhs_Next(request_of_phase_process_class* pPhase); +cPhs_State cPhs_Do(request_of_phase_process_class* pPhase, void* pUserData); +cPhs_State cPhs_Handler(request_of_phase_process_class* pPhase, cPhs__Handler* pHandlerTable, void* pUserData); #endif /* C_PHASE_H */ diff --git a/include/SSystem/SComponent/c_request.h b/include/SSystem/SComponent/c_request.h index 8b1b37730..f08404e04 100644 --- a/include/SSystem/SComponent/c_request.h +++ b/include/SSystem/SComponent/c_request.h @@ -9,7 +9,7 @@ struct request_base_class { u8 flag2 : 6; }; -int cReq_Is_Done(request_base_class*); +BOOL cReq_Is_Done(request_base_class*); void cReq_Done(request_base_class*); void cReq_Command(request_base_class*, u8); void cReq_Create(request_base_class*, u8); diff --git a/include/SSystem/SComponent/c_tag.h b/include/SSystem/SComponent/c_tag.h index e2dbf41db..1bd2ca05b 100644 --- a/include/SSystem/SComponent/c_tag.h +++ b/include/SSystem/SComponent/c_tag.h @@ -11,10 +11,10 @@ typedef struct create_tag_class { /* 0x00 */ node_class mpNode; /* 0x0C */ void* mpTagData; /* 0x10 */ s8 mbIsUse; -} create_tag_class; +} create_tag_class; // Size: 0x14 -int cTg_IsUse(create_tag_class* pTag); -int cTg_SingleCutFromTree(create_tag_class* pTag); +BOOL cTg_IsUse(create_tag_class* pTag); +BOOL cTg_SingleCutFromTree(create_tag_class* pTag); int cTg_AdditionToTree(node_lists_tree_class* pTree, int listIdx, create_tag_class* pTag); int cTg_InsertToTree(node_lists_tree_class* pTree, int listIdx, create_tag_class* pTag, int idx); node_class* cTg_GetFirst(node_list_class* pTag); diff --git a/include/SSystem/SComponent/c_tree_iter.h b/include/SSystem/SComponent/c_tree_iter.h index 147e02601..8349d2e8e 100644 --- a/include/SSystem/SComponent/c_tree_iter.h +++ b/include/SSystem/SComponent/c_tree_iter.h @@ -5,7 +5,7 @@ typedef struct node_lists_tree_class node_lists_tree_class; -int cTrIt_Method(node_lists_tree_class* pTree, cNdIt_MethodFunc pJudgeFunc, void* pUserData); +BOOL cTrIt_Method(node_lists_tree_class* pTree, cNdIt_MethodFunc pJudgeFunc, void* pUserData); void* cTrIt_Judge(node_lists_tree_class* pTree, cNdIt_JudgeFunc pJudgeFunc, void* pUserData); #endif /* C_TREE_ITER_H */ diff --git a/include/c/c_dylink.h b/include/c/c_dylink.h index 9b7473de4..ece18ceed 100644 --- a/include/c/c_dylink.h +++ b/include/c/c_dylink.h @@ -5,11 +5,11 @@ #include "SSystem/SComponent/c_phase.h" struct cDylPhs { - static int phase_01(void*); - static int phase_02(s16*); - static int phase_03(void*); - static int Link(request_of_phase_process_class*, s16); - static int Unlink(request_of_phase_process_class*, s16); + static cPhs_State phase_01(void*); + static cPhs_State phase_02(s16*); + static cPhs_State phase_03(void*); + static cPhs_State Link(request_of_phase_process_class*, s16); + static BOOL Unlink(request_of_phase_process_class*, s16); }; @@ -18,11 +18,11 @@ struct DynamicNameTableEntry { const char* name; }; -int cDyl_InitAsyncIsDone(); +BOOL cDyl_InitAsyncIsDone(); void cDyl_InitAsync(); -s32 cDyl_IsLinked(s16 i_procName); -s32 cDyl_Unlink(s16 i_procName); -s32 cDyl_LinkASync(s16 i_procName); +BOOL cDyl_IsLinked(s16 i_procName); +BOOL cDyl_Unlink(s16 i_procName); +cPhs_State cDyl_LinkASync(s16 i_procName); #endif /* C_C_DYLINK_H */ diff --git a/include/d/actor/d_a_acorn_leaf.h b/include/d/actor/d_a_acorn_leaf.h index 3cf581351..075856cce 100644 --- a/include/d/actor/d_a_acorn_leaf.h +++ b/include/d/actor/d_a_acorn_leaf.h @@ -11,7 +11,7 @@ public: void CreateInit(); void create_acorn(); void create_acorn_sub(bool); - s32 _create(); + cPhs_State _create(); void set_mtx(); bool _execute(); bool _draw(); diff --git a/include/d/actor/d_a_agb.h b/include/d/actor/d_a_agb.h index 27d56bea0..2c5b2e28d 100644 --- a/include/d/actor/d_a_agb.h +++ b/include/d/actor/d_a_agb.h @@ -104,7 +104,7 @@ public: void CursorMove(fopAc_ac_c*, u32); void modeMove(); void modeDelete(); - int createHeap(); + BOOL createHeap(); inline void modeProcCall(); diff --git a/include/d/actor/d_a_alldie.h b/include/d/actor/d_a_alldie.h index 283cba49c..8422c5156 100644 --- a/include/d/actor/d_a_alldie.h +++ b/include/d/actor/d_a_alldie.h @@ -5,7 +5,7 @@ class daAlldie_c : public fopAc_ac_c { public: - inline s32 create(); + inline cPhs_State create(); inline BOOL draw(); void setActio(u8 action) { mAction = action; } diff --git a/include/d/actor/d_a_amiprop.h b/include/d/actor/d_a_amiprop.h index 9df419142..7e99c81df 100644 --- a/include/d/actor/d_a_amiprop.h +++ b/include/d/actor/d_a_amiprop.h @@ -8,7 +8,7 @@ public: bool _delete(); void CreateHeap(); void CreateInit(); - s32 _create(); + cPhs_State _create(); void set_mtx(); void setMoveBGMtx(); bool _execute(); diff --git a/include/d/actor/d_a_andsw2.h b/include/d/actor/d_a_andsw2.h index b949d4ef9..ca665bab5 100644 --- a/include/d/actor/d_a_andsw2.h +++ b/include/d/actor/d_a_andsw2.h @@ -17,7 +17,7 @@ public: BOOL chkAllSw2(); inline BOOL execute(); - inline s32 create(); + inline cPhs_State create(); inline BOOL draw(); public: diff --git a/include/d/actor/d_a_arrow.h b/include/d/actor/d_a_arrow.h index ead366afc..5bfa246f6 100644 --- a/include/d/actor/d_a_arrow.h +++ b/include/d/actor/d_a_arrow.h @@ -51,7 +51,7 @@ public: BOOL createInit(); BOOL _execute(); BOOL _draw(); - s32 _create(); + cPhs_State _create(); BOOL _delete(); static u8 getKeepType(); diff --git a/include/d/actor/d_a_arrow_iceeff.h b/include/d/actor/d_a_arrow_iceeff.h index 1b084f781..268a506ac 100644 --- a/include/d/actor/d_a_arrow_iceeff.h +++ b/include/d/actor/d_a_arrow_iceeff.h @@ -6,7 +6,7 @@ class daArrow_Iceeff_c : public fopAc_ac_c { public: - inline s32 _create(); + inline cPhs_State _create(); inline bool _delete(); inline bool _draw(); inline bool _execute(); diff --git a/include/d/actor/d_a_arrow_lighteff.h b/include/d/actor/d_a_arrow_lighteff.h index 3da81e103..95c1c277f 100644 --- a/include/d/actor/d_a_arrow_lighteff.h +++ b/include/d/actor/d_a_arrow_lighteff.h @@ -10,7 +10,7 @@ class JPABaseEmitter; class daArrow_Lighteff_c : public fopAc_ac_c { public: - inline s32 _create(); + inline cPhs_State _create(); inline bool _delete(); inline bool _draw(); inline bool _execute(); diff --git a/include/d/actor/d_a_atdoor.h b/include/d/actor/d_a_atdoor.h index 16e5b017b..3f29e664e 100644 --- a/include/d/actor/d_a_atdoor.h +++ b/include/d/actor/d_a_atdoor.h @@ -13,7 +13,7 @@ public: void CreateHeap(); void calcMtx(); void CreateInit(); - s32 create(); + cPhs_State create(); public: /* Place member variables here */ diff --git a/include/d/actor/d_a_auction.h b/include/d/actor/d_a_auction.h index 458332907..e2a8cd156 100644 --- a/include/d/actor/d_a_auction.h +++ b/include/d/actor/d_a_auction.h @@ -45,9 +45,9 @@ public: void setNpcID(int, fpc_ProcID) {} void setStart(unsigned char) {} - s32 _create(); + cPhs_State _create(); BOOL createHeap(); - s32 createInit(); + cPhs_State createInit(); BOOL _delete(); BOOL _draw(); BOOL _execute(); diff --git a/include/d/actor/d_a_beam.h b/include/d/actor/d_a_beam.h index c67991cca..1e7e0ad14 100644 --- a/include/d/actor/d_a_beam.h +++ b/include/d/actor/d_a_beam.h @@ -5,7 +5,7 @@ class daBeam_c : public fopAc_ac_c { public: - inline s32 _create(); + inline cPhs_State _create(); inline bool _delete(); inline bool _draw(); void beamCheck() {} diff --git a/include/d/actor/d_a_bflower.h b/include/d/actor/d_a_bflower.h index 4188874e6..95f85e980 100644 --- a/include/d/actor/d_a_bflower.h +++ b/include/d/actor/d_a_bflower.h @@ -21,7 +21,7 @@ public: BOOL CreateHeap(); void CreateInit(); int init_bck_anm(s16 param); - s32 _create(); + cPhs_State _create(); void set_mtx(); bool _execute(); BOOL actLive(); diff --git a/include/d/actor/d_a_bg.h b/include/d/actor/d_a_bg.h index 4fcb1a690..be15d4486 100644 --- a/include/d/actor/d_a_bg.h +++ b/include/d/actor/d_a_bg.h @@ -42,7 +42,7 @@ public: ~daBg_c(); const char * setArcName(); inline BOOL createHeap(); - s32 create(); + cPhs_State create(); inline BOOL execute(); inline BOOL draw(); inline BOOL isDelete(); diff --git a/include/d/actor/d_a_bigelf.h b/include/d/actor/d_a_bigelf.h index a24422dee..4b7d48c23 100644 --- a/include/d/actor/d_a_bigelf.h +++ b/include/d/actor/d_a_bigelf.h @@ -81,7 +81,7 @@ public: bool _draw(); bool _execute(); bool _delete(); - s32 _create(); + cPhs_State _create(); void CreateHeap(); public: diff --git a/include/d/actor/d_a_boko.h b/include/d/actor/d_a_boko.h index e28ea5eab..bd76f956b 100644 --- a/include/d/actor/d_a_boko.h +++ b/include/d/actor/d_a_boko.h @@ -79,7 +79,7 @@ public: BOOL execute(); void bokoDelete(); BOOL createHeap(); - s32 create(); + cPhs_State create(); public: /* 0x290 */ request_of_phase_process_class mPhs; diff --git a/include/d/actor/d_a_bomb2.h b/include/d/actor/d_a_bomb2.h index 45ab22533..cec0e8aaf 100644 --- a/include/d/actor/d_a_bomb2.h +++ b/include/d/actor/d_a_bomb2.h @@ -97,7 +97,7 @@ namespace daBomb2 { void start_carry(); void start_proc_call(); void create_init(); - int _create(); + cPhs_State _create(); bool _delete(); void set_mtx(); void init_mtx(); diff --git a/include/d/actor/d_a_boomerang.h b/include/d/actor/d_a_boomerang.h index 6dbbcf069..b53aab5ee 100644 --- a/include/d/actor/d_a_boomerang.h +++ b/include/d/actor/d_a_boomerang.h @@ -9,7 +9,7 @@ public: void onCancelFlg() { mCancelFlg = true; } daBoomerang_c(); - s32 create(); + cPhs_State create(); BOOL draw(); BOOL execute(); float getFlyMax(); diff --git a/include/d/actor/d_a_branch.h b/include/d/actor/d_a_branch.h index 8f24dbc61..95e47d36a 100644 --- a/include/d/actor/d_a_branch.h +++ b/include/d/actor/d_a_branch.h @@ -17,7 +17,7 @@ public: dComIfG_resDelete(&mPhase, m_arcname); } - inline s32 create(); + inline cPhs_State create(); inline BOOL draw(); inline BOOL execute(); diff --git a/include/d/actor/d_a_canon.h b/include/d/actor/d_a_canon.h index a05d356fe..d1ae345be 100644 --- a/include/d/actor/d_a_canon.h +++ b/include/d/actor/d_a_canon.h @@ -5,7 +5,7 @@ class daCanon_c : public fopAc_ac_c { public: - inline s32 _create(); + inline cPhs_State _create(); inline bool _delete(); inline bool _draw(); inline bool _execute(); diff --git a/include/d/actor/d_a_coming2.h b/include/d/actor/d_a_coming2.h index c2df9e074..81e3b5a56 100644 --- a/include/d/actor/d_a_coming2.h +++ b/include/d/actor/d_a_coming2.h @@ -45,7 +45,7 @@ namespace daComing2 { void coming_game_main(); void coming_process_init(short); void coming_process_main(); - s32 _create(); + cPhs_State _create(); bool _delete(); bool _execute(); bool _draw(); diff --git a/include/d/actor/d_a_coming3.h b/include/d/actor/d_a_coming3.h index 7f81506ac..5d874b409 100644 --- a/include/d/actor/d_a_coming3.h +++ b/include/d/actor/d_a_coming3.h @@ -26,7 +26,7 @@ namespace daComing3 { void collision_main(); void solidHeapCB(fopAc_ac_c*); void create_heap(); - s32 _create(); + cPhs_State _create(); bool _delete(); bool _execute(); bool _draw(); diff --git a/include/d/actor/d_a_dai.h b/include/d/actor/d_a_dai.h index cda35d345..9ccebed50 100644 --- a/include/d/actor/d_a_dai.h +++ b/include/d/actor/d_a_dai.h @@ -14,7 +14,7 @@ public: bool _delete(); void CreateHeap(); void CreateInit(); - s32 _create(); + cPhs_State _create(); void set_mtx(); void eventOrder(); void checkOrder(); diff --git a/include/d/actor/d_a_dai_item.h b/include/d/actor/d_a_dai_item.h index b4441adf7..a60e6348e 100644 --- a/include/d/actor/d_a_dai_item.h +++ b/include/d/actor/d_a_dai_item.h @@ -24,7 +24,7 @@ public: bool _delete(); BOOL CreateHeap(); void CreateInit(); - s32 _create(); + cPhs_State _create(); void set_mtx(); bool _execute(); void itemProc(); diff --git a/include/d/actor/d_a_daiocta.h b/include/d/actor/d_a_daiocta.h index ee15c3ba3..d3ba484ad 100644 --- a/include/d/actor/d_a_daiocta.h +++ b/include/d/actor/d_a_daiocta.h @@ -62,7 +62,7 @@ public: bool _draw(); void getArg(); void createInit(); - s32 _create(); + cPhs_State _create(); bool _delete(); public: diff --git a/include/d/actor/d_a_daiocta_eye.h b/include/d/actor/d_a_daiocta_eye.h index 4ac17801e..e3a8f69f4 100644 --- a/include/d/actor/d_a_daiocta_eye.h +++ b/include/d/actor/d_a_daiocta_eye.h @@ -24,7 +24,7 @@ public: bool _execute(); bool _draw(); void createInit(); - s32 _create(); + cPhs_State _create(); bool _delete(); public: diff --git a/include/d/actor/d_a_deku_item.h b/include/d/actor/d_a_deku_item.h index 2d5138a84..79adb6284 100644 --- a/include/d/actor/d_a_deku_item.h +++ b/include/d/actor/d_a_deku_item.h @@ -21,7 +21,7 @@ public: bool _delete(); BOOL CreateHeap(); void CreateInit(); - s32 _create(); + cPhs_State _create(); void set_mtx(); bool _execute(); void mode_proc_call(); diff --git a/include/d/actor/d_a_demo_item.h b/include/d/actor/d_a_demo_item.h index 13e23b819..8e9385fd9 100644 --- a/include/d/actor/d_a_demo_item.h +++ b/include/d/actor/d_a_demo_item.h @@ -17,7 +17,7 @@ public: static u8 m_effect_type[]; inline BOOL Delete(); - inline s32 create(); + inline cPhs_State create(); inline BOOL draw(); inline BOOL execute(); inline BOOL isdelete(); diff --git a/include/d/actor/d_a_demo_kmm.h b/include/d/actor/d_a_demo_kmm.h index b6ca1eaeb..c0443cd7b 100644 --- a/include/d/actor/d_a_demo_kmm.h +++ b/include/d/actor/d_a_demo_kmm.h @@ -13,7 +13,7 @@ public: void calcMtx(); void setAnime(int, int, float, float); void CreateInit(); - s32 create(); + cPhs_State create(); public: /* Place member variables here */ diff --git a/include/d/actor/d_a_door10.h b/include/d/actor/d_a_door10.h index ccabccd7f..f34e32a3b 100644 --- a/include/d/actor/d_a_door10.h +++ b/include/d/actor/d_a_door10.h @@ -35,7 +35,7 @@ public: void closeEnd(); void calcMtx(); void CreateInit(); - s32 create(); + cPhs_State create(); void demoProc(); BOOL draw(); diff --git a/include/d/actor/d_a_door12.h b/include/d/actor/d_a_door12.h index 99972bc58..215f30517 100644 --- a/include/d/actor/d_a_door12.h +++ b/include/d/actor/d_a_door12.h @@ -39,7 +39,7 @@ public: void closeEnd(); void calcMtx(); void CreateInit(); - s32 create(); + cPhs_State create(); void demoProc(); BOOL draw(); diff --git a/include/d/actor/d_a_dummy.h b/include/d/actor/d_a_dummy.h index fb14d164a..973f71676 100644 --- a/include/d/actor/d_a_dummy.h +++ b/include/d/actor/d_a_dummy.h @@ -9,7 +9,7 @@ namespace daDummy { public: static BOOL solidHeapCB(fopAc_ac_c*); bool create_heap(); - s32 _create(); + cPhs_State _create(); bool _delete(); void set_mtx(); bool _execute(); diff --git a/include/d/actor/d_a_fallrock.h b/include/d/actor/d_a_fallrock.h index 196aea4ee..10320b41c 100644 --- a/include/d/actor/d_a_fallrock.h +++ b/include/d/actor/d_a_fallrock.h @@ -5,7 +5,7 @@ class daFallRock_c : public fopAc_ac_c { public: - inline s32 create(); + inline cPhs_State create(); inline BOOL draw(); inline BOOL execute(); diff --git a/include/d/actor/d_a_fallrock_tag.h b/include/d/actor/d_a_fallrock_tag.h index fb7d765eb..ee3859116 100644 --- a/include/d/actor/d_a_fallrock_tag.h +++ b/include/d/actor/d_a_fallrock_tag.h @@ -5,7 +5,7 @@ class daFallRockTag_c : public fopAc_ac_c { public: - inline s32 create(); + inline cPhs_State create(); inline BOOL draw(); inline BOOL execute(); void getData(); // weak but not inlined? diff --git a/include/d/actor/d_a_fan.h b/include/d/actor/d_a_fan.h index 1d37dc914..b4038055a 100644 --- a/include/d/actor/d_a_fan.h +++ b/include/d/actor/d_a_fan.h @@ -8,15 +8,15 @@ class daFan_c : public dBgS_MoveBgActor { public: - s32 _create(); - BOOL Delete(); - int CreateHeap(); - int Create(); + cPhs_State _create(); + virtual BOOL Delete(); + virtual BOOL CreateHeap(); + virtual BOOL Create(); void set_mtx(); void set_wind_length(f32); void set_cps(f32); - int Execute(Mtx**); - BOOL Draw(); + virtual int Execute(Mtx**); + virtual BOOL Draw(); public: /* 0x2C8 */ request_of_phase_process_class mPhs; diff --git a/include/d/actor/d_a_fire.h b/include/d/actor/d_a_fire.h index 3fa00b40f..a92dc6e43 100644 --- a/include/d/actor/d_a_fire.h +++ b/include/d/actor/d_a_fire.h @@ -7,7 +7,7 @@ class daFire_c : public fopAc_ac_c { public: bool _delete(); void CreateInit(); - s32 _create(); + cPhs_State _create(); bool _execute(); void search_wind(); void ctrlEffect(); diff --git a/include/d/actor/d_a_floor.h b/include/d/actor/d_a_floor.h index 4f9d7b28b..98c3ae0f0 100644 --- a/include/d/actor/d_a_floor.h +++ b/include/d/actor/d_a_floor.h @@ -6,14 +6,14 @@ class daFloor_c : public dBgS_MoveBgActor { public: - BOOL Delete(); - int CreateHeap(); - int Create(); - s32 _create(); + virtual BOOL Delete(); + virtual BOOL CreateHeap(); + virtual BOOL Create(); + cPhs_State _create(); void set_mtx(); void set_effect(); - BOOL Draw(); - int Execute(Mtx**); + virtual BOOL Draw(); + virtual BOOL Execute(Mtx**); public: /* 0x2C8 */ request_of_phase_process_class mPhs; diff --git a/include/d/actor/d_a_fm.h b/include/d/actor/d_a_fm.h index c1f4825ea..9fe219c64 100644 --- a/include/d/actor/d_a_fm.h +++ b/include/d/actor/d_a_fm.h @@ -113,7 +113,7 @@ public: bool _draw(); void getArg(); void createInit(); - s32 _create(); + cPhs_State _create(); bool _delete(); public: diff --git a/include/d/actor/d_a_ghostship.h b/include/d/actor/d_a_ghostship.h index f37a5a566..90690c33c 100644 --- a/include/d/actor/d_a_ghostship.h +++ b/include/d/actor/d_a_ghostship.h @@ -21,7 +21,7 @@ public: void getAlpha() {} void setMtx() {} - inline s32 _create(); + inline cPhs_State _create(); inline bool _delete(); inline bool _draw(); inline bool _execute(); diff --git a/include/d/actor/d_a_goal_flag.h b/include/d/actor/d_a_goal_flag.h index 8f54d36aa..eae78ac0d 100644 --- a/include/d/actor/d_a_goal_flag.h +++ b/include/d/actor/d_a_goal_flag.h @@ -5,7 +5,7 @@ class daGoal_Flag_c : public fopAc_ac_c { public: - inline s32 _create(); + inline cPhs_State _create(); inline bool _delete(); inline bool _draw(); inline bool _execute(); diff --git a/include/d/actor/d_a_grid.h b/include/d/actor/d_a_grid.h index f5e8809fc..1663a649a 100644 --- a/include/d/actor/d_a_grid.h +++ b/include/d/actor/d_a_grid.h @@ -16,7 +16,7 @@ class daGrid_c : public fopAc_ac_c { public: void force_calc_wind_rel_angle(short) {} - s32 _create(); + cPhs_State _create(); bool _delete(); bool _execute(); bool _draw(); diff --git a/include/d/actor/d_a_gy.h b/include/d/actor/d_a_gy.h index 3a1f8ae4e..4f8fcde04 100644 --- a/include/d/actor/d_a_gy.h +++ b/include/d/actor/d_a_gy.h @@ -46,7 +46,7 @@ public: void drawDebug(); bool _draw(); void createInit(); - s32 _create(); + cPhs_State _create(); bool _delete(); public: diff --git a/include/d/actor/d_a_gy_ctrl.h b/include/d/actor/d_a_gy_ctrl.h index 47e529678..5e9d64096 100644 --- a/include/d/actor/d_a_gy_ctrl.h +++ b/include/d/actor/d_a_gy_ctrl.h @@ -37,7 +37,7 @@ public: void getParam(unsigned long, unsigned char, unsigned char); void getArg(); void checkGyCtrlExist(); - s32 _create(); + cPhs_State _create(); bool _delete(); public: diff --git a/include/d/actor/d_a_hookshot.h b/include/d/actor/d_a_hookshot.h index 24ba748f8..dff10b96f 100644 --- a/include/d/actor/d_a_hookshot.h +++ b/include/d/actor/d_a_hookshot.h @@ -47,7 +47,7 @@ public: BOOL procReturn(); BOOL execute(); BOOL hookshot_delete(); - s32 create(); + cPhs_State create(); public: /* 0x290 */ daHookshot_shape mShape; diff --git a/include/d/actor/d_a_hot_floor.h b/include/d/actor/d_a_hot_floor.h index 7cfca4d29..8b6758a07 100644 --- a/include/d/actor/d_a_hot_floor.h +++ b/include/d/actor/d_a_hot_floor.h @@ -11,8 +11,8 @@ class daHot_Floor_c : public fopAc_ac_c { public: void set_mtx_init(); void set_mtx(); - s32 CreateInit(); - inline s32 _create(); + cPhs_State CreateInit(); + inline cPhs_State _create(); inline bool _execute(); inline bool _draw(); inline bool _delete(); diff --git a/include/d/actor/d_a_hys.h b/include/d/actor/d_a_hys.h index 7663eb1dd..6befebb8e 100644 --- a/include/d/actor/d_a_hys.h +++ b/include/d/actor/d_a_hys.h @@ -5,7 +5,7 @@ class daHys_c : public fopAc_ac_c { public: - inline s32 _create(); + inline cPhs_State _create(); void set_mtx(); BOOL Delete(); diff --git a/include/d/actor/d_a_icelift.h b/include/d/actor/d_a_icelift.h index 0c969fb35..90abc72ce 100644 --- a/include/d/actor/d_a_icelift.h +++ b/include/d/actor/d_a_icelift.h @@ -8,7 +8,7 @@ public: bool _delete(); void CreateHeap(); void CreateInit(); - s32 _create(); + cPhs_State _create(); void set_mtx(); bool _execute(); void lift_wave(); diff --git a/include/d/actor/d_a_kaji.h b/include/d/actor/d_a_kaji.h index 4360a51e2..618aca3ed 100644 --- a/include/d/actor/d_a_kaji.h +++ b/include/d/actor/d_a_kaji.h @@ -21,7 +21,7 @@ public: } void setAnm(int, f32) {} - inline s32 _create(); + inline cPhs_State _create(); inline bool _delete(); inline bool _execute(); inline bool _draw(); diff --git a/include/d/actor/d_a_kddoor.h b/include/d/actor/d_a_kddoor.h index 74b2e6dff..8bc2d4a94 100644 --- a/include/d/actor/d_a_kddoor.h +++ b/include/d/actor/d_a_kddoor.h @@ -68,7 +68,7 @@ public: void closeEnd(); void calcMtx(); void CreateInit(); - s32 create(); + cPhs_State create(); void demoProc(); BOOL draw(); diff --git a/include/d/actor/d_a_kmon.h b/include/d/actor/d_a_kmon.h index f63376671..366d84bdd 100644 --- a/include/d/actor/d_a_kmon.h +++ b/include/d/actor/d_a_kmon.h @@ -5,7 +5,7 @@ class daKmon_c : public fopAc_ac_c { public: - inline s32 _create(); + inline cPhs_State _create(); inline bool _delete(); inline bool _draw(); inline bool _execute(); diff --git a/include/d/actor/d_a_knob00.h b/include/d/actor/d_a_knob00.h index fbb3d58d0..aa6e971f3 100644 --- a/include/d/actor/d_a_knob00.h +++ b/include/d/actor/d_a_knob00.h @@ -27,7 +27,7 @@ public: void chkException(); void calcMtx(); void CreateInit(); - s32 create(); + cPhs_State create(); void setStart(float, float); void setAngle(); void adjustmentProc(); diff --git a/include/d/actor/d_a_komore.h b/include/d/actor/d_a_komore.h index be58ff75e..36db7e3ed 100644 --- a/include/d/actor/d_a_komore.h +++ b/include/d/actor/d_a_komore.h @@ -11,7 +11,7 @@ public: virtual ~Act_c() {} static BOOL solidHeapCB(fopAc_ac_c*); bool create_heap(); - s32 _create(); + cPhs_State _create(); bool _delete(); void set_mtx(); bool _execute(); diff --git a/include/d/actor/d_a_lbridge.h b/include/d/actor/d_a_lbridge.h index f67425b51..318075e06 100644 --- a/include/d/actor/d_a_lbridge.h +++ b/include/d/actor/d_a_lbridge.h @@ -11,7 +11,7 @@ public: BOOL CreateHeap(); void CreateInit(); - s32 _create(); + cPhs_State _create(); void set_mtx(); void setMoveBGMtx(); bool _execute(); diff --git a/include/d/actor/d_a_leaflift.h b/include/d/actor/d_a_leaflift.h index 95127beb2..9c699b070 100644 --- a/include/d/actor/d_a_leaflift.h +++ b/include/d/actor/d_a_leaflift.h @@ -14,7 +14,7 @@ public: bool _delete(); BOOL CreateHeap(); void CreateInit(); - s32 _create(); + cPhs_State _create(); void set_mtx(); void setMoveBGMtx(); bool _execute(); diff --git a/include/d/actor/d_a_lstair.h b/include/d/actor/d_a_lstair.h index dca7f28fc..5422a44c5 100644 --- a/include/d/actor/d_a_lstair.h +++ b/include/d/actor/d_a_lstair.h @@ -10,7 +10,7 @@ public: bool _delete(); void CreateHeap(); void CreateInit(); - s32 _create(); + cPhs_State _create(); void set_mtx(); void setMoveBGMtx(); bool _execute(); diff --git a/include/d/actor/d_a_lwood.h b/include/d/actor/d_a_lwood.h index 18c03a351..3f326c88f 100644 --- a/include/d/actor/d_a_lwood.h +++ b/include/d/actor/d_a_lwood.h @@ -8,7 +8,7 @@ class dBgW; class daLwood_c : public fopAc_ac_c { public: - inline s32 _create(); + inline cPhs_State _create(); inline bool _delete(); inline bool _draw(); inline bool _execute(); diff --git a/include/d/actor/d_a_machine.h b/include/d/actor/d_a_machine.h index c0653440b..97ebab0f9 100644 --- a/include/d/actor/d_a_machine.h +++ b/include/d/actor/d_a_machine.h @@ -12,7 +12,7 @@ public: void set_next_pnt(); void search_wind_mill(); void set_speed(); - s32 _create(); + cPhs_State _create(); void set_mtx(); bool _execute(); void attack(); diff --git a/include/d/actor/d_a_magma.h b/include/d/actor/d_a_magma.h index 137d72a7f..681ecf0e1 100644 --- a/include/d/actor/d_a_magma.h +++ b/include/d/actor/d_a_magma.h @@ -8,7 +8,7 @@ class daMagma_c : public fopAc_ac_c { public: inline ~daMagma_c(); - inline s32 create(); + inline cPhs_State create(); inline s32 getPathNo() { return fopAcM_GetParam(this); } public: diff --git a/include/d/actor/d_a_mbdoor.h b/include/d/actor/d_a_mbdoor.h index 11580a7a6..79d1336dd 100644 --- a/include/d/actor/d_a_mbdoor.h +++ b/include/d/actor/d_a_mbdoor.h @@ -13,7 +13,7 @@ public: inline BOOL draw(); inline BOOL execute(); - s32 create(); + cPhs_State create(); u8 getSwbit(); u8 getType(); diff --git a/include/d/actor/d_a_mdoor.h b/include/d/actor/d_a_mdoor.h index 380670ca4..92d170258 100644 --- a/include/d/actor/d_a_mdoor.h +++ b/include/d/actor/d_a_mdoor.h @@ -22,7 +22,7 @@ public: void smokeInit(); void smokeEnd(); void CreateInit(); - s32 create(); + cPhs_State create(); void demoProc(); public: diff --git a/include/d/actor/d_a_mgameboard.h b/include/d/actor/d_a_mgameboard.h index 5cf3aa507..30928d565 100644 --- a/include/d/actor/d_a_mgameboard.h +++ b/include/d/actor/d_a_mgameboard.h @@ -11,7 +11,7 @@ class dDlst_2DObject_c; class daMgBoard_c : public fopAc_ac_c { public: - inline s32 _create(); + inline cPhs_State _create(); inline bool _delete(); inline bool _draw(); void reqClearGame() {} diff --git a/include/d/actor/d_a_mmusic.h b/include/d/actor/d_a_mmusic.h index 1fcf2f2fd..94b9cc3aa 100644 --- a/include/d/actor/d_a_mmusic.h +++ b/include/d/actor/d_a_mmusic.h @@ -13,7 +13,7 @@ namespace daMmusic { bool create_heap(); BOOL Macore_is_playing(); void set_mtx(); - s32 _create(); + cPhs_State _create(); bool _delete(); void init_se(); void manage_se(int); diff --git a/include/d/actor/d_a_mozo.h b/include/d/actor/d_a_mozo.h index 8a25d1a49..9d9841111 100644 --- a/include/d/actor/d_a_mozo.h +++ b/include/d/actor/d_a_mozo.h @@ -13,7 +13,7 @@ public: void setProcess(proc_t proc) { mCurrentProc = proc; } - s32 _create(); + cPhs_State _create(); bool _delete(); bool _draw(); bool _execute(); diff --git a/include/d/actor/d_a_mtoge.h b/include/d/actor/d_a_mtoge.h index 426841d64..80c4694c8 100644 --- a/include/d/actor/d_a_mtoge.h +++ b/include/d/actor/d_a_mtoge.h @@ -16,7 +16,7 @@ public: BOOL CreateHeap(); void calcMtx(); BOOL CreateInit(); - s32 create(); + cPhs_State create(); static const char M_arcname[]; diff --git a/include/d/actor/d_a_nh.h b/include/d/actor/d_a_nh.h index 63c695f63..f1ec0a518 100644 --- a/include/d/actor/d_a_nh.h +++ b/include/d/actor/d_a_nh.h @@ -30,7 +30,7 @@ public: ~daNh_c(); void setBaseMtx(); BOOL createHeap(); - s32 create(); + cPhs_State create(); BOOL init(); void action(void*); BOOL setAction(ActionFunc, void*); diff --git a/include/d/actor/d_a_npc_ac1.h b/include/d/actor/d_a_npc_ac1.h index eb1efb6df..6d6300e2d 100644 --- a/include/d/actor/d_a_npc_ac1.h +++ b/include/d/actor/d_a_npc_ac1.h @@ -59,7 +59,7 @@ public: bool _draw(); bool _execute(); bool _delete(); - s32 _create(); + cPhs_State _create(); void create_Anm(); void create_wng_Anm(); void create_arm_Anm(); diff --git a/include/d/actor/d_a_npc_ah.h b/include/d/actor/d_a_npc_ah.h index 991478408..c6255bd1e 100644 --- a/include/d/actor/d_a_npc_ah.h +++ b/include/d/actor/d_a_npc_ah.h @@ -15,7 +15,7 @@ public: void getPhaseP() {} void setResFlag(unsigned char) {} - s32 _create(); + cPhs_State _create(); void createHeap(); void createInit(); bool _delete(); diff --git a/include/d/actor/d_a_npc_aj1.h b/include/d/actor/d_a_npc_aj1.h index 9614ec521..692735f33 100644 --- a/include/d/actor/d_a_npc_aj1.h +++ b/include/d/actor/d_a_npc_aj1.h @@ -92,7 +92,7 @@ public: bool _draw(); bool _execute(); bool _delete(); - s32 _create(); + cPhs_State _create(); void bodyCreateHeap(); void itemCreateHeap(); void CreateHeap(); diff --git a/include/d/actor/d_a_npc_auction.h b/include/d/actor/d_a_npc_auction.h index 90add2af1..3c94d59fd 100644 --- a/include/d/actor/d_a_npc_auction.h +++ b/include/d/actor/d_a_npc_auction.h @@ -12,7 +12,7 @@ class daNpcAuction_c : public fopNpc_npc_c { public: daNpcAuction_c(); - inline s32 _create(); + inline cPhs_State _create(); inline bool _delete(); inline bool _draw(); inline bool _execute(); diff --git a/include/d/actor/d_a_npc_ba1.h b/include/d/actor/d_a_npc_ba1.h index 7ba86ffef..a6dde225b 100644 --- a/include/d/actor/d_a_npc_ba1.h +++ b/include/d/actor/d_a_npc_ba1.h @@ -101,7 +101,7 @@ public: bool _draw(); bool _execute(); bool _delete(); - s32 _create(); + cPhs_State _create(); void create_Anm(); void create_itm_Mdl(); void CreateHeap(); diff --git a/include/d/actor/d_a_npc_bj1.h b/include/d/actor/d_a_npc_bj1.h index 05973b110..331fc865e 100644 --- a/include/d/actor/d_a_npc_bj1.h +++ b/include/d/actor/d_a_npc_bj1.h @@ -119,7 +119,7 @@ public: bool _draw(); bool _execute(); bool _delete(); - s32 _create(); + cPhs_State _create(); void create_Anm(); void create_prp_Anm(); void create_itm_Mdl(); diff --git a/include/d/actor/d_a_npc_bm1.h b/include/d/actor/d_a_npc_bm1.h index 3d2f1d4a5..37ac921d4 100644 --- a/include/d/actor/d_a_npc_bm1.h +++ b/include/d/actor/d_a_npc_bm1.h @@ -165,7 +165,7 @@ public: bool _draw(); bool _execute(); bool _delete(); - s32 _create(); + cPhs_State _create(); void create_Anm(); void create_hed_Anm(); void create_wng_Anm(); diff --git a/include/d/actor/d_a_npc_bmcon1.h b/include/d/actor/d_a_npc_bmcon1.h index 145585daf..5dcb1cd1e 100644 --- a/include/d/actor/d_a_npc_bmcon1.h +++ b/include/d/actor/d_a_npc_bmcon1.h @@ -22,7 +22,7 @@ public: void setResFlag(unsigned char) {} void nodeArmControl(J3DNode*, J3DModel*); - s32 _create(); + cPhs_State _create(); void createHeap(); void createInit(); bool _delete(); diff --git a/include/d/actor/d_a_npc_bms1.h b/include/d/actor/d_a_npc_bms1.h index d525cd7df..c7ba73eba 100644 --- a/include/d/actor/d_a_npc_bms1.h +++ b/include/d/actor/d_a_npc_bms1.h @@ -55,7 +55,7 @@ public: bool _draw(); bool _execute(); bool _delete(); - s32 _create(); + cPhs_State _create(); void CreateHeap(); public: diff --git a/include/d/actor/d_a_npc_bmsw.h b/include/d/actor/d_a_npc_bmsw.h index 9f1b3c8ba..06a28f52a 100644 --- a/include/d/actor/d_a_npc_bmsw.h +++ b/include/d/actor/d_a_npc_bmsw.h @@ -36,7 +36,7 @@ public: bool _draw(); bool _execute(); bool _delete(); - s32 _create(); + cPhs_State _create(); void CreateHeap(); public: diff --git a/include/d/actor/d_a_npc_bs1.h b/include/d/actor/d_a_npc_bs1.h index b24d62990..212a0ce9e 100644 --- a/include/d/actor/d_a_npc_bs1.h +++ b/include/d/actor/d_a_npc_bs1.h @@ -94,7 +94,7 @@ public: BOOL _draw(); BOOL _execute(); BOOL _delete(); - s32 _create(); + cPhs_State _create(); BOOL CreateHeap(); static u8 m_tag_buy_item_max; diff --git a/include/d/actor/d_a_npc_btsw.h b/include/d/actor/d_a_npc_btsw.h index 28a222485..e1d489785 100644 --- a/include/d/actor/d_a_npc_btsw.h +++ b/include/d/actor/d_a_npc_btsw.h @@ -32,7 +32,7 @@ public: bool _draw(); bool _execute(); bool _delete(); - s32 _create(); + cPhs_State _create(); void CreateHeap(); public: diff --git a/include/d/actor/d_a_npc_btsw2.h b/include/d/actor/d_a_npc_btsw2.h index 5f4dec408..8bccbd7b5 100644 --- a/include/d/actor/d_a_npc_btsw2.h +++ b/include/d/actor/d_a_npc_btsw2.h @@ -44,7 +44,7 @@ public: void talk01(); void pathMove(); BOOL wait_action(void*); - s32 _create(); + cPhs_State _create(); BOOL _delete(); BOOL _execute(); BOOL _draw(); diff --git a/include/d/actor/d_a_npc_cb1.h b/include/d/actor/d_a_npc_cb1.h index 6147bebb8..b28299ab4 100644 --- a/include/d/actor/d_a_npc_cb1.h +++ b/include/d/actor/d_a_npc_cb1.h @@ -77,7 +77,7 @@ public: ~daNpc_Cb1_c(); void isTagCheckOK(); void setMessageAnimation(unsigned char); - s32 create(); + cPhs_State create(); void createHeap(); void setAction(int (daNpc_Cb1_c::**)(void*), int (daNpc_Cb1_c::*)(void*), void*); void setWaitAction(void*); diff --git a/include/d/actor/d_a_npc_co1.h b/include/d/actor/d_a_npc_co1.h index c5c909f39..aeb5b4066 100644 --- a/include/d/actor/d_a_npc_co1.h +++ b/include/d/actor/d_a_npc_co1.h @@ -70,7 +70,7 @@ public: bool _draw(); bool _execute(); bool _delete(); - s32 _create(); + cPhs_State _create(); void create_Anm(); void create_prl_Anm(); void create_itm_Mdl(); diff --git a/include/d/actor/d_a_npc_de1.h b/include/d/actor/d_a_npc_de1.h index 06e41f9ef..0796dc58d 100644 --- a/include/d/actor/d_a_npc_de1.h +++ b/include/d/actor/d_a_npc_de1.h @@ -56,7 +56,7 @@ public: bool _draw(); bool _execute(); bool _delete(); - s32 _create(); + cPhs_State _create(); void CreateHeap(); public: diff --git a/include/d/actor/d_a_npc_ds1.h b/include/d/actor/d_a_npc_ds1.h index 1c78056ed..547403689 100644 --- a/include/d/actor/d_a_npc_ds1.h +++ b/include/d/actor/d_a_npc_ds1.h @@ -61,7 +61,7 @@ public: bool _draw(); bool _execute(); bool _delete(); - s32 _create(); + cPhs_State _create(); void CreateHeap(); public: diff --git a/include/d/actor/d_a_npc_fa1.h b/include/d/actor/d_a_npc_fa1.h index 57e2211fe..d7e5b3ce8 100644 --- a/include/d/actor/d_a_npc_fa1.h +++ b/include/d/actor/d_a_npc_fa1.h @@ -87,7 +87,7 @@ public: void bigelf_change(); void findPlayer(); bool _delete(); - s32 _create(); + cPhs_State _create(); void CreateHeap(); void setMtx(); diff --git a/include/d/actor/d_a_npc_gk1.h b/include/d/actor/d_a_npc_gk1.h index 57735e8e7..d4cfcaec4 100644 --- a/include/d/actor/d_a_npc_gk1.h +++ b/include/d/actor/d_a_npc_gk1.h @@ -58,7 +58,7 @@ public: bool _draw(); bool _execute(); bool _delete(); - s32 _create(); + cPhs_State _create(); void bodyCreateHeap(); void itemCreateHeap(); void hat_CreateHeap(); diff --git a/include/d/actor/d_a_npc_gp1.h b/include/d/actor/d_a_npc_gp1.h index a04cbde33..9c5d094b2 100644 --- a/include/d/actor/d_a_npc_gp1.h +++ b/include/d/actor/d_a_npc_gp1.h @@ -70,7 +70,7 @@ public: bool _draw(); bool _execute(); bool _delete(); - s32 _create(); + cPhs_State _create(); void create_Anm(); void CreateHeap(); diff --git a/include/d/actor/d_a_npc_hi1.h b/include/d/actor/d_a_npc_hi1.h index 66b0dd5c0..d006581a7 100644 --- a/include/d/actor/d_a_npc_hi1.h +++ b/include/d/actor/d_a_npc_hi1.h @@ -60,7 +60,7 @@ public: bool _draw(); bool _execute(); bool _delete(); - s32 _create(); + cPhs_State _create(); void bodyCreateHeap(); void CreateHeap(); diff --git a/include/d/actor/d_a_npc_ho.h b/include/d/actor/d_a_npc_ho.h index d001546c8..a2cb4bed5 100644 --- a/include/d/actor/d_a_npc_ho.h +++ b/include/d/actor/d_a_npc_ho.h @@ -56,7 +56,7 @@ public: bool _draw(); bool _execute(); bool _delete(); - s32 _create(); + cPhs_State _create(); void CreateHeap(); public: diff --git a/include/d/actor/d_a_npc_hr.h b/include/d/actor/d_a_npc_hr.h index 1a641fe7b..8ec1a1573 100644 --- a/include/d/actor/d_a_npc_hr.h +++ b/include/d/actor/d_a_npc_hr.h @@ -141,7 +141,7 @@ public: bool _draw(); bool _execute(); bool _delete(); - s32 _create(); + cPhs_State _create(); void CreateHeap(); public: diff --git a/include/d/actor/d_a_npc_jb1.h b/include/d/actor/d_a_npc_jb1.h index 894a725bd..fda879612 100644 --- a/include/d/actor/d_a_npc_jb1.h +++ b/include/d/actor/d_a_npc_jb1.h @@ -47,7 +47,7 @@ public: bool _draw(); bool _execute(); bool _delete(); - s32 _create(); + cPhs_State _create(); void create_Anm(); void create_lgt(); void CreateHeap(); diff --git a/include/d/actor/d_a_npc_ji1.h b/include/d/actor/d_a_npc_ji1.h index be50cb109..f25b3ee92 100644 --- a/include/d/actor/d_a_npc_ji1.h +++ b/include/d/actor/d_a_npc_ji1.h @@ -130,7 +130,7 @@ public: BOOL checkCutType(int, int); void setAnimFromMsgNo(u32); BOOL setAnm(int, f32, int); - s32 _create(); + cPhs_State _create(); BOOL CreateHeap(); BOOL CreateInit(); BOOL _delete(); diff --git a/include/d/actor/d_a_npc_kamome.h b/include/d/actor/d_a_npc_kamome.h index 68829f1f4..846e9c6d8 100644 --- a/include/d/actor/d_a_npc_kamome.h +++ b/include/d/actor/d_a_npc_kamome.h @@ -102,7 +102,7 @@ public: void setAttention(bool, int); void setBaseMtx(); BOOL createHeap(); - s32 create(); + cPhs_State create(); daNpc_kam_c() {} BOOL init(); BOOL setAction(ActionFunc*, ActionFunc, void*); diff --git a/include/d/actor/d_a_npc_kf1.h b/include/d/actor/d_a_npc_kf1.h index 04c289981..33b25c559 100644 --- a/include/d/actor/d_a_npc_kf1.h +++ b/include/d/actor/d_a_npc_kf1.h @@ -90,7 +90,7 @@ public: bool _draw(); bool _execute(); bool _delete(); - s32 _create(); + cPhs_State _create(); void bodyCreateHeap(); void itemCreateHeap(); void CreateHeap(); diff --git a/include/d/actor/d_a_npc_kg1.h b/include/d/actor/d_a_npc_kg1.h index 70ef77b0d..5d8554da0 100644 --- a/include/d/actor/d_a_npc_kg1.h +++ b/include/d/actor/d_a_npc_kg1.h @@ -7,7 +7,7 @@ class daNpc_Kg1_c : public fopAc_ac_c { public: - inline s32 _create(); + inline cPhs_State _create(); inline bool _delete(); inline bool _draw(); inline bool _execute(); diff --git a/include/d/actor/d_a_npc_kg2.h b/include/d/actor/d_a_npc_kg2.h index f86abb41d..b4c0b8209 100644 --- a/include/d/actor/d_a_npc_kg2.h +++ b/include/d/actor/d_a_npc_kg2.h @@ -38,7 +38,7 @@ public: void processMove(); void wait_action(void*); void event_wait_action(void*); - s32 _create(); + cPhs_State _create(); bool _delete(); bool _execute(); bool _draw(); diff --git a/include/d/actor/d_a_npc_kk1.h b/include/d/actor/d_a_npc_kk1.h index 54c631b76..a823adfaa 100644 --- a/include/d/actor/d_a_npc_kk1.h +++ b/include/d/actor/d_a_npc_kk1.h @@ -116,7 +116,7 @@ public: bool _draw(); bool _execute(); bool _delete(); - s32 _create(); + cPhs_State _create(); void bodyCreateHeap(); void effcCreateHeap(); void CreateHeap(); diff --git a/include/d/actor/d_a_npc_km1.h b/include/d/actor/d_a_npc_km1.h index a70848364..59a086b35 100644 --- a/include/d/actor/d_a_npc_km1.h +++ b/include/d/actor/d_a_npc_km1.h @@ -56,7 +56,7 @@ public: bool _draw(); bool _execute(); bool _delete(); - s32 _create(); + cPhs_State _create(); void CreateHeap(); public: diff --git a/include/d/actor/d_a_npc_ko1.h b/include/d/actor/d_a_npc_ko1.h index 1b659cc5e..e8b204cbb 100644 --- a/include/d/actor/d_a_npc_ko1.h +++ b/include/d/actor/d_a_npc_ko1.h @@ -130,7 +130,7 @@ public: bool _draw(); bool _execute(); bool _delete(); - s32 _create(); + cPhs_State _create(); void create_Anm(); void create_hed_Anm(); void create_bln_Anm(); diff --git a/include/d/actor/d_a_npc_kp1.h b/include/d/actor/d_a_npc_kp1.h index 07c57c8db..b57461fc9 100644 --- a/include/d/actor/d_a_npc_kp1.h +++ b/include/d/actor/d_a_npc_kp1.h @@ -59,7 +59,7 @@ public: bool _draw(); bool _execute(); bool _delete(); - s32 _create(); + cPhs_State _create(); void CreateHeap(); public: diff --git a/include/d/actor/d_a_npc_ls1.h b/include/d/actor/d_a_npc_ls1.h index 6514dad41..db1a18fc0 100644 --- a/include/d/actor/d_a_npc_ls1.h +++ b/include/d/actor/d_a_npc_ls1.h @@ -107,7 +107,7 @@ public: bool _draw(); bool _execute(); bool _delete(); - s32 _create(); + cPhs_State _create(); void bodyCreateHeap(); void handCreateHeap(); void itemCreateHeap(); diff --git a/include/d/actor/d_a_npc_md.h b/include/d/actor/d_a_npc_md.h index 497c3c173..4acec69eb 100644 --- a/include/d/actor/d_a_npc_md.h +++ b/include/d/actor/d_a_npc_md.h @@ -339,7 +339,7 @@ public: s16 XyCheckCB(int); s16 XyEventCB(int); - s32 create(); + cPhs_State create(); BOOL createHeap(); BOOL setAction(ActionFunc*, ActionFunc, void*); void npcAction(void*); diff --git a/include/d/actor/d_a_npc_mk.h b/include/d/actor/d_a_npc_mk.h index 321d71416..1a0fcaf03 100644 --- a/include/d/actor/d_a_npc_mk.h +++ b/include/d/actor/d_a_npc_mk.h @@ -79,7 +79,7 @@ public: bool _draw(); bool _execute(); bool _delete(); - s32 _create(); + cPhs_State _create(); void CreateHeap(); public: diff --git a/include/d/actor/d_a_npc_mn.h b/include/d/actor/d_a_npc_mn.h index e093046aa..de39f2be8 100644 --- a/include/d/actor/d_a_npc_mn.h +++ b/include/d/actor/d_a_npc_mn.h @@ -16,7 +16,7 @@ public: void setResFlag(unsigned char) {} daNpcMn_c(); - s32 _create(); + cPhs_State _create(); void createHeap(); void createInit(); bool _delete(); diff --git a/include/d/actor/d_a_npc_mt.h b/include/d/actor/d_a_npc_mt.h index de68525cb..5c5c4256b 100644 --- a/include/d/actor/d_a_npc_mt.h +++ b/include/d/actor/d_a_npc_mt.h @@ -20,7 +20,7 @@ public: void setResFlag(u8) {} daNpcMt_c(); - s32 _create(); + cPhs_State _create(); void createHeap(); void createInit(); bool _delete(); diff --git a/include/d/actor/d_a_npc_nz.h b/include/d/actor/d_a_npc_nz.h index 552783f4c..1f4564026 100644 --- a/include/d/actor/d_a_npc_nz.h +++ b/include/d/actor/d_a_npc_nz.h @@ -50,7 +50,7 @@ public: BOOL createInit(); void setSmokeParticle(); void getArg(); - s32 _create(); + cPhs_State _create(); bool _delete(); BOOL _searchEsa(fopAc_ac_c*); void cutProc(); diff --git a/include/d/actor/d_a_npc_ob1.h b/include/d/actor/d_a_npc_ob1.h index 391b560da..a52ca086d 100644 --- a/include/d/actor/d_a_npc_ob1.h +++ b/include/d/actor/d_a_npc_ob1.h @@ -76,7 +76,7 @@ public: bool _draw(); bool _execute(); bool _delete(); - s32 _create(); + cPhs_State _create(); void create_Anm(); void create_hed_Mdl(); void CreateHeap(); diff --git a/include/d/actor/d_a_npc_os.h b/include/d/actor/d_a_npc_os.h index fca229b8f..f2d11f46e 100644 --- a/include/d/actor/d_a_npc_os.h +++ b/include/d/actor/d_a_npc_os.h @@ -74,7 +74,7 @@ public: static bool isPlayerRoom(int idx) { return m_playerRoom[idx]; } static bool isPlayerRoom_Goat() { return isPlayerRoom(1); } - s32 create(); + cPhs_State create(); BOOL createHeap(); BOOL jointCheck(s8); BOOL wakeupCheck(); diff --git a/include/d/actor/d_a_npc_p1.h b/include/d/actor/d_a_npc_p1.h index 08f4e72d8..c8c26190e 100644 --- a/include/d/actor/d_a_npc_p1.h +++ b/include/d/actor/d_a_npc_p1.h @@ -27,7 +27,7 @@ public: void minigameExplainCut(); void privateCut(); void setAttentionPos(cXyz*); - s32 _create(); + cPhs_State _create(); void CreateHeap(); bool _delete(); void getKajiID(); diff --git a/include/d/actor/d_a_npc_p2.h b/include/d/actor/d_a_npc_p2.h index f61be21df..b2ed0b7de 100644 --- a/include/d/actor/d_a_npc_p2.h +++ b/include/d/actor/d_a_npc_p2.h @@ -68,7 +68,7 @@ public: void getArg(); void _createHeap(); void createInit(); - s32 _create(); + cPhs_State _create(); bool _delete(); void cutProc(); void cutTalkStart(int); diff --git a/include/d/actor/d_a_npc_people.h b/include/d/actor/d_a_npc_people.h index c3e9d37fe..76fbe0cf3 100644 --- a/include/d/actor/d_a_npc_people.h +++ b/include/d/actor/d_a_npc_people.h @@ -83,7 +83,7 @@ public: void setTalk(u8) {} daNpcPeople_c(); - s32 _create(); + cPhs_State _create(); BOOL createHeap(); s32 createInit(); bool _delete(); diff --git a/include/d/actor/d_a_npc_pf1.h b/include/d/actor/d_a_npc_pf1.h index 06fc7e76c..d88a9a616 100644 --- a/include/d/actor/d_a_npc_pf1.h +++ b/include/d/actor/d_a_npc_pf1.h @@ -70,7 +70,7 @@ public: bool _draw(); bool _execute(); bool _delete(); - s32 _create(); + cPhs_State _create(); void bodyCreateHeap(); void CreateHeap(); diff --git a/include/d/actor/d_a_npc_photo.h b/include/d/actor/d_a_npc_photo.h index bc821c1e7..56d71ec02 100644 --- a/include/d/actor/d_a_npc_photo.h +++ b/include/d/actor/d_a_npc_photo.h @@ -19,7 +19,7 @@ public: void setResFlag(unsigned char) {} daNpcPhoto_c(); - s32 _create(); + cPhs_State _create(); void createHeap(); void createInit(); bool _delete(); diff --git a/include/d/actor/d_a_npc_pm1.h b/include/d/actor/d_a_npc_pm1.h index 8d1fb1064..822715f17 100644 --- a/include/d/actor/d_a_npc_pm1.h +++ b/include/d/actor/d_a_npc_pm1.h @@ -56,7 +56,7 @@ public: bool _draw(); bool _execute(); bool _delete(); - s32 _create(); + cPhs_State _create(); void CreateHeap(); public: diff --git a/include/d/actor/d_a_npc_roten.h b/include/d/actor/d_a_npc_roten.h index aed59cecd..c98d6cef7 100644 --- a/include/d/actor/d_a_npc_roten.h +++ b/include/d/actor/d_a_npc_roten.h @@ -26,7 +26,7 @@ public: void setResFlag(u8 flag) { field_0x9BC = flag; } daNpcRoten_c(); - s32 _create(); + cPhs_State _create(); BOOL createHeap(); s32 createInit(); bool _delete(); diff --git a/include/d/actor/d_a_npc_rsh1.h b/include/d/actor/d_a_npc_rsh1.h index 443921270..9c1deca5a 100644 --- a/include/d/actor/d_a_npc_rsh1.h +++ b/include/d/actor/d_a_npc_rsh1.h @@ -61,7 +61,7 @@ public: bool _draw(); bool _execute(); bool _delete(); - s32 _create(); + cPhs_State _create(); void CreateHeap(); void set_mtx(); diff --git a/include/d/actor/d_a_npc_sarace.h b/include/d/actor/d_a_npc_sarace.h index cd1d3ca88..4e1e18715 100644 --- a/include/d/actor/d_a_npc_sarace.h +++ b/include/d/actor/d_a_npc_sarace.h @@ -33,7 +33,7 @@ public: bool _draw(); bool _execute(); bool _delete(); - s32 _create(); + cPhs_State _create(); void CreateHeap(); static s32 ship_race_rupee; diff --git a/include/d/actor/d_a_npc_so.h b/include/d/actor/d_a_npc_so.h index a0c31c3f0..e7cbf4501 100644 --- a/include/d/actor/d_a_npc_so.h +++ b/include/d/actor/d_a_npc_so.h @@ -77,7 +77,7 @@ public: bool _draw(); void createInit(); void getArg(); - s32 _create(); + cPhs_State _create(); bool _delete(); void cutAppearProc(); diff --git a/include/d/actor/d_a_npc_sv.h b/include/d/actor/d_a_npc_sv.h index bedeb8ccd..9a36c2cff 100644 --- a/include/d/actor/d_a_npc_sv.h +++ b/include/d/actor/d_a_npc_sv.h @@ -16,7 +16,7 @@ public: void setResFlag(unsigned char) {} daNpcSv_c(); - s32 _create(); + cPhs_State _create(); void createHeap(); void createInit(); bool _delete(); diff --git a/include/d/actor/d_a_npc_tc.h b/include/d/actor/d_a_npc_tc.h index 2c51b3a48..5743c7378 100644 --- a/include/d/actor/d_a_npc_tc.h +++ b/include/d/actor/d_a_npc_tc.h @@ -63,7 +63,7 @@ public: bool _execute(); bool _delete(); void isCreate(); - s32 _create(); + cPhs_State _create(); void _createHeap(); void next_msgStatusNormal2(unsigned long*); void getMsgNormal2(); diff --git a/include/d/actor/d_a_npc_tt.h b/include/d/actor/d_a_npc_tt.h index 19184c5dc..bb24d277c 100644 --- a/include/d/actor/d_a_npc_tt.h +++ b/include/d/actor/d_a_npc_tt.h @@ -66,7 +66,7 @@ public: bool _draw(); bool _execute(); bool _delete(); - s32 _create(); + cPhs_State _create(); void CreateHeap(); void initTexPatternAnm(bool); diff --git a/include/d/actor/d_a_npc_uk.h b/include/d/actor/d_a_npc_uk.h index 3d4292501..560f013d2 100644 --- a/include/d/actor/d_a_npc_uk.h +++ b/include/d/actor/d_a_npc_uk.h @@ -83,7 +83,7 @@ public: bool _draw(); bool _execute(); bool _delete(); - s32 _create(); + cPhs_State _create(); void CreateHeap(); public: diff --git a/include/d/actor/d_a_npc_ym1.h b/include/d/actor/d_a_npc_ym1.h index 4fa397316..be15c730c 100644 --- a/include/d/actor/d_a_npc_ym1.h +++ b/include/d/actor/d_a_npc_ym1.h @@ -82,7 +82,7 @@ public: bool _draw(); bool _execute(); bool _delete(); - s32 _create(); + cPhs_State _create(); void bodyCreateHeap(); void headCreateHeap(); void itemCreateHeap(); diff --git a/include/d/actor/d_a_npc_yw1.h b/include/d/actor/d_a_npc_yw1.h index 15dcdd5fe..61b84e76f 100644 --- a/include/d/actor/d_a_npc_yw1.h +++ b/include/d/actor/d_a_npc_yw1.h @@ -77,7 +77,7 @@ public: bool _draw(); bool _execute(); bool _delete(); - s32 _create(); + cPhs_State _create(); void bodyCreateHeap(); void headCreateHeap(); void CreateHeap(); diff --git a/include/d/actor/d_a_npc_zk1.h b/include/d/actor/d_a_npc_zk1.h index b9aeb1a8c..95ea3cf88 100644 --- a/include/d/actor/d_a_npc_zk1.h +++ b/include/d/actor/d_a_npc_zk1.h @@ -56,7 +56,7 @@ public: bool _draw(); bool _execute(); bool _delete(); - s32 _create(); + cPhs_State _create(); void bodyCreateHeap(); void CreateHeap(); diff --git a/include/d/actor/d_a_npc_zl1.h b/include/d/actor/d_a_npc_zl1.h index 879287455..78224b39c 100644 --- a/include/d/actor/d_a_npc_zl1.h +++ b/include/d/actor/d_a_npc_zl1.h @@ -143,7 +143,7 @@ public: bool _draw(); bool _execute(); bool _delete(); - s32 _create(); + cPhs_State _create(); void bodyCreateHeap(); void itemCreateHeap(); void CreateHeap(); diff --git a/include/d/actor/d_a_obj_AjavW.h b/include/d/actor/d_a_obj_AjavW.h index 71674d1d9..86e7835b0 100644 --- a/include/d/actor/d_a_obj_AjavW.h +++ b/include/d/actor/d_a_obj_AjavW.h @@ -8,7 +8,7 @@ class daObjAjavW_c : public fopAc_ac_c { public: - s32 _create(); + cPhs_State _create(); bool _execute(); bool _draw(); bool _delete(); diff --git a/include/d/actor/d_a_obj_Itnak.h b/include/d/actor/d_a_obj_Itnak.h index 602f37717..e7eaa12f1 100644 --- a/include/d/actor/d_a_obj_Itnak.h +++ b/include/d/actor/d_a_obj_Itnak.h @@ -13,7 +13,7 @@ namespace daObjItnak { void solidHeapCB(fopAc_ac_c*); void create_heap(); - s32 _create(); + cPhs_State _create(); bool _delete(); void set_mtx(); void set_co_se(dCcD_Cyl*); diff --git a/include/d/actor/d_a_obj_Vds.h b/include/d/actor/d_a_obj_Vds.h index b74b679f9..7fad395f2 100644 --- a/include/d/actor/d_a_obj_Vds.h +++ b/include/d/actor/d_a_obj_Vds.h @@ -30,7 +30,7 @@ namespace daObjVds { void Event_exe(); void solidHeapCB(fopAc_ac_c*); void create_heap(); - s32 _create(); + cPhs_State _create(); bool _delete(); void set_mtx(); bool _execute(); diff --git a/include/d/actor/d_a_obj_Vteng.h b/include/d/actor/d_a_obj_Vteng.h index e2bd958f1..3c36fe13e 100644 --- a/include/d/actor/d_a_obj_Vteng.h +++ b/include/d/actor/d_a_obj_Vteng.h @@ -10,7 +10,7 @@ class mDoExt_McaMorf; class daObjVteng_c : public fopAc_ac_c { public: void init_mtx(); - s32 _create(); + cPhs_State _create(); bool _execute(); bool _draw(); bool _delete(); diff --git a/include/d/actor/d_a_obj_YLzou.h b/include/d/actor/d_a_obj_YLzou.h index 2f1ac8341..884a3589d 100644 --- a/include/d/actor/d_a_obj_YLzou.h +++ b/include/d/actor/d_a_obj_YLzou.h @@ -18,7 +18,7 @@ public: void eff_smoke_slip_remove(); void eff_smoke_proc(); void vib_proc(); - s32 _create(); + cPhs_State _create(); bool _delete(); void move_ylzou_demo_start_wait_act_proc(); void demo_regist_wait_act_proc(); diff --git a/include/d/actor/d_a_obj_Yboil.h b/include/d/actor/d_a_obj_Yboil.h index f52c0c43d..8ca5aacb0 100644 --- a/include/d/actor/d_a_obj_Yboil.h +++ b/include/d/actor/d_a_obj_Yboil.h @@ -15,7 +15,7 @@ public: PRM_SWSAVE_W = 8, }; - inline s32 _create(); + inline cPhs_State _create(); inline bool _delete(); inline bool _draw(); inline bool _execute(); diff --git a/include/d/actor/d_a_obj_Ygush00.h b/include/d/actor/d_a_obj_Ygush00.h index 99bd0d7b2..ee667e372 100644 --- a/include/d/actor/d_a_obj_Ygush00.h +++ b/include/d/actor/d_a_obj_Ygush00.h @@ -18,7 +18,7 @@ public: int param_get_arg() const { return daObj::PrmAbstract(this, PRM_TYPE_W, PRM_TYPE_S); } - s32 _create(); + cPhs_State _create(); bool _delete(); bool _execute(); bool _draw(); diff --git a/include/d/actor/d_a_obj_adnno.h b/include/d/actor/d_a_obj_adnno.h index dc74d1061..6eea620c9 100644 --- a/include/d/actor/d_a_obj_adnno.h +++ b/include/d/actor/d_a_obj_adnno.h @@ -6,7 +6,7 @@ class daObjAdnno_c : public fopAc_ac_c { public: - inline s32 _create(); + inline cPhs_State _create(); inline bool _execute(); inline bool _draw(); inline bool _delete(); diff --git a/include/d/actor/d_a_obj_ajav.h b/include/d/actor/d_a_obj_ajav.h index e9d496750..39ea68adc 100644 --- a/include/d/actor/d_a_obj_ajav.h +++ b/include/d/actor/d_a_obj_ajav.h @@ -46,7 +46,7 @@ namespace daObjAjav { void solidHeapCB(fopAc_ac_c*); void create_heap(); - s32 _create(); + cPhs_State _create(); bool _delete(); void init_mtx(); void set_tex(); diff --git a/include/d/actor/d_a_obj_akabe.h b/include/d/actor/d_a_obj_akabe.h index dd3c0948c..99a398859 100644 --- a/include/d/actor/d_a_obj_akabe.h +++ b/include/d/actor/d_a_obj_akabe.h @@ -28,7 +28,7 @@ namespace daObjAkabe { s32 prm_get_always() const { return daObj::PrmAbstract(this, PRM_ALWAYS_W, PRM_ALWAYS_S); } s32 prm_get_arg0() const { return daObj::PrmAbstract(this, PRM_ARG0_W, PRM_ARG0_S); } - s32 _create(); + cPhs_State _create(); u8 create_heap(); bool _delete(); void init_scale(); diff --git a/include/d/actor/d_a_obj_apzl.h b/include/d/actor/d_a_obj_apzl.h index 3387fe0a9..b8212c3a5 100644 --- a/include/d/actor/d_a_obj_apzl.h +++ b/include/d/actor/d_a_obj_apzl.h @@ -5,7 +5,7 @@ class daObjApzl_c : public fopAc_ac_c { public: - inline s32 _create(); + inline cPhs_State _create(); inline bool _delete(); inline bool _draw(); inline bool _execute(); diff --git a/include/d/actor/d_a_obj_ashut.h b/include/d/actor/d_a_obj_ashut.h index d062fda56..0c1da3456 100644 --- a/include/d/actor/d_a_obj_ashut.h +++ b/include/d/actor/d_a_obj_ashut.h @@ -16,9 +16,9 @@ namespace daObjAshut { void CreateHeap(); s32 Create(); - void Mthd_Create(); + cPhs_State Mthd_Create(); BOOL Delete(); - void Mthd_Delete(); + BOOL Mthd_Delete(); void set_mtx(); void init_mtx(); void chk_safe_area() const; diff --git a/include/d/actor/d_a_obj_auzu.h b/include/d/actor/d_a_obj_auzu.h index 1a2b3e082..a9807e0e0 100644 --- a/include/d/actor/d_a_obj_auzu.h +++ b/include/d/actor/d_a_obj_auzu.h @@ -20,7 +20,7 @@ namespace daObjAuzu { void solidHeapCB(fopAc_ac_c*); void create_heap(); - s32 _create(); + cPhs_State _create(); bool _delete(); void is_exist() const; void set_mtx(); diff --git a/include/d/actor/d_a_obj_aygr.h b/include/d/actor/d_a_obj_aygr.h index 1e0b522f5..b4c28a3a7 100644 --- a/include/d/actor/d_a_obj_aygr.h +++ b/include/d/actor/d_a_obj_aygr.h @@ -10,9 +10,9 @@ namespace daObjAygr { void CreateHeap(); s32 Create(); - void Mthd_Create(); + cPhs_State Mthd_Create(); BOOL Delete(); - void Mthd_Delete(); + BOOL Mthd_Delete(); void set_mtx(); void init_mtx(); void Execute(float(**)[3][4]); diff --git a/include/d/actor/d_a_obj_balancelift.h b/include/d/actor/d_a_obj_balancelift.h index c52727ad8..ae03ae54b 100644 --- a/include/d/actor/d_a_obj_balancelift.h +++ b/include/d/actor/d_a_obj_balancelift.h @@ -5,7 +5,7 @@ class daBalancelift_c : public fopAc_ac_c { public: - inline s32 _create(); + inline cPhs_State _create(); inline bool _delete(); inline bool _draw(); inline bool _execute(); diff --git a/include/d/actor/d_a_obj_barrel.h b/include/d/actor/d_a_obj_barrel.h index 25ec90017..34b4faf52 100644 --- a/include/d/actor/d_a_obj_barrel.h +++ b/include/d/actor/d_a_obj_barrel.h @@ -70,7 +70,7 @@ namespace daObjBarrel { static BOOL solidHeapCB(fopAc_ac_c*); bool create_heap(); - s32 _create(); + cPhs_State _create(); bool _delete(); void mode_wait_init(); void mode_wait(); @@ -149,7 +149,7 @@ namespace daObjBarrel { STATIC_ASSERT(sizeof(Act_c) == 0x634); namespace Method { - s32 Create(void*); + cPhs_State Create(void*); BOOL Delete(void*); BOOL Execute(void*); BOOL Draw(void*); diff --git a/include/d/actor/d_a_obj_barrel2.h b/include/d/actor/d_a_obj_barrel2.h index 28584fc5b..92356ab09 100644 --- a/include/d/actor/d_a_obj_barrel2.h +++ b/include/d/actor/d_a_obj_barrel2.h @@ -29,7 +29,7 @@ namespace daObjBarrel2 { void solidHeapCB(fopAc_ac_c*); void create_heap(); - s32 _create(); + cPhs_State _create(); bool _delete(); void tg_hitCB(fopAc_ac_c*, dCcD_GObjInf*, fopAc_ac_c*, dCcD_GObjInf*); void co_hitCB(fopAc_ac_c*, dCcD_GObjInf*, fopAc_ac_c*, dCcD_GObjInf*); @@ -81,7 +81,7 @@ namespace daObjBarrel2 { }; namespace Method { - s32 Create(void*); + cPhs_State Create(void*); BOOL Delete(void*); BOOL Execute(void*); BOOL Draw(void*); diff --git a/include/d/actor/d_a_obj_barrier.h b/include/d/actor/d_a_obj_barrier.h index 1244a7b4d..02b9705e9 100644 --- a/include/d/actor/d_a_obj_barrier.h +++ b/include/d/actor/d_a_obj_barrier.h @@ -77,7 +77,7 @@ public: void break_order_proc(); void break_end_wait_proc(); bool break_check(); - int _create(); + cPhs_State _create(); bool _delete(); bool _execute(); bool _draw(); diff --git a/include/d/actor/d_a_obj_bemos.h b/include/d/actor/d_a_obj_bemos.h index 86cfc4a39..4d05c3c94 100644 --- a/include/d/actor/d_a_obj_bemos.h +++ b/include/d/actor/d_a_obj_bemos.h @@ -5,7 +5,7 @@ class daBemos_c : public fopAc_ac_c { public: - inline s32 _create(); + inline cPhs_State _create(); inline bool _delete(); inline bool _draw(); inline bool _execute(); diff --git a/include/d/actor/d_a_obj_bscurtain.h b/include/d/actor/d_a_obj_bscurtain.h index 5521b383f..42b202993 100644 --- a/include/d/actor/d_a_obj_bscurtain.h +++ b/include/d/actor/d_a_obj_bscurtain.h @@ -9,7 +9,7 @@ class daObj_Bscurtain_c : public fopAc_ac_c { public: BOOL CreateHeap(); s32 CreateInit(); - inline s32 _create(); + inline cPhs_State _create(); inline bool _delete(); inline bool _execute(); inline bool _draw(); diff --git a/include/d/actor/d_a_obj_buoyflag.h b/include/d/actor/d_a_obj_buoyflag.h index e6c5bb91a..865fcf021 100644 --- a/include/d/actor/d_a_obj_buoyflag.h +++ b/include/d/actor/d_a_obj_buoyflag.h @@ -58,7 +58,7 @@ namespace daObjBuoyflag { } void setup(MtxP mtx) { cMtx_copy(mtx, m1090); } - inline s32 _create(); + inline cPhs_State _create(); inline bool _delete(); inline bool _draw(); inline bool _execute(); diff --git a/include/d/actor/d_a_obj_buoyrace.h b/include/d/actor/d_a_obj_buoyrace.h index 0ff79bede..5b7144eb0 100644 --- a/include/d/actor/d_a_obj_buoyrace.h +++ b/include/d/actor/d_a_obj_buoyrace.h @@ -6,7 +6,7 @@ namespace daObjBuoyrace { class Act_c : public fopAc_ac_c { public: - inline s32 _create(); + inline cPhs_State _create(); inline bool _delete(); inline bool _draw(); inline bool _execute(); diff --git a/include/d/actor/d_a_obj_cafelmp.h b/include/d/actor/d_a_obj_cafelmp.h index b8068afe8..ea237f94e 100644 --- a/include/d/actor/d_a_obj_cafelmp.h +++ b/include/d/actor/d_a_obj_cafelmp.h @@ -6,7 +6,7 @@ class daObjCafelmp_c : public fopAc_ac_c { public: - inline s32 _create(); + inline cPhs_State _create(); inline bool _delete(); inline bool _draw(); inline bool _execute(); diff --git a/include/d/actor/d_a_obj_canon.h b/include/d/actor/d_a_obj_canon.h index 1048eeab8..2cba48205 100644 --- a/include/d/actor/d_a_obj_canon.h +++ b/include/d/actor/d_a_obj_canon.h @@ -38,7 +38,7 @@ public: bool _draw(); void createInit(); void getArg(); - s32 _create(); + cPhs_State _create(); bool _delete(); public: diff --git a/include/d/actor/d_a_obj_coming.h b/include/d/actor/d_a_obj_coming.h index d01a14c72..10b056258 100644 --- a/include/d/actor/d_a_obj_coming.h +++ b/include/d/actor/d_a_obj_coming.h @@ -37,7 +37,7 @@ namespace daObjComing { void prm_get_waitTime() const; // weak but not inlined? void chk_switch(); - s32 _create(); + cPhs_State _create(); bool _delete(); void get_aqua_y(const cXyz*); void chk_ship_range(const fopAc_ac_c*) const; diff --git a/include/d/actor/d_a_obj_correct.h b/include/d/actor/d_a_obj_correct.h index ad6e9aefe..86efc6ce9 100644 --- a/include/d/actor/d_a_obj_correct.h +++ b/include/d/actor/d_a_obj_correct.h @@ -11,7 +11,7 @@ namespace daObjCorrect { void prm_get_swSave() const {} void prm_get_type() const {} - s32 _create(); + cPhs_State _create(); bool _delete(); void chk_try_actor0(fopAc_ac_c*); void chk_try_actor1(daObjTry::Act_c*, daObjTry::Type_e, float) const; diff --git a/include/d/actor/d_a_obj_demo_barrel.h b/include/d/actor/d_a_obj_demo_barrel.h index 688faee3d..525129361 100644 --- a/include/d/actor/d_a_obj_demo_barrel.h +++ b/include/d/actor/d_a_obj_demo_barrel.h @@ -5,7 +5,7 @@ class daObj_Demo_Barrel_c : public fopAc_ac_c { public: - inline s32 _create(); + inline cPhs_State _create(); inline bool _delete(); inline bool _draw(); inline bool _execute(); diff --git a/include/d/actor/d_a_obj_dmgroom.h b/include/d/actor/d_a_obj_dmgroom.h index b439d6501..cab708ddc 100644 --- a/include/d/actor/d_a_obj_dmgroom.h +++ b/include/d/actor/d_a_obj_dmgroom.h @@ -7,7 +7,7 @@ class daObjDmgroom_c : public fopAc_ac_c { public: - inline s32 _create(); + inline cPhs_State _create(); inline bool _execute(); inline bool _draw(); inline bool _delete(); diff --git a/include/d/actor/d_a_obj_doguu.h b/include/d/actor/d_a_obj_doguu.h index 7da8d6729..163f757df 100644 --- a/include/d/actor/d_a_obj_doguu.h +++ b/include/d/actor/d_a_obj_doguu.h @@ -5,7 +5,7 @@ class daObjDoguu_c : public fopAc_ac_c { public: - inline s32 _create(); + inline cPhs_State _create(); inline bool _delete(); inline bool _draw(); inline bool _execute(); diff --git a/include/d/actor/d_a_obj_doguu_demo.h b/include/d/actor/d_a_obj_doguu_demo.h index 358f828e3..82f4da6fe 100644 --- a/include/d/actor/d_a_obj_doguu_demo.h +++ b/include/d/actor/d_a_obj_doguu_demo.h @@ -7,7 +7,7 @@ class daObjDoguuD_c : public fopAc_ac_c { public: - inline s32 _create(); + inline cPhs_State _create(); inline bool _delete(); inline bool _draw(); inline bool _execute(); diff --git a/include/d/actor/d_a_obj_dragonhead.h b/include/d/actor/d_a_obj_dragonhead.h index 2ab3e8a16..60a2f9c86 100644 --- a/include/d/actor/d_a_obj_dragonhead.h +++ b/include/d/actor/d_a_obj_dragonhead.h @@ -8,7 +8,7 @@ class daObjDragonhead_c : public fopAc_ac_c { public: - inline s32 _create(); + inline cPhs_State _create(); inline bool _delete(); inline bool _draw(); inline bool _execute(); diff --git a/include/d/actor/d_a_obj_drift.h b/include/d/actor/d_a_obj_drift.h index 24243a68d..2da542650 100644 --- a/include/d/actor/d_a_obj_drift.h +++ b/include/d/actor/d_a_obj_drift.h @@ -11,12 +11,12 @@ namespace daObjDrift { void CreateHeap(); s32 Create(); - void Mthd_Create(); + cPhs_State Mthd_Create(); void make_flower(); void calc_flower_param(cXyz*, csXyz*); void set_flower_current(); BOOL Delete(); - void Mthd_Delete(); + BOOL Mthd_Delete(); void mode_wait_init(); void mode_wait(); void mode_rot_init(); diff --git a/include/d/actor/d_a_obj_eayogn.h b/include/d/actor/d_a_obj_eayogn.h index 5825dc7e5..d67f5724e 100644 --- a/include/d/actor/d_a_obj_eayogn.h +++ b/include/d/actor/d_a_obj_eayogn.h @@ -12,7 +12,7 @@ public: // BOOL check_ev_bit() const { return dComIfGs_isSymbol(1); } BOOL check_ev_bit() const; - s32 _create(); + cPhs_State _create(); bool _execute(); bool _draw(); bool _delete(); diff --git a/include/d/actor/d_a_obj_ebomzo.h b/include/d/actor/d_a_obj_ebomzo.h index e14c33665..5d9d28ccb 100644 --- a/include/d/actor/d_a_obj_ebomzo.h +++ b/include/d/actor/d_a_obj_ebomzo.h @@ -4,11 +4,10 @@ #include "d/d_bg_s_movebg_actor.h" #include "d/d_cc_d.h" #include "d/d_a_obj.h" -#include "d/d_procname.h" #include "JSystem/JParticle/JPAEmitter.h" namespace daObjEbomzo { - class Act_c : public dBgS_MoveBgActor{ + class Act_c : public dBgS_MoveBgActor { public: enum Prm_e { PRM_SWSAVE_W = 8, @@ -17,14 +16,14 @@ namespace daObjEbomzo { int prm_get_swSave() const { return daObj::PrmAbstract(this, PRM_SWSAVE_W, PRM_SWSAVE_S); } - int CreateHeap(); - int Create(); - int Delete(); - int Execute(Mtx**); - int Draw(); + virtual BOOL CreateHeap(); + virtual BOOL Create(); + virtual BOOL Delete(); + virtual BOOL Execute(Mtx**); + virtual BOOL Draw(); - int Mthd_Create(); - int Mthd_Delete(); + cPhs_State Mthd_Create(); + BOOL Mthd_Delete(); void set_mtx(); void init_mtx(); diff --git a/include/d/actor/d_a_obj_eff.h b/include/d/actor/d_a_obj_eff.h index 9a5e90571..f5186c1a2 100644 --- a/include/d/actor/d_a_obj_eff.h +++ b/include/d/actor/d_a_obj_eff.h @@ -32,7 +32,7 @@ namespace daObjEff { void eff_set_pinecone_smoke(); void eff_set_woodBox_smoke(); void eff_set(); - s32 _create(); + cPhs_State _create(); void remove_barrel_smoke(); void remove_stool_smoke(); void remove_skull_smoke(); diff --git a/include/d/actor/d_a_obj_ekskz.h b/include/d/actor/d_a_obj_ekskz.h index e4d34e6bc..e26166a21 100644 --- a/include/d/actor/d_a_obj_ekskz.h +++ b/include/d/actor/d_a_obj_ekskz.h @@ -12,15 +12,15 @@ namespace daObjEkskz { public: void prm_get_swSave() const {} - int CreateHeap(); - int Create(); - void Mthd_Create(); - BOOL Delete(); - void Mthd_Delete(); + virtual BOOL CreateHeap(); + virtual BOOL Create(); + cPhs_State Mthd_Create(); + virtual BOOL Delete(); + BOOL Mthd_Delete(); void set_mtx(); void init_mtx(); - int Execute(float(**)[3][4]); - BOOL Draw(); + virtual BOOL Execute(float(**)[3][4]); + virtual BOOL Draw(); public: /* 0x2C8 */ u8 m2C8[0x2D0 - 0x2C8]; diff --git a/include/d/actor/d_a_obj_eskban.h b/include/d/actor/d_a_obj_eskban.h index b42b0858a..8197c71e4 100644 --- a/include/d/actor/d_a_obj_eskban.h +++ b/include/d/actor/d_a_obj_eskban.h @@ -37,18 +37,18 @@ namespace daObjEskban { Act_c(); - int CreateHeap(); - int Create(); - s32 Mthd_Create(); - int Delete(); + virtual BOOL CreateHeap(); + virtual BOOL Create(); + cPhs_State Mthd_Create(); + virtual BOOL Delete(); BOOL Mthd_Delete(); void set_mtx(); void init_mtx(); void eff_m_break(unsigned short, unsigned short); void eff_b_break(unsigned short); void daObjEskban_effect_set(); - int Execute(Mtx**); - int Draw(); + virtual BOOL Execute(Mtx**); + virtual BOOL Draw(); public: /* 0x2C4 Act_c vtable */ diff --git a/include/d/actor/d_a_obj_ferris.h b/include/d/actor/d_a_obj_ferris.h index 4f7feb880..ff8b793bc 100644 --- a/include/d/actor/d_a_obj_ferris.h +++ b/include/d/actor/d_a_obj_ferris.h @@ -39,7 +39,7 @@ namespace daObjFerris { s32 param_get_swSave() const { return daObj::PrmAbstract(this, PRM_SWSAVE_W, PRM_SWSAVE_S); } bool create_heap(); - s32 _create(); + cPhs_State _create(); bool _delete(); void set_mtx(int); void init_mtx(); diff --git a/include/d/actor/d_a_obj_figure.h b/include/d/actor/d_a_obj_figure.h index 434950ffc..8be9725c6 100644 --- a/include/d/actor/d_a_obj_figure.h +++ b/include/d/actor/d_a_obj_figure.h @@ -16,7 +16,7 @@ public: bool isDispFigure() { return mbDisplay; } void setResFlag(u8 flag) { mLoadFlags |= flag; } - s32 _create(); + cPhs_State _create(); BOOL createHeap(); s32 createInit(); BOOL _delete(); diff --git a/include/d/actor/d_a_obj_firewall.h b/include/d/actor/d_a_obj_firewall.h index daf837754..892fcccd6 100644 --- a/include/d/actor/d_a_obj_firewall.h +++ b/include/d/actor/d_a_obj_firewall.h @@ -20,7 +20,7 @@ public: void set_pl_se(); void setup_burn_up(); void setup_put_the_fire_out(); - s32 _create(); + cPhs_State _create(); bool _delete(); void wait_act_proc(); void wait2_act_proc(); diff --git a/include/d/actor/d_a_obj_flame.h b/include/d/actor/d_a_obj_flame.h index b598ba16b..b10f62502 100644 --- a/include/d/actor/d_a_obj_flame.h +++ b/include/d/actor/d_a_obj_flame.h @@ -12,7 +12,7 @@ class mDoExt_brkAnm; namespace daObjFlame { class Act_c : public fopAc_ac_c { public: - inline s32 _create(); + inline cPhs_State _create(); inline bool _delete(); inline bool _draw(); inline bool _execute(); @@ -91,7 +91,7 @@ namespace daObjFlame { }; namespace Method { - s32 Create(void*); + cPhs_State Create(void*); BOOL Delete(void*); BOOL Execute(void*); BOOL Draw(void*); diff --git a/include/d/actor/d_a_obj_ftree.h b/include/d/actor/d_a_obj_ftree.h index af5a36228..85736d0c8 100644 --- a/include/d/actor/d_a_obj_ftree.h +++ b/include/d/actor/d_a_obj_ftree.h @@ -87,7 +87,7 @@ namespace daObjFtree { void solidHeapCB(fopAc_ac_c*); BOOL NodeCallBack_Effect(J3DNode*, int); void create_heap(); - s32 _create(); + cPhs_State _create(); bool _delete(); void set_mtx(); bool _execute(); diff --git a/include/d/actor/d_a_obj_ganonbed.h b/include/d/actor/d_a_obj_ganonbed.h index 0ad3373b8..d50307754 100644 --- a/include/d/actor/d_a_obj_ganonbed.h +++ b/include/d/actor/d_a_obj_ganonbed.h @@ -8,7 +8,7 @@ class daObjGbed_c : public fopAc_ac_c { public: void init_mtx(); - s32 _create(); + cPhs_State _create(); bool _execute(); bool _draw(); bool _delete(); diff --git a/include/d/actor/d_a_obj_gaship.h b/include/d/actor/d_a_obj_gaship.h index e8e88cd20..ca45b8ce1 100644 --- a/include/d/actor/d_a_obj_gaship.h +++ b/include/d/actor/d_a_obj_gaship.h @@ -11,7 +11,7 @@ namespace daObjGaship { void birth_flag(); static BOOL solidHeapCB(fopAc_ac_c*); bool create_heap(); - s32 _create(); + cPhs_State _create(); bool _delete(); void set_mtx(); bool _execute(); diff --git a/include/d/actor/d_a_obj_gaship2.h b/include/d/actor/d_a_obj_gaship2.h index 0d22e0a40..24627a658 100644 --- a/include/d/actor/d_a_obj_gaship2.h +++ b/include/d/actor/d_a_obj_gaship2.h @@ -11,7 +11,7 @@ public: virtual ~Act_c() {} static BOOL solidHeapCB(fopAc_ac_c*); bool create_heap(); - s32 _create(); + cPhs_State _create(); bool _delete(); void set_mtx(); bool _execute(); diff --git a/include/d/actor/d_a_obj_gnnbtltaki.h b/include/d/actor/d_a_obj_gnnbtltaki.h index 8a14993a2..ccb354afc 100644 --- a/include/d/actor/d_a_obj_gnnbtltaki.h +++ b/include/d/actor/d_a_obj_gnnbtltaki.h @@ -7,7 +7,7 @@ class daObjGnnbtaki_c : public fopAc_ac_c { public: void solidHeapCB(fopAc_ac_c*); void create_heap(); - s32 _create(); + cPhs_State _create(); bool _delete(); void init_mtx(); bool _execute(); diff --git a/include/d/actor/d_a_obj_gnndemotakie.h b/include/d/actor/d_a_obj_gnndemotakie.h index 3cafd933b..2715042e1 100644 --- a/include/d/actor/d_a_obj_gnndemotakie.h +++ b/include/d/actor/d_a_obj_gnndemotakie.h @@ -7,7 +7,7 @@ class daObjGnntakie_c : public fopAc_ac_c { public: void solidHeapCB(fopAc_ac_c*); void create_heap(); - s32 _create(); + cPhs_State _create(); bool _delete(); void init_mtx(); bool _execute(); diff --git a/include/d/actor/d_a_obj_gnndemotakis.h b/include/d/actor/d_a_obj_gnndemotakis.h index 84dd2cc93..0f06d7508 100644 --- a/include/d/actor/d_a_obj_gnndemotakis.h +++ b/include/d/actor/d_a_obj_gnndemotakis.h @@ -7,7 +7,7 @@ class daObjGnntakis_c : public fopAc_ac_c { public: void solidHeapCB(fopAc_ac_c*); void create_heap(); - s32 _create(); + cPhs_State _create(); bool _delete(); void init_mtx(); bool _execute(); diff --git a/include/d/actor/d_a_obj_gong.h b/include/d/actor/d_a_obj_gong.h index 4f5cebcd4..de65d1fb5 100644 --- a/include/d/actor/d_a_obj_gong.h +++ b/include/d/actor/d_a_obj_gong.h @@ -13,7 +13,7 @@ namespace daObjGong { static const char M_arcname[6]; - s32 _create(); + cPhs_State _create(); bool _execute(); bool _draw(); bool _delete(); diff --git a/include/d/actor/d_a_obj_gryw00.h b/include/d/actor/d_a_obj_gryw00.h index 49693abdd..54b1eff3f 100644 --- a/include/d/actor/d_a_obj_gryw00.h +++ b/include/d/actor/d_a_obj_gryw00.h @@ -27,18 +27,18 @@ public: void particle_move(); void particle_delete(); void set_se(); - int CreateHeap(); - int Create(); - s32 Mthd_Create(); - BOOL Delete(); + virtual BOOL CreateHeap(); + virtual BOOL Create(); + cPhs_State Mthd_Create(); + virtual BOOL Delete(); BOOL Mthd_Delete(); void switch_wait_act_proc(); void spread_water_face_act_proc(); void water_level_move_wait_act_proc(); void anime_loop_start_wait_act_proc(); void high_water_level_act_proc(); - BOOL Execute(Mtx**); - BOOL Draw(); + virtual BOOL Execute(Mtx**); + virtual BOOL Draw(); public: /* 0x2C8 */ request_of_phase_process_class mPhs; diff --git a/include/d/actor/d_a_obj_gtaki.h b/include/d/actor/d_a_obj_gtaki.h index 9feaebf24..67a38f08a 100644 --- a/include/d/actor/d_a_obj_gtaki.h +++ b/include/d/actor/d_a_obj_gtaki.h @@ -5,7 +5,7 @@ class daObjGtaki_c : public fopAc_ac_c { public: - inline s32 _create(); + inline cPhs_State _create(); inline bool _delete(); inline bool _draw(); inline bool _execute(); diff --git a/include/d/actor/d_a_obj_hami2.h b/include/d/actor/d_a_obj_hami2.h index cd7a6b77f..11a527c5f 100644 --- a/include/d/actor/d_a_obj_hami2.h +++ b/include/d/actor/d_a_obj_hami2.h @@ -10,9 +10,9 @@ namespace daObjHami2 { void CreateHeap(); s32 Create(); - void Mthd_Create(); + cPhs_State Mthd_Create(); BOOL Delete(); - void Mthd_Delete(); + BOOL Mthd_Delete(); void set_mtx(); void init_mtx(); void daObjHami2_close_stop(); diff --git a/include/d/actor/d_a_obj_hami3.h b/include/d/actor/d_a_obj_hami3.h index 3a7677505..572611b50 100644 --- a/include/d/actor/d_a_obj_hami3.h +++ b/include/d/actor/d_a_obj_hami3.h @@ -12,9 +12,9 @@ namespace daObjHami3 { void CreateHeap(); s32 Create(); - void Mthd_Create(); + cPhs_State Mthd_Create(); BOOL Delete(); - void Mthd_Delete(); + BOOL Mthd_Delete(); void set_mtx(); void init_mtx(); void daObjHami3_close_stop(); diff --git a/include/d/actor/d_a_obj_hami4.h b/include/d/actor/d_a_obj_hami4.h index 03a8106dc..815347af6 100644 --- a/include/d/actor/d_a_obj_hami4.h +++ b/include/d/actor/d_a_obj_hami4.h @@ -5,7 +5,7 @@ class daObjHami4_c : public fopAc_ac_c { public: - inline s32 _create(); + inline cPhs_State _create(); inline bool _delete(); inline bool _draw(); inline bool _execute(); diff --git a/include/d/actor/d_a_obj_hat.h b/include/d/actor/d_a_obj_hat.h index 2beadb2f9..56249e249 100644 --- a/include/d/actor/d_a_obj_hat.h +++ b/include/d/actor/d_a_obj_hat.h @@ -16,7 +16,7 @@ public: daObjHat_c(); - s32 _create(); + cPhs_State _create(); BOOL createHeap(); s32 createInit(); BOOL _delete(); diff --git a/include/d/actor/d_a_obj_hbrf1.h b/include/d/actor/d_a_obj_hbrf1.h index c4113d0ad..10cce9e79 100644 --- a/include/d/actor/d_a_obj_hbrf1.h +++ b/include/d/actor/d_a_obj_hbrf1.h @@ -34,10 +34,10 @@ namespace daObjHbrf1 { s32 prm_get_Type() const { return daObj::PrmAbstract(this, PRM_TYPE_W, PRM_TYPE_S); } s32 prm_get_Event() const { return daObj::PrmAbstract(this, PRM_EVENT_W, PRM_EVENT_S); } - BOOL CreateHeap(); - int Create(); - s32 Mthd_Create(); - BOOL Delete(); + virtual BOOL CreateHeap(); + virtual BOOL Create(); + cPhs_State Mthd_Create(); + virtual BOOL Delete(); BOOL Mthd_Delete(); void set_mtx(); void init_mtx(); @@ -49,8 +49,8 @@ namespace daObjHbrf1 { void daObjHbrf1_down_demo_wait(); void daObjHbrf1_down_demo_timer(); void daObjHbrf1_down_demo(); - BOOL Execute(Mtx** mtx); - BOOL Draw(); + virtual BOOL Execute(Mtx** mtx); + virtual BOOL Draw(); static Mtx M_tmp_mtx; diff --git a/include/d/actor/d_a_obj_hcbh.h b/include/d/actor/d_a_obj_hcbh.h index 965a7e595..d48fff04e 100644 --- a/include/d/actor/d_a_obj_hcbh.h +++ b/include/d/actor/d_a_obj_hcbh.h @@ -21,7 +21,7 @@ public: void co_hitCallback(fopAc_ac_c*, dCcD_GObjInf*, fopAc_ac_c*, dCcD_GObjInf*); void particle_set(); void make_item(); - s32 _create(); + cPhs_State _create(); bool _delete(); void wait_act_proc(); void fall_act_proc(); diff --git a/include/d/actor/d_a_obj_hfuck1.h b/include/d/actor/d_a_obj_hfuck1.h index 2dbaaaf6c..49652a795 100644 --- a/include/d/actor/d_a_obj_hfuck1.h +++ b/include/d/actor/d_a_obj_hfuck1.h @@ -9,7 +9,7 @@ class daObjHfuck1_c : public fopAc_ac_c { public: void init_mtx(); - s32 _create(); + cPhs_State _create(); bool _execute(); bool _draw(); bool _delete(); diff --git a/include/d/actor/d_a_obj_hha.h b/include/d/actor/d_a_obj_hha.h index 234de7625..8c64c54e9 100644 --- a/include/d/actor/d_a_obj_hha.h +++ b/include/d/actor/d_a_obj_hha.h @@ -123,7 +123,7 @@ public: static int solidHeapCB(fopAc_ac_c*); BOOL create_heap(); - s32 _create(); + cPhs_State _create(); bool _delete(); void set_tex(float, float, int); void init_mtx(); diff --git a/include/d/actor/d_a_obj_hlift.h b/include/d/actor/d_a_obj_hlift.h index 5b09a1697..f464c8886 100644 --- a/include/d/actor/d_a_obj_hlift.h +++ b/include/d/actor/d_a_obj_hlift.h @@ -17,9 +17,9 @@ namespace daObjHlift { void CreateHeap(); s32 Create(); - void Mthd_Create(); + cPhs_State Mthd_Create(); BOOL Delete(); - void Mthd_Delete(); + BOOL Mthd_Delete(); void mode_lower_init(); void mode_lower(); void mode_l_u_init(); diff --git a/include/d/actor/d_a_obj_hole.h b/include/d/actor/d_a_obj_hole.h index ef113c864..4cb1aa286 100644 --- a/include/d/actor/d_a_obj_hole.h +++ b/include/d/actor/d_a_obj_hole.h @@ -36,7 +36,7 @@ public: bool _execute(); bool _draw(); BOOL _createHeap(); - s32 _create(); + cPhs_State _create(); bool _delete(); public: diff --git a/include/d/actor/d_a_obj_homen.h b/include/d/actor/d_a_obj_homen.h index 1723f2bb0..f823ddc3f 100644 --- a/include/d/actor/d_a_obj_homen.h +++ b/include/d/actor/d_a_obj_homen.h @@ -46,7 +46,7 @@ namespace daObjHomen { static BOOL solidHeapCB(fopAc_ac_c*); bool create_heap(); - s32 _create(); + cPhs_State _create(); bool _delete(); void set_mtx(); void init_mtx(); diff --git a/include/d/actor/d_a_obj_homensmoke.h b/include/d/actor/d_a_obj_homensmoke.h index 58b21d067..ed02c3cfe 100644 --- a/include/d/actor/d_a_obj_homensmoke.h +++ b/include/d/actor/d_a_obj_homensmoke.h @@ -13,7 +13,7 @@ namespace daObjHomensmoke { virtual ~Act_c() {} void set_mtx(); - s32 _create(); + cPhs_State _create(); bool _delete(); bool _execute(); bool _draw(); diff --git a/include/d/actor/d_a_obj_hsehi1.h b/include/d/actor/d_a_obj_hsehi1.h index 64328042d..7b3580322 100644 --- a/include/d/actor/d_a_obj_hsehi1.h +++ b/include/d/actor/d_a_obj_hsehi1.h @@ -32,7 +32,7 @@ public: void drawStart(); void setBaseMtx(); void createHeap(); - s32 create(); + cPhs_State create(); void init(); void action(void*); void setAction(int (daObj_hsh_c::*)(void*), void*); diff --git a/include/d/actor/d_a_obj_htetu1.h b/include/d/actor/d_a_obj_htetu1.h index e96fc170a..afdb4688f 100644 --- a/include/d/actor/d_a_obj_htetu1.h +++ b/include/d/actor/d_a_obj_htetu1.h @@ -11,7 +11,7 @@ public: void solidHeapCB(fopAc_ac_c*); void create_heap(); - s32 _create(); + cPhs_State _create(); bool _delete(); void init_mtx(); void unlock(); diff --git a/include/d/actor/d_a_obj_ice.h b/include/d/actor/d_a_obj_ice.h index fe4d852ab..fbfd58a49 100644 --- a/include/d/actor/d_a_obj_ice.h +++ b/include/d/actor/d_a_obj_ice.h @@ -16,7 +16,7 @@ public: void solidHeapCB(fopAc_ac_c*); void create_heap(); void tg_hitCallback(fopAc_ac_c*, dCcD_GObjInf*, fopAc_ac_c*, dCcD_GObjInf*); - s32 _create(); + cPhs_State _create(); bool _delete(); void wait_act_proc(); void fade_out_retire_act_proc(); diff --git a/include/d/actor/d_a_obj_iceisland.h b/include/d/actor/d_a_obj_iceisland.h index a200f73a7..eb460ad2e 100644 --- a/include/d/actor/d_a_obj_iceisland.h +++ b/include/d/actor/d_a_obj_iceisland.h @@ -5,7 +5,7 @@ class daObjIceisland_c : public fopAc_ac_c { public: - inline s32 _create(); + inline cPhs_State _create(); inline bool _delete(); inline bool _draw(); inline bool _execute(); diff --git a/include/d/actor/d_a_obj_ikada.h b/include/d/actor/d_a_obj_ikada.h index 8b4bbaa5b..cddbe2256 100644 --- a/include/d/actor/d_a_obj_ikada.h +++ b/include/d/actor/d_a_obj_ikada.h @@ -77,7 +77,7 @@ public: void getArg(); void createInit(); void _createHeap(); - s32 _create(); + cPhs_State _create(); bool _delete(); public: diff --git a/include/d/actor/d_a_obj_jump.h b/include/d/actor/d_a_obj_jump.h index 1524fdbad..0871823e7 100644 --- a/include/d/actor/d_a_obj_jump.h +++ b/include/d/actor/d_a_obj_jump.h @@ -22,9 +22,9 @@ namespace daObjJump { void CreateHeap(); s32 Create(); - void Mthd_Create(); + cPhs_State Mthd_Create(); BOOL Delete(); - void Mthd_Delete(); + BOOL Mthd_Delete(); void set_mtx(); void init_mtx(); void set_push_flag(); diff --git a/include/d/actor/d_a_obj_kanat.h b/include/d/actor/d_a_obj_kanat.h index d0fa5d201..477ac8e2c 100644 --- a/include/d/actor/d_a_obj_kanat.h +++ b/include/d/actor/d_a_obj_kanat.h @@ -19,13 +19,13 @@ namespace daObjKanat { int prm_get_swSave() const { return daObj::PrmAbstract(this, PRM_SWSAVE_W, PRM_SWSAVE_S); } - int CreateHeap(); - int Create(); - BOOL Delete(); - BOOL Execute(Mtx**); - BOOL Draw(); + virtual BOOL CreateHeap(); + virtual BOOL Create(); + virtual BOOL Delete(); + virtual BOOL Execute(Mtx**); + virtual BOOL Draw(); - s32 Mthd_Create(); + cPhs_State Mthd_Create(); BOOL Mthd_Delete(); void set_mtx(); void init_mtx(); diff --git a/include/d/actor/d_a_obj_kanoke.h b/include/d/actor/d_a_obj_kanoke.h index 1ed518643..05b2e02ac 100644 --- a/include/d/actor/d_a_obj_kanoke.h +++ b/include/d/actor/d_a_obj_kanoke.h @@ -10,7 +10,7 @@ public: }; daObjKanoke_c(); - s32 _create(); + cPhs_State _create(); void createHeap(); void createInit(); bool _delete(); diff --git a/include/d/actor/d_a_obj_ladder.h b/include/d/actor/d_a_obj_ladder.h index 8fb8bd4cf..04568d661 100644 --- a/include/d/actor/d_a_obj_ladder.h +++ b/include/d/actor/d_a_obj_ladder.h @@ -40,10 +40,10 @@ namespace daObjLadder { s32 prm_get_swSave() const { return daObj::PrmAbstract(this, PRM_SWSAVE_W, PRM_SWSAVE_S); } u8 prm_get_evId() const { return daObj::PrmAbstract(this, PRM_EV_ID_W, PRM_EV_ID_S); } - BOOL CreateHeap(); - int Create(); - s32 Mthd_Create(); - BOOL Delete(); + virtual BOOL CreateHeap(); + virtual BOOL Create(); + cPhs_State Mthd_Create(); + virtual BOOL Delete(); BOOL Mthd_Delete(); void demo_end_reset(); void mode_wait_init(); @@ -58,8 +58,8 @@ namespace daObjLadder { void mode_fell(); void set_mtx(); void init_mtx(); - int Execute(Mtx**); - BOOL Draw(); + virtual BOOL Execute(Mtx**); + virtual BOOL Draw(); static Mtx M_tmp_mtx; static const char M_arcname[]; diff --git a/include/d/actor/d_a_obj_leaves.h b/include/d/actor/d_a_obj_leaves.h index 92708e1d3..f7b7d7e68 100644 --- a/include/d/actor/d_a_obj_leaves.h +++ b/include/d/actor/d_a_obj_leaves.h @@ -17,7 +17,7 @@ public: void solidHeapCB(fopAc_ac_c*); void create_heap(); void tg_hitCallback(fopAc_ac_c*, dCcD_GObjInf*, fopAc_ac_c*, dCcD_GObjInf*); - s32 _create(); + cPhs_State _create(); bool _delete(); void wait_proc(); void alpha_calc_start_wait_proc(); diff --git a/include/d/actor/d_a_obj_light.h b/include/d/actor/d_a_obj_light.h index 1ce07fd2f..f766f40a5 100644 --- a/include/d/actor/d_a_obj_light.h +++ b/include/d/actor/d_a_obj_light.h @@ -10,7 +10,7 @@ namespace daObjLight { void create_heap(); void init_collision(); void set_collision(); - s32 _create(); + cPhs_State _create(); bool _delete(); void set_fire(int); void draw_fire(); diff --git a/include/d/actor/d_a_obj_lpalm.h b/include/d/actor/d_a_obj_lpalm.h index 43b7983fc..5e28a3ee1 100644 --- a/include/d/actor/d_a_obj_lpalm.h +++ b/include/d/actor/d_a_obj_lpalm.h @@ -7,7 +7,7 @@ class daObjLpalm_c : public fopAc_ac_c { public: - inline s32 _create(); + inline cPhs_State _create(); inline bool _delete(); inline bool _draw(); inline bool _execute(); diff --git a/include/d/actor/d_a_obj_magmarock.h b/include/d/actor/d_a_obj_magmarock.h index 5ff30d1bc..7e7109aa5 100644 --- a/include/d/actor/d_a_obj_magmarock.h +++ b/include/d/actor/d_a_obj_magmarock.h @@ -12,7 +12,7 @@ namespace daObjMagmarock { class Act_c : public fopAc_ac_c { public: void MeltDownRequest() {} - inline s32 _create(); + inline cPhs_State _create(); inline bool _delete(); inline bool _draw(); inline bool _execute(); @@ -44,7 +44,7 @@ namespace daObjMagmarock { }; namespace Method { - s32 Create(void*); + cPhs_State Create(void*); BOOL Delete(void*); BOOL Execute(void*); BOOL Draw(void*); diff --git a/include/d/actor/d_a_obj_majyuu_door.h b/include/d/actor/d_a_obj_majyuu_door.h index ac43f567d..b533bcc12 100644 --- a/include/d/actor/d_a_obj_majyuu_door.h +++ b/include/d/actor/d_a_obj_majyuu_door.h @@ -11,7 +11,7 @@ public: void _createHeap(); void getArg(); void CreateInit(); - s32 _create(); + cPhs_State _create(); bool _delete(); void setCollision(); void modeWaitInit(); diff --git a/include/d/actor/d_a_obj_mkie.h b/include/d/actor/d_a_obj_mkie.h index b3e365844..81a5fc770 100644 --- a/include/d/actor/d_a_obj_mkie.h +++ b/include/d/actor/d_a_obj_mkie.h @@ -24,9 +24,9 @@ namespace daObjMkie { void init_cc(); void set_cc_pos(); s32 Create(); - void Mthd_Create(); + cPhs_State Mthd_Create(); BOOL Delete(); - void Mthd_Delete(); + BOOL Mthd_Delete(); void set_mtx(); void init_mtx(); void chk_light(); diff --git a/include/d/actor/d_a_obj_mkiek.h b/include/d/actor/d_a_obj_mkiek.h index 4d89450b1..8dcf6c679 100644 --- a/include/d/actor/d_a_obj_mkiek.h +++ b/include/d/actor/d_a_obj_mkiek.h @@ -11,9 +11,9 @@ namespace daObjMkiek { void CreateHeap(); s32 Create(); - void Mthd_Create(); + cPhs_State Mthd_Create(); BOOL Delete(); - void Mthd_Delete(); + BOOL Mthd_Delete(); void set_mtx(); void init_mtx(); void check(); diff --git a/include/d/actor/d_a_obj_mknjd.h b/include/d/actor/d_a_obj_mknjd.h index 151b79295..50a2cd82c 100644 --- a/include/d/actor/d_a_obj_mknjd.h +++ b/include/d/actor/d_a_obj_mknjd.h @@ -35,16 +35,16 @@ namespace daObjMknjD { } } - s32 Mthd_Create(); - s32 Mthd_Delete(); + cPhs_State Mthd_Create(); + BOOL Mthd_Delete(); s16 XyCheckCB(int); s16 XyEventCB(int); - int CreateHeap(); - int Create(); + virtual BOOL CreateHeap(); + virtual BOOL Create(); - int Delete(); + virtual BOOL Delete(); void set_mtx(); void init_mtx(); @@ -55,8 +55,8 @@ namespace daObjMknjD { void privateCut(); bool daObjMknjD_break(); - int Execute(Mtx**); - int Draw(); + virtual BOOL Execute(Mtx**); + virtual BOOL Draw(); static const char M_arcname[]; static Mtx M_tmp_mtx; diff --git a/include/d/actor/d_a_obj_mmrr.h b/include/d/actor/d_a_obj_mmrr.h index 6f4ca23df..d9b1b34b3 100644 --- a/include/d/actor/d_a_obj_mmrr.h +++ b/include/d/actor/d_a_obj_mmrr.h @@ -17,7 +17,7 @@ namespace daObjMmrr { void set_cc_rec_pos(); void set_cc_trans_pos(); void set_cull(); - s32 _create(); + cPhs_State _create(); bool _delete(); void set_mtx(); void init_mtx(); diff --git a/include/d/actor/d_a_obj_monument.h b/include/d/actor/d_a_obj_monument.h index 813c894d0..2aa0cad9a 100644 --- a/include/d/actor/d_a_obj_monument.h +++ b/include/d/actor/d_a_obj_monument.h @@ -35,7 +35,7 @@ namespace daObjMonument { Type_e prm_get_type() const { return (Type_e)daObj::PrmAbstract(this, PRM_TYPE_W, PRM_TYPE_S); } u32 prm_get_swSave() const { return daObj::PrmAbstract(this, PRM_SWSAVE_W, PRM_SWSAVE_S); } - s32 _create(); + cPhs_State _create(); bool _execute(); bool _draw(); bool _delete(); diff --git a/include/d/actor/d_a_obj_movebox.h b/include/d/actor/d_a_obj_movebox.h index 45175bb52..d97b79170 100644 --- a/include/d/actor/d_a_obj_movebox.h +++ b/include/d/actor/d_a_obj_movebox.h @@ -163,7 +163,7 @@ namespace daObjMovebox { typedef void (Act_c::*ModeFunc)(); - inline s32 Mthd_Create(); + inline cPhs_State Mthd_Create(); inline BOOL Mthd_Delete(); s32 prm_get_type() const { return daObj::PrmAbstract(this, PRM_TYPE_W, PRM_TYPE_S); } @@ -197,10 +197,10 @@ namespace daObjMovebox { void init_mtx(); void path_init(); void path_save(); - int CreateHeap(); + virtual BOOL CreateHeap(); static void RideCallBack(dBgW*, fopAc_ac_c*, fopAc_ac_c*); static fopAc_ac_c* PPCallBack(fopAc_ac_c*, fopAc_ac_c*, s16, dBgW::PushPullLabel); - int Create(); + virtual BOOL Create(); void afl_sway(); int check_to_walk(); void clr_moment_cnt(); @@ -223,9 +223,9 @@ namespace daObjMovebox { void sound_land(); void vib_land(); void eff_land_smoke(); - int Execute(Mtx**); - int Draw(); - int Delete(); + virtual BOOL Execute(Mtx**); + virtual BOOL Draw(); + virtual BOOL Delete(); static const s16 M_dir_base[4]; diff --git a/include/d/actor/d_a_obj_msdan.h b/include/d/actor/d_a_obj_msdan.h index d9f54925c..e3a15939a 100644 --- a/include/d/actor/d_a_obj_msdan.h +++ b/include/d/actor/d_a_obj_msdan.h @@ -11,9 +11,9 @@ namespace daObjMsdan { void prm_get_sound() const {} void prm_get_swSave() const {} - void Mthd_Create(); - void Mthd_Execute(); - void Mthd_Delete(); + cPhs_State Mthd_Create(); + BOOL Mthd_Execute(); + BOOL Mthd_Delete(); public: /* Place member variables here */ diff --git a/include/d/actor/d_a_obj_msdan2.h b/include/d/actor/d_a_obj_msdan2.h index 8f1e9b780..131c27f3c 100644 --- a/include/d/actor/d_a_obj_msdan2.h +++ b/include/d/actor/d_a_obj_msdan2.h @@ -8,9 +8,9 @@ namespace daObjMsdan2 { public: void prm_get_swSave() const {} - void Mthd_Create(); - void Mthd_Execute(); - void Mthd_Delete(); + cPhs_State Mthd_Create(); + BOOL Mthd_Execute(); + BOOL Mthd_Delete(); 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 8c595227e..73977f7d6 100644 --- a/include/d/actor/d_a_obj_msdan_sub.h +++ b/include/d/actor/d_a_obj_msdan_sub.h @@ -12,9 +12,9 @@ namespace daObjMsdanSub { void CreateHeap(); s32 Create(); - void Mthd_Create(); + cPhs_State Mthd_Create(); BOOL Delete(); - void Mthd_Delete(); + BOOL Mthd_Delete(); void set_mtx(); void init_mtx(); void Execute(float(**)[3][4]); diff --git a/include/d/actor/d_a_obj_msdan_sub2.h b/include/d/actor/d_a_obj_msdan_sub2.h index 84565949c..b6ca85ec6 100644 --- a/include/d/actor/d_a_obj_msdan_sub2.h +++ b/include/d/actor/d_a_obj_msdan_sub2.h @@ -11,9 +11,9 @@ namespace daObjMsdanSub2 { void CreateHeap(); s32 Create(); - void Mthd_Create(); + cPhs_State Mthd_Create(); BOOL Delete(); - void Mthd_Delete(); + BOOL Mthd_Delete(); void set_mtx(); void init_mtx(); void Execute(float(**)[3][4]); diff --git a/include/d/actor/d_a_obj_mshokki.h b/include/d/actor/d_a_obj_mshokki.h index 6a76f89cf..6e1a83652 100644 --- a/include/d/actor/d_a_obj_mshokki.h +++ b/include/d/actor/d_a_obj_mshokki.h @@ -15,7 +15,7 @@ public: void co_hitCallback(fopAc_ac_c*, dCcD_GObjInf*, fopAc_ac_c*, dCcD_GObjInf*); void break_proc(); void set_se(); - s32 _create(); + cPhs_State _create(); bool _delete(); bool _execute(); bool _draw(); diff --git a/include/d/actor/d_a_obj_mtest.h b/include/d/actor/d_a_obj_mtest.h index fbf5fdb75..ce0b9d365 100644 --- a/include/d/actor/d_a_obj_mtest.h +++ b/include/d/actor/d_a_obj_mtest.h @@ -55,7 +55,7 @@ namespace daObjMtest { virtual BOOL Draw(); bool chk_appear(); - s32 Mthd_Create(); + cPhs_State Mthd_Create(); BOOL Mthd_Delete(); void set_mtx(); void init_mtx(); diff --git a/include/d/actor/d_a_obj_nest.h b/include/d/actor/d_a_obj_nest.h index ae03180d5..214360dd1 100644 --- a/include/d/actor/d_a_obj_nest.h +++ b/include/d/actor/d_a_obj_nest.h @@ -9,9 +9,9 @@ namespace daObjNest { public: void CreateHeap(); s32 Create(); - void Mthd_Create(); + cPhs_State Mthd_Create(); BOOL Delete(); - void Mthd_Delete(); + BOOL Mthd_Delete(); void set_mtx(); void init_mtx(); void rideCB(dBgW*, fopAc_ac_c*, fopAc_ac_c*); diff --git a/include/d/actor/d_a_obj_ohatch.h b/include/d/actor/d_a_obj_ohatch.h index ebe415d38..ba53fc305 100644 --- a/include/d/actor/d_a_obj_ohatch.h +++ b/include/d/actor/d_a_obj_ohatch.h @@ -11,7 +11,7 @@ public: void init_mtx(); void solidHeapCB(fopAc_ac_c*); void create_heap(); - s32 _create(); + cPhs_State _create(); bool _delete(); void close_wait_act_proc(); void tremor_act_proc(); diff --git a/include/d/actor/d_a_obj_ojtree.h b/include/d/actor/d_a_obj_ojtree.h index b2539c118..58df099df 100644 --- a/include/d/actor/d_a_obj_ojtree.h +++ b/include/d/actor/d_a_obj_ojtree.h @@ -12,15 +12,15 @@ namespace daObjOjtree { static Mtx M_tmp_mtx; static const char M_arcname[]; - int CreateHeap(); - int Create(); - s32 Mthd_Create(); - BOOL Delete(); - s32 Mthd_Delete(); + virtual BOOL CreateHeap(); + virtual BOOL Create(); + cPhs_State Mthd_Create(); + virtual BOOL Delete(); + BOOL Mthd_Delete(); void set_mtx(); void init_mtx(); - int Execute(Mtx**); - BOOL Draw(); + virtual BOOL Execute(Mtx**); + virtual BOOL Draw(); public: /* 0x2C8 */ request_of_phase_process_class mPhs; diff --git a/include/d/actor/d_a_obj_ospbox.h b/include/d/actor/d_a_obj_ospbox.h index 8c815b283..87b52677b 100644 --- a/include/d/actor/d_a_obj_ospbox.h +++ b/include/d/actor/d_a_obj_ospbox.h @@ -11,9 +11,9 @@ namespace daObjOspbox { void CreateHeap(); s32 Create(); - void Mthd_Create(); + cPhs_State Mthd_Create(); BOOL Delete(); - void Mthd_Delete(); + BOOL Mthd_Delete(); void set_mtx(); void init_mtx(); void make_item(); diff --git a/include/d/actor/d_a_obj_otble.h b/include/d/actor/d_a_obj_otble.h index 653a9c0aa..f6a98e002 100644 --- a/include/d/actor/d_a_obj_otble.h +++ b/include/d/actor/d_a_obj_otble.h @@ -6,7 +6,7 @@ namespace daObj_Otble { class Act_c : public fopAc_ac_c { public: - inline s32 _create(); + inline cPhs_State _create(); inline bool _delete(); void attr() const {} @@ -21,7 +21,7 @@ namespace daObj_Otble { }; namespace Mthd { - s32 Create(void*); + cPhs_State Create(void*); BOOL Delete(void*); BOOL Execute(void*); BOOL Draw(void*); diff --git a/include/d/actor/d_a_obj_paper.h b/include/d/actor/d_a_obj_paper.h index 2e86d4a3a..5c035992c 100644 --- a/include/d/actor/d_a_obj_paper.h +++ b/include/d/actor/d_a_obj_paper.h @@ -38,7 +38,7 @@ namespace daObjPaper { static int solidHeapCB(fopAc_ac_c*); bool create_heap(); - s32 _create(); + cPhs_State _create(); bool _delete(); void mode_wait_init(); void mode_wait(); diff --git a/include/d/actor/d_a_obj_pbco.h b/include/d/actor/d_a_obj_pbco.h index 1696bc8ea..3d7929d26 100644 --- a/include/d/actor/d_a_obj_pbco.h +++ b/include/d/actor/d_a_obj_pbco.h @@ -8,13 +8,13 @@ class dBgW; class daObj_Pbco_c : public fopAc_ac_c { public: - inline s32 _create(); + inline cPhs_State _create(); inline bool _delete(); inline bool _draw(); inline bool _execute(); static const char M_arcname[]; BOOL CreateHeap(); - s32 CreateInit(); + cPhs_State CreateInit(); void set_mtx(); public: diff --git a/include/d/actor/d_a_obj_pbka.h b/include/d/actor/d_a_obj_pbka.h index 13a31222e..77c8461b0 100644 --- a/include/d/actor/d_a_obj_pbka.h +++ b/include/d/actor/d_a_obj_pbka.h @@ -6,7 +6,7 @@ class daObjPbka_c : public fopAc_ac_c { public: - inline s32 _create(); + inline cPhs_State _create(); inline bool _delete(); inline bool _draw(); inline bool _execute(); diff --git a/include/d/actor/d_a_obj_pfall.h b/include/d/actor/d_a_obj_pfall.h index 992452b0a..a3d8849c1 100644 --- a/include/d/actor/d_a_obj_pfall.h +++ b/include/d/actor/d_a_obj_pfall.h @@ -13,7 +13,7 @@ public: void set_mtx(); void CreateHeap(); void CreateInit(); - s32 _create(); + cPhs_State _create(); bool _delete(); void cutProc(); void cutWaitStart(int); diff --git a/include/d/actor/d_a_obj_pirateship.h b/include/d/actor/d_a_obj_pirateship.h index fabe7e540..36a6fbf02 100644 --- a/include/d/actor/d_a_obj_pirateship.h +++ b/include/d/actor/d_a_obj_pirateship.h @@ -8,7 +8,7 @@ namespace daObjPirateship { class Act_c : public fopAc_ac_c { public: - inline s32 _create(); + inline cPhs_State _create(); inline bool _delete(); inline bool _draw(); inline bool _execute(); @@ -39,7 +39,7 @@ namespace daObjPirateship { }; namespace Method { - s32 Create(void*); + cPhs_State Create(void*); BOOL Delete(void*); BOOL Execute(void*); BOOL Draw(void*); diff --git a/include/d/actor/d_a_obj_plant.h b/include/d/actor/d_a_obj_plant.h index acda35430..892e579ec 100644 --- a/include/d/actor/d_a_obj_plant.h +++ b/include/d/actor/d_a_obj_plant.h @@ -5,7 +5,7 @@ class daObjPlant_c : public fopAc_ac_c { public: - inline s32 _create(); + inline cPhs_State _create(); inline bool _delete(); inline bool _draw(); inline bool _execute(); diff --git a/include/d/actor/d_a_obj_quake.h b/include/d/actor/d_a_obj_quake.h index 74c690e08..441498fac 100644 --- a/include/d/actor/d_a_obj_quake.h +++ b/include/d/actor/d_a_obj_quake.h @@ -17,7 +17,7 @@ public: PRM_POWER_S = 0xB, }; - s32 _create(); + cPhs_State _create(); BOOL _delete(); BOOL _is_delete(); BOOL _execute(); diff --git a/include/d/actor/d_a_obj_rcloud.h b/include/d/actor/d_a_obj_rcloud.h index 524fbb1d4..fd86a7641 100644 --- a/include/d/actor/d_a_obj_rcloud.h +++ b/include/d/actor/d_a_obj_rcloud.h @@ -12,7 +12,7 @@ public: void init_mtx(); void solidHeapCB(fopAc_ac_c*); void create_heap(); - s32 _create(); + cPhs_State _create(); bool _delete(); void wait_act_proc(); void clouds_lift_start_wait_act_proc(); diff --git a/include/d/actor/d_a_obj_rflw.h b/include/d/actor/d_a_obj_rflw.h index 8d34e7119..d2b8cf58d 100644 --- a/include/d/actor/d_a_obj_rflw.h +++ b/include/d/actor/d_a_obj_rflw.h @@ -5,7 +5,7 @@ class daObjRflw_c : public fopAc_ac_c { public: - inline s32 _create(); + inline cPhs_State _create(); inline bool _delete(); inline bool _draw(); inline bool _execute(); diff --git a/include/d/actor/d_a_obj_rforce.h b/include/d/actor/d_a_obj_rforce.h index 0016341ba..b98214379 100644 --- a/include/d/actor/d_a_obj_rforce.h +++ b/include/d/actor/d_a_obj_rforce.h @@ -9,7 +9,7 @@ namespace daObjRforce { public: static BOOL solidHeapCB(fopAc_ac_c*); bool create_heap(); - s32 _create(); + cPhs_State _create(); bool _delete(); void set_mtx(); bool _execute(); diff --git a/include/d/actor/d_a_obj_roten.h b/include/d/actor/d_a_obj_roten.h index 415fd71fb..44c555d1e 100644 --- a/include/d/actor/d_a_obj_roten.h +++ b/include/d/actor/d_a_obj_roten.h @@ -9,7 +9,7 @@ class daObj_Roten_c : public fopAc_ac_c { public: - inline s32 _create(); + inline cPhs_State _create(); inline bool _delete(); inline bool _draw(); inline bool _execute(); diff --git a/include/d/actor/d_a_obj_search.h b/include/d/actor/d_a_obj_search.h index 35e844b1d..3d6d8ccf1 100644 --- a/include/d/actor/d_a_obj_search.h +++ b/include/d/actor/d_a_obj_search.h @@ -46,7 +46,7 @@ namespace daObj_Search { void attr() const; void SetArgData(); void CreateInit(); - s32 _create(); + cPhs_State _create(); void smoke_set(float, int); bool _execute(); void check_bk_control(); @@ -79,7 +79,7 @@ namespace daObj_Search { }; namespace Mthd { - s32 Create(void*); + cPhs_State Create(void*); BOOL Delete(void*); BOOL Execute(void*); BOOL Draw(void*); diff --git a/include/d/actor/d_a_obj_shelf.h b/include/d/actor/d_a_obj_shelf.h index 44ee9486f..2dd2dc537 100644 --- a/include/d/actor/d_a_obj_shelf.h +++ b/include/d/actor/d_a_obj_shelf.h @@ -16,11 +16,11 @@ namespace daObjShelf { bool prm_get_groundma() const { return daObj::PrmAbstract(this, PRM_GROUNDMA_W, PRM_GROUNDMA_S); } - int CreateHeap(); - int Create(); - s32 Mthd_Create(); - BOOL Delete(); - int Mthd_Delete(); + virtual BOOL CreateHeap(); + virtual BOOL Create(); + cPhs_State Mthd_Create(); + virtual BOOL Delete(); + BOOL Mthd_Delete(); void hold_event() const; void mode_wait_init(); void mode_wait(); @@ -34,8 +34,8 @@ namespace daObjShelf { void mode_fell(); void set_mtx(); void init_mtx(); - BOOL Execute(Mtx**); - BOOL Draw(); + virtual BOOL Execute(Mtx**); + virtual BOOL Draw(); public: static const char M_arcname[6]; diff --git a/include/d/actor/d_a_obj_shmrgrd.h b/include/d/actor/d_a_obj_shmrgrd.h index 043f02bf5..b6cce0c3f 100644 --- a/include/d/actor/d_a_obj_shmrgrd.h +++ b/include/d/actor/d_a_obj_shmrgrd.h @@ -15,7 +15,7 @@ public: daObjShmrgrd_c(); void solidHeapCB(fopAc_ac_c*); void create_heap(); - s32 _create(); + cPhs_State _create(); bool _delete(); void search_target_next(daObjShmrgrd_c*); void register_list(); diff --git a/include/d/actor/d_a_obj_smplbg.h b/include/d/actor/d_a_obj_smplbg.h index 960b0a78b..8fcc5fe4f 100644 --- a/include/d/actor/d_a_obj_smplbg.h +++ b/include/d/actor/d_a_obj_smplbg.h @@ -14,9 +14,9 @@ namespace daObjSmplbg { void CreateHeap(); s32 Create(); - void Mthd_Create(); + cPhs_State Mthd_Create(); BOOL Delete(); - void Mthd_Delete(); + BOOL Mthd_Delete(); void set_mtx(); void init_mtx(); void exec_qtkhd(); diff --git a/include/d/actor/d_a_obj_stair.h b/include/d/actor/d_a_obj_stair.h index 21463fdcf..430bea085 100644 --- a/include/d/actor/d_a_obj_stair.h +++ b/include/d/actor/d_a_obj_stair.h @@ -5,7 +5,7 @@ class daObj_Stair_c : public fopAc_ac_c { public: - inline s32 _create(); + inline cPhs_State _create(); inline bool _delete(); inline bool _draw(); inline bool _execute(); diff --git a/include/d/actor/d_a_obj_swflat.h b/include/d/actor/d_a_obj_swflat.h index f1445662a..996734dd1 100644 --- a/include/d/actor/d_a_obj_swflat.h +++ b/include/d/actor/d_a_obj_swflat.h @@ -12,9 +12,9 @@ namespace daObjSwflat { void CreateHeap(); s32 Create(); - void Mthd_Create(); + cPhs_State Mthd_Create(); BOOL Delete(); - void Mthd_Delete(); + BOOL Mthd_Delete(); void set_mtx(); void init_mtx(); void Execute(float(**)[3][4]); diff --git a/include/d/actor/d_a_obj_swhammer.h b/include/d/actor/d_a_obj_swhammer.h index b10e597af..12e8d1162 100644 --- a/include/d/actor/d_a_obj_swhammer.h +++ b/include/d/actor/d_a_obj_swhammer.h @@ -3,7 +3,7 @@ #include "d/d_a_obj.h" #include "d/d_bg_s_movebg_actor.h" -#include "c/c_damagereaction.h" +#include "d/d_particle.h" class J3DNode; @@ -25,10 +25,10 @@ namespace daObjSwhammer { s32 prm_get_swSave2() const { return daObj::PrmAbstract(this, PRM_SWSAVE2_W, PRM_SWSAVE2_S); } Act_c(); - BOOL CreateHeap(); - int Create(); - s32 _create(); - BOOL Delete(); + virtual BOOL CreateHeap(); + virtual BOOL Create(); + cPhs_State _create(); + virtual BOOL Delete(); bool _delete(); void set_mtx(); void init_mtx(); @@ -48,8 +48,8 @@ namespace daObjSwhammer { void mode_lower(); void mode_l_u_init(); void mode_l_u(); - BOOL Execute(Mtx**); - BOOL Draw(); + virtual BOOL Execute(Mtx**); + virtual BOOL Draw(); virtual ~Act_c() {}; diff --git a/include/d/actor/d_a_obj_swheavy.h b/include/d/actor/d_a_obj_swheavy.h index c96a9a51b..682fb2f75 100644 --- a/include/d/actor/d_a_obj_swheavy.h +++ b/include/d/actor/d_a_obj_swheavy.h @@ -44,7 +44,7 @@ namespace daObjSwheavy { static BOOL solidHeapCB(fopAc_ac_c*); u8 create_heap(); - s32 _create(); + cPhs_State _create(); bool _delete(); void set_mtx(); void init_mtx(); diff --git a/include/d/actor/d_a_obj_swlight.h b/include/d/actor/d_a_obj_swlight.h index 2c9f2d105..d858cda05 100644 --- a/include/d/actor/d_a_obj_swlight.h +++ b/include/d/actor/d_a_obj_swlight.h @@ -23,7 +23,7 @@ namespace daObjSwlight { void is_switch2() const; void solidHeapCB(fopAc_ac_c*); void create_heap(); - s32 _create(); + cPhs_State _create(); bool _delete(); static BOOL jnodeCB_moon(J3DNode*, int); void set_mtx(); diff --git a/include/d/actor/d_a_obj_swpush.h b/include/d/actor/d_a_obj_swpush.h index da13338a4..5229d45ff 100644 --- a/include/d/actor/d_a_obj_swpush.h +++ b/include/d/actor/d_a_obj_swpush.h @@ -26,8 +26,8 @@ namespace daObjSwpush { void solidHeapCB(fopAc_ac_c*); void create_heap(); void create_res_load(); - void Mthd_Create(); - void Mthd_Delete(); + cPhs_State Mthd_Create(); + BOOL Mthd_Delete(); void set_mtx(); void init_mtx(); void set_btp_frame(); @@ -55,8 +55,8 @@ namespace daObjSwpush { void demo_reqSw(); void demo_runSw_init(); void demo_runSw(); - void Mthd_Execute(); - void Mthd_Draw(); + BOOL Mthd_Execute(); + BOOL Mthd_Draw(); public: /* Place member variables here */ diff --git a/include/d/actor/d_a_obj_table.h b/include/d/actor/d_a_obj_table.h index 5b0939a75..17e9a6391 100644 --- a/include/d/actor/d_a_obj_table.h +++ b/include/d/actor/d_a_obj_table.h @@ -10,15 +10,15 @@ namespace daObjTable { public: void prm_get_mdl() const {} - BOOL CreateHeap(); - int Create(); - void Mthd_Create(); - BOOL Delete(); - void Mthd_Delete(); + virtual BOOL CreateHeap(); + virtual BOOL Create(); + cPhs_State Mthd_Create(); + virtual BOOL Delete(); + BOOL Mthd_Delete(); void set_mtx(); void init_mtx(); - int Execute(Mtx**); - BOOL Draw(); + virtual BOOL Execute(Mtx**); + virtual BOOL Draw(); public: /* 0x2C8 */ request_of_phase_process_class mPhs; diff --git a/include/d/actor/d_a_obj_tapestry.h b/include/d/actor/d_a_obj_tapestry.h index 94a93a63f..7a3079a88 100644 --- a/include/d/actor/d_a_obj_tapestry.h +++ b/include/d/actor/d_a_obj_tapestry.h @@ -23,7 +23,7 @@ public: void set_cc_pos(); void checkCollision(); void set_eye_pos(); - s32 _create(); + cPhs_State _create(); bool _delete(); void wait_act_proc(); void demo_request_act_proc(); diff --git a/include/d/actor/d_a_obj_tenmado.h b/include/d/actor/d_a_obj_tenmado.h index be60e20b5..37fa369f2 100644 --- a/include/d/actor/d_a_obj_tenmado.h +++ b/include/d/actor/d_a_obj_tenmado.h @@ -11,9 +11,9 @@ namespace daObjTenmado { void CreateHeap(); s32 Create(); - void Mthd_Create(); + cPhs_State Mthd_Create(); BOOL Delete(); - void Mthd_Delete(); + BOOL Mthd_Delete(); void set_mtx(); void init_mtx(); void Execute(float(**)[3][4]); diff --git a/include/d/actor/d_a_obj_tide.h b/include/d/actor/d_a_obj_tide.h index f06395912..b03790b66 100644 --- a/include/d/actor/d_a_obj_tide.h +++ b/include/d/actor/d_a_obj_tide.h @@ -11,9 +11,9 @@ namespace daObjTide { void CreateHeap(); s32 Create(); - void Mthd_Create(); + cPhs_State Mthd_Create(); BOOL Delete(); - void Mthd_Delete(); + BOOL Mthd_Delete(); void set_mtx(); void init_mtx(); void move_to_aim(float, bool); diff --git a/include/d/actor/d_a_obj_timer.h b/include/d/actor/d_a_obj_timer.h index ae7561e60..d766bd0a6 100644 --- a/include/d/actor/d_a_obj_timer.h +++ b/include/d/actor/d_a_obj_timer.h @@ -26,7 +26,7 @@ namespace daObjTimer { s32 prm_get_time() const { return daObj::PrmAbstract(this, PRM_TIME_W, PRM_TIME_S); } void stopTimer() { mIsStop = true;} - s32 _create(); + cPhs_State _create(); bool _delete(); void mode_wait_init(); void mode_wait(); diff --git a/include/d/actor/d_a_obj_tntrap.h b/include/d/actor/d_a_obj_tntrap.h index 4cb8a6aa8..a2a0f79e7 100644 --- a/include/d/actor/d_a_obj_tntrap.h +++ b/include/d/actor/d_a_obj_tntrap.h @@ -20,7 +20,7 @@ public: void set_tri(int); void chk_event_flg(); void set_em_set_offsetY(); - s32 _create(); + cPhs_State _create(); bool _delete(); void trap_off_wait_act_proc(); void trap_on_wait_act_proc(); diff --git a/include/d/actor/d_a_obj_tousekiki.h b/include/d/actor/d_a_obj_tousekiki.h index af97af3da..515b73fee 100644 --- a/include/d/actor/d_a_obj_tousekiki.h +++ b/include/d/actor/d_a_obj_tousekiki.h @@ -5,7 +5,7 @@ class daObj_Tousekiki_c : public fopAc_ac_c { public: - inline s32 _create(); + inline cPhs_State _create(); inline bool _delete(); inline bool _draw(); inline bool _execute(); diff --git a/include/d/actor/d_a_obj_tower.h b/include/d/actor/d_a_obj_tower.h index 098ff20b9..4ce5a0dcf 100644 --- a/include/d/actor/d_a_obj_tower.h +++ b/include/d/actor/d_a_obj_tower.h @@ -3,11 +3,10 @@ #include "f_op/f_op_actor.h" #include "d/d_bg_w.h" -#include "d/d_com_inf_game.h" class daObjTower_c : public fopAc_ac_c { public: - inline cPhs__Step _create(); + inline cPhs_State _create(); inline bool _delete(); inline bool _draw(); inline bool _execute(); diff --git a/include/d/actor/d_a_obj_trap.h b/include/d/actor/d_a_obj_trap.h index 605e39175..1255770fd 100644 --- a/include/d/actor/d_a_obj_trap.h +++ b/include/d/actor/d_a_obj_trap.h @@ -11,7 +11,7 @@ public: void solidHeapCB(fopAc_ac_c*); void create_heap(); - s32 _create(); + cPhs_State _create(); bool _delete(); void init_mtx(); void set_co_pos(); diff --git a/include/d/actor/d_a_obj_tribox.h b/include/d/actor/d_a_obj_tribox.h index 0715976cc..8d1006199 100644 --- a/include/d/actor/d_a_obj_tribox.h +++ b/include/d/actor/d_a_obj_tribox.h @@ -25,7 +25,7 @@ namespace daObjTribox { void create_block_after(); void create_correct_before(); void create_correct_after(); - s32 _create(); + cPhs_State _create(); bool _delete(); void set_mtx(); void init_mtx(); diff --git a/include/d/actor/d_a_obj_try.h b/include/d/actor/d_a_obj_try.h index 1af900bed..4d80d83a1 100644 --- a/include/d/actor/d_a_obj_try.h +++ b/include/d/actor/d_a_obj_try.h @@ -23,7 +23,7 @@ namespace daObjTry { void init_cc(); void search_sameType(void*, void*); void chk_appear() const; - s32 _create(); + cPhs_State _create(); bool _delete(); void mode_restart_init(); void mode_restart(); diff --git a/include/d/actor/d_a_obj_usovmc.h b/include/d/actor/d_a_obj_usovmc.h index e62bdf38b..52cf0321e 100644 --- a/include/d/actor/d_a_obj_usovmc.h +++ b/include/d/actor/d_a_obj_usovmc.h @@ -7,13 +7,13 @@ namespace daObjUsovmc { class Act_c : public dBgS_MoveBgActor { public: - virtual int CreateHeap() /* override */; - virtual int Create() /* override */; - virtual int Delete() /* override */; - virtual int Execute(Mtx**) /* override */; - virtual int Draw() /* override */; + virtual BOOL CreateHeap() /* override */; + virtual BOOL Create() /* override */; + virtual BOOL Delete() /* override */; + virtual BOOL Execute(Mtx**) /* override */; + virtual BOOL Draw() /* override */; - s32 Mthd_Create(); + cPhs_State Mthd_Create(); BOOL Mthd_Delete(); void set_mtx(); void init_mtx(); diff --git a/include/d/actor/d_a_obj_vfan.h b/include/d/actor/d_a_obj_vfan.h index 4dc060bd2..46ca4cd27 100644 --- a/include/d/actor/d_a_obj_vfan.h +++ b/include/d/actor/d_a_obj_vfan.h @@ -8,7 +8,6 @@ #include "f_op/f_op_actor.h" #include "SSystem/SComponent/c_phase.h" -#include "d/d_bg_w.h" namespace daObjVfan { class Act_c : public dBgS_MoveBgActor { @@ -23,16 +22,16 @@ public: s32 prm_get_swSave() const { return daObj::PrmAbstract(this, PRM_W, PRM_S); } - int CreateHeap(); - int Create(); - s32 Mthd_Create(); - BOOL Delete(); + virtual BOOL CreateHeap(); + virtual BOOL Create(); + cPhs_State Mthd_Create(); + virtual BOOL Delete(); BOOL Mthd_Delete(); void set_mtx(); void init_mtx(); void ParticleSet(); - int Execute(Mtx**); - BOOL Draw(); + virtual BOOL Execute(Mtx**); + virtual BOOL Draw(); public: /* 0x2C8 */ request_of_phase_process_class mPhs; diff --git a/include/d/actor/d_a_obj_vgnfd.h b/include/d/actor/d_a_obj_vgnfd.h index dc46fe21c..8ca82ef57 100644 --- a/include/d/actor/d_a_obj_vgnfd.h +++ b/include/d/actor/d_a_obj_vgnfd.h @@ -18,7 +18,7 @@ public: static BOOL solidHeapCB(fopAc_ac_c*); BOOL create_bdl_brk(int); BOOL create_heap(); - s32 _create(); + cPhs_State _create(); bool _delete(); s32 get_start_demo_idx(); BOOL check_fin(); diff --git a/include/d/actor/d_a_obj_vmc.h b/include/d/actor/d_a_obj_vmc.h index ca87d31f2..49a9015fb 100644 --- a/include/d/actor/d_a_obj_vmc.h +++ b/include/d/actor/d_a_obj_vmc.h @@ -24,7 +24,7 @@ namespace daObjVmc { static BOOL solidHeapCB(fopAc_ac_c*); bool create_heap(); void CreateInit(); - s32 _create(); + cPhs_State _create(); bool _delete(); void set_mtx(); void init_mtx(); diff --git a/include/d/actor/d_a_obj_vmsdz.h b/include/d/actor/d_a_obj_vmsdz.h index 9f1678920..4b00dd91d 100644 --- a/include/d/actor/d_a_obj_vmsdz.h +++ b/include/d/actor/d_a_obj_vmsdz.h @@ -8,7 +8,7 @@ class daObjVmsdz_c : public fopAc_ac_c { public: static BOOL solidHeapCB(fopAc_ac_c*); BOOL create_heap(); - s32 _create(); + cPhs_State _create(); bool _delete(); void init_mtx(); bool _execute(); diff --git a/include/d/actor/d_a_obj_vmsms.h b/include/d/actor/d_a_obj_vmsms.h index d4dda676f..93766dea7 100644 --- a/include/d/actor/d_a_obj_vmsms.h +++ b/include/d/actor/d_a_obj_vmsms.h @@ -10,7 +10,7 @@ public: static BOOL solidHeapCB(fopAc_ac_c*); BOOL create_heap(); - s32 _create(); + cPhs_State _create(); bool _delete(); void init_mtx(); bool _execute(); diff --git a/include/d/actor/d_a_obj_volcano.h b/include/d/actor/d_a_obj_volcano.h index f6ca401d2..992e84b8a 100644 --- a/include/d/actor/d_a_obj_volcano.h +++ b/include/d/actor/d_a_obj_volcano.h @@ -14,9 +14,9 @@ namespace daObjVolcano { void StopFire(); void CreateHeap(); s32 Create(); - void Mthd_Create(); + cPhs_State Mthd_Create(); BOOL Delete(); - void Mthd_Delete(); + BOOL Mthd_Delete(); void set_mtx(); void init_mtx(); void daObjVolcano_fire_demo_wait(); diff --git a/include/d/actor/d_a_obj_vtil.h b/include/d/actor/d_a_obj_vtil.h index c2b103000..b6eca015c 100644 --- a/include/d/actor/d_a_obj_vtil.h +++ b/include/d/actor/d_a_obj_vtil.h @@ -11,7 +11,7 @@ public: void solidHeapCB(fopAc_ac_c*); void create_heap(); - s32 _create(); + cPhs_State _create(); bool _delete(); void tell_agb_attack(); void tell_agb_sink(); diff --git a/include/d/actor/d_a_obj_vyasi.h b/include/d/actor/d_a_obj_vyasi.h index 02d6dd6df..c774df22c 100644 --- a/include/d/actor/d_a_obj_vyasi.h +++ b/include/d/actor/d_a_obj_vyasi.h @@ -34,7 +34,7 @@ namespace daObjVyasi { void process_main(); void solidHeapCB(fopAc_ac_c*); void create_heap(); - s32 _create(); + cPhs_State _create(); bool _delete(); void set_mtx(); void calc_dif_angle(); diff --git a/include/d/actor/d_a_obj_warpt.h b/include/d/actor/d_a_obj_warpt.h index 304445230..fe232099b 100644 --- a/include/d/actor/d_a_obj_warpt.h +++ b/include/d/actor/d_a_obj_warpt.h @@ -45,7 +45,7 @@ public: bool _draw(); void getArg(); void createInit(); - s32 _create(); + cPhs_State _create(); bool _delete(); public: diff --git a/include/d/actor/d_a_obj_wood.h b/include/d/actor/d_a_obj_wood.h index 125719a12..544cb97ad 100644 --- a/include/d/actor/d_a_obj_wood.h +++ b/include/d/actor/d_a_obj_wood.h @@ -7,7 +7,7 @@ namespace daObjWood { class Act_c : public fopAc_ac_c { public: - inline s32 _create(); + inline cPhs_State _create(); inline bool _delete(); inline bool _execute(); inline bool _draw(); @@ -18,7 +18,7 @@ namespace daObjWood { }; namespace Method { - s32 Create(void*); + cPhs_State Create(void*); BOOL Delete(void*); BOOL Execute(void*); BOOL Draw(void*); diff --git a/include/d/actor/d_a_obj_xfuta.h b/include/d/actor/d_a_obj_xfuta.h index bc4296f15..aa2033a6e 100644 --- a/include/d/actor/d_a_obj_xfuta.h +++ b/include/d/actor/d_a_obj_xfuta.h @@ -11,16 +11,16 @@ public: virtual ~Act_c() {} static BOOL solidHeapCB(fopAc_ac_c*); bool create_heap(); - s32 _create(); + cPhs_State _create(); bool _delete(); void set_mtx(); bool _execute(); bool _draw(); - s32 Mthd_Delete(); - s32 Mthd_Create(); - s32 Mthd_Execute(); - s32 Mthd_Draw(); - s32 Mthd_IsDelete(); + BOOL Mthd_Delete(); + cPhs_State Mthd_Create(); + BOOL Mthd_Execute(); + BOOL Mthd_Draw(); + BOOL Mthd_IsDelete(); static const char M_arcname[]; public: diff --git a/include/d/actor/d_a_obj_zouK.h b/include/d/actor/d_a_obj_zouK.h index f54dca1ba..3ed3e43f7 100644 --- a/include/d/actor/d_a_obj_zouK.h +++ b/include/d/actor/d_a_obj_zouK.h @@ -26,7 +26,7 @@ namespace daObjZouk { static BOOL solidHeapCB(fopAc_ac_c*); bool create_heap(); - s32 _create(); + cPhs_State _create(); bool _delete(); void set_mtx(); void texture_scroll(); diff --git a/include/d/actor/d_a_oship.h b/include/d/actor/d_a_oship.h index fa4fdac23..50c269ef6 100644 --- a/include/d/actor/d_a_oship.h +++ b/include/d/actor/d_a_oship.h @@ -55,7 +55,7 @@ public: void createInit(); void _createHeap(); void getArg(); - s32 _create(); + cPhs_State _create(); bool _delete(); public: diff --git a/include/d/actor/d_a_pedestal.h b/include/d/actor/d_a_pedestal.h index 6bdb5e014..a387923c5 100644 --- a/include/d/actor/d_a_pedestal.h +++ b/include/d/actor/d_a_pedestal.h @@ -41,7 +41,7 @@ namespace daPedestal { bool _delete(); BOOL CreateHeap(); void CreateInit(); - s32 _create(); + cPhs_State _create(); int getMyStaffId(); BOOL wakeupCheck(); BOOL finishCheck(); diff --git a/include/d/actor/d_a_pz.h b/include/d/actor/d_a_pz.h index b8ce9703b..1b8ceb51b 100644 --- a/include/d/actor/d_a_pz.h +++ b/include/d/actor/d_a_pz.h @@ -93,7 +93,7 @@ public: bool _draw(); void bodyCreateInit(); void createInit(); - s32 _create(); + cPhs_State _create(); bool _delete(); public: diff --git a/include/d/actor/d_a_race_item.h b/include/d/actor/d_a_race_item.h index 4c51f6a88..444adf39f 100644 --- a/include/d/actor/d_a_race_item.h +++ b/include/d/actor/d_a_race_item.h @@ -10,7 +10,7 @@ public: void set_mtx(); BOOL Delete(); - s32 create(); + cPhs_State create(); BOOL CreateInit(); void checkGet(); inline BOOL execute(); diff --git a/include/d/actor/d_a_rd.h b/include/d/actor/d_a_rd.h index bccc3a861..eda71d26c 100644 --- a/include/d/actor/d_a_rd.h +++ b/include/d/actor/d_a_rd.h @@ -166,7 +166,7 @@ public: bool isLinkControl(); void createInit(); void getArg(); - s32 _create(); + cPhs_State _create(); bool _delete(); /* 0x2AC */ int mMode; diff --git a/include/d/actor/d_a_salvage.h b/include/d/actor/d_a_salvage.h index 484ac35c2..a7a0197da 100644 --- a/include/d/actor/d_a_salvage.h +++ b/include/d/actor/d_a_salvage.h @@ -41,7 +41,7 @@ public: void CreateHeap(); void CreateInit(); - s32 _create(); + cPhs_State _create(); bool _delete(); bool _execute(); void checkOrder(); diff --git a/include/d/actor/d_a_salvage_tbox.h b/include/d/actor/d_a_salvage_tbox.h index f50a236c9..f0c4ead13 100644 --- a/include/d/actor/d_a_salvage_tbox.h +++ b/include/d/actor/d_a_salvage_tbox.h @@ -27,7 +27,7 @@ public: bool _delete(); void CreateHeap(); void CreateInit(); - s32 _create(); + cPhs_State _create(); void set_mtx(); bool _execute(); void initWait(int); diff --git a/include/d/actor/d_a_sbox.h b/include/d/actor/d_a_sbox.h index ebf803ceb..9a777bcf8 100644 --- a/include/d/actor/d_a_sbox.h +++ b/include/d/actor/d_a_sbox.h @@ -20,7 +20,7 @@ public: void lightProc(); void lightInit(); void CreateInit(); - s32 create(); + cPhs_State create(); void demoInitWait(); void demoProcWait(); void demoInitOpen(); diff --git a/include/d/actor/d_a_seatag.h b/include/d/actor/d_a_seatag.h index 26bee87d3..3ee77182a 100644 --- a/include/d/actor/d_a_seatag.h +++ b/include/d/actor/d_a_seatag.h @@ -5,7 +5,7 @@ class daSeatag_c : public fopAc_ac_c { public: - inline s32 create(); + inline cPhs_State create(); inline BOOL draw(); inline BOOL execute(); diff --git a/include/d/actor/d_a_ship.h b/include/d/actor/d_a_ship.h index deac62d8d..f62f87124 100644 --- a/include/d/actor/d_a_ship.h +++ b/include/d/actor/d_a_ship.h @@ -173,7 +173,7 @@ public: BOOL execute(); void shipDelete(); void createHeap(); - s32 create(); + cPhs_State create(); void checkForceMove() const; void initStartPos(cXyz const*, s16); diff --git a/include/d/actor/d_a_shutter.h b/include/d/actor/d_a_shutter.h index 9b839934f..b2c61fdf5 100644 --- a/include/d/actor/d_a_shutter.h +++ b/include/d/actor/d_a_shutter.h @@ -10,8 +10,8 @@ class daShutter_c : public fopAc_ac_c { public: bool _delete(); BOOL CreateHeap(); - s32 Create(); - s32 _create(); + BOOL Create(); + cPhs_State _create(); void set_mtx(); bool _execute(); void shutter_move(); diff --git a/include/d/actor/d_a_shutter2.h b/include/d/actor/d_a_shutter2.h index 1a5149a32..1198f80f4 100644 --- a/include/d/actor/d_a_shutter2.h +++ b/include/d/actor/d_a_shutter2.h @@ -6,15 +6,15 @@ class daShutter2_c : public dBgS_MoveBgActor { public: - BOOL Delete(); - int CreateHeap(); - int Create(); - s32 _create(); + virtual BOOL Delete(); + virtual BOOL CreateHeap(); + virtual BOOL Create(); + cPhs_State _create(); void set_mtx(); - int Execute(Mtx**); + virtual BOOL Execute(Mtx**); void shutter_move(); void demo(); - BOOL Draw(); + virtual BOOL Draw(); /* 0x00 */ static const float m_max_speed[1]; /* 0x04 */ static const float m_min_speed[1]; diff --git a/include/d/actor/d_a_sie_flag.h b/include/d/actor/d_a_sie_flag.h index 9e8204611..4382e0417 100644 --- a/include/d/actor/d_a_sie_flag.h +++ b/include/d/actor/d_a_sie_flag.h @@ -11,7 +11,7 @@ public: void set_mtx(); void CreateHeap(); void CreateInit(); - s32 _create(); + cPhs_State _create(); bool _delete(); bool _execute(); bool _draw(); diff --git a/include/d/actor/d_a_spc_item01.h b/include/d/actor/d_a_spc_item01.h index 4ab035729..e13c651fd 100644 --- a/include/d/actor/d_a_spc_item01.h +++ b/include/d/actor/d_a_spc_item01.h @@ -7,7 +7,7 @@ class daSpcItem01_c : public daItemBase_c { public: void set_mtx(); BOOL _delete(); - s32 _create(); + cPhs_State _create(); BOOL CreateInit(); BOOL _execute(); void set_effect(); diff --git a/include/d/actor/d_a_spotbox.h b/include/d/actor/d_a_spotbox.h index e0f03e2a5..724d622a0 100644 --- a/include/d/actor/d_a_spotbox.h +++ b/include/d/actor/d_a_spotbox.h @@ -6,7 +6,7 @@ class daSpotbox_c : public fopAc_ac_c { public: - inline s32 create(); + inline cPhs_State create(); inline BOOL draw(); inline BOOL execute(); inline u32 getType() { return fopAcM_GetParam(this) & 1; } diff --git a/include/d/actor/d_a_steam_tag.h b/include/d/actor/d_a_steam_tag.h index 7ef0d3e76..f3587d6e0 100644 --- a/include/d/actor/d_a_steam_tag.h +++ b/include/d/actor/d_a_steam_tag.h @@ -24,7 +24,7 @@ struct daSteamTag_mData { class daSteamTag_c : public fopAc_ac_c { public: ~daSteamTag_c(); - inline s32 create(); + inline cPhs_State create(); inline BOOL draw(); inline BOOL execute(); diff --git a/include/d/actor/d_a_stone.h b/include/d/actor/d_a_stone.h index 80475a3d8..1f5d2f5d6 100644 --- a/include/d/actor/d_a_stone.h +++ b/include/d/actor/d_a_stone.h @@ -23,7 +23,7 @@ namespace daStone { void create_heap(); void chk_appear(); - s32 _create(); + cPhs_State _create(); bool _delete(); void mode_wait_init(); void mode_wait(); @@ -67,7 +67,7 @@ namespace daStone { }; namespace Method { - s32 Create(void*); + cPhs_State Create(void*); BOOL Delete(void*); BOOL Execute(void*); BOOL Draw(void*); diff --git a/include/d/actor/d_a_stone2.h b/include/d/actor/d_a_stone2.h index 9e6babcc4..449f2206d 100644 --- a/include/d/actor/d_a_stone2.h +++ b/include/d/actor/d_a_stone2.h @@ -23,9 +23,9 @@ namespace daStone2 { void CreateHeap(); s32 Create(); void chk_appear(); - void Mthd_Create(); + cPhs_State Mthd_Create(); BOOL Delete(); - void Mthd_Delete(); + BOOL Mthd_Delete(); void set_mtx(); void init_mtx(); void cull_set_draw(); diff --git a/include/d/actor/d_a_swattack.h b/include/d/actor/d_a_swattack.h index 081036de3..39d8c8249 100644 --- a/include/d/actor/d_a_swattack.h +++ b/include/d/actor/d_a_swattack.h @@ -7,7 +7,7 @@ class daSwAt_c : public fopAc_ac_c { public: - s32 _create(); + cPhs_State _create(); bool _execute(); bool _draw(); bool _delete(); diff --git a/include/d/actor/d_a_swhit0.h b/include/d/actor/d_a_swhit0.h index 9af1a38e2..bdce06eeb 100644 --- a/include/d/actor/d_a_swhit0.h +++ b/include/d/actor/d_a_swhit0.h @@ -25,7 +25,7 @@ public: void decisionRtType(); s32 CreateInit(); - s32 create(); + cPhs_State create(); s32 checkHit(); s32 DemoProc(); diff --git a/include/d/actor/d_a_switem.h b/include/d/actor/d_a_switem.h index 5245e8fee..a2002e070 100644 --- a/include/d/actor/d_a_switem.h +++ b/include/d/actor/d_a_switem.h @@ -9,7 +9,7 @@ class daSwItem_c : public fopAc_ac_c { public: bool _delete(); BOOL CreateInit(); - s32 _create(); + cPhs_State _create(); bool _execute(); BOOL isRupeeInAllCreateTable(int); bool _draw(); diff --git a/include/d/actor/d_a_swpropeller.h b/include/d/actor/d_a_swpropeller.h index 30144b96a..595a4245c 100644 --- a/include/d/actor/d_a_swpropeller.h +++ b/include/d/actor/d_a_swpropeller.h @@ -10,7 +10,7 @@ public: bool _delete(); void CreateHeap(); void CreateInit(); - s32 _create(); + cPhs_State _create(); void set_mtx(); bool _execute(); bool _draw(); diff --git a/include/d/actor/d_a_swtact.h b/include/d/actor/d_a_swtact.h index 087c300e5..7f98149d9 100644 --- a/include/d/actor/d_a_swtact.h +++ b/include/d/actor/d_a_swtact.h @@ -14,7 +14,7 @@ public: void CreateInit(); void set_mtx(); s32 getAnswer(); - s32 _create(); + cPhs_State _create(); bool _execute(); bool _draw(); diff --git a/include/d/actor/d_a_tag_attention.h b/include/d/actor/d_a_tag_attention.h index 8d3fbd098..10eca4f81 100644 --- a/include/d/actor/d_a_tag_attention.h +++ b/include/d/actor/d_a_tag_attention.h @@ -10,7 +10,7 @@ namespace daTagAttention { void prm_get_Type() const {} void prm_get_swSave() const {} - s32 _create(); + cPhs_State _create(); bool _execute(); public: diff --git a/include/d/actor/d_a_tag_ba1.h b/include/d/actor/d_a_tag_ba1.h index e868a8f10..54b84edcc 100644 --- a/include/d/actor/d_a_tag_ba1.h +++ b/include/d/actor/d_a_tag_ba1.h @@ -11,7 +11,7 @@ public: bool _draw(); bool _execute(); bool _delete(); - s32 _create(); + cPhs_State _create(); public: /* Place member variables here */ diff --git a/include/d/actor/d_a_tag_etc.h b/include/d/actor/d_a_tag_etc.h index 26d57806f..d4a654929 100644 --- a/include/d/actor/d_a_tag_etc.h +++ b/include/d/actor/d_a_tag_etc.h @@ -17,7 +17,7 @@ public: BOOL otherCheck(fopAc_ac_c*); void demoProc(); void demoInitProc(); - s32 create(); + cPhs_State create(); public: /* 0x290 */ u8 mAction; diff --git a/include/d/actor/d_a_tag_event.h b/include/d/actor/d_a_tag_event.h index 325c185b4..6611797cd 100644 --- a/include/d/actor/d_a_tag_event.h +++ b/include/d/actor/d_a_tag_event.h @@ -20,7 +20,7 @@ public: ACTION_MJ_READY = 0xB, }; - inline s32 create(); + inline cPhs_State create(); inline BOOL draw(); inline BOOL execute(); diff --git a/include/d/actor/d_a_tag_evsw.h b/include/d/actor/d_a_tag_evsw.h index 6273b942e..45dbb67ef 100644 --- a/include/d/actor/d_a_tag_evsw.h +++ b/include/d/actor/d_a_tag_evsw.h @@ -24,7 +24,7 @@ namespace daTagEvsw { u16 prm_get_eventbitID() const { return daObj::PrmAbstract(this, PRM_EVENTBITID_W, PRM_EVENTBITID_S); } u16 prm_get_Type() const { return daObj::PrmAbstract(this, PRM_TYPE_W, PRM_TYPE_S); } - s32 _create(); + cPhs_State _create(); bool _delete(); bool _execute(); bool _draw(); diff --git a/include/d/actor/d_a_tag_ghostship.h b/include/d/actor/d_a_tag_ghostship.h index a1ffd2490..ae9287938 100644 --- a/include/d/actor/d_a_tag_ghostship.h +++ b/include/d/actor/d_a_tag_ghostship.h @@ -20,7 +20,7 @@ public: bool _execute(); bool _draw(); void getArg(); - s32 _create(); + cPhs_State _create(); bool _delete(); public: diff --git a/include/d/actor/d_a_tag_hint.h b/include/d/actor/d_a_tag_hint.h index 17224b9ab..1162574f2 100644 --- a/include/d/actor/d_a_tag_hint.h +++ b/include/d/actor/d_a_tag_hint.h @@ -6,7 +6,7 @@ class daTag_Hint_c : public fopAc_ac_c { public: void chkFlag(unsigned short) {} - inline s32 create(); + inline cPhs_State create(); inline BOOL draw(); inline BOOL execute(); void setActio(unsigned char) {} diff --git a/include/d/actor/d_a_tag_island.h b/include/d/actor/d_a_tag_island.h index 7541c9354..c00d6e8ef 100644 --- a/include/d/actor/d_a_tag_island.h +++ b/include/d/actor/d_a_tag_island.h @@ -17,7 +17,7 @@ public: void clrFlag(u16 flag) { mFlag &= ~flag; } void setFlag(u16 flag) { mFlag |= flag; } - inline s32 create(); + inline cPhs_State create(); inline BOOL draw(); inline BOOL execute(); void setActio(u8 action) { mAction = action; } diff --git a/include/d/actor/d_a_tag_kb_item.h b/include/d/actor/d_a_tag_kb_item.h index 7d44289b6..ccef375f7 100644 --- a/include/d/actor/d_a_tag_kb_item.h +++ b/include/d/actor/d_a_tag_kb_item.h @@ -11,7 +11,7 @@ public: void dig_main(); bool _delete(); void CreateInit(); - int _create(); + cPhs_State _create(); bool _execute(); bool _draw(); diff --git a/include/d/actor/d_a_tag_kf1.h b/include/d/actor/d_a_tag_kf1.h index 9f628e23a..a22435b46 100644 --- a/include/d/actor/d_a_tag_kf1.h +++ b/include/d/actor/d_a_tag_kf1.h @@ -29,7 +29,7 @@ public: bool _draw(); bool _execute(); bool _delete(); - s32 _create(); + cPhs_State _create(); public: /* Place member variables here */ diff --git a/include/d/actor/d_a_tag_kk1.h b/include/d/actor/d_a_tag_kk1.h index ab8d06627..96cb1240e 100644 --- a/include/d/actor/d_a_tag_kk1.h +++ b/include/d/actor/d_a_tag_kk1.h @@ -9,7 +9,7 @@ public: bool _draw(); bool _execute(); bool _delete(); - s32 _create(); + cPhs_State _create(); public: /* Place member variables here */ diff --git a/include/d/actor/d_a_tag_light.h b/include/d/actor/d_a_tag_light.h index 69c2cce45..1d1cdd45d 100644 --- a/include/d/actor/d_a_tag_light.h +++ b/include/d/actor/d_a_tag_light.h @@ -40,7 +40,7 @@ namespace daTagLight { void get_cc_r() const; void solidHeapCB(fopAc_ac_c*); void create_heap(); - s32 _create(); + cPhs_State _create(); bool _delete(); void chk_sw() const; void chk_sch() const; diff --git a/include/d/actor/d_a_tag_md_cb.h b/include/d/actor/d_a_tag_md_cb.h index 65d89fa1c..06cdb0552 100644 --- a/include/d/actor/d_a_tag_md_cb.h +++ b/include/d/actor/d_a_tag_md_cb.h @@ -11,7 +11,7 @@ public: void onEventAccept() {} void setTimer(short) {} - s32 create(); + cPhs_State create(); void init(); void checkTimer(); void checkEventFinish(); diff --git a/include/d/actor/d_a_tag_mk.h b/include/d/actor/d_a_tag_mk.h index af2b94de7..62a3f1163 100644 --- a/include/d/actor/d_a_tag_mk.h +++ b/include/d/actor/d_a_tag_mk.h @@ -5,7 +5,7 @@ class daTag_Mk_c : public fopAc_ac_c { public: - inline s32 create(); + inline cPhs_State create(); inline BOOL draw(); void setAction(unsigned char) {} diff --git a/include/d/actor/d_a_tag_msg.h b/include/d/actor/d_a_tag_msg.h index efeb5d519..833dc7612 100644 --- a/include/d/actor/d_a_tag_msg.h +++ b/include/d/actor/d_a_tag_msg.h @@ -7,7 +7,7 @@ class daTag_Msg_c : public fopAc_ac_c { public: typedef BOOL (ActionFunc)(daTag_Msg_c*); - inline s32 create(); + inline cPhs_State create(); inline BOOL draw(); inline BOOL execute(); void setActio(u8 action) { mAction = action; } diff --git a/include/d/actor/d_a_tag_photo.h b/include/d/actor/d_a_tag_photo.h index 869abdaec..972265be0 100644 --- a/include/d/actor/d_a_tag_photo.h +++ b/include/d/actor/d_a_tag_photo.h @@ -9,7 +9,7 @@ public: void getTagNo() {} - s32 _create(); + cPhs_State _create(); void createHeap(); void createInit(); bool _delete(); diff --git a/include/d/actor/d_a_tag_ret.h b/include/d/actor/d_a_tag_ret.h index cd669e16f..8e02fdd1a 100644 --- a/include/d/actor/d_a_tag_ret.h +++ b/include/d/actor/d_a_tag_ret.h @@ -12,7 +12,7 @@ namespace daTagRet { PRM_LINK_ID_S = 0, }; - s32 _create(); + cPhs_State _create(); bool _delete(); void set_mtx(); bool _execute(); diff --git a/include/d/actor/d_a_tag_so.h b/include/d/actor/d_a_tag_so.h index 6fbfde41b..a83a4d6ae 100644 --- a/include/d/actor/d_a_tag_so.h +++ b/include/d/actor/d_a_tag_so.h @@ -15,7 +15,7 @@ public: void debugDraw(); bool _draw(); void getArg(); - s32 _create(); + cPhs_State _create(); bool _delete(); public: diff --git a/include/d/actor/d_a_tag_volcano.h b/include/d/actor/d_a_tag_volcano.h index 057d5648c..1f552950f 100644 --- a/include/d/actor/d_a_tag_volcano.h +++ b/include/d/actor/d_a_tag_volcano.h @@ -23,7 +23,7 @@ namespace daTagvolcano { u32 prm_get_timer() const { return daObj::PrmAbstract(this, PRM_TIMER_W, PRM_TIMER_S); } u32 prm_get_type() const { return daObj::PrmAbstract(this, PRM_TYPE_W, PRM_TYPE_S); } - s32 _create(); + cPhs_State _create(); bool check_timer_clear(); bool _delete(); bool _execute(); diff --git a/include/d/actor/d_a_tag_waterlevel.h b/include/d/actor/d_a_tag_waterlevel.h index 57d4743a7..8761ac500 100644 --- a/include/d/actor/d_a_tag_waterlevel.h +++ b/include/d/actor/d_a_tag_waterlevel.h @@ -20,7 +20,7 @@ namespace daTagWaterlevel { static State_e get_state() { return M_state; } inline u8 prm_get_sch() const { return daObj::PrmAbstract(this, PRM_SCH_W, PRM_SCH_S); } - s32 _create(); + cPhs_State _create(); bool _delete(); void bgm_proc(); bool _execute(); diff --git a/include/d/actor/d_a_tama.h b/include/d/actor/d_a_tama.h index d153ce9de..0aa031f81 100644 --- a/include/d/actor/d_a_tama.h +++ b/include/d/actor/d_a_tama.h @@ -15,7 +15,7 @@ public: BOOL _draw(); BOOL _execute(); BOOL _delete(); - s32 _create(); + cPhs_State _create(); public: /* 0x290 */ fpc_ProcID mPartnerID; diff --git a/include/d/actor/d_a_title.h b/include/d/actor/d_a_title.h index fecc66c8f..8285f2e83 100644 --- a/include/d/actor/d_a_title.h +++ b/include/d/actor/d_a_title.h @@ -56,7 +56,7 @@ class daTitle_c : public fopAc_ac_c { public: inline ~daTitle_c(); - inline s32 create(); + inline cPhs_State create(); inline BOOL draw(); inline BOOL execute(); diff --git a/include/d/actor/d_a_toge.h b/include/d/actor/d_a_toge.h index a7ef6ac9c..7b766262d 100644 --- a/include/d/actor/d_a_toge.h +++ b/include/d/actor/d_a_toge.h @@ -12,7 +12,7 @@ public: BOOL _delete(); BOOL CreateHeap(); BOOL Create(); - s32 _create(); + cPhs_State _create(); BOOL _execute(); void set_collision(); void search_wind(); diff --git a/include/d/actor/d_a_tori_flag.h b/include/d/actor/d_a_tori_flag.h index 697a0fd58..a32051aa7 100644 --- a/include/d/actor/d_a_tori_flag.h +++ b/include/d/actor/d_a_tori_flag.h @@ -23,7 +23,7 @@ class daTori_Flag_HIO_c { class daTori_Flag_c : public fopAc_ac_c { public: - inline s32 _create(); + inline cPhs_State _create(); inline bool _delete(); inline bool _draw(); inline bool _execute(); diff --git a/include/d/actor/d_a_tornado.h b/include/d/actor/d_a_tornado.h index dde5ce040..4474210af 100644 --- a/include/d/actor/d_a_tornado.h +++ b/include/d/actor/d_a_tornado.h @@ -26,7 +26,7 @@ public: BOOL execute(); BOOL tornado_delete(); BOOL createHeap(); - s32 create(); + cPhs_State create(); public: /* 0x290 */ request_of_phase_process_class mPhs; diff --git a/include/d/actor/d_a_tpota.h b/include/d/actor/d_a_tpota.h index 9de24c9c5..52f4d20b0 100644 --- a/include/d/actor/d_a_tpota.h +++ b/include/d/actor/d_a_tpota.h @@ -7,7 +7,7 @@ class JPABaseParticle; class daTpota_c : public fopAc_ac_c { public: - s32 _create(); + cPhs_State _create(); bool _delete(); void make_ripple(cXyz); void check_water_h(JPABaseParticle*, float); diff --git a/include/d/actor/d_a_tsubo.h b/include/d/actor/d_a_tsubo.h index ab0e345f9..876fbcf8b 100644 --- a/include/d/actor/d_a_tsubo.h +++ b/include/d/actor/d_a_tsubo.h @@ -74,7 +74,7 @@ namespace daTsubo { void create_init_cull(); void create_init_cc(); void create_init_bgc(); - s32 _create(); + cPhs_State _create(); void _is_delete(); bool _delete(); void spec_make_boko(int); @@ -234,7 +234,7 @@ namespace daTsubo { }; // Size: 0xF00 namespace Method { - s32 Create(void*); + cPhs_State Create(void*); BOOL Delete(void*); BOOL Execute(void*); BOOL Draw(void*); diff --git a/include/d/actor/d_a_wall.h b/include/d/actor/d_a_wall.h index 8de4d6594..c00de7157 100644 --- a/include/d/actor/d_a_wall.h +++ b/include/d/actor/d_a_wall.h @@ -13,7 +13,7 @@ public: bool _delete(); BOOL CreateHeap(); void CreateInit(); - s32 _create(); + cPhs_State _create(); void set_mtx(); void setMoveBGMtx(); bool _execute(); diff --git a/include/d/actor/d_a_warpdm20.h b/include/d/actor/d_a_warpdm20.h index d1ddc55b7..cc558f08b 100644 --- a/include/d/actor/d_a_warpdm20.h +++ b/include/d/actor/d_a_warpdm20.h @@ -10,7 +10,7 @@ public: bool _delete(); void CreateHeap(); void CreateInit(); - s32 _create(); + cPhs_State _create(); bool _execute(); void normal_execute(); void demo_execute(); diff --git a/include/d/actor/d_a_warpf.h b/include/d/actor/d_a_warpf.h index 25cf6c9f6..3f1af2cd7 100644 --- a/include/d/actor/d_a_warpf.h +++ b/include/d/actor/d_a_warpf.h @@ -10,7 +10,7 @@ public: void checkEndDemo(); void onEndDemo(); void CreateInit(); - s32 _create(); + cPhs_State _create(); bool _execute(); void eventOrder(); void checkOrder(); diff --git a/include/d/actor/d_a_warpfout.h b/include/d/actor/d_a_warpfout.h index 106fa1561..aa0b28d70 100644 --- a/include/d/actor/d_a_warpfout.h +++ b/include/d/actor/d_a_warpfout.h @@ -12,7 +12,7 @@ public: bool _delete(); void CreateInit(); - s32 _create(); + cPhs_State _create(); bool _execute(); void checkOrder(); void eventOrder(); diff --git a/include/d/actor/d_a_warpgn.h b/include/d/actor/d_a_warpgn.h index b47b143e1..6387a3751 100644 --- a/include/d/actor/d_a_warpgn.h +++ b/include/d/actor/d_a_warpgn.h @@ -10,7 +10,7 @@ public: bool _delete(); void CreateHeap(); void CreateInit(); - s32 _create(); + cPhs_State _create(); bool _execute(); void normal_execute(); void demo_execute(); diff --git a/include/d/actor/d_a_warphr.h b/include/d/actor/d_a_warphr.h index f44ec7914..f2274778c 100644 --- a/include/d/actor/d_a_warphr.h +++ b/include/d/actor/d_a_warphr.h @@ -10,7 +10,7 @@ public: bool _delete(); void CreateHeap(); void CreateInit(); - s32 _create(); + cPhs_State _create(); bool _execute(); void normal_execute(); void demo_execute(); diff --git a/include/d/actor/d_a_warpls.h b/include/d/actor/d_a_warpls.h index 86a0e4eba..62543203c 100644 --- a/include/d/actor/d_a_warpls.h +++ b/include/d/actor/d_a_warpls.h @@ -11,7 +11,7 @@ public: bool _delete(); void CreateHeap(); void CreateInit(); - s32 _create(); + cPhs_State _create(); bool _execute(); void checkOrder(); void eventOrder(); diff --git a/include/d/actor/d_a_warpmj.h b/include/d/actor/d_a_warpmj.h index 0df8f284e..cd58c7b3e 100644 --- a/include/d/actor/d_a_warpmj.h +++ b/include/d/actor/d_a_warpmj.h @@ -10,7 +10,7 @@ public: bool _delete(); void CreateHeap(); void CreateInit(); - s32 _create(); + cPhs_State _create(); bool _execute(); void normal_execute(); void demo_execute(); diff --git a/include/d/actor/d_a_waterfall.h b/include/d/actor/d_a_waterfall.h index 085b83688..b847ceea8 100644 --- a/include/d/actor/d_a_waterfall.h +++ b/include/d/actor/d_a_waterfall.h @@ -10,7 +10,7 @@ public: bool _delete(); void CreateHeap(); void CreateInit(); - s32 _create(); + cPhs_State _create(); void set_mtx(); void set_gate_mtx(); void set_minamo_mtx(); diff --git a/include/d/actor/d_a_wbird.h b/include/d/actor/d_a_wbird.h index e5c2ab5c2..c68f571cb 100644 --- a/include/d/actor/d_a_wbird.h +++ b/include/d/actor/d_a_wbird.h @@ -12,7 +12,7 @@ public: void calcMtx(); void setStartPos(); void CreateInit(); - s32 create(); + cPhs_State create(); void actionWait(); void actionEnd(); void actionMove(); diff --git a/include/d/actor/d_a_wind_tag.h b/include/d/actor/d_a_wind_tag.h index 1bc3614ea..6d3a04e0f 100644 --- a/include/d/actor/d_a_wind_tag.h +++ b/include/d/actor/d_a_wind_tag.h @@ -22,7 +22,7 @@ namespace daWindTag { BOOL CreateHeap(); void CreateInit(); void set_wind_angle(); - s32 _create(); + cPhs_State _create(); void set_mtx(); bool checkSizeSpecialBig(); void set_wind_se_sub(unsigned long, cXyz*); diff --git a/include/d/actor/d_a_windmill.h b/include/d/actor/d_a_windmill.h index cb74fb4fd..99e509afc 100644 --- a/include/d/actor/d_a_windmill.h +++ b/include/d/actor/d_a_windmill.h @@ -17,7 +17,7 @@ public: BOOL CreateHeap(); void CreateInit(); void search_wind(); - s32 _create(); + cPhs_State _create(); void set_mtx(); bool _execute(); void hane_move(); diff --git a/include/d/actor/d_a_ygcwp.h b/include/d/actor/d_a_ygcwp.h index bdefc89d5..87c387ffc 100644 --- a/include/d/actor/d_a_ygcwp.h +++ b/include/d/actor/d_a_ygcwp.h @@ -12,7 +12,7 @@ public: static BOOL solidHeapCB(fopAc_ac_c*); BOOL create_heap(); - s32 _create(); + cPhs_State _create(); bool _delete(); void init_mtx(); void make_shine(); diff --git a/include/d/actor/d_a_ykgr.h b/include/d/actor/d_a_ykgr.h index 063dd7b25..8ee54cc71 100644 --- a/include/d/actor/d_a_ykgr.h +++ b/include/d/actor/d_a_ykgr.h @@ -29,7 +29,7 @@ public: static dPath* m_path; static JPABaseEmitter* m_emitter; - inline s32 _create(); + inline cPhs_State _create(); inline bool _delete(); inline bool _draw(); inline bool _execute(); diff --git a/include/d/d_bg_s_movebg_actor.h b/include/d/d_bg_s_movebg_actor.h index 8f3e0bcfa..503b455b2 100644 --- a/include/d/d_bg_s_movebg_actor.h +++ b/include/d/d_bg_s_movebg_actor.h @@ -18,22 +18,22 @@ public: /* 0x2C4 */ /* vtable */ dBgS_MoveBgActor(); - int MoveBGCreateHeap(); - int MoveBGCreate(char const* resName, int resIndex, MoveBGActor_SetFunc callback, u32 resSize); - int MoveBGDelete(); - int MoveBGExecute(); + BOOL MoveBGCreateHeap(); + cPhs_State MoveBGCreate(char const* resName, int resIndex, MoveBGActor_SetFunc callback, u32 resSize); + BOOL MoveBGDelete(); + BOOL MoveBGExecute(); - int MoveBGDraw() { return Draw(); } - int MoveBGIsDelete() { return IsDelete(); } + BOOL MoveBGDraw() { return Draw(); } + BOOL MoveBGIsDelete() { return IsDelete(); } - virtual int CreateHeap() { return 1; } - virtual int Create() { return 1; } - virtual int Execute(Mtx**) { return 1; } - virtual int Draw() { return 1; } - virtual int Delete() { return 1; } - virtual int IsDelete() { return 1; } - virtual int ToFore() { return 1; } - virtual int ToBack() { return 1; } + virtual BOOL CreateHeap() { return TRUE; } + virtual BOOL Create() { return TRUE; } + virtual BOOL Execute(Mtx**) { return TRUE; } + virtual BOOL Draw() { return TRUE; } + virtual BOOL Delete() { return TRUE; } + virtual BOOL IsDelete() { return TRUE; } + virtual BOOL ToFore() { return TRUE; } + virtual BOOL ToBack() { return TRUE; } static const char* m_name; static int m_dzb_id; diff --git a/include/d/d_com_inf_game.h b/include/d/d_com_inf_game.h index 1f21fd522..5af85f621 100644 --- a/include/d/d_com_inf_game.h +++ b/include/d/d_com_inf_game.h @@ -3199,7 +3199,7 @@ inline void dComIfGp_setFmapData(void * pData) { g_dComIfG_gameInfo.play.setFmap */ class request_of_phase_process_class; -int dComIfG_resLoad(request_of_phase_process_class* i_phase, char const* arc_name); +cPhs_State dComIfG_resLoad(request_of_phase_process_class* i_phase, char const* arc_name); int dComIfG_resLoad(request_of_phase_process_class* i_phase, char const* resName, JKRHeap* heap); int dComIfG_resDelete(request_of_phase_process_class* i_phase, char const* resName); @@ -3607,7 +3607,7 @@ inline u8 dComIfG_getBrightness() { return g_dComIfG_gameInfo.mBrightness; } inline void dComIfG_setBrightness(u8 v) { g_dComIfG_gameInfo.mBrightness = v; } class scene_class; -int dComIfG_resetToOpening(scene_class* i_scene); +BOOL dComIfG_resetToOpening(scene_class* i_scene); int dComIfG_changeOpeningScene(scene_class* i_scene, s16 i_procName); diff --git a/include/d/d_com_lib_game.h b/include/d/d_com_lib_game.h index baf163b71..1b12bf92a 100644 --- a/include/d/d_com_lib_game.h +++ b/include/d/d_com_lib_game.h @@ -3,6 +3,6 @@ #include "SSystem/SComponent/c_phase.h" -int dComLbG_PhaseHandler(request_of_phase_process_class*, request_of_phase_process_fn*, void*); +cPhs_State dComLbG_PhaseHandler(request_of_phase_process_class*, request_of_phase_process_fn*, void*); #endif /* D_COM_LIB_GAME */ diff --git a/include/d/d_gameover.h b/include/d/d_gameover.h index 5dc01a484..921381808 100644 --- a/include/d/d_gameover.h +++ b/include/d/d_gameover.h @@ -79,7 +79,7 @@ public: void animeStart() { mAnimeStart = true; } void setBackAlpha(f32 alpha) { dgo_scrn_c->setAlpha(alpha); } - s32 _create(); + cPhs_State _create(); BOOL _execute(); BOOL _draw(); BOOL _delete(); diff --git a/include/d/d_resorce.h b/include/d/d_resorce.h index 9fbe412d2..d26ecfce2 100644 --- a/include/d/d_resorce.h +++ b/include/d/d_resorce.h @@ -1,9 +1,9 @@ #ifndef D_D_RESORCE_H #define D_D_RESORCE_H +#include "JSystem/JKernel/JKRArchive.h" #include "dolphin/types.h" #include "global.h" -#include "JSystem/JKernel/JKRMemArchive.h" class JKRArchive; class JKRHeap; @@ -48,7 +48,7 @@ class dRes_control_c { public: dRes_control_c() {} ~dRes_control_c(); - static int setRes(char const*, dRes_info_c*, int, char const*, u8, JKRHeap*); + static BOOL setRes(char const*, dRes_info_c*, int, char const*, u8, JKRHeap*); static int syncRes(char const*, dRes_info_c*, int); static int deleteRes(char const*, dRes_info_c*, int); static void* getRes(char const*, char const*, dRes_info_c*, int); @@ -58,11 +58,11 @@ public: static void* getRes(char const*, s32, dRes_info_c*, int); static void* getIDRes(char const*, u16, dRes_info_c*, int); static int syncAllRes(dRes_info_c*, int); - int setStageRes(char const*, JKRHeap*); + BOOL setStageRes(char const*, JKRHeap*); void dump(); int getObjectResName2Index(char const*, char const*); - int setObjectRes(const char* name, u8 direction, JKRHeap* heap) { + BOOL setObjectRes(const char* name, u8 direction, JKRHeap* heap) { return setRes(name, &mObjectInfo[0], ARRAY_SIZE(mObjectInfo), "/res/Object/", direction, heap); } diff --git a/include/d/d_s_name.h b/include/d/d_s_name.h index f8f8f82df..fa9ca7c04 100644 --- a/include/d/d_s_name.h +++ b/include/d/d_s_name.h @@ -67,7 +67,7 @@ public: class dScnName_c : public scene_class { public: ~dScnName_c(); - s32 create(); + cPhs_State create(); void cloth_create(); void cloth_move(); void cloth2D_create(); diff --git a/include/d/d_s_open.h b/include/d/d_s_open.h index d6f48988b..06f33e7e4 100644 --- a/include/d/d_s_open.h +++ b/include/d/d_s_open.h @@ -68,7 +68,7 @@ class dScnOpen_c : public scene_class { public: ~dScnOpen_c(); void changeGameScene(); - s32 create(); + cPhs_State create(); BOOL draw(); BOOL execute(); diff --git a/include/d/d_throwstone.h b/include/d/d_throwstone.h index 893bfda95..d245abd08 100644 --- a/include/d/d_throwstone.h +++ b/include/d/d_throwstone.h @@ -7,7 +7,7 @@ class daThrowstone_c : public fopAc_ac_c { public: BOOL CreateHeap(); - inline s32 _create(); + inline cPhs_State _create(); inline bool _delete(); inline bool _execute(); inline bool _draw(); diff --git a/include/d/d_timer.h b/include/d/d_timer.h index fd6de599d..b13354f29 100644 --- a/include/d/d_timer.h +++ b/include/d/d_timer.h @@ -62,7 +62,7 @@ public: class dTimer_c : public msg_class { public: - s32 _create(); + cPhs_State _create(); BOOL _execute(); BOOL _draw(); BOOL _delete(); diff --git a/include/d/d_wind_arrow.h b/include/d/d_wind_arrow.h index 0ed605e74..025e0bb7f 100644 --- a/include/d/d_wind_arrow.h +++ b/include/d/d_wind_arrow.h @@ -18,7 +18,7 @@ public: class dWindArrow_c : public kankyo_class { public: inline ~dWindArrow_c(); - inline s32 create(); + inline cPhs_State create(); inline BOOL execute(); BOOL createHeap(); void adjustHeap(); diff --git a/include/d/d_wpot_water.h b/include/d/d_wpot_water.h index 8d31a233c..05b3af3b9 100644 --- a/include/d/d_wpot_water.h +++ b/include/d/d_wpot_water.h @@ -15,7 +15,7 @@ public: class dWpotWater_c : public kankyo_class { public: - inline s32 create(); + inline cPhs_State create(); inline BOOL draw(); inline BOOL execute(); diff --git a/include/dolphin/os/OS.h b/include/dolphin/os/OS.h index 52a14a8d1..9fce29771 100644 --- a/include/dolphin/os/OS.h +++ b/include/dolphin/os/OS.h @@ -93,8 +93,6 @@ extern BOOL __OSIsGcam; extern u32 BOOT_REGION_START AT_ADDRESS(0x812FDFF0); extern u32 BOOT_REGION_END AT_ADDRESS(0x812FDFEC); -void OSReportInit__Fv(void); // needed for inline asm - u8* OSGetStackPointer(void); void __OSFPRInit(void); static void InquiryCallback(s32 param_0, DVDCommandBlock* param_1); diff --git a/include/f_op/f_op_actor_iter.h b/include/f_op/f_op_actor_iter.h index be2e4efc2..1c0469a68 100644 --- a/include/f_op/f_op_actor_iter.h +++ b/include/f_op/f_op_actor_iter.h @@ -1,10 +1,12 @@ #ifndef F_OP_ACTOR_ITER_H_ #define F_OP_ACTOR_ITER_H_ +#include "dolphin/types.h" + typedef int (*fopAcIt_ExecutorFunc)(void*, void*); typedef void* (*fopAcIt_JudgeFunc)(void*, void*); -int fopAcIt_Executor(fopAcIt_ExecutorFunc, void*); +BOOL fopAcIt_Executor(fopAcIt_ExecutorFunc, void*); void* fopAcIt_Judge(fopAcIt_JudgeFunc, void*); -#endif \ No newline at end of file +#endif diff --git a/include/f_op/f_op_actor_mng.h b/include/f_op/f_op_actor_mng.h index 0a299fb42..0db808de2 100644 --- a/include/f_op/f_op_actor_mng.h +++ b/include/f_op/f_op_actor_mng.h @@ -447,9 +447,9 @@ void fopAcM_setStageLayer(void* p_proc); void fopAcM_setRoomLayer(void* p_proc, int roomNo); -s32 fopAcM_SearchByID(fpc_ProcID id, fopAc_ac_c** p_actor); +BOOL fopAcM_SearchByID(fpc_ProcID id, fopAc_ac_c** p_actor); -s32 fopAcM_SearchByName(s16 procName, fopAc_ac_c** p_actor); +BOOL fopAcM_SearchByName(s16 procName, fopAc_ac_c** p_actor); fopAcM_prm_class* fopAcM_CreateAppend(); @@ -459,8 +459,8 @@ fopAcM_prm_class* createAppend(u16 enemyNo, u32 parameters, cXyz* p_pos, int roo void fopAcM_Log(fopAc_ac_c* p_actor, char* str); -s32 fopAcM_delete(fopAc_ac_c* p_actor); -s32 fopAcM_delete(fpc_ProcID actorID); +BOOL fopAcM_delete(fopAc_ac_c* p_actor); +BOOL fopAcM_delete(fpc_ProcID actorID); fpc_ProcID fopAcM_create(s16 i_procName, u32 i_parameter, cXyz* i_pos = NULL, int i_roomNo = -1, csXyz* i_angle = NULL, cXyz* i_scale = NULL, s8 i_subType = -1, diff --git a/include/f_op/f_op_camera_mng.h b/include/f_op/f_op_camera_mng.h index 95d04e27b..2ad981680 100644 --- a/include/f_op/f_op_camera_mng.h +++ b/include/f_op/f_op_camera_mng.h @@ -41,7 +41,7 @@ inline f32 fopCamM_GetFovy(camera_class* i_camera) { return i_camera->mFovy; } -fpc_ProcID fopCamM_Create(int i_cameraIdx, s16 pProcName, void* param_3); +fpc_ProcID fopCamM_Create(int i_cameraIdx, s16 pProcName, void* i_append); void fopCamM_Management(void); u32 fopCamM_GetParam(camera_class* pCamera); void fopCamM_Init(void); diff --git a/include/f_op/f_op_overlap_mng.h b/include/f_op/f_op_overlap_mng.h index f64961191..7e5f1f097 100644 --- a/include/f_op/f_op_overlap_mng.h +++ b/include/f_op/f_op_overlap_mng.h @@ -25,15 +25,15 @@ struct overlap_process_profile_definition { int fopOvlpM_SceneIsStop(); int fopOvlpM_SceneIsStart(); void fopOvlpM_Management(); -int fopOvlpM_IsOutReq(overlap_task_class* i_this); +BOOL fopOvlpM_IsOutReq(overlap_task_class* i_this); void fopOvlpM_Done(overlap_task_class* i_this); void fopOvlpM_ToldAboutID(fpc_ProcID pid); -int fopOvlpM_IsPeek(); -int fopOvlpM_IsDone(); -int fopOvlpM_IsDoingReq(); -int fopOvlpM_ClearOfReq(); +BOOL fopOvlpM_IsPeek(); +BOOL fopOvlpM_IsDone(); +BOOL fopOvlpM_IsDoingReq(); +BOOL fopOvlpM_ClearOfReq(); request_base_class* fopOvlpM_Request(s16 procName, u16 peekTime); int fopOvlpM_Cancel(); void fopOvlpM_Init(); -#endif \ No newline at end of file +#endif diff --git a/include/f_op/f_op_overlap_req.h b/include/f_op/f_op_overlap_req.h index 1e79fd89b..9be744862 100644 --- a/include/f_op/f_op_overlap_req.h +++ b/include/f_op/f_op_overlap_req.h @@ -25,9 +25,9 @@ public: /* 0x24 */ layer_class* pCurrentLayer; }; -int fopOvlpReq_OverlapClr(overlap_request_class* param_1); +BOOL fopOvlpReq_OverlapClr(overlap_request_class* param_1); overlap_request_class* fopOvlpReq_Request(overlap_request_class*, s16, u16); -s32 fopOvlpReq_Handler(overlap_request_class*); +cPhs_State fopOvlpReq_Handler(overlap_request_class*); BOOL fopOvlpReq_Cancel(overlap_request_class*); BOOL fopOvlpReq_Is_PeektimeLimit(overlap_request_class*); diff --git a/include/f_op/f_op_scene_mng.h b/include/f_op/f_op_scene_mng.h index a21361039..bb14472ca 100644 --- a/include/f_op/f_op_scene_mng.h +++ b/include/f_op/f_op_scene_mng.h @@ -7,7 +7,7 @@ typedef struct base_process_class base_process_class; scene_class* fopScnM_SearchByID(fpc_ProcID id); -int fopScnM_ChangeReq(scene_class*, s16, s16, u16); +BOOL fopScnM_ChangeReq(scene_class*, s16, s16, u16); BOOL fopScnM_DeleteReq(scene_class*); BOOL fopScnM_CreateReq(s16, s16, u16, u32); u32 fopScnM_ReRequest(s16, u32); diff --git a/include/f_op/f_op_scene_req.h b/include/f_op/f_op_scene_req.h index 655c948c1..596075378 100644 --- a/include/f_op/f_op_scene_req.h +++ b/include/f_op/f_op_scene_req.h @@ -5,11 +5,6 @@ class scene_class; -extern "C" { -void fopScnRq_Handler__Fv(void); -void fopScnRq_ReRequest(void); -} - class scene_request_class { public: node_create_request mCrtReq; @@ -18,9 +13,8 @@ public: u8 field_0x70[4]; }; -// cPhs__Step fopScnRq_phase_ClearOverlap(scene_request_class* param_1); uint fopScnRq_Request(int, scene_class*, s16, void*, s16, u16); s32 fopScnRq_ReRequest(uint, s16, void*); s32 fopScnRq_Handler(void); -#endif \ No newline at end of file +#endif diff --git a/include/f_pc/f_pc_base.h b/include/f_pc/f_pc_base.h index b78e5cb48..1f4a40af1 100644 --- a/include/f_pc/f_pc_base.h +++ b/include/f_pc/f_pc_base.h @@ -10,12 +10,8 @@ typedef unsigned int fpc_ProcID; -typedef struct create_request create_request; -typedef struct process_method_class process_method_class; -typedef struct profile_method_class profile_method_class; - typedef struct base_process_class { - /* 0x00 */ u32 mBsType; + /* 0x00 */ int mBsType; /* 0x04 */ fpc_ProcID mBsPcId; /* 0x08 */ s16 mProcName; /* 0x0A */ s8 mUnk0; @@ -32,22 +28,17 @@ typedef struct base_process_class { /* 0xA8 */ process_method_class* mpPcMtd; /* 0xAC */ void* mpUserData; /* 0xB0 */ u32 mParameters; - /* 0xB4 */ u32 mSubType; + /* 0xB4 */ int mSubType; } base_process_class; // Size: 0xB8 BOOL fpcBs_Is_JustOfType(int pType1, int pType2); -s32 fpcBs_MakeOfType(int* pType); +int fpcBs_MakeOfType(int* pType); fpc_ProcID fpcBs_MakeOfId(void); -s32 fpcBs_Execute(base_process_class* pProc); +BOOL fpcBs_Execute(base_process_class* pProc); void fpcBs_DeleteAppend(base_process_class* pProc); -s32 fpcBs_IsDelete(base_process_class* pProc); -s32 fpcBs_Delete(base_process_class* pProc); +BOOL fpcBs_IsDelete(base_process_class* pProc); +BOOL fpcBs_Delete(base_process_class* pProc); base_process_class* fpcBs_Create(s16 pProcTypeID, fpc_ProcID pProcID, void* pData); -s32 fpcBs_SubCreate(base_process_class* pProc); - -extern "C" { -void fpcBs_MakeOfType__FPi(void); -void fpcBs_Is_JustOfType__Fii(void); -} +cPhs_State fpcBs_SubCreate(base_process_class* pProc); #endif diff --git a/include/f_pc/f_pc_create_iter.h b/include/f_pc/f_pc_create_iter.h index f9c7dd2a2..ebc9cef23 100644 --- a/include/f_pc/f_pc_create_iter.h +++ b/include/f_pc/f_pc_create_iter.h @@ -9,11 +9,6 @@ typedef struct create_tag create_tag; typedef int (*fpcCtIt_MethodFunc)(void*, void*); typedef void* (*fpcCtIt_JudgeFunc)(void*, void*); -typedef struct node_method_data { - fpcCtIt_MethodFunc mFunc; - void* mpUserData; -} node_method_data; - typedef struct node_judge_data { fpcCtIt_JudgeFunc mFunc; void* mpUserData; @@ -25,7 +20,7 @@ typedef struct fpcCtIt_jilprm_c { void* mpUserData; } fpcCtIt_jilprm_c; -s32 fpcCtIt_Method(fpcCtIt_MethodFunc pJudge, void* pUserData); +BOOL fpcCtIt_Method(fpcCtIt_MethodFunc pJudge, void* pUserData); void* fpcCtIt_Judge(fpcCtIt_JudgeFunc pJudge, void* pUserData); void* fpcCtIt_filter_JudgeInLayer(create_tag*, fpcCtIt_jilprm_c*); void* fpcCtIt_JudgeInLayer(uint i_layerID, fpcCtIt_JudgeFunc i_judgeFunc, void* i_data); diff --git a/include/f_pc/f_pc_create_req.h b/include/f_pc/f_pc_create_req.h index e8043eca8..301f70643 100644 --- a/include/f_pc/f_pc_create_req.h +++ b/include/f_pc/f_pc_create_req.h @@ -35,8 +35,8 @@ void fpcCtRq_CreateQTo(create_request* pReq); void fpcCtRq_ToCreateQ(create_request* pReq); BOOL fpcCtRq_Delete(create_request* pReq); BOOL fpcCtRq_Cancel(create_request* pReq); -s32 fpcCtRq_IsDoing(create_request* pReq); -s32 fpcCtRq_Handler(void); +BOOL fpcCtRq_IsDoing(create_request* pReq); +BOOL fpcCtRq_Handler(void); create_request* fpcCtRq_Create(layer_class* pLayer, u32 size, create_request_method_class* pCtRqMtd); diff --git a/include/f_pc/f_pc_create_tag.h b/include/f_pc/f_pc_create_tag.h index 845e37856..0d33bd54b 100644 --- a/include/f_pc/f_pc_create_tag.h +++ b/include/f_pc/f_pc_create_tag.h @@ -6,8 +6,8 @@ #include "SSystem/SComponent/c_tag.h" typedef struct create_tag { - create_tag_class base; -} create_tag; + /* 0x00 */ create_tag_class base; +} create_tag; // Size: 0x14 void fpcCtTg_ToCreateQ(create_tag* pTag); void fpcCtTg_CreateQTo(create_tag* pTag); diff --git a/include/f_pc/f_pc_creator.h b/include/f_pc/f_pc_creator.h index 902e457f8..534a68962 100644 --- a/include/f_pc/f_pc_creator.h +++ b/include/f_pc/f_pc_creator.h @@ -8,8 +8,8 @@ typedef struct base_process_class base_process_class; BOOL fpcCt_IsCreatingByID(fpc_ProcID id); -s32 fpcCt_IsDoing(base_process_class* pProc); +BOOL fpcCt_IsDoing(base_process_class* pProc); BOOL fpcCt_Abort(base_process_class* pProc); -s32 fpcCt_Handler(void); +BOOL fpcCt_Handler(void); #endif diff --git a/include/f_pc/f_pc_deletor.h b/include/f_pc/f_pc_deletor.h index ebe81a41a..a8dfdb055 100644 --- a/include/f_pc/f_pc_deletor.h +++ b/include/f_pc/f_pc_deletor.h @@ -7,9 +7,9 @@ typedef struct base_process_class base_process_class; BOOL fpcDt_IsComplete(void); -s32 fpcDt_ToDeleteQ(base_process_class* pProc); -s32 fpcDt_ToQueue(base_process_class* pProc); +BOOL fpcDt_ToDeleteQ(base_process_class* pProc); +BOOL fpcDt_ToQueue(base_process_class* pProc); void fpcDt_Handler(void); -s32 fpcDt_Delete(void* pProc); +BOOL fpcDt_Delete(void* pProc); #endif diff --git a/include/f_pc/f_pc_draw.h b/include/f_pc/f_pc_draw.h index b62024269..87fc4a73b 100644 --- a/include/f_pc/f_pc_draw.h +++ b/include/f_pc/f_pc_draw.h @@ -5,10 +5,10 @@ typedef struct base_process_class base_process_class; -typedef int (*fpcDw_HandlerFunc)(void*, void*); -typedef int (*fpcDw_HandlerFuncFunc)(fpcDw_HandlerFunc); +typedef BOOL (*fpcDw_HandlerFunc)(void*, void*); +typedef BOOL (*fpcDw_HandlerFuncFunc)(fpcDw_HandlerFunc); -s32 fpcDw_Execute(base_process_class* pProc); -s32 fpcDw_Handler(fpcDw_HandlerFuncFunc param_1, fpcDw_HandlerFunc param_2); +BOOL fpcDw_Execute(base_process_class* i_proc); +BOOL fpcDw_Handler(fpcDw_HandlerFuncFunc i_iterHandler, fpcDw_HandlerFunc i_func); -#endif \ No newline at end of file +#endif diff --git a/include/f_pc/f_pc_executor.h b/include/f_pc/f_pc_executor.h index a820d7393..3258c3c55 100644 --- a/include/f_pc/f_pc_executor.h +++ b/include/f_pc/f_pc_executor.h @@ -12,17 +12,13 @@ base_process_class* fpcEx_Search(fpcLyIt_JudgeFunc pFunc, void* pUserData); base_process_class* fpcEx_SearchByID(fpc_ProcID id); BOOL fpcEx_IsExist(fpc_ProcID id); s32 fpcEx_ToLineQ(base_process_class* pProc); -s32 fpcEx_ExecuteQTo(base_process_class* pProc); -s32 fpcEx_Execute(base_process_class* pProc); -s32 fpcEx_ToExecuteQ(base_process_class* pProc); +BOOL fpcEx_ExecuteQTo(base_process_class* pProc); +BOOL fpcEx_Execute(base_process_class* pProc); +BOOL fpcEx_ToExecuteQ(base_process_class* pProc); void fpcEx_Handler(fpcLnIt_QueueFunc pFunc); inline base_process_class* fpcM_Search(fpcLyIt_JudgeFunc pFunc, void* pUserData) { return fpcEx_Search(pFunc, pUserData); } -extern "C" { -void fpcEx_IsExist__FUi(void); -} - #endif diff --git a/include/f_pc/f_pc_fstcreate_req.h b/include/f_pc/f_pc_fstcreate_req.h index 16484a78b..f425e68b5 100644 --- a/include/f_pc/f_pc_fstcreate_req.h +++ b/include/f_pc/f_pc_fstcreate_req.h @@ -14,10 +14,10 @@ typedef struct fast_create_request { /* 0x4C */ void* mpFastCreateData; } fast_create_request; // Size: 0x50 -s32 fpcFCtRq_Do(fast_create_request* pFstCreateReq); -s32 fpcFCtRq_Delete(fast_create_request*); +cPhs_State fpcFCtRq_Do(fast_create_request* pFstCreateReq); +BOOL fpcFCtRq_Delete(fast_create_request*); base_process_class* fpcFCtRq_Request(layer_class* pLayer, s16 pProcTypeID, fstCreateFunc pFastCreateFunc, void* pFastCreateData, void* pData); -#endif \ No newline at end of file +#endif diff --git a/include/f_pc/f_pc_layer.h b/include/f_pc/f_pc_layer.h index ea8e7dfbf..4fc1276e8 100644 --- a/include/f_pc/f_pc_layer.h +++ b/include/f_pc/f_pc_layer.h @@ -41,7 +41,7 @@ s32 fpcLy_IntoQueue(layer_class* pLayer, int treeListIdx, create_tag_class* pTag s32 fpcLy_ToQueue(layer_class* pLayer, int treeListIdx, create_tag_class* pTag); s32 fpcLy_QueueTo(layer_class* pLayer, create_tag_class* pTag); -s32 fpcLy_Cancel(layer_class* pLayer); +BOOL fpcLy_Cancel(layer_class* pLayer); bool fpcLy_CancelMethod(process_method_tag_class* pLayer); void fpcLy_CancelQTo(process_method_tag_class* pMthd); @@ -49,6 +49,6 @@ s32 fpcLy_ToCancelQ(layer_class* pLayer, process_method_tag_class* pMthd); void fpcLy_Create(layer_class* pLayer, void* pPcNode, node_list_class* pLists, int listNum); -s32 fpcLy_Delete(layer_class* pLayer); +BOOL fpcLy_Delete(layer_class* pLayer); #endif diff --git a/include/f_pc/f_pc_layer_iter.h b/include/f_pc/f_pc_layer_iter.h index 25f75a034..514302119 100644 --- a/include/f_pc/f_pc_layer_iter.h +++ b/include/f_pc/f_pc_layer_iter.h @@ -5,16 +5,11 @@ typedef struct layer_class layer_class; -typedef struct layer_iter { - void* mpFunc; - void* mpUserData; -} layer_iter; - typedef int (*fpcLyIt_OnlyHereFunc)(void*, void*); typedef void* (*fpcLyIt_JudgeFunc)(void*, void*); -s32 fpcLyIt_OnlyHere(layer_class* pLayer, fpcLyIt_OnlyHereFunc pFunc, void* pUserData); -s32 fpcLyIt_OnlyHereLY(layer_class* pLayer, fpcLyIt_OnlyHereFunc pFunc, void* pUserData); +BOOL fpcLyIt_OnlyHere(layer_class* pLayer, fpcLyIt_OnlyHereFunc pFunc, void* pUserData); +BOOL fpcLyIt_OnlyHereLY(layer_class* pLayer, fpcLyIt_OnlyHereFunc pFunc, void* pUserData); void* fpcLyIt_Judge(layer_class* pLayer, fpcLyIt_JudgeFunc pFunc, void* pUserData); void* fpcLyIt_AllJudge(fpcLyIt_JudgeFunc pFunc, void* pUserData); diff --git a/include/f_pc/f_pc_layer_tag.h b/include/f_pc/f_pc_layer_tag.h index 7aa9bf095..a9c736beb 100644 --- a/include/f_pc/f_pc_layer_tag.h +++ b/include/f_pc/f_pc_layer_tag.h @@ -20,11 +20,11 @@ typedef struct layer_management_tag_class { u16 mNodeListIdx; } layer_management_tag_class; -s32 fpcLyTg_QueueTo(layer_management_tag_class* i_lyTag); -s32 fpcLyTg_ToQueue(layer_management_tag_class* i_lyTag, uint i_layerID, u16 i_listID, - u16 i_listPriority); -s32 fpcLyTg_Move(layer_management_tag_class* i_lyTag, uint i_layerID, u16 i_listID, - u16 i_listPriority); -s32 fpcLyTg_Init(layer_management_tag_class* i_lyTag, uint i_layerID, void* i_data); +BOOL fpcLyTg_QueueTo(layer_management_tag_class* i_lyTag); +BOOL fpcLyTg_ToQueue(layer_management_tag_class* i_lyTag, uint i_layerID, u16 i_listID, + u16 i_listPriority); +BOOL fpcLyTg_Move(layer_management_tag_class* i_lyTag, uint i_layerID, u16 i_listID, + u16 i_listPriority); +BOOL fpcLyTg_Init(layer_management_tag_class* i_lyTag, uint i_layerID, void* i_data); #endif diff --git a/include/f_pc/f_pc_leaf.h b/include/f_pc/f_pc_leaf.h index 3f79104ca..bd9e57829 100644 --- a/include/f_pc/f_pc_leaf.h +++ b/include/f_pc/f_pc_leaf.h @@ -27,12 +27,12 @@ typedef struct leaf_process_profile_definition { } leaf_process_profile_definition; s16 fpcLf_GetPriority(leafdraw_class* pLeaf); -s32 fpcLf_DrawMethod(leafdraw_method_class* pMthd, void* pUserData); -s32 fpcLf_Draw(leafdraw_class* pMthd); -s32 fpcLf_Execute(leafdraw_class* pLeaf); -s32 fpcLf_IsDelete(leafdraw_class* pLeaf); -s32 fpcLf_Delete(leafdraw_class* pLeaf); -s32 fpcLf_Create(leafdraw_class* pLeaf); +BOOL fpcLf_DrawMethod(leafdraw_method_class* pMthd, void* pUserData); +BOOL fpcLf_Draw(leafdraw_class* pMthd); +BOOL fpcLf_Execute(leafdraw_class* pLeaf); +BOOL fpcLf_IsDelete(leafdraw_class* pLeaf); +BOOL fpcLf_Delete(leafdraw_class* pLeaf); +cPhs_State fpcLf_Create(leafdraw_class* pLeaf); extern int g_fpcLf_type; extern leafdraw_method_class g_fpcLf_Method; diff --git a/include/f_pc/f_pc_load.h b/include/f_pc/f_pc_load.h index 3fdbdf56a..91ad147da 100644 --- a/include/f_pc/f_pc_load.h +++ b/include/f_pc/f_pc_load.h @@ -2,11 +2,12 @@ #ifndef F_PC_LOAD_H_ #define F_PC_LOAD_H_ +#include "SSystem/SComponent/c_phase.h" #include "dolphin/types.h" BOOL fpcLd_Use(s16 procName); -s32 fpcLd_IsLoaded(s16 procName); +BOOL fpcLd_IsLoaded(s16 procName); void fpcLd_Free(s16 procName); -s32 fpcLd_Load(s16 procName); +cPhs_State fpcLd_Load(s16 procName); #endif diff --git a/include/f_pc/f_pc_manager.h b/include/f_pc/f_pc_manager.h index 04362fd61..533115fea 100644 --- a/include/f_pc/f_pc_manager.h +++ b/include/f_pc/f_pc_manager.h @@ -78,10 +78,10 @@ inline s8 fpcM_CreateResult(void* pProc) { return ((base_process_class*)pProc)->mCreateResult; } -void fpcM_Draw(void* pProc); -s32 fpcM_DrawIterater(fpcM_DrawIteraterFunc pFunc); -s32 fpcM_Execute(void* pProc); -s32 fpcM_Delete(void* pProc); +BOOL fpcM_Draw(void* pProc); +BOOL fpcM_DrawIterater(fpcM_DrawIteraterFunc pFunc); +BOOL fpcM_Execute(void* pProc); +BOOL fpcM_Delete(void* pProc); BOOL fpcM_IsCreating(fpc_ProcID pID); void fpcM_Management(fpcM_ManagementFunc pFunc1, fpcM_ManagementFunc pFunc2); void fpcM_Init(void); @@ -92,8 +92,4 @@ void fpcM_PauseEnable(void* pProc, u8 i_flag); void fpcM_PauseDisable(void* pProc, u8 i_flag); void* fpcM_JudgeInLayer(uint i_layerID, fpcCtIt_JudgeFunc i_judgeFunc, void* i_data); -extern "C" { -void fpcM_Delete__FPv(void); -} - #endif diff --git a/include/f_pc/f_pc_method.h b/include/f_pc/f_pc_method.h index eb34133fd..bad955c9c 100644 --- a/include/f_pc/f_pc_method.h +++ b/include/f_pc/f_pc_method.h @@ -3,6 +3,7 @@ #define F_PC_METHOD_H_ #include "dolphin/types.h" +#include "SSystem/SComponent/c_phase.h" typedef int (*process_method_func)(void*); @@ -13,10 +14,10 @@ typedef struct process_method_class { process_method_func mpIsDeleteFunc; } process_method_class; -s32 fpcMtd_Method(process_method_func pFunc, void* pUserData); -s32 fpcMtd_Execute(process_method_class* pMthd, void* pUserData); -s32 fpcMtd_IsDelete(process_method_class* pMthd, void* pUserData); -s32 fpcMtd_Delete(process_method_class* pMthd, void* pUserData); -s32 fpcMtd_Create(process_method_class* pMthd, void* pUserData); +int fpcMtd_Method(process_method_func pFunc, void* pUserData); +BOOL fpcMtd_Execute(process_method_class* pMthd, void* pUserData); +BOOL fpcMtd_IsDelete(process_method_class* pMthd, void* pUserData); +BOOL fpcMtd_Delete(process_method_class* pMthd, void* pUserData); +cPhs_State fpcMtd_Create(process_method_class* pMthd, void* pUserData); #endif diff --git a/include/f_pc/f_pc_method_iter.h b/include/f_pc/f_pc_method_iter.h index c85838254..ff8f08ab9 100644 --- a/include/f_pc/f_pc_method_iter.h +++ b/include/f_pc/f_pc_method_iter.h @@ -8,6 +8,6 @@ typedef struct node_list_class node_list_class; typedef int (*fpcMtdIt_MethodFunc)(void*); -int fpcMtdIt_Method(node_list_class* pList, fpcMtdIt_MethodFunc pMethod); +BOOL fpcMtdIt_Method(node_list_class* pList, fpcMtdIt_MethodFunc pMethod); #endif diff --git a/include/f_pc/f_pc_method_tag.h b/include/f_pc/f_pc_method_tag.h index 54fd6c7d5..411f4a130 100644 --- a/include/f_pc/f_pc_method_tag.h +++ b/include/f_pc/f_pc_method_tag.h @@ -4,15 +4,15 @@ #include "SSystem/SComponent/c_tag.h" -typedef int (*process_method_tag_func)(void*); +typedef BOOL (*process_method_tag_func)(void*); typedef struct process_method_tag_class { - create_tag_class mCreateTag; - process_method_tag_func mpFunc; - void* mpMthdData; -} process_method_tag_class; + /* 0x00 */ create_tag_class mCreateTag; + /* 0x14 */ process_method_tag_func mpFunc; + /* 0x18 */ void* mpMthdData; +} process_method_tag_class; // Size: 0x1C -s32 fpcMtdTg_Do(process_method_tag_class* pMthd); +BOOL fpcMtdTg_Do(process_method_tag_class* pMthd); s32 fpcMtdTg_ToMethodQ(node_list_class* pList, process_method_tag_class* pMthd); void fpcMtdTg_MethodQTo(process_method_tag_class* pMthd); s32 fpcMtdTg_Init(process_method_tag_class* pMthd, process_method_tag_func pFunc, void* pMthdData); diff --git a/include/f_pc/f_pc_node.h b/include/f_pc/f_pc_node.h index c055a30b9..079f06dcc 100644 --- a/include/f_pc/f_pc_node.h +++ b/include/f_pc/f_pc_node.h @@ -25,14 +25,14 @@ typedef struct node_process_profile_definition { /* 0x1C */ process_method_class* sub_method; // Subclass methods } node_process_profile_definition; -s32 fpcNd_DrawMethod(nodedraw_method_class* pNodeMethod, void* pData); -s32 fpcNd_Draw(process_node_class* pProcNode); -s32 fpcNd_Execute(process_node_class* pProcNode); +BOOL fpcNd_DrawMethod(nodedraw_method_class* pNodeMethod, void* pData); +BOOL fpcNd_Draw(process_node_class* pProcNode); +BOOL fpcNd_Execute(process_node_class* pProcNode); void* fpcNd_IsCreatingFromUnder(void* pProcNode); -s32 fpcNd_IsDeleteTiming(process_node_class* pProcNode); -s32 fpcNd_IsDelete(process_node_class* pProcNode); -s32 fpcNd_Delete(process_node_class* pProcNode); -s32 fpcNd_Create(process_node_class* pProcNode); +BOOL fpcNd_IsDeleteTiming(process_node_class* pProcNode); +BOOL fpcNd_IsDelete(process_node_class* pProcNode); +BOOL fpcNd_Delete(process_node_class* pProcNode); +cPhs_State fpcNd_Create(process_node_class* pProcNode); extern int g_fpcNd_type; extern nodedraw_method_class g_fpcNd_Method; diff --git a/include/f_pc/f_pc_node_req.h b/include/f_pc/f_pc_node_req.h index f70a08f15..9a2d3dff6 100644 --- a/include/f_pc/f_pc_node_req.h +++ b/include/f_pc/f_pc_node_req.h @@ -10,32 +10,31 @@ typedef struct layer_class layer_class; typedef struct process_node_class process_node_class; typedef struct node_create_request_method_class { - process_method_func mpExecuteFunc; - process_method_func mpCancelFunc; - process_method_func mpUnkFunc; - process_method_func mpPostMethodFunc; -} node_create_request_method_class; + /* 0x00 */ process_method_func mpExecuteFunc; + /* 0x04 */ process_method_func mpCancelFunc; + /* 0x08 */ process_method_func mpUnkFunc; + /* 0x0C */ process_method_func mpPostMethodFunc; +} node_create_request_method_class; // Size: 0x10 // needed to match struct copy typedef struct unk_process_node_class { - process_node_class* mpNodeProc; - fpc_ProcID mProcId; -} unk_process_node_class; + /* 0x00 */ process_node_class* mpNodeProc; + /* 0x04 */ fpc_ProcID mProcId; +} unk_process_node_class; // Size: 0x08 typedef struct node_create_request { - create_tag_class mCreateTag; - process_method_tag_class mProcMthCls; - request_of_phase_process_class mReqPhsProc; - cPhs__Handler* mpPhsHandler; - node_create_request_method_class* mpNodeCrReqMthCls; - s32 mParameter; - uint mRequestId; - unk_process_node_class mNodeProc; - layer_class* mpLayerClass; - fpc_ProcID mCreatingID; - s16 mProcName; - void* mpUserData; - s16 unk_0x60; - + /* 0x00 */ create_tag_class mCreateTag; + /* 0x14 */ process_method_tag_class mProcMthCls; + /* 0x30 */ request_of_phase_process_class mReqPhsProc; + /* 0x38 */ cPhs__Handler* mpPhsHandler; + /* 0x3C */ node_create_request_method_class* mpNodeCrReqMthCls; + /* 0x40 */ s32 mParameter; + /* 0x44 */ uint mRequestId; + /* 0x48 */ unk_process_node_class mNodeProc; + /* 0x50 */ layer_class* mpLayerClass; + /* 0x54 */ fpc_ProcID mCreatingID; + /* 0x58 */ s16 mProcName; + /* 0x5C */ void* mpUserData; + /* 0x60 */ s16 unk_0x60; } node_create_request; // Size: 0x64 typedef struct request_node_class { @@ -45,15 +44,15 @@ typedef struct request_node_class { void fpcNdRq_RequestQTo(node_create_request* pNodeCreateReq); void fpcNdRq_ToRequestQ(node_create_request* pNodeCreateReq); -s32 fpcNdRq_phase_IsCreated(node_create_request* pNodeCreateReq); -s32 fpcNdRq_phase_Create(node_create_request* pNodeCreateReq); -s32 fpcNdRq_phase_IsDeleteTiming(node_create_request* pNodeCreateReq); -s32 fpcNdRq_phase_IsDeleted(node_create_request* pNodeCreateReq); -s32 fpcNdRq_phase_Delete(node_create_request* pNodeCreateReq); -s32 fpcNdRq_DoPhase(node_create_request* pNodeCreateReq); -s32 fpcNdRq_Execute(node_create_request* pNodeCreateReq); -s32 fpcNdRq_Delete(node_create_request* pNodeCreateReq); -s32 fpcNdRq_Cancel(node_create_request* pNodeCreateReq); +cPhs_State fpcNdRq_phase_IsCreated(node_create_request* pNodeCreateReq); +cPhs_State fpcNdRq_phase_Create(node_create_request* pNodeCreateReq); +cPhs_State fpcNdRq_phase_IsDeleteTiming(node_create_request* pNodeCreateReq); +cPhs_State fpcNdRq_phase_IsDeleted(node_create_request* pNodeCreateReq); +cPhs_State fpcNdRq_phase_Delete(node_create_request* pNodeCreateReq); +cPhs_State fpcNdRq_DoPhase(node_create_request* pNodeCreateReq); +cPhs_State fpcNdRq_Execute(node_create_request* pNodeCreateReq); +BOOL fpcNdRq_Delete(node_create_request* pNodeCreateReq); +BOOL fpcNdRq_Cancel(node_create_request* pNodeCreateReq); s32 fpcNdRq_Handler(void); s32 fpcNdRq_IsPossibleTarget(process_node_class* pProcNode); s32 fpcNdRq_IsIng(process_node_class* pProcNode); @@ -68,4 +67,4 @@ fpcNdRq_Request(u32 param_1, int param_2, process_node_class* param_3, s16 param s32 fpcNdRq_ReChangeNode(uint i_requestID, s16 i_procName, void* i_data); s32 fpcNdRq_ReRequest(uint i_requestID, s16 i_procName, void* i_data); -#endif \ No newline at end of file +#endif diff --git a/include/f_pc/f_pc_priority.h b/include/f_pc/f_pc_priority.h index 85a45184c..0436996dc 100644 --- a/include/f_pc/f_pc_priority.h +++ b/include/f_pc/f_pc_priority.h @@ -22,11 +22,11 @@ typedef struct process_priority_class { /* 0x38 */ process_priority_queue_info mInfoCurr; } process_priority_class; -s32 fpcPi_IsInQueue(process_priority_class* pPi); +BOOL fpcPi_IsInQueue(process_priority_class* pPi); s32 fpcPi_QueueTo(process_priority_class* pPi); s32 fpcPi_ToQueue(process_priority_class* pPi); process_priority_class* fpcPi_GetFromQueue(void); -s32 fpcPi_Delete(process_priority_class* pPi); +BOOL fpcPi_Delete(process_priority_class* pPi); s32 fpcPi_IsNormal(uint i_layer, u16 i_listID, u16 i_priority); s32 fpcPi_Change(process_priority_class* i_procPriority, uint i_layer, u16 i_listID, u16 i_priority); diff --git a/include/f_pc/f_pc_profile.h b/include/f_pc/f_pc_profile.h index 9418d9f64..d7b055504 100644 --- a/include/f_pc/f_pc_profile.h +++ b/include/f_pc/f_pc_profile.h @@ -3,20 +3,17 @@ #define F_PC_PROFILE_H_ #include "dolphin/types.h" - -typedef struct nodedraw_method_class nodedraw_method_class; -typedef struct leafdraw_method_class leafdraw_method_class; -typedef struct process_method_class process_method_class; +#include "f_pc/f_pc_method.h" typedef struct process_profile_definition { - /* 0x00 */ s32 mLayerID; + /* 0x00 */ uint mLayerID; /* 0x04 */ u16 mListID; /* 0x06 */ u16 mListPrio; /* 0x08 */ s16 mProcName; /* 0x0C */ process_method_class* sub_method; // Subclass methods /* 0x10 */ s32 mSize; /* 0x14 */ s32 mSizeOther; - /* 0x18 */ s32 mParameters; + /* 0x18 */ u32 mParameters; } process_profile_definition; #define LAYER_DEFAULT (-2) diff --git a/include/f_pc/f_pc_searcher.h b/include/f_pc/f_pc_searcher.h index 7ef9b7ed6..73839dade 100644 --- a/include/f_pc/f_pc_searcher.h +++ b/include/f_pc/f_pc_searcher.h @@ -8,10 +8,6 @@ void* fpcSch_JudgeForPName(void* pProc, void* pUserData); void* fpcSch_JudgeByID(void* pProc, void* pUserData); -extern "C" { -void fpcSch_JudgeForPName__FPvPv(void); -} - inline base_process_class* fpcM_SearchByName(s16 name) { return (base_process_class*)fpcLyIt_AllJudge(fpcSch_JudgeForPName, &name); } diff --git a/include/f_pc/f_pc_stdcreate_req.h b/include/f_pc/f_pc_stdcreate_req.h index 71ff5d46d..2be311618 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 int (*stdCreateFunc)(void*, void*); +typedef BOOL (*stdCreateFunc)(void*, void*); typedef struct standard_create_request_class { /* 0x00 */ create_request base; @@ -16,14 +16,15 @@ typedef struct standard_create_request_class { /* 0x5C */ void* mpCallBackUserData; } standard_create_request_class; -s32 fpcSCtRq_phase_CreateProcess(standard_create_request_class* pStdCreateReq); -s32 fpcSCtRq_phase_SubCreateProcess(standard_create_request_class* pStdCreateReq); -s32 fpcSCtRq_phase_IsComplete(standard_create_request_class* pStdCreateReq); -s32 fpcSCtRq_phase_PostMethod(standard_create_request_class* pStdCreateReq); -s32 fpcSCtRq_phase_Done(standard_create_request_class*); -s32 fpcSCtRq_Handler(standard_create_request_class* pStdCreateReq); -s32 fpcSCtRq_Delete(standard_create_request_class*); -s32 fpcSCtRq_Cancel(standard_create_request_class*); +cPhs_State fpcSCtRq_phase_Load(standard_create_request_class* pStdCreateReq); +cPhs_State fpcSCtRq_phase_CreateProcess(standard_create_request_class* pStdCreateReq); +cPhs_State fpcSCtRq_phase_SubCreateProcess(standard_create_request_class* pStdCreateReq); +cPhs_State fpcSCtRq_phase_IsComplete(standard_create_request_class* pStdCreateReq); +cPhs_State fpcSCtRq_phase_PostMethod(standard_create_request_class* pStdCreateReq); +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); #endif diff --git a/src/SSystem/SComponent/c_list_iter.cpp b/src/SSystem/SComponent/c_list_iter.cpp index 14b25e1f1..0faef41ee 100644 --- a/src/SSystem/SComponent/c_list_iter.cpp +++ b/src/SSystem/SComponent/c_list_iter.cpp @@ -8,11 +8,11 @@ #include "dolphin/types.h" /* 80244BF0-80244C28 .text cLsIt_Method__FP15node_list_classPFP10node_classPv_iPv */ -int cLsIt_Method(node_list_class* pList, cNdIt_MethodFunc pMethod, void* pUserData) { +BOOL cLsIt_Method(node_list_class* pList, cNdIt_MethodFunc pMethod, void* pUserData) { if (pList->mSize > 0) return cNdIt_Method(pList->mpHead, pMethod, pUserData); else - return 1; + return TRUE; } /* 80244C28-80244C60 .text cLsIt_Judge__FP15node_list_classPFP10node_classPv_PvPv */ diff --git a/src/SSystem/SComponent/c_node_iter.cpp b/src/SSystem/SComponent/c_node_iter.cpp index c0fd371b0..2ba8ea4e7 100644 --- a/src/SSystem/SComponent/c_node_iter.cpp +++ b/src/SSystem/SComponent/c_node_iter.cpp @@ -8,14 +8,14 @@ #include "dolphin/types.h" /* 80244EB4-80244F44 .text cNdIt_Method__FP10node_classPFP10node_classPv_iPv */ -int cNdIt_Method(node_class* pNode, cNdIt_MethodFunc pMethod, void* pUserData) { - int ret = 1; +BOOL cNdIt_Method(node_class* pNode, cNdIt_MethodFunc pMethod, void* pUserData) { + BOOL ret = TRUE; node_class* pNext = NODE_GET_NEXT(pNode); while (pNode) { int methodRet = pMethod(pNode, pUserData); if (!methodRet) - ret = 0; + ret = FALSE; pNode = pNext; pNext = NODE_GET_NEXT(pNext); } diff --git a/src/SSystem/SComponent/c_phase.cpp b/src/SSystem/SComponent/c_phase.cpp index 5b1f87602..cff68d709 100644 --- a/src/SSystem/SComponent/c_phase.cpp +++ b/src/SSystem/SComponent/c_phase.cpp @@ -8,13 +8,13 @@ /* 802451B4-802451C0 .text cPhs_Reset__FP30request_of_phase_process_class */ void cPhs_Reset(request_of_phase_process_class* pPhase) { - pPhase->id = cPhs_INIT_e; + pPhase->id = 0; } /* 802451C0-802451D0 .text cPhs_Set__FP30request_of_phase_process_classPPFPv_i */ void cPhs_Set(request_of_phase_process_class* pPhase, cPhs__Handler* pHandlerTable) { pPhase->mpHandlerTable = pHandlerTable; - pPhase->id = cPhs_INIT_e; + pPhase->id = 0; } /* 802451D0-802451F8 .text cPhs_UnCompleate__FP30request_of_phase_process_class */ @@ -24,13 +24,13 @@ void cPhs_UnCompleate(request_of_phase_process_class* pPhase) { } /* 802451F8-80245208 .text cPhs_Compleate__FP30request_of_phase_process_class */ -int cPhs_Compleate(request_of_phase_process_class* pPhase) { +cPhs_State cPhs_Compleate(request_of_phase_process_class* pPhase) { pPhase->mpHandlerTable = NULL; return cPhs_COMPLEATE_e; } /* 80245208-80245268 .text cPhs_Next__FP30request_of_phase_process_class */ -int cPhs_Next(request_of_phase_process_class* pPhase) { +cPhs_State cPhs_Next(request_of_phase_process_class* pPhase) { if (const cPhs__Handler* handlerTable = pPhase->mpHandlerTable) { pPhase->id++; cPhs__Handler handler = handlerTable[pPhase->id]; @@ -48,7 +48,7 @@ int cPhs_Next(request_of_phase_process_class* pPhase) { } /* 80245268-8024533C .text cPhs_Do__FP30request_of_phase_process_classPv */ -int cPhs_Do(request_of_phase_process_class* pPhase, void* pUserData) { +cPhs_State cPhs_Do(request_of_phase_process_class* pPhase, void* pUserData) { cPhs__Handler * handler = pPhase->mpHandlerTable; if (handler) { @@ -78,7 +78,7 @@ int cPhs_Do(request_of_phase_process_class* pPhase, void* pUserData) { } /* 8024533C-80245364 .text cPhs_Handler__FP30request_of_phase_process_classPPFPv_iPv */ -int cPhs_Handler(request_of_phase_process_class* pPhase, cPhs__Handler* pHandlerTable, +cPhs_State cPhs_Handler(request_of_phase_process_class* pPhase, cPhs__Handler* pHandlerTable, void* pUserData) { pPhase->mpHandlerTable = pHandlerTable; return cPhs_Do(pPhase, pUserData); diff --git a/src/SSystem/SComponent/c_request.cpp b/src/SSystem/SComponent/c_request.cpp index 0e3444c87..404417ac0 100644 --- a/src/SSystem/SComponent/c_request.cpp +++ b/src/SSystem/SComponent/c_request.cpp @@ -7,12 +7,12 @@ #include "dolphin/types.h" /* 80245364-80245390 .text cReq_Is_Done__FP18request_base_class */ -int cReq_Is_Done(request_base_class* i_this) { +BOOL cReq_Is_Done(request_base_class* i_this) { if (i_this->flag1 == 1) { i_this->flag1 = 0; - return 1; + return TRUE; } - return 0; + return FALSE; } /* 80245390-802453C0 .text cReq_Done__FP18request_base_class */ diff --git a/src/SSystem/SComponent/c_tag.cpp b/src/SSystem/SComponent/c_tag.cpp index 6b1c6f657..9f63014d8 100644 --- a/src/SSystem/SComponent/c_tag.cpp +++ b/src/SSystem/SComponent/c_tag.cpp @@ -9,18 +9,18 @@ #include "dolphin/types.h" /* 80245410-8024541C .text cTg_IsUse__FP16create_tag_class */ -int cTg_IsUse(create_tag_class* pTag) { +BOOL cTg_IsUse(create_tag_class* pTag) { return pTag->mbIsUse; } /* 8024541C-8024545C .text cTg_SingleCutFromTree__FP16create_tag_class */ -int cTg_SingleCutFromTree(create_tag_class* pTag) { +BOOL cTg_SingleCutFromTree(create_tag_class* pTag) { if (pTag->mbIsUse == true) { pTag->mbIsUse = false; cTr_SingleCut(&pTag->mpNode); - return true; + return TRUE; } else { - return false; + return FALSE; } } diff --git a/src/SSystem/SComponent/c_tag_iter.cpp b/src/SSystem/SComponent/c_tag_iter.cpp index ac5e30d79..ce3bc167a 100644 --- a/src/SSystem/SComponent/c_tag_iter.cpp +++ b/src/SSystem/SComponent/c_tag_iter.cpp @@ -5,14 +5,13 @@ #include "SSystem/SComponent/c_tag_iter.h" #include "SSystem/SComponent/c_tag.h" -#include "dolphin/types.h" /* 8024560C-80245640 .text cTgIt_MethodCall__FP16create_tag_classP13method_filter */ -int cTgIt_MethodCall(create_tag_class* pTag, method_filter* pMethodFilter) { - return pMethodFilter->mpMethodFunc((node_class*)pTag->mpTagData, pMethodFilter->mpUserData); +int cTgIt_MethodCall(create_tag_class* tag, method_filter* filter) { + return filter->mpMethodFunc((node_class*)tag->mpTagData, filter->mpUserData); } /* 80245640-80245674 .text cTgIt_JudgeFilter__FP16create_tag_classP12judge_filter */ -void* cTgIt_JudgeFilter(create_tag_class* pTag, judge_filter* pJudgeFilter) { - return pJudgeFilter->mpJudgeFunc((node_class*)pTag->mpTagData, pJudgeFilter->mpUserData); +void* cTgIt_JudgeFilter(create_tag_class* tag, judge_filter* filter) { + return filter->mpJudgeFunc((node_class*)tag->mpTagData, filter->mpUserData); } diff --git a/src/SSystem/SComponent/c_tree_iter.cpp b/src/SSystem/SComponent/c_tree_iter.cpp index c043da2df..b96dd1e68 100644 --- a/src/SSystem/SComponent/c_tree_iter.cpp +++ b/src/SSystem/SComponent/c_tree_iter.cpp @@ -10,24 +10,24 @@ #include "dolphin/types.h" /* 802450D0-80245144 .text cTrIt_Method__FP21node_lists_tree_classPFP10node_classPv_iPv */ -int cTrIt_Method(node_lists_tree_class* pTree, cNdIt_MethodFunc pMethod, void* pUserData) { - node_list_class* pList = pTree->mpLists; - int i = pTree->mNumLists; - int ret = 1; +BOOL cTrIt_Method(node_lists_tree_class* tree, cNdIt_MethodFunc method, void* data) { + node_list_class* pList = tree->mpLists; + int i = tree->mNumLists; + BOOL ret = TRUE; while (i-- > 0) { - int sub = cLsIt_Method(pList++, pMethod, pUserData); - if (sub == 0) - ret = 0; + BOOL sub = cLsIt_Method(pList++, method, data); + if (sub == FALSE) + ret = FALSE; } return ret; } /* 80245144-802451B4 .text cTrIt_Judge__FP21node_lists_tree_classPFP10node_classPv_PvPv */ -void* cTrIt_Judge(node_lists_tree_class* pTree, cNdIt_JudgeFunc pJudge, void* pUserData) { - node_list_class* pList = pTree->mpLists; - int i = pTree->mNumLists; +void* cTrIt_Judge(node_lists_tree_class* tree, cNdIt_JudgeFunc judge, void* data) { + node_list_class* pList = tree->mpLists; + int i = tree->mNumLists; while (i-- > 0) { - void* pJudgeRet = cLsIt_Judge(pList++, pJudge, pUserData); + void* pJudgeRet = cLsIt_Judge(pList++, judge, data); if (pJudgeRet != NULL) return pJudgeRet; } diff --git a/src/c/c_dylink.cpp b/src/c/c_dylink.cpp index db0a9b28c..d9341a775 100644 --- a/src/c/c_dylink.cpp +++ b/src/c/c_dylink.cpp @@ -491,7 +491,7 @@ s32 cCc_Init() { } /* 800229E0-80022A80 .text cDyl_IsLinked__Fs */ -s32 cDyl_IsLinked(s16 i_ProfName) { +BOOL cDyl_IsLinked(s16 i_ProfName) { JUT_ASSERT(0xae, cDyl_Initialized); if (DMC[i_ProfName] != NULL) @@ -501,14 +501,14 @@ s32 cDyl_IsLinked(s16 i_ProfName) { } /* 80022A80-80022B58 .text cDyl_Unlink__Fs */ -s32 cDyl_Unlink(s16 i_ProfName) { +BOOL cDyl_Unlink(s16 i_ProfName) { JUT_ASSERT(0xc5, cDyl_Initialized); JUT_ASSERT(0xc6, i_ProfName < ARRAY_SIZE(DMC)); if (DMC[i_ProfName] != NULL) return DMC[i_ProfName]->unlink(); - return 0; + return FALSE; } static void dummy(s16 i_ProfName) { @@ -517,7 +517,7 @@ static void dummy(s16 i_ProfName) { } /* 80022B58-80022CEC .text cDyl_LinkASync__Fs */ -s32 cDyl_LinkASync(s16 i_ProfName) { +cPhs_State cDyl_LinkASync(s16 i_ProfName) { JUT_ASSERT(0x101, DMC_initialized); if (!cDyl_Initialized) @@ -572,7 +572,7 @@ void cDyl_InitAsync() { } /* 80022E70-80022EDC .text cDyl_InitAsyncIsDone__Fv */ -int cDyl_InitAsyncIsDone() { +BOOL cDyl_InitAsyncIsDone() { if (cDyl_DVD == NULL) return TRUE; @@ -586,45 +586,45 @@ int cDyl_InitAsyncIsDone() { } /* 80022EDC-80022EE4 .text phase_01__7cDylPhsFPv */ -int cDylPhs::phase_01(void*) { +cPhs_State cDylPhs::phase_01(void*) { return cPhs_NEXT_e; } /* 80022EE4-80022F1C .text phase_02__7cDylPhsFPs */ -int cDylPhs::phase_02(s16* pProf) { - s32 ret = cDyl_LinkASync(*pProf); +cPhs_State cDylPhs::phase_02(s16* pProf) { + cPhs_State ret = cDyl_LinkASync(*pProf); return ret == cPhs_COMPLEATE_e ? cPhs_NEXT_e : ret; } /* 80022F1C-80022F24 .text phase_03__7cDylPhsFPv */ -int cDylPhs::phase_03(void*) { +cPhs_State cDylPhs::phase_03(void*) { return cPhs_INIT_e; } /* 80022F24-80022F68 .text Link__7cDylPhsFP30request_of_phase_process_classs */ -int cDylPhs::Link(request_of_phase_process_class* i_phase, s16 profName) { +cPhs_State cDylPhs::Link(request_of_phase_process_class* i_phase, s16 profName) { static cPhs__Handler l_method[] = { (cPhs__Handler) &cDylPhs::phase_01, (cPhs__Handler) &cDylPhs::phase_02, (cPhs__Handler) &cDylPhs::phase_03, }; - if (i_phase->id == cPhs_NEXT_e) + if (i_phase->id == 2) return cPhs_COMPLEATE_e; return dComLbG_PhaseHandler(i_phase, l_method, &profName); } /* 80022F68-80023004 .text Unlink__7cDylPhsFP30request_of_phase_process_classs */ -int cDylPhs::Unlink(request_of_phase_process_class* i_phase, s16 profName) { +BOOL cDylPhs::Unlink(request_of_phase_process_class* i_phase, s16 profName) { JUT_ASSERT(0x1a6, i_phase->id != 1); - s32 ret; - if (i_phase->id == cPhs_NEXT_e) { + BOOL ret; + if (i_phase->id == 2) { ret = cDyl_Unlink(profName); - i_phase->id = cPhs_INIT_e; + i_phase->id = 0; } else { - ret = cPhs_INIT_e; + ret = FALSE; } return ret; } diff --git a/src/d/actor/d_a_acorn_leaf.cpp b/src/d/actor/d_a_acorn_leaf.cpp index 5122ceda3..cb53b72f6 100644 --- a/src/d/actor/d_a_acorn_leaf.cpp +++ b/src/d/actor/d_a_acorn_leaf.cpp @@ -32,7 +32,7 @@ void daAleaf_c::create_acorn_sub(bool) { } /* 0000049C-000005EC .text _create__9daAleaf_cFv */ -s32 daAleaf_c::_create() { +cPhs_State daAleaf_c::_create() { /* Nonmatching */ } @@ -52,7 +52,7 @@ bool daAleaf_c::_draw() { } /* 00000CD4-00000CF4 .text daAleaf_Create__FPv */ -static s32 daAleaf_Create(void*) { +static cPhs_State daAleaf_Create(void*) { /* Nonmatching */ } diff --git a/src/d/actor/d_a_agb.cpp b/src/d/actor/d_a_agb.cpp index 541c4cd50..2e54b4613 100644 --- a/src/d/actor/d_a_agb.cpp +++ b/src/d/actor/d_a_agb.cpp @@ -1530,7 +1530,7 @@ void daAgb_c::modeProcCall() { } /* 800D30D4-800D36F4 .text daAgb_Execute__FP7daAgb_c */ -static int daAgb_Execute(daAgb_c* i_this) { +static BOOL daAgb_Execute(daAgb_c* i_this) { fopAc_ac_c* i_actor = i_this; daPy_py_c* player = daPy_getPlayerActorClass(); i_this->field_0x679 = false; @@ -1654,11 +1654,11 @@ static int daAgb_Execute(daAgb_c* i_this) { } } - return 1; + return TRUE; } /* 800D36F4-800D38EC .text daAgb_Draw__FP7daAgb_c */ -static int daAgb_Draw(daAgb_c* i_this) { +static BOOL daAgb_Draw(daAgb_c* i_this) { u8 var_r6 = 1; if (mDoGaC_GbaLink()) { @@ -1693,19 +1693,19 @@ static int daAgb_Draw(daAgb_c* i_this) { dMap_drawPoint(3, i_this->current.pos.x, i_this->current.pos.y, i_this->current.pos.z, i_this->current.roomNo, -0x8000, var_r6, 0, 0); - return 1; + return TRUE; } /* 800D38F0-800D38F8 .text daAgb_IsDelete__FP7daAgb_c */ -static int daAgb_IsDelete(daAgb_c* i_this) { - return 1; +static BOOL daAgb_IsDelete(daAgb_c* i_this) { + return TRUE; } /* 800D38F8-800D394C .text daAgb_Delete__FP7daAgb_c */ -static int daAgb_Delete(daAgb_c* i_this) { +static BOOL daAgb_Delete(daAgb_c* i_this) { dComIfG_resDelete(&i_this->mPhase, "Agb"); i_this->field_0x684.end(); - return 1; + return TRUE; } /* 800D394C-800D396C .text createHeap_CB__FP10fopAc_ac_c */ @@ -1714,18 +1714,18 @@ static BOOL createHeap_CB(fopAc_ac_c* i_this) { } /* 800D396C-800D3B58 .text createHeap__7daAgb_cFv */ -int daAgb_c::createHeap() { +BOOL daAgb_c::createHeap() { J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("Agb", AGB_BDL_AGBCURSOR); JUT_ASSERT(VERSION_SELECT(2960, 3277, 3286), modelData != NULL); mpModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000002); if (mpModel == NULL) { - return 0; + return FALSE; } J3DAnmTevRegKey* pbrk = (J3DAnmTevRegKey*)dComIfG_getObjectRes("Agb", AGB_BRK_AGBCURSOR); if (!mBrk.init(modelData, pbrk, TRUE, J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, false, 1)) { - return 0; + return FALSE; } ResTIMG* img_p = modelData->getTexture()->getResTIMG(1); @@ -1736,15 +1736,15 @@ int daAgb_c::createHeap() { img_p->minLOD * 0.125f, img_p->maxLOD * 0.125f, img_p->LODBias * 0.01f, img_p->biasClamp, img_p->doEdgeLOD, (GXAnisotropy)img_p->maxAnisotropy); - return 1; + return TRUE; } /* 800D3B58-800D3D2C .text daAgb_Create__FP10fopAc_ac_c */ -static int daAgb_Create(fopAc_ac_c* i_this) { +static cPhs_State daAgb_Create(fopAc_ac_c* i_this) { daAgb_c* a_this = (daAgb_c*)i_this; fopAcM_SetupActor(i_this, daAgb_c); - int phase = dComIfG_resLoad(&a_this->mPhase, "Agb"); + cPhs_State phase = dComIfG_resLoad(&a_this->mPhase, "Agb"); if (phase == cPhs_COMPLEATE_e) { dComIfGp_setAgb(a_this); if (!fopAcM_entrySolidHeap(i_this, createHeap_CB, 0x500)) { diff --git a/src/d/actor/d_a_agbsw0.cpp b/src/d/actor/d_a_agbsw0.cpp index 1e3482088..2c1a6dfff 100644 --- a/src/d/actor/d_a_agbsw0.cpp +++ b/src/d/actor/d_a_agbsw0.cpp @@ -67,7 +67,7 @@ BOOL daAgbsw0_c::draw() { if(toCheck != 0xFF) { if(conditionNo == 0) { if(!fopAcM_isSwitch(this, toCheck)) { - return 1; + return true; } } else { @@ -408,7 +408,7 @@ BOOL daAgbsw0_c::ExeSubA() { if(field_0x298 == 1) { if(mDoGaC_GbaLink()) { if(!mDoGac_SendStatusCheck(5)) { - return 1; + return true; } MailSend(-1, 0, 0xFF, 0xFF, 0); @@ -494,7 +494,7 @@ BOOL daAgbsw0_c::ExeSubAT() { if(field_0x298 == 1) { if(mDoGaC_GbaLink()) { if(!mDoGac_SendStatusCheck(5)) { - return 1; + return true; } MailSend(-1, 0, 0xFF, 0xFF, 0); @@ -578,7 +578,7 @@ BOOL daAgbsw0_c::ExeSubA2() { if(field_0x298 == 1) { if(mDoGaC_GbaLink()) { if(!mDoGac_SendStatusCheck(5)) { - return 1; + return true; } MailSend(-1, 0, 0xFF, 0xFF, 0); @@ -2121,7 +2121,7 @@ BOOL daAgbsw0_c::MoveCheck(s16 conditionNo) { case 0x43: for (int i = 0; i < 3; i++) { if(daNpc_Os_c::isPlayerRoom(i)) { - return 1; + return true; } } @@ -2552,7 +2552,7 @@ static BOOL daAgbsw0_Draw(daAgbsw0_c* i_this) { } /* 00004B2C-00004CF8 .text daAgbsw0_Execute__FP10daAgbsw0_c */ -static void daAgbsw0_Execute(daAgbsw0_c* i_this) { +static BOOL daAgbsw0_Execute(daAgbsw0_c* i_this) { i_this->execute(); } diff --git a/src/d/actor/d_a_alldie.cpp b/src/d/actor/d_a_alldie.cpp index e368eb67f..030789fcc 100644 --- a/src/d/actor/d_a_alldie.cpp +++ b/src/d/actor/d_a_alldie.cpp @@ -64,7 +64,7 @@ BOOL daAlldie_c::execute() { return TRUE; } -s32 daAlldie_c::create() { +cPhs_State daAlldie_c::create() { fopAcM_SetupActor(this, daAlldie_c); if (!dComIfGs_isSwitch(getSwbit(), fopAcM_GetRoomNo(this))) { @@ -104,7 +104,7 @@ static BOOL daAlldie_Delete(daAlldie_c* i_this) { } /* 00000220-000002CC .text daAlldie_Create__FP10fopAc_ac_c */ -static s32 daAlldie_Create(fopAc_ac_c* ac) { +static cPhs_State daAlldie_Create(fopAc_ac_c* ac) { return ((daAlldie_c*)ac)->create(); } diff --git a/src/d/actor/d_a_am.cpp b/src/d/actor/d_a_am.cpp index 5e1a53b26..b7d279376 100644 --- a/src/d/actor/d_a_am.cpp +++ b/src/d/actor/d_a_am.cpp @@ -1120,12 +1120,12 @@ static BOOL useHeapInit(fopAc_ac_c* i_actor) { } /* 00003C00-00003F5C .text daAM_Create__FP10fopAc_ac_c */ -static s32 daAM_Create(fopAc_ac_c* i_actor) { +static cPhs_State daAM_Create(fopAc_ac_c* i_actor) { fopAcM_SetupActor(i_actor, am_class); am_class* i_this = (am_class*)i_actor; - s32 phase_state = dComIfG_resLoad(&i_this->mPhase, "AM"); + cPhs_State phase_state = dComIfG_resLoad(&i_this->mPhase, "AM"); if (phase_state == cPhs_COMPLEATE_e) { if (!fopAcM_entrySolidHeap(i_this, useHeapInit, 0x1C80)) { return cPhs_ERROR_e; diff --git a/src/d/actor/d_a_am2.cpp b/src/d/actor/d_a_am2.cpp index 8bec7ef99..8b5412803 100644 --- a/src/d/actor/d_a_am2.cpp +++ b/src/d/actor/d_a_am2.cpp @@ -1248,12 +1248,12 @@ static BOOL useHeapInit(fopAc_ac_c* i_actor) { } /* 00003E70-00004250 .text daAM2_Create__FP10fopAc_ac_c */ -static s32 daAM2_Create(fopAc_ac_c* i_actor) { +static cPhs_State daAM2_Create(fopAc_ac_c* i_actor) { fopAcM_SetupActor(i_actor, am2_class); am2_class* i_this = (am2_class*)i_actor; - s32 phase_state = dComIfG_resLoad(&i_this->mPhase, "AM2"); + cPhs_State phase_state = dComIfG_resLoad(&i_this->mPhase, "AM2"); if (phase_state == cPhs_COMPLEATE_e) { if (!fopAcM_entrySolidHeap(i_this, useHeapInit, 0x1AA0)) { return cPhs_ERROR_e; diff --git a/src/d/actor/d_a_amiprop.cpp b/src/d/actor/d_a_amiprop.cpp index 0d3217112..480284948 100644 --- a/src/d/actor/d_a_amiprop.cpp +++ b/src/d/actor/d_a_amiprop.cpp @@ -27,7 +27,7 @@ void daAmiProp_c::CreateInit() { } /* 00000318-00000444 .text _create__11daAmiProp_cFv */ -s32 daAmiProp_c::_create() { +cPhs_State daAmiProp_c::_create() { /* Nonmatching */ } @@ -52,7 +52,7 @@ bool daAmiProp_c::_draw() { } /* 00000924-00000944 .text daAmiProp_Create__FPv */ -static s32 daAmiProp_Create(void*) { +static cPhs_State daAmiProp_Create(void*) { /* Nonmatching */ } diff --git a/src/d/actor/d_a_andsw0.cpp b/src/d/actor/d_a_andsw0.cpp index 0db61a47f..f11f2e7aa 100644 --- a/src/d/actor/d_a_andsw0.cpp +++ b/src/d/actor/d_a_andsw0.cpp @@ -20,8 +20,8 @@ enum { }; /* 00000078-00000080 .text daAndsw0_Draw__FP12andsw0_class */ -static s32 daAndsw0_Draw(andsw0_class*) { - return 1; +static BOOL daAndsw0_Draw(andsw0_class*) { + return TRUE; } /* 00000080-000003C4 .text daAndsw0_check__FP12andsw0_class */ @@ -295,27 +295,27 @@ static void event_start_check(andsw0_class* i_this) { } /* 00000914-00000964 .text daAndsw0_Execute__FP12andsw0_class */ -static s32 daAndsw0_Execute(andsw0_class* i_this) { +static BOOL daAndsw0_Execute(andsw0_class* i_this) { event_start_check(i_this); if (i_this->mNumSwitchesToCheck == 0xFF) hajimarinomori_check(i_this); else daAndsw0_check(i_this); - return 1; + return TRUE; } /* 00000964-0000096C .text daAndsw0_IsDelete__FP12andsw0_class */ -static s32 daAndsw0_IsDelete(andsw0_class*) { - return 1; +static BOOL daAndsw0_IsDelete(andsw0_class*) { + return TRUE; } /* 0000096C-00000974 .text daAndsw0_Delete__FP12andsw0_class */ -static s32 daAndsw0_Delete(andsw0_class*) { - return 1; +static BOOL daAndsw0_Delete(andsw0_class*) { + return TRUE; } /* 00000974-00000A64 .text daAndsw0_Create__FP10fopAc_ac_c */ -static s32 daAndsw0_Create(fopAc_ac_c* ac) { +static cPhs_State daAndsw0_Create(fopAc_ac_c* ac) { fopAcM_SetupActor(ac, andsw0_class); andsw0_class * i_this = (andsw0_class *)ac; diff --git a/src/d/actor/d_a_andsw2.cpp b/src/d/actor/d_a_andsw2.cpp index b8e73e78f..7c03efb8a 100644 --- a/src/d/actor/d_a_andsw2.cpp +++ b/src/d/actor/d_a_andsw2.cpp @@ -183,7 +183,7 @@ BOOL daAndsw2_c::execute() { return TRUE; } -s32 daAndsw2_c::create() { +cPhs_State daAndsw2_c::create() { int sw = getSwbit(); fopAcM_SetupActor(this, daAndsw2_c); @@ -249,7 +249,7 @@ static BOOL daAndsw2_Delete(daAndsw2_c* i_this) { } /* 000005AC-00000724 .text daAndsw2_Create__FP10fopAc_ac_c */ -static s32 daAndsw2_Create(fopAc_ac_c* ac) { +static cPhs_State daAndsw2_Create(fopAc_ac_c* ac) { return ((daAndsw2_c*)ac)->create(); } diff --git a/src/d/actor/d_a_arrow.cpp b/src/d/actor/d_a_arrow.cpp index c3ffce425..218adc3cd 100644 --- a/src/d/actor/d_a_arrow.cpp +++ b/src/d/actor/d_a_arrow.cpp @@ -1217,7 +1217,7 @@ BOOL daArrow_c::_draw() { } /* 800D7960-800D7A38 .text _create__9daArrow_cFv */ -s32 daArrow_c::_create() { +cPhs_State daArrow_c::_create() { fopAcM_SetupActor(this, daArrow_c); checkCreater(); diff --git a/src/d/actor/d_a_arrow_iceeff.cpp b/src/d/actor/d_a_arrow_iceeff.cpp index e435b8857..bceb2228f 100644 --- a/src/d/actor/d_a_arrow_iceeff.cpp +++ b/src/d/actor/d_a_arrow_iceeff.cpp @@ -106,7 +106,7 @@ void daArrow_Iceeff_c::set_mtx() { } } -s32 daArrow_Iceeff_c::_create() { +cPhs_State daArrow_Iceeff_c::_create() { fopAcM_SetupActor(this, daArrow_Iceeff_c); void* arrow = fopAcM_SearchByID(parentActorID); @@ -131,7 +131,7 @@ s32 daArrow_Iceeff_c::_create() { } /* 0000073C-00000854 .text daArrow_Iceeff_Create__FPv */ -static s32 daArrow_Iceeff_Create(void* i_this) { +static cPhs_State daArrow_Iceeff_Create(void* i_this) { return static_cast(i_this)->_create(); } diff --git a/src/d/actor/d_a_arrow_lighteff.cpp b/src/d/actor/d_a_arrow_lighteff.cpp index 0cfa551b4..5ca4df33b 100644 --- a/src/d/actor/d_a_arrow_lighteff.cpp +++ b/src/d/actor/d_a_arrow_lighteff.cpp @@ -187,7 +187,7 @@ void daArrow_Lighteff_c::set_mtx() { } } -s32 daArrow_Lighteff_c::_create() { +cPhs_State daArrow_Lighteff_c::_create() { fopAcM_SetupActor(this, daArrow_Lighteff_c); field_0x2EA = 0; @@ -201,7 +201,7 @@ s32 daArrow_Lighteff_c::_create() { } /* 00000980-00000A70 .text daArrow_Lighteff_Create__FPv */ -static s32 daArrow_Lighteff_Create(void* i_this) { +static cPhs_State daArrow_Lighteff_Create(void* i_this) { return static_cast(i_this)->_create(); } diff --git a/src/d/actor/d_a_atdoor.cpp b/src/d/actor/d_a_atdoor.cpp index fe32a4a84..864c94d58 100644 --- a/src/d/actor/d_a_atdoor.cpp +++ b/src/d/actor/d_a_atdoor.cpp @@ -32,7 +32,7 @@ void daAtdoor_c::CreateInit() { } /* 0000036C-00000418 .text create__10daAtdoor_cFv */ -s32 daAtdoor_c::create() { +cPhs_State daAtdoor_c::create() { /* Nonmatching */ } @@ -82,7 +82,7 @@ static BOOL daAtdoor_Delete(daAtdoor_c*) { } /* 0000070C-0000072C .text daAtdoor_Create__FP10fopAc_ac_c */ -static s32 daAtdoor_Create(fopAc_ac_c*) { +static cPhs_State daAtdoor_Create(fopAc_ac_c*) { /* Nonmatching */ } diff --git a/src/d/actor/d_a_att.cpp b/src/d/actor/d_a_att.cpp index 5c17d288b..c65d269a1 100644 --- a/src/d/actor/d_a_att.cpp +++ b/src/d/actor/d_a_att.cpp @@ -112,7 +112,7 @@ static BOOL daAtt_Delete(att_class* i_this) { } /* 00000578-00000768 .text daAtt_Create__FP10fopAc_ac_c */ -static s32 daAtt_Create(fopAc_ac_c* i_this) { +static cPhs_State daAtt_Create(fopAc_ac_c* i_this) { #if VERSION == VERSION_USA static dCcD_SrcSph sita_sph_src = { // dCcD_SrcGObjInf diff --git a/src/d/actor/d_a_auction.cpp b/src/d/actor/d_a_auction.cpp index cf8e7df6c..43b0c680c 100644 --- a/src/d/actor/d_a_auction.cpp +++ b/src/d/actor/d_a_auction.cpp @@ -235,10 +235,10 @@ static BOOL CheckCreateHeap(fopAc_ac_c* i_this) { } /* 00000664-000006F4 .text _create__11daAuction_cFv */ -s32 daAuction_c::_create() { +cPhs_State daAuction_c::_create() { fopAcM_SetupActor(this, daAuction_c); - s32 phase_state = dComIfG_resLoad(&mPhs, "Pspl"); + cPhs_State phase_state = dComIfG_resLoad(&mPhs, "Pspl"); if (phase_state == cPhs_COMPLEATE_e) { if (!fopAcM_entrySolidHeap(this, CheckCreateHeap, 0x2400)) { @@ -269,7 +269,7 @@ BOOL daAuction_c::createHeap() { } /* 00000770-000008C4 .text createInit__11daAuction_cFv */ -s32 daAuction_c::createInit() { +cPhs_State daAuction_c::createInit() { mEvtStartIdx = dComIfGp_evmng_getEventIdx("AUCTION_START"); mEvtGetItemIdx = dComIfGp_evmng_getEventIdx("AUCTION_GET_ITEM"); mEvtNoItemIdx = dComIfGp_evmng_getEventIdx("AUCTION_NO_ITEM"); diff --git a/src/d/actor/d_a_bb.cpp b/src/d/actor/d_a_bb.cpp index ca3b7a899..c24dfec91 100644 --- a/src/d/actor/d_a_bb.cpp +++ b/src/d/actor/d_a_bb.cpp @@ -163,7 +163,7 @@ static BOOL useHeapInit(fopAc_ac_c*) { } /* 00007A68-00007F58 .text daBb_Create__FP10fopAc_ac_c */ -static s32 daBb_Create(fopAc_ac_c*) { +static cPhs_State daBb_Create(fopAc_ac_c*) { /* Nonmatching */ } diff --git a/src/d/actor/d_a_bdk.cpp b/src/d/actor/d_a_bdk.cpp index 8ccf2d90b..18820d53c 100644 --- a/src/d/actor/d_a_bdk.cpp +++ b/src/d/actor/d_a_bdk.cpp @@ -308,7 +308,7 @@ static BOOL useHeapInit(fopAc_ac_c*) { } /* 0000C6CC-0000CCA8 .text daBdk_Create__FP10fopAc_ac_c */ -static s32 daBdk_Create(fopAc_ac_c*) { +static cPhs_State daBdk_Create(fopAc_ac_c*) { /* Nonmatching */ } diff --git a/src/d/actor/d_a_bdkobj.cpp b/src/d/actor/d_a_bdkobj.cpp index 8e11a92ce..3bbd5f617 100644 --- a/src/d/actor/d_a_bdkobj.cpp +++ b/src/d/actor/d_a_bdkobj.cpp @@ -63,7 +63,7 @@ static BOOL useHeapInit(fopAc_ac_c*) { } /* 000024C8-000027B8 .text daBdkobj_Create__FP10fopAc_ac_c */ -static s32 daBdkobj_Create(fopAc_ac_c*) { +static cPhs_State daBdkobj_Create(fopAc_ac_c*) { /* Nonmatching */ } diff --git a/src/d/actor/d_a_beam.cpp b/src/d/actor/d_a_beam.cpp index 6cf6242be..50fb9ce58 100644 --- a/src/d/actor/d_a_beam.cpp +++ b/src/d/actor/d_a_beam.cpp @@ -83,7 +83,7 @@ static s32 daBeamCreate(void*) { } /* 00001CA4-00001D34 .text _create__8daBeam_cFv */ -s32 daBeam_c::_create() { +cPhs_State daBeam_c::_create() { /* Nonmatching */ } diff --git a/src/d/actor/d_a_bflower.cpp b/src/d/actor/d_a_bflower.cpp index 2c9899e66..3ced7efb4 100644 --- a/src/d/actor/d_a_bflower.cpp +++ b/src/d/actor/d_a_bflower.cpp @@ -234,10 +234,10 @@ int daBFlower_c::init_bck_anm(s16 param) { } /* 0000080C-000008AC .text _create__11daBFlower_cFv */ -s32 daBFlower_c::_create() { +cPhs_State daBFlower_c::_create() { fopAcM_SetupActor(this, daBFlower_c); - s32 phase_state = dComIfG_resLoad(&mPhs, m_arcname); + cPhs_State phase_state = dComIfG_resLoad(&mPhs, m_arcname); if (phase_state == cPhs_COMPLEATE_e) { if (!fopAcM_entrySolidHeap(this, CheckCreateHeap, 0xFC0)) { @@ -489,7 +489,7 @@ bool daBFlower_c::_delete() { } /* 00001AC4-00001AE4 .text daBFlower_Create__FPv */ -static s32 daBFlower_Create(void* i_this) { +static cPhs_State daBFlower_Create(void* i_this) { return static_cast(i_this)->_create(); } diff --git a/src/d/actor/d_a_bg.cpp b/src/d/actor/d_a_bg.cpp index 7e540b085..2e755d486 100644 --- a/src/d/actor/d_a_bg.cpp +++ b/src/d/actor/d_a_bg.cpp @@ -334,12 +334,12 @@ static BOOL daBg_Delete(daBg_c* i_this) { } /* 800D9074-800D9094 .text daBg_Create__FP10fopAc_ac_c */ -static s32 daBg_Create(fopAc_ac_c* i_ac) { +static cPhs_State daBg_Create(fopAc_ac_c* i_ac) { return ((daBg_c*)i_ac)->create(); } /* 800D9094-800D9318 .text create__6daBg_cFv */ -s32 daBg_c::create() { +cPhs_State daBg_c::create() { fopAcM_SetupActor(this, daBg_c); s32 roomNo = fopAcM_GetParam(this); @@ -348,8 +348,8 @@ s32 daBg_c::create() { heap = JKRSolidHeap::create(-1, roomHeap, false); JUT_ASSERT(0x2fd, heap != NULL); JKRHeap * oldHeap = mDoExt_setCurrentHeap(heap); - s32 rt = createHeap(); - JUT_ASSERT(0x302, rt == 1); + BOOL rt = createHeap(); + JUT_ASSERT(0x302, rt == TRUE); mDoExt_setCurrentHeap(oldHeap); heap->adjustSize(); } else { diff --git a/src/d/actor/d_a_bgn.cpp b/src/d/actor/d_a_bgn.cpp index a5fe94bae..f8048fa6c 100644 --- a/src/d/actor/d_a_bgn.cpp +++ b/src/d/actor/d_a_bgn.cpp @@ -270,7 +270,7 @@ static BOOL useHeapInit(fopAc_ac_c*) { } /* 0000B9DC-0000CA80 .text daBgn_Create__FP10fopAc_ac_c */ -static s32 daBgn_Create(fopAc_ac_c* i_this) { +static cPhs_State daBgn_Create(fopAc_ac_c* i_this) { /* Nonmatching */ fopAcM_SetupActor(i_this, bgn_class); } diff --git a/src/d/actor/d_a_bgn2.cpp b/src/d/actor/d_a_bgn2.cpp index f5602adfc..dd4f1c8da 100644 --- a/src/d/actor/d_a_bgn2.cpp +++ b/src/d/actor/d_a_bgn2.cpp @@ -142,7 +142,7 @@ static BOOL useHeapInit(fopAc_ac_c*) { } /* 00003CA8-00003FF4 .text daBgn2_Create__FP10fopAc_ac_c */ -static s32 daBgn2_Create(fopAc_ac_c*) { +static cPhs_State daBgn2_Create(fopAc_ac_c*) { /* Nonmatching */ } diff --git a/src/d/actor/d_a_bgn3.cpp b/src/d/actor/d_a_bgn3.cpp index c793cbf55..13ed2bff3 100644 --- a/src/d/actor/d_a_bgn3.cpp +++ b/src/d/actor/d_a_bgn3.cpp @@ -142,7 +142,7 @@ static BOOL useHeapInit(fopAc_ac_c*) { } /* 00004890-00004BC0 .text daBgn3_Create__FP10fopAc_ac_c */ -static s32 daBgn3_Create(fopAc_ac_c*) { +static cPhs_State daBgn3_Create(fopAc_ac_c*) { /* Nonmatching */ } diff --git a/src/d/actor/d_a_bigelf.cpp b/src/d/actor/d_a_bigelf.cpp index 74d27f6ca..36ba9f0d7 100644 --- a/src/d/actor/d_a_bigelf.cpp +++ b/src/d/actor/d_a_bigelf.cpp @@ -322,7 +322,7 @@ static BOOL CheckCreateHeap(fopAc_ac_c*) { } /* 00002FCC-00003124 .text _create__10daBigelf_cFv */ -s32 daBigelf_c::_create() { +cPhs_State daBigelf_c::_create() { /* Nonmatching */ } @@ -332,7 +332,7 @@ void daBigelf_c::CreateHeap() { } /* 00003808-00003828 .text daBigelf_Create__FP10fopAc_ac_c */ -static s32 daBigelf_Create(fopAc_ac_c*) { +static cPhs_State daBigelf_Create(fopAc_ac_c*) { /* Nonmatching */ } diff --git a/src/d/actor/d_a_bita.cpp b/src/d/actor/d_a_bita.cpp index 994ef91de..6086b8c11 100644 --- a/src/d/actor/d_a_bita.cpp +++ b/src/d/actor/d_a_bita.cpp @@ -202,7 +202,7 @@ static BOOL useHeapInit(fopAc_ac_c* i_ac) { } /* 00000A60-00000D24 .text daBita_Create__FP10fopAc_ac_c */ -static s32 daBita_Create(fopAc_ac_c* i_ac) { +static cPhs_State daBita_Create(fopAc_ac_c* i_ac) { static dCcD_SrcCyl body_cyl_src = { // dCcD_SrcGObjInf { @@ -236,7 +236,7 @@ static s32 daBita_Create(fopAc_ac_c* i_ac) { fopAcM_SetupActor(i_ac, bita_class); bita_class* i_this = (bita_class*)i_ac; - s32 rt = dComIfG_resLoad(&i_this->mPhs, "Bita"); + cPhs_State rt = dComIfG_resLoad(&i_this->mPhs, "Bita"); if (rt == cPhs_COMPLEATE_e) { btd = NULL; i_this->mType = (fopAcM_GetParam(i_this) >> 0) & 0xFF; diff --git a/src/d/actor/d_a_bk.cpp b/src/d/actor/d_a_bk.cpp index cf9e74ae0..0e677ad6d 100644 --- a/src/d/actor/d_a_bk.cpp +++ b/src/d/actor/d_a_bk.cpp @@ -3749,12 +3749,12 @@ static BOOL useHeapInit(fopAc_ac_c* i_actor) { } /* 0000E310-0000EA2C .text daBk_Create__FP10fopAc_ac_c */ -static s32 daBk_Create(fopAc_ac_c* i_actor) { +static cPhs_State daBk_Create(fopAc_ac_c* i_actor) { /* Nonmatching - data */ fopAcM_SetupActor(i_actor, bk_class); bk_class* i_this = (bk_class*)i_actor; - s32 phase_state = dComIfG_resLoad(&i_this->mPhase, "Bk"); + cPhs_State phase_state = dComIfG_resLoad(&i_this->mPhase, "Bk"); if (phase_state == cPhs_COMPLEATE_e) { i_this->gbaName = 1; diff --git a/src/d/actor/d_a_bl.cpp b/src/d/actor/d_a_bl.cpp index edd281cfd..1e7b597b4 100644 --- a/src/d/actor/d_a_bl.cpp +++ b/src/d/actor/d_a_bl.cpp @@ -152,7 +152,7 @@ static BOOL useHeapInit(fopAc_ac_c*) { } /* 00005884-00005D88 .text daBL_Create__FP10fopAc_ac_c */ -static s32 daBL_Create(fopAc_ac_c*) { +static cPhs_State daBL_Create(fopAc_ac_c*) { /* Nonmatching */ } diff --git a/src/d/actor/d_a_bmd.cpp b/src/d/actor/d_a_bmd.cpp index bd070d230..60ba4c385 100644 --- a/src/d/actor/d_a_bmd.cpp +++ b/src/d/actor/d_a_bmd.cpp @@ -147,7 +147,7 @@ static BOOL solidHeapCB(fopAc_ac_c*) { } /* 00006528-00006908 .text daBmd_Create__FP10fopAc_ac_c */ -static s32 daBmd_Create(fopAc_ac_c*) { +static cPhs_State daBmd_Create(fopAc_ac_c*) { /* Nonmatching */ } diff --git a/src/d/actor/d_a_bmdfoot.cpp b/src/d/actor/d_a_bmdfoot.cpp index 2fff98a91..b5ce6790d 100644 --- a/src/d/actor/d_a_bmdfoot.cpp +++ b/src/d/actor/d_a_bmdfoot.cpp @@ -103,7 +103,7 @@ static BOOL solidHeapCB(fopAc_ac_c*) { } /* 00002A1C-00002E88 .text daBmdfoot_Create__FP10fopAc_ac_c */ -static s32 daBmdfoot_Create(fopAc_ac_c*) { +static cPhs_State daBmdfoot_Create(fopAc_ac_c*) { /* Nonmatching */ } diff --git a/src/d/actor/d_a_bmdhand.cpp b/src/d/actor/d_a_bmdhand.cpp index 0394b5b52..299ff1e40 100644 --- a/src/d/actor/d_a_bmdhand.cpp +++ b/src/d/actor/d_a_bmdhand.cpp @@ -117,7 +117,7 @@ static BOOL solidHeapCB(fopAc_ac_c*) { } /* 00003230-000034FC .text daBmdhand_Create__FP10fopAc_ac_c */ -static s32 daBmdhand_Create(fopAc_ac_c*) { +static cPhs_State daBmdhand_Create(fopAc_ac_c*) { /* Nonmatching */ } diff --git a/src/d/actor/d_a_bo.cpp b/src/d/actor/d_a_bo.cpp index 58b7ac452..41a96f4ee 100644 --- a/src/d/actor/d_a_bo.cpp +++ b/src/d/actor/d_a_bo.cpp @@ -132,7 +132,7 @@ static BOOL useHeapInit(fopAc_ac_c*) { } /* 00004D50-000050DC .text daBO_Create__FP10fopAc_ac_c */ -static s32 daBO_Create(fopAc_ac_c*) { +static cPhs_State daBO_Create(fopAc_ac_c*) { /* Nonmatching */ } diff --git a/src/d/actor/d_a_boko.cpp b/src/d/actor/d_a_boko.cpp index 4d2b79af6..1dffd3b37 100644 --- a/src/d/actor/d_a_boko.cpp +++ b/src/d/actor/d_a_boko.cpp @@ -251,7 +251,7 @@ BOOL daBoko_c::createHeap() { } /* 00002DE4-00003154 .text create__8daBoko_cFv */ -s32 daBoko_c::create() { +cPhs_State daBoko_c::create() { /* Nonmatching */ fopAcM_SetupActor(this, daBoko_c); } @@ -261,7 +261,7 @@ daBoko_c::daBoko_c() { } /* 00003824-00003844 .text daBoko_Create__FP10fopAc_ac_c */ -static s32 daBoko_Create(fopAc_ac_c* i_this) { +static cPhs_State daBoko_Create(fopAc_ac_c* i_this) { return static_cast(i_this)->create(); } diff --git a/src/d/actor/d_a_bomb2.cpp b/src/d/actor/d_a_bomb2.cpp index e1c1471d3..d5188af4a 100644 --- a/src/d/actor/d_a_bomb2.cpp +++ b/src/d/actor/d_a_bomb2.cpp @@ -405,10 +405,10 @@ namespace daBomb2 { start_proc_call(); } - int Act_c::_create() { + cPhs_State Act_c::_create() { fopAcM_SetupActor(this, Act_c); - int status = dComIfG_resLoad(&mPhase, attr().resName); + cPhs_State status = dComIfG_resLoad(&mPhase, attr().resName); if(status == cPhs_COMPLEATE_e) { if(fopAcM_entrySolidHeap(this, solidHeapCB, attr().heapSize)) { @@ -1312,7 +1312,7 @@ namespace daBomb2 { } namespace { - int Mthd_Create(void* i_this) { + cPhs_State Mthd_Create(void* i_this) { return static_cast(i_this)->_create(); } @@ -1328,8 +1328,8 @@ namespace daBomb2 { return static_cast(i_this)->_draw(); } - bool Mthd_IsDelete(void*) { - return true; + BOOL Mthd_IsDelete(void* i_this) { + return TRUE; } static actor_method_class Mthd_Table = { diff --git a/src/d/actor/d_a_bomb3.inc b/src/d/actor/d_a_bomb3.inc index 82aff58af..521439d4e 100644 --- a/src/d/actor/d_a_bomb3.inc +++ b/src/d/actor/d_a_bomb3.inc @@ -1337,7 +1337,7 @@ int daBomb_c::create() { fopAcM_SetupActor(this, daBomb_c); - int status; + cPhs_State status; if(mType == 1) { status = dComIfG_resLoad(&mPhase, m_attrType[mType].resName); } diff --git a/src/d/actor/d_a_boomerang.cpp b/src/d/actor/d_a_boomerang.cpp index bd1d6c212..22bd3e139 100644 --- a/src/d/actor/d_a_boomerang.cpp +++ b/src/d/actor/d_a_boomerang.cpp @@ -140,12 +140,12 @@ static BOOL daBoomerang_createHeap(fopAc_ac_c*) { } /* 800E2CE8-800E2EF0 .text create__13daBoomerang_cFv */ -s32 daBoomerang_c::create() { +cPhs_State daBoomerang_c::create() { /* Nonmatching */ } /* 800E33F0-800E3410 .text daBoomerang_Create__FP10fopAc_ac_c */ -static s32 daBoomerang_Create(fopAc_ac_c*) { +static cPhs_State daBoomerang_Create(fopAc_ac_c*) { /* Nonmatching */ } diff --git a/src/d/actor/d_a_boss_item.cpp b/src/d/actor/d_a_boss_item.cpp index e46a9b96f..ba010aadb 100644 --- a/src/d/actor/d_a_boss_item.cpp +++ b/src/d/actor/d_a_boss_item.cpp @@ -20,7 +20,7 @@ static BOOL daBossItem_Delete(bossitem_class* i_this) { } /* 00000088-00000128 .text daBossItem_Create__FP10fopAc_ac_c */ -static s32 daBossItem_Create(fopAc_ac_c* i_this) { +static cPhs_State daBossItem_Create(fopAc_ac_c* i_this) { bossitem_class* bItem = static_cast(i_this); fopAcM_SetupActor(bItem, bossitem_class); diff --git a/src/d/actor/d_a_bpw.cpp b/src/d/actor/d_a_bpw.cpp index 881e908ff..71e280859 100644 --- a/src/d/actor/d_a_bpw.cpp +++ b/src/d/actor/d_a_bpw.cpp @@ -282,7 +282,7 @@ void tori_create_init(bpw_class*) { } /* 0000D43C-0000DB08 .text daBPW_Create__FP10fopAc_ac_c */ -static s32 daBPW_Create(fopAc_ac_c*) { +static cPhs_State daBPW_Create(fopAc_ac_c*) { /* Nonmatching */ } diff --git a/src/d/actor/d_a_branch.cpp b/src/d/actor/d_a_branch.cpp index 2e603296b..8f5c06ada 100644 --- a/src/d/actor/d_a_branch.cpp +++ b/src/d/actor/d_a_branch.cpp @@ -171,12 +171,10 @@ static BOOL daBranch_Delete(daBranch_c* i_this) { return TRUE; } -inline s32 daBranch_c::create() { - int phase_state; - +inline cPhs_State daBranch_c::create() { fopAcM_SetupActor(this, daBranch_c); - phase_state = dComIfG_resLoad(&mPhase, daBranch_c::m_arcname); + cPhs_State phase_state = dComIfG_resLoad(&mPhase, daBranch_c::m_arcname); if (phase_state == cPhs_COMPLEATE_e) { if (!fopAcM_entrySolidHeap(this, daBranch_c::solidHeapCB, 0x4000)) { for (int i = 0; i < (s32)ARRAY_SIZE(mAnims); i++) { @@ -212,7 +210,7 @@ inline s32 daBranch_c::create() { } /* 00000694-0000080C .text daBranch_Create__FP10fopAc_ac_c */ -static s32 daBranch_Create(fopAc_ac_c* i_this) { +static cPhs_State daBranch_Create(fopAc_ac_c* i_this) { daBranch_c* branch = static_cast(i_this); return branch->create(); } diff --git a/src/d/actor/d_a_bridge.cpp b/src/d/actor/d_a_bridge.cpp index 8c8db0a74..f8f84826d 100644 --- a/src/d/actor/d_a_bridge.cpp +++ b/src/d/actor/d_a_bridge.cpp @@ -93,7 +93,7 @@ static BOOL CallbackCreateHeap(fopAc_ac_c*) { } /* 00004310-00004770 .text daBridge_Create__FP10fopAc_ac_c */ -static s32 daBridge_Create(fopAc_ac_c*) { +static cPhs_State daBridge_Create(fopAc_ac_c*) { /* Nonmatching */ } diff --git a/src/d/actor/d_a_bst.cpp b/src/d/actor/d_a_bst.cpp index 13fb3193f..ae65e08d9 100644 --- a/src/d/actor/d_a_bst.cpp +++ b/src/d/actor/d_a_bst.cpp @@ -208,7 +208,7 @@ static BOOL useHeapInit(fopAc_ac_c*) { } /* 0000B318-0000B860 .text daBst_Create__FP10fopAc_ac_c */ -static s32 daBst_Create(fopAc_ac_c*) { +static cPhs_State daBst_Create(fopAc_ac_c*) { /* Nonmatching */ } diff --git a/src/d/actor/d_a_btd.cpp b/src/d/actor/d_a_btd.cpp index 3b6925e1d..f8c27ea39 100644 --- a/src/d/actor/d_a_btd.cpp +++ b/src/d/actor/d_a_btd.cpp @@ -218,7 +218,7 @@ static BOOL useHeapInit(fopAc_ac_c*) { } /* 00008D78-000091D0 .text daBtd_Create__FP10fopAc_ac_c */ -static s32 daBtd_Create(fopAc_ac_c*) { +static cPhs_State daBtd_Create(fopAc_ac_c*) { /* Nonmatching */ } diff --git a/src/d/actor/d_a_bwd.cpp b/src/d/actor/d_a_bwd.cpp index 847c367ca..b102928c2 100644 --- a/src/d/actor/d_a_bwd.cpp +++ b/src/d/actor/d_a_bwd.cpp @@ -152,7 +152,7 @@ static BOOL useHeapInit(fopAc_ac_c*) { } /* 00009720-00009C7C .text daBwd_Create__FP10fopAc_ac_c */ -static s32 daBwd_Create(fopAc_ac_c*) { +static cPhs_State daBwd_Create(fopAc_ac_c*) { /* Nonmatching */ } diff --git a/src/d/actor/d_a_bwdg.cpp b/src/d/actor/d_a_bwdg.cpp index 1bd7a8d6b..1a617e096 100644 --- a/src/d/actor/d_a_bwdg.cpp +++ b/src/d/actor/d_a_bwdg.cpp @@ -233,11 +233,11 @@ static BOOL useHeapInit(fopAc_ac_c* i_actor) { } /* 000009A0-00000B5C .text daBwdg_Create__FP10fopAc_ac_c */ -static s32 daBwdg_Create(fopAc_ac_c* i_actor) { +static cPhs_State daBwdg_Create(fopAc_ac_c* i_actor) { bwdg_class* i_this = (bwdg_class*)i_actor; fopAcM_SetupActor(i_this, bwdg_class); - int phase_state = dComIfG_resLoad(&i_this->mPhase, "Bwdg"); + cPhs_State phase_state = dComIfG_resLoad(&i_this->mPhase, "Bwdg"); if (phase_state == cPhs_COMPLEATE_e) { boss = NULL; i_this->current.pos.setall(0.0f); @@ -254,6 +254,7 @@ static s32 daBwdg_Create(fopAc_ac_c* i_actor) { i_this->mpBgW->CopyBackVtx(); i_this->mpBgW->Move(); } + return phase_state; } diff --git a/src/d/actor/d_a_bwds.cpp b/src/d/actor/d_a_bwds.cpp index 31e8f1a3e..6ae192264 100644 --- a/src/d/actor/d_a_bwds.cpp +++ b/src/d/actor/d_a_bwds.cpp @@ -92,7 +92,7 @@ static BOOL useHeapInit(fopAc_ac_c*) { } /* 0000367C-000039A4 .text daBwds_Create__FP10fopAc_ac_c */ -static s32 daBwds_Create(fopAc_ac_c*) { +static cPhs_State daBwds_Create(fopAc_ac_c*) { /* Nonmatching */ } diff --git a/src/d/actor/d_a_canon.cpp b/src/d/actor/d_a_canon.cpp index 9390d749c..f074af1da 100644 --- a/src/d/actor/d_a_canon.cpp +++ b/src/d/actor/d_a_canon.cpp @@ -148,7 +148,7 @@ static s32 daCanonCreate(void*) { } /* 00002094-000023C0 .text _create__9daCanon_cFv */ -s32 daCanon_c::_create() { +cPhs_State daCanon_c::_create() { /* Nonmatching */ } diff --git a/src/d/actor/d_a_cc.cpp b/src/d/actor/d_a_cc.cpp index 34cdeade0..ebf5744e7 100644 --- a/src/d/actor/d_a_cc.cpp +++ b/src/d/actor/d_a_cc.cpp @@ -162,7 +162,7 @@ static BOOL useHeapInit(fopAc_ac_c*) { } /* 00006A74-00007160 .text daCC_Create__FP10fopAc_ac_c */ -static s32 daCC_Create(fopAc_ac_c*) { +static cPhs_State daCC_Create(fopAc_ac_c*) { /* Nonmatching */ } diff --git a/src/d/actor/d_a_coming2.cpp b/src/d/actor/d_a_coming2.cpp index e81c21b66..3e1001045 100644 --- a/src/d/actor/d_a_coming2.cpp +++ b/src/d/actor/d_a_coming2.cpp @@ -162,7 +162,7 @@ void daComing2::Act_c::coming_process_main() { } /* 00002154-00002264 .text _create__Q29daComing25Act_cFv */ -s32 daComing2::Act_c::_create() { +cPhs_State daComing2::Act_c::_create() { /* Nonmatching */ } @@ -184,27 +184,27 @@ bool daComing2::Act_c::_draw() { namespace daComing2 { namespace { /* 000023B8-000023D8 .text Mthd_Create__Q29daComing225@unnamed@d_a_coming2_cpp@FPv */ -void Mthd_Create(void*) { +cPhs_State Mthd_Create(void*) { /* Nonmatching */ } /* 000023D8-000023FC .text Mthd_Delete__Q29daComing225@unnamed@d_a_coming2_cpp@FPv */ -void Mthd_Delete(void*) { +BOOL Mthd_Delete(void*) { /* Nonmatching */ } /* 000023FC-00002420 .text Mthd_Execute__Q29daComing225@unnamed@d_a_coming2_cpp@FPv */ -void Mthd_Execute(void*) { +BOOL Mthd_Execute(void*) { /* Nonmatching */ } /* 00002420-00002444 .text Mthd_Draw__Q29daComing225@unnamed@d_a_coming2_cpp@FPv */ -void Mthd_Draw(void*) { +BOOL Mthd_Draw(void*) { /* Nonmatching */ } /* 00002444-0000244C .text Mthd_IsDelete__Q29daComing225@unnamed@d_a_coming2_cpp@FPv */ -void Mthd_IsDelete(void*) { +BOOL Mthd_IsDelete(void*) { /* Nonmatching */ } diff --git a/src/d/actor/d_a_coming3.cpp b/src/d/actor/d_a_coming3.cpp index 6d06b641a..e0f67ded1 100644 --- a/src/d/actor/d_a_coming3.cpp +++ b/src/d/actor/d_a_coming3.cpp @@ -102,7 +102,7 @@ void daComing3::Act_c::create_heap() { } /* 000018CC-00001A24 .text _create__Q29daComing35Act_cFv */ -s32 daComing3::Act_c::_create() { +cPhs_State daComing3::Act_c::_create() { /* Nonmatching */ } @@ -124,27 +124,27 @@ bool daComing3::Act_c::_draw() { namespace daComing3 { namespace { /* 00001D14-00001D34 .text Mthd_Create__Q29daComing325@unnamed@d_a_coming3_cpp@FPv */ -void Mthd_Create(void*) { +cPhs_State Mthd_Create(void*) { /* Nonmatching */ } /* 00001D34-00001D58 .text Mthd_Delete__Q29daComing325@unnamed@d_a_coming3_cpp@FPv */ -void Mthd_Delete(void*) { +BOOL Mthd_Delete(void*) { /* Nonmatching */ } /* 00001D58-00001D7C .text Mthd_Execute__Q29daComing325@unnamed@d_a_coming3_cpp@FPv */ -void Mthd_Execute(void*) { +BOOL Mthd_Execute(void*) { /* Nonmatching */ } /* 00001D7C-00001DA0 .text Mthd_Draw__Q29daComing325@unnamed@d_a_coming3_cpp@FPv */ -void Mthd_Draw(void*) { +BOOL Mthd_Draw(void*) { /* Nonmatching */ } /* 00001DA0-00001DA8 .text Mthd_IsDelete__Q29daComing325@unnamed@d_a_coming3_cpp@FPv */ -void Mthd_IsDelete(void*) { +BOOL Mthd_IsDelete(void*) { /* Nonmatching */ } diff --git a/src/d/actor/d_a_dai.cpp b/src/d/actor/d_a_dai.cpp index 9f678940f..04930adcf 100644 --- a/src/d/actor/d_a_dai.cpp +++ b/src/d/actor/d_a_dai.cpp @@ -27,7 +27,7 @@ void daDai_c::CreateInit() { } /* 000003A8-00000494 .text _create__7daDai_cFv */ -s32 daDai_c::_create() { +cPhs_State daDai_c::_create() { /* Nonmatching */ } @@ -92,7 +92,7 @@ void daDai_c::next_msgStatus(unsigned long*) { } /* 0000109C-000010BC .text daDai_Create__FPv */ -static s32 daDai_Create(void*) { +static cPhs_State daDai_Create(void*) { /* Nonmatching */ } diff --git a/src/d/actor/d_a_dai_item.cpp b/src/d/actor/d_a_dai_item.cpp index 4baefa8f3..ad20d5dc5 100644 --- a/src/d/actor/d_a_dai_item.cpp +++ b/src/d/actor/d_a_dai_item.cpp @@ -374,17 +374,17 @@ void daStandItem_c::CreateInit() { } /* 800E3E94-800E4048 .text _create__13daStandItem_cFv */ -s32 daStandItem_c::_create() { +cPhs_State daStandItem_c::_create() { fopAcM_SetupActor(this, daStandItem_c); mItemNo = fopAcM_GetParam(this); mItemType = convItemNo(mItemNo); - s32 rt = dComIfG_resLoad(&mPhsDai, m_arcname); + cPhs_State rt = dComIfG_resLoad(&mPhsDai, m_arcname); if (rt != cPhs_COMPLEATE_e) return rt; - s32 cloth_rt = dComIfG_resLoad(&mPhsCloth, "Cloth"); + cPhs_State cloth_rt = dComIfG_resLoad(&mPhsCloth, "Cloth"); if (cloth_rt != cPhs_COMPLEATE_e) return cloth_rt; @@ -774,7 +774,7 @@ bool daStandItem_c::_draw() { } /* 800E53B8-800E53D8 .text daStandItem_Create__FPv */ -static s32 daStandItem_Create(void* i_this) { +static cPhs_State daStandItem_Create(void* i_this) { return ((daStandItem_c*)i_this)->_create(); } diff --git a/src/d/actor/d_a_daiocta.cpp b/src/d/actor/d_a_daiocta.cpp index 7878589d1..d02eadcdc 100644 --- a/src/d/actor/d_a_daiocta.cpp +++ b/src/d/actor/d_a_daiocta.cpp @@ -253,7 +253,7 @@ void daDaiocta_c::createInit() { } /* 00004660-00004918 .text _create__11daDaiocta_cFv */ -s32 daDaiocta_c::_create() { +cPhs_State daDaiocta_c::_create() { /* Nonmatching */ } diff --git a/src/d/actor/d_a_daiocta_eye.cpp b/src/d/actor/d_a_daiocta_eye.cpp index 9c54162da..e83bcb857 100644 --- a/src/d/actor/d_a_daiocta_eye.cpp +++ b/src/d/actor/d_a_daiocta_eye.cpp @@ -103,7 +103,7 @@ void daDaiocta_Eye_c::createInit() { } /* 000012D4-00001450 .text _create__15daDaiocta_Eye_cFv */ -s32 daDaiocta_Eye_c::_create() { +cPhs_State daDaiocta_Eye_c::_create() { /* Nonmatching */ } diff --git a/src/d/actor/d_a_deku_item.cpp b/src/d/actor/d_a_deku_item.cpp index 122683cb0..50b780eec 100644 --- a/src/d/actor/d_a_deku_item.cpp +++ b/src/d/actor/d_a_deku_item.cpp @@ -105,7 +105,7 @@ void daDekuItem_c::CreateInit() { } /* 000003A8-00000598 .text _create__12daDekuItem_cFv */ -s32 daDekuItem_c::_create() { +cPhs_State daDekuItem_c::_create() { fopAcM_SetupActor(this, daDekuItem_c); mItemBitNo = daDekuItem_prm::getItemBitNo(this); @@ -118,7 +118,7 @@ s32 daDekuItem_c::_create() { return cPhs_ERROR_e; } - s32 phase_state = dComIfG_resLoad(&mPhs, m_arcname); + cPhs_State phase_state = dComIfG_resLoad(&mPhs, m_arcname); if (phase_state == cPhs_COMPLEATE_e) { if (!fopAcM_entrySolidHeap(this, CheckCreateHeap, 0x5000)) { @@ -249,7 +249,7 @@ bool daDekuItem_c::_draw() { } /* 00000ECC-00000EEC .text daDekuItem_Create__FPv */ -static s32 daDekuItem_Create(void* i_this) { +static cPhs_State daDekuItem_Create(void* i_this) { return static_cast(i_this)->_create(); } diff --git a/src/d/actor/d_a_demo00.cpp b/src/d/actor/d_a_demo00.cpp index 570257a03..dbc9f7129 100644 --- a/src/d/actor/d_a_demo00.cpp +++ b/src/d/actor/d_a_demo00.cpp @@ -206,7 +206,7 @@ static BOOL daDemo00_Delete(daDemo00_c* i_this) { } /* 800E78D0-800E7964 .text daDemo00_Create__FP10fopAc_ac_c */ -static s32 daDemo00_Create(fopAc_ac_c* i_ac) { +static cPhs_State daDemo00_Create(fopAc_ac_c* i_ac) { daDemo00_c* i_this = (daDemo00_c*)i_ac; fopAcM_SetupActor(i_this, daDemo00_c); dKy_tevstr_init(&i_this->tevStr, dComIfGp_roomControl_getStayNo(), 0xFF); diff --git a/src/d/actor/d_a_demo_dk.cpp b/src/d/actor/d_a_demo_dk.cpp index c6da6514c..1d43e2590 100644 --- a/src/d/actor/d_a_demo_dk.cpp +++ b/src/d/actor/d_a_demo_dk.cpp @@ -47,7 +47,7 @@ static BOOL useHeapInit(fopAc_ac_c*) { } /* 000005FC-00000714 .text daDEMO_DK_Create__FP10fopAc_ac_c */ -static s32 daDEMO_DK_Create(fopAc_ac_c*) { +static cPhs_State daDEMO_DK_Create(fopAc_ac_c*) { /* Nonmatching */ } diff --git a/src/d/actor/d_a_demo_item.cpp b/src/d/actor/d_a_demo_item.cpp index 3c3d70b4e..ccaac77ac 100644 --- a/src/d/actor/d_a_demo_item.cpp +++ b/src/d/actor/d_a_demo_item.cpp @@ -452,7 +452,7 @@ BOOL daDitem_c::Delete() { return DeleteBase(dItem_data::getArcname(m_itemNo)); } -s32 daDitem_c::create() { +cPhs_State daDitem_c::create() { fopAcM_SetupActor(this, daDitem_c); m_itemNo = daDitem_prm::getNo(this); @@ -462,7 +462,7 @@ s32 daDitem_c::create() { m_itemNo = dItem_GREEN_RUPEE_e; } - s32 phase_state = dComIfG_resLoad(&mPhs, dItem_data::getArcname(m_itemNo)); + cPhs_State phase_state = dComIfG_resLoad(&mPhs, dItem_data::getArcname(m_itemNo)); if (phase_state == cPhs_COMPLEATE_e) { u32 heap_size = dItem_data::getHeapSize(m_itemNo); if (!fopAcM_entrySolidHeap(this, CheckItemCreateHeap, heap_size)) { @@ -507,7 +507,7 @@ static BOOL daDitem_Delete(daDitem_c* i_this) { } /* 00000994-00000B6C .text daDitem_Create__FP9daDitem_c */ -static s32 daDitem_Create(daDitem_c* i_this) { +static cPhs_State daDitem_Create(daDitem_c* i_this) { return i_this->create(); } diff --git a/src/d/actor/d_a_demo_kmm.cpp b/src/d/actor/d_a_demo_kmm.cpp index ffd8ce918..6ebda6fc9 100644 --- a/src/d/actor/d_a_demo_kmm.cpp +++ b/src/d/actor/d_a_demo_kmm.cpp @@ -32,7 +32,7 @@ void daDemo_Kmm_c::CreateInit() { } /* 00000308-000003A0 .text create__12daDemo_Kmm_cFv */ -s32 daDemo_Kmm_c::create() { +cPhs_State daDemo_Kmm_c::create() { /* Nonmatching */ } @@ -62,7 +62,7 @@ static BOOL daDemo_Kmm_Delete(daDemo_Kmm_c*) { } /* 00000500-00000520 .text daDemo_Kmm_Create__FP10fopAc_ac_c */ -static s32 daDemo_Kmm_Create(fopAc_ac_c*) { +static cPhs_State daDemo_Kmm_Create(fopAc_ac_c*) { /* Nonmatching */ } diff --git a/src/d/actor/d_a_disappear.cpp b/src/d/actor/d_a_disappear.cpp index e02bfc9f1..149482841 100644 --- a/src/d/actor/d_a_disappear.cpp +++ b/src/d/actor/d_a_disappear.cpp @@ -96,7 +96,7 @@ void set_disappear(disappear_class* i_this, float scale) { } /* 800E7DBC-800E7E60 .text daDisappear_Create__FP10fopAc_ac_c */ -static s32 daDisappear_Create(fopAc_ac_c* i_this) { +static cPhs_State daDisappear_Create(fopAc_ac_c* i_this) { disappear_class* dis = static_cast(i_this); fopAcM_SetupActor(dis, disappear_class); diff --git a/src/d/actor/d_a_dk.cpp b/src/d/actor/d_a_dk.cpp index 3da16a295..f3960917b 100644 --- a/src/d/actor/d_a_dk.cpp +++ b/src/d/actor/d_a_dk.cpp @@ -73,7 +73,7 @@ static BOOL useHeapInit(fopAc_ac_c*) { } /* 00000FFC-000011EC .text daDk_Create__FP10fopAc_ac_c */ -static s32 daDk_Create(fopAc_ac_c*) { +static cPhs_State daDk_Create(fopAc_ac_c*) { /* Nonmatching */ } diff --git a/src/d/actor/d_a_door10.cpp b/src/d/actor/d_a_door10.cpp index c14d78fcb..ee2d4ae9f 100644 --- a/src/d/actor/d_a_door10.cpp +++ b/src/d/actor/d_a_door10.cpp @@ -122,7 +122,7 @@ void daDoor10_c::CreateInit() { } /* 0000125C-000013A8 .text create__10daDoor10_cFv */ -s32 daDoor10_c::create() { +cPhs_State daDoor10_c::create() { /* Nonmatching */ } @@ -182,7 +182,7 @@ static BOOL daDoor10_Delete(daDoor10_c*) { } /* 00001E18-00001EA8 .text daDoor10_Create__FP10fopAc_ac_c */ -static s32 daDoor10_Create(fopAc_ac_c*) { +static cPhs_State daDoor10_Create(fopAc_ac_c*) { /* Nonmatching */ } diff --git a/src/d/actor/d_a_door12.cpp b/src/d/actor/d_a_door12.cpp index 2b1f2af09..825c26b6f 100644 --- a/src/d/actor/d_a_door12.cpp +++ b/src/d/actor/d_a_door12.cpp @@ -137,7 +137,7 @@ void daDoor12_c::CreateInit() { } /* 0000134C-0000144C .text create__10daDoor12_cFv */ -s32 daDoor12_c::create() { +cPhs_State daDoor12_c::create() { /* Nonmatching */ } @@ -192,7 +192,7 @@ static BOOL daDoor12_Delete(daDoor12_c*) { } /* 00001CC4-00001D3C .text daDoor12_Create__FP10fopAc_ac_c */ -static s32 daDoor12_Create(fopAc_ac_c*) { +static cPhs_State daDoor12_Create(fopAc_ac_c*) { /* Nonmatching */ } diff --git a/src/d/actor/d_a_dr.cpp b/src/d/actor/d_a_dr.cpp index 6ea0294df..b8c95fb55 100644 --- a/src/d/actor/d_a_dr.cpp +++ b/src/d/actor/d_a_dr.cpp @@ -232,12 +232,12 @@ static BOOL createHeap(fopAc_ac_c* i_actor) { } /* 00000C08-00000CE4 .text daDr_Create__FP10fopAc_ac_c */ -static s32 daDr_Create(fopAc_ac_c* i_actor) { +static cPhs_State daDr_Create(fopAc_ac_c* i_actor) { fopAcM_SetupActor(i_actor, dr_class); dr_class* i_this = (dr_class*)i_actor; - s32 phase_state = dComIfG_resLoad(&i_this->mPhs, "Dr"); + cPhs_State phase_state = dComIfG_resLoad(&i_this->mPhs, "Dr"); if (phase_state == cPhs_COMPLEATE_e) { if (!fopAcM_entrySolidHeap(i_this, createHeap, 0xF000)) { return cPhs_ERROR_e; diff --git a/src/d/actor/d_a_dr2.cpp b/src/d/actor/d_a_dr2.cpp index d38a1b9e7..06877cce4 100644 --- a/src/d/actor/d_a_dr2.cpp +++ b/src/d/actor/d_a_dr2.cpp @@ -93,7 +93,7 @@ static BOOL useHeapInit(fopAc_ac_c*) { } /* 000024A0-00002668 .text daDr2_Create__FP10fopAc_ac_c */ -static s32 daDr2_Create(fopAc_ac_c*) { +static cPhs_State daDr2_Create(fopAc_ac_c*) { /* Nonmatching */ } diff --git a/src/d/actor/d_a_dummy.cpp b/src/d/actor/d_a_dummy.cpp index 79204da60..bae55f33c 100644 --- a/src/d/actor/d_a_dummy.cpp +++ b/src/d/actor/d_a_dummy.cpp @@ -19,7 +19,7 @@ bool daDummy::Act_c::create_heap() { } /* 000000A4-0000015C .text _create__Q27daDummy5Act_cFv */ -s32 daDummy::Act_c::_create() { +cPhs_State daDummy::Act_c::_create() { fopAcM_SetupActor(this, Act_c); if (fopAcM_entrySolidHeap(this, solidHeapCB, 0)) { @@ -54,7 +54,7 @@ bool daDummy::Act_c::_draw() { namespace daDummy { namespace { - s32 Mthd_Create(void* i_this) { + cPhs_State Mthd_Create(void* i_this) { return static_cast(i_this)->_create(); } diff --git a/src/d/actor/d_a_ep.cpp b/src/d/actor/d_a_ep.cpp index 26e7668fd..decbb3991 100644 --- a/src/d/actor/d_a_ep.cpp +++ b/src/d/actor/d_a_ep.cpp @@ -77,7 +77,7 @@ void daEp_CreateInit(fopAc_ac_c*) { } /* 00002608-00002840 .text daEp_Create__FP10fopAc_ac_c */ -static s32 daEp_Create(fopAc_ac_c*) { +static cPhs_State daEp_Create(fopAc_ac_c*) { /* Nonmatching */ } diff --git a/src/d/actor/d_a_esa.cpp b/src/d/actor/d_a_esa.cpp index ae80f8ce5..1ffd9ba9e 100644 --- a/src/d/actor/d_a_esa.cpp +++ b/src/d/actor/d_a_esa.cpp @@ -240,7 +240,7 @@ static BOOL daEsa_CreateHeap(fopAc_ac_c* i_actor) { } /* 800E8AB0-800E8CA4 .text daEsa_Create__FP10fopAc_ac_c */ -static s32 daEsa_Create(fopAc_ac_c* i_actor) { +static cPhs_State daEsa_Create(fopAc_ac_c* i_actor) { daPy_py_c* player = daPy_getPlayerActorClass(); fopAcM_SetupActor(i_actor, esa_class); diff --git a/src/d/actor/d_a_fallrock.cpp b/src/d/actor/d_a_fallrock.cpp index 7f5be4701..aa4901941 100644 --- a/src/d/actor/d_a_fallrock.cpp +++ b/src/d/actor/d_a_fallrock.cpp @@ -47,12 +47,12 @@ static BOOL daFallRock_Delete(daFallRock_c*) { } /* 00001030-00001050 .text daFallRock_Create__FP10fopAc_ac_c */ -static s32 daFallRock_Create(fopAc_ac_c*) { +static cPhs_State daFallRock_Create(fopAc_ac_c*) { /* Nonmatching */ } /* 00001050-0000127C .text create__12daFallRock_cFv */ -s32 daFallRock_c::create() { +cPhs_State daFallRock_c::create() { /* Nonmatching */ } diff --git a/src/d/actor/d_a_fallrock_tag.cpp b/src/d/actor/d_a_fallrock_tag.cpp index 9656f2c1a..8652bf729 100644 --- a/src/d/actor/d_a_fallrock_tag.cpp +++ b/src/d/actor/d_a_fallrock_tag.cpp @@ -27,7 +27,7 @@ static BOOL daFallRockTag_Delete(daFallRockTag_c*) { } /* 000002EC-00000360 .text daFallRockTag_Create__FP10fopAc_ac_c */ -static s32 daFallRockTag_Create(fopAc_ac_c*) { +static cPhs_State daFallRockTag_Create(fopAc_ac_c*) { /* Nonmatching */ } diff --git a/src/d/actor/d_a_fan.cpp b/src/d/actor/d_a_fan.cpp index beccfae66..743a9a144 100644 --- a/src/d/actor/d_a_fan.cpp +++ b/src/d/actor/d_a_fan.cpp @@ -69,7 +69,7 @@ BOOL daFan_c::Delete() { } /* 000000F0-0000040C .text CreateHeap__7daFan_cFv */ -int daFan_c::CreateHeap() { +BOOL daFan_c::CreateHeap() { J3DModelData* modelData = static_cast(dComIfG_getObjectRes(m_arcname[mType], m_bdlidx[mType])); JUT_ASSERT(0x15e, modelData != NULL); @@ -105,7 +105,7 @@ int daFan_c::CreateHeap() { static int nodeCallBack(J3DNode*, int); /* 0000040C-00000640 .text Create__7daFan_cFv */ -int daFan_c::Create() { +BOOL daFan_c::Create() { f32 wind_len = m_wind_length[mType]; fopAcM_SetMtx(this, mModel->getBaseTRMtx()); Vec cullMin = m_cull_min[mType]; @@ -153,15 +153,15 @@ static int nodeCallBack(J3DNode* node, int calcTiming) { } /* 000006F4-00000900 .text _create__7daFan_cFv */ -s32 daFan_c::_create() { +cPhs_State daFan_c::_create() { fopAcM_SetupActor(this, daFan_c); mType = daFan_prm::getType(this); - s32 rt1 = dComIfG_resLoad(&mPhs, m_arcname[mType]); + cPhs_State rt1 = dComIfG_resLoad(&mPhs, m_arcname[mType]); if (rt1 != cPhs_COMPLEATE_e) return rt1; - s32 rt2 = dComIfG_resLoad(&mWindPhs, m_arcname2); + cPhs_State rt2 = dComIfG_resLoad(&mWindPhs, m_arcname2); if (rt2 != cPhs_COMPLEATE_e) return rt2; @@ -261,7 +261,7 @@ BOOL daFan_c::Draw() { } /* 0000118C-000011AC .text daFan_Create__FPv */ -static BOOL daFan_Create(void* i_this) { +static cPhs_State daFan_Create(void* i_this) { return ((daFan_c*)i_this)->_create(); } diff --git a/src/d/actor/d_a_ff.cpp b/src/d/actor/d_a_ff.cpp index fd2f79162..edbcbb78e 100644 --- a/src/d/actor/d_a_ff.cpp +++ b/src/d/actor/d_a_ff.cpp @@ -47,7 +47,7 @@ static BOOL useHeapInit(fopAc_ac_c*) { } /* 000013D4-0000164C .text daFf_Create__FP10fopAc_ac_c */ -static s32 daFf_Create(fopAc_ac_c*) { +static cPhs_State daFf_Create(fopAc_ac_c*) { /* Nonmatching */ } diff --git a/src/d/actor/d_a_fganon.cpp b/src/d/actor/d_a_fganon.cpp index e8a0f204b..aa981225b 100644 --- a/src/d/actor/d_a_fganon.cpp +++ b/src/d/actor/d_a_fganon.cpp @@ -857,10 +857,10 @@ BOOL kabe_check(fganon_class* i_this) { cXyz tempPos = player->eyePos + transformedPos; linChk.Set(&player->eyePos, &tempPos, a_this); if (dComIfG_Bgsp()->LineCross(&linChk)) { - return 1; + return TRUE; } } - return 0; + return FALSE; } /* 00004300-000044CC .text deru__FP12fganon_class */ @@ -2780,7 +2780,7 @@ static dCcD_SrcSph ball_at_sph_src = { }; /* 00009844-00009C70 .text daFganon_Create__FP10fopAc_ac_c */ -static s32 daFganon_Create(fopAc_ac_c* i_act) { +static cPhs_State daFganon_Create(fopAc_ac_c* i_act) { fganon_class* i_this = (fganon_class*)i_act; fopAcM_SetupActor(i_act, fganon_class); s32 res; diff --git a/src/d/actor/d_a_fgmahou.cpp b/src/d/actor/d_a_fgmahou.cpp index e62ca3b85..7a217ea8c 100644 --- a/src/d/actor/d_a_fgmahou.cpp +++ b/src/d/actor/d_a_fgmahou.cpp @@ -42,7 +42,7 @@ static BOOL useHeapInit(fopAc_ac_c*) { } /* 000010E4-0000135C .text daFgmahou_Create__FP10fopAc_ac_c */ -static s32 daFgmahou_Create(fopAc_ac_c*) { +static cPhs_State daFgmahou_Create(fopAc_ac_c*) { /* Nonmatching */ } diff --git a/src/d/actor/d_a_fire.cpp b/src/d/actor/d_a_fire.cpp index b591f53fe..a8ee90ade 100644 --- a/src/d/actor/d_a_fire.cpp +++ b/src/d/actor/d_a_fire.cpp @@ -17,7 +17,7 @@ void daFire_c::CreateInit() { } /* 00000518-00000758 .text _create__8daFire_cFv */ -s32 daFire_c::_create() { +cPhs_State daFire_c::_create() { /* Nonmatching */ } @@ -87,7 +87,7 @@ bool daFire_c::_draw() { } /* 000015AC-000015CC .text daFire_Create__FPv */ -static s32 daFire_Create(void*) { +static cPhs_State daFire_Create(void*) { /* Nonmatching */ } diff --git a/src/d/actor/d_a_floor.cpp b/src/d/actor/d_a_floor.cpp index b6885c311..656f4bfb3 100644 --- a/src/d/actor/d_a_floor.cpp +++ b/src/d/actor/d_a_floor.cpp @@ -34,7 +34,7 @@ BOOL daFloor_c::Delete() { } /* 0000012C-000001E8 .text CreateHeap__9daFloor_cFv */ -int daFloor_c::CreateHeap() { +BOOL daFloor_c::CreateHeap() { J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(m_arcname, HHYU1_BDL_HHYU1); JUT_ASSERT(0xc1, modelData != NULL); mpModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000022); @@ -44,7 +44,7 @@ int daFloor_c::CreateHeap() { } /* 000001E8-0000025C .text Create__9daFloor_cFv */ -int daFloor_c::Create() { +BOOL daFloor_c::Create() { fopAcM_SetMtx(this, mpModel->getBaseTRMtx()); fopAcM_setCullSizeBox(this, -100.0f, -50.0f, -100.0f, 100.0f, 50.0f, 100.0f); set_mtx(); @@ -53,14 +53,14 @@ int daFloor_c::Create() { } /* 0000025C-00000354 .text _create__9daFloor_cFv */ -s32 daFloor_c::_create() { +cPhs_State daFloor_c::_create() { fopAcM_SetupActor(this, daFloor_c); mSwitchNo = daFloor_prm::getSwitchNo(this); if (mSwitchNo != 0xFF && dComIfGs_isSwitch(mSwitchNo, fopAcM_GetHomeRoomNo(this))) return cPhs_ERROR_e; - s32 rt = dComIfG_resLoad(&mPhs, m_arcname); + cPhs_State rt = dComIfG_resLoad(&mPhs, m_arcname); if (rt == cPhs_COMPLEATE_e) { if (!MoveBGCreate(m_arcname, HHYU1_DZB_HHYU1, NULL, 0x8A0)) return cPhs_ERROR_e; @@ -77,7 +77,7 @@ void daFloor_c::set_mtx() { } /* 000003D4-00000548 .text Execute__9daFloor_cFPPA3_A4_f */ -int daFloor_c::Execute(Mtx**) { +BOOL daFloor_c::Execute(Mtx**) { if (field_0x2da != 0) { field_0x2da--; if (field_0x2da == 0) { @@ -117,7 +117,7 @@ BOOL daFloor_c::Draw() { } /* 000006E0-00000700 .text daFloor_Create__FPv */ -static s32 daFloor_Create(void* i_this) { +static cPhs_State daFloor_Create(void* i_this) { return ((daFloor_c*)i_this)->_create(); } diff --git a/src/d/actor/d_a_fm.cpp b/src/d/actor/d_a_fm.cpp index 24386ff17..dd8e02743 100644 --- a/src/d/actor/d_a_fm.cpp +++ b/src/d/actor/d_a_fm.cpp @@ -532,7 +532,7 @@ void daFm_c::createInit() { } /* 000090DC-00009258 .text _create__6daFm_cFv */ -s32 daFm_c::_create() { +cPhs_State daFm_c::_create() { /* Nonmatching */ } diff --git a/src/d/actor/d_a_ghostship.cpp b/src/d/actor/d_a_ghostship.cpp index 44c4f2f0b..2e988cef5 100644 --- a/src/d/actor/d_a_ghostship.cpp +++ b/src/d/actor/d_a_ghostship.cpp @@ -240,7 +240,7 @@ static s32 daGhostshipCreate(void* i_actor) { daGhostship_c* i_this = static_cast(i_actor); fopAcM_SetupActor(i_this, daGhostship_c); - s32 result = dComIfG_resLoad(&i_this->mPhs, daGhostship_c::m_arc_name); + cPhs_State result = dComIfG_resLoad(&i_this->mPhs, daGhostship_c::m_arc_name); if(result != cPhs_COMPLEATE_e) { return result; } diff --git a/src/d/actor/d_a_gm.cpp b/src/d/actor/d_a_gm.cpp index 14d95c2f8..d0ede962f 100644 --- a/src/d/actor/d_a_gm.cpp +++ b/src/d/actor/d_a_gm.cpp @@ -128,7 +128,7 @@ static BOOL useHeapInit(fopAc_ac_c*) { } /* 00007EBC-0000842C .text daGM_Create__FP10fopAc_ac_c */ -static s32 daGM_Create(fopAc_ac_c*) { +static cPhs_State daGM_Create(fopAc_ac_c*) { /* Nonmatching */ } diff --git a/src/d/actor/d_a_gnd.cpp b/src/d/actor/d_a_gnd.cpp index 9f01509c1..aa43b86be 100644 --- a/src/d/actor/d_a_gnd.cpp +++ b/src/d/actor/d_a_gnd.cpp @@ -192,7 +192,7 @@ static BOOL useHeapInit(fopAc_ac_c*) { } /* 00007AC0-00007CFC .text daGnd_Create__FP10fopAc_ac_c */ -static s32 daGnd_Create(fopAc_ac_c*) { +static cPhs_State daGnd_Create(fopAc_ac_c*) { /* Nonmatching */ } diff --git a/src/d/actor/d_a_goal_flag.cpp b/src/d/actor/d_a_goal_flag.cpp index 28f645e2e..78c05e616 100644 --- a/src/d/actor/d_a_goal_flag.cpp +++ b/src/d/actor/d_a_goal_flag.cpp @@ -102,7 +102,7 @@ static s32 daGoal_FlagCreate(void*) { } /* 00002400-00002968 .text _create__13daGoal_Flag_cFv */ -s32 daGoal_Flag_c::_create() { +cPhs_State daGoal_Flag_c::_create() { /* Nonmatching */ } diff --git a/src/d/actor/d_a_grass.cpp b/src/d/actor/d_a_grass.cpp index b31046ca8..a167ae9f5 100644 --- a/src/d/actor/d_a_grass.cpp +++ b/src/d/actor/d_a_grass.cpp @@ -32,7 +32,7 @@ static BOOL daGrass_Delete(grass_class*) { } /* 000000FC-000014E0 .text daGrass_Create__FP10fopAc_ac_c */ -static s32 daGrass_Create(fopAc_ac_c* i_ac) { +static cPhs_State daGrass_Create(fopAc_ac_c* i_ac) { static const csXyz l_setType0[] = { csXyz(0, 0, 0), csXyz(3, 0, -50), diff --git a/src/d/actor/d_a_grid.cpp b/src/d/actor/d_a_grid.cpp index dabe20a85..37b32a0cc 100644 --- a/src/d/actor/d_a_grid.cpp +++ b/src/d/actor/d_a_grid.cpp @@ -60,12 +60,12 @@ static BOOL daGrid_Delete(daGrid_c*) { } /* 800EA978-800EA998 .text daGrid_Create__FP10fopAc_ac_c */ -static s32 daGrid_Create(fopAc_ac_c*) { +static cPhs_State daGrid_Create(fopAc_ac_c*) { /* Nonmatching */ } /* 800EA998-800EAEAC .text _create__8daGrid_cFv */ -s32 daGrid_c::_create() { +cPhs_State daGrid_c::_create() { /* Nonmatching */ } diff --git a/src/d/actor/d_a_gy.cpp b/src/d/actor/d_a_gy.cpp index 9b7a90b64..93012b150 100644 --- a/src/d/actor/d_a_gy.cpp +++ b/src/d/actor/d_a_gy.cpp @@ -207,7 +207,7 @@ void daGy_c::createInit() { } /* 00004920-00004A80 .text _create__6daGy_cFv */ -s32 daGy_c::_create() { +cPhs_State daGy_c::_create() { /* Nonmatching */ } diff --git a/src/d/actor/d_a_gy_ctrl.cpp b/src/d/actor/d_a_gy_ctrl.cpp index 4b2bb8e5d..5533d58e3 100644 --- a/src/d/actor/d_a_gy_ctrl.cpp +++ b/src/d/actor/d_a_gy_ctrl.cpp @@ -137,7 +137,7 @@ void daGy_Ctrl_c::checkGyCtrlExist() { } /* 00001458-000016AC .text _create__11daGy_Ctrl_cFv */ -s32 daGy_Ctrl_c::_create() { +cPhs_State daGy_Ctrl_c::_create() { /* Nonmatching */ } diff --git a/src/d/actor/d_a_himo2.cpp b/src/d/actor/d_a_himo2.cpp index 6615fd455..ef7dd4d24 100644 --- a/src/d/actor/d_a_himo2.cpp +++ b/src/d/actor/d_a_himo2.cpp @@ -102,7 +102,7 @@ static BOOL CallbackCreateHeap(fopAc_ac_c*) { } /* 800F07F4-800F0B08 .text daHimo2_Create__FP10fopAc_ac_c */ -static s32 daHimo2_Create(fopAc_ac_c*) { +static cPhs_State daHimo2_Create(fopAc_ac_c*) { /* Nonmatching */ } diff --git a/src/d/actor/d_a_himo3.cpp b/src/d/actor/d_a_himo3.cpp index db6cacf41..3bb266dec 100644 --- a/src/d/actor/d_a_himo3.cpp +++ b/src/d/actor/d_a_himo3.cpp @@ -57,7 +57,7 @@ void useHeapInit(himo3_class*) { } /* 00001DD4-00002128 .text daHimo3_Create__FP10fopAc_ac_c */ -static s32 daHimo3_Create(fopAc_ac_c*) { +static cPhs_State daHimo3_Create(fopAc_ac_c*) { /* Nonmatching */ } diff --git a/src/d/actor/d_a_hitobj.cpp b/src/d/actor/d_a_hitobj.cpp index 5e563c976..dcf3b3292 100644 --- a/src/d/actor/d_a_hitobj.cpp +++ b/src/d/actor/d_a_hitobj.cpp @@ -42,11 +42,11 @@ static BOOL daHitobj_Delete(hitobj_class* i_this) { } /* 00000120-0000025C .text daHitobj_Create__FP10fopAc_ac_c */ -static s32 daHitobj_Create(fopAc_ac_c* pActor) { +static cPhs_State daHitobj_Create(fopAc_ac_c* pActor) { hitobj_class* i_this = (hitobj_class*)pActor; fopAcM_SetupActor(i_this, hitobj_class); - int res = dComIfG_resLoad(&(i_this->mPhs), "Hitobj"); + cPhs_State res = dComIfG_resLoad(&(i_this->mPhs), "Hitobj"); if (res == cPhs_COMPLEATE_e) { i_this->mUnusedParam = fopAcM_GetParam(i_this) & 0xFF; diff --git a/src/d/actor/d_a_hmlif.cpp b/src/d/actor/d_a_hmlif.cpp index c3b8750b5..87b120d0e 100644 --- a/src/d/actor/d_a_hmlif.cpp +++ b/src/d/actor/d_a_hmlif.cpp @@ -92,7 +92,7 @@ BOOL daHmlif_c::Draw() { } /* 00001610-00001630 .text daHmlif_Create__FPv */ -static s32 daHmlif_Create(void*) { +static cPhs_State daHmlif_Create(void*) { /* Nonmatching */ } diff --git a/src/d/actor/d_a_hookshot.cpp b/src/d/actor/d_a_hookshot.cpp index b1501b273..5231652f6 100644 --- a/src/d/actor/d_a_hookshot.cpp +++ b/src/d/actor/d_a_hookshot.cpp @@ -287,7 +287,7 @@ static dCcD_SrcCps l_at_cps_src = { }; /* 800F2C14-800F2CC8 .text create__12daHookshot_cFv */ -s32 daHookshot_c::create() { +cPhs_State daHookshot_c::create() { fopAcM_SetupActor(this, daHookshot_c); mShape.setUserArea(reinterpret_cast(this)); @@ -308,7 +308,7 @@ s32 daHookshot_c::create() { } /* 800F3134-800F3154 .text daHookshot_Create__FP10fopAc_ac_c */ -static s32 daHookshot_Create(fopAc_ac_c* i_actor) { +static cPhs_State daHookshot_Create(fopAc_ac_c* i_actor) { return reinterpret_cast(i_actor)->create(); } diff --git a/src/d/actor/d_a_hot_floor.cpp b/src/d/actor/d_a_hot_floor.cpp index 4776af878..3712fa019 100644 --- a/src/d/actor/d_a_hot_floor.cpp +++ b/src/d/actor/d_a_hot_floor.cpp @@ -42,7 +42,7 @@ void daHot_Floor_c::set_mtx() { } /* 00000218-00000264 .text CreateInit__13daHot_Floor_cFv */ -s32 daHot_Floor_c::CreateInit() { +cPhs_State daHot_Floor_c::CreateInit() { mbSpawnParticle = true; mSpawnTimer = 0.0f; set_mtx_init(); @@ -50,7 +50,7 @@ s32 daHot_Floor_c::CreateInit() { return cPhs_COMPLEATE_e; } -s32 daHot_Floor_c::_create() { +cPhs_State daHot_Floor_c::_create() { fopAcM_SetupActor(this, daHot_Floor_c); return CreateInit(); } diff --git a/src/d/actor/d_a_hys.cpp b/src/d/actor/d_a_hys.cpp index c53e1758e..0278106d2 100644 --- a/src/d/actor/d_a_hys.cpp +++ b/src/d/actor/d_a_hys.cpp @@ -62,7 +62,7 @@ BOOL daHys_c::Draw() { } /* 00000778-00000904 .text daHys_Create__FPv */ -static s32 daHys_Create(void*) { +static cPhs_State daHys_Create(void*) { /* Nonmatching */ } diff --git a/src/d/actor/d_a_ib.cpp b/src/d/actor/d_a_ib.cpp index 4733ddf8f..f9fc72b50 100644 --- a/src/d/actor/d_a_ib.cpp +++ b/src/d/actor/d_a_ib.cpp @@ -452,7 +452,7 @@ BOOL daIball_c::CreateHeap() { } /* 800F4B40-800F4B60 .text daIball_Create__FP10fopAc_ac_c */ -static s32 daIball_Create(fopAc_ac_c* i_this) { +static cPhs_State daIball_Create(fopAc_ac_c* i_this) { return static_cast(i_this)->_daIball_create(); } diff --git a/src/d/actor/d_a_icelift.cpp b/src/d/actor/d_a_icelift.cpp index 1a2be5dfb..cece518b1 100644 --- a/src/d/actor/d_a_icelift.cpp +++ b/src/d/actor/d_a_icelift.cpp @@ -33,7 +33,7 @@ void daIlift_c::CreateInit() { } /* 00000680-00000794 .text _create__9daIlift_cFv */ -s32 daIlift_c::_create() { +cPhs_State daIlift_c::_create() { /* Nonmatching */ } @@ -73,7 +73,7 @@ bool daIlift_c::_draw() { } /* 00000FF8-00001018 .text daIlift_Create__FPv */ -static s32 daIlift_Create(void*) { +static cPhs_State daIlift_Create(void*) { /* Nonmatching */ } diff --git a/src/d/actor/d_a_ikari.cpp b/src/d/actor/d_a_ikari.cpp index d196e7e9a..e89767de0 100644 --- a/src/d/actor/d_a_ikari.cpp +++ b/src/d/actor/d_a_ikari.cpp @@ -116,7 +116,7 @@ bool daIkari_c::_draw() { /* 00000494-000005B0 .text _create__9daIkari_cFv */ int daIkari_c::_create() { - int phase = dComIfG_resLoad(&mPhs, M_arcname); + cPhs_State phase = dComIfG_resLoad(&mPhs, M_arcname); fopAcM_SetupActor(this, daIkari_c); diff --git a/src/d/actor/d_a_item.cpp b/src/d/actor/d_a_item.cpp index 0c7649285..f17a12537 100644 --- a/src/d/actor/d_a_item.cpp +++ b/src/d/actor/d_a_item.cpp @@ -233,7 +233,7 @@ s32 daItem_c::_daItem_create() { } } - s32 phase_state = dComIfG_resLoad(&mPhs, dItem_data::getFieldArc(m_itemNo)); + cPhs_State phase_state = dComIfG_resLoad(&mPhs, dItem_data::getFieldArc(m_itemNo)); if (phase_state == cPhs_COMPLEATE_e) { // Note: The demo version calls getHeapSize instead of getFieldHeapSize here. u32 heap_size = dItem_data::getFieldHeapSize(m_itemNo); @@ -1454,7 +1454,7 @@ static BOOL daItem_Delete(daItem_c* i_this) { } /* 800F89D0-800F89F0 .text daItem_Create__FP10fopAc_ac_c */ -static s32 daItem_Create(fopAc_ac_c* i_this) { +static cPhs_State daItem_Create(fopAc_ac_c* i_this) { return ((daItem_c*)i_this)->_daItem_create(); } diff --git a/src/d/actor/d_a_jbo.cpp b/src/d/actor/d_a_jbo.cpp index 58ebde1d4..f5b961ce5 100644 --- a/src/d/actor/d_a_jbo.cpp +++ b/src/d/actor/d_a_jbo.cpp @@ -48,7 +48,7 @@ static BOOL useHeapInit(fopAc_ac_c*) { } /* 0000081C-00000A90 .text daJBO_Create__FP10fopAc_ac_c */ -static s32 daJBO_Create(fopAc_ac_c*) { +static cPhs_State daJBO_Create(fopAc_ac_c*) { /* Nonmatching */ } diff --git a/src/d/actor/d_a_kaji.cpp b/src/d/actor/d_a_kaji.cpp index 71ec47a30..a921b67f1 100644 --- a/src/d/actor/d_a_kaji.cpp +++ b/src/d/actor/d_a_kaji.cpp @@ -40,10 +40,10 @@ BOOL daKaji_c::CreateHeap() { return mpMorf && mpMorf->getModel(); } -s32 daKaji_c::_create() { +cPhs_State daKaji_c::_create() { fopAcM_SetupActor(this, daKaji_c); - s32 phase_state = dComIfG_resLoad(&mPhs, M_arcname); + cPhs_State phase_state = dComIfG_resLoad(&mPhs, M_arcname); if (phase_state == cPhs_COMPLEATE_e) { if (fopAcM_entrySolidHeap(this, CheckCreateHeap, 0x660)) { mDoMtx_stack_c::transS(current.pos); diff --git a/src/d/actor/d_a_kamome.cpp b/src/d/actor/d_a_kamome.cpp index a8b02b53e..c3d6974ba 100644 --- a/src/d/actor/d_a_kamome.cpp +++ b/src/d/actor/d_a_kamome.cpp @@ -133,7 +133,7 @@ static BOOL createHeap(fopAc_ac_c*) { } /* 00004B94-00004F84 .text daKamome_Create__FP10fopAc_ac_c */ -static s32 daKamome_Create(fopAc_ac_c*) { +static cPhs_State daKamome_Create(fopAc_ac_c*) { /* Nonmatching */ } diff --git a/src/d/actor/d_a_kanban.cpp b/src/d/actor/d_a_kanban.cpp index 7d54bae1a..b3644ffd7 100644 --- a/src/d/actor/d_a_kanban.cpp +++ b/src/d/actor/d_a_kanban.cpp @@ -103,7 +103,7 @@ static BOOL useHeapInit(fopAc_ac_c*) { } /* 00002614-00002A5C .text daKanban_Create__FP10fopAc_ac_c */ -static s32 daKanban_Create(fopAc_ac_c*) { +static cPhs_State daKanban_Create(fopAc_ac_c*) { /* Nonmatching */ } diff --git a/src/d/actor/d_a_kantera.cpp b/src/d/actor/d_a_kantera.cpp index 1040fe52c..4bfdc63ff 100644 --- a/src/d/actor/d_a_kantera.cpp +++ b/src/d/actor/d_a_kantera.cpp @@ -57,7 +57,7 @@ static BOOL daKantera_CreateHeap(fopAc_ac_c*) { } /* 00001FA4-00002304 .text daKantera_Create__FP10fopAc_ac_c */ -static s32 daKantera_Create(fopAc_ac_c*) { +static cPhs_State daKantera_Create(fopAc_ac_c*) { /* Nonmatching */ } diff --git a/src/d/actor/d_a_kb.cpp b/src/d/actor/d_a_kb.cpp index 2e8072b49..9d9f3ec67 100644 --- a/src/d/actor/d_a_kb.cpp +++ b/src/d/actor/d_a_kb.cpp @@ -178,7 +178,7 @@ static BOOL useHeapInit(fopAc_ac_c*) { } /* 00007258-00007798 .text daKb_Create__FP10fopAc_ac_c */ -static s32 daKb_Create(fopAc_ac_c*) { +static cPhs_State daKb_Create(fopAc_ac_c*) { /* Nonmatching */ } diff --git a/src/d/actor/d_a_kddoor.cpp b/src/d/actor/d_a_kddoor.cpp index 4be28401c..f1e6fcd79 100644 --- a/src/d/actor/d_a_kddoor.cpp +++ b/src/d/actor/d_a_kddoor.cpp @@ -227,7 +227,7 @@ void daKddoor_c::CreateInit() { } /* 0000220C-000023CC .text create__10daKddoor_cFv */ -s32 daKddoor_c::create() { +cPhs_State daKddoor_c::create() { /* Nonmatching */ } @@ -282,7 +282,7 @@ static BOOL daKddoor_Delete(daKddoor_c*) { } /* 00002C44-00002C64 .text daKddoor_Create__FP10fopAc_ac_c */ -static s32 daKddoor_Create(fopAc_ac_c*) { +static cPhs_State daKddoor_Create(fopAc_ac_c*) { /* Nonmatching */ } diff --git a/src/d/actor/d_a_ki.cpp b/src/d/actor/d_a_ki.cpp index ed671164a..53531992d 100644 --- a/src/d/actor/d_a_ki.cpp +++ b/src/d/actor/d_a_ki.cpp @@ -113,7 +113,7 @@ static BOOL useHeapInit(fopAc_ac_c*) { } /* 00004364-000046F4 .text daKi_Create__FP10fopAc_ac_c */ -static s32 daKi_Create(fopAc_ac_c*) { +static cPhs_State daKi_Create(fopAc_ac_c*) { /* Nonmatching */ } diff --git a/src/d/actor/d_a_kita.cpp b/src/d/actor/d_a_kita.cpp index 0b04caab5..18db92641 100644 --- a/src/d/actor/d_a_kita.cpp +++ b/src/d/actor/d_a_kita.cpp @@ -23,7 +23,7 @@ void kita_move(kita_class*) { } /* 00001894-000019F8 .text himo_create__FP10kita_class */ -void himo_create(kita_class*) { +cPhs_State himo_create(kita_class*) { /* Nonmatching */ } @@ -48,7 +48,7 @@ static BOOL CallbackCreateHeap(fopAc_ac_c*) { } /* 00001EB0-00002224 .text daKita_Create__FP10fopAc_ac_c */ -static s32 daKita_Create(fopAc_ac_c*) { +static cPhs_State daKita_Create(fopAc_ac_c*) { /* Nonmatching */ } diff --git a/src/d/actor/d_a_klft.cpp b/src/d/actor/d_a_klft.cpp index e8cd63ddd..2c9d999c6 100644 --- a/src/d/actor/d_a_klft.cpp +++ b/src/d/actor/d_a_klft.cpp @@ -63,7 +63,7 @@ static BOOL CallbackCreateHeap(fopAc_ac_c*) { } /* 000017C4-00001C78 .text daKlft_Create__FP10fopAc_ac_c */ -static s32 daKlft_Create(fopAc_ac_c*) { +static cPhs_State daKlft_Create(fopAc_ac_c*) { /* Nonmatching */ } diff --git a/src/d/actor/d_a_kn.cpp b/src/d/actor/d_a_kn.cpp index 93f517a0a..f5fa8e3a7 100644 --- a/src/d/actor/d_a_kn.cpp +++ b/src/d/actor/d_a_kn.cpp @@ -57,7 +57,7 @@ static BOOL useHeapInit(fopAc_ac_c*) { } /* 000010E0-000012B0 .text daKN_Create__FP10fopAc_ac_c */ -static s32 daKN_Create(fopAc_ac_c*) { +static cPhs_State daKN_Create(fopAc_ac_c*) { /* Nonmatching */ } diff --git a/src/d/actor/d_a_knob00.cpp b/src/d/actor/d_a_knob00.cpp index 110798f77..817f2f288 100644 --- a/src/d/actor/d_a_knob00.cpp +++ b/src/d/actor/d_a_knob00.cpp @@ -77,7 +77,7 @@ void daKnob00_c::CreateInit() { } /* 00000D84-00000E70 .text create__10daKnob00_cFv */ -s32 daKnob00_c::create() { +cPhs_State daKnob00_c::create() { /* Nonmatching */ } @@ -182,7 +182,7 @@ static BOOL daKnob00_Delete(daKnob00_c*) { } /* 00001F50-00001F70 .text daKnob00_Create__FP10fopAc_ac_c */ -static s32 daKnob00_Create(fopAc_ac_c*) { +static cPhs_State daKnob00_Create(fopAc_ac_c*) { /* Nonmatching */ } diff --git a/src/d/actor/d_a_kokiie.cpp b/src/d/actor/d_a_kokiie.cpp index 0bc30de88..08d120166 100644 --- a/src/d/actor/d_a_kokiie.cpp +++ b/src/d/actor/d_a_kokiie.cpp @@ -47,7 +47,7 @@ static BOOL CallbackCreateHeap(fopAc_ac_c*) { } /* 00001250-000014E4 .text daKokiie_Create__FP10fopAc_ac_c */ -static s32 daKokiie_Create(fopAc_ac_c*) { +static cPhs_State daKokiie_Create(fopAc_ac_c*) { /* Nonmatching */ } diff --git a/src/d/actor/d_a_komore.cpp b/src/d/actor/d_a_komore.cpp index ab82e1087..824b9781c 100644 --- a/src/d/actor/d_a_komore.cpp +++ b/src/d/actor/d_a_komore.cpp @@ -42,9 +42,9 @@ bool daKomore::Act_c::create_heap() { } /* 000001F8-000002F8 .text _create__Q28daKomore5Act_cFv */ -s32 daKomore::Act_c::_create() { +cPhs_State daKomore::Act_c::_create() { fopAcM_SetupActor(this, Act_c); - int phase_state = dComIfG_resLoad(&mPhs, M_arcname); + cPhs_State phase_state = dComIfG_resLoad(&mPhs, M_arcname); if (phase_state == cPhs_COMPLEATE_e) { if (fopAcM_entrySolidHeap(this, solidHeapCB, 0x0)) { set_mtx(); @@ -92,27 +92,27 @@ bool daKomore::Act_c::_draw() { namespace daKomore { namespace { /* 00000518-00000538 .text Mthd_Create__Q28daKomore24@unnamed@d_a_komore_cpp@FPv */ -s32 Mthd_Create(void* i_this) { +cPhs_State Mthd_Create(void* i_this) { return static_cast(i_this)->_create(); } /* 00000538-0000055C .text Mthd_Delete__Q28daKomore24@unnamed@d_a_komore_cpp@FPv */ -s32 Mthd_Delete(void* i_this) { +BOOL Mthd_Delete(void* i_this) { return static_cast(i_this)->_delete(); } /* 0000055C-00000580 .text Mthd_Execute__Q28daKomore24@unnamed@d_a_komore_cpp@FPv */ -s32 Mthd_Execute(void* i_this) { +BOOL Mthd_Execute(void* i_this) { return static_cast(i_this)->_execute(); } /* 00000580-000005A4 .text Mthd_Draw__Q28daKomore24@unnamed@d_a_komore_cpp@FPv */ -s32 Mthd_Draw(void* i_this) { +BOOL Mthd_Draw(void* i_this) { return static_cast(i_this)->_draw(); } /* 000005A4-000005AC .text Mthd_IsDelete__Q28daKomore24@unnamed@d_a_komore_cpp@FPv */ -s32 Mthd_IsDelete(void* i_this) { +BOOL Mthd_IsDelete(void* i_this) { return TRUE; } diff --git a/src/d/actor/d_a_ks.cpp b/src/d/actor/d_a_ks.cpp index 7a3ce918d..81daf8f6c 100644 --- a/src/d/actor/d_a_ks.cpp +++ b/src/d/actor/d_a_ks.cpp @@ -122,7 +122,7 @@ static BOOL useHeapInit(fopAc_ac_c*) { } /* 000034F8-00003A94 .text daKS_Create__FP10fopAc_ac_c */ -static s32 daKS_Create(fopAc_ac_c*) { +static cPhs_State daKS_Create(fopAc_ac_c*) { /* Nonmatching */ } diff --git a/src/d/actor/d_a_kt.cpp b/src/d/actor/d_a_kt.cpp index 0b43fe787..ec24e90ff 100644 --- a/src/d/actor/d_a_kt.cpp +++ b/src/d/actor/d_a_kt.cpp @@ -325,12 +325,11 @@ static BOOL daKt_solidHeapCB(fopAc_ac_c* i_ac) { } /* 0000134C-00001530 .text daKt_Create__FP10fopAc_ac_c */ -static s32 daKt_Create(fopAc_ac_c* i_ac) { - s32 rt; +static cPhs_State daKt_Create(fopAc_ac_c* i_ac) { + fopAcM_SetupActor(i_ac, kt_class); kt_class* i_this = (kt_class*)i_ac; - fopAcM_SetupActor(i_this, kt_class); - rt = dComIfG_resLoad(&i_this->mPhs, "Kt"); + cPhs_State rt = dComIfG_resLoad(&i_this->mPhs, "Kt"); if (rt == cPhs_COMPLEATE_e) { if (fopAcM_entrySolidHeap(i_this, daKt_solidHeapCB, 0)) { s32 num = fopAcM_GetParam(i_this); diff --git a/src/d/actor/d_a_kui.cpp b/src/d/actor/d_a_kui.cpp index 18b1a2acc..9e413d9e0 100644 --- a/src/d/actor/d_a_kui.cpp +++ b/src/d/actor/d_a_kui.cpp @@ -64,7 +64,7 @@ static BOOL daKui_CreateHeap(fopAc_ac_c*) { } /* 00001664-000018C8 .text daKui_Create__FP10fopAc_ac_c */ -static s32 daKui_Create(fopAc_ac_c*) { +static cPhs_State daKui_Create(fopAc_ac_c*) { /* Nonmatching */ } diff --git a/src/d/actor/d_a_kytag00.cpp b/src/d/actor/d_a_kytag00.cpp index 30c02578f..2cdec50ff 100644 --- a/src/d/actor/d_a_kytag00.cpp +++ b/src/d/actor/d_a_kytag00.cpp @@ -348,7 +348,7 @@ static BOOL daKytag00_Delete(kytag00_class* i_this) { } /* 00000D64-00000F8C .text daKytag00_Create__FP10fopAc_ac_c */ -static s32 daKytag00_Create(fopAc_ac_c* i_ac) { +static cPhs_State daKytag00_Create(fopAc_ac_c* i_ac) { kytag00_class * i_this = (kytag00_class *)i_ac; fopAcM_SetupActor(i_this, kytag00_class); diff --git a/src/d/actor/d_a_kytag01.cpp b/src/d/actor/d_a_kytag01.cpp index e26e13240..8eea092bc 100644 --- a/src/d/actor/d_a_kytag01.cpp +++ b/src/d/actor/d_a_kytag01.cpp @@ -71,7 +71,7 @@ void wave_make() { } /* 00000224-00000318 .text daKytag01_Create__FP10fopAc_ac_c */ -static s32 daKytag01_Create(fopAc_ac_c* i_ac) { +static cPhs_State daKytag01_Create(fopAc_ac_c* i_ac) { dScnKy_env_light_c& env_light = dKy_getEnvlight(); kytag01_class* i_this = (kytag01_class*)i_ac; fopAcM_SetupActor(i_this, kytag01_class); diff --git a/src/d/actor/d_a_kytag02.cpp b/src/d/actor/d_a_kytag02.cpp index 3dcb09bef..3c67740ac 100644 --- a/src/d/actor/d_a_kytag02.cpp +++ b/src/d/actor/d_a_kytag02.cpp @@ -107,7 +107,7 @@ static BOOL daKytag02_Delete(kytag02_class* i_this) { } /* 00000420-0000047C .text daKytag02_Create__FP10fopAc_ac_c */ -static s32 daKytag02_Create(fopAc_ac_c* i_ac) { +static cPhs_State daKytag02_Create(fopAc_ac_c* i_ac) { kytag02_class* i_this = (kytag02_class*)i_ac; fopAcM_SetupActor(i_this, kytag02_class); i_this->mpPath = set_path_info(i_this); diff --git a/src/d/actor/d_a_kytag03.cpp b/src/d/actor/d_a_kytag03.cpp index f098dac50..f00163f09 100644 --- a/src/d/actor/d_a_kytag03.cpp +++ b/src/d/actor/d_a_kytag03.cpp @@ -124,10 +124,10 @@ static BOOL daKytag03_Delete(kytag03_class* i_this) { } /* 00000544-00000604 .text daKytag03_Create__FP10fopAc_ac_c */ -static s32 daKytag03_Create(fopAc_ac_c* i_ac) { +static cPhs_State daKytag03_Create(fopAc_ac_c* i_ac) { kytag03_class* i_this = (kytag03_class*)i_ac; fopAcM_SetupActor(i_this, kytag03_class); - s32 ret = dComIfG_resLoad(&i_this->mPhs, "M_DOOR"); + cPhs_State ret = dComIfG_resLoad(&i_this->mPhs, "M_DOOR"); if (ret == cPhs_COMPLEATE_e) { if (!fopAcM_entrySolidHeap(i_this, useHeapInit, 0x4c30)) { return cPhs_ERROR_e; diff --git a/src/d/actor/d_a_kytag05.cpp b/src/d/actor/d_a_kytag05.cpp index 3a775d3b3..fd9d00490 100644 --- a/src/d/actor/d_a_kytag05.cpp +++ b/src/d/actor/d_a_kytag05.cpp @@ -118,11 +118,11 @@ static BOOL daKytag05_Delete(kytag05_class*) { } /* 00000404-000004C0 .text daKytag05_Create__FP10fopAc_ac_c */ -static int daKytag05_Create(fopAc_ac_c* i_this) { +static cPhs_State daKytag05_Create(fopAc_ac_c* i_this) { fopAcM_SetupActor(i_this, kytag05_class); kytag05_class *a_this = (kytag05_class*)i_this; if (dComIfGs_isSymbol(1) != 0) { - return 3; + return cPhs_STOP_e; } a_this->mIndex = 0; a_this->mTimer = 0; diff --git a/src/d/actor/d_a_kytag07.cpp b/src/d/actor/d_a_kytag07.cpp index 1bfbadd89..6281e0fe2 100644 --- a/src/d/actor/d_a_kytag07.cpp +++ b/src/d/actor/d_a_kytag07.cpp @@ -80,7 +80,7 @@ static BOOL daKytag07_Delete(kytag07_class*) { } /* 000002C8-00000350 .text daKytag07_Create__FP10fopAc_ac_c */ -static s32 daKytag07_Create(fopAc_ac_c* i_ac) { +static cPhs_State daKytag07_Create(fopAc_ac_c* i_ac) { dScnKy_env_light_c& envLight = dKy_getEnvlight(); kytag07_class* i_this = (kytag07_class*)i_ac; fopAcM_SetupActor(i_this, kytag07_class); diff --git a/src/d/actor/d_a_lamp.cpp b/src/d/actor/d_a_lamp.cpp index 24404f3f2..ef1bded77 100644 --- a/src/d/actor/d_a_lamp.cpp +++ b/src/d/actor/d_a_lamp.cpp @@ -177,11 +177,11 @@ static BOOL daLamp_solidHeapCB(fopAc_ac_c* i_ac) { } /* 0000075C-00000914 .text daLamp_Create__FP10fopAc_ac_c */ -static int daLamp_Create(fopAc_ac_c* i_ac) { +static cPhs_State daLamp_Create(fopAc_ac_c* i_ac) { fopAcM_SetupActor(i_ac, lamp_class); lamp_class* i_this = (lamp_class*)i_ac; - s32 phase_state = dComIfG_resLoad(&i_this->mPhs, "Lamp"); + cPhs_State phase_state = dComIfG_resLoad(&i_this->mPhs, "Lamp"); if (phase_state == cPhs_COMPLEATE_e) { if (fopAcM_entrySolidHeap(i_this, &daLamp_solidHeapCB, 0x6040)) { i_this->mParameters = fopAcM_GetParam(i_this); diff --git a/src/d/actor/d_a_lbridge.cpp b/src/d/actor/d_a_lbridge.cpp index ba28c82b2..ff8792aaf 100644 --- a/src/d/actor/d_a_lbridge.cpp +++ b/src/d/actor/d_a_lbridge.cpp @@ -100,10 +100,10 @@ void daLbridge_c::CreateInit() { } /* 00000544-0000063C .text _create__11daLbridge_cFv */ -s32 daLbridge_c::_create() { +cPhs_State daLbridge_c::_create() { fopAcM_SetupActor(this, daLbridge_c); - s32 ret = dComIfG_resLoad(&mPhs, m_arcname); + cPhs_State ret = dComIfG_resLoad(&mPhs, m_arcname); if (ret == cPhs_COMPLEATE_e) { if (!fopAcM_entrySolidHeap(this, CheckCreateHeap, 0x2E10U)) { @@ -308,7 +308,7 @@ bool daLbridge_c::_delete() { } /* 00000FF8-00001018 .text daLbridge_Create__FPv */ -static s32 daLbridge_Create(void* i_this) { +static cPhs_State daLbridge_Create(void* i_this) { return static_cast(i_this)->_create(); } diff --git a/src/d/actor/d_a_leaflift.cpp b/src/d/actor/d_a_leaflift.cpp index 5e851374b..2775de727 100644 --- a/src/d/actor/d_a_leaflift.cpp +++ b/src/d/actor/d_a_leaflift.cpp @@ -148,7 +148,7 @@ void daLlift_c::CreateInit() { } /* 00000634-00000760 .text _create__9daLlift_cFv */ -s32 daLlift_c::_create() { +cPhs_State daLlift_c::_create() { int res; fopAcM_SetupActor(this, daLlift_c); res = dComIfG_resLoad(&mPhs, m_arcname); @@ -323,7 +323,7 @@ bool daLlift_c::_draw() { } /* 00001180-000011A0 .text daLlift_Create__FPv */ -static s32 daLlift_Create(void* i_this) { +static cPhs_State daLlift_Create(void* i_this) { return ((daLlift_c*)i_this)->_create(); } diff --git a/src/d/actor/d_a_lod_bg.cpp b/src/d/actor/d_a_lod_bg.cpp index 29ff25800..71d16f2af 100644 --- a/src/d/actor/d_a_lod_bg.cpp +++ b/src/d/actor/d_a_lod_bg.cpp @@ -368,7 +368,7 @@ static BOOL daLodbg_Delete(daLodbg_c* i_this) { } /* 000012EC-0000133C .text daLodbg_Create__FP10fopAc_ac_c */ -static s32 daLodbg_Create(fopAc_ac_c* i_ac) { +static cPhs_State daLodbg_Create(fopAc_ac_c* i_ac) { /* Nonmatching */ daLodbg_c* i_this = (daLodbg_c*)i_ac; fopAcM_SetupActor(i_this, daLodbg_c); diff --git a/src/d/actor/d_a_lstair.cpp b/src/d/actor/d_a_lstair.cpp index 8aae66e60..788312a37 100644 --- a/src/d/actor/d_a_lstair.cpp +++ b/src/d/actor/d_a_lstair.cpp @@ -27,7 +27,7 @@ void daLStair_c::CreateInit() { } /* 00000638-00000758 .text _create__10daLStair_cFv */ -s32 daLStair_c::_create() { +cPhs_State daLStair_c::_create() { /* Nonmatching */ } @@ -82,7 +82,7 @@ void daLStair_c::set_off_se() { } /* 00001144-00001164 .text daLStair_Create__FPv */ -static s32 daLStair_Create(void*) { +static cPhs_State daLStair_Create(void*) { /* Nonmatching */ } diff --git a/src/d/actor/d_a_lwood.cpp b/src/d/actor/d_a_lwood.cpp index 43651f23c..17d03b9da 100644 --- a/src/d/actor/d_a_lwood.cpp +++ b/src/d/actor/d_a_lwood.cpp @@ -110,10 +110,10 @@ void daLwood_c::setMoveBGMtx() { mDoMtx_copy(mDoMtx_stack_c::get(), mtx); } -s32 daLwood_c::_create() { +cPhs_State daLwood_c::_create() { fopAcM_SetupActor(this, daLwood_c); - s32 ret = dComIfG_resLoad(&mPhs, m_arcname); + cPhs_State ret = dComIfG_resLoad(&mPhs, m_arcname); if (ret == cPhs_COMPLEATE_e) { if (fopAcM_entrySolidHeap(this, CheckCreateHeap, 0x0e40) == 0) { @@ -149,7 +149,7 @@ bool daLwood_c::_draw() { } /* 000005D8-00000678 .text daLwood_Create__FPv */ -static s32 daLwood_Create(void* i_this) { +static cPhs_State daLwood_Create(void* i_this) { return ((daLwood_c*)i_this)->_create(); } diff --git a/src/d/actor/d_a_machine.cpp b/src/d/actor/d_a_machine.cpp index 069306939..f65673232 100644 --- a/src/d/actor/d_a_machine.cpp +++ b/src/d/actor/d_a_machine.cpp @@ -53,7 +53,7 @@ void daMachine_c::set_speed() { } /* 000007F8-00000898 .text _create__11daMachine_cFv */ -s32 daMachine_c::_create() { +cPhs_State daMachine_c::_create() { /* Nonmatching */ } @@ -93,7 +93,7 @@ bool daMachine_c::_draw() { } /* 0000154C-0000156C .text daMachine_Create__FPv */ -static s32 daMachine_Create(void*) { +static cPhs_State daMachine_Create(void*) { /* Nonmatching */ } diff --git a/src/d/actor/d_a_magma.cpp b/src/d/actor/d_a_magma.cpp index 2d29fdfe3..e4a5e661c 100644 --- a/src/d/actor/d_a_magma.cpp +++ b/src/d/actor/d_a_magma.cpp @@ -13,10 +13,10 @@ daMagma_c::~daMagma_c() { dComIfG_resDelete(&mPhs, "Magma"); } -s32 daMagma_c::create() { +cPhs_State daMagma_c::create() { fopAcM_SetupActor(this, daMagma_c); - int result = dComIfG_resLoad(&mPhs, "Magma"); + cPhs_State result = dComIfG_resLoad(&mPhs, "Magma"); if (result != cPhs_COMPLEATE_e) { return result; } @@ -45,7 +45,7 @@ static BOOL daMagma_Delete(daMagma_c* i_this) { } /* 000000CC-00000178 .text daMagma_Create__FP10fopAc_ac_c */ -static s32 daMagma_Create(fopAc_ac_c* i_this) { +static cPhs_State daMagma_Create(fopAc_ac_c* i_this) { return ((daMagma_c*)i_this)->create(); } diff --git a/src/d/actor/d_a_majuu_flag.cpp b/src/d/actor/d_a_majuu_flag.cpp index 05fed961e..1c973b806 100644 --- a/src/d/actor/d_a_majuu_flag.cpp +++ b/src/d/actor/d_a_majuu_flag.cpp @@ -67,7 +67,7 @@ static BOOL daMajuu_Flag_Delete(daMajuu_Flag_c*) { } /* 00001454-00001AE0 .text daMajuu_Flag_Create__FP10fopAc_ac_c */ -static s32 daMajuu_Flag_Create(fopAc_ac_c*) { +static cPhs_State daMajuu_Flag_Create(fopAc_ac_c*) { /* Nonmatching */ } diff --git a/src/d/actor/d_a_mant.cpp b/src/d/actor/d_a_mant.cpp index 3144744c3..9e317503d 100644 --- a/src/d/actor/d_a_mant.cpp +++ b/src/d/actor/d_a_mant.cpp @@ -52,7 +52,7 @@ static BOOL daMant_Delete(mant_class*) { } /* 00001A4C-00001D18 .text daMant_Create__FP10fopAc_ac_c */ -static s32 daMant_Create(fopAc_ac_c*) { +static cPhs_State daMant_Create(fopAc_ac_c*) { /* Nonmatching */ } diff --git a/src/d/actor/d_a_mbdoor.cpp b/src/d/actor/d_a_mbdoor.cpp index f03c080a3..2756c3564 100644 --- a/src/d/actor/d_a_mbdoor.cpp +++ b/src/d/actor/d_a_mbdoor.cpp @@ -253,8 +253,8 @@ BOOL daMbdoor_c::CreateInit() { } /* 00000A44-00000AF4 .text create__10daMbdoor_cFv */ -s32 daMbdoor_c::create() { - s32 phase_state = dComIfG_resLoad(&mPhs, getArcName()); +cPhs_State daMbdoor_c::create() { + cPhs_State phase_state = dComIfG_resLoad(&mPhs, getArcName()); fopAcM_SetupActor(this, daMbdoor_c); @@ -572,7 +572,7 @@ static BOOL daMbdoor_Delete(daMbdoor_c* i_this) { } /* 000015D4-000015F4 .text daMbdoor_Create__FP10fopAc_ac_c */ -static s32 daMbdoor_Create(fopAc_ac_c* i_this) { +static cPhs_State daMbdoor_Create(fopAc_ac_c* i_this) { return ((daMbdoor_c*)i_this)->create(); } diff --git a/src/d/actor/d_a_mdoor.cpp b/src/d/actor/d_a_mdoor.cpp index 9f63d73fb..22ca09373 100644 --- a/src/d/actor/d_a_mdoor.cpp +++ b/src/d/actor/d_a_mdoor.cpp @@ -57,7 +57,7 @@ void daMdoor_c::CreateInit() { } /* 000005E0-00000698 .text create__9daMdoor_cFv */ -s32 daMdoor_c::create() { +cPhs_State daMdoor_c::create() { /* Nonmatching */ } @@ -132,7 +132,7 @@ static BOOL daMdoor_Delete(daMdoor_c*) { } /* 00001054-00001074 .text daMdoor_Create__FP10fopAc_ac_c */ -static s32 daMdoor_Create(fopAc_ac_c*) { +static cPhs_State daMdoor_Create(fopAc_ac_c*) { /* Nonmatching */ } diff --git a/src/d/actor/d_a_mflft.cpp b/src/d/actor/d_a_mflft.cpp index fa3f4fc5b..e0d3518f3 100644 --- a/src/d/actor/d_a_mflft.cpp +++ b/src/d/actor/d_a_mflft.cpp @@ -73,7 +73,7 @@ static BOOL CallbackCreateHeap(fopAc_ac_c*) { } /* 000024C8-00002A34 .text daMflft_Create__FP10fopAc_ac_c */ -static s32 daMflft_Create(fopAc_ac_c*) { +static cPhs_State daMflft_Create(fopAc_ac_c*) { /* Nonmatching */ } diff --git a/src/d/actor/d_a_mgameboard.cpp b/src/d/actor/d_a_mgameboard.cpp index 007ad3462..d56b10b81 100644 --- a/src/d/actor/d_a_mgameboard.cpp +++ b/src/d/actor/d_a_mgameboard.cpp @@ -62,7 +62,7 @@ void daMgBoard_c::CursorMove() { } /* 000013C4-000014C8 .text daMgBoard_Create__FPv */ -static s32 daMgBoard_Create(void*) { +static cPhs_State daMgBoard_Create(void*) { /* Nonmatching */ } diff --git a/src/d/actor/d_a_mmusic.cpp b/src/d/actor/d_a_mmusic.cpp index cb06b528c..ccc5ae062 100644 --- a/src/d/actor/d_a_mmusic.cpp +++ b/src/d/actor/d_a_mmusic.cpp @@ -54,10 +54,10 @@ void daMmusic::Act_c::set_mtx() { } /* 000001A4-00000268 .text _create__Q28daMmusic5Act_cFv */ -s32 daMmusic::Act_c::_create() { +cPhs_State daMmusic::Act_c::_create() { fopAcM_SetupActor(this, Act_c); - s32 ret = cPhs_COMPLEATE_e; + cPhs_State ret = cPhs_COMPLEATE_e; if (fopAcM_entrySolidHeap(this, solidHeapCB, 0)) { set_mtx(); fopAcM_SetMtx(this, mMtx); @@ -151,7 +151,7 @@ bool daMmusic::Act_c::_draw() { namespace daMmusic { namespace { - s32 Mthd_Create(void* i_this) { + cPhs_State Mthd_Create(void* i_this) { return ((Act_c*)i_this)->_create(); } diff --git a/src/d/actor/d_a_mo2.cpp b/src/d/actor/d_a_mo2.cpp index d4a52d1b9..e39d1e41d 100644 --- a/src/d/actor/d_a_mo2.cpp +++ b/src/d/actor/d_a_mo2.cpp @@ -337,7 +337,7 @@ static BOOL createHeap(fopAc_ac_c*) { } /* 0000BAFC-0000C148 .text daMo2_Create__FP10fopAc_ac_c */ -static s32 daMo2_Create(fopAc_ac_c*) { +static cPhs_State daMo2_Create(fopAc_ac_c*) { /* Nonmatching */ } diff --git a/src/d/actor/d_a_mozo.cpp b/src/d/actor/d_a_mozo.cpp index b3fad07be..5a695eed9 100644 --- a/src/d/actor/d_a_mozo.cpp +++ b/src/d/actor/d_a_mozo.cpp @@ -206,10 +206,10 @@ s32 daMozo_c::CreateInit() { } /* 00002228-000023B0 .text _create__8daMozo_cFv */ -s32 daMozo_c::_create() { +cPhs_State daMozo_c::_create() { fopAcM_SetupActor(this, daMozo_c); - s32 result = dComIfG_resLoad(&mPhs, "Mozo"); + cPhs_State result = dComIfG_resLoad(&mPhs, "Mozo"); if (result == cPhs_COMPLEATE_e) { if (fopAcM_entrySolidHeap(this, CheckCreateHeap, 0x1AA0)) { @@ -289,7 +289,7 @@ static BOOL daMozo_Delete(daMozo_c* i_this) { } /* 000026F0-00002710 .text daMozo_Create__FP10fopAc_ac_c */ -static s32 daMozo_Create(fopAc_ac_c* i_this) { +static cPhs_State daMozo_Create(fopAc_ac_c* i_this) { return static_cast(i_this)->_create(); } diff --git a/src/d/actor/d_a_msw.cpp b/src/d/actor/d_a_msw.cpp index fba8cafe3..df7479b13 100644 --- a/src/d/actor/d_a_msw.cpp +++ b/src/d/actor/d_a_msw.cpp @@ -249,7 +249,7 @@ BOOL daMsw_CreateInit(fopAc_ac_c* i_this) { } /* 00000D3C-00000FE0 .text daMsw_Create__FP10fopAc_ac_c */ -static s32 daMsw_Create(fopAc_ac_c* i_this) { +static cPhs_State daMsw_Create(fopAc_ac_c* i_this) { static dCcD_SrcCyl himo_cyl_src = { // dCcD_SrcGObjInf { @@ -283,7 +283,7 @@ static s32 daMsw_Create(fopAc_ac_c* i_this) { fopAcM_SetupActor(i_this, msw_class); msw_class* pActor = static_cast(i_this); - s32 phase_state = dComIfG_resLoad(&pActor->mPhs, "Msw"); + cPhs_State phase_state = dComIfG_resLoad(&pActor->mPhs, "Msw"); if (phase_state == cPhs_COMPLEATE_e) { pActor->m2A0 = (fopAcM_GetParam(pActor) >> 0) & 0xFF; diff --git a/src/d/actor/d_a_mt.cpp b/src/d/actor/d_a_mt.cpp index 6d0b6ada7..b135eca12 100644 --- a/src/d/actor/d_a_mt.cpp +++ b/src/d/actor/d_a_mt.cpp @@ -158,7 +158,7 @@ static BOOL CallbackCreateHeap(fopAc_ac_c*) { } /* 000084AC-000088A8 .text daMt_Create__FP10fopAc_ac_c */ -static s32 daMt_Create(fopAc_ac_c*) { +static cPhs_State daMt_Create(fopAc_ac_c*) { /* Nonmatching */ } diff --git a/src/d/actor/d_a_mtoge.cpp b/src/d/actor/d_a_mtoge.cpp index 4e3b00c65..7c6fb2e17 100644 --- a/src/d/actor/d_a_mtoge.cpp +++ b/src/d/actor/d_a_mtoge.cpp @@ -96,10 +96,10 @@ BOOL daMtoge_c::CreateInit() { } /* 00000384-0000041C .text create__9daMtoge_cFv */ -s32 daMtoge_c::create() { +cPhs_State daMtoge_c::create() { fopAcM_SetupActor(this, daMtoge_c); - cPhs__Step phase_state = (cPhs__Step)dComIfG_resLoad(&mPhaseProcReq, M_arcname); + cPhs_State phase_state = dComIfG_resLoad(&mPhaseProcReq, M_arcname); if (phase_state != cPhs_COMPLEATE_e) { return phase_state; } @@ -226,7 +226,7 @@ static BOOL daMtoge_Delete(daMtoge_c* i_this) { } /* 00000790-000007B0 .text daMtoge_Create__FP10fopAc_ac_c */ -static s32 daMtoge_Create(fopAc_ac_c* i_this) { +static cPhs_State daMtoge_Create(fopAc_ac_c* i_this) { return static_cast(i_this)->create(); } diff --git a/src/d/actor/d_a_nh.cpp b/src/d/actor/d_a_nh.cpp index 67728799b..0b7ea115f 100644 --- a/src/d/actor/d_a_nh.cpp +++ b/src/d/actor/d_a_nh.cpp @@ -121,10 +121,10 @@ static BOOL checkCreateHeap(fopAc_ac_c* i_this) { } /* 800F9A74-800F9C8C .text create__6daNh_cFv */ -s32 daNh_c::create() { +cPhs_State daNh_c::create() { static u32 a_heap_size_tbl = 0x4000; - s32 phase_state = cPhs_COMPLEATE_e; + cPhs_State phase_state = cPhs_COMPLEATE_e; fopAcM_SetupActor(this, daNh_c); @@ -494,7 +494,7 @@ static BOOL daNh_Delete(daNh_c* i_this) { } /* 800FAE8C-800FAEAC .text daNh_Create__FP10fopAc_ac_c */ -static s32 daNh_Create(fopAc_ac_c* i_this) { +static cPhs_State daNh_Create(fopAc_ac_c* i_this) { return ((daNh_c*)i_this)->create(); } diff --git a/src/d/actor/d_a_npc_ac1.cpp b/src/d/actor/d_a_npc_ac1.cpp index b1deaabfd..1aeac63b3 100644 --- a/src/d/actor/d_a_npc_ac1.cpp +++ b/src/d/actor/d_a_npc_ac1.cpp @@ -277,7 +277,7 @@ static BOOL CheckCreateHeap(fopAc_ac_c*) { } /* 0000201C-0000213C .text _create__11daNpc_Ac1_cFv */ -s32 daNpc_Ac1_c::_create() { +cPhs_State daNpc_Ac1_c::_create() { /* Nonmatching */ } @@ -307,7 +307,7 @@ void daNpc_Ac1_c::CreateHeap() { } /* 00003044-00003064 .text daNpc_Ac1_Create__FP10fopAc_ac_c */ -static s32 daNpc_Ac1_Create(fopAc_ac_c*) { +static cPhs_State daNpc_Ac1_Create(fopAc_ac_c*) { /* Nonmatching */ } diff --git a/src/d/actor/d_a_npc_ah.cpp b/src/d/actor/d_a_npc_ah.cpp index 309037c74..aa3f6aa00 100644 --- a/src/d/actor/d_a_npc_ah.cpp +++ b/src/d/actor/d_a_npc_ah.cpp @@ -33,7 +33,7 @@ void phase_2(daNpcAh_c*) { } /* 000008D8-00000908 .text _create__9daNpcAh_cFv */ -s32 daNpcAh_c::_create() { +cPhs_State daNpcAh_c::_create() { /* Nonmatching */ } diff --git a/src/d/actor/d_a_npc_aj1.cpp b/src/d/actor/d_a_npc_aj1.cpp index 64f6f45eb..76f944a10 100644 --- a/src/d/actor/d_a_npc_aj1.cpp +++ b/src/d/actor/d_a_npc_aj1.cpp @@ -432,7 +432,7 @@ bool daNpc_Aj1_c::_delete() { } /* 0000363C-00003890 .text _create__11daNpc_Aj1_cFv */ -s32 daNpc_Aj1_c::_create() { +cPhs_State daNpc_Aj1_c::_create() { /* Nonmatching */ } @@ -452,7 +452,7 @@ void daNpc_Aj1_c::CreateHeap() { } /* 00003FFC-0000401C .text daNpc_Aj1_Create__FP10fopAc_ac_c */ -static s32 daNpc_Aj1_Create(fopAc_ac_c*) { +static cPhs_State daNpc_Aj1_Create(fopAc_ac_c*) { /* Nonmatching */ } diff --git a/src/d/actor/d_a_npc_ba1.cpp b/src/d/actor/d_a_npc_ba1.cpp index 0fbfdef68..69d88d63a 100644 --- a/src/d/actor/d_a_npc_ba1.cpp +++ b/src/d/actor/d_a_npc_ba1.cpp @@ -477,7 +477,7 @@ static BOOL CheckCreateHeap(fopAc_ac_c*) { } /* 00003E98-00003FB8 .text _create__11daNpc_Ba1_cFv */ -s32 daNpc_Ba1_c::_create() { +cPhs_State daNpc_Ba1_c::_create() { /* Nonmatching */ } @@ -497,7 +497,7 @@ void daNpc_Ba1_c::CreateHeap() { } /* 0000485C-0000487C .text daNpc_Ba1_Create__FP10fopAc_ac_c */ -static s32 daNpc_Ba1_Create(fopAc_ac_c*) { +static cPhs_State daNpc_Ba1_Create(fopAc_ac_c*) { /* Nonmatching */ } diff --git a/src/d/actor/d_a_npc_bj1.cpp b/src/d/actor/d_a_npc_bj1.cpp index 9609c21f4..1bc88a1de 100644 --- a/src/d/actor/d_a_npc_bj1.cpp +++ b/src/d/actor/d_a_npc_bj1.cpp @@ -577,7 +577,7 @@ static BOOL CheckCreateHeap(fopAc_ac_c*) { } /* 000061C4-000062E4 .text _create__11daNpc_Bj1_cFv */ -s32 daNpc_Bj1_c::_create() { +cPhs_State daNpc_Bj1_c::_create() { /* Nonmatching */ } @@ -602,7 +602,7 @@ void daNpc_Bj1_c::CreateHeap() { } /* 00007114-00007134 .text daNpc_Bj1_Create__FP10fopAc_ac_c */ -static s32 daNpc_Bj1_Create(fopAc_ac_c*) { +static cPhs_State daNpc_Bj1_Create(fopAc_ac_c*) { /* Nonmatching */ } diff --git a/src/d/actor/d_a_npc_bm1.cpp b/src/d/actor/d_a_npc_bm1.cpp index 5d3c414e8..623d81604 100644 --- a/src/d/actor/d_a_npc_bm1.cpp +++ b/src/d/actor/d_a_npc_bm1.cpp @@ -777,7 +777,7 @@ static BOOL CheckCreateHeap(fopAc_ac_c*) { } /* 00007D70-00007ED4 .text _create__11daNpc_Bm1_cFv */ -s32 daNpc_Bm1_c::_create() { +cPhs_State daNpc_Bm1_c::_create() { /* Nonmatching */ } @@ -812,7 +812,7 @@ void daNpc_Bm1_c::CreateHeap() { } /* 0000946C-0000948C .text daNpc_Bm1_Create__FP10fopAc_ac_c */ -static s32 daNpc_Bm1_Create(fopAc_ac_c*) { +static cPhs_State daNpc_Bm1_Create(fopAc_ac_c*) { /* Nonmatching */ } diff --git a/src/d/actor/d_a_npc_bmcon1.cpp b/src/d/actor/d_a_npc_bmcon1.cpp index 134fd91f0..3b3b0c33a 100644 --- a/src/d/actor/d_a_npc_bmcon1.cpp +++ b/src/d/actor/d_a_npc_bmcon1.cpp @@ -42,7 +42,7 @@ void phase_2(daNpcBmcon_c*) { } /* 00000A14-00000A44 .text _create__12daNpcBmcon_cFv */ -s32 daNpcBmcon_c::_create() { +cPhs_State daNpcBmcon_c::_create() { /* Nonmatching */ } diff --git a/src/d/actor/d_a_npc_bms1.cpp b/src/d/actor/d_a_npc_bms1.cpp index 8acd596ae..cb7cc4d21 100644 --- a/src/d/actor/d_a_npc_bms1.cpp +++ b/src/d/actor/d_a_npc_bms1.cpp @@ -222,7 +222,7 @@ static BOOL CheckCreateHeap(fopAc_ac_c*) { } /* 00003534-00003718 .text _create__12daNpc_Bms1_cFv */ -s32 daNpc_Bms1_c::_create() { +cPhs_State daNpc_Bms1_c::_create() { /* Nonmatching */ } @@ -232,7 +232,7 @@ void daNpc_Bms1_c::CreateHeap() { } /* 000043B8-000043D8 .text daNpc_Bms1_Create__FP10fopAc_ac_c */ -static s32 daNpc_Bms1_Create(fopAc_ac_c*) { +static cPhs_State daNpc_Bms1_Create(fopAc_ac_c*) { /* Nonmatching */ } diff --git a/src/d/actor/d_a_npc_bmsw.cpp b/src/d/actor/d_a_npc_bmsw.cpp index 95b53ae22..5b6b85006 100644 --- a/src/d/actor/d_a_npc_bmsw.cpp +++ b/src/d/actor/d_a_npc_bmsw.cpp @@ -147,7 +147,7 @@ static BOOL CallbackCreateHeap(fopAc_ac_c*) { } /* 00002D60-00002ECC .text _create__12daNpc_Bmsw_cFv */ -s32 daNpc_Bmsw_c::_create() { +cPhs_State daNpc_Bmsw_c::_create() { /* Nonmatching */ } @@ -252,7 +252,7 @@ void SwCam_c::Move() { } /* 00004D0C-00004D2C .text daNpc_Bmsw_Create__FP10fopAc_ac_c */ -static s32 daNpc_Bmsw_Create(fopAc_ac_c*) { +static cPhs_State daNpc_Bmsw_Create(fopAc_ac_c*) { /* Nonmatching */ } diff --git a/src/d/actor/d_a_npc_bs1.cpp b/src/d/actor/d_a_npc_bs1.cpp index 789611ff2..d803bba96 100644 --- a/src/d/actor/d_a_npc_bs1.cpp +++ b/src/d/actor/d_a_npc_bs1.cpp @@ -2124,10 +2124,10 @@ static BOOL CheckCreateHeap(fopAc_ac_c* i_this) { } /* 00004980-00004AD8 .text _create__11daNpc_Bs1_cFv */ -s32 daNpc_Bs1_c::_create() { +cPhs_State daNpc_Bs1_c::_create() { fopAcM_SetupActor(this, daNpc_Bs1_c); - int phase_state = dComIfG_resLoad(&mPhase, "Bs"); + cPhs_State phase_state = dComIfG_resLoad(&mPhase, "Bs"); if (phase_state == cPhs_COMPLEATE_e) { mType = fopAcM_GetParamBit(fopAcM_GetParam(this), 0x14, 0x4); switch (mType) { @@ -2226,7 +2226,7 @@ BOOL daNpc_Bs1_c::CreateHeap() { } /* 00005470-00005490 .text daNpc_Bs1_Create__FP10fopAc_ac_c */ -static s32 daNpc_Bs1_Create(fopAc_ac_c* i_this) { +static cPhs_State daNpc_Bs1_Create(fopAc_ac_c* i_this) { return ((daNpc_Bs1_c*)i_this)->_create(); } diff --git a/src/d/actor/d_a_npc_btsw.cpp b/src/d/actor/d_a_npc_btsw.cpp index a5588d838..8558a79bf 100644 --- a/src/d/actor/d_a_npc_btsw.cpp +++ b/src/d/actor/d_a_npc_btsw.cpp @@ -153,7 +153,7 @@ static BOOL CallbackCreateHeap(fopAc_ac_c*) { } /* 00002BB0-00002CAC .text _create__12daNpc_Btsw_cFv */ -s32 daNpc_Btsw_c::_create() { +cPhs_State daNpc_Btsw_c::_create() { /* Nonmatching */ } @@ -258,7 +258,7 @@ void SwCam2_c::Move() { } /* 00004788-000047A8 .text daNpc_Btsw_Create__FP10fopAc_ac_c */ -static s32 daNpc_Btsw_Create(fopAc_ac_c*) { +static cPhs_State daNpc_Btsw_Create(fopAc_ac_c*) { /* Nonmatching */ } diff --git a/src/d/actor/d_a_npc_btsw2.cpp b/src/d/actor/d_a_npc_btsw2.cpp index 687757870..3e5a519b1 100644 --- a/src/d/actor/d_a_npc_btsw2.cpp +++ b/src/d/actor/d_a_npc_btsw2.cpp @@ -527,14 +527,14 @@ BOOL daNpc_Btsw2_c::wait_action(void*) { } /* 00001660-00001884 .text _create__13daNpc_Btsw2_cFv */ -s32 daNpc_Btsw2_c::_create() { +cPhs_State daNpc_Btsw2_c::_create() { fopAcM_SetupActor(this, daNpc_Btsw2_c); if (dComIfGs_getEventReg(0xC203) == 3 || !checkItemGet(dItem_PEARL_DIN_e, TRUE)) { return cPhs_ERROR_e; } - int phase_state = dComIfG_resLoad(&mPhs, m_arc_name); + cPhs_State phase_state = dComIfG_resLoad(&mPhs, m_arc_name); if (phase_state == cPhs_COMPLEATE_e) { if (!fopAcM_entrySolidHeap(this, CallbackCreateHeap, 0x29E0)) { @@ -618,7 +618,7 @@ BOOL daNpc_Btsw2_c::_draw() { } /* 00001F6C-00001F8C .text daNpc_Btsw2_Create__FP10fopAc_ac_c */ -static s32 daNpc_Btsw2_Create(fopAc_ac_c* i_this) { +static cPhs_State daNpc_Btsw2_Create(fopAc_ac_c* i_this) { return static_cast(i_this)->_create(); } diff --git a/src/d/actor/d_a_npc_cb1.cpp b/src/d/actor/d_a_npc_cb1.cpp index 01f273453..32f2d7218 100644 --- a/src/d/actor/d_a_npc_cb1.cpp +++ b/src/d/actor/d_a_npc_cb1.cpp @@ -27,7 +27,7 @@ static BOOL CheckCreateHeap(fopAc_ac_c*) { } /* 000004F8-00000814 .text create__11daNpc_Cb1_cFv */ -s32 daNpc_Cb1_c::create() { +cPhs_State daNpc_Cb1_c::create() { /* Nonmatching */ } @@ -537,7 +537,7 @@ daNpc_Cb1_c::~daNpc_Cb1_c() { } /* 000093A8-000093C8 .text daNpc_Cb1_Create__FP10fopAc_ac_c */ -static s32 daNpc_Cb1_Create(fopAc_ac_c*) { +static cPhs_State daNpc_Cb1_Create(fopAc_ac_c*) { /* Nonmatching */ } diff --git a/src/d/actor/d_a_npc_co1.cpp b/src/d/actor/d_a_npc_co1.cpp index 40e126a0a..640610054 100644 --- a/src/d/actor/d_a_npc_co1.cpp +++ b/src/d/actor/d_a_npc_co1.cpp @@ -317,7 +317,7 @@ static BOOL CheckCreateHeap(fopAc_ac_c*) { } /* 00002B8C-00002CAC .text _create__11daNpc_Co1_cFv */ -s32 daNpc_Co1_c::_create() { +cPhs_State daNpc_Co1_c::_create() { /* Nonmatching */ } @@ -342,7 +342,7 @@ void daNpc_Co1_c::CreateHeap() { } /* 000037C8-000037E8 .text daNpc_Co1_Create__FP10fopAc_ac_c */ -static s32 daNpc_Co1_Create(fopAc_ac_c*) { +static cPhs_State daNpc_Co1_Create(fopAc_ac_c*) { /* Nonmatching */ } diff --git a/src/d/actor/d_a_npc_de1.cpp b/src/d/actor/d_a_npc_de1.cpp index e3805f3bb..6c55a64dd 100644 --- a/src/d/actor/d_a_npc_de1.cpp +++ b/src/d/actor/d_a_npc_de1.cpp @@ -257,7 +257,7 @@ static BOOL CheckCreateHeap(fopAc_ac_c*) { } /* 00002520-000027A4 .text _create__11daNpc_De1_cFv */ -s32 daNpc_De1_c::_create() { +cPhs_State daNpc_De1_c::_create() { /* Nonmatching */ } @@ -267,7 +267,7 @@ void daNpc_De1_c::CreateHeap() { } /* 00002E04-00002E24 .text daNpc_De1_Create__FP10fopAc_ac_c */ -static s32 daNpc_De1_Create(fopAc_ac_c*) { +static cPhs_State daNpc_De1_Create(fopAc_ac_c*) { /* Nonmatching */ } diff --git a/src/d/actor/d_a_npc_ds1.cpp b/src/d/actor/d_a_npc_ds1.cpp index 9adb707b8..af0afa7e5 100644 --- a/src/d/actor/d_a_npc_ds1.cpp +++ b/src/d/actor/d_a_npc_ds1.cpp @@ -262,7 +262,7 @@ static BOOL CheckCreateHeap(fopAc_ac_c*) { } /* 0000467C-000047BC .text _create__11daNpc_Ds1_cFv */ -s32 daNpc_Ds1_c::_create() { +cPhs_State daNpc_Ds1_c::_create() { /* Nonmatching */ } @@ -272,7 +272,7 @@ void daNpc_Ds1_c::CreateHeap() { } /* 000052D4-000052F4 .text daNpc_Ds1_Create__FP10fopAc_ac_c */ -static s32 daNpc_Ds1_Create(fopAc_ac_c*) { +static cPhs_State daNpc_Ds1_Create(fopAc_ac_c*) { /* Nonmatching */ } diff --git a/src/d/actor/d_a_npc_fa1.cpp b/src/d/actor/d_a_npc_fa1.cpp index cf9f378c9..99a7a212e 100644 --- a/src/d/actor/d_a_npc_fa1.cpp +++ b/src/d/actor/d_a_npc_fa1.cpp @@ -272,7 +272,7 @@ static BOOL CheckCreateHeap(fopAc_ac_c*) { } /* 800FD110-800FD224 .text _create__11daNpc_Fa1_cFv */ -s32 daNpc_Fa1_c::_create() { +cPhs_State daNpc_Fa1_c::_create() { /* Nonmatching */ } @@ -287,7 +287,7 @@ void daNpc_Fa1_c::setMtx() { } /* 800FD6DC-800FD6FC .text daNpc_Fa1_Create__FP10fopAc_ac_c */ -static s32 daNpc_Fa1_Create(fopAc_ac_c*) { +static cPhs_State daNpc_Fa1_Create(fopAc_ac_c*) { /* Nonmatching */ } diff --git a/src/d/actor/d_a_npc_gk1.cpp b/src/d/actor/d_a_npc_gk1.cpp index f9a582a39..ba88a1e28 100644 --- a/src/d/actor/d_a_npc_gk1.cpp +++ b/src/d/actor/d_a_npc_gk1.cpp @@ -267,7 +267,7 @@ bool daNpc_Gk1_c::_delete() { } /* 000022D4-00002520 .text _create__11daNpc_Gk1_cFv */ -s32 daNpc_Gk1_c::_create() { +cPhs_State daNpc_Gk1_c::_create() { /* Nonmatching */ } @@ -292,7 +292,7 @@ void daNpc_Gk1_c::CreateHeap() { } /* 00002D2C-00002D4C .text daNpc_Gk1_Create__FP10fopAc_ac_c */ -static s32 daNpc_Gk1_Create(fopAc_ac_c*) { +static cPhs_State daNpc_Gk1_Create(fopAc_ac_c*) { /* Nonmatching */ } diff --git a/src/d/actor/d_a_npc_gp1.cpp b/src/d/actor/d_a_npc_gp1.cpp index 711437b01..d8c5d3ad5 100644 --- a/src/d/actor/d_a_npc_gp1.cpp +++ b/src/d/actor/d_a_npc_gp1.cpp @@ -322,7 +322,7 @@ static BOOL CheckCreateHeap(fopAc_ac_c*) { } /* 00003084-000031A4 .text _create__11daNpc_Gp1_cFv */ -s32 daNpc_Gp1_c::_create() { +cPhs_State daNpc_Gp1_c::_create() { /* Nonmatching */ } @@ -337,7 +337,7 @@ void daNpc_Gp1_c::CreateHeap() { } /* 000039A0-000039C0 .text daNpc_Gp1_Create__FP10fopAc_ac_c */ -static s32 daNpc_Gp1_Create(fopAc_ac_c*) { +static cPhs_State daNpc_Gp1_Create(fopAc_ac_c*) { /* Nonmatching */ } diff --git a/src/d/actor/d_a_npc_hi1.cpp b/src/d/actor/d_a_npc_hi1.cpp index 3c67727e1..019c067b9 100644 --- a/src/d/actor/d_a_npc_hi1.cpp +++ b/src/d/actor/d_a_npc_hi1.cpp @@ -272,7 +272,7 @@ bool daNpc_Hi1_c::_delete() { } /* 00001F30-0000205C .text _create__11daNpc_Hi1_cFv */ -s32 daNpc_Hi1_c::_create() { +cPhs_State daNpc_Hi1_c::_create() { /* Nonmatching */ } @@ -287,7 +287,7 @@ void daNpc_Hi1_c::CreateHeap() { } /* 000027EC-0000280C .text daNpc_Hi1_Create__FP10fopAc_ac_c */ -static s32 daNpc_Hi1_Create(fopAc_ac_c*) { +static cPhs_State daNpc_Hi1_Create(fopAc_ac_c*) { /* Nonmatching */ } diff --git a/src/d/actor/d_a_npc_ho.cpp b/src/d/actor/d_a_npc_ho.cpp index 004ed0983..4a1dacdba 100644 --- a/src/d/actor/d_a_npc_ho.cpp +++ b/src/d/actor/d_a_npc_ho.cpp @@ -182,7 +182,7 @@ static BOOL CheckCreateHeap(fopAc_ac_c*) { } /* 00001F1C-00002124 .text _create__10daNpc_Ho_cFv */ -s32 daNpc_Ho_c::_create() { +cPhs_State daNpc_Ho_c::_create() { /* Nonmatching */ } @@ -192,7 +192,7 @@ void daNpc_Ho_c::CreateHeap() { } /* 00002784-000027A4 .text daNpc_Ho_Create__FP10fopAc_ac_c */ -static s32 daNpc_Ho_Create(fopAc_ac_c*) { +static cPhs_State daNpc_Ho_Create(fopAc_ac_c*) { /* Nonmatching */ } diff --git a/src/d/actor/d_a_npc_hr.cpp b/src/d/actor/d_a_npc_hr.cpp index 026a8076d..fc56f49f7 100644 --- a/src/d/actor/d_a_npc_hr.cpp +++ b/src/d/actor/d_a_npc_hr.cpp @@ -452,7 +452,7 @@ static BOOL CheckCreateHeap(fopAc_ac_c*) { } /* 000051A8-000052C4 .text _create__10daNpc_Hr_cFv */ -s32 daNpc_Hr_c::_create() { +cPhs_State daNpc_Hr_c::_create() { /* Nonmatching */ } @@ -462,7 +462,7 @@ void daNpc_Hr_c::CreateHeap() { } /* 00005CE8-00005D08 .text daNpc_Hr_Create__FP10fopAc_ac_c */ -static s32 daNpc_Hr_Create(fopAc_ac_c*) { +static cPhs_State daNpc_Hr_Create(fopAc_ac_c*) { /* Nonmatching */ } diff --git a/src/d/actor/d_a_npc_jb1.cpp b/src/d/actor/d_a_npc_jb1.cpp index 8d346fc9c..38e37d651 100644 --- a/src/d/actor/d_a_npc_jb1.cpp +++ b/src/d/actor/d_a_npc_jb1.cpp @@ -187,7 +187,7 @@ static BOOL CheckCreateHeap(fopAc_ac_c*) { } /* 00001074-000011B8 .text _create__11daNpc_Jb1_cFv */ -s32 daNpc_Jb1_c::_create() { +cPhs_State daNpc_Jb1_c::_create() { /* Nonmatching */ } @@ -207,7 +207,7 @@ void daNpc_Jb1_c::CreateHeap() { } /* 00001C20-00001C40 .text daNpc_Jb1_Create__FP10fopAc_ac_c */ -static s32 daNpc_Jb1_Create(fopAc_ac_c*) { +static cPhs_State daNpc_Jb1_Create(fopAc_ac_c*) { /* Nonmatching */ } diff --git a/src/d/actor/d_a_npc_ji1.cpp b/src/d/actor/d_a_npc_ji1.cpp index db58a3bc9..91924cd08 100644 --- a/src/d/actor/d_a_npc_ji1.cpp +++ b/src/d/actor/d_a_npc_ji1.cpp @@ -1106,7 +1106,7 @@ BOOL daNpc_Ji1_c::talkAction(void*) { } } - return 1; + return TRUE; } /* 000033D0-000039AC .text speakAction__11daNpc_Ji1_cFPv */ @@ -2110,7 +2110,7 @@ BOOL daNpc_Ji1_c::teachSPRollCutAction(void*) { setAction(&daNpc_Ji1_c::eventAction, 0); field_0x2C8 = &daNpc_Ji1_c::teachSPRollCutAction; - return 1; + return TRUE; } if(cutType == 8) { @@ -2119,7 +2119,7 @@ BOOL daNpc_Ji1_c::teachSPRollCutAction(void*) { setAction(&daNpc_Ji1_c::eventAction, 0); field_0x2C8 = &daNpc_Ji1_c::teachSPRollCutAction; - return 1; + return TRUE; } field_0x7E0.OnTgShield(); @@ -2561,7 +2561,7 @@ BOOL daNpc_Ji1_c::battleGuardCheck() { setClearRecord(field_0xD70); } - return 1; + return TRUE; } } @@ -2592,7 +2592,7 @@ BOOL daNpc_Ji1_c::battleGuardCheck() { } } - return 1; + return TRUE; } /* 0000C7E4-0000CA98 .text battleAction__11daNpc_Ji1_cFPv */ @@ -3147,10 +3147,10 @@ static BOOL CheckCreateHeap(fopAc_ac_c* i_this) { } /* 0000DED0-0000DF78 .text _create__11daNpc_Ji1_cFv */ -s32 daNpc_Ji1_c::_create() { +cPhs_State daNpc_Ji1_c::_create() { fopAcM_SetupActor(this, daNpc_Ji1_c); - s32 state = dComIfG_resLoad(&field_0xC7C, "Ji"); + cPhs_State state = dComIfG_resLoad(&field_0xC7C, "Ji"); if(state == cPhs_COMPLEATE_e) { if(!fopAcM_entrySolidHeap(this, &CheckCreateHeap, 0x16840)) { return cPhs_ERROR_e; @@ -3788,7 +3788,7 @@ static BOOL daNpc_Ji1_Delete(daNpc_Ji1_c* i_this) { } /* 00011FC0-00011FE0 .text daNpc_Ji1_Create__FP10fopAc_ac_c */ -static s32 daNpc_Ji1_Create(fopAc_ac_c* i_this) { +static cPhs_State daNpc_Ji1_Create(fopAc_ac_c* i_this) { return static_cast(i_this)->_create(); } diff --git a/src/d/actor/d_a_npc_kamome.cpp b/src/d/actor/d_a_npc_kamome.cpp index 5d477b605..0da9a99a8 100644 --- a/src/d/actor/d_a_npc_kamome.cpp +++ b/src/d/actor/d_a_npc_kamome.cpp @@ -247,7 +247,7 @@ static BOOL checkCreateHeap(fopAc_ac_c* i_this) { } /* 00000ED8-0000101C .text create__11daNpc_kam_cFv */ -s32 daNpc_kam_c::create() { +cPhs_State daNpc_kam_c::create() { fopAcM_SetupActor(this, daNpc_kam_c); if (l_act != NULL && l_act != this) { @@ -257,7 +257,7 @@ s32 daNpc_kam_c::create() { static u32 l_heap_size = 0x1360; - s32 phase_state = dComIfG_resLoad(&mPhs, "Kamome"); + cPhs_State phase_state = dComIfG_resLoad(&mPhs, "Kamome"); if (phase_state == cPhs_COMPLEATE_e) { if (!fopAcM_entrySolidHeap(this, checkCreateHeap, l_heap_size)) { @@ -1404,7 +1404,7 @@ static BOOL daNpc_kam_Delete(daNpc_kam_c* i_this) { } /* 000045B8-000045D8 .text daNpc_kam_Create__FP10fopAc_ac_c */ -static s32 daNpc_kam_Create(fopAc_ac_c* i_this) { +static cPhs_State daNpc_kam_Create(fopAc_ac_c* i_this) { return ((daNpc_kam_c*)i_this)->create(); } diff --git a/src/d/actor/d_a_npc_kf1.cpp b/src/d/actor/d_a_npc_kf1.cpp index a0bdb47f8..2ee17f10d 100644 --- a/src/d/actor/d_a_npc_kf1.cpp +++ b/src/d/actor/d_a_npc_kf1.cpp @@ -437,7 +437,7 @@ bool daNpc_Kf1_c::_delete() { } /* 00003C18-00003E64 .text _create__11daNpc_Kf1_cFv */ -s32 daNpc_Kf1_c::_create() { +cPhs_State daNpc_Kf1_c::_create() { /* Nonmatching */ } @@ -457,7 +457,7 @@ void daNpc_Kf1_c::CreateHeap() { } /* 00004590-000045B0 .text daNpc_Kf1_Create__FP10fopAc_ac_c */ -static s32 daNpc_Kf1_Create(fopAc_ac_c*) { +static cPhs_State daNpc_Kf1_Create(fopAc_ac_c*) { /* Nonmatching */ } diff --git a/src/d/actor/d_a_npc_kg1.cpp b/src/d/actor/d_a_npc_kg1.cpp index 32988bde9..c87775026 100644 --- a/src/d/actor/d_a_npc_kg1.cpp +++ b/src/d/actor/d_a_npc_kg1.cpp @@ -118,7 +118,7 @@ static s32 daNpc_Kg1Create(void*) { } /* 00001FAC-0000203C .text _create__11daNpc_Kg1_cFv */ -s32 daNpc_Kg1_c::_create() { +cPhs_State daNpc_Kg1_c::_create() { /* Nonmatching */ } diff --git a/src/d/actor/d_a_npc_kg2.cpp b/src/d/actor/d_a_npc_kg2.cpp index d4b7c7031..b5cad4902 100644 --- a/src/d/actor/d_a_npc_kg2.cpp +++ b/src/d/actor/d_a_npc_kg2.cpp @@ -158,7 +158,7 @@ void daNpc_Kg2_c::event_wait_action(void*) { } /* 00002590-000027BC .text _create__11daNpc_Kg2_cFv */ -s32 daNpc_Kg2_c::_create() { +cPhs_State daNpc_Kg2_c::_create() { /* Nonmatching */ } @@ -178,7 +178,7 @@ bool daNpc_Kg2_c::_draw() { } /* 00002E74-00002E94 .text daNpc_Kg2_Create__FP10fopAc_ac_c */ -static s32 daNpc_Kg2_Create(fopAc_ac_c*) { +static cPhs_State daNpc_Kg2_Create(fopAc_ac_c*) { /* Nonmatching */ } diff --git a/src/d/actor/d_a_npc_kk1.cpp b/src/d/actor/d_a_npc_kk1.cpp index e733b265e..fc0121805 100644 --- a/src/d/actor/d_a_npc_kk1.cpp +++ b/src/d/actor/d_a_npc_kk1.cpp @@ -547,7 +547,7 @@ bool daNpc_Kk1_c::_delete() { } /* 00005A58-00005B98 .text _create__11daNpc_Kk1_cFv */ -s32 daNpc_Kk1_c::_create() { +cPhs_State daNpc_Kk1_c::_create() { /* Nonmatching */ } @@ -567,7 +567,7 @@ void daNpc_Kk1_c::CreateHeap() { } /* 00006684-000066A4 .text daNpc_Kk1_Create__FP10fopAc_ac_c */ -static s32 daNpc_Kk1_Create(fopAc_ac_c*) { +static cPhs_State daNpc_Kk1_Create(fopAc_ac_c*) { /* Nonmatching */ } diff --git a/src/d/actor/d_a_npc_km1.cpp b/src/d/actor/d_a_npc_km1.cpp index b006ea387..f43fa9448 100644 --- a/src/d/actor/d_a_npc_km1.cpp +++ b/src/d/actor/d_a_npc_km1.cpp @@ -213,7 +213,7 @@ static BOOL CheckCreateHeap(fopAc_ac_c*) { } /* 000018AC-00001A1C .text _create__11daNpc_Km1_cFv */ -s32 daNpc_Km1_c::_create() { +cPhs_State daNpc_Km1_c::_create() { /* Nonmatching */ } @@ -223,7 +223,7 @@ void daNpc_Km1_c::CreateHeap() { } /* 00002158-00002178 .text daNpc_Km1_Create__FP10fopAc_ac_c */ -static s32 daNpc_Km1_Create(fopAc_ac_c*) { +static cPhs_State daNpc_Km1_Create(fopAc_ac_c*) { /* Nonmatching */ } diff --git a/src/d/actor/d_a_npc_ko1.cpp b/src/d/actor/d_a_npc_ko1.cpp index 53364579a..e72e28a71 100644 --- a/src/d/actor/d_a_npc_ko1.cpp +++ b/src/d/actor/d_a_npc_ko1.cpp @@ -647,7 +647,7 @@ static BOOL CheckCreateHeap(fopAc_ac_c*) { } /* 00007610-00007730 .text _create__11daNpc_Ko1_cFv */ -s32 daNpc_Ko1_c::_create() { +cPhs_State daNpc_Ko1_c::_create() { /* Nonmatching */ } @@ -677,7 +677,7 @@ void daNpc_Ko1_c::CreateHeap() { } /* 00008604-00008624 .text daNpc_Ko1_Create__FP10fopAc_ac_c */ -static s32 daNpc_Ko1_Create(fopAc_ac_c*) { +static cPhs_State daNpc_Ko1_Create(fopAc_ac_c*) { /* Nonmatching */ } diff --git a/src/d/actor/d_a_npc_kp1.cpp b/src/d/actor/d_a_npc_kp1.cpp index 75c054c52..bf0b69b52 100644 --- a/src/d/actor/d_a_npc_kp1.cpp +++ b/src/d/actor/d_a_npc_kp1.cpp @@ -228,7 +228,7 @@ static BOOL CheckCreateHeap(fopAc_ac_c*) { } /* 0000217C-000022A0 .text _create__11daNpc_Kp1_cFv */ -s32 daNpc_Kp1_c::_create() { +cPhs_State daNpc_Kp1_c::_create() { /* Nonmatching */ } @@ -238,7 +238,7 @@ void daNpc_Kp1_c::CreateHeap() { } /* 00002B14-00002B34 .text daNpc_Kp1_Create__FP10fopAc_ac_c */ -static s32 daNpc_Kp1_Create(fopAc_ac_c*) { +static cPhs_State daNpc_Kp1_Create(fopAc_ac_c*) { /* Nonmatching */ } diff --git a/src/d/actor/d_a_npc_ls1.cpp b/src/d/actor/d_a_npc_ls1.cpp index 64c03d22d..754593b23 100644 --- a/src/d/actor/d_a_npc_ls1.cpp +++ b/src/d/actor/d_a_npc_ls1.cpp @@ -477,7 +477,7 @@ bool daNpc_Ls1_c::_delete() { } /* 000046A8-000047D4 .text _create__11daNpc_Ls1_cFv */ -s32 daNpc_Ls1_c::_create() { +cPhs_State daNpc_Ls1_c::_create() { /* Nonmatching */ } @@ -502,7 +502,7 @@ void daNpc_Ls1_c::CreateHeap() { } /* 000055BC-000055DC .text daNpc_Ls1_Create__FP10fopAc_ac_c */ -static s32 daNpc_Ls1_Create(fopAc_ac_c*) { +static cPhs_State daNpc_Ls1_Create(fopAc_ac_c*) { /* Nonmatching */ } diff --git a/src/d/actor/d_a_npc_md.cpp b/src/d/actor/d_a_npc_md.cpp index e93f6ec1e..834fa692d 100644 --- a/src/d/actor/d_a_npc_md.cpp +++ b/src/d/actor/d_a_npc_md.cpp @@ -368,7 +368,7 @@ static BOOL CheckCreateHeap(fopAc_ac_c* i_this) { } /* 00000884-00000D80 .text create__10daNpc_Md_cFv */ -s32 daNpc_Md_c::create() { +cPhs_State daNpc_Md_c::create() { m313D = 0; strcpy(mModelArcName, l_arc_name); int heapSizeIdx = 0; @@ -424,7 +424,7 @@ s32 daNpc_Md_c::create() { heapSizeIdx = 1; } - s32 phase_state = dComIfG_resLoad(&mPhase, mModelArcName); + cPhs_State phase_state = dComIfG_resLoad(&mPhase, mModelArcName); m313D = 1; if (phase_state == cPhs_COMPLEATE_e) { if (dComIfGp_getCb1Player() != NULL) { @@ -3308,7 +3308,7 @@ daNpc_Md_c::~daNpc_Md_c() { } /* 000110BC-000110DC .text daNpc_Md_Create__FP10fopAc_ac_c */ -static s32 daNpc_Md_Create(fopAc_ac_c* i_this) { +static cPhs_State daNpc_Md_Create(fopAc_ac_c* i_this) { return static_cast(i_this)->create(); } diff --git a/src/d/actor/d_a_npc_mk.cpp b/src/d/actor/d_a_npc_mk.cpp index bdbf8092f..0bd35c0b9 100644 --- a/src/d/actor/d_a_npc_mk.cpp +++ b/src/d/actor/d_a_npc_mk.cpp @@ -293,7 +293,7 @@ static BOOL CheckCreateHeap(fopAc_ac_c*) { } /* 0000407C-000042F8 .text _create__10daNpc_Mk_cFv */ -s32 daNpc_Mk_c::_create() { +cPhs_State daNpc_Mk_c::_create() { /* Nonmatching */ } @@ -303,7 +303,7 @@ void daNpc_Mk_c::CreateHeap() { } /* 00004954-00004974 .text daNpc_Mk_Create__FP10fopAc_ac_c */ -static s32 daNpc_Mk_Create(fopAc_ac_c*) { +static cPhs_State daNpc_Mk_Create(fopAc_ac_c*) { /* Nonmatching */ } diff --git a/src/d/actor/d_a_npc_mn.cpp b/src/d/actor/d_a_npc_mn.cpp index f792e9788..61688a7b4 100644 --- a/src/d/actor/d_a_npc_mn.cpp +++ b/src/d/actor/d_a_npc_mn.cpp @@ -33,7 +33,7 @@ void phase_2(daNpcMn_c*) { } /* 000008D4-00000904 .text _create__9daNpcMn_cFv */ -s32 daNpcMn_c::_create() { +cPhs_State daNpcMn_c::_create() { /* Nonmatching */ } diff --git a/src/d/actor/d_a_npc_mt.cpp b/src/d/actor/d_a_npc_mt.cpp index 4d65bec4a..2223e0034 100644 --- a/src/d/actor/d_a_npc_mt.cpp +++ b/src/d/actor/d_a_npc_mt.cpp @@ -55,7 +55,7 @@ void phase_2(daNpcMt_c*) { } /* 000008D8-00000908 .text _create__9daNpcMt_cFv */ -s32 daNpcMt_c::_create() { +cPhs_State daNpcMt_c::_create() { /* Nonmatching */ } diff --git a/src/d/actor/d_a_npc_nz.cpp b/src/d/actor/d_a_npc_nz.cpp index 260330cf1..f710e6e42 100644 --- a/src/d/actor/d_a_npc_nz.cpp +++ b/src/d/actor/d_a_npc_nz.cpp @@ -901,12 +901,12 @@ void daNpc_Nz_c::getArg() { } /* 00002830-000028FC .text _create__10daNpc_Nz_cFv */ -s32 daNpc_Nz_c::_create() { +cPhs_State daNpc_Nz_c::_create() { fopAcM_SetupActor(this, daNpc_Nz_c); getArg(); - s32 result = dComIfG_resLoad(&mPhs1, m_arc_name); + cPhs_State result = dComIfG_resLoad(&mPhs1, m_arc_name); if(result != cPhs_COMPLEATE_e) { return result; } diff --git a/src/d/actor/d_a_npc_ob1.cpp b/src/d/actor/d_a_npc_ob1.cpp index 139f155fb..348d94121 100644 --- a/src/d/actor/d_a_npc_ob1.cpp +++ b/src/d/actor/d_a_npc_ob1.cpp @@ -352,7 +352,7 @@ static BOOL CheckCreateHeap(fopAc_ac_c*) { } /* 0000326C-0000338C .text _create__11daNpc_Ob1_cFv */ -s32 daNpc_Ob1_c::_create() { +cPhs_State daNpc_Ob1_c::_create() { /* Nonmatching */ } @@ -372,7 +372,7 @@ void daNpc_Ob1_c::CreateHeap() { } /* 00003BE8-00003C08 .text daNpc_Ob1_Create__FP10fopAc_ac_c */ -static s32 daNpc_Ob1_Create(fopAc_ac_c*) { +static cPhs_State daNpc_Ob1_Create(fopAc_ac_c*) { /* Nonmatching */ } diff --git a/src/d/actor/d_a_npc_os.cpp b/src/d/actor/d_a_npc_os.cpp index 955ccfc79..f5cfcd5d0 100644 --- a/src/d/actor/d_a_npc_os.cpp +++ b/src/d/actor/d_a_npc_os.cpp @@ -142,12 +142,12 @@ static BOOL CheckCreateHeap(fopAc_ac_c* i_this) { } /* 00000374-00000538 .text create__10daNpc_Os_cFv */ -s32 daNpc_Os_c::create() { +cPhs_State daNpc_Os_c::create() { fopAcM_SetupActor(this, daNpc_Os_c) static u32 l_heap_size = 0xFA0; - int result = dComIfG_resLoad(&mPhs, "Os"); + cPhs_State result = dComIfG_resLoad(&mPhs, "Os"); if(result == cPhs_COMPLEATE_e) { if(!fopAcM_entrySolidHeap(this, CheckCreateHeap, l_heap_size)) { mpMorf = NULL; @@ -2360,7 +2360,7 @@ daNpc_Os_c::~daNpc_Os_c() { } /* 00006E1C-00006E3C .text daNpc_Os_Create__FP10fopAc_ac_c */ -static s32 daNpc_Os_Create(fopAc_ac_c* i_this) { +static cPhs_State daNpc_Os_Create(fopAc_ac_c* i_this) { return static_cast(i_this)->create(); } diff --git a/src/d/actor/d_a_npc_p1.cpp b/src/d/actor/d_a_npc_p1.cpp index 9653aba95..f9a9708a1 100644 --- a/src/d/actor/d_a_npc_p1.cpp +++ b/src/d/actor/d_a_npc_p1.cpp @@ -128,7 +128,7 @@ void daNpc_P1_c::setAttentionPos(cXyz*) { } /* 00002B00-00003484 .text _create__10daNpc_P1_cFv */ -s32 daNpc_P1_c::_create() { +cPhs_State daNpc_P1_c::_create() { /* Nonmatching */ } @@ -183,7 +183,7 @@ static BOOL daNpc_P1_Delete(daNpc_P1_c*) { } /* 00004BEC-00004C0C .text daNpc_P1_Create__FP10fopAc_ac_c */ -static s32 daNpc_P1_Create(fopAc_ac_c*) { +static cPhs_State daNpc_P1_Create(fopAc_ac_c*) { /* Nonmatching */ } diff --git a/src/d/actor/d_a_npc_p2.cpp b/src/d/actor/d_a_npc_p2.cpp index ed22ccdd1..2d0c10b79 100644 --- a/src/d/actor/d_a_npc_p2.cpp +++ b/src/d/actor/d_a_npc_p2.cpp @@ -293,7 +293,7 @@ void daNpc_P2_c::createInit() { } /* 0000476C-0000492C .text _create__10daNpc_P2_cFv */ -s32 daNpc_P2_c::_create() { +cPhs_State daNpc_P2_c::_create() { /* Nonmatching */ } diff --git a/src/d/actor/d_a_npc_people.cpp b/src/d/actor/d_a_npc_people.cpp index f6891c1b6..429744856 100644 --- a/src/d/actor/d_a_npc_people.cpp +++ b/src/d/actor/d_a_npc_people.cpp @@ -4109,7 +4109,7 @@ static BOOL CheckCreateHeap(fopAc_ac_c* i_this) { } /* 0000075C-000008E0 .text phase_1__FP13daNpcPeople_c */ -static s32 phase_1(daNpcPeople_c* i_this) { +static cPhs_State phase_1(daNpcPeople_c* i_this) { fopAcM_SetupActor(i_this, daNpcPeople_c); s16 arg0 = i_this->getPrmArg0(); @@ -4168,8 +4168,8 @@ static s32 phase_1(daNpcPeople_c* i_this) { } /* 000008E0-00000960 .text phase_2__FP13daNpcPeople_c */ -static s32 phase_2(daNpcPeople_c* i_this) { - int rt = dComIfG_resLoad(i_this->getPhaseP(), l_arcname_tbl[i_this->getNpcNo()]); +static cPhs_State phase_2(daNpcPeople_c* i_this) { + cPhs_State rt = dComIfG_resLoad(i_this->getPhaseP(), l_arcname_tbl[i_this->getNpcNo()]); if(rt == cPhs_COMPLEATE_e) { if(fopAcM_entrySolidHeap(i_this, CheckCreateHeap, 0x3300)) { return i_this->createInit(); @@ -4183,7 +4183,7 @@ static s32 phase_2(daNpcPeople_c* i_this) { } /* 00000960-00000990 .text _create__13daNpcPeople_cFv */ -s32 daNpcPeople_c::_create() { +cPhs_State daNpcPeople_c::_create() { static cPhs__Handler l_method[] = { (cPhs__Handler)phase_1, (cPhs__Handler)phase_2, diff --git a/src/d/actor/d_a_npc_pf1.cpp b/src/d/actor/d_a_npc_pf1.cpp index fd64f48de..491cb336d 100644 --- a/src/d/actor/d_a_npc_pf1.cpp +++ b/src/d/actor/d_a_npc_pf1.cpp @@ -322,7 +322,7 @@ bool daNpc_Pf1_c::_delete() { } /* 00002FF8-00003258 .text _create__11daNpc_Pf1_cFv */ -s32 daNpc_Pf1_c::_create() { +cPhs_State daNpc_Pf1_c::_create() { /* Nonmatching */ } @@ -337,7 +337,7 @@ void daNpc_Pf1_c::CreateHeap() { } /* 0000381C-0000383C .text daNpc_Pf1_Create__FP10fopAc_ac_c */ -static s32 daNpc_Pf1_Create(fopAc_ac_c*) { +static cPhs_State daNpc_Pf1_Create(fopAc_ac_c*) { /* Nonmatching */ } diff --git a/src/d/actor/d_a_npc_photo.cpp b/src/d/actor/d_a_npc_photo.cpp index 9c3c1c76a..13c605fbb 100644 --- a/src/d/actor/d_a_npc_photo.cpp +++ b/src/d/actor/d_a_npc_photo.cpp @@ -33,7 +33,7 @@ void phase_2(daNpcPhoto_c*) { } /* 000009D4-00000A04 .text _create__12daNpcPhoto_cFv */ -s32 daNpcPhoto_c::_create() { +cPhs_State daNpcPhoto_c::_create() { /* Nonmatching */ } diff --git a/src/d/actor/d_a_npc_pm1.cpp b/src/d/actor/d_a_npc_pm1.cpp index 140a84bdf..354053785 100644 --- a/src/d/actor/d_a_npc_pm1.cpp +++ b/src/d/actor/d_a_npc_pm1.cpp @@ -213,7 +213,7 @@ static BOOL CheckCreateHeap(fopAc_ac_c*) { } /* 000018BC-00001A2C .text _create__11daNpc_Pm1_cFv */ -s32 daNpc_Pm1_c::_create() { +cPhs_State daNpc_Pm1_c::_create() { /* Nonmatching */ } @@ -223,7 +223,7 @@ void daNpc_Pm1_c::CreateHeap() { } /* 00002168-00002188 .text daNpc_Pm1_Create__FP10fopAc_ac_c */ -static s32 daNpc_Pm1_Create(fopAc_ac_c*) { +static cPhs_State daNpc_Pm1_Create(fopAc_ac_c*) { /* Nonmatching */ } diff --git a/src/d/actor/d_a_npc_roten.cpp b/src/d/actor/d_a_npc_roten.cpp index 2d8b8ba51..12892d329 100644 --- a/src/d/actor/d_a_npc_roten.cpp +++ b/src/d/actor/d_a_npc_roten.cpp @@ -1586,7 +1586,7 @@ static BOOL CheckCreateHeap(fopAc_ac_c* i_this) { } /* 000008EC-00000974 .text phase_1__FP12daNpcRoten_c */ -static s32 phase_1(daNpcRoten_c* i_this) { +static cPhs_State phase_1(daNpcRoten_c* i_this) { fopAcM_SetupActor(i_this, daNpcRoten_c); i_this->setNpcNo(i_this->getPrmNpcNo()); @@ -1600,8 +1600,8 @@ static s32 phase_1(daNpcRoten_c* i_this) { } /* 00000974-000009F4 .text phase_2__FP12daNpcRoten_c */ -static s32 phase_2(daNpcRoten_c* i_this) { - s32 result = dComIfG_resLoad(i_this->getPhaseP(), l_arcname_tbl[i_this->getPrmNpcNo()]); +static cPhs_State phase_2(daNpcRoten_c* i_this) { + cPhs_State result = dComIfG_resLoad(i_this->getPhaseP(), l_arcname_tbl[i_this->getPrmNpcNo()]); if(result == cPhs_COMPLEATE_e) { if(fopAcM_entrySolidHeap(i_this, CheckCreateHeap, 0x4620)) { result = i_this->createInit(); @@ -1616,7 +1616,7 @@ static s32 phase_2(daNpcRoten_c* i_this) { } /* 000009F4-00000A24 .text _create__12daNpcRoten_cFv */ -s32 daNpcRoten_c::_create() { +cPhs_State daNpcRoten_c::_create() { static cPhs__Handler l_method[] = { (cPhs__Handler)phase_1, (cPhs__Handler)phase_2, diff --git a/src/d/actor/d_a_npc_rsh1.cpp b/src/d/actor/d_a_npc_rsh1.cpp index 5a26bbd10..fb6504165 100644 --- a/src/d/actor/d_a_npc_rsh1.cpp +++ b/src/d/actor/d_a_npc_rsh1.cpp @@ -258,7 +258,7 @@ static BOOL CheckCreateHeap(fopAc_ac_c*) { } /* 00004328-00004464 .text _create__12daNpc_Rsh1_cFv */ -s32 daNpc_Rsh1_c::_create() { +cPhs_State daNpc_Rsh1_c::_create() { /* Nonmatching */ } @@ -273,7 +273,7 @@ void daNpc_Rsh1_c::set_mtx() { } /* 00004A28-00004A48 .text daNpc_Rsh1_Create__FP10fopAc_ac_c */ -static s32 daNpc_Rsh1_Create(fopAc_ac_c*) { +static cPhs_State daNpc_Rsh1_Create(fopAc_ac_c*) { /* Nonmatching */ } diff --git a/src/d/actor/d_a_npc_sarace.cpp b/src/d/actor/d_a_npc_sarace.cpp index 3cdc2d482..b48caece3 100644 --- a/src/d/actor/d_a_npc_sarace.cpp +++ b/src/d/actor/d_a_npc_sarace.cpp @@ -128,7 +128,7 @@ static BOOL CallbackCreateHeap(fopAc_ac_c*) { } /* 00001B00-00001D1C .text _create__14daNpc_Sarace_cFv */ -s32 daNpc_Sarace_c::_create() { +cPhs_State daNpc_Sarace_c::_create() { /* Nonmatching */ } @@ -138,7 +138,7 @@ void daNpc_Sarace_c::CreateHeap() { } /* 00002498-000024B8 .text daNpc_Sarace_Create__FP10fopAc_ac_c */ -static s32 daNpc_Sarace_Create(fopAc_ac_c*) { +static cPhs_State daNpc_Sarace_Create(fopAc_ac_c*) { /* Nonmatching */ } diff --git a/src/d/actor/d_a_npc_so.cpp b/src/d/actor/d_a_npc_so.cpp index f926ea546..e12cec7ad 100644 --- a/src/d/actor/d_a_npc_so.cpp +++ b/src/d/actor/d_a_npc_so.cpp @@ -357,7 +357,7 @@ void daNpc_So_c::getArg() { } /* 00003E24-00003F38 .text _create__10daNpc_So_cFv */ -s32 daNpc_So_c::_create() { +cPhs_State daNpc_So_c::_create() { /* Nonmatching */ } diff --git a/src/d/actor/d_a_npc_sv.cpp b/src/d/actor/d_a_npc_sv.cpp index fba24a4e4..8babae364 100644 --- a/src/d/actor/d_a_npc_sv.cpp +++ b/src/d/actor/d_a_npc_sv.cpp @@ -34,7 +34,7 @@ void phase_2(daNpcSv_c*) { } /* 00000738-00000768 .text _create__9daNpcSv_cFv */ -s32 daNpcSv_c::_create() { +cPhs_State daNpcSv_c::_create() { /* Nonmatching */ } diff --git a/src/d/actor/d_a_npc_tc.cpp b/src/d/actor/d_a_npc_tc.cpp index 23f7ef27b..c3811cd21 100644 --- a/src/d/actor/d_a_npc_tc.cpp +++ b/src/d/actor/d_a_npc_tc.cpp @@ -293,7 +293,7 @@ void daNpc_Tc_c::isCreate() { } /* 00003FC0-00004090 .text _create__10daNpc_Tc_cFv */ -s32 daNpc_Tc_c::_create() { +cPhs_State daNpc_Tc_c::_create() { /* Nonmatching */ } @@ -303,7 +303,7 @@ void daNpc_Tc_c::_createHeap() { } /* 000047DC-000047FC .text daNpc_Tc_Create__FP10fopAc_ac_c */ -static s32 daNpc_Tc_Create(fopAc_ac_c*) { +static cPhs_State daNpc_Tc_Create(fopAc_ac_c*) { /* Nonmatching */ } diff --git a/src/d/actor/d_a_npc_tt.cpp b/src/d/actor/d_a_npc_tt.cpp index d9319f169..f218b0c5f 100644 --- a/src/d/actor/d_a_npc_tt.cpp +++ b/src/d/actor/d_a_npc_tt.cpp @@ -218,7 +218,7 @@ static BOOL CheckCreateHeap(fopAc_ac_c*) { } /* 000021C8-0000241C .text _create__10daNpc_Tt_cFv */ -s32 daNpc_Tt_c::_create() { +cPhs_State daNpc_Tt_c::_create() { /* Nonmatching */ } @@ -228,7 +228,7 @@ void daNpc_Tt_c::CreateHeap() { } /* 00002AB0-00002AD0 .text daNpc_Tt_Create__FP10fopAc_ac_c */ -static s32 daNpc_Tt_Create(fopAc_ac_c*) { +static cPhs_State daNpc_Tt_Create(fopAc_ac_c*) { /* Nonmatching */ } diff --git a/src/d/actor/d_a_npc_uk.cpp b/src/d/actor/d_a_npc_uk.cpp index fae56e3a4..6d456d349 100644 --- a/src/d/actor/d_a_npc_uk.cpp +++ b/src/d/actor/d_a_npc_uk.cpp @@ -323,7 +323,7 @@ static BOOL CheckCreateHeap(fopAc_ac_c*) { } /* 00004D54-00005028 .text _create__10daNpc_Uk_cFv */ -s32 daNpc_Uk_c::_create() { +cPhs_State daNpc_Uk_c::_create() { /* Nonmatching */ } @@ -333,7 +333,7 @@ void daNpc_Uk_c::CreateHeap() { } /* 00005728-00005748 .text daNpc_Uk_Create__FP10fopAc_ac_c */ -static s32 daNpc_Uk_Create(fopAc_ac_c*) { +static cPhs_State daNpc_Uk_Create(fopAc_ac_c*) { /* Nonmatching */ } diff --git a/src/d/actor/d_a_npc_ym1.cpp b/src/d/actor/d_a_npc_ym1.cpp index d34e7a6c2..524bd52a1 100644 --- a/src/d/actor/d_a_npc_ym1.cpp +++ b/src/d/actor/d_a_npc_ym1.cpp @@ -387,7 +387,7 @@ bool daNpc_Ym1_c::_delete() { } /* 00003AB0-00003BDC .text _create__11daNpc_Ym1_cFv */ -s32 daNpc_Ym1_c::_create() { +cPhs_State daNpc_Ym1_c::_create() { /* Nonmatching */ } @@ -412,7 +412,7 @@ void daNpc_Ym1_c::CreateHeap() { } /* 000045F8-00004618 .text daNpc_Ym1_Create__FP10fopAc_ac_c */ -static s32 daNpc_Ym1_Create(fopAc_ac_c*) { +static cPhs_State daNpc_Ym1_Create(fopAc_ac_c*) { /* Nonmatching */ } diff --git a/src/d/actor/d_a_npc_yw1.cpp b/src/d/actor/d_a_npc_yw1.cpp index 5638b1c0f..0e5cd76e2 100644 --- a/src/d/actor/d_a_npc_yw1.cpp +++ b/src/d/actor/d_a_npc_yw1.cpp @@ -372,7 +372,7 @@ bool daNpc_Yw1_c::_delete() { } /* 00003F38-0000417C .text _create__11daNpc_Yw1_cFv */ -s32 daNpc_Yw1_c::_create() { +cPhs_State daNpc_Yw1_c::_create() { /* Nonmatching */ } @@ -392,7 +392,7 @@ void daNpc_Yw1_c::CreateHeap() { } /* 000049D0-000049F0 .text daNpc_Yw1_Create__FP10fopAc_ac_c */ -static s32 daNpc_Yw1_Create(fopAc_ac_c*) { +static cPhs_State daNpc_Yw1_Create(fopAc_ac_c*) { /* Nonmatching */ } diff --git a/src/d/actor/d_a_npc_zk1.cpp b/src/d/actor/d_a_npc_zk1.cpp index 486733010..decec3e96 100644 --- a/src/d/actor/d_a_npc_zk1.cpp +++ b/src/d/actor/d_a_npc_zk1.cpp @@ -252,7 +252,7 @@ bool daNpc_Zk1_c::_delete() { } /* 00001EFC-00002148 .text _create__11daNpc_Zk1_cFv */ -s32 daNpc_Zk1_c::_create() { +cPhs_State daNpc_Zk1_c::_create() { /* Nonmatching */ } @@ -267,7 +267,7 @@ void daNpc_Zk1_c::CreateHeap() { } /* 0000270C-0000272C .text daNpc_Zk1_Create__FP10fopAc_ac_c */ -static s32 daNpc_Zk1_Create(fopAc_ac_c*) { +static cPhs_State daNpc_Zk1_Create(fopAc_ac_c*) { /* Nonmatching */ } diff --git a/src/d/actor/d_a_npc_zl1.cpp b/src/d/actor/d_a_npc_zl1.cpp index 99eed85a5..f77530716 100644 --- a/src/d/actor/d_a_npc_zl1.cpp +++ b/src/d/actor/d_a_npc_zl1.cpp @@ -633,7 +633,7 @@ bool daNpc_Zl1_c::_delete() { } /* 00006CF4-00006E20 .text _create__11daNpc_Zl1_cFv */ -s32 daNpc_Zl1_c::_create() { +cPhs_State daNpc_Zl1_c::_create() { /* Nonmatching */ } @@ -653,7 +653,7 @@ void daNpc_Zl1_c::CreateHeap() { } /* 00007974-00007994 .text daNpc_Zl1_Create__FP10fopAc_ac_c */ -static s32 daNpc_Zl1_Create(fopAc_ac_c*) { +static cPhs_State daNpc_Zl1_Create(fopAc_ac_c*) { /* Nonmatching */ } diff --git a/src/d/actor/d_a_nz.cpp b/src/d/actor/d_a_nz.cpp index ad58a5d81..342222b48 100644 --- a/src/d/actor/d_a_nz.cpp +++ b/src/d/actor/d_a_nz.cpp @@ -173,7 +173,7 @@ void daNZ_CreateInit(nz_class*) { } /* 000081AC-00008294 .text daNZ_Create__FP10fopAc_ac_c */ -static s32 daNZ_Create(fopAc_ac_c*) { +static cPhs_State daNZ_Create(fopAc_ac_c*) { /* Nonmatching */ } diff --git a/src/d/actor/d_a_nzg.cpp b/src/d/actor/d_a_nzg.cpp index 56c48c39a..c892750ba 100644 --- a/src/d/actor/d_a_nzg.cpp +++ b/src/d/actor/d_a_nzg.cpp @@ -42,7 +42,7 @@ static BOOL useHeapInit(fopAc_ac_c*) { } /* 00000620-00000864 .text daNZG_Create__FP10fopAc_ac_c */ -static s32 daNZG_Create(fopAc_ac_c*) { +static cPhs_State daNZG_Create(fopAc_ac_c*) { /* Nonmatching */ } diff --git a/src/d/actor/d_a_obj_AjavW.cpp b/src/d/actor/d_a_obj_AjavW.cpp index f0d165eaf..90b316efe 100644 --- a/src/d/actor/d_a_obj_AjavW.cpp +++ b/src/d/actor/d_a_obj_AjavW.cpp @@ -45,10 +45,10 @@ bool daObjAjavW_c::create_heap() { } /* 00000208-00000350 .text _create__12daObjAjavW_cFv */ -s32 daObjAjavW_c::_create() { +cPhs_State daObjAjavW_c::_create() { fopAcM_SetupActor(this, daObjAjavW_c); - s32 ret = dComIfG_resLoad(&mPhs, l_arcname); + cPhs_State ret = dComIfG_resLoad(&mPhs, l_arcname); if (ret == cPhs_COMPLEATE_e) { if (fopAcM_entrySolidHeap(this, solidHeapCB, 0x8c0) == 1) { @@ -102,7 +102,7 @@ bool daObjAjavW_c::_draw() { } /* 0000056C-0000058C .text daObjAjavW_Create__FP12daObjAjavW_c */ -static s32 daObjAjavW_Create(daObjAjavW_c* i_this) { +static cPhs_State daObjAjavW_Create(daObjAjavW_c* i_this) { return i_this->_create(); } diff --git a/src/d/actor/d_a_obj_Itnak.cpp b/src/d/actor/d_a_obj_Itnak.cpp index 1db3520b1..e151bbff1 100644 --- a/src/d/actor/d_a_obj_Itnak.cpp +++ b/src/d/actor/d_a_obj_Itnak.cpp @@ -17,7 +17,7 @@ void daObjItnak::Act_c::create_heap() { } /* 0000016C-000003A0 .text _create__Q210daObjItnak5Act_cFv */ -s32 daObjItnak::Act_c::_create() { +cPhs_State daObjItnak::Act_c::_create() { /* Nonmatching */ } @@ -59,27 +59,27 @@ bool daObjItnak::Act_c::_draw() { namespace daObjItnak { namespace { /* 0000123C-0000125C .text Mthd_Create__Q210daObjItnak27@unnamed@d_a_obj_Itnak_cpp@FPv */ -void Mthd_Create(void*) { +cPhs_State Mthd_Create(void*) { /* Nonmatching */ } /* 0000125C-00001280 .text Mthd_Delete__Q210daObjItnak27@unnamed@d_a_obj_Itnak_cpp@FPv */ -void Mthd_Delete(void*) { +BOOL Mthd_Delete(void*) { /* Nonmatching */ } /* 00001280-000012A4 .text Mthd_Execute__Q210daObjItnak27@unnamed@d_a_obj_Itnak_cpp@FPv */ -void Mthd_Execute(void*) { +BOOL Mthd_Execute(void*) { /* Nonmatching */ } /* 000012A4-000012C8 .text Mthd_Draw__Q210daObjItnak27@unnamed@d_a_obj_Itnak_cpp@FPv */ -void Mthd_Draw(void*) { +BOOL Mthd_Draw(void*) { /* Nonmatching */ } /* 000012C8-000012D0 .text Mthd_IsDelete__Q210daObjItnak27@unnamed@d_a_obj_Itnak_cpp@FPv */ -void Mthd_IsDelete(void*) { +BOOL Mthd_IsDelete(void*) { /* Nonmatching */ } diff --git a/src/d/actor/d_a_obj_Vds.cpp b/src/d/actor/d_a_obj_Vds.cpp index 073ede616..26f6e990f 100644 --- a/src/d/actor/d_a_obj_Vds.cpp +++ b/src/d/actor/d_a_obj_Vds.cpp @@ -102,7 +102,7 @@ void daObjVds::Act_c::create_heap() { } /* 00001020-000011EC .text _create__Q28daObjVds5Act_cFv */ -s32 daObjVds::Act_c::_create() { +cPhs_State daObjVds::Act_c::_create() { /* Nonmatching */ } @@ -129,27 +129,27 @@ bool daObjVds::Act_c::_draw() { namespace daObjVds { namespace { /* 000015A8-000015C8 .text Mthd_Create__Q28daObjVds25@unnamed@d_a_obj_Vds_cpp@FPv */ -void Mthd_Create(void*) { +cPhs_State Mthd_Create(void*) { /* Nonmatching */ } /* 000015C8-000015EC .text Mthd_Delete__Q28daObjVds25@unnamed@d_a_obj_Vds_cpp@FPv */ -void Mthd_Delete(void*) { +BOOL Mthd_Delete(void*) { /* Nonmatching */ } /* 000015EC-00001610 .text Mthd_Execute__Q28daObjVds25@unnamed@d_a_obj_Vds_cpp@FPv */ -void Mthd_Execute(void*) { +BOOL Mthd_Execute(void*) { /* Nonmatching */ } /* 00001610-00001634 .text Mthd_Draw__Q28daObjVds25@unnamed@d_a_obj_Vds_cpp@FPv */ -void Mthd_Draw(void*) { +BOOL Mthd_Draw(void*) { /* Nonmatching */ } /* 00001634-0000163C .text Mthd_IsDelete__Q28daObjVds25@unnamed@d_a_obj_Vds_cpp@FPv */ -void Mthd_IsDelete(void*) { +BOOL Mthd_IsDelete(void*) { /* Nonmatching */ } diff --git a/src/d/actor/d_a_obj_Vteng.cpp b/src/d/actor/d_a_obj_Vteng.cpp index 98b8ac7a7..7b2eb827b 100644 --- a/src/d/actor/d_a_obj_Vteng.cpp +++ b/src/d/actor/d_a_obj_Vteng.cpp @@ -77,10 +77,10 @@ bool daObjVteng_c::jokai_demo() { } /* 00000324-000003F4 .text _create__12daObjVteng_cFv */ -s32 daObjVteng_c::_create() { +cPhs_State daObjVteng_c::_create() { fopAcM_SetupActor(this, daObjVteng_c); - s32 ret = dComIfG_resLoad(&mPhs, l_arcname); + cPhs_State ret = dComIfG_resLoad(&mPhs, l_arcname); if (ret == cPhs_COMPLEATE_e) { if (fopAcM_entrySolidHeap(this, solidHeapCB, 0x72a0)) { @@ -131,7 +131,7 @@ bool daObjVteng_c::_draw() { } /* 00000578-00000598 .text daObjVteng_Create__FP10fopAc_ac_c */ -static s32 daObjVteng_Create(fopAc_ac_c* i_this) { +static cPhs_State daObjVteng_Create(fopAc_ac_c* i_this) { return ((daObjVteng_c*)i_this)->_create(); } diff --git a/src/d/actor/d_a_obj_YLzou.cpp b/src/d/actor/d_a_obj_YLzou.cpp index 5907eaf90..7b3488248 100644 --- a/src/d/actor/d_a_obj_YLzou.cpp +++ b/src/d/actor/d_a_obj_YLzou.cpp @@ -62,7 +62,7 @@ void daObjYLzou_c::vib_proc() { } /* 000009A4-00000AE0 .text _create__12daObjYLzou_cFv */ -s32 daObjYLzou_c::_create() { +cPhs_State daObjYLzou_c::_create() { /* Nonmatching */ } @@ -177,7 +177,7 @@ bool daObjYLzou_c::_draw() { } /* 00001834-00001854 .text daObjYLzou_Create__FP10fopAc_ac_c */ -static s32 daObjYLzou_Create(fopAc_ac_c*) { +static cPhs_State daObjYLzou_Create(fopAc_ac_c*) { /* Nonmatching */ } diff --git a/src/d/actor/d_a_obj_Yboil.cpp b/src/d/actor/d_a_obj_Yboil.cpp index f3ac22b85..acec437db 100644 --- a/src/d/actor/d_a_obj_Yboil.cpp +++ b/src/d/actor/d_a_obj_Yboil.cpp @@ -82,10 +82,10 @@ void daObjYboil_c::set_mtx() { } } -s32 daObjYboil_c::_create() { +cPhs_State daObjYboil_c::_create() { fopAcM_SetupActor(this, daObjYboil_c); - s32 ret; + cPhs_State ret; if (dComIfGs_isEventBit(0x1902)) { ret = cPhs_STOP_e; } else { @@ -141,7 +141,7 @@ bool daObjYboil_c::_execute() { } /* 0000066C-000007D8 .text daObjYboil_Create__FPv */ -static s32 daObjYboil_Create(void* i_this) { +static cPhs_State daObjYboil_Create(void* i_this) { return ((daObjYboil_c*)i_this)->_create(); } diff --git a/src/d/actor/d_a_obj_Ygush00.cpp b/src/d/actor/d_a_obj_Ygush00.cpp index e2ff0247d..9675eebeb 100644 --- a/src/d/actor/d_a_obj_Ygush00.cpp +++ b/src/d/actor/d_a_obj_Ygush00.cpp @@ -65,7 +65,7 @@ bool daObjYgush00_c::create_heap() { } /* 00000250-000003F4 .text _create__14daObjYgush00_cFv */ -s32 daObjYgush00_c::_create() { +cPhs_State daObjYgush00_c::_create() { fopAcM_SetupActor(this, daObjYgush00_c); if (fopAcM_IsFirstCreating(this)) { @@ -75,7 +75,7 @@ s32 daObjYgush00_c::_create() { mType = 0; } - s32 ret = dComIfG_resLoad(&mPhase, l_arcname); + cPhs_State ret = dComIfG_resLoad(&mPhase, l_arcname); if (ret == cPhs_COMPLEATE_e) { if (fopAcM_entrySolidHeap(this, solidHeapCB, 0x740) == 1) { @@ -148,7 +148,7 @@ bool daObjYgush00_c::_draw() { } /* 000006FC-0000071C .text daObjYgush00_Create__FP14daObjYgush00_c */ -static s32 daObjYgush00_Create(daObjYgush00_c* i_this) { +static cPhs_State daObjYgush00_Create(daObjYgush00_c* i_this) { return i_this->_create(); } diff --git a/src/d/actor/d_a_obj_adnno.cpp b/src/d/actor/d_a_obj_adnno.cpp index 7c0ff5281..2fd00de12 100644 --- a/src/d/actor/d_a_obj_adnno.cpp +++ b/src/d/actor/d_a_obj_adnno.cpp @@ -76,10 +76,10 @@ void daObjAdnno_c::set_mtx() { } } -s32 daObjAdnno_c::_create() { +cPhs_State daObjAdnno_c::_create() { fopAcM_SetupActor(this, daObjAdnno_c); - s32 ret = dComIfG_resLoad(&mPhs, "Adnno"); + cPhs_State ret = dComIfG_resLoad(&mPhs, "Adnno"); if (ret == cPhs_COMPLEATE_e) { if (fopAcM_entrySolidHeap(this, CheckCreateHeap, 0x9C00) == 0) { @@ -123,7 +123,7 @@ bool daObjAdnno_c::_draw() { } /* 00000330-000003D4 .text daObjAdnno_Create__FPv */ -static s32 daObjAdnno_Create(void* i_this) { +static cPhs_State daObjAdnno_Create(void* i_this) { return ((daObjAdnno_c*)i_this)->_create(); } diff --git a/src/d/actor/d_a_obj_ajav.cpp b/src/d/actor/d_a_obj_ajav.cpp index b0083a356..a58eac622 100644 --- a/src/d/actor/d_a_obj_ajav.cpp +++ b/src/d/actor/d_a_obj_ajav.cpp @@ -107,7 +107,7 @@ void daObjAjav::Act_c::create_heap() { } /* 00001288-0000166C .text _create__Q29daObjAjav5Act_cFv */ -s32 daObjAjav::Act_c::_create() { +cPhs_State daObjAjav::Act_c::_create() { /* Nonmatching */ } @@ -189,27 +189,27 @@ bool daObjAjav::Act_c::_draw() { namespace daObjAjav { namespace { /* 00002DCC-00002DEC .text Mthd_Create__Q29daObjAjav26@unnamed@d_a_obj_ajav_cpp@FPv */ -void Mthd_Create(void*) { +cPhs_State Mthd_Create(void*) { /* Nonmatching */ } /* 00002DEC-00002E10 .text Mthd_Delete__Q29daObjAjav26@unnamed@d_a_obj_ajav_cpp@FPv */ -void Mthd_Delete(void*) { +BOOL Mthd_Delete(void*) { /* Nonmatching */ } /* 00002E10-00002E34 .text Mthd_Execute__Q29daObjAjav26@unnamed@d_a_obj_ajav_cpp@FPv */ -void Mthd_Execute(void*) { +BOOL Mthd_Execute(void*) { /* Nonmatching */ } /* 00002E34-00002E58 .text Mthd_Draw__Q29daObjAjav26@unnamed@d_a_obj_ajav_cpp@FPv */ -void Mthd_Draw(void*) { +BOOL Mthd_Draw(void*) { /* Nonmatching */ } /* 00002E58-00002E60 .text Mthd_IsDelete__Q29daObjAjav26@unnamed@d_a_obj_ajav_cpp@FPv */ -void Mthd_IsDelete(void*) { +BOOL Mthd_IsDelete(void*) { /* Nonmatching */ } diff --git a/src/d/actor/d_a_obj_akabe.cpp b/src/d/actor/d_a_obj_akabe.cpp index a5a63ec92..3af56f976 100644 --- a/src/d/actor/d_a_obj_akabe.cpp +++ b/src/d/actor/d_a_obj_akabe.cpp @@ -49,8 +49,8 @@ namespace daObjAkabe { } /* 000001A4-00000360 .text _create__Q210daObjAkabe5Act_cFv */ - s32 Act_c::_create() { - s32 rt = cPhs_ERROR_e; + cPhs_State Act_c::_create() { + cPhs_State rt = cPhs_ERROR_e; s32 arg0 = prm_get_arg0(); if (arg0 == 1) @@ -153,7 +153,7 @@ namespace daObjAkabe { namespace { /* 000005EC-0000060C .text Mthd_Create__Q210daObjAkabe27@unnamed@d_a_obj_akabe_cpp@FPv */ - s32 Mthd_Create(void* i_this) { + cPhs_State Mthd_Create(void* i_this) { return ((Act_c*)i_this)->_create(); } diff --git a/src/d/actor/d_a_obj_apzl.cpp b/src/d/actor/d_a_obj_apzl.cpp index 7dcfaf349..d6b61acaa 100644 --- a/src/d/actor/d_a_obj_apzl.cpp +++ b/src/d/actor/d_a_obj_apzl.cpp @@ -82,7 +82,7 @@ void daObjApzl_c::set_mtx() { } /* 000016B8-00001780 .text daObjApzl_Create__FPv */ -static s32 daObjApzl_Create(void*) { +static cPhs_State daObjApzl_Create(void*) { /* Nonmatching */ } diff --git a/src/d/actor/d_a_obj_ashut.cpp b/src/d/actor/d_a_obj_ashut.cpp index df752ee99..664f13755 100644 --- a/src/d/actor/d_a_obj_ashut.cpp +++ b/src/d/actor/d_a_obj_ashut.cpp @@ -17,7 +17,7 @@ s32 daObjAshut::Act_c::Create() { } /* 00000224-00000388 .text Mthd_Create__Q210daObjAshut5Act_cFv */ -void daObjAshut::Act_c::Mthd_Create() { +cPhs_State daObjAshut::Act_c::Mthd_Create() { /* Nonmatching */ } @@ -27,7 +27,7 @@ BOOL daObjAshut::Act_c::Delete() { } /* 00000390-000003DC .text Mthd_Delete__Q210daObjAshut5Act_cFv */ -void daObjAshut::Act_c::Mthd_Delete() { +BOOL daObjAshut::Act_c::Mthd_Delete() { /* Nonmatching */ } @@ -109,27 +109,27 @@ BOOL daObjAshut::Act_c::Draw() { namespace daObjAshut { namespace { /* 00000D6C-00000D8C .text Mthd_Create__Q210daObjAshut27@unnamed@d_a_obj_ashut_cpp@FPv */ -void Mthd_Create(void*) { +cPhs_State Mthd_Create(void*) { /* Nonmatching */ } /* 00000D8C-00000DAC .text Mthd_Delete__Q210daObjAshut27@unnamed@d_a_obj_ashut_cpp@FPv */ -void Mthd_Delete(void*) { +BOOL Mthd_Delete(void*) { /* Nonmatching */ } /* 00000DAC-00000DCC .text Mthd_Execute__Q210daObjAshut27@unnamed@d_a_obj_ashut_cpp@FPv */ -void Mthd_Execute(void*) { +BOOL Mthd_Execute(void*) { /* Nonmatching */ } /* 00000DCC-00000DF8 .text Mthd_Draw__Q210daObjAshut27@unnamed@d_a_obj_ashut_cpp@FPv */ -void Mthd_Draw(void*) { +BOOL Mthd_Draw(void*) { /* Nonmatching */ } /* 00000DF8-00000E24 .text Mthd_IsDelete__Q210daObjAshut27@unnamed@d_a_obj_ashut_cpp@FPv */ -void Mthd_IsDelete(void*) { +BOOL Mthd_IsDelete(void*) { /* Nonmatching */ } diff --git a/src/d/actor/d_a_obj_auzu.cpp b/src/d/actor/d_a_obj_auzu.cpp index 7337ba815..23b788a1f 100644 --- a/src/d/actor/d_a_obj_auzu.cpp +++ b/src/d/actor/d_a_obj_auzu.cpp @@ -17,7 +17,7 @@ void daObjAuzu::Act_c::create_heap() { } /* 000001F8-000003B8 .text _create__Q29daObjAuzu5Act_cFv */ -s32 daObjAuzu::Act_c::_create() { +cPhs_State daObjAuzu::Act_c::_create() { /* Nonmatching */ } @@ -74,27 +74,27 @@ bool daObjAuzu::Act_c::_draw() { namespace daObjAuzu { namespace { /* 00000C38-00000C58 .text Mthd_Create__Q29daObjAuzu26@unnamed@d_a_obj_auzu_cpp@FPv */ -void Mthd_Create(void*) { +cPhs_State Mthd_Create(void*) { /* Nonmatching */ } /* 00000C58-00000C7C .text Mthd_Delete__Q29daObjAuzu26@unnamed@d_a_obj_auzu_cpp@FPv */ -void Mthd_Delete(void*) { +BOOL Mthd_Delete(void*) { /* Nonmatching */ } /* 00000C7C-00000CA0 .text Mthd_Execute__Q29daObjAuzu26@unnamed@d_a_obj_auzu_cpp@FPv */ -void Mthd_Execute(void*) { +BOOL Mthd_Execute(void*) { /* Nonmatching */ } /* 00000CA0-00000CC4 .text Mthd_Draw__Q29daObjAuzu26@unnamed@d_a_obj_auzu_cpp@FPv */ -void Mthd_Draw(void*) { +BOOL Mthd_Draw(void*) { /* Nonmatching */ } /* 00000CC4-00000CCC .text Mthd_IsDelete__Q29daObjAuzu26@unnamed@d_a_obj_auzu_cpp@FPv */ -void Mthd_IsDelete(void*) { +BOOL Mthd_IsDelete(void*) { /* Nonmatching */ } diff --git a/src/d/actor/d_a_obj_aygr.cpp b/src/d/actor/d_a_obj_aygr.cpp index 72f1cd5e2..8731918ec 100644 --- a/src/d/actor/d_a_obj_aygr.cpp +++ b/src/d/actor/d_a_obj_aygr.cpp @@ -17,7 +17,7 @@ s32 daObjAygr::Act_c::Create() { } /* 00000310-000004D4 .text Mthd_Create__Q29daObjAygr5Act_cFv */ -void daObjAygr::Act_c::Mthd_Create() { +cPhs_State daObjAygr::Act_c::Mthd_Create() { /* Nonmatching */ } @@ -27,7 +27,7 @@ BOOL daObjAygr::Act_c::Delete() { } /* 000004DC-0000054C .text Mthd_Delete__Q29daObjAygr5Act_cFv */ -void daObjAygr::Act_c::Mthd_Delete() { +BOOL daObjAygr::Act_c::Mthd_Delete() { /* Nonmatching */ } @@ -54,27 +54,27 @@ BOOL daObjAygr::Act_c::Draw() { namespace daObjAygr { namespace { /* 0000079C-000007BC .text Mthd_Create__Q29daObjAygr26@unnamed@d_a_obj_aygr_cpp@FPv */ -void Mthd_Create(void*) { +cPhs_State Mthd_Create(void*) { /* Nonmatching */ } /* 000007BC-000007DC .text Mthd_Delete__Q29daObjAygr26@unnamed@d_a_obj_aygr_cpp@FPv */ -void Mthd_Delete(void*) { +BOOL Mthd_Delete(void*) { /* Nonmatching */ } /* 000007DC-000007FC .text Mthd_Execute__Q29daObjAygr26@unnamed@d_a_obj_aygr_cpp@FPv */ -void Mthd_Execute(void*) { +BOOL Mthd_Execute(void*) { /* Nonmatching */ } /* 000007FC-00000828 .text Mthd_Draw__Q29daObjAygr26@unnamed@d_a_obj_aygr_cpp@FPv */ -void Mthd_Draw(void*) { +BOOL Mthd_Draw(void*) { /* Nonmatching */ } /* 00000828-00000854 .text Mthd_IsDelete__Q29daObjAygr26@unnamed@d_a_obj_aygr_cpp@FPv */ -void Mthd_IsDelete(void*) { +BOOL Mthd_IsDelete(void*) { /* Nonmatching */ } diff --git a/src/d/actor/d_a_obj_barrel.cpp b/src/d/actor/d_a_obj_barrel.cpp index 93defe12f..941736810 100644 --- a/src/d/actor/d_a_obj_barrel.cpp +++ b/src/d/actor/d_a_obj_barrel.cpp @@ -107,9 +107,9 @@ bool daObjBarrel::Act_c::create_heap() { } /* 00000160-00000474 .text _create__Q211daObjBarrel5Act_cFv */ -s32 daObjBarrel::Act_c::_create() { +cPhs_State daObjBarrel::Act_c::_create() { fopAcM_SetupActor(this, Act_c); - s32 rt = dComIfG_resLoad(&mPhs, M_arcname); + cPhs_State rt = dComIfG_resLoad(&mPhs, M_arcname); if (rt == cPhs_COMPLEATE_e) { if(fopAcM_entrySolidHeap(this, solidHeapCB, 0x820) != 0) { mAcchCir.SetWall(30.0f, l_l_radius); @@ -734,7 +734,7 @@ bool daObjBarrel::Act_c::_draw() { } /* 0000241C-0000243C .text Create__Q211daObjBarrel6MethodFPv */ -s32 daObjBarrel::Method::Create(void* i_this) { +cPhs_State daObjBarrel::Method::Create(void* i_this) { return static_cast(i_this)->_create(); } diff --git a/src/d/actor/d_a_obj_barrel2.cpp b/src/d/actor/d_a_obj_barrel2.cpp index 84562006f..2d0f1b06c 100644 --- a/src/d/actor/d_a_obj_barrel2.cpp +++ b/src/d/actor/d_a_obj_barrel2.cpp @@ -17,7 +17,7 @@ void daObjBarrel2::Act_c::create_heap() { } /* 00000308-0000089C .text _create__Q212daObjBarrel25Act_cFv */ -s32 daObjBarrel2::Act_c::_create() { +cPhs_State daObjBarrel2::Act_c::_create() { /* Nonmatching */ } @@ -247,7 +247,7 @@ bool daObjBarrel2::Act_c::_draw() { } /* 00002F78-00002F98 .text Create__Q212daObjBarrel26MethodFPv */ -s32 daObjBarrel2::Method::Create(void*) { +cPhs_State daObjBarrel2::Method::Create(void*) { /* Nonmatching */ } diff --git a/src/d/actor/d_a_obj_barrier.cpp b/src/d/actor/d_a_obj_barrier.cpp index 62ab0dcee..96bcb9046 100644 --- a/src/d/actor/d_a_obj_barrier.cpp +++ b/src/d/actor/d_a_obj_barrier.cpp @@ -477,8 +477,8 @@ void daObjBarrier_ef_c::draw() { } /* 00001638-0000182C .text _create__14daObjBarrier_cFv */ -int daObjBarrier_c::_create() { - int phase = cPhs_ERROR_e; +cPhs_State daObjBarrier_c::_create() { + cPhs_State phase = cPhs_ERROR_e; fopAcM_SetupActor(this, daObjBarrier_c); if (fopAcM_IsFirstCreating(this)) { @@ -585,28 +585,28 @@ bool daObjBarrier_c::_draw() { } /* 00001C1C-00001C3C .text daObjBarrier_Create__FP10fopAc_ac_c */ -static int daObjBarrier_Create(fopAc_ac_c* i_this) { +static cPhs_State daObjBarrier_Create(fopAc_ac_c* i_this) { return static_cast(i_this)->_create(); } /* 00001C3C-00001C60 .text daObjBarrier_Delete__FP14daObjBarrier_c */ -static int daObjBarrier_Delete(daObjBarrier_c* i_this) { +static BOOL daObjBarrier_Delete(daObjBarrier_c* i_this) { return static_cast(i_this)->_delete(); } /* 00001C60-00001C84 .text daObjBarrier_Execute__FP14daObjBarrier_c */ -static int daObjBarrier_Execute(daObjBarrier_c* i_this) { +static BOOL daObjBarrier_Execute(daObjBarrier_c* i_this) { return static_cast(i_this)->_execute(); } /* 00001C84-00001CA8 .text daObjBarrier_Draw__FP14daObjBarrier_c */ -static int daObjBarrier_Draw(daObjBarrier_c* i_this) { +static BOOL daObjBarrier_Draw(daObjBarrier_c* i_this) { return static_cast(i_this)->_draw(); } /* 00001CA8-00001CB0 .text daObjBarrier_IsDelete__FP14daObjBarrier_c */ -static int daObjBarrier_IsDelete(daObjBarrier_c* i_this) { - return 1; +static BOOL daObjBarrier_IsDelete(daObjBarrier_c* i_this) { + return TRUE; } static actor_method_class l_daObjBarrier_Method = { diff --git a/src/d/actor/d_a_obj_bemos.cpp b/src/d/actor/d_a_obj_bemos.cpp index 39ea70536..5f56fba38 100644 --- a/src/d/actor/d_a_obj_bemos.cpp +++ b/src/d/actor/d_a_obj_bemos.cpp @@ -192,7 +192,7 @@ static s32 daBemosCreate(void*) { } /* 00003F90-0000403C .text _create__9daBemos_cFv */ -s32 daBemos_c::_create() { +cPhs_State daBemos_c::_create() { /* Nonmatching */ } diff --git a/src/d/actor/d_a_obj_bscurtain.cpp b/src/d/actor/d_a_obj_bscurtain.cpp index f044416bf..cf4a8bd69 100644 --- a/src/d/actor/d_a_obj_bscurtain.cpp +++ b/src/d/actor/d_a_obj_bscurtain.cpp @@ -60,10 +60,10 @@ s32 daObj_Bscurtain_c::CreateInit() { return cPhs_COMPLEATE_e; } -s32 daObj_Bscurtain_c::_create() { +cPhs_State daObj_Bscurtain_c::_create() { fopAcM_SetupActor(this, daObj_Bscurtain_c); - s32 ret = dComIfG_resLoad(&mPhs, M_arcname); + cPhs_State ret = dComIfG_resLoad(&mPhs, M_arcname); if (ret == cPhs_COMPLEATE_e) { if (fopAcM_entrySolidHeap(this, CheckCreateHeap, 0x10000)) { diff --git a/src/d/actor/d_a_obj_buoyflag.cpp b/src/d/actor/d_a_obj_buoyflag.cpp index c3ec78c60..bee89dcd0 100644 --- a/src/d/actor/d_a_obj_buoyflag.cpp +++ b/src/d/actor/d_a_obj_buoyflag.cpp @@ -89,27 +89,27 @@ void daObjBuoyflag::Act_c::mode_jumpToSea() { namespace daObjBuoyflag { namespace { /* 0000278C-000027AC .text Mthd_Create__Q213daObjBuoyflag30@unnamed@d_a_obj_buoyflag_cpp@FPv */ -void Mthd_Create(void*) { +cPhs_State Mthd_Create(void*) { /* Nonmatching */ } /* 000029FC-00002A2C .text Mthd_Delete__Q213daObjBuoyflag30@unnamed@d_a_obj_buoyflag_cpp@FPv */ -void Mthd_Delete(void*) { +BOOL Mthd_Delete(void*) { /* Nonmatching */ } /* 00002A2C-00002B04 .text Mthd_Execute__Q213daObjBuoyflag30@unnamed@d_a_obj_buoyflag_cpp@FPv */ -void Mthd_Execute(void*) { +BOOL Mthd_Execute(void*) { /* Nonmatching */ } /* 00002B04-00002B54 .text Mthd_Draw__Q213daObjBuoyflag30@unnamed@d_a_obj_buoyflag_cpp@FPv */ -void Mthd_Draw(void*) { +BOOL Mthd_Draw(void*) { /* Nonmatching */ } /* 00002B54-00002B5C .text Mthd_IsDelete__Q213daObjBuoyflag30@unnamed@d_a_obj_buoyflag_cpp@FPv */ -void Mthd_IsDelete(void*) { +BOOL Mthd_IsDelete(void*) { /* Nonmatching */ } diff --git a/src/d/actor/d_a_obj_buoyrace.cpp b/src/d/actor/d_a_obj_buoyrace.cpp index 894280e83..a7639e82d 100644 --- a/src/d/actor/d_a_obj_buoyrace.cpp +++ b/src/d/actor/d_a_obj_buoyrace.cpp @@ -22,7 +22,7 @@ void daObjBuoyrace::Act_c::create_load() { } /* 00000238-00000374 .text _create__Q213daObjBuoyrace5Act_cFv */ -s32 daObjBuoyrace::Act_c::_create() { +cPhs_State daObjBuoyrace::Act_c::_create() { /* Nonmatching */ } @@ -74,27 +74,27 @@ bool daObjBuoyrace::Act_c::_draw() { namespace daObjBuoyrace { namespace { /* 00000B28-00000B48 .text Mthd_Create__Q213daObjBuoyrace30@unnamed@d_a_obj_buoyrace_cpp@FPv */ -void Mthd_Create(void*) { +cPhs_State Mthd_Create(void*) { /* Nonmatching */ } /* 00000B48-00000B6C .text Mthd_Delete__Q213daObjBuoyrace30@unnamed@d_a_obj_buoyrace_cpp@FPv */ -void Mthd_Delete(void*) { +BOOL Mthd_Delete(void*) { /* Nonmatching */ } /* 00000B6C-00000B90 .text Mthd_Execute__Q213daObjBuoyrace30@unnamed@d_a_obj_buoyrace_cpp@FPv */ -void Mthd_Execute(void*) { +BOOL Mthd_Execute(void*) { /* Nonmatching */ } /* 00000B90-00000BB4 .text Mthd_Draw__Q213daObjBuoyrace30@unnamed@d_a_obj_buoyrace_cpp@FPv */ -void Mthd_Draw(void*) { +BOOL Mthd_Draw(void*) { /* Nonmatching */ } /* 00000BB4-00000BBC .text Mthd_IsDelete__Q213daObjBuoyrace30@unnamed@d_a_obj_buoyrace_cpp@FPv */ -void Mthd_IsDelete(void*) { +BOOL Mthd_IsDelete(void*) { /* Nonmatching */ } diff --git a/src/d/actor/d_a_obj_cafelmp.cpp b/src/d/actor/d_a_obj_cafelmp.cpp index e3bac50f7..5515fae14 100644 --- a/src/d/actor/d_a_obj_cafelmp.cpp +++ b/src/d/actor/d_a_obj_cafelmp.cpp @@ -45,10 +45,10 @@ void daObjCafelmp_c::set_mtx() { mpModel->setBaseTRMtx(mDoMtx_stack_c::get()); } -s32 daObjCafelmp_c::_create() { +cPhs_State daObjCafelmp_c::_create() { fopAcM_SetupActor(this, daObjCafelmp_c); - s32 ret = dComIfG_resLoad(&mPhs, "Cafelmp"); + cPhs_State ret = dComIfG_resLoad(&mPhs, "Cafelmp"); if (ret == cPhs_COMPLEATE_e) { if (fopAcM_entrySolidHeap(this, CheckCreateHeap, 0x680) == 0) { @@ -82,7 +82,7 @@ bool daObjCafelmp_c::_draw() { } /* 0000024C-000002EC .text daObjCafelmp_Create__FPv */ -static s32 daObjCafelmp_Create(void* i_this) { +static cPhs_State daObjCafelmp_Create(void* i_this) { return ((daObjCafelmp_c*)i_this)->_create(); } diff --git a/src/d/actor/d_a_obj_canon.cpp b/src/d/actor/d_a_obj_canon.cpp index f2056437e..7842558b9 100644 --- a/src/d/actor/d_a_obj_canon.cpp +++ b/src/d/actor/d_a_obj_canon.cpp @@ -147,7 +147,7 @@ void daObj_Canon_c::getArg() { } /* 00001880-000019D8 .text _create__13daObj_Canon_cFv */ -s32 daObj_Canon_c::_create() { +cPhs_State daObj_Canon_c::_create() { /* Nonmatching */ } diff --git a/src/d/actor/d_a_obj_coming.cpp b/src/d/actor/d_a_obj_coming.cpp index ce1c3ea68..bac459123 100644 --- a/src/d/actor/d_a_obj_coming.cpp +++ b/src/d/actor/d_a_obj_coming.cpp @@ -42,7 +42,7 @@ void daObjComing::Act_c::chk_switch() { } /* 000003B0-000004B0 .text _create__Q211daObjComing5Act_cFv */ -s32 daObjComing::Act_c::_create() { +cPhs_State daObjComing::Act_c::_create() { /* Nonmatching */ } @@ -144,27 +144,27 @@ bool daObjComing::Act_c::_draw() { namespace daObjComing { namespace { /* 00001318-00001338 .text Mthd_Create__Q211daObjComing28@unnamed@d_a_obj_coming_cpp@FPv */ -void Mthd_Create(void*) { +cPhs_State Mthd_Create(void*) { /* Nonmatching */ } /* 00001338-0000135C .text Mthd_Delete__Q211daObjComing28@unnamed@d_a_obj_coming_cpp@FPv */ -void Mthd_Delete(void*) { +BOOL Mthd_Delete(void*) { /* Nonmatching */ } /* 0000135C-00001380 .text Mthd_Execute__Q211daObjComing28@unnamed@d_a_obj_coming_cpp@FPv */ -void Mthd_Execute(void*) { +BOOL Mthd_Execute(void*) { /* Nonmatching */ } /* 00001380-000013A4 .text Mthd_Draw__Q211daObjComing28@unnamed@d_a_obj_coming_cpp@FPv */ -void Mthd_Draw(void*) { +BOOL Mthd_Draw(void*) { /* Nonmatching */ } /* 000013A4-000013AC .text Mthd_IsDelete__Q211daObjComing28@unnamed@d_a_obj_coming_cpp@FPv */ -void Mthd_IsDelete(void*) { +BOOL Mthd_IsDelete(void*) { /* Nonmatching */ } diff --git a/src/d/actor/d_a_obj_correct.cpp b/src/d/actor/d_a_obj_correct.cpp index 7d856c54c..735a4a663 100644 --- a/src/d/actor/d_a_obj_correct.cpp +++ b/src/d/actor/d_a_obj_correct.cpp @@ -7,7 +7,7 @@ #include "d/d_procname.h" /* 00000078-000001B0 .text _create__Q212daObjCorrect5Act_cFv */ -s32 daObjCorrect::Act_c::_create() { +cPhs_State daObjCorrect::Act_c::_create() { /* Nonmatching */ } @@ -129,27 +129,27 @@ bool daObjCorrect::Act_c::_execute() { namespace daObjCorrect { namespace { /* 00000DD8-00000DF8 .text Mthd_Create__Q212daObjCorrect29@unnamed@d_a_obj_correct_cpp@FPv */ -void Mthd_Create(void*) { +cPhs_State Mthd_Create(void*) { /* Nonmatching */ } /* 00000DF8-00000E1C .text Mthd_Delete__Q212daObjCorrect29@unnamed@d_a_obj_correct_cpp@FPv */ -void Mthd_Delete(void*) { +BOOL Mthd_Delete(void*) { /* Nonmatching */ } /* 00000E1C-00000E40 .text Mthd_Execute__Q212daObjCorrect29@unnamed@d_a_obj_correct_cpp@FPv */ -void Mthd_Execute(void*) { +BOOL Mthd_Execute(void*) { /* Nonmatching */ } /* 00000E40-00000E48 .text Mthd_Draw__Q212daObjCorrect29@unnamed@d_a_obj_correct_cpp@FPv */ -void Mthd_Draw(void*) { +BOOL Mthd_Draw(void*) { /* Nonmatching */ } /* 00000E48-00000E50 .text Mthd_IsDelete__Q212daObjCorrect29@unnamed@d_a_obj_correct_cpp@FPv */ -void Mthd_IsDelete(void*) { +BOOL Mthd_IsDelete(void*) { /* Nonmatching */ } diff --git a/src/d/actor/d_a_obj_dmgroom.cpp b/src/d/actor/d_a_obj_dmgroom.cpp index 2806bae87..60a3be0c9 100644 --- a/src/d/actor/d_a_obj_dmgroom.cpp +++ b/src/d/actor/d_a_obj_dmgroom.cpp @@ -50,10 +50,10 @@ void daObjDmgroom_c::set_mtx() { mpModel->setBaseTRMtx(mDoMtx_stack_c::get()); } -s32 daObjDmgroom_c::_create() { +cPhs_State daObjDmgroom_c::_create() { fopAcM_SetupActor(this, daObjDmgroom_c); - s32 ret = dComIfG_resLoad(&mPhs, "Dmgroom"); + cPhs_State ret = dComIfG_resLoad(&mPhs, "Dmgroom"); if (ret == cPhs_COMPLEATE_e) { if (fopAcM_entrySolidHeap(this, CheckCreateHeap, 0x1460) == 0) { @@ -93,7 +93,7 @@ bool daObjDmgroom_c::_draw() { } /* 000002EC-000003B4 .text daObjDmgroom_Create__FPv */ -static s32 daObjDmgroom_Create(void* i_this) { +static cPhs_State daObjDmgroom_Create(void* i_this) { return ((daObjDmgroom_c*)i_this)->_create(); } diff --git a/src/d/actor/d_a_obj_doguu.cpp b/src/d/actor/d_a_obj_doguu.cpp index 2429baf37..5b44d3695 100644 --- a/src/d/actor/d_a_obj_doguu.cpp +++ b/src/d/actor/d_a_obj_doguu.cpp @@ -77,12 +77,12 @@ void daObjDoguu_c::setFinishMyEvent() { } /* 000016A4-000016C4 .text daObjDoguu_Create__FPv */ -static s32 daObjDoguu_Create(void*) { +static cPhs_State daObjDoguu_Create(void*) { /* Nonmatching */ } /* 000016C4-0000178C .text _create__12daObjDoguu_cFv */ -s32 daObjDoguu_c::_create() { +cPhs_State daObjDoguu_c::_create() { /* Nonmatching */ } diff --git a/src/d/actor/d_a_obj_doguu_demo.cpp b/src/d/actor/d_a_obj_doguu_demo.cpp index 6de9532f2..76f08ebc4 100644 --- a/src/d/actor/d_a_obj_doguu_demo.cpp +++ b/src/d/actor/d_a_obj_doguu_demo.cpp @@ -62,11 +62,11 @@ void daObjDoguuD_c::set_mtx() { mpModel->setBaseTRMtx(mDoMtx_stack_c::get()); } -s32 daObjDoguuD_c::_create() { +cPhs_State daObjDoguuD_c::_create() { fopAcM_SetupActor(this, daObjDoguuD_c); mBgwRegistered = false; - s32 phase_state = dComIfG_resLoad(&mPhs, "DoguuD"); + cPhs_State phase_state = dComIfG_resLoad(&mPhs, "DoguuD"); if (phase_state == cPhs_COMPLEATE_e) { if (!fopAcM_entrySolidHeap(this, CheckCreateHeap, 0x1460)) { diff --git a/src/d/actor/d_a_obj_dragonhead.cpp b/src/d/actor/d_a_obj_dragonhead.cpp index e3b6de776..89181025f 100644 --- a/src/d/actor/d_a_obj_dragonhead.cpp +++ b/src/d/actor/d_a_obj_dragonhead.cpp @@ -110,10 +110,10 @@ void daObjDragonhead_c::set_mtx() { mpModel->setBaseTRMtx(mDoMtx_stack_c::get()); } -s32 daObjDragonhead_c::_create() { +cPhs_State daObjDragonhead_c::_create() { fopAcM_SetupActor(this, daObjDragonhead_c); - s32 ret = dComIfG_resLoad(&mPhs, "Qdghd"); + cPhs_State ret = dComIfG_resLoad(&mPhs, "Qdghd"); if (ret == cPhs_COMPLEATE_e) { if (fopAcM_entrySolidHeap(this, CheckCreateHeap, 0x10500) == 0) { @@ -197,7 +197,7 @@ bool daObjDragonhead_c::_draw() { } /* 000003CC-000004FC .text daObjDragonhead_Create__FPv */ -static s32 daObjDragonhead_Create(void* i_this) { +static cPhs_State daObjDragonhead_Create(void* i_this) { return ((daObjDragonhead_c*)i_this)->_create(); } diff --git a/src/d/actor/d_a_obj_drift.cpp b/src/d/actor/d_a_obj_drift.cpp index f218de789..f7bee92a6 100644 --- a/src/d/actor/d_a_obj_drift.cpp +++ b/src/d/actor/d_a_obj_drift.cpp @@ -17,7 +17,7 @@ s32 daObjDrift::Act_c::Create() { } /* 00000370-0000050C .text Mthd_Create__Q210daObjDrift5Act_cFv */ -void daObjDrift::Act_c::Mthd_Create() { +cPhs_State daObjDrift::Act_c::Mthd_Create() { /* Nonmatching */ } @@ -42,7 +42,7 @@ BOOL daObjDrift::Act_c::Delete() { } /* 0000095C-000009A8 .text Mthd_Delete__Q210daObjDrift5Act_cFv */ -void daObjDrift::Act_c::Mthd_Delete() { +BOOL daObjDrift::Act_c::Mthd_Delete() { /* Nonmatching */ } @@ -99,27 +99,27 @@ BOOL daObjDrift::Act_c::Draw() { namespace daObjDrift { namespace { /* 00001270-00001290 .text Mthd_Create__Q210daObjDrift27@unnamed@d_a_obj_drift_cpp@FPv */ -void Mthd_Create(void*) { +cPhs_State Mthd_Create(void*) { /* Nonmatching */ } /* 00001290-000012B0 .text Mthd_Delete__Q210daObjDrift27@unnamed@d_a_obj_drift_cpp@FPv */ -void Mthd_Delete(void*) { +BOOL Mthd_Delete(void*) { /* Nonmatching */ } /* 000012B0-000012D0 .text Mthd_Execute__Q210daObjDrift27@unnamed@d_a_obj_drift_cpp@FPv */ -void Mthd_Execute(void*) { +BOOL Mthd_Execute(void*) { /* Nonmatching */ } /* 000012D0-000012FC .text Mthd_Draw__Q210daObjDrift27@unnamed@d_a_obj_drift_cpp@FPv */ -void Mthd_Draw(void*) { +BOOL Mthd_Draw(void*) { /* Nonmatching */ } /* 000012FC-00001328 .text Mthd_IsDelete__Q210daObjDrift27@unnamed@d_a_obj_drift_cpp@FPv */ -void Mthd_IsDelete(void*) { +BOOL Mthd_IsDelete(void*) { /* Nonmatching */ } diff --git a/src/d/actor/d_a_obj_eayogn.cpp b/src/d/actor/d_a_obj_eayogn.cpp index 74d6c86e8..a5e2fbb89 100644 --- a/src/d/actor/d_a_obj_eayogn.cpp +++ b/src/d/actor/d_a_obj_eayogn.cpp @@ -40,8 +40,8 @@ BOOL daObjEayogn_c::create_heap() { } /* 00000198-0000029C .text _create__13daObjEayogn_cFv */ -s32 daObjEayogn_c::_create() { - s32 ret = cPhs_ERROR_e; +cPhs_State daObjEayogn_c::_create() { + cPhs_State ret = cPhs_ERROR_e; fopAcM_SetupActor(this, daObjEayogn_c); @@ -108,7 +108,7 @@ bool daObjEayogn_c::_draw() { namespace { /* 00000490-000004B0 .text Mthd_Create__28@unnamed@d_a_obj_eayogn_cpp@FPv */ - s32 Mthd_Create(void* i_this) { + cPhs_State Mthd_Create(void* i_this) { return ((daObjEayogn_c*)i_this)->_create(); } diff --git a/src/d/actor/d_a_obj_ebomzo.cpp b/src/d/actor/d_a_obj_ebomzo.cpp index b2b490e2f..b4a18890e 100644 --- a/src/d/actor/d_a_obj_ebomzo.cpp +++ b/src/d/actor/d_a_obj_ebomzo.cpp @@ -8,6 +8,7 @@ #include "d/d_com_inf_game.h" #include "f_op/f_op_actor_mng.h" #include "d/res/res_ebomzo.h" +#include "d/d_procname.h" typedef enum { /*0*/ Ebomzo_Mode_Check = 0, @@ -49,7 +50,7 @@ dCcD_SrcSph sph_check_src = { }; /* 00000078-0000012C .text CreateHeap__Q211daObjEbomzo5Act_cFv */ -int daObjEbomzo::Act_c::CreateHeap() { +BOOL daObjEbomzo::Act_c::CreateHeap() { J3DModelData* model_data = (J3DModelData*)dComIfG_getObjectRes(M_arcname, EBOMZO_BDL_EBOMZO); JUT_ASSERT(140, model_data != NULL); mpModel = mDoExt_J3DModel__create(model_data, 0, 0x11020203); @@ -57,7 +58,7 @@ int daObjEbomzo::Act_c::CreateHeap() { } /* 0000012C-0000021C .text Create__Q211daObjEbomzo5Act_cFv */ -int daObjEbomzo::Act_c::Create() { +BOOL daObjEbomzo::Act_c::Create() { fopAcM_SetMtx(this, mpModel->getBaseTRMtx()); init_mtx(); @@ -80,12 +81,10 @@ int daObjEbomzo::Act_c::Create() { } /* 0000021C-000003A0 .text Mthd_Create__Q211daObjEbomzo5Act_cFv */ -int daObjEbomzo::Act_c::Mthd_Create() { - int phase_state; - +cPhs_State daObjEbomzo::Act_c::Mthd_Create() { fopAcM_SetupActor(this, daObjEbomzo::Act_c); - phase_state = dComIfG_resLoad(&mPhs, M_arcname); + cPhs_State phase_state = dComIfG_resLoad(&mPhs, M_arcname); if (phase_state == cPhs_COMPLEATE_e) { phase_state = MoveBGCreate(M_arcname, EBOMZO_DZB_EBOMZO, NULL, 0x1200); JUT_ASSERT(194, (phase_state == cPhs_COMPLEATE_e) || (phase_state == cPhs_ERROR_e)); @@ -94,12 +93,12 @@ int daObjEbomzo::Act_c::Mthd_Create() { } /* 00000558-00000560 .text Delete__Q211daObjEbomzo5Act_cFv */ -int daObjEbomzo::Act_c::Delete() { +BOOL daObjEbomzo::Act_c::Delete() { return TRUE; } /* 00000560-000005AC .text Mthd_Delete__Q211daObjEbomzo5Act_cFv */ -int daObjEbomzo::Act_c::Mthd_Delete() { +BOOL daObjEbomzo::Act_c::Mthd_Delete() { u32 result = MoveBGDelete(); dComIfG_resDelete(&mPhs, M_arcname); return result; @@ -178,7 +177,7 @@ void daObjEbomzo::Act_c::demo() { void daObjEbomzo::Act_c::fall() {} /* 000009C0-00000AFC .text Execute__Q211daObjEbomzo5Act_cFPPA3_A4_f */ -int daObjEbomzo::Act_c::Execute(Mtx** matrix) { +BOOL daObjEbomzo::Act_c::Execute(Mtx** matrix) { cXyz offset; offset.x = cM_ssin(current.angle.y) * 50.0f; @@ -202,7 +201,7 @@ int daObjEbomzo::Act_c::Execute(Mtx** matrix) { } /* 00000AFC-00000B9C .text Draw__Q211daObjEbomzo5Act_cFv */ -int daObjEbomzo::Act_c::Draw() { +BOOL daObjEbomzo::Act_c::Draw() { g_env_light.settingTevStruct(TEV_TYPE_BG0, ¤t.pos, &tevStr); g_env_light.setLightTevColorType(mpModel, &tevStr); dComIfGd_setListBG(); @@ -215,7 +214,7 @@ int daObjEbomzo::Act_c::Draw() { namespace daObjEbomzo { namespace { /* 00000B9C-00000BBC .text Mthd_Create__Q211daObjEbomzo28@unnamed@d_a_obj_ebomzo_cpp@FPv */ - s32 Mthd_Create(void* i_this) { + cPhs_State Mthd_Create(void* i_this) { return static_cast(i_this)->Mthd_Create(); } diff --git a/src/d/actor/d_a_obj_eff.cpp b/src/d/actor/d_a_obj_eff.cpp index 85540b17e..31e74c0e2 100644 --- a/src/d/actor/d_a_obj_eff.cpp +++ b/src/d/actor/d_a_obj_eff.cpp @@ -137,7 +137,7 @@ void daObjEff::Act_c::eff_set() { } /* 00000F6C-00001030 .text _create__Q28daObjEff5Act_cFv */ -s32 daObjEff::Act_c::_create() { +cPhs_State daObjEff::Act_c::_create() { /* Nonmatching */ } @@ -224,27 +224,27 @@ bool daObjEff::Act_c::_execute() { namespace daObjEff { namespace { /* 000014C0-000014E0 .text Mthd_Create__Q28daObjEff25@unnamed@d_a_obj_eff_cpp@FPv */ -void Mthd_Create(void*) { +cPhs_State Mthd_Create(void*) { /* Nonmatching */ } /* 000014E0-00001504 .text Mthd_Delete__Q28daObjEff25@unnamed@d_a_obj_eff_cpp@FPv */ -void Mthd_Delete(void*) { +BOOL Mthd_Delete(void*) { /* Nonmatching */ } /* 00001504-00001528 .text Mthd_Execute__Q28daObjEff25@unnamed@d_a_obj_eff_cpp@FPv */ -void Mthd_Execute(void*) { +BOOL Mthd_Execute(void*) { /* Nonmatching */ } /* 00001528-00001530 .text Mthd_Draw__Q28daObjEff25@unnamed@d_a_obj_eff_cpp@FPv */ -void Mthd_Draw(void*) { +BOOL Mthd_Draw(void*) { /* Nonmatching */ } /* 00001530-00001538 .text Mthd_IsDelete__Q28daObjEff25@unnamed@d_a_obj_eff_cpp@FPv */ -void Mthd_IsDelete(void*) { +BOOL Mthd_IsDelete(void*) { /* Nonmatching */ } diff --git a/src/d/actor/d_a_obj_ekskz.cpp b/src/d/actor/d_a_obj_ekskz.cpp index f86dccc59..074758253 100644 --- a/src/d/actor/d_a_obj_ekskz.cpp +++ b/src/d/actor/d_a_obj_ekskz.cpp @@ -7,17 +7,17 @@ #include "d/d_procname.h" /* 00000078-00000368 .text CreateHeap__Q210daObjEkskz5Act_cFv */ -int daObjEkskz::Act_c::CreateHeap() { +BOOL daObjEkskz::Act_c::CreateHeap() { /* Nonmatching */ } /* 00000368-0000054C .text Create__Q210daObjEkskz5Act_cFv */ -int daObjEkskz::Act_c::Create() { +BOOL daObjEkskz::Act_c::Create() { /* Nonmatching */ } /* 0000054C-00000684 .text Mthd_Create__Q210daObjEkskz5Act_cFv */ -void daObjEkskz::Act_c::Mthd_Create() { +cPhs_State daObjEkskz::Act_c::Mthd_Create() { /* Nonmatching */ } @@ -27,7 +27,7 @@ BOOL daObjEkskz::Act_c::Delete() { } /* 00000C64-00000CBC .text Mthd_Delete__Q210daObjEkskz5Act_cFv */ -void daObjEkskz::Act_c::Mthd_Delete() { +BOOL daObjEkskz::Act_c::Mthd_Delete() { /* Nonmatching */ } @@ -42,7 +42,7 @@ void daObjEkskz::Act_c::init_mtx() { } /* 00000DC0-00000FFC .text Execute__Q210daObjEkskz5Act_cFPPA3_A4_f */ -int daObjEkskz::Act_c::Execute(float(**)[3][4]) { +BOOL daObjEkskz::Act_c::Execute(float(**)[3][4]) { /* Nonmatching */ } @@ -54,27 +54,27 @@ BOOL daObjEkskz::Act_c::Draw() { namespace daObjEkskz { namespace { /* 00001124-00001144 .text Mthd_Create__Q210daObjEkskz27@unnamed@d_a_obj_ekskz_cpp@FPv */ -void Mthd_Create(void*) { +cPhs_State Mthd_Create(void*) { /* Nonmatching */ } /* 00001144-00001164 .text Mthd_Delete__Q210daObjEkskz27@unnamed@d_a_obj_ekskz_cpp@FPv */ -void Mthd_Delete(void*) { +BOOL Mthd_Delete(void*) { /* Nonmatching */ } /* 00001164-00001184 .text Mthd_Execute__Q210daObjEkskz27@unnamed@d_a_obj_ekskz_cpp@FPv */ -void Mthd_Execute(void*) { +BOOL Mthd_Execute(void*) { /* Nonmatching */ } /* 00001184-000011B0 .text Mthd_Draw__Q210daObjEkskz27@unnamed@d_a_obj_ekskz_cpp@FPv */ -void Mthd_Draw(void*) { +BOOL Mthd_Draw(void*) { /* Nonmatching */ } /* 000011B0-000011DC .text Mthd_IsDelete__Q210daObjEkskz27@unnamed@d_a_obj_ekskz_cpp@FPv */ -void Mthd_IsDelete(void*) { +BOOL Mthd_IsDelete(void*) { /* Nonmatching */ } diff --git a/src/d/actor/d_a_obj_eskban.cpp b/src/d/actor/d_a_obj_eskban.cpp index 8b0b70e57..e3e62b277 100644 --- a/src/d/actor/d_a_obj_eskban.cpp +++ b/src/d/actor/d_a_obj_eskban.cpp @@ -108,7 +108,7 @@ static dCcD_SrcSph sph_check_src = { }; /* 000000EC-000001FC .text CreateHeap__Q211daObjEskban5Act_cFv */ -int daObjEskban::Act_c::CreateHeap() { +BOOL daObjEskban::Act_c::CreateHeap() { J3DModelData* model_data = static_cast(dComIfG_getObjectRes(M_arcname, ESKBAN_BDL_ESKBAN)); JUT_ASSERT(261, model_data != NULL); @@ -119,7 +119,7 @@ int daObjEskban::Act_c::CreateHeap() { } /* 000001FC-00000368 .text Create__Q211daObjEskban5Act_cFv */ -int daObjEskban::Act_c::Create() { +BOOL daObjEskban::Act_c::Create() { fopAcM_SetMtx(this, mpModel->getBaseTRMtx()); init_mtx(); fopAcM_setCullSizeBox(this, -500, -1, -500, 500, 500, 500); @@ -147,8 +147,8 @@ int daObjEskban::Act_c::Create() { } /* 000003A4-000004D0 .text Mthd_Create__Q211daObjEskban5Act_cFv */ -s32 daObjEskban::Act_c::Mthd_Create() { - s32 phase_state; +cPhs_State daObjEskban::Act_c::Mthd_Create() { + cPhs_State phase_state; fopAcM_SetupActor(this, Act_c); M_smoke = NULL; @@ -267,7 +267,7 @@ void daObjEskban::Act_c::daObjEskban_effect_set() { } /* 00000EF0-00001400 .text Execute__Q211daObjEskban5Act_cFPPA3_A4_f */ -int daObjEskban::Act_c::Execute(Mtx** pMtx) { +BOOL daObjEskban::Act_c::Execute(Mtx** pMtx) { dComIfG_Ccsp()->Set(&mCheckCyl); dComIfG_Ccsp()->Set(&mCameraCyl); dComIfG_Ccsp()->Set(&mCheckSph); @@ -389,28 +389,28 @@ BOOL daObjEskban::Act_c::Draw() { namespace daObjEskban { namespace { /* 000014B4-000014D4 .text Mthd_Create__Q211daObjEskban28@unnamed@d_a_obj_eskban_cpp@FPv */ -void Mthd_Create(void* i_this) { - ((Act_c*)i_this)->Mthd_Create(); +cPhs_State Mthd_Create(void* i_this) { + return ((Act_c*)i_this)->Mthd_Create(); } /* 000014D4-000014F4 .text Mthd_Delete__Q211daObjEskban28@unnamed@d_a_obj_eskban_cpp@FPv */ -void Mthd_Delete(void* i_this) { - ((Act_c*)i_this)->Mthd_Delete(); +BOOL Mthd_Delete(void* i_this) { + return ((Act_c*)i_this)->Mthd_Delete(); } /* 000014F4-00001514 .text Mthd_Execute__Q211daObjEskban28@unnamed@d_a_obj_eskban_cpp@FPv */ -void Mthd_Execute(void* i_this) { - ((Act_c*)i_this)->MoveBGExecute(); +BOOL Mthd_Execute(void* i_this) { + return ((Act_c*)i_this)->MoveBGExecute(); } /* 00001514-00001540 .text Mthd_Draw__Q211daObjEskban28@unnamed@d_a_obj_eskban_cpp@FPv */ -void Mthd_Draw(void* i_this) { - ((Act_c*)i_this)->MoveBGDraw(); +BOOL Mthd_Draw(void* i_this) { + return ((Act_c*)i_this)->MoveBGDraw(); } /* 00001540-0000156C .text Mthd_IsDelete__Q211daObjEskban28@unnamed@d_a_obj_eskban_cpp@FPv */ -void Mthd_IsDelete(void* i_this) { - ((Act_c*)i_this)->MoveBGIsDelete(); +BOOL Mthd_IsDelete(void* i_this) { + return ((Act_c*)i_this)->MoveBGIsDelete(); } static actor_method_class Mthd_Eskban = { diff --git a/src/d/actor/d_a_obj_ferris.cpp b/src/d/actor/d_a_obj_ferris.cpp index c7c1e89fa..05ffd087f 100644 --- a/src/d/actor/d_a_obj_ferris.cpp +++ b/src/d/actor/d_a_obj_ferris.cpp @@ -143,10 +143,10 @@ void daObjFerris::Act_c::ride_call_back(dBgW* bgw, fopAc_ac_c* i_ac, fopAc_ac_c* } /* 000004DC-00000898 .text _create__Q211daObjFerris5Act_cFv */ -s32 daObjFerris::Act_c::_create() { +cPhs_State daObjFerris::Act_c::_create() { fopAcM_SetupActor(this, Act_c); - s32 ret = dComIfG_resLoad(&mPhs, M_arcname); + cPhs_State ret = dComIfG_resLoad(&mPhs, M_arcname); s32 i; if (ret == cPhs_COMPLEATE_e) { @@ -526,7 +526,7 @@ bool daObjFerris::Act_c::_draw() { namespace daObjFerris { namespace { - s32 Mthd_Create(void* i_this) { + cPhs_State Mthd_Create(void* i_this) { return ((Act_c*)i_this)->_create(); } diff --git a/src/d/actor/d_a_obj_figure.cpp b/src/d/actor/d_a_obj_figure.cpp index 6b72fafca..0307a5eb2 100644 --- a/src/d/actor/d_a_obj_figure.cpp +++ b/src/d/actor/d_a_obj_figure.cpp @@ -881,11 +881,11 @@ static BOOL CheckCreateHeap(fopAc_ac_c* i_this) { } /* 000005A8-00000624 .text phase_1__FP13daObjFigure_c */ -static s32 phase_1(daObjFigure_c* i_this) { +static cPhs_State phase_1(daObjFigure_c* i_this) { fopAcM_SetupActor(i_this, daObjFigure_c) i_this->setResFlag(0x1); - int status = dComIfG_resLoad(i_this->getPhase1P(), "Figure"); + cPhs_State status = dComIfG_resLoad(i_this->getPhase1P(), "Figure"); if(status != cPhs_ERROR_e && status == cPhs_COMPLEATE_e) { return cPhs_NEXT_e; } @@ -894,7 +894,7 @@ static s32 phase_1(daObjFigure_c* i_this) { } /* 00000624-000006F0 .text phase_2__FP13daObjFigure_c */ -static s32 phase_2(daObjFigure_c* i_this) { +static cPhs_State phase_2(daObjFigure_c* i_this) { i_this->setResFlag(0x2); u8 figureNo = i_this->getFigureNo(); int id = dSnap_GetFigRoomId(figureNo); @@ -902,7 +902,7 @@ static s32 phase_2(daObjFigure_c* i_this) { id = l_figure_dat_tbl[figureNo].mRoomId; } - int status = dComIfG_resLoad(i_this->getPhase2P(), l_arcname_tbl[id]); + cPhs_State status = dComIfG_resLoad(i_this->getPhase2P(), l_arcname_tbl[id]); if(status == cPhs_COMPLEATE_e) { if(fopAcM_entrySolidHeap(i_this, CheckCreateHeap, figureNo == 0x40 ? 0x25000 : 0xCD90)) { @@ -917,7 +917,7 @@ static s32 phase_2(daObjFigure_c* i_this) { } /* 000006F0-00000720 .text _create__13daObjFigure_cFv */ -s32 daObjFigure_c::_create() { +cPhs_State daObjFigure_c::_create() { static cPhs__Handler l_method[] = { (cPhs__Handler)&phase_1, (cPhs__Handler)&phase_2, diff --git a/src/d/actor/d_a_obj_firewall.cpp b/src/d/actor/d_a_obj_firewall.cpp index 8e6922e16..e0fda2151 100644 --- a/src/d/actor/d_a_obj_firewall.cpp +++ b/src/d/actor/d_a_obj_firewall.cpp @@ -72,7 +72,7 @@ void daObjFirewall_c::setup_put_the_fire_out() { } /* 00000EAC-000011F8 .text _create__15daObjFirewall_cFv */ -s32 daObjFirewall_c::_create() { +cPhs_State daObjFirewall_c::_create() { /* Nonmatching */ } @@ -127,7 +127,7 @@ bool daObjFirewall_c::_draw() { } /* 00001CD4-00001CF4 .text daObjFirewall_Create__FP10fopAc_ac_c */ -static s32 daObjFirewall_Create(fopAc_ac_c*) { +static cPhs_State daObjFirewall_Create(fopAc_ac_c*) { /* Nonmatching */ } diff --git a/src/d/actor/d_a_obj_flame.cpp b/src/d/actor/d_a_obj_flame.cpp index 5d6e99a78..9f95ece2e 100644 --- a/src/d/actor/d_a_obj_flame.cpp +++ b/src/d/actor/d_a_obj_flame.cpp @@ -132,12 +132,12 @@ void daObjFlame::Act_c::mode_proc_call() { } /* 00001EAC-00001ECC .text Create__Q210daObjFlame6MethodFPv */ -s32 daObjFlame::Method::Create(void*) { +cPhs_State daObjFlame::Method::Create(void*) { /* Nonmatching */ } /* 00001ECC-00002200 .text _create__Q210daObjFlame5Act_cFv */ -s32 daObjFlame::Act_c::_create() { +cPhs_State daObjFlame::Act_c::_create() { /* Nonmatching */ } diff --git a/src/d/actor/d_a_obj_ftree.cpp b/src/d/actor/d_a_obj_ftree.cpp index 4f6a84ebb..8b36b9969 100644 --- a/src/d/actor/d_a_obj_ftree.cpp +++ b/src/d/actor/d_a_obj_ftree.cpp @@ -322,7 +322,7 @@ void daObjFtree::Act_c::create_heap() { } /* 00003354-000035F4 .text _create__Q210daObjFtree5Act_cFv */ -s32 daObjFtree::Act_c::_create() { +cPhs_State daObjFtree::Act_c::_create() { /* Nonmatching */ } @@ -349,27 +349,27 @@ bool daObjFtree::Act_c::_draw() { namespace daObjFtree { namespace { /* 0000455C-0000457C .text Mthd_Create__Q210daObjFtree27@unnamed@d_a_obj_ftree_cpp@FPv */ -void Mthd_Create(void*) { +cPhs_State Mthd_Create(void*) { /* Nonmatching */ } /* 0000457C-000045A0 .text Mthd_Delete__Q210daObjFtree27@unnamed@d_a_obj_ftree_cpp@FPv */ -void Mthd_Delete(void*) { +BOOL Mthd_Delete(void*) { /* Nonmatching */ } /* 000045A0-000045C4 .text Mthd_Execute__Q210daObjFtree27@unnamed@d_a_obj_ftree_cpp@FPv */ -void Mthd_Execute(void*) { +BOOL Mthd_Execute(void*) { /* Nonmatching */ } /* 000045C4-000045E8 .text Mthd_Draw__Q210daObjFtree27@unnamed@d_a_obj_ftree_cpp@FPv */ -void Mthd_Draw(void*) { +BOOL Mthd_Draw(void*) { /* Nonmatching */ } /* 000045E8-000045F0 .text Mthd_IsDelete__Q210daObjFtree27@unnamed@d_a_obj_ftree_cpp@FPv */ -void Mthd_IsDelete(void*) { +BOOL Mthd_IsDelete(void*) { /* Nonmatching */ } diff --git a/src/d/actor/d_a_obj_ganonbed.cpp b/src/d/actor/d_a_obj_ganonbed.cpp index 15996f59e..4ed017e54 100644 --- a/src/d/actor/d_a_obj_ganonbed.cpp +++ b/src/d/actor/d_a_obj_ganonbed.cpp @@ -51,10 +51,10 @@ bool daObjGbed_c::create_heap() { } /* 00000224-000002F8 .text _create__11daObjGbed_cFv */ -s32 daObjGbed_c::_create() { +cPhs_State daObjGbed_c::_create() { fopAcM_SetupActor(this, daObjGbed_c); - s32 ret = dComIfG_resLoad(&mPhs, l_arcname); + cPhs_State ret = dComIfG_resLoad(&mPhs, l_arcname); if (ret == cPhs_COMPLEATE_e) { if (fopAcM_entrySolidHeap(this, solidHeapCB, 0x13e0)) { @@ -103,7 +103,7 @@ bool daObjGbed_c::_draw() { } /* 00000444-00000464 .text daObjGbed_Create__FP10fopAc_ac_c */ -static s32 daObjGbed_Create(fopAc_ac_c* i_this) { +static cPhs_State daObjGbed_Create(fopAc_ac_c* i_this) { return ((daObjGbed_c*)i_this)->_create(); } diff --git a/src/d/actor/d_a_obj_gaship.cpp b/src/d/actor/d_a_obj_gaship.cpp index 9fb326a47..f3194dc0a 100644 --- a/src/d/actor/d_a_obj_gaship.cpp +++ b/src/d/actor/d_a_obj_gaship.cpp @@ -56,10 +56,10 @@ bool daObjGaship::Act_c::create_heap() { } /* 00000448-000004F8 .text _create__Q211daObjGaship5Act_cFv */ -s32 daObjGaship::Act_c::_create() { +cPhs_State daObjGaship::Act_c::_create() { fopAcM_SetupActor(this, Act_c); - s32 ret = dComIfG_resLoad(&mPhs, M_arcname); + cPhs_State ret = dComIfG_resLoad(&mPhs, M_arcname); if (ret == cPhs_COMPLEATE_e) { if (fopAcM_entrySolidHeap(this, solidHeapCB, 0x0)) { fopAcM_SetMtx(this, mModel->getBaseTRMtx()); @@ -105,7 +105,7 @@ bool daObjGaship::Act_c::_draw() { namespace daObjGaship { namespace { /* 0000066C-0000068C .text Mthd_Create__Q211daObjGaship28@unnamed@d_a_obj_gaship_cpp@FPv */ -s32 Mthd_Create(void* i_ac) { +cPhs_State Mthd_Create(void* i_ac) { return ((daObjGaship::Act_c*)i_ac)->_create(); } diff --git a/src/d/actor/d_a_obj_gaship2.cpp b/src/d/actor/d_a_obj_gaship2.cpp index 898ab5625..b016643a6 100644 --- a/src/d/actor/d_a_obj_gaship2.cpp +++ b/src/d/actor/d_a_obj_gaship2.cpp @@ -41,9 +41,9 @@ bool daObjGaship2::Act_c::create_heap() { } /* 00000220-000002F8 .text _create__Q212daObjGaship25Act_cFv */ -s32 daObjGaship2::Act_c::_create() { +cPhs_State daObjGaship2::Act_c::_create() { fopAcM_SetupActor(this, Act_c); - int phase_state = dComIfG_resLoad(&mphs, M_arcname); + cPhs_State phase_state = dComIfG_resLoad(&mphs, M_arcname); if (phase_state == cPhs_COMPLEATE_e) { if (fopAcM_entrySolidHeap(this, solidHeapCB, 0x0)) { fopAcM_SetMtx(this, mpModel->getBaseTRMtx()); @@ -98,7 +98,7 @@ bool daObjGaship2::Act_c::_draw() { namespace daObjGaship2 { namespace { - s32 Mthd_Create(void *i_this) { + cPhs_State Mthd_Create(void *i_this) { return ((daObjGaship2::Act_c *) i_this)->_create(); } diff --git a/src/d/actor/d_a_obj_gnnbtltaki.cpp b/src/d/actor/d_a_obj_gnnbtltaki.cpp index 48b5a9c20..7b4126670 100644 --- a/src/d/actor/d_a_obj_gnnbtltaki.cpp +++ b/src/d/actor/d_a_obj_gnnbtltaki.cpp @@ -17,7 +17,7 @@ void daObjGnnbtaki_c::create_heap() { } /* 000001F4-00000348 .text _create__15daObjGnnbtaki_cFv */ -s32 daObjGnnbtaki_c::_create() { +cPhs_State daObjGnnbtaki_c::_create() { /* Nonmatching */ } @@ -43,27 +43,27 @@ bool daObjGnnbtaki_c::_draw() { namespace { /* 000005CC-000005EC .text Mthd_Create__32@unnamed@d_a_obj_gnnbtltaki_cpp@FPv */ -void Mthd_Create(void*) { +cPhs_State Mthd_Create(void*) { /* Nonmatching */ } /* 000005EC-00000610 .text Mthd_Delete__32@unnamed@d_a_obj_gnnbtltaki_cpp@FPv */ -void Mthd_Delete(void*) { +BOOL Mthd_Delete(void*) { /* Nonmatching */ } /* 00000610-00000634 .text Mthd_Execute__32@unnamed@d_a_obj_gnnbtltaki_cpp@FPv */ -void Mthd_Execute(void*) { +BOOL Mthd_Execute(void*) { /* Nonmatching */ } /* 00000634-00000658 .text Mthd_Draw__32@unnamed@d_a_obj_gnnbtltaki_cpp@FPv */ -void Mthd_Draw(void*) { +BOOL Mthd_Draw(void*) { /* Nonmatching */ } /* 00000658-00000660 .text Mthd_IsDelete__32@unnamed@d_a_obj_gnnbtltaki_cpp@FPv */ -void Mthd_IsDelete(void*) { +BOOL Mthd_IsDelete(void*) { /* Nonmatching */ } diff --git a/src/d/actor/d_a_obj_gnndemotakie.cpp b/src/d/actor/d_a_obj_gnndemotakie.cpp index cb506f86e..87ba90490 100644 --- a/src/d/actor/d_a_obj_gnndemotakie.cpp +++ b/src/d/actor/d_a_obj_gnndemotakie.cpp @@ -17,7 +17,7 @@ void daObjGnntakie_c::create_heap() { } /* 000001F4-00000300 .text _create__15daObjGnntakie_cFv */ -s32 daObjGnntakie_c::_create() { +cPhs_State daObjGnntakie_c::_create() { /* Nonmatching */ } @@ -43,27 +43,27 @@ bool daObjGnntakie_c::_draw() { namespace { /* 00000494-000004B4 .text Mthd_Create__34@unnamed@d_a_obj_gnndemotakie_cpp@FPv */ -void Mthd_Create(void*) { +cPhs_State Mthd_Create(void*) { /* Nonmatching */ } /* 000004B4-000004D8 .text Mthd_Delete__34@unnamed@d_a_obj_gnndemotakie_cpp@FPv */ -void Mthd_Delete(void*) { +BOOL Mthd_Delete(void*) { /* Nonmatching */ } /* 000004D8-000004FC .text Mthd_Execute__34@unnamed@d_a_obj_gnndemotakie_cpp@FPv */ -void Mthd_Execute(void*) { +BOOL Mthd_Execute(void*) { /* Nonmatching */ } /* 000004FC-00000520 .text Mthd_Draw__34@unnamed@d_a_obj_gnndemotakie_cpp@FPv */ -void Mthd_Draw(void*) { +BOOL Mthd_Draw(void*) { /* Nonmatching */ } /* 00000520-00000528 .text Mthd_IsDelete__34@unnamed@d_a_obj_gnndemotakie_cpp@FPv */ -void Mthd_IsDelete(void*) { +BOOL Mthd_IsDelete(void*) { /* Nonmatching */ } diff --git a/src/d/actor/d_a_obj_gnndemotakis.cpp b/src/d/actor/d_a_obj_gnndemotakis.cpp index b0e5a5419..a898cc39b 100644 --- a/src/d/actor/d_a_obj_gnndemotakis.cpp +++ b/src/d/actor/d_a_obj_gnndemotakis.cpp @@ -17,7 +17,7 @@ void daObjGnntakis_c::create_heap() { } /* 000001F4-00000308 .text _create__15daObjGnntakis_cFv */ -s32 daObjGnntakis_c::_create() { +cPhs_State daObjGnntakis_c::_create() { /* Nonmatching */ } @@ -43,27 +43,27 @@ bool daObjGnntakis_c::_draw() { namespace { /* 0000058C-000005AC .text Mthd_Create__34@unnamed@d_a_obj_gnndemotakis_cpp@FPv */ -void Mthd_Create(void*) { +cPhs_State Mthd_Create(void*) { /* Nonmatching */ } /* 000005AC-000005D0 .text Mthd_Delete__34@unnamed@d_a_obj_gnndemotakis_cpp@FPv */ -void Mthd_Delete(void*) { +BOOL Mthd_Delete(void*) { /* Nonmatching */ } /* 000005D0-000005F4 .text Mthd_Execute__34@unnamed@d_a_obj_gnndemotakis_cpp@FPv */ -void Mthd_Execute(void*) { +BOOL Mthd_Execute(void*) { /* Nonmatching */ } /* 000005F4-00000618 .text Mthd_Draw__34@unnamed@d_a_obj_gnndemotakis_cpp@FPv */ -void Mthd_Draw(void*) { +BOOL Mthd_Draw(void*) { /* Nonmatching */ } /* 00000618-00000620 .text Mthd_IsDelete__34@unnamed@d_a_obj_gnndemotakis_cpp@FPv */ -void Mthd_IsDelete(void*) { +BOOL Mthd_IsDelete(void*) { /* Nonmatching */ } diff --git a/src/d/actor/d_a_obj_gong.cpp b/src/d/actor/d_a_obj_gong.cpp index cc0f2434b..86c9920d0 100644 --- a/src/d/actor/d_a_obj_gong.cpp +++ b/src/d/actor/d_a_obj_gong.cpp @@ -69,10 +69,10 @@ bool daObjGong::Act_c::create_heap() { } /* 0000028C-00000374 .text _create__Q29daObjGong5Act_cFv */ -s32 daObjGong::Act_c::_create() { +cPhs_State daObjGong::Act_c::_create() { fopAcM_SetupActor(this, Act_c); - s32 ret = dComIfG_resLoad(&mPhs, M_arcname); + cPhs_State ret = dComIfG_resLoad(&mPhs, M_arcname); if (ret == cPhs_COMPLEATE_e) { if (fopAcM_entrySolidHeap(this, solidHeapCB, 0x0)) { @@ -134,7 +134,7 @@ bool daObjGong::Act_c::_draw() { namespace daObjGong { namespace { /* 00000580-000005A0 .text Mthd_Create__Q29daObjGong26@unnamed@d_a_obj_gong_cpp@FPv */ - s32 Mthd_Create(void* i_this) { + cPhs_State Mthd_Create(void* i_this) { return ((Act_c*)i_this)->_create(); } diff --git a/src/d/actor/d_a_obj_gryw00.cpp b/src/d/actor/d_a_obj_gryw00.cpp index 20a0ec240..ee4049c35 100644 --- a/src/d/actor/d_a_obj_gryw00.cpp +++ b/src/d/actor/d_a_obj_gryw00.cpp @@ -91,7 +91,7 @@ void daObjGryw00_c::set_se() { } /* 000004C4-00000654 .text CreateHeap__13daObjGryw00_cFv */ -int daObjGryw00_c::CreateHeap() { +BOOL daObjGryw00_c::CreateHeap() { BOOL ret = TRUE; J3DModelData* mdlData = static_cast(dComIfG_getObjectRes(l_arcname, GRYW00_BDL_GRYW00)); J3DAnmTextureSRTKey* pbtk = static_cast(dComIfG_getObjectRes(l_arcname, GRYW00_BTK_GRYW00)); @@ -113,7 +113,7 @@ int daObjGryw00_c::CreateHeap() { } /* 00000654-000007D4 .text Create__13daObjGryw00_cFv */ -int daObjGryw00_c::Create() { +BOOL daObjGryw00_c::Create() { mActivationSwitch = param_get_swSave(); mWaterLvFinalYPos = HIGH_WATER_LEVEL + home.pos.y; if (mActivationSwitch != 0xff && fopAcM_isSwitch(this, mActivationSwitch) == TRUE) { @@ -150,10 +150,10 @@ int daObjGryw00_c::Create() { } /* 000007D4-0000090C .text Mthd_Create__13daObjGryw00_cFv */ -s32 daObjGryw00_c::Mthd_Create() { +cPhs_State daObjGryw00_c::Mthd_Create() { fopAcM_SetupActor(this, daObjGryw00_c); - s32 phase_state = dComIfG_resLoad(&mPhs, l_arcname); + cPhs_State phase_state = dComIfG_resLoad(&mPhs, l_arcname); if (phase_state == cPhs_COMPLEATE_e) { phase_state = MoveBGCreate(l_arcname, 0xf, dBgS_MoveBGProc_Trans, 0x9a0); JUT_ASSERT(519, (phase_state == cPhs_COMPLEATE_e) || (phase_state == cPhs_ERROR_e)); @@ -270,7 +270,7 @@ BOOL daObjGryw00_c::Draw() { } /* 00000ECC-00000EEC .text daObjGryw00_Create__FP13daObjGryw00_c */ -static s32 daObjGryw00_Create(daObjGryw00_c* i_this) { +static cPhs_State daObjGryw00_Create(daObjGryw00_c* i_this) { return i_this->Mthd_Create(); } diff --git a/src/d/actor/d_a_obj_gtaki.cpp b/src/d/actor/d_a_obj_gtaki.cpp index 3c7220346..4189b91fa 100644 --- a/src/d/actor/d_a_obj_gtaki.cpp +++ b/src/d/actor/d_a_obj_gtaki.cpp @@ -32,12 +32,12 @@ void daObjGtaki_c::set_mtx() { } /* 00000684-000006A4 .text daObjGtaki_Create__FPv */ -static s32 daObjGtaki_Create(void*) { +static cPhs_State daObjGtaki_Create(void*) { /* Nonmatching */ } /* 000006A4-0000087C .text _create__12daObjGtaki_cFv */ -s32 daObjGtaki_c::_create() { +cPhs_State daObjGtaki_c::_create() { /* Nonmatching */ } diff --git a/src/d/actor/d_a_obj_hami2.cpp b/src/d/actor/d_a_obj_hami2.cpp index defabe681..bff25379d 100644 --- a/src/d/actor/d_a_obj_hami2.cpp +++ b/src/d/actor/d_a_obj_hami2.cpp @@ -23,7 +23,7 @@ s32 daObjHami2::Act_c::Create() { } /* 0000042C-00000540 .text Mthd_Create__Q210daObjHami25Act_cFv */ -void daObjHami2::Act_c::Mthd_Create() { +cPhs_State daObjHami2::Act_c::Mthd_Create() { /* Nonmatching */ } @@ -33,7 +33,7 @@ BOOL daObjHami2::Act_c::Delete() { } /* 00000548-000005E8 .text Mthd_Delete__Q210daObjHami25Act_cFv */ -void daObjHami2::Act_c::Mthd_Delete() { +BOOL daObjHami2::Act_c::Mthd_Delete() { /* Nonmatching */ } @@ -90,27 +90,27 @@ BOOL daObjHami2::Act_c::Draw() { namespace daObjHami2 { namespace { /* 00000B58-00000B78 .text Mthd_Create__Q210daObjHami227@unnamed@d_a_obj_hami2_cpp@FPv */ -void Mthd_Create(void*) { +cPhs_State Mthd_Create(void*) { /* Nonmatching */ } /* 00000B78-00000B98 .text Mthd_Delete__Q210daObjHami227@unnamed@d_a_obj_hami2_cpp@FPv */ -void Mthd_Delete(void*) { +BOOL Mthd_Delete(void*) { /* Nonmatching */ } /* 00000B98-00000BB8 .text Mthd_Execute__Q210daObjHami227@unnamed@d_a_obj_hami2_cpp@FPv */ -void Mthd_Execute(void*) { +BOOL Mthd_Execute(void*) { /* Nonmatching */ } /* 00000BB8-00000BE4 .text Mthd_Draw__Q210daObjHami227@unnamed@d_a_obj_hami2_cpp@FPv */ -void Mthd_Draw(void*) { +BOOL Mthd_Draw(void*) { /* Nonmatching */ } /* 00000BE4-00000C10 .text Mthd_IsDelete__Q210daObjHami227@unnamed@d_a_obj_hami2_cpp@FPv */ -void Mthd_IsDelete(void*) { +BOOL Mthd_IsDelete(void*) { /* Nonmatching */ } diff --git a/src/d/actor/d_a_obj_hami3.cpp b/src/d/actor/d_a_obj_hami3.cpp index ca4f655c4..3bf56724c 100644 --- a/src/d/actor/d_a_obj_hami3.cpp +++ b/src/d/actor/d_a_obj_hami3.cpp @@ -23,7 +23,7 @@ s32 daObjHami3::Act_c::Create() { } /* 00000354-00000450 .text Mthd_Create__Q210daObjHami35Act_cFv */ -void daObjHami3::Act_c::Mthd_Create() { +cPhs_State daObjHami3::Act_c::Mthd_Create() { /* Nonmatching */ } @@ -33,7 +33,7 @@ BOOL daObjHami3::Act_c::Delete() { } /* 00000458-000004A4 .text Mthd_Delete__Q210daObjHami35Act_cFv */ -void daObjHami3::Act_c::Mthd_Delete() { +BOOL daObjHami3::Act_c::Mthd_Delete() { /* Nonmatching */ } @@ -90,27 +90,27 @@ BOOL daObjHami3::Act_c::Draw() { namespace daObjHami3 { namespace { /* 00000A94-00000AB4 .text Mthd_Create__Q210daObjHami327@unnamed@d_a_obj_hami3_cpp@FPv */ -void Mthd_Create(void*) { +cPhs_State Mthd_Create(void*) { /* Nonmatching */ } /* 00000AB4-00000AD4 .text Mthd_Delete__Q210daObjHami327@unnamed@d_a_obj_hami3_cpp@FPv */ -void Mthd_Delete(void*) { +BOOL Mthd_Delete(void*) { /* Nonmatching */ } /* 00000AD4-00000AF4 .text Mthd_Execute__Q210daObjHami327@unnamed@d_a_obj_hami3_cpp@FPv */ -void Mthd_Execute(void*) { +BOOL Mthd_Execute(void*) { /* Nonmatching */ } /* 00000AF4-00000B20 .text Mthd_Draw__Q210daObjHami327@unnamed@d_a_obj_hami3_cpp@FPv */ -void Mthd_Draw(void*) { +BOOL Mthd_Draw(void*) { /* Nonmatching */ } /* 00000B20-00000B4C .text Mthd_IsDelete__Q210daObjHami327@unnamed@d_a_obj_hami3_cpp@FPv */ -void Mthd_IsDelete(void*) { +BOOL Mthd_IsDelete(void*) { /* Nonmatching */ } diff --git a/src/d/actor/d_a_obj_hami4.cpp b/src/d/actor/d_a_obj_hami4.cpp index 26c4269d1..723e87415 100644 --- a/src/d/actor/d_a_obj_hami4.cpp +++ b/src/d/actor/d_a_obj_hami4.cpp @@ -47,7 +47,7 @@ void daObjHami4_c::daObjHami4_open_stop() { } /* 000007B0-00000870 .text daObjHami4_Create__FPv */ -static s32 daObjHami4_Create(void*) { +static cPhs_State daObjHami4_Create(void*) { /* Nonmatching */ } diff --git a/src/d/actor/d_a_obj_hat.cpp b/src/d/actor/d_a_obj_hat.cpp index b37ce8fb2..c4123f488 100644 --- a/src/d/actor/d_a_obj_hat.cpp +++ b/src/d/actor/d_a_obj_hat.cpp @@ -60,10 +60,10 @@ static BOOL CheckCreateHeap(fopAc_ac_c* actor) { } /* 000003CC-0000045C .text _create__10daObjHat_cFv */ -s32 daObjHat_c::_create() { +cPhs_State daObjHat_c::_create() { fopAcM_SetupActor(this, daObjHat_c); - int phase_state = dComIfG_resLoad(&mPhs, "Ro"); + cPhs_State phase_state = dComIfG_resLoad(&mPhs, "Ro"); if (phase_state == cPhs_COMPLEATE_e) { if (fopAcM_entrySolidHeap(this, &CheckCreateHeap, 0uL)) { diff --git a/src/d/actor/d_a_obj_hbrf1.cpp b/src/d/actor/d_a_obj_hbrf1.cpp index 89efcd598..2a6e9bcfa 100644 --- a/src/d/actor/d_a_obj_hbrf1.cpp +++ b/src/d/actor/d_a_obj_hbrf1.cpp @@ -24,7 +24,7 @@ BOOL daObjHbrf1::Act_c::CreateHeap() { } /* 0000012C-000002B4 .text Create__Q210daObjHbrf15Act_cFv */ -int daObjHbrf1::Act_c::Create() { +BOOL daObjHbrf1::Act_c::Create() { fopAcM_SetMtx(this, mpModel->getBaseTRMtx()); if (prm_get_Type() == 0 && !fopAcM_isSwitch(this, prm_get_swSave())) { @@ -48,10 +48,10 @@ int daObjHbrf1::Act_c::Create() { } /* 000002B4-000003B0 .text Mthd_Create__Q210daObjHbrf15Act_cFv */ -s32 daObjHbrf1::Act_c::Mthd_Create() { +cPhs_State daObjHbrf1::Act_c::Mthd_Create() { fopAcM_SetupActor(this, daObjHbrf1::Act_c); - s32 phase_state = dComIfG_resLoad(&mPhs, M_arcname); + cPhs_State phase_state = dComIfG_resLoad(&mPhs, M_arcname); if (phase_state == cPhs_COMPLEATE_e) { phase_state = MoveBGCreate(M_arcname, HBRF1_DZB_HBRF1, dBgS_MoveBGProc_Trans, 0); @@ -260,7 +260,7 @@ BOOL daObjHbrf1::Act_c::Draw() { namespace daObjHbrf1 { namespace { /* 00000CBC-00000CDC .text Mthd_Create__Q210daObjHbrf127@unnamed@d_a_obj_hbrf1_cpp@FPv */ -s32 Mthd_Create(void* i_this) { +cPhs_State Mthd_Create(void* i_this) { return static_cast(i_this)->Mthd_Create(); } diff --git a/src/d/actor/d_a_obj_hcbh.cpp b/src/d/actor/d_a_obj_hcbh.cpp index 60ba31d75..4557c6fdb 100644 --- a/src/d/actor/d_a_obj_hcbh.cpp +++ b/src/d/actor/d_a_obj_hcbh.cpp @@ -57,7 +57,7 @@ void daObjHcbh_c::make_item() { } /* 00000A20-00000E30 .text _create__11daObjHcbh_cFv */ -s32 daObjHcbh_c::_create() { +cPhs_State daObjHcbh_c::_create() { /* Nonmatching */ } @@ -87,7 +87,7 @@ bool daObjHcbh_c::_draw() { } /* 0000197C-0000199C .text daObjHcbh_Create__FP10fopAc_ac_c */ -static s32 daObjHcbh_Create(fopAc_ac_c*) { +static cPhs_State daObjHcbh_Create(fopAc_ac_c*) { /* Nonmatching */ } diff --git a/src/d/actor/d_a_obj_hfuck1.cpp b/src/d/actor/d_a_obj_hfuck1.cpp index 4ef9bdc75..9c6dcd8a0 100644 --- a/src/d/actor/d_a_obj_hfuck1.cpp +++ b/src/d/actor/d_a_obj_hfuck1.cpp @@ -97,10 +97,10 @@ bool daObjHfuck1_c::checkCollision() { } /* 000002AC-000004B0 .text _create__13daObjHfuck1_cFv */ -s32 daObjHfuck1_c::_create() { +cPhs_State daObjHfuck1_c::_create() { fopAcM_SetupActor(this, daObjHfuck1_c); - s32 ret = dComIfG_resLoad(&mPhs, l_arcname); + cPhs_State ret = dComIfG_resLoad(&mPhs, l_arcname); if (ret == cPhs_COMPLEATE_e) { if (fopAcM_entrySolidHeap(this, solidHeapCB, 0xc20)) { @@ -172,7 +172,7 @@ bool daObjHfuck1_c::_draw() { } /* 0000082C-0000084C .text daObjHfuck1_Create__FP10fopAc_ac_c */ -static BOOL daObjHfuck1_Create(fopAc_ac_c* i_this) { +static cPhs_State daObjHfuck1_Create(fopAc_ac_c* i_this) { return ((daObjHfuck1_c*)i_this)->_create(); } diff --git a/src/d/actor/d_a_obj_hha.cpp b/src/d/actor/d_a_obj_hha.cpp index 07521f959..e3b83e0fe 100644 --- a/src/d/actor/d_a_obj_hha.cpp +++ b/src/d/actor/d_a_obj_hha.cpp @@ -295,7 +295,7 @@ BOOL daObjHha_c::create_heap() { } /* 00000E48-000011AC .text _create__10daObjHha_cFv */ -s32 daObjHha_c::_create() { +cPhs_State daObjHha_c::_create() { static const float pos_y[4] = {150.0f, -150.0f, 0.0f, 0.0f}; static const float tar_y[4] = {0.0f, 0.0f, 150.0f, -150.0f}; static const u16 move_frame[2] = {55, 30}; @@ -304,7 +304,7 @@ s32 daObjHha_c::_create() { fopAcM_SetupActor(this, daObjHha_c); - s32 ret = dComIfG_resLoad(&mPhs, M_arcname); + cPhs_State ret = dComIfG_resLoad(&mPhs, M_arcname); if(ret == cPhs_COMPLEATE_e){ ret = cPhs_ERROR_e; if(fopAcM_entrySolidHeap(this, &solidHeapCB, 0x3C80) != false){ @@ -669,7 +669,7 @@ bool daObjHha_c::_draw() { namespace { /* 000029F4-00002A14 .text Mthd_Create__25@unnamed@d_a_obj_hha_cpp@FPv */ -s32 Mthd_Create(void* i_this) { +cPhs_State Mthd_Create(void* i_this) { return static_cast(i_this)->_create(); } diff --git a/src/d/actor/d_a_obj_hlift.cpp b/src/d/actor/d_a_obj_hlift.cpp index acb773510..dac4c8fb2 100644 --- a/src/d/actor/d_a_obj_hlift.cpp +++ b/src/d/actor/d_a_obj_hlift.cpp @@ -17,7 +17,7 @@ s32 daObjHlift::Act_c::Create() { } /* 000002D0-00000408 .text Mthd_Create__Q210daObjHlift5Act_cFv */ -void daObjHlift::Act_c::Mthd_Create() { +cPhs_State daObjHlift::Act_c::Mthd_Create() { /* Nonmatching */ } @@ -27,7 +27,7 @@ BOOL daObjHlift::Act_c::Delete() { } /* 00000430-0000047C .text Mthd_Delete__Q210daObjHlift5Act_cFv */ -void daObjHlift::Act_c::Mthd_Delete() { +BOOL daObjHlift::Act_c::Mthd_Delete() { /* Nonmatching */ } @@ -129,27 +129,27 @@ BOOL daObjHlift::Act_c::Draw() { namespace daObjHlift { namespace { /* 00001090-000010B0 .text Mthd_Create__Q210daObjHlift27@unnamed@d_a_obj_hlift_cpp@FPv */ -void Mthd_Create(void*) { +cPhs_State Mthd_Create(void*) { /* Nonmatching */ } /* 000010B0-000010D0 .text Mthd_Delete__Q210daObjHlift27@unnamed@d_a_obj_hlift_cpp@FPv */ -void Mthd_Delete(void*) { +BOOL Mthd_Delete(void*) { /* Nonmatching */ } /* 000010D0-000010F0 .text Mthd_Execute__Q210daObjHlift27@unnamed@d_a_obj_hlift_cpp@FPv */ -void Mthd_Execute(void*) { +BOOL Mthd_Execute(void*) { /* Nonmatching */ } /* 000010F0-0000111C .text Mthd_Draw__Q210daObjHlift27@unnamed@d_a_obj_hlift_cpp@FPv */ -void Mthd_Draw(void*) { +BOOL Mthd_Draw(void*) { /* Nonmatching */ } /* 0000111C-00001148 .text Mthd_IsDelete__Q210daObjHlift27@unnamed@d_a_obj_hlift_cpp@FPv */ -void Mthd_IsDelete(void*) { +BOOL Mthd_IsDelete(void*) { /* Nonmatching */ } diff --git a/src/d/actor/d_a_obj_hole.cpp b/src/d/actor/d_a_obj_hole.cpp index df4ae659f..ab9dcc3d8 100644 --- a/src/d/actor/d_a_obj_hole.cpp +++ b/src/d/actor/d_a_obj_hole.cpp @@ -249,10 +249,10 @@ void daObj_Hole_c::getArg() { } /* 0000096C-00000BA8 .text _create__12daObj_Hole_cFv */ -s32 daObj_Hole_c::_create() { +cPhs_State daObj_Hole_c::_create() { fopAcM_SetupActor(this, daObj_Hole_c); - s32 result = dComIfG_resLoad(&mPhs, m_arc_name); + cPhs_State result = dComIfG_resLoad(&mPhs, m_arc_name); if (result == cPhs_COMPLEATE_e) { getArg(); diff --git a/src/d/actor/d_a_obj_homen.cpp b/src/d/actor/d_a_obj_homen.cpp index def7d3f01..085fbb5f4 100644 --- a/src/d/actor/d_a_obj_homen.cpp +++ b/src/d/actor/d_a_obj_homen.cpp @@ -237,14 +237,14 @@ bool Act_c::create_heap() { } /* 000002B4-000005B0 .text _create__Q210daObjHomen5Act_cFv */ -s32 Act_c::_create() { +cPhs_State Act_c::_create() { fopAcM_SetupActor(this, Act_c); if (param_get_sw() != 0xFF && is_switch() == true) { return cPhs_ERROR_e; } - s32 phase_state = dComIfG_resLoad(&mPhase, M_arcname); + cPhs_State phase_state = dComIfG_resLoad(&mPhase, M_arcname); mType = param_get_arg0() & 1; @@ -819,7 +819,7 @@ bool Act_c::_draw() { namespace { /* 00002954-00002974 .text Mthd_Create__Q210daObjHomen27@unnamed@d_a_obj_homen_cpp@FPv */ -s32 Mthd_Create(void* i_this) { +cPhs_State Mthd_Create(void* i_this) { return ((Act_c*)i_this)->_create(); } diff --git a/src/d/actor/d_a_obj_homensmoke.cpp b/src/d/actor/d_a_obj_homensmoke.cpp index 245cdd30e..04cf35624 100644 --- a/src/d/actor/d_a_obj_homensmoke.cpp +++ b/src/d/actor/d_a_obj_homensmoke.cpp @@ -34,7 +34,7 @@ namespace daObjHomensmoke { } /* 0000026C-0000048C .text _create__Q215daObjHomensmoke5Act_cFv */ - s32 Act_c::_create() { + cPhs_State Act_c::_create() { fopAcM_SetupActor(this, Act_c); mbInitialized = FALSE; @@ -126,7 +126,7 @@ namespace daObjHomensmoke { namespace { /* 00000740-00000760 .text Mthd_Create__Q215daObjHomensmoke32@unnamed@d_a_obj_homensmoke_cpp@FPv */ - s32 Mthd_Create(void* i_this) { + cPhs_State Mthd_Create(void* i_this) { return ((Act_c*)i_this)->_create(); } diff --git a/src/d/actor/d_a_obj_hsehi1.cpp b/src/d/actor/d_a_obj_hsehi1.cpp index ace91edcf..77ea3e659 100644 --- a/src/d/actor/d_a_obj_hsehi1.cpp +++ b/src/d/actor/d_a_obj_hsehi1.cpp @@ -92,7 +92,7 @@ static BOOL checkCreateHeap(fopAc_ac_c*) { } /* 00000930-00000B44 .text create__11daObj_hsh_cFv */ -s32 daObj_hsh_c::create() { +cPhs_State daObj_hsh_c::create() { /* Nonmatching */ } @@ -272,7 +272,7 @@ static BOOL daObj_hsh_Delete(daObj_hsh_c*) { } /* 000021C8-000021E8 .text daObj_hsh_Create__FP10fopAc_ac_c */ -static s32 daObj_hsh_Create(fopAc_ac_c*) { +static cPhs_State daObj_hsh_Create(fopAc_ac_c*) { /* Nonmatching */ } diff --git a/src/d/actor/d_a_obj_htetu1.cpp b/src/d/actor/d_a_obj_htetu1.cpp index 94e5ca1c8..80a677061 100644 --- a/src/d/actor/d_a_obj_htetu1.cpp +++ b/src/d/actor/d_a_obj_htetu1.cpp @@ -22,7 +22,7 @@ void daObjHtetu1_c::create_heap() { } /* 00000298-00000460 .text _create__13daObjHtetu1_cFv */ -s32 daObjHtetu1_c::_create() { +cPhs_State daObjHtetu1_c::_create() { /* Nonmatching */ } @@ -68,27 +68,27 @@ bool daObjHtetu1_c::_draw() { namespace { /* 0000107C-0000109C .text Mthd_Create__28@unnamed@d_a_obj_htetu1_cpp@FPv */ -void Mthd_Create(void*) { +cPhs_State Mthd_Create(void*) { /* Nonmatching */ } /* 0000109C-000010C0 .text Mthd_Delete__28@unnamed@d_a_obj_htetu1_cpp@FPv */ -void Mthd_Delete(void*) { +BOOL Mthd_Delete(void*) { /* Nonmatching */ } /* 000010C0-000010E4 .text Mthd_Execute__28@unnamed@d_a_obj_htetu1_cpp@FPv */ -void Mthd_Execute(void*) { +BOOL Mthd_Execute(void*) { /* Nonmatching */ } /* 000010E4-00001108 .text Mthd_Draw__28@unnamed@d_a_obj_htetu1_cpp@FPv */ -void Mthd_Draw(void*) { +BOOL Mthd_Draw(void*) { /* Nonmatching */ } /* 00001108-00001110 .text Mthd_IsDelete__28@unnamed@d_a_obj_htetu1_cpp@FPv */ -void Mthd_IsDelete(void*) { +BOOL Mthd_IsDelete(void*) { /* Nonmatching */ } diff --git a/src/d/actor/d_a_obj_ice.cpp b/src/d/actor/d_a_obj_ice.cpp index 947678050..e83b1c42b 100644 --- a/src/d/actor/d_a_obj_ice.cpp +++ b/src/d/actor/d_a_obj_ice.cpp @@ -39,7 +39,7 @@ void daObjIce_c::tg_hitCallback(fopAc_ac_c*, dCcD_GObjInf*, fopAc_ac_c*, dCcD_GO } /* 000005F4-000008C0 .text _create__10daObjIce_cFv */ -s32 daObjIce_c::_create() { +cPhs_State daObjIce_c::_create() { /* Nonmatching */ } @@ -84,7 +84,7 @@ void daObjIce_c::setEffectMtx() { } /* 000013A0-000013C0 .text daObjIce_Create__FP10fopAc_ac_c */ -static s32 daObjIce_Create(fopAc_ac_c*) { +static cPhs_State daObjIce_Create(fopAc_ac_c*) { /* Nonmatching */ } diff --git a/src/d/actor/d_a_obj_iceisland.cpp b/src/d/actor/d_a_obj_iceisland.cpp index 28f24648b..a25e06a5d 100644 --- a/src/d/actor/d_a_obj_iceisland.cpp +++ b/src/d/actor/d_a_obj_iceisland.cpp @@ -72,7 +72,7 @@ void daObjIceisland_c::daObjIceisland_fail_demo_main() { } /* 000009B8-00000B2C .text daObjIceisland_Create__FPv */ -static s32 daObjIceisland_Create(void*) { +static cPhs_State daObjIceisland_Create(void*) { /* Nonmatching */ } diff --git a/src/d/actor/d_a_obj_ikada.cpp b/src/d/actor/d_a_obj_ikada.cpp index 8d71a07d1..47141f9e8 100644 --- a/src/d/actor/d_a_obj_ikada.cpp +++ b/src/d/actor/d_a_obj_ikada.cpp @@ -267,7 +267,7 @@ void daObj_Ikada_c::_createHeap() { } /* 00004B60-00004C18 .text _create__13daObj_Ikada_cFv */ -s32 daObj_Ikada_c::_create() { +cPhs_State daObj_Ikada_c::_create() { /* Nonmatching */ } diff --git a/src/d/actor/d_a_obj_jump.cpp b/src/d/actor/d_a_obj_jump.cpp index 42bfeb888..ebff48b0a 100644 --- a/src/d/actor/d_a_obj_jump.cpp +++ b/src/d/actor/d_a_obj_jump.cpp @@ -17,7 +17,7 @@ s32 daObjJump::Act_c::Create() { } /* 0000033C-00000544 .text Mthd_Create__Q29daObjJump5Act_cFv */ -void daObjJump::Act_c::Mthd_Create() { +cPhs_State daObjJump::Act_c::Mthd_Create() { /* Nonmatching */ } @@ -27,7 +27,7 @@ BOOL daObjJump::Act_c::Delete() { } /* 00000A0C-00000A58 .text Mthd_Delete__Q29daObjJump5Act_cFv */ -void daObjJump::Act_c::Mthd_Delete() { +BOOL daObjJump::Act_c::Mthd_Delete() { /* Nonmatching */ } @@ -139,27 +139,27 @@ BOOL daObjJump::Act_c::Draw() { namespace daObjJump { namespace { /* 00001594-000015B4 .text Mthd_Create__Q29daObjJump26@unnamed@d_a_obj_jump_cpp@FPv */ -void Mthd_Create(void*) { +cPhs_State Mthd_Create(void*) { /* Nonmatching */ } /* 000015B4-000015D4 .text Mthd_Delete__Q29daObjJump26@unnamed@d_a_obj_jump_cpp@FPv */ -void Mthd_Delete(void*) { +BOOL Mthd_Delete(void*) { /* Nonmatching */ } /* 000015D4-000015F4 .text Mthd_Execute__Q29daObjJump26@unnamed@d_a_obj_jump_cpp@FPv */ -void Mthd_Execute(void*) { +BOOL Mthd_Execute(void*) { /* Nonmatching */ } /* 000015F4-00001620 .text Mthd_Draw__Q29daObjJump26@unnamed@d_a_obj_jump_cpp@FPv */ -void Mthd_Draw(void*) { +BOOL Mthd_Draw(void*) { /* Nonmatching */ } /* 00001620-0000164C .text Mthd_IsDelete__Q29daObjJump26@unnamed@d_a_obj_jump_cpp@FPv */ -void Mthd_IsDelete(void*) { +BOOL Mthd_IsDelete(void*) { /* Nonmatching */ } diff --git a/src/d/actor/d_a_obj_kanat.cpp b/src/d/actor/d_a_obj_kanat.cpp index a5d1260f3..d46558728 100644 --- a/src/d/actor/d_a_obj_kanat.cpp +++ b/src/d/actor/d_a_obj_kanat.cpp @@ -13,7 +13,7 @@ Mtx daObjKanat::Act_c::M_tmp_mtx; const char daObjKanat::Act_c::M_arcname[] = "Kanat"; /* 00000078-0000012C .text CreateHeap__Q210daObjKanat5Act_cFv */ -int daObjKanat::Act_c::CreateHeap() { +BOOL daObjKanat::Act_c::CreateHeap() { J3DModelData* model_data = (J3DModelData*)dComIfG_getObjectRes(M_arcname, KANAT_BDL_KANAT); JUT_ASSERT(79, model_data != NULL); mpModel = mDoExt_J3DModel__create(model_data, 0, 0x11020203); @@ -21,7 +21,7 @@ int daObjKanat::Act_c::CreateHeap() { } /* 0000012C-000001AC .text Create__Q210daObjKanat5Act_cFv */ -int daObjKanat::Act_c::Create() { +BOOL daObjKanat::Act_c::Create() { fopAcM_SetMtx(this, mpModel->getBaseTRMtx()); init_mtx(); fopAcM_setCullSizeBox(this, -500.0f, -100.0f, -500.0f, 500.0f, 200.0f, 500.0f); @@ -32,14 +32,14 @@ int daObjKanat::Act_c::Create() { } /* 000001AC-000002EC .text Mthd_Create__Q210daObjKanat5Act_cFv */ -s32 daObjKanat::Act_c::Mthd_Create() { +cPhs_State daObjKanat::Act_c::Mthd_Create() { fopAcM_SetupActor(this, daObjKanat::Act_c); if (fopAcM_isSwitch(this, prm_get_swSave())) { return cPhs_STOP_e; } - s32 phase_state = dComIfG_resLoad(&mPhs, M_arcname); + cPhs_State phase_state = dComIfG_resLoad(&mPhs, M_arcname); if (phase_state == cPhs_COMPLEATE_e) { phase_state = MoveBGCreate(M_arcname, KANAT_DZB_KANAT, NULL, 0x6440); JUT_ASSERT(126, (phase_state == cPhs_COMPLEATE_e) || (phase_state == cPhs_ERROR_e)); @@ -122,7 +122,7 @@ BOOL daObjKanat::Act_c::Draw() { namespace daObjKanat { namespace { - s32 Mthd_Create(void* i_this) { + cPhs_State Mthd_Create(void* i_this) { return static_cast(i_this)->Mthd_Create(); } diff --git a/src/d/actor/d_a_obj_kanoke.cpp b/src/d/actor/d_a_obj_kanoke.cpp index 88b92f762..6aa96b39d 100644 --- a/src/d/actor/d_a_obj_kanoke.cpp +++ b/src/d/actor/d_a_obj_kanoke.cpp @@ -17,7 +17,7 @@ static BOOL CheckCreateHeap(fopAc_ac_c*) { } /* 00000664-00000700 .text _create__13daObjKanoke_cFv */ -s32 daObjKanoke_c::_create() { +cPhs_State daObjKanoke_c::_create() { /* Nonmatching */ } diff --git a/src/d/actor/d_a_obj_ladder.cpp b/src/d/actor/d_a_obj_ladder.cpp index a2472e02a..af2e1eb90 100644 --- a/src/d/actor/d_a_obj_ladder.cpp +++ b/src/d/actor/d_a_obj_ladder.cpp @@ -71,7 +71,7 @@ BOOL daObjLadder::Act_c::CreateHeap() { } /* 0000013C-000002F0 .text Create__Q211daObjLadder5Act_cFv */ -int daObjLadder::Act_c::Create() { +BOOL daObjLadder::Act_c::Create() { fopAcM_SetMtx(this, mpModel->getBaseTRMtx()); init_mtx(); @@ -104,9 +104,9 @@ int daObjLadder::Act_c::Create() { } /* 000002F0-000004F8 .text Mthd_Create__Q211daObjLadder5Act_cFv */ -s32 daObjLadder::Act_c::Mthd_Create() { +cPhs_State daObjLadder::Act_c::Mthd_Create() { fopAcM_SetupActor(this, Act_c); - s32 phase_state = dComIfG_resLoad(&mPhs, M_arcname); + cPhs_State phase_state = dComIfG_resLoad(&mPhs, M_arcname); if (phase_state == cPhs_COMPLEATE_e) { mType = prm_get_type(); @@ -270,7 +270,7 @@ void daObjLadder::Act_c::init_mtx() { } /* 00000F88-000010A0 .text Execute__Q211daObjLadder5Act_cFPPA3_A4_f */ -int daObjLadder::Act_c::Execute(Mtx** ppMtx) { +BOOL daObjLadder::Act_c::Execute(Mtx** ppMtx) { typedef void (Act_c::*ModeFunc)(); static const ModeFunc mode_proc[] = { &Act_c::mode_wait, @@ -304,7 +304,7 @@ BOOL daObjLadder::Act_c::Draw() { namespace daObjLadder { namespace { /* 00001140-00001160 .text Mthd_Create__Q211daObjLadder28@unnamed@d_a_obj_ladder_cpp@FPv */ -static s32 Mthd_Create(void* i_this) { +static cPhs_State Mthd_Create(void* i_this) { return static_cast(i_this)->Mthd_Create(); } diff --git a/src/d/actor/d_a_obj_leaves.cpp b/src/d/actor/d_a_obj_leaves.cpp index e413de7d3..ac35f7d43 100644 --- a/src/d/actor/d_a_obj_leaves.cpp +++ b/src/d/actor/d_a_obj_leaves.cpp @@ -45,7 +45,7 @@ void daObjLeaves_c::tg_hitCallback(fopAc_ac_c*, dCcD_GObjInf*, fopAc_ac_c*, dCcD } /* 000008C0-00000B08 .text _create__13daObjLeaves_cFv */ -s32 daObjLeaves_c::_create() { +cPhs_State daObjLeaves_c::_create() { /* Nonmatching */ } @@ -95,7 +95,7 @@ bool daObjLeaves_c::_draw() { } /* 00001290-000012B0 .text daObjLeaves_Create__FP13daObjLeaves_c */ -static s32 daObjLeaves_Create(daObjLeaves_c*) { +static cPhs_State daObjLeaves_Create(daObjLeaves_c*) { /* Nonmatching */ } diff --git a/src/d/actor/d_a_obj_light.cpp b/src/d/actor/d_a_obj_light.cpp index b8e887cf2..190620422 100644 --- a/src/d/actor/d_a_obj_light.cpp +++ b/src/d/actor/d_a_obj_light.cpp @@ -27,7 +27,7 @@ void daObjLight::Act_c::set_collision() { } /* 000004A4-0000070C .text _create__Q210daObjLight5Act_cFv */ -s32 daObjLight::Act_c::_create() { +cPhs_State daObjLight::Act_c::_create() { /* Nonmatching */ } @@ -104,27 +104,27 @@ bool daObjLight::Act_c::_draw() { namespace daObjLight { namespace { /* 00001528-00001548 .text Mthd_Create__Q210daObjLight27@unnamed@d_a_obj_light_cpp@FPv */ -void Mthd_Create(void*) { +cPhs_State Mthd_Create(void*) { /* Nonmatching */ } /* 00001548-0000156C .text Mthd_Delete__Q210daObjLight27@unnamed@d_a_obj_light_cpp@FPv */ -void Mthd_Delete(void*) { +BOOL Mthd_Delete(void*) { /* Nonmatching */ } /* 0000156C-00001590 .text Mthd_Execute__Q210daObjLight27@unnamed@d_a_obj_light_cpp@FPv */ -void Mthd_Execute(void*) { +BOOL Mthd_Execute(void*) { /* Nonmatching */ } /* 00001590-000015B4 .text Mthd_Draw__Q210daObjLight27@unnamed@d_a_obj_light_cpp@FPv */ -void Mthd_Draw(void*) { +BOOL Mthd_Draw(void*) { /* Nonmatching */ } /* 000015B4-000015BC .text Mthd_IsDelete__Q210daObjLight27@unnamed@d_a_obj_light_cpp@FPv */ -void Mthd_IsDelete(void*) { +BOOL Mthd_IsDelete(void*) { /* Nonmatching */ } diff --git a/src/d/actor/d_a_obj_lpalm.cpp b/src/d/actor/d_a_obj_lpalm.cpp index 03d2de274..072c23b77 100644 --- a/src/d/actor/d_a_obj_lpalm.cpp +++ b/src/d/actor/d_a_obj_lpalm.cpp @@ -81,10 +81,10 @@ void daObjLpalm_c::CreateInit() { mModel->setBaseTRMtx(mDoMtx_stack_c::get()); } -s32 daObjLpalm_c::_create() { +cPhs_State daObjLpalm_c::_create() { fopAcM_SetupActor(this, daObjLpalm_c); - s32 ret = dComIfG_resLoad(&mPhs, M_arcname); + cPhs_State ret = dComIfG_resLoad(&mPhs, M_arcname); if (ret == cPhs_COMPLEATE_e) { if (fopAcM_entrySolidHeap(this, CheckCreateHeap, 0xf00) == 0) { diff --git a/src/d/actor/d_a_obj_magmarock.cpp b/src/d/actor/d_a_obj_magmarock.cpp index 5166028aa..3ef3c0535 100644 --- a/src/d/actor/d_a_obj_magmarock.cpp +++ b/src/d/actor/d_a_obj_magmarock.cpp @@ -112,7 +112,7 @@ void daObjMagmarock::Act_c::calc_ground_quat() { } /* 000017DC-0000198C .text Create__Q214daObjMagmarock6MethodFPv */ -s32 daObjMagmarock::Method::Create(void*) { +cPhs_State daObjMagmarock::Method::Create(void*) { /* Nonmatching */ } diff --git a/src/d/actor/d_a_obj_majyuu_door.cpp b/src/d/actor/d_a_obj_majyuu_door.cpp index c70d37b46..8575abe10 100644 --- a/src/d/actor/d_a_obj_majyuu_door.cpp +++ b/src/d/actor/d_a_obj_majyuu_door.cpp @@ -43,7 +43,7 @@ void daObj_MjDoor_c::CreateInit() { } /* 00000478-000005B4 .text _create__14daObj_MjDoor_cFv */ -s32 daObj_MjDoor_c::_create() { +cPhs_State daObj_MjDoor_c::_create() { /* Nonmatching */ } diff --git a/src/d/actor/d_a_obj_mkie.cpp b/src/d/actor/d_a_obj_mkie.cpp index d5a98cd17..730efd265 100644 --- a/src/d/actor/d_a_obj_mkie.cpp +++ b/src/d/actor/d_a_obj_mkie.cpp @@ -27,7 +27,7 @@ s32 daObjMkie::Act_c::Create() { } /* 00000568-00000754 .text Mthd_Create__Q29daObjMkie5Act_cFv */ -void daObjMkie::Act_c::Mthd_Create() { +cPhs_State daObjMkie::Act_c::Mthd_Create() { /* Nonmatching */ } @@ -37,7 +37,7 @@ BOOL daObjMkie::Act_c::Delete() { } /* 00000BF8-00000C54 .text Mthd_Delete__Q29daObjMkie5Act_cFv */ -void daObjMkie::Act_c::Mthd_Delete() { +BOOL daObjMkie::Act_c::Mthd_Delete() { /* Nonmatching */ } @@ -119,27 +119,27 @@ BOOL daObjMkie::Act_c::Draw() { namespace daObjMkie { namespace { /* 000015B8-000015D8 .text Mthd_Create__Q29daObjMkie26@unnamed@d_a_obj_mkie_cpp@FPv */ -void Mthd_Create(void*) { +cPhs_State Mthd_Create(void*) { /* Nonmatching */ } /* 000015D8-000015F8 .text Mthd_Delete__Q29daObjMkie26@unnamed@d_a_obj_mkie_cpp@FPv */ -void Mthd_Delete(void*) { +BOOL Mthd_Delete(void*) { /* Nonmatching */ } /* 000015F8-00001618 .text Mthd_Execute__Q29daObjMkie26@unnamed@d_a_obj_mkie_cpp@FPv */ -void Mthd_Execute(void*) { +BOOL Mthd_Execute(void*) { /* Nonmatching */ } /* 00001618-00001644 .text Mthd_Draw__Q29daObjMkie26@unnamed@d_a_obj_mkie_cpp@FPv */ -void Mthd_Draw(void*) { +BOOL Mthd_Draw(void*) { /* Nonmatching */ } /* 00001644-00001670 .text Mthd_IsDelete__Q29daObjMkie26@unnamed@d_a_obj_mkie_cpp@FPv */ -void Mthd_IsDelete(void*) { +BOOL Mthd_IsDelete(void*) { /* Nonmatching */ } diff --git a/src/d/actor/d_a_obj_mkiek.cpp b/src/d/actor/d_a_obj_mkiek.cpp index 914964b83..9706b0d6c 100644 --- a/src/d/actor/d_a_obj_mkiek.cpp +++ b/src/d/actor/d_a_obj_mkiek.cpp @@ -17,7 +17,7 @@ s32 daObjMkiek::Act_c::Create() { } /* 00000314-000004F8 .text Mthd_Create__Q210daObjMkiek5Act_cFv */ -void daObjMkiek::Act_c::Mthd_Create() { +cPhs_State daObjMkiek::Act_c::Mthd_Create() { /* Nonmatching */ } @@ -27,7 +27,7 @@ BOOL daObjMkiek::Act_c::Delete() { } /* 0000075C-000007B4 .text Mthd_Delete__Q210daObjMkiek5Act_cFv */ -void daObjMkiek::Act_c::Mthd_Delete() { +BOOL daObjMkiek::Act_c::Mthd_Delete() { /* Nonmatching */ } @@ -69,27 +69,27 @@ BOOL daObjMkiek::Act_c::Draw() { namespace daObjMkiek { namespace { /* 00000E1C-00000E3C .text Mthd_Create__Q210daObjMkiek27@unnamed@d_a_obj_mkiek_cpp@FPv */ -void Mthd_Create(void*) { +cPhs_State Mthd_Create(void*) { /* Nonmatching */ } /* 00000E3C-00000E5C .text Mthd_Delete__Q210daObjMkiek27@unnamed@d_a_obj_mkiek_cpp@FPv */ -void Mthd_Delete(void*) { +BOOL Mthd_Delete(void*) { /* Nonmatching */ } /* 00000E5C-00000E7C .text Mthd_Execute__Q210daObjMkiek27@unnamed@d_a_obj_mkiek_cpp@FPv */ -void Mthd_Execute(void*) { +BOOL Mthd_Execute(void*) { /* Nonmatching */ } /* 00000E7C-00000EA8 .text Mthd_Draw__Q210daObjMkiek27@unnamed@d_a_obj_mkiek_cpp@FPv */ -void Mthd_Draw(void*) { +BOOL Mthd_Draw(void*) { /* Nonmatching */ } /* 00000EA8-00000ED4 .text Mthd_IsDelete__Q210daObjMkiek27@unnamed@d_a_obj_mkiek_cpp@FPv */ -void Mthd_IsDelete(void*) { +BOOL Mthd_IsDelete(void*) { /* Nonmatching */ } diff --git a/src/d/actor/d_a_obj_mknjd.cpp b/src/d/actor/d_a_obj_mknjd.cpp index 8e2db60f5..dae8ac8b6 100644 --- a/src/d/actor/d_a_obj_mknjd.cpp +++ b/src/d/actor/d_a_obj_mknjd.cpp @@ -160,7 +160,7 @@ s16 daObjMknjD::Act_c::XyEventCB(int) { } /* 0000031C-00000620 .text CreateHeap__Q210daObjMknjD5Act_cFv */ -int daObjMknjD::Act_c::CreateHeap() { +BOOL daObjMknjD::Act_c::CreateHeap() { const void* temp_r26; // Fakematch to get it to use the same register for model_data_d and jntName if (m043E == true) { temp_r26 = dComIfG_getObjectRes(M_arcname, MKNJD_BDL_MKNJK); @@ -215,14 +215,14 @@ int daObjMknjD::Act_c::CreateHeap() { mBreakMdl->setUserArea(reinterpret_cast(this)); mMainMdlAlpha = 0xFF; - return 1; + return TRUE; } - return 0; + return FALSE; } /* 00000620-000008E8 .text Create__Q210daObjMknjD5Act_cFv */ -int daObjMknjD::Act_c::Create() { +BOOL daObjMknjD::Act_c::Create() { fopAcM_SetMtx(this, mMainMdl->getBaseTRMtx()); init_mtx(); fopAcM_SetMtx(this, mBreakMdl->getBaseTRMtx()); @@ -285,22 +285,21 @@ int daObjMknjD::Act_c::Create() { mMsgPID = fpcM_ERROR_PROCESS_ID_e; m0504 = false; - return 1; + return TRUE; } /* 000008E8-00000A84 .text Mthd_Create__Q210daObjMknjD5Act_cFv */ -s32 daObjMknjD::Act_c::Mthd_Create() { - s32 phase_state; - +cPhs_State daObjMknjD::Act_c::Mthd_Create() { fopAcM_SetupActor(this, daObjMknjD::Act_c); m043E = prm_get_Type(); + cPhs_State phase_state; if (fopAcM_isSwitch(this, prm_get_swSave())) { mEmitters[2] = NULL; mEmitters[3] = NULL; - return 3; + return cPhs_STOP_e; } else { phase_state = dComIfG_resLoad(&mPhs, M_arcname); @@ -315,18 +314,18 @@ s32 daObjMknjD::Act_c::Mthd_Create() { } /* 00000B64-00000BDC .text Delete__Q210daObjMknjD5Act_cFv */ -int daObjMknjD::Act_c::Delete() { +BOOL daObjMknjD::Act_c::Delete() { dComIfGp_att_revivalAleart(); for (int i = 0; i < 4; i++) { mSmokeCBs[i].end(); } - return 1; + return TRUE; } /* 00000BDC-00000C34 .text Mthd_Delete__Q210daObjMknjD5Act_cFv */ -s32 daObjMknjD::Act_c::Mthd_Delete() { +BOOL daObjMknjD::Act_c::Mthd_Delete() { int bgDeleteResult = MoveBGDelete(); if (fpcM_CreateResult(this) != cPhs_STOP_e) { @@ -695,7 +694,7 @@ bool daObjMknjD::Act_c::daObjMknjD_break() { } /* 0000195C-000020E0 .text Execute__Q210daObjMknjD5Act_cFPPA3_A4_f */ -int daObjMknjD::Act_c::Execute(Mtx** i_mtx) { +BOOL daObjMknjD::Act_c::Execute(Mtx** i_mtx) { daPy_py_c* player = static_cast(dComIfGp_getPlayer(0)); daPy_py_c* partner = static_cast(dComIfGp_getCb1Player()); @@ -906,7 +905,7 @@ int daObjMknjD::Act_c::Execute(Mtx** i_mtx) { m0434 = 0; } - return 1; + return TRUE; } /* 000020E0-000022FC .text setMaterial__10daObjMknjDFP11J3DMaterialUc */ @@ -943,7 +942,7 @@ void daObjMknjD::setMaterial(J3DMaterial* i_mat, u8 i_alpha) { } /* 000022FC-00002430 .text Draw__Q210daObjMknjD5Act_cFv */ -int daObjMknjD::Act_c::Draw() { +BOOL daObjMknjD::Act_c::Draw() { g_env_light.settingTevStruct(TEV_TYPE_BG0, ¤t.pos, &tevStr); g_env_light.setLightTevColorType(mBreakMdl, &tevStr); @@ -967,33 +966,33 @@ int daObjMknjD::Act_c::Draw() { dComIfGd_setList(); - return 1; + return TRUE; } namespace daObjMknjD { namespace { /* 00002430-00002450 .text Mthd_Create__Q210daObjMknjD27@unnamed@d_a_obj_mknjd_cpp@FPv */ - s32 Mthd_Create(void* i_this) { + cPhs_State Mthd_Create(void* i_this) { return static_cast(i_this)->Mthd_Create(); } /* 00002450-00002470 .text Mthd_Delete__Q210daObjMknjD27@unnamed@d_a_obj_mknjd_cpp@FPv */ - s32 Mthd_Delete(void* i_this) { + BOOL Mthd_Delete(void* i_this) { return static_cast(i_this)->Mthd_Delete(); } /* 00002470-00002490 .text Mthd_Execute__Q210daObjMknjD27@unnamed@d_a_obj_mknjd_cpp@FPv */ - s32 Mthd_Execute(void* i_this) { + BOOL Mthd_Execute(void* i_this) { return static_cast(i_this)->MoveBGExecute(); } /* 00002490-000024BC .text Mthd_Draw__Q210daObjMknjD27@unnamed@d_a_obj_mknjd_cpp@FPv */ - s32 Mthd_Draw(void* i_this) { + BOOL Mthd_Draw(void* i_this) { return static_cast(i_this)->Draw(); } /* 000024BC-000024E8 .text Mthd_IsDelete__Q210daObjMknjD27@unnamed@d_a_obj_mknjd_cpp@FPv */ - s32 Mthd_IsDelete(void* i_this) { + BOOL Mthd_IsDelete(void* i_this) { return static_cast(i_this)->IsDelete(); } diff --git a/src/d/actor/d_a_obj_mmrr.cpp b/src/d/actor/d_a_obj_mmrr.cpp index 40e50dda2..42bc7ddb9 100644 --- a/src/d/actor/d_a_obj_mmrr.cpp +++ b/src/d/actor/d_a_obj_mmrr.cpp @@ -47,7 +47,7 @@ void daObjMmrr::Act_c::set_cull() { } /* 0000102C-0000122C .text _create__Q29daObjMmrr5Act_cFv */ -s32 daObjMmrr::Act_c::_create() { +cPhs_State daObjMmrr::Act_c::_create() { /* Nonmatching */ } @@ -99,27 +99,27 @@ bool daObjMmrr::Act_c::_draw() { namespace daObjMmrr { namespace { /* 000017E8-00001808 .text Mthd_Create__Q29daObjMmrr26@unnamed@d_a_obj_mmrr_cpp@FPv */ -void Mthd_Create(void*) { +cPhs_State Mthd_Create(void*) { /* Nonmatching */ } /* 00001808-0000182C .text Mthd_Delete__Q29daObjMmrr26@unnamed@d_a_obj_mmrr_cpp@FPv */ -void Mthd_Delete(void*) { +BOOL Mthd_Delete(void*) { /* Nonmatching */ } /* 0000182C-00001850 .text Mthd_Execute__Q29daObjMmrr26@unnamed@d_a_obj_mmrr_cpp@FPv */ -void Mthd_Execute(void*) { +BOOL Mthd_Execute(void*) { /* Nonmatching */ } /* 00001850-00001874 .text Mthd_Draw__Q29daObjMmrr26@unnamed@d_a_obj_mmrr_cpp@FPv */ -void Mthd_Draw(void*) { +BOOL Mthd_Draw(void*) { /* Nonmatching */ } /* 00001874-0000187C .text Mthd_IsDelete__Q29daObjMmrr26@unnamed@d_a_obj_mmrr_cpp@FPv */ -void Mthd_IsDelete(void*) { +BOOL Mthd_IsDelete(void*) { /* Nonmatching */ } diff --git a/src/d/actor/d_a_obj_monument.cpp b/src/d/actor/d_a_obj_monument.cpp index 6a8ee2b83..4be1cd3f2 100644 --- a/src/d/actor/d_a_obj_monument.cpp +++ b/src/d/actor/d_a_obj_monument.cpp @@ -55,10 +55,10 @@ bool daObjMonument::Act_c::create_heap() { } /* 00000238-00000318 .text _create__Q213daObjMonument5Act_cFv */ -s32 daObjMonument::Act_c::_create() { +cPhs_State daObjMonument::Act_c::_create() { fopAcM_SetupActor(this, Act_c); - s32 ret = dComIfG_resLoad(&mPhs, M_arcname); + cPhs_State ret = dComIfG_resLoad(&mPhs, M_arcname); mpBgW = NULL; if (ret == cPhs_COMPLEATE_e) { @@ -120,7 +120,7 @@ bool daObjMonument::Act_c::_draw() { namespace daObjMonument { namespace { /* 00000538-00000558 .text Mthd_Create__Q213daObjMonument30@unnamed@d_a_obj_monument_cpp@FPv */ - s32 Mthd_Create(void* i_this) { + cPhs_State Mthd_Create(void* i_this) { return ((Act_c*)i_this)->_create(); } diff --git a/src/d/actor/d_a_obj_movebox.cpp b/src/d/actor/d_a_obj_movebox.cpp index 0da9612ff..925878835 100644 --- a/src/d/actor/d_a_obj_movebox.cpp +++ b/src/d/actor/d_a_obj_movebox.cpp @@ -69,10 +69,10 @@ namespace daObjMovebox { {-0.75f, -0.25f, 0.0f, 0.0f}, }; - s32 Act_c::Mthd_Create() { + cPhs_State Act_c::Mthd_Create() { fopAcM_SetupActor(this, Act_c); - s32 phase_state; + cPhs_State phase_state; mType = prm_get_type(); phase_state = cPhs_ERROR_e; prmX_init(); @@ -1211,14 +1211,14 @@ namespace daObjMovebox { } /* 00001A10-00001B00 .text CreateHeap__Q212daObjMovebox5Act_cFv */ - int Act_c::CreateHeap() { + BOOL Act_c::CreateHeap() { BOOL success = TRUE; if (i_attr()->mModelFileIndex >= 0) { J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(M_arcname[mType], i_attr()->mModelFileIndex); JUT_ASSERT(1722, modelData != NULL); mpModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000022); - success = (mpModel != 0); + success = (mpModel != NULL); } else { mpModel = NULL; } @@ -1305,7 +1305,7 @@ namespace daObjMovebox { } /* 00001DD4-00002214 .text Create__Q212daObjMovebox5Act_cFv */ - int Act_c::Create() { + BOOL Act_c::Create() { m604 = 0; m608 = 0.0f; m60C = 0.0f; @@ -1892,7 +1892,7 @@ namespace daObjMovebox { namespace { /* 000042A0-000044E0 .text Mthd_Create__Q212daObjMovebox29@unnamed@d_a_obj_movebox_cpp@FPv */ - s32 Mthd_Create(void* i_this) { + cPhs_State Mthd_Create(void* i_this) { return static_cast(i_this)->Mthd_Create(); } diff --git a/src/d/actor/d_a_obj_msdan.cpp b/src/d/actor/d_a_obj_msdan.cpp index bdf017ef4..f710891d4 100644 --- a/src/d/actor/d_a_obj_msdan.cpp +++ b/src/d/actor/d_a_obj_msdan.cpp @@ -7,44 +7,44 @@ #include "d/d_procname.h" /* 00000078-000003D4 .text Mthd_Create__Q210daObjMsdan5Act_cFv */ -void daObjMsdan::Act_c::Mthd_Create() { +cPhs_State daObjMsdan::Act_c::Mthd_Create() { /* Nonmatching */ } /* 000003D4-000005C0 .text Mthd_Execute__Q210daObjMsdan5Act_cFv */ -void daObjMsdan::Act_c::Mthd_Execute() { +BOOL daObjMsdan::Act_c::Mthd_Execute() { /* Nonmatching */ } /* 000005C0-000005F0 .text Mthd_Delete__Q210daObjMsdan5Act_cFv */ -void daObjMsdan::Act_c::Mthd_Delete() { +BOOL daObjMsdan::Act_c::Mthd_Delete() { /* Nonmatching */ } namespace daObjMsdan { namespace { /* 000005F0-00000610 .text Mthd_Create__Q210daObjMsdan27@unnamed@d_a_obj_msdan_cpp@FPv */ -void Mthd_Create(void*) { +cPhs_State Mthd_Create(void*) { /* Nonmatching */ } /* 00000610-00000630 .text Mthd_Delete__Q210daObjMsdan27@unnamed@d_a_obj_msdan_cpp@FPv */ -void Mthd_Delete(void*) { +BOOL Mthd_Delete(void*) { /* Nonmatching */ } /* 00000630-00000650 .text Mthd_Execute__Q210daObjMsdan27@unnamed@d_a_obj_msdan_cpp@FPv */ -void Mthd_Execute(void*) { +BOOL Mthd_Execute(void*) { /* Nonmatching */ } /* 00000650-00000658 .text Mthd_Draw__Q210daObjMsdan27@unnamed@d_a_obj_msdan_cpp@FPv */ -void Mthd_Draw(void*) { +BOOL Mthd_Draw(void*) { /* Nonmatching */ } /* 00000658-00000660 .text Mthd_IsDelete__Q210daObjMsdan27@unnamed@d_a_obj_msdan_cpp@FPv */ -void Mthd_IsDelete(void*) { +BOOL Mthd_IsDelete(void*) { /* Nonmatching */ } diff --git a/src/d/actor/d_a_obj_msdan2.cpp b/src/d/actor/d_a_obj_msdan2.cpp index 45bb2fa06..90ba68209 100644 --- a/src/d/actor/d_a_obj_msdan2.cpp +++ b/src/d/actor/d_a_obj_msdan2.cpp @@ -7,44 +7,44 @@ #include "d/d_procname.h" /* 00000078-0000024C .text Mthd_Create__Q211daObjMsdan25Act_cFv */ -void daObjMsdan2::Act_c::Mthd_Create() { +cPhs_State daObjMsdan2::Act_c::Mthd_Create() { /* Nonmatching */ } /* 0000024C-00000344 .text Mthd_Execute__Q211daObjMsdan25Act_cFv */ -void daObjMsdan2::Act_c::Mthd_Execute() { +BOOL daObjMsdan2::Act_c::Mthd_Execute() { /* Nonmatching */ } /* 00000344-0000034C .text Mthd_Delete__Q211daObjMsdan25Act_cFv */ -void daObjMsdan2::Act_c::Mthd_Delete() { +BOOL daObjMsdan2::Act_c::Mthd_Delete() { /* Nonmatching */ } namespace daObjMsdan2 { namespace { /* 0000034C-0000036C .text Mthd_Create__Q211daObjMsdan228@unnamed@d_a_obj_msdan2_cpp@FPv */ -void Mthd_Create(void*) { +cPhs_State Mthd_Create(void*) { /* Nonmatching */ } /* 0000036C-0000038C .text Mthd_Delete__Q211daObjMsdan228@unnamed@d_a_obj_msdan2_cpp@FPv */ -void Mthd_Delete(void*) { +BOOL Mthd_Delete(void*) { /* Nonmatching */ } /* 0000038C-000003AC .text Mthd_Execute__Q211daObjMsdan228@unnamed@d_a_obj_msdan2_cpp@FPv */ -void Mthd_Execute(void*) { +BOOL Mthd_Execute(void*) { /* Nonmatching */ } /* 000003AC-000003B4 .text Mthd_Draw__Q211daObjMsdan228@unnamed@d_a_obj_msdan2_cpp@FPv */ -void Mthd_Draw(void*) { +BOOL Mthd_Draw(void*) { /* Nonmatching */ } /* 000003B4-000003BC .text Mthd_IsDelete__Q211daObjMsdan228@unnamed@d_a_obj_msdan2_cpp@FPv */ -void Mthd_IsDelete(void*) { +BOOL Mthd_IsDelete(void*) { /* Nonmatching */ } diff --git a/src/d/actor/d_a_obj_msdan_sub.cpp b/src/d/actor/d_a_obj_msdan_sub.cpp index 931e9128d..520a23d2c 100644 --- a/src/d/actor/d_a_obj_msdan_sub.cpp +++ b/src/d/actor/d_a_obj_msdan_sub.cpp @@ -17,7 +17,7 @@ s32 daObjMsdanSub::Act_c::Create() { } /* 00000304-00000400 .text Mthd_Create__Q213daObjMsdanSub5Act_cFv */ -void daObjMsdanSub::Act_c::Mthd_Create() { +cPhs_State daObjMsdanSub::Act_c::Mthd_Create() { /* Nonmatching */ } @@ -27,7 +27,7 @@ BOOL daObjMsdanSub::Act_c::Delete() { } /* 00000408-00000454 .text Mthd_Delete__Q213daObjMsdanSub5Act_cFv */ -void daObjMsdanSub::Act_c::Mthd_Delete() { +BOOL daObjMsdanSub::Act_c::Mthd_Delete() { /* Nonmatching */ } @@ -54,27 +54,27 @@ BOOL daObjMsdanSub::Act_c::Draw() { namespace daObjMsdanSub { namespace { /* 00000C54-00000C74 .text Mthd_Create__Q213daObjMsdanSub31@unnamed@d_a_obj_msdan_sub_cpp@FPv */ -void Mthd_Create(void*) { +cPhs_State Mthd_Create(void*) { /* Nonmatching */ } /* 00000C74-00000C94 .text Mthd_Delete__Q213daObjMsdanSub31@unnamed@d_a_obj_msdan_sub_cpp@FPv */ -void Mthd_Delete(void*) { +BOOL Mthd_Delete(void*) { /* Nonmatching */ } /* 00000C94-00000CB4 .text Mthd_Execute__Q213daObjMsdanSub31@unnamed@d_a_obj_msdan_sub_cpp@FPv */ -void Mthd_Execute(void*) { +BOOL Mthd_Execute(void*) { /* Nonmatching */ } /* 00000CB4-00000CE0 .text Mthd_Draw__Q213daObjMsdanSub31@unnamed@d_a_obj_msdan_sub_cpp@FPv */ -void Mthd_Draw(void*) { +BOOL Mthd_Draw(void*) { /* Nonmatching */ } /* 00000CE0-00000D0C .text Mthd_IsDelete__Q213daObjMsdanSub31@unnamed@d_a_obj_msdan_sub_cpp@FPv */ -void Mthd_IsDelete(void*) { +BOOL Mthd_IsDelete(void*) { /* Nonmatching */ } diff --git a/src/d/actor/d_a_obj_msdan_sub2.cpp b/src/d/actor/d_a_obj_msdan_sub2.cpp index 017438faa..69ff2f088 100644 --- a/src/d/actor/d_a_obj_msdan_sub2.cpp +++ b/src/d/actor/d_a_obj_msdan_sub2.cpp @@ -17,7 +17,7 @@ s32 daObjMsdanSub2::Act_c::Create() { } /* 000002E4-00000454 .text Mthd_Create__Q214daObjMsdanSub25Act_cFv */ -void daObjMsdanSub2::Act_c::Mthd_Create() { +cPhs_State daObjMsdanSub2::Act_c::Mthd_Create() { /* Nonmatching */ } @@ -27,7 +27,7 @@ BOOL daObjMsdanSub2::Act_c::Delete() { } /* 0000045C-000004A8 .text Mthd_Delete__Q214daObjMsdanSub25Act_cFv */ -void daObjMsdanSub2::Act_c::Mthd_Delete() { +BOOL daObjMsdanSub2::Act_c::Mthd_Delete() { /* Nonmatching */ } @@ -54,27 +54,27 @@ BOOL daObjMsdanSub2::Act_c::Draw() { namespace daObjMsdanSub2 { namespace { /* 000009AC-000009CC .text Mthd_Create__Q214daObjMsdanSub232@unnamed@d_a_obj_msdan_sub2_cpp@FPv */ -void Mthd_Create(void*) { +cPhs_State Mthd_Create(void*) { /* Nonmatching */ } /* 000009CC-000009EC .text Mthd_Delete__Q214daObjMsdanSub232@unnamed@d_a_obj_msdan_sub2_cpp@FPv */ -void Mthd_Delete(void*) { +BOOL Mthd_Delete(void*) { /* Nonmatching */ } /* 000009EC-00000A0C .text Mthd_Execute__Q214daObjMsdanSub232@unnamed@d_a_obj_msdan_sub2_cpp@FPv */ -void Mthd_Execute(void*) { +BOOL Mthd_Execute(void*) { /* Nonmatching */ } /* 00000A0C-00000A38 .text Mthd_Draw__Q214daObjMsdanSub232@unnamed@d_a_obj_msdan_sub2_cpp@FPv */ -void Mthd_Draw(void*) { +BOOL Mthd_Draw(void*) { /* Nonmatching */ } /* 00000A38-00000A64 .text Mthd_IsDelete__Q214daObjMsdanSub232@unnamed@d_a_obj_msdan_sub2_cpp@FPv */ -void Mthd_IsDelete(void*) { +BOOL Mthd_IsDelete(void*) { /* Nonmatching */ } diff --git a/src/d/actor/d_a_obj_mshokki.cpp b/src/d/actor/d_a_obj_mshokki.cpp index 1a54ced27..67054af6c 100644 --- a/src/d/actor/d_a_obj_mshokki.cpp +++ b/src/d/actor/d_a_obj_mshokki.cpp @@ -42,7 +42,7 @@ void daObjMshokki_c::set_se() { } /* 00000740-00000A1C .text _create__14daObjMshokki_cFv */ -s32 daObjMshokki_c::_create() { +cPhs_State daObjMshokki_c::_create() { /* Nonmatching */ } @@ -62,7 +62,7 @@ bool daObjMshokki_c::_draw() { } /* 00000E84-00000EA4 .text daObjMshokki_Create__FP10fopAc_ac_c */ -static s32 daObjMshokki_Create(fopAc_ac_c*) { +static cPhs_State daObjMshokki_Create(fopAc_ac_c*) { /* Nonmatching */ } diff --git a/src/d/actor/d_a_obj_mtest.cpp b/src/d/actor/d_a_obj_mtest.cpp index 6b729455a..a9a5356fc 100644 --- a/src/d/actor/d_a_obj_mtest.cpp +++ b/src/d/actor/d_a_obj_mtest.cpp @@ -136,7 +136,7 @@ BOOL daObjMtest::Act_c::Create() { } /* 000003E8-00000708 .text Mthd_Create__Q210daObjMtest5Act_cFv */ -s32 daObjMtest::Act_c::Mthd_Create() { +cPhs_State daObjMtest::Act_c::Mthd_Create() { static s16 dzb_data[5][Type_Max] = { { MTEST_DZB_MCUBE, @@ -247,7 +247,7 @@ s32 daObjMtest::Act_c::Mthd_Create() { M_type = prm_get_type(); JUT_ASSERT(327, M_type < Type_Max); - s32 phase_state = dComIfG_resLoad(&mPhase, M_arcname[M_type]); + cPhs_State phase_state = dComIfG_resLoad(&mPhase, M_arcname[M_type]); if (phase_state == cPhs_COMPLEATE_e) { s32 dzb_idx = 0; if (prm_get_arg1() == 1) { @@ -350,7 +350,7 @@ BOOL daObjMtest::Act_c::Draw() { namespace daObjMtest { namespace { - s32 Mthd_Create(void* i_this) { + cPhs_State Mthd_Create(void* i_this) { return ((Act_c*)i_this)->Mthd_Create(); } diff --git a/src/d/actor/d_a_obj_nest.cpp b/src/d/actor/d_a_obj_nest.cpp index 5313edacd..d95a62fab 100644 --- a/src/d/actor/d_a_obj_nest.cpp +++ b/src/d/actor/d_a_obj_nest.cpp @@ -17,7 +17,7 @@ s32 daObjNest::Act_c::Create() { } /* 000001F0-000002E8 .text Mthd_Create__Q29daObjNest5Act_cFv */ -void daObjNest::Act_c::Mthd_Create() { +cPhs_State daObjNest::Act_c::Mthd_Create() { /* Nonmatching */ } @@ -27,7 +27,7 @@ BOOL daObjNest::Act_c::Delete() { } /* 000002F0-0000033C .text Mthd_Delete__Q29daObjNest5Act_cFv */ -void daObjNest::Act_c::Mthd_Delete() { +BOOL daObjNest::Act_c::Mthd_Delete() { /* Nonmatching */ } @@ -69,27 +69,27 @@ BOOL daObjNest::Act_c::Draw() { namespace daObjNest { namespace { /* 000007FC-0000081C .text Mthd_Create__Q29daObjNest26@unnamed@d_a_obj_nest_cpp@FPv */ -void Mthd_Create(void*) { +cPhs_State Mthd_Create(void*) { /* Nonmatching */ } /* 0000081C-0000083C .text Mthd_Delete__Q29daObjNest26@unnamed@d_a_obj_nest_cpp@FPv */ -void Mthd_Delete(void*) { +BOOL Mthd_Delete(void*) { /* Nonmatching */ } /* 0000083C-0000085C .text Mthd_Execute__Q29daObjNest26@unnamed@d_a_obj_nest_cpp@FPv */ -void Mthd_Execute(void*) { +BOOL Mthd_Execute(void*) { /* Nonmatching */ } /* 0000085C-00000888 .text Mthd_Draw__Q29daObjNest26@unnamed@d_a_obj_nest_cpp@FPv */ -void Mthd_Draw(void*) { +BOOL Mthd_Draw(void*) { /* Nonmatching */ } /* 00000888-000008B4 .text Mthd_IsDelete__Q29daObjNest26@unnamed@d_a_obj_nest_cpp@FPv */ -void Mthd_IsDelete(void*) { +BOOL Mthd_IsDelete(void*) { /* Nonmatching */ } diff --git a/src/d/actor/d_a_obj_ohatch.cpp b/src/d/actor/d_a_obj_ohatch.cpp index 3bf17e128..f9c8d401e 100644 --- a/src/d/actor/d_a_obj_ohatch.cpp +++ b/src/d/actor/d_a_obj_ohatch.cpp @@ -27,7 +27,7 @@ void daObjOhatch_c::create_heap() { } /* 000003CC-00000548 .text _create__13daObjOhatch_cFv */ -s32 daObjOhatch_c::_create() { +cPhs_State daObjOhatch_c::_create() { /* Nonmatching */ } @@ -72,7 +72,7 @@ bool daObjOhatch_c::_draw() { } /* 00000B64-00000B84 .text daObjOhatch_Create__FP10fopAc_ac_c */ -static s32 daObjOhatch_Create(fopAc_ac_c*) { +static cPhs_State daObjOhatch_Create(fopAc_ac_c*) { /* Nonmatching */ } diff --git a/src/d/actor/d_a_obj_ojtree.cpp b/src/d/actor/d_a_obj_ojtree.cpp index 9ab831c7f..a957b1b20 100644 --- a/src/d/actor/d_a_obj_ojtree.cpp +++ b/src/d/actor/d_a_obj_ojtree.cpp @@ -3,7 +3,6 @@ // Translation Unit: d_a_obj_ojtree.cpp // -#include "SSystem/SComponent/c_bg_w.h" #include "d/res/res_ojtree.h" #include "d/actor/d_a_obj_ojtree.h" #include "d/d_com_inf_game.h" @@ -14,7 +13,7 @@ Mtx daObjOjtree::Act_c::M_tmp_mtx; const char daObjOjtree::Act_c::M_arcname[] = "Ojtree"; /* 00000078-0000012C .text CreateHeap__Q211daObjOjtree5Act_cFv */ -int daObjOjtree::Act_c::CreateHeap() { +BOOL daObjOjtree::Act_c::CreateHeap() { J3DModelData* model_data = (J3DModelData*)dComIfG_getObjectRes(M_arcname, OJTREE_BDL_OJTREE); JUT_ASSERT(67, model_data != NULL); mpModel = mDoExt_J3DModel__create(model_data, 0x80000, 0x11000022); @@ -22,7 +21,7 @@ int daObjOjtree::Act_c::CreateHeap() { } /* 0000012C-000001EC .text Create__Q211daObjOjtree5Act_cFv */ -int daObjOjtree::Act_c::Create() { +BOOL daObjOjtree::Act_c::Create() { cXyz pos; fopAcM_SetMtx(this, mpModel->getBaseTRMtx()); @@ -36,10 +35,10 @@ int daObjOjtree::Act_c::Create() { } /* 000001EC-000002E4 .text Mthd_Create__Q211daObjOjtree5Act_cFv */ -s32 daObjOjtree::Act_c::Mthd_Create() { +cPhs_State daObjOjtree::Act_c::Mthd_Create() { fopAcM_SetupActor(this, daObjOjtree::Act_c); - s32 phase_state = dComIfG_resLoad(&mPhs, M_arcname); + cPhs_State phase_state = dComIfG_resLoad(&mPhs, M_arcname); if (phase_state == cPhs_COMPLEATE_e) { phase_state = MoveBGCreate(M_arcname, OJTREE_DZB_OJTREE, NULL, 0x26a0); JUT_ASSERT(123, (phase_state == cPhs_COMPLEATE_e) || (phase_state == cPhs_ERROR_e)); @@ -54,7 +53,7 @@ BOOL daObjOjtree::Act_c::Delete() { } /* 000002EC-00000338 .text Mthd_Delete__Q211daObjOjtree5Act_cFv */ -s32 daObjOjtree::Act_c::Mthd_Delete() { +BOOL daObjOjtree::Act_c::Mthd_Delete() { s32 result = MoveBGDelete(); dComIfG_resDelete(&mPhs, M_arcname); return result; @@ -75,7 +74,7 @@ void daObjOjtree::Act_c::init_mtx() { } /* 000003F4-0000045C .text Execute__Q211daObjOjtree5Act_cFPPA3_A4_f */ -int daObjOjtree::Act_c::Execute(Mtx** pMtx) { +BOOL daObjOjtree::Act_c::Execute(Mtx** pMtx) { if(mLockTimer != 0) { if (--mLockTimer == 0) @@ -100,11 +99,11 @@ BOOL daObjOjtree::Act_c::Draw() { namespace daObjOjtree { namespace { - s32 Mthd_Create(void* i_this) { + cPhs_State Mthd_Create(void* i_this) { return static_cast(i_this)->Mthd_Create(); } - s32 Mthd_Delete(void* i_this) { + BOOL Mthd_Delete(void* i_this) { return static_cast(i_this)->Mthd_Delete(); } diff --git a/src/d/actor/d_a_obj_ospbox.cpp b/src/d/actor/d_a_obj_ospbox.cpp index 097eeef3d..a517c663a 100644 --- a/src/d/actor/d_a_obj_ospbox.cpp +++ b/src/d/actor/d_a_obj_ospbox.cpp @@ -17,7 +17,7 @@ s32 daObjOspbox::Act_c::Create() { } /* 00000294-000004F8 .text Mthd_Create__Q211daObjOspbox5Act_cFv */ -void daObjOspbox::Act_c::Mthd_Create() { +cPhs_State daObjOspbox::Act_c::Mthd_Create() { /* Nonmatching */ } @@ -27,7 +27,7 @@ BOOL daObjOspbox::Act_c::Delete() { } /* 00000BB4-00000C04 .text Mthd_Delete__Q211daObjOspbox5Act_cFv */ -void daObjOspbox::Act_c::Mthd_Delete() { +BOOL daObjOspbox::Act_c::Mthd_Delete() { /* Nonmatching */ } @@ -79,27 +79,27 @@ BOOL daObjOspbox::Act_c::Draw() { namespace daObjOspbox { namespace { /* 000011A4-000011C4 .text Mthd_Create__Q211daObjOspbox28@unnamed@d_a_obj_ospbox_cpp@FPv */ -void Mthd_Create(void*) { +cPhs_State Mthd_Create(void*) { /* Nonmatching */ } /* 000011C4-000011E4 .text Mthd_Delete__Q211daObjOspbox28@unnamed@d_a_obj_ospbox_cpp@FPv */ -void Mthd_Delete(void*) { +BOOL Mthd_Delete(void*) { /* Nonmatching */ } /* 000011E4-00001204 .text Mthd_Execute__Q211daObjOspbox28@unnamed@d_a_obj_ospbox_cpp@FPv */ -void Mthd_Execute(void*) { +BOOL Mthd_Execute(void*) { /* Nonmatching */ } /* 00001204-00001230 .text Mthd_Draw__Q211daObjOspbox28@unnamed@d_a_obj_ospbox_cpp@FPv */ -void Mthd_Draw(void*) { +BOOL Mthd_Draw(void*) { /* Nonmatching */ } /* 00001230-0000125C .text Mthd_IsDelete__Q211daObjOspbox28@unnamed@d_a_obj_ospbox_cpp@FPv */ -void Mthd_IsDelete(void*) { +BOOL Mthd_IsDelete(void*) { /* Nonmatching */ } diff --git a/src/d/actor/d_a_obj_otble.cpp b/src/d/actor/d_a_obj_otble.cpp index 8b7e79f19..e9af87b16 100644 --- a/src/d/actor/d_a_obj_otble.cpp +++ b/src/d/actor/d_a_obj_otble.cpp @@ -37,7 +37,7 @@ void daObj_Otble::Act_c::CreateInit() { } /* 000005A0-000006AC .text Create__Q211daObj_Otble4MthdFPv */ -s32 daObj_Otble::Mthd::Create(void*) { +cPhs_State daObj_Otble::Mthd::Create(void*) { /* Nonmatching */ } diff --git a/src/d/actor/d_a_obj_paper.cpp b/src/d/actor/d_a_obj_paper.cpp index 4a8c1b5b5..bb5fe8cce 100644 --- a/src/d/actor/d_a_obj_paper.cpp +++ b/src/d/actor/d_a_obj_paper.cpp @@ -139,12 +139,12 @@ namespace daObjPaper { } /* 00000170-000004E0 .text _create__Q210daObjPaper5Act_cFv */ - s32 Act_c::_create() { + cPhs_State Act_c::_create() { fopAcM_SetupActor(this, Act_c); mType = prm_get_type(); - s32 result = dComIfG_resLoad(&mPhs, attr(mType).mResName); + cPhs_State result = dComIfG_resLoad(&mPhs, attr(mType).mResName); if (result == cPhs_COMPLEATE_e) { if (fopAcM_entrySolidHeap(this, solidHeapCB, attr(mType).mHeapSize)) { @@ -323,27 +323,27 @@ namespace daObjPaper { namespace { /* 00000BD4-00000BF4 .text Mthd_Create__Q210daObjPaper27@unnamed@d_a_obj_paper_cpp@FPv */ - static s32 Mthd_Create(void* i_this) { + static cPhs_State Mthd_Create(void* i_this) { return static_cast(i_this)->_create(); } /* 00000BF4-00000C18 .text Mthd_Delete__Q210daObjPaper27@unnamed@d_a_obj_paper_cpp@FPv */ - static s32 Mthd_Delete(void* i_this) { + static BOOL Mthd_Delete(void* i_this) { return static_cast(i_this)->_delete(); } /* 00000C18-00000C3C .text Mthd_Execute__Q210daObjPaper27@unnamed@d_a_obj_paper_cpp@FPv */ - static s32 Mthd_Execute(void* i_this) { + static BOOL Mthd_Execute(void* i_this) { return static_cast(i_this)->_execute(); } /* 00000C3C-00000C60 .text Mthd_Draw__Q210daObjPaper27@unnamed@d_a_obj_paper_cpp@FPv */ - static s32 Mthd_Draw(void* i_this) { + static BOOL Mthd_Draw(void* i_this) { return static_cast(i_this)->_draw(); } /* 00000C60-00000C68 .text Mthd_IsDelete__Q210daObjPaper27@unnamed@d_a_obj_paper_cpp@FPv */ - static s32 Mthd_IsDelete(void* i_this) { + static BOOL Mthd_IsDelete(void* i_this) { return TRUE; } diff --git a/src/d/actor/d_a_obj_pbco.cpp b/src/d/actor/d_a_obj_pbco.cpp index a01c75419..f5b0609fb 100644 --- a/src/d/actor/d_a_obj_pbco.cpp +++ b/src/d/actor/d_a_obj_pbco.cpp @@ -54,7 +54,7 @@ BOOL daObj_Pbco_c::CreateHeap() { } /* 00000348-000003A4 .text CreateInit__12daObj_Pbco_cFv */ -s32 daObj_Pbco_c::CreateInit() { +cPhs_State daObj_Pbco_c::CreateInit() { set_mtx(); fopAcM_SetMtx(this, mpModel->getBaseTRMtx()); if (mpBgW) { @@ -63,9 +63,9 @@ s32 daObj_Pbco_c::CreateInit() { return cPhs_COMPLEATE_e; } -s32 daObj_Pbco_c::_create() { +cPhs_State daObj_Pbco_c::_create() { fopAcM_SetupActor(this, daObj_Pbco_c); - int phase_state = dComIfG_resLoad(&mPhs, M_arcname); + cPhs_State phase_state = dComIfG_resLoad(&mPhs, M_arcname); if (phase_state == cPhs_COMPLEATE_e) { if (fopAcM_entrySolidHeap(this, CheckCreateHeap, 0x10000)) { phase_state = CreateInit(); diff --git a/src/d/actor/d_a_obj_pbka.cpp b/src/d/actor/d_a_obj_pbka.cpp index c5f70e841..e1ae614b1 100644 --- a/src/d/actor/d_a_obj_pbka.cpp +++ b/src/d/actor/d_a_obj_pbka.cpp @@ -42,10 +42,10 @@ void daObjPbka_c::set_mtx() { mpModel->setBaseTRMtx(mDoMtx_stack_c::get()); } -s32 daObjPbka_c::_create() { +cPhs_State daObjPbka_c::_create() { fopAcM_SetupActor(this, daObjPbka_c); - int phase_state = dComIfG_resLoad(&mPhase, "Pbka"); + cPhs_State phase_state = dComIfG_resLoad(&mPhase, "Pbka"); if (phase_state == cPhs_COMPLEATE_e) { if (fopAcM_entrySolidHeap(this, CheckCreateHeap, 0x680) == 0) { phase_state = cPhs_ERROR_e; diff --git a/src/d/actor/d_a_obj_pfall.cpp b/src/d/actor/d_a_obj_pfall.cpp index 07ad72a3d..3b12ded00 100644 --- a/src/d/actor/d_a_obj_pfall.cpp +++ b/src/d/actor/d_a_obj_pfall.cpp @@ -37,7 +37,7 @@ void daObj_Pfall_c::CreateInit() { } /* 000008CC-000009E8 .text _create__13daObj_Pfall_cFv */ -s32 daObj_Pfall_c::_create() { +cPhs_State daObj_Pfall_c::_create() { /* Nonmatching */ } diff --git a/src/d/actor/d_a_obj_pirateship.cpp b/src/d/actor/d_a_obj_pirateship.cpp index 7ce6c3b4f..ca9e37ec7 100644 --- a/src/d/actor/d_a_obj_pirateship.cpp +++ b/src/d/actor/d_a_obj_pirateship.cpp @@ -84,12 +84,12 @@ void daObjPirateship::Act_c::demo_move() { } /* 00000EF0-00000F10 .text Create__Q215daObjPirateship6MethodFPv */ -s32 daObjPirateship::Method::Create(void*) { +cPhs_State daObjPirateship::Method::Create(void*) { /* Nonmatching */ } /* 00000F10-000012A4 .text _create__Q215daObjPirateship5Act_cFv */ -s32 daObjPirateship::Act_c::_create() { +cPhs_State daObjPirateship::Act_c::_create() { /* Nonmatching */ } diff --git a/src/d/actor/d_a_obj_plant.cpp b/src/d/actor/d_a_obj_plant.cpp index cc794bf2b..d787b9352 100644 --- a/src/d/actor/d_a_obj_plant.cpp +++ b/src/d/actor/d_a_obj_plant.cpp @@ -33,7 +33,7 @@ void daObjPlant_c::set_mtx() { } /* 00000410-00000544 .text daObjPlant_Create__FPv */ -static s32 daObjPlant_Create(void*) { +static cPhs_State daObjPlant_Create(void*) { /* Nonmatching */ } diff --git a/src/d/actor/d_a_obj_quake.cpp b/src/d/actor/d_a_obj_quake.cpp index 5ad7816c7..3c1374314 100644 --- a/src/d/actor/d_a_obj_quake.cpp +++ b/src/d/actor/d_a_obj_quake.cpp @@ -25,7 +25,7 @@ daObjQuake_HIO_c::daObjQuake_HIO_c() { } /* 00000134-000002C4 .text _create__12daObjQuake_cFv */ -s32 daObjQuake_c::_create() { +cPhs_State daObjQuake_c::_create() { fopAcM_SetupActor(this, daObjQuake_c); if (dComIfGs_isSymbol(1)) { diff --git a/src/d/actor/d_a_obj_rcloud.cpp b/src/d/actor/d_a_obj_rcloud.cpp index c2ebac0a8..e8076d5c4 100644 --- a/src/d/actor/d_a_obj_rcloud.cpp +++ b/src/d/actor/d_a_obj_rcloud.cpp @@ -22,7 +22,7 @@ void daObjRcloud_c::create_heap() { } /* 00000238-000003B4 .text _create__13daObjRcloud_cFv */ -s32 daObjRcloud_c::_create() { +cPhs_State daObjRcloud_c::_create() { /* Nonmatching */ } @@ -67,7 +67,7 @@ bool daObjRcloud_c::_draw() { } /* 00000848-00000868 .text daObjRcloud_Create__FP10fopAc_ac_c */ -static s32 daObjRcloud_Create(fopAc_ac_c*) { +static cPhs_State daObjRcloud_Create(fopAc_ac_c*) { /* Nonmatching */ } diff --git a/src/d/actor/d_a_obj_rflw.cpp b/src/d/actor/d_a_obj_rflw.cpp index d27687e1a..15aba2b13 100644 --- a/src/d/actor/d_a_obj_rflw.cpp +++ b/src/d/actor/d_a_obj_rflw.cpp @@ -33,7 +33,7 @@ void daObjRflw_c::set_mtx() { } /* 000003E8-0000051C .text daObjRflw_Create__FPv */ -static s32 daObjRflw_Create(void*) { +static cPhs_State daObjRflw_Create(void*) { /* Nonmatching */ } diff --git a/src/d/actor/d_a_obj_rforce.cpp b/src/d/actor/d_a_obj_rforce.cpp index 4df416b4d..08c24957c 100644 --- a/src/d/actor/d_a_obj_rforce.cpp +++ b/src/d/actor/d_a_obj_rforce.cpp @@ -42,10 +42,10 @@ bool daObjRforce::Act_c::create_heap() { } /* 00000220-000002F8 .text _create__Q211daObjRforce5Act_cFv */ -s32 daObjRforce::Act_c::_create() { +cPhs_State daObjRforce::Act_c::_create() { fopAcM_SetupActor(this, Act_c); - s32 ret = dComIfG_resLoad(&mPhs, M_arcname); + cPhs_State ret = dComIfG_resLoad(&mPhs, M_arcname); if(ret == cPhs_COMPLEATE_e){ if(fopAcM_entrySolidHeap(this, solidHeapCB, 0)){ @@ -102,7 +102,7 @@ bool daObjRforce::Act_c::_draw() { namespace daObjRforce { namespace { /* 00000508-00000528 .text Mthd_Create__Q211daObjRforce28@unnamed@d_a_obj_rforce_cpp@FPv */ -s32 Mthd_Create(void* obj) { +cPhs_State Mthd_Create(void* obj) { return static_cast(obj)->_create(); } diff --git a/src/d/actor/d_a_obj_roten.cpp b/src/d/actor/d_a_obj_roten.cpp index d2fbe25ef..c644b6f66 100644 --- a/src/d/actor/d_a_obj_roten.cpp +++ b/src/d/actor/d_a_obj_roten.cpp @@ -96,7 +96,7 @@ static BOOL Roten_create_check(u8 type) { } -s32 daObj_Roten_c::_create() { +cPhs_State daObj_Roten_c::_create() { fopAcM_SetupActor(this, daObj_Roten_c); mType = fopAcM_GetParam(this) >> 0x18; @@ -109,7 +109,7 @@ s32 daObj_Roten_c::_create() { field_0x2D1 = 1; return cPhs_ERROR_e; } - s32 result = dComIfG_resLoad(&mPhs, daObj_Roten_c::M_arcname); + cPhs_State result = dComIfG_resLoad(&mPhs, daObj_Roten_c::M_arcname); u32 heap_size[] = { 0x2BA0, diff --git a/src/d/actor/d_a_obj_search.cpp b/src/d/actor/d_a_obj_search.cpp index 2e65183de..f3e007f58 100644 --- a/src/d/actor/d_a_obj_search.cpp +++ b/src/d/actor/d_a_obj_search.cpp @@ -147,7 +147,7 @@ void daObj_Search::Act_c::CreateInit() { } /* 8010071C-80100B08 .text _create__Q212daObj_Search5Act_cFv */ -s32 daObj_Search::Act_c::_create() { +cPhs_State daObj_Search::Act_c::_create() { /* Nonmatching */ } @@ -232,7 +232,7 @@ BOOL daObj_Search::Act_c::_isdelete() { } /* 80102844-80102864 .text Create__Q212daObj_Search4MthdFPv */ -s32 daObj_Search::Mthd::Create(void*) { +cPhs_State daObj_Search::Mthd::Create(void*) { /* Nonmatching */ } diff --git a/src/d/actor/d_a_obj_shelf.cpp b/src/d/actor/d_a_obj_shelf.cpp index 0ac6e6d02..00d16525d 100644 --- a/src/d/actor/d_a_obj_shelf.cpp +++ b/src/d/actor/d_a_obj_shelf.cpp @@ -74,10 +74,10 @@ BOOL daObjShelf::Act_c::Create() { } /* 000001A0-0000029C .text Mthd_Create__Q210daObjShelf5Act_cFv */ -s32 daObjShelf::Act_c::Mthd_Create() { +cPhs_State daObjShelf::Act_c::Mthd_Create() { fopAcM_SetupActor(this, Act_c); - s32 phase_state = dComIfG_resLoad(&mPhs, M_arcname); + cPhs_State phase_state = dComIfG_resLoad(&mPhs, M_arcname); if (phase_state == cPhs_COMPLEATE_e) { phase_state = MoveBGCreate(M_arcname, OTANA_DZB_OTANA, dBgS_MoveBGProc_Trans, 0xb00); JUT_ASSERT(0x15b, (phase_state == cPhs_COMPLEATE_e) || (phase_state == cPhs_ERROR_e)); @@ -91,8 +91,8 @@ BOOL daObjShelf::Act_c::Delete() { } /* 000002A4-000002F0 .text Mthd_Delete__Q210daObjShelf5Act_cFv */ -int daObjShelf::Act_c::Mthd_Delete() { - int ret = MoveBGDelete(); +BOOL daObjShelf::Act_c::Mthd_Delete() { + BOOL ret = MoveBGDelete(); dComIfG_resDelete(&mPhs, M_arcname); return ret; } @@ -268,17 +268,17 @@ BOOL daObjShelf::Act_c::Draw() { namespace daObjShelf { namespace { /* 00000A50-00000A70 .text Mthd_Create__Q210daObjShelf27@unnamed@d_a_obj_shelf_cpp@FPv */ -s32 Mthd_Create(void* i_this) { +cPhs_State Mthd_Create(void* i_this) { return static_cast(i_this)->Mthd_Create(); } /* 00000A70-00000A90 .text Mthd_Delete__Q210daObjShelf27@unnamed@d_a_obj_shelf_cpp@FPv */ -int Mthd_Delete(void* i_this) { +BOOL Mthd_Delete(void* i_this) { return static_cast(i_this)->Mthd_Delete(); } /* 00000A90-00000AB0 .text Mthd_Execute__Q210daObjShelf27@unnamed@d_a_obj_shelf_cpp@FPv */ -int Mthd_Execute(void* i_this) { +BOOL Mthd_Execute(void* i_this) { return static_cast(i_this)->MoveBGExecute(); } diff --git a/src/d/actor/d_a_obj_shmrgrd.cpp b/src/d/actor/d_a_obj_shmrgrd.cpp index 55091480c..491107a84 100644 --- a/src/d/actor/d_a_obj_shmrgrd.cpp +++ b/src/d/actor/d_a_obj_shmrgrd.cpp @@ -22,7 +22,7 @@ void daObjShmrgrd_c::create_heap() { } /* 000006E0-00000964 .text _create__14daObjShmrgrd_cFv */ -s32 daObjShmrgrd_c::_create() { +cPhs_State daObjShmrgrd_c::_create() { /* Nonmatching */ } @@ -158,27 +158,27 @@ bool daObjShmrgrd_c::_draw() { namespace { /* 00001A74-00001A94 .text Mthd_Create__29@unnamed@d_a_obj_shmrgrd_cpp@FPv */ -void Mthd_Create(void*) { +cPhs_State Mthd_Create(void*) { /* Nonmatching */ } /* 00001A94-00001AB8 .text Mthd_Delete__29@unnamed@d_a_obj_shmrgrd_cpp@FPv */ -void Mthd_Delete(void*) { +BOOL Mthd_Delete(void*) { /* Nonmatching */ } /* 00001AB8-00001ADC .text Mthd_Execute__29@unnamed@d_a_obj_shmrgrd_cpp@FPv */ -void Mthd_Execute(void*) { +BOOL Mthd_Execute(void*) { /* Nonmatching */ } /* 00001ADC-00001B00 .text Mthd_Draw__29@unnamed@d_a_obj_shmrgrd_cpp@FPv */ -void Mthd_Draw(void*) { +BOOL Mthd_Draw(void*) { /* Nonmatching */ } /* 00001B00-00001B08 .text Mthd_IsDelete__29@unnamed@d_a_obj_shmrgrd_cpp@FPv */ -void Mthd_IsDelete(void*) { +BOOL Mthd_IsDelete(void*) { /* Nonmatching */ } diff --git a/src/d/actor/d_a_obj_smplbg.cpp b/src/d/actor/d_a_obj_smplbg.cpp index 914ef6073..43cb09ae2 100644 --- a/src/d/actor/d_a_obj_smplbg.cpp +++ b/src/d/actor/d_a_obj_smplbg.cpp @@ -17,7 +17,7 @@ s32 daObjSmplbg::Act_c::Create() { } /* 0000032C-00000474 .text Mthd_Create__Q211daObjSmplbg5Act_cFv */ -void daObjSmplbg::Act_c::Mthd_Create() { +cPhs_State daObjSmplbg::Act_c::Mthd_Create() { /* Nonmatching */ } @@ -27,7 +27,7 @@ BOOL daObjSmplbg::Act_c::Delete() { } /* 0000047C-000004D8 .text Mthd_Delete__Q211daObjSmplbg5Act_cFv */ -void daObjSmplbg::Act_c::Mthd_Delete() { +BOOL daObjSmplbg::Act_c::Mthd_Delete() { /* Nonmatching */ } @@ -59,27 +59,27 @@ BOOL daObjSmplbg::Act_c::Draw() { namespace daObjSmplbg { namespace { /* 00000764-00000784 .text Mthd_Create__Q211daObjSmplbg28@unnamed@d_a_obj_smplbg_cpp@FPv */ -void Mthd_Create(void*) { +cPhs_State Mthd_Create(void*) { /* Nonmatching */ } /* 00000784-000007A4 .text Mthd_Delete__Q211daObjSmplbg28@unnamed@d_a_obj_smplbg_cpp@FPv */ -void Mthd_Delete(void*) { +BOOL Mthd_Delete(void*) { /* Nonmatching */ } /* 000007A4-000007C4 .text Mthd_Execute__Q211daObjSmplbg28@unnamed@d_a_obj_smplbg_cpp@FPv */ -void Mthd_Execute(void*) { +BOOL Mthd_Execute(void*) { /* Nonmatching */ } /* 000007C4-000007F0 .text Mthd_Draw__Q211daObjSmplbg28@unnamed@d_a_obj_smplbg_cpp@FPv */ -void Mthd_Draw(void*) { +BOOL Mthd_Draw(void*) { /* Nonmatching */ } /* 000007F0-0000081C .text Mthd_IsDelete__Q211daObjSmplbg28@unnamed@d_a_obj_smplbg_cpp@FPv */ -void Mthd_IsDelete(void*) { +BOOL Mthd_IsDelete(void*) { /* Nonmatching */ } diff --git a/src/d/actor/d_a_obj_stair.cpp b/src/d/actor/d_a_obj_stair.cpp index 200c77d4c..621e05000 100644 --- a/src/d/actor/d_a_obj_stair.cpp +++ b/src/d/actor/d_a_obj_stair.cpp @@ -48,7 +48,7 @@ static s32 daObj_StairCreate(void*) { } /* 000004D8-00000854 .text _create__13daObj_Stair_cFv */ -s32 daObj_Stair_c::_create() { +cPhs_State daObj_Stair_c::_create() { /* Nonmatching */ } diff --git a/src/d/actor/d_a_obj_swflat.cpp b/src/d/actor/d_a_obj_swflat.cpp index cc9d9ce8a..f89c81689 100644 --- a/src/d/actor/d_a_obj_swflat.cpp +++ b/src/d/actor/d_a_obj_swflat.cpp @@ -22,7 +22,7 @@ s32 daObjSwflat::Act_c::Create() { } /* 00000630-000007BC .text Mthd_Create__Q211daObjSwflat5Act_cFv */ -void daObjSwflat::Act_c::Mthd_Create() { +cPhs_State daObjSwflat::Act_c::Mthd_Create() { /* Nonmatching */ } @@ -32,7 +32,7 @@ BOOL daObjSwflat::Act_c::Delete() { } /* 0000097C-00000A64 .text Mthd_Delete__Q211daObjSwflat5Act_cFv */ -void daObjSwflat::Act_c::Mthd_Delete() { +BOOL daObjSwflat::Act_c::Mthd_Delete() { /* Nonmatching */ } @@ -64,27 +64,27 @@ BOOL daObjSwflat::Act_c::IsDelete() { namespace daObjSwflat { namespace { /* 000012DC-000012FC .text Mthd_Create__Q211daObjSwflat28@unnamed@d_a_obj_swflat_cpp@FPv */ -void Mthd_Create(void*) { +cPhs_State Mthd_Create(void*) { /* Nonmatching */ } /* 000012FC-0000131C .text Mthd_Delete__Q211daObjSwflat28@unnamed@d_a_obj_swflat_cpp@FPv */ -void Mthd_Delete(void*) { +BOOL Mthd_Delete(void*) { /* Nonmatching */ } /* 0000131C-0000133C .text Mthd_Execute__Q211daObjSwflat28@unnamed@d_a_obj_swflat_cpp@FPv */ -void Mthd_Execute(void*) { +BOOL Mthd_Execute(void*) { /* Nonmatching */ } /* 0000133C-00001368 .text Mthd_Draw__Q211daObjSwflat28@unnamed@d_a_obj_swflat_cpp@FPv */ -void Mthd_Draw(void*) { +BOOL Mthd_Draw(void*) { /* Nonmatching */ } /* 00001368-00001394 .text Mthd_IsDelete__Q211daObjSwflat28@unnamed@d_a_obj_swflat_cpp@FPv */ -void Mthd_IsDelete(void*) { +BOOL Mthd_IsDelete(void*) { /* Nonmatching */ } diff --git a/src/d/actor/d_a_obj_swhammer.cpp b/src/d/actor/d_a_obj_swhammer.cpp index 6c9b765fe..514d66a09 100644 --- a/src/d/actor/d_a_obj_swhammer.cpp +++ b/src/d/actor/d_a_obj_swhammer.cpp @@ -7,7 +7,7 @@ #include "d/res/res_mhmrsw.h" #include "d/d_procname.h" #include "d/d_com_inf_game.h" -#include "d/actor/d_a_player_main.h" +#include "d/actor/d_a_player.h" #include "weak_bss_936_to_1036.h" // IWYU pragma: keep #include "weak_data_1811.h" // IWYU pragma: keep @@ -127,7 +127,7 @@ BOOL daObjSwhammer::Act_c::CreateHeap() { } /* 0000058C-0000070C .text Create__Q213daObjSwhammer5Act_cFv */ -int daObjSwhammer::Act_c::Create() { +BOOL daObjSwhammer::Act_c::Create() { fopAcM_SetMtx(this, mpModel->getBaseTRMtx()); init_mtx(); fopAcM_setCullSizeSphere(this, 0.0f, 30.0f, 0.0f, 120.0f); @@ -164,14 +164,14 @@ int daObjSwhammer::Act_c::Create() { attention_info.distances[fopAc_Attn_TYPE_MISC_e] = 0x2D; attention_info.position.y = current.pos.y + mTopPos + 120.0f; eyePos.y = attention_info.position.y; - return 1; + return TRUE; } /* 0000070C-000007F8 .text _create__Q213daObjSwhammer5Act_cFv */ -s32 daObjSwhammer::Act_c::_create() { +cPhs_State daObjSwhammer::Act_c::_create() { fopAcM_SetupActor(this, Act_c); - s32 phase_state = dComIfG_resLoad(&mPhs, M_arcname); + cPhs_State phase_state = dComIfG_resLoad(&mPhs, M_arcname); if (phase_state == cPhs_COMPLEATE_e) { phase_state = MoveBGCreate(M_arcname, MHMRSW_DZB_MHMRSW, NULL, 0xa80); JUT_ASSERT(0x1e9, (phase_state == cPhs_COMPLEATE_e) || (phase_state == cPhs_ERROR_e)); @@ -187,7 +187,7 @@ BOOL daObjSwhammer::Act_c::Delete() { /* 00000828-0000087C .text _delete__Q213daObjSwhammer5Act_cFv */ bool daObjSwhammer::Act_c::_delete() { - int ret = MoveBGDelete(); + BOOL ret = MoveBGDelete(); dComIfG_resDelete(&mPhs, M_arcname); return ret; } @@ -442,7 +442,7 @@ BOOL daObjSwhammer::Act_c::Draw() { namespace daObjSwhammer { namespace { /* 00001564-00001584 .text Mthd_Create__Q213daObjSwhammer30@unnamed@d_a_obj_swhammer_cpp@FPv */ -s32 Mthd_Create(void* i_this) { +cPhs_State Mthd_Create(void* i_this) { return static_cast(i_this)->_create(); } @@ -452,13 +452,13 @@ BOOL Mthd_Delete(void* i_this) { } /* 000015A8-000015C8 .text Mthd_Execute__Q213daObjSwhammer30@unnamed@d_a_obj_swhammer_cpp@FPv */ -int Mthd_Execute(void* i_this) { +BOOL Mthd_Execute(void* i_this) { return static_cast(i_this)->MoveBGExecute(); } /* 000015C8-000015F4 .text Mthd_Draw__Q213daObjSwhammer30@unnamed@d_a_obj_swhammer_cpp@FPv */ -void Mthd_Draw(void* i_this) { - static_cast(i_this)->Draw(); +BOOL Mthd_Draw(void* i_this) { + return static_cast(i_this)->Draw(); } /* 000015F4-00001620 .text Mthd_IsDelete__Q213daObjSwhammer30@unnamed@d_a_obj_swhammer_cpp@FPv */ diff --git a/src/d/actor/d_a_obj_swheavy.cpp b/src/d/actor/d_a_obj_swheavy.cpp index 06c0ea9ff..023b4508a 100644 --- a/src/d/actor/d_a_obj_swheavy.cpp +++ b/src/d/actor/d_a_obj_swheavy.cpp @@ -105,10 +105,10 @@ u8 daObjSwheavy::Act_c::create_heap() { } /* 0000032C-00000628 .text _create__Q212daObjSwheavy5Act_cFv */ -s32 daObjSwheavy::Act_c::_create() { +cPhs_State daObjSwheavy::Act_c::_create() { fopAcM_SetupActor(this, daObjSwheavy::Act_c); - s32 phase_state = dComIfG_resLoad(&mPhs, M_arcname); + cPhs_State phase_state = dComIfG_resLoad(&mPhs, M_arcname); if (phase_state == cPhs_COMPLEATE_e) { mType = prm_get_type(); bool up = cLib_checkBit(attr().mFlags, FLAG_IS_TOGGLE) || !is_switch(); @@ -435,7 +435,7 @@ bool daObjSwheavy::Act_c::_draw() { namespace daObjSwheavy { namespace { /* 000011C0-000011E0 .text Mthd_Create__Q212daObjSwheavy29@unnamed@d_a_obj_swheavy_cpp@FPv */ -s32 Mthd_Create(void* i_this) { +cPhs_State Mthd_Create(void* i_this) { return static_cast(i_this)->_create(); } diff --git a/src/d/actor/d_a_obj_swlight.cpp b/src/d/actor/d_a_obj_swlight.cpp index 9b5ad868d..03874e38e 100644 --- a/src/d/actor/d_a_obj_swlight.cpp +++ b/src/d/actor/d_a_obj_swlight.cpp @@ -22,7 +22,7 @@ void daObjSwlight::Act_c::create_heap() { } /* 0000045C-00000704 .text _create__Q212daObjSwlight5Act_cFv */ -s32 daObjSwlight::Act_c::_create() { +cPhs_State daObjSwlight::Act_c::_create() { /* Nonmatching */ } @@ -144,27 +144,27 @@ bool daObjSwlight::Act_c::_draw() { namespace daObjSwlight { namespace { /* 00001AC4-00001AE4 .text Mthd_Create__Q212daObjSwlight29@unnamed@d_a_obj_swlight_cpp@FPv */ -void Mthd_Create(void*) { +cPhs_State Mthd_Create(void*) { /* Nonmatching */ } /* 00001AE4-00001B08 .text Mthd_Delete__Q212daObjSwlight29@unnamed@d_a_obj_swlight_cpp@FPv */ -void Mthd_Delete(void*) { +BOOL Mthd_Delete(void*) { /* Nonmatching */ } /* 00001B08-00001B2C .text Mthd_Execute__Q212daObjSwlight29@unnamed@d_a_obj_swlight_cpp@FPv */ -void Mthd_Execute(void*) { +BOOL Mthd_Execute(void*) { /* Nonmatching */ } /* 00001B2C-00001B50 .text Mthd_Draw__Q212daObjSwlight29@unnamed@d_a_obj_swlight_cpp@FPv */ -void Mthd_Draw(void*) { +BOOL Mthd_Draw(void*) { /* Nonmatching */ } /* 00001B50-00001B58 .text Mthd_IsDelete__Q212daObjSwlight29@unnamed@d_a_obj_swlight_cpp@FPv */ -void Mthd_IsDelete(void*) { +BOOL Mthd_IsDelete(void*) { /* Nonmatching */ } diff --git a/src/d/actor/d_a_obj_swpush.cpp b/src/d/actor/d_a_obj_swpush.cpp index 3b863fb2f..12a599220 100644 --- a/src/d/actor/d_a_obj_swpush.cpp +++ b/src/d/actor/d_a_obj_swpush.cpp @@ -32,12 +32,12 @@ void daObjSwpush::Act_c::create_res_load() { } /* 0000051C-000008C4 .text Mthd_Create__Q211daObjSwpush5Act_cFv */ -void daObjSwpush::Act_c::Mthd_Create() { +cPhs_State daObjSwpush::Act_c::Mthd_Create() { /* Nonmatching */ } /* 00000968-000009F8 .text Mthd_Delete__Q211daObjSwpush5Act_cFv */ -void daObjSwpush::Act_c::Mthd_Delete() { +BOOL daObjSwpush::Act_c::Mthd_Delete() { /* Nonmatching */ } @@ -177,39 +177,39 @@ void daObjSwpush::Act_c::demo_runSw() { } /* 00001C84-00001F14 .text Mthd_Execute__Q211daObjSwpush5Act_cFv */ -void daObjSwpush::Act_c::Mthd_Execute() { +BOOL daObjSwpush::Act_c::Mthd_Execute() { /* Nonmatching */ } /* 00001F14-00001FF8 .text Mthd_Draw__Q211daObjSwpush5Act_cFv */ -void daObjSwpush::Act_c::Mthd_Draw() { +BOOL daObjSwpush::Act_c::Mthd_Draw() { /* Nonmatching */ } namespace daObjSwpush { namespace { /* 00001FF8-00002018 .text Mthd_Create__Q211daObjSwpush28@unnamed@d_a_obj_swpush_cpp@FPv */ -void Mthd_Create(void*) { +cPhs_State Mthd_Create(void*) { /* Nonmatching */ } /* 00002018-00002038 .text Mthd_Delete__Q211daObjSwpush28@unnamed@d_a_obj_swpush_cpp@FPv */ -void Mthd_Delete(void*) { +BOOL Mthd_Delete(void*) { /* Nonmatching */ } /* 00002038-00002058 .text Mthd_Execute__Q211daObjSwpush28@unnamed@d_a_obj_swpush_cpp@FPv */ -void Mthd_Execute(void*) { +BOOL Mthd_Execute(void*) { /* Nonmatching */ } /* 00002058-00002078 .text Mthd_Draw__Q211daObjSwpush28@unnamed@d_a_obj_swpush_cpp@FPv */ -void Mthd_Draw(void*) { +BOOL Mthd_Draw(void*) { /* Nonmatching */ } /* 00002078-00002080 .text Mthd_IsDelete__Q211daObjSwpush28@unnamed@d_a_obj_swpush_cpp@FPv */ -void Mthd_IsDelete(void*) { +BOOL Mthd_IsDelete(void*) { /* Nonmatching */ } diff --git a/src/d/actor/d_a_obj_table.cpp b/src/d/actor/d_a_obj_table.cpp index a640f3952..ba73f96c1 100644 --- a/src/d/actor/d_a_obj_table.cpp +++ b/src/d/actor/d_a_obj_table.cpp @@ -12,12 +12,12 @@ BOOL daObjTable::Act_c::CreateHeap() { } /* 000001B8-00000284 .text Create__Q210daObjTable5Act_cFv */ -int daObjTable::Act_c::Create() { +BOOL daObjTable::Act_c::Create() { /* Nonmatching */ } /* 00000284-000003B4 .text Mthd_Create__Q210daObjTable5Act_cFv */ -void daObjTable::Act_c::Mthd_Create() { +cPhs_State daObjTable::Act_c::Mthd_Create() { /* Nonmatching */ } @@ -27,7 +27,7 @@ BOOL daObjTable::Act_c::Delete() { } /* 000003BC-00000408 .text Mthd_Delete__Q210daObjTable5Act_cFv */ -void daObjTable::Act_c::Mthd_Delete() { +BOOL daObjTable::Act_c::Mthd_Delete() { /* Nonmatching */ } @@ -42,7 +42,7 @@ void daObjTable::Act_c::init_mtx() { } /* 000004C4-00000500 .text Execute__Q210daObjTable5Act_cFPPA3_A4_f */ -int daObjTable::Act_c::Execute(Mtx**) { +BOOL daObjTable::Act_c::Execute(Mtx**) { /* Nonmatching */ } @@ -54,27 +54,27 @@ BOOL daObjTable::Act_c::Draw() { namespace daObjTable { namespace { /* 00000608-00000628 .text Mthd_Create__Q210daObjTable27@unnamed@d_a_obj_table_cpp@FPv */ -void Mthd_Create(void*) { +cPhs_State Mthd_Create(void*) { /* Nonmatching */ } /* 00000628-00000648 .text Mthd_Delete__Q210daObjTable27@unnamed@d_a_obj_table_cpp@FPv */ -void Mthd_Delete(void*) { +BOOL Mthd_Delete(void*) { /* Nonmatching */ } /* 00000648-00000668 .text Mthd_Execute__Q210daObjTable27@unnamed@d_a_obj_table_cpp@FPv */ -void Mthd_Execute(void*) { +BOOL Mthd_Execute(void*) { /* Nonmatching */ } /* 00000668-00000694 .text Mthd_Draw__Q210daObjTable27@unnamed@d_a_obj_table_cpp@FPv */ -void Mthd_Draw(void*) { +BOOL Mthd_Draw(void*) { /* Nonmatching */ } /* 00000694-000006C0 .text Mthd_IsDelete__Q210daObjTable27@unnamed@d_a_obj_table_cpp@FPv */ -void Mthd_IsDelete(void*) { +BOOL Mthd_IsDelete(void*) { /* Nonmatching */ } diff --git a/src/d/actor/d_a_obj_tapestry.cpp b/src/d/actor/d_a_obj_tapestry.cpp index e35bf6448..bd3dcddf8 100644 --- a/src/d/actor/d_a_obj_tapestry.cpp +++ b/src/d/actor/d_a_obj_tapestry.cpp @@ -267,7 +267,7 @@ void daObjTapestry_c::set_eye_pos() { } /* 00004F2C-00005168 .text _create__15daObjTapestry_cFv */ -s32 daObjTapestry_c::_create() { +cPhs_State daObjTapestry_c::_create() { /* Nonmatching */ } @@ -317,7 +317,7 @@ bool daObjTapestry_c::_draw() { } /* 00005C44-00005C64 .text daObjTapestry_Create__FP10fopAc_ac_c */ -static s32 daObjTapestry_Create(fopAc_ac_c*) { +static cPhs_State daObjTapestry_Create(fopAc_ac_c*) { /* Nonmatching */ } diff --git a/src/d/actor/d_a_obj_tenmado.cpp b/src/d/actor/d_a_obj_tenmado.cpp index 4031ce239..f7b1a1045 100644 --- a/src/d/actor/d_a_obj_tenmado.cpp +++ b/src/d/actor/d_a_obj_tenmado.cpp @@ -17,7 +17,7 @@ s32 daObjTenmado::Act_c::Create() { } /* 0000029C-00000394 .text Mthd_Create__Q212daObjTenmado5Act_cFv */ -void daObjTenmado::Act_c::Mthd_Create() { +cPhs_State daObjTenmado::Act_c::Mthd_Create() { /* Nonmatching */ } @@ -27,7 +27,7 @@ BOOL daObjTenmado::Act_c::Delete() { } /* 0000039C-000003E8 .text Mthd_Delete__Q212daObjTenmado5Act_cFv */ -void daObjTenmado::Act_c::Mthd_Delete() { +BOOL daObjTenmado::Act_c::Mthd_Delete() { /* Nonmatching */ } @@ -54,27 +54,27 @@ BOOL daObjTenmado::Act_c::Draw() { namespace daObjTenmado { namespace { /* 00000750-00000770 .text Mthd_Create__Q212daObjTenmado29@unnamed@d_a_obj_tenmado_cpp@FPv */ -void Mthd_Create(void*) { +cPhs_State Mthd_Create(void*) { /* Nonmatching */ } /* 00000770-00000790 .text Mthd_Delete__Q212daObjTenmado29@unnamed@d_a_obj_tenmado_cpp@FPv */ -void Mthd_Delete(void*) { +BOOL Mthd_Delete(void*) { /* Nonmatching */ } /* 00000790-000007B0 .text Mthd_Execute__Q212daObjTenmado29@unnamed@d_a_obj_tenmado_cpp@FPv */ -void Mthd_Execute(void*) { +BOOL Mthd_Execute(void*) { /* Nonmatching */ } /* 000007B0-000007DC .text Mthd_Draw__Q212daObjTenmado29@unnamed@d_a_obj_tenmado_cpp@FPv */ -void Mthd_Draw(void*) { +BOOL Mthd_Draw(void*) { /* Nonmatching */ } /* 000007DC-00000808 .text Mthd_IsDelete__Q212daObjTenmado29@unnamed@d_a_obj_tenmado_cpp@FPv */ -void Mthd_IsDelete(void*) { +BOOL Mthd_IsDelete(void*) { /* Nonmatching */ } diff --git a/src/d/actor/d_a_obj_tide.cpp b/src/d/actor/d_a_obj_tide.cpp index 7d92a07e6..ffc85f14b 100644 --- a/src/d/actor/d_a_obj_tide.cpp +++ b/src/d/actor/d_a_obj_tide.cpp @@ -17,7 +17,7 @@ s32 daObjTide::Act_c::Create() { } /* 000007BC-00000998 .text Mthd_Create__Q29daObjTide5Act_cFv */ -void daObjTide::Act_c::Mthd_Create() { +cPhs_State daObjTide::Act_c::Mthd_Create() { /* Nonmatching */ } @@ -27,7 +27,7 @@ BOOL daObjTide::Act_c::Delete() { } /* 000009EC-00000A54 .text Mthd_Delete__Q29daObjTide5Act_cFv */ -void daObjTide::Act_c::Mthd_Delete() { +BOOL daObjTide::Act_c::Mthd_Delete() { /* Nonmatching */ } @@ -154,27 +154,27 @@ BOOL daObjTide::Act_c::Draw() { namespace daObjTide { namespace { /* 00001DD0-00001DF0 .text Mthd_Create__Q29daObjTide26@unnamed@d_a_obj_tide_cpp@FPv */ -void Mthd_Create(void*) { +cPhs_State Mthd_Create(void*) { /* Nonmatching */ } /* 00001DF0-00001E10 .text Mthd_Delete__Q29daObjTide26@unnamed@d_a_obj_tide_cpp@FPv */ -void Mthd_Delete(void*) { +BOOL Mthd_Delete(void*) { /* Nonmatching */ } /* 00001E10-00001E30 .text Mthd_Execute__Q29daObjTide26@unnamed@d_a_obj_tide_cpp@FPv */ -void Mthd_Execute(void*) { +BOOL Mthd_Execute(void*) { /* Nonmatching */ } /* 00001E30-00001E5C .text Mthd_Draw__Q29daObjTide26@unnamed@d_a_obj_tide_cpp@FPv */ -void Mthd_Draw(void*) { +BOOL Mthd_Draw(void*) { /* Nonmatching */ } /* 00001E5C-00001E88 .text Mthd_IsDelete__Q29daObjTide26@unnamed@d_a_obj_tide_cpp@FPv */ -void Mthd_IsDelete(void*) { +BOOL Mthd_IsDelete(void*) { /* Nonmatching */ } diff --git a/src/d/actor/d_a_obj_timer.cpp b/src/d/actor/d_a_obj_timer.cpp index fe383b237..52fab7093 100644 --- a/src/d/actor/d_a_obj_timer.cpp +++ b/src/d/actor/d_a_obj_timer.cpp @@ -10,7 +10,7 @@ #include "weak_data_1811.h" // IWYU pragma: keep /* 00000078-00000114 .text _create__Q210daObjTimer5Act_cFv */ -s32 daObjTimer::Act_c::_create() { +cPhs_State daObjTimer::Act_c::_create() { fopAcM_SetupActor(this, daObjTimer::Act_c); fopAcM_offDraw(this); @@ -91,7 +91,7 @@ bool daObjTimer::Act_c::_execute() { namespace daObjTimer { namespace { /* 00000394-000003B4 .text Mthd_Create__Q210daObjTimer27@unnamed@d_a_obj_timer_cpp@FPv */ -s32 Mthd_Create(void* i_this) { +cPhs_State Mthd_Create(void* i_this) { return static_cast(i_this)->_create(); } diff --git a/src/d/actor/d_a_obj_tntrap.cpp b/src/d/actor/d_a_obj_tntrap.cpp index c485b7046..6eedef5f1 100644 --- a/src/d/actor/d_a_obj_tntrap.cpp +++ b/src/d/actor/d_a_obj_tntrap.cpp @@ -57,7 +57,7 @@ void daObjTnTrap_c::set_em_set_offsetY() { } /* 00000A98-00000C78 .text _create__13daObjTnTrap_cFv */ -s32 daObjTnTrap_c::_create() { +cPhs_State daObjTnTrap_c::_create() { /* Nonmatching */ } @@ -147,7 +147,7 @@ bool daObjTnTrap_c::_draw() { } /* 00001BF0-00001C10 .text daObjTnTrap_Create__FP10fopAc_ac_c */ -static s32 daObjTnTrap_Create(fopAc_ac_c*) { +static cPhs_State daObjTnTrap_Create(fopAc_ac_c*) { /* Nonmatching */ } diff --git a/src/d/actor/d_a_obj_toripost.cpp b/src/d/actor/d_a_obj_toripost.cpp index 95049ac2b..19ff00643 100644 --- a/src/d/actor/d_a_obj_toripost.cpp +++ b/src/d/actor/d_a_obj_toripost.cpp @@ -895,7 +895,7 @@ bool daObjTpost_c::_draw() { mMorf->entryDL(); dComIfGd_setSimpleShadow2(¤t.pos, mAcch.GetGroundH(), 40.0f, mAcch.m_gnd, shape_angle.y, 1.0f, 0); - return 1; + return true; } /* 00001980-00001BA4 .text createInit__12daObjTpost_cFv */ @@ -961,7 +961,7 @@ int daObjTpost_c::_create() { fopAcM_SetupActor(this, daObjTpost_c); getArg(); - int step = dComIfG_resLoad(&mPhs, m_arc_name); + cPhs_State step = dComIfG_resLoad(&mPhs, m_arc_name); if(step == cPhs_COMPLEATE_e) { if(fopAcM_entrySolidHeap(this, createHeap_CB, 0x7E0) == 0) { return cPhs_ERROR_e; diff --git a/src/d/actor/d_a_obj_tousekiki.cpp b/src/d/actor/d_a_obj_tousekiki.cpp index 4aeb6fbe5..54cb75e9b 100644 --- a/src/d/actor/d_a_obj_tousekiki.cpp +++ b/src/d/actor/d_a_obj_tousekiki.cpp @@ -22,7 +22,7 @@ static s32 daObj_TousekikiCreate(void*) { } /* 000002DC-000004F4 .text _create__17daObj_Tousekiki_cFv */ -s32 daObj_Tousekiki_c::_create() { +cPhs_State daObj_Tousekiki_c::_create() { /* Nonmatching */ } diff --git a/src/d/actor/d_a_obj_tower.cpp b/src/d/actor/d_a_obj_tower.cpp index 80a1fd4e4..41c742dc6 100644 --- a/src/d/actor/d_a_obj_tower.cpp +++ b/src/d/actor/d_a_obj_tower.cpp @@ -57,30 +57,29 @@ void daObjTower_c::set_mtx() { mpModel->setBaseTRMtx(mDoMtx_stack_c::get()); } -cPhs__Step daObjTower_c::_create() { - cPhs__Step PVar3; - +cPhs_State daObjTower_c::_create() { fopAcM_SetupActor(this, daObjTower_c); field_0x2d0 = 0; + cPhs_State phase_state; if (!dComIfGs_isEventBit(0x1e40)) { - PVar3 = cPhs_STOP_e; + phase_state = cPhs_STOP_e; } else { - PVar3 = (cPhs__Step)dComIfG_resLoad(&mPhs, "X_tower"); - if (PVar3 == cPhs_COMPLEATE_e) { + phase_state = dComIfG_resLoad(&mPhs, "X_tower"); + if (phase_state == cPhs_COMPLEATE_e) { if (!fopAcM_entrySolidHeap(this, CheckCreateHeap, 0x1c6c0)) { - PVar3 = cPhs_ERROR_e; + phase_state = cPhs_ERROR_e; } else { CreateInit(); } } } - return PVar3; + return phase_state; } /* 0000030C-000003DC .text daObjTower_Create__FPv */ -static cPhs__Step daObjTower_Create(void* i_this) { +static cPhs_State daObjTower_Create(void* i_this) { return ((daObjTower_c*)i_this)->_create(); } diff --git a/src/d/actor/d_a_obj_trap.cpp b/src/d/actor/d_a_obj_trap.cpp index 917a0f153..0c570ca0e 100644 --- a/src/d/actor/d_a_obj_trap.cpp +++ b/src/d/actor/d_a_obj_trap.cpp @@ -17,7 +17,7 @@ void daObjTrap_c::create_heap() { } /* 000002A4-00000510 .text _create__11daObjTrap_cFv */ -s32 daObjTrap_c::_create() { +cPhs_State daObjTrap_c::_create() { /* Nonmatching */ } @@ -108,27 +108,27 @@ bool daObjTrap_c::_draw() { namespace { /* 00002D54-00002D74 .text Mthd_Create__26@unnamed@d_a_obj_trap_cpp@FPv */ -void Mthd_Create(void*) { +cPhs_State Mthd_Create(void*) { /* Nonmatching */ } /* 00002D74-00002D98 .text Mthd_Delete__26@unnamed@d_a_obj_trap_cpp@FPv */ -void Mthd_Delete(void*) { +BOOL Mthd_Delete(void*) { /* Nonmatching */ } /* 00002D98-00002DBC .text Mthd_Execute__26@unnamed@d_a_obj_trap_cpp@FPv */ -void Mthd_Execute(void*) { +BOOL Mthd_Execute(void*) { /* Nonmatching */ } /* 00002DBC-00002DE0 .text Mthd_Draw__26@unnamed@d_a_obj_trap_cpp@FPv */ -void Mthd_Draw(void*) { +BOOL Mthd_Draw(void*) { /* Nonmatching */ } /* 00002DE0-00002DE8 .text Mthd_IsDelete__26@unnamed@d_a_obj_trap_cpp@FPv */ -void Mthd_IsDelete(void*) { +BOOL Mthd_IsDelete(void*) { /* Nonmatching */ } diff --git a/src/d/actor/d_a_obj_tribox.cpp b/src/d/actor/d_a_obj_tribox.cpp index cec929de3..870568d79 100644 --- a/src/d/actor/d_a_obj_tribox.cpp +++ b/src/d/actor/d_a_obj_tribox.cpp @@ -72,7 +72,7 @@ void daObjTribox::Act_c::create_correct_after() { } /* 00000A28-00000BC4 .text _create__Q211daObjTribox5Act_cFv */ -s32 daObjTribox::Act_c::_create() { +cPhs_State daObjTribox::Act_c::_create() { /* Nonmatching */ } @@ -339,27 +339,27 @@ bool daObjTribox::Act_c::_draw() { namespace daObjTribox { namespace { /* 00003538-00003558 .text Mthd_Create__Q211daObjTribox28@unnamed@d_a_obj_tribox_cpp@FPv */ -void Mthd_Create(void*) { +cPhs_State Mthd_Create(void*) { /* Nonmatching */ } /* 00003558-0000357C .text Mthd_Delete__Q211daObjTribox28@unnamed@d_a_obj_tribox_cpp@FPv */ -void Mthd_Delete(void*) { +BOOL Mthd_Delete(void*) { /* Nonmatching */ } /* 0000357C-000035A0 .text Mthd_Execute__Q211daObjTribox28@unnamed@d_a_obj_tribox_cpp@FPv */ -void Mthd_Execute(void*) { +BOOL Mthd_Execute(void*) { /* Nonmatching */ } /* 000035A0-000035C4 .text Mthd_Draw__Q211daObjTribox28@unnamed@d_a_obj_tribox_cpp@FPv */ -void Mthd_Draw(void*) { +BOOL Mthd_Draw(void*) { /* Nonmatching */ } /* 000035C4-000035CC .text Mthd_IsDelete__Q211daObjTribox28@unnamed@d_a_obj_tribox_cpp@FPv */ -void Mthd_IsDelete(void*) { +BOOL Mthd_IsDelete(void*) { /* Nonmatching */ } diff --git a/src/d/actor/d_a_obj_try.cpp b/src/d/actor/d_a_obj_try.cpp index de34cbf18..03aee2f99 100644 --- a/src/d/actor/d_a_obj_try.cpp +++ b/src/d/actor/d_a_obj_try.cpp @@ -37,7 +37,7 @@ void daObjTry::Act_c::chk_appear() const { } /* 00000528-000008D8 .text _create__Q28daObjTry5Act_cFv */ -s32 daObjTry::Act_c::_create() { +cPhs_State daObjTry::Act_c::_create() { /* Nonmatching */ } @@ -224,27 +224,27 @@ bool daObjTry::Act_c::_draw() { namespace daObjTry { namespace { /* 00002EA4-00002EC4 .text Mthd_Create__Q28daObjTry25@unnamed@d_a_obj_try_cpp@FPv */ -void Mthd_Create(void*) { +cPhs_State Mthd_Create(void*) { /* Nonmatching */ } /* 00002EC4-00002EE8 .text Mthd_Delete__Q28daObjTry25@unnamed@d_a_obj_try_cpp@FPv */ -void Mthd_Delete(void*) { +BOOL Mthd_Delete(void*) { /* Nonmatching */ } /* 00002EE8-00002F0C .text Mthd_Execute__Q28daObjTry25@unnamed@d_a_obj_try_cpp@FPv */ -void Mthd_Execute(void*) { +BOOL Mthd_Execute(void*) { /* Nonmatching */ } /* 00002F0C-00002F30 .text Mthd_Draw__Q28daObjTry25@unnamed@d_a_obj_try_cpp@FPv */ -void Mthd_Draw(void*) { +BOOL Mthd_Draw(void*) { /* Nonmatching */ } /* 00002F30-00002F38 .text Mthd_IsDelete__Q28daObjTry25@unnamed@d_a_obj_try_cpp@FPv */ -void Mthd_IsDelete(void*) { +BOOL Mthd_IsDelete(void*) { /* Nonmatching */ } diff --git a/src/d/actor/d_a_obj_usovmc.cpp b/src/d/actor/d_a_obj_usovmc.cpp index b266823cc..cec29b22c 100644 --- a/src/d/actor/d_a_obj_usovmc.cpp +++ b/src/d/actor/d_a_obj_usovmc.cpp @@ -12,7 +12,7 @@ const char daObjUsovmc::Act_c::M_arcname[7] = "Usovmc"; Mtx daObjUsovmc::Act_c::M_tmp_mtx; /* 00000078-0000012C .text CreateHeap__Q211daObjUsovmc5Act_cFv */ -int daObjUsovmc::Act_c::CreateHeap() { +BOOL daObjUsovmc::Act_c::CreateHeap() { J3DModelData* model_data = (J3DModelData*)dComIfG_getObjectRes(M_arcname, USOVMC_BDL_VMCBX); JUT_ASSERT(0x4a, model_data != NULL); mModel = mDoExt_J3DModel__create(model_data, 0, 0x11020203); @@ -20,7 +20,7 @@ int daObjUsovmc::Act_c::CreateHeap() { } /* 0000012C-00000198 .text Create__Q211daObjUsovmc5Act_cFv */ -int daObjUsovmc::Act_c::Create() { +BOOL daObjUsovmc::Act_c::Create() { fopAcM_SetMtx(this, mModel->getBaseTRMtx()); init_mtx(); fopAcM_setCullSizeBox(this, -80.0f, -1.0f, -80.0f, 80.0f, 205.0f, 80.0f); @@ -28,10 +28,10 @@ int daObjUsovmc::Act_c::Create() { } /* 00000198-00000290 .text Mthd_Create__Q211daObjUsovmc5Act_cFv */ -s32 daObjUsovmc::Act_c::Mthd_Create() { +cPhs_State daObjUsovmc::Act_c::Mthd_Create() { fopAcM_SetupActor(this, Act_c); - s32 phase_state = dComIfG_resLoad(&mPhs, M_arcname); + cPhs_State phase_state = dComIfG_resLoad(&mPhs, M_arcname); if (phase_state == cPhs_COMPLEATE_e) { phase_state = MoveBGCreate(M_arcname, USOVMC_DZB_VMCBS, NULL, 0); JUT_ASSERT(0x74, (phase_state == cPhs_COMPLEATE_e) || (phase_state == cPhs_ERROR_e)); @@ -47,7 +47,7 @@ BOOL daObjUsovmc::Act_c::Delete() { /* 00000298-000002E4 .text Mthd_Delete__Q211daObjUsovmc5Act_cFv */ BOOL daObjUsovmc::Act_c::Mthd_Delete() { - s32 ret = MoveBGDelete(); + BOOL ret = MoveBGDelete(); dComIfG_resDelete(&mPhs, M_arcname); return ret; } @@ -67,7 +67,7 @@ void daObjUsovmc::Act_c::init_mtx() { } /* 000003A0-000003DC .text Execute__Q211daObjUsovmc5Act_cFPPA3_A4_f */ -int daObjUsovmc::Act_c::Execute(Mtx** mtx) { +BOOL daObjUsovmc::Act_c::Execute(Mtx** mtx) { set_mtx(); *mtx = &M_tmp_mtx; return TRUE; @@ -86,7 +86,7 @@ BOOL daObjUsovmc::Act_c::Draw() { namespace daObjUsovmc { namespace { /* 0000047C-0000049C .text Mthd_Create__Q211daObjUsovmc28@unnamed@d_a_obj_usovmc_cpp@FPv */ -s32 Mthd_Create(void* i_ac) { +cPhs_State Mthd_Create(void* i_ac) { return ((Act_c*)i_ac)->Mthd_Create(); } diff --git a/src/d/actor/d_a_obj_vfan.cpp b/src/d/actor/d_a_obj_vfan.cpp index 796c0ba39..1fb377d4d 100644 --- a/src/d/actor/d_a_obj_vfan.cpp +++ b/src/d/actor/d_a_obj_vfan.cpp @@ -47,7 +47,7 @@ static dCcD_SrcCyl cyl_check_src = { }; /* 00000078-00000134 .text CreateHeap__Q29daObjVfan5Act_cFv */ -int daObjVfan::Act_c::CreateHeap() { +BOOL daObjVfan::Act_c::CreateHeap() { J3DModelData* model_data = static_cast(dComIfG_getObjectRes(M_arcname, VFAN_BDL_V_FAN_00)); JUT_ASSERT(0x8c, model_data != NULL); @@ -61,7 +61,7 @@ int daObjVfan::Act_c::CreateHeap() { } /* 00000134-00000214 .text Create__Q29daObjVfan5Act_cFv */ -int daObjVfan::Act_c::Create() { +BOOL daObjVfan::Act_c::Create() { fopAcM_SetMtx(this, mpModel->getBaseTRMtx()); init_mtx(); @@ -83,11 +83,10 @@ int daObjVfan::Act_c::Create() { } /* 00000214-000003D0 .text Mthd_Create__Q29daObjVfan5Act_cFv */ -s32 daObjVfan::Act_c::Mthd_Create() { +cPhs_State daObjVfan::Act_c::Mthd_Create() { fopAcM_SetupActor(this, daObjVfan::Act_c); - int phase_state; - + cPhs_State phase_state; if (fopAcM_isSwitch(this, prm_get_swSave())) { return cPhs_STOP_e; } else { @@ -150,7 +149,7 @@ void daObjVfan::Act_c::ParticleSet() { } /* 000009B4-00000C74 .text Execute__Q29daObjVfan5Act_cFPPA3_A4_f */ -int daObjVfan::Act_c::Execute(Mtx** mtx) { +BOOL daObjVfan::Act_c::Execute(Mtx** mtx) { switch (mState) { case 0: dComIfG_Ccsp()->Set(&mCyl); @@ -219,19 +218,19 @@ BOOL daObjVfan::Act_c::Draw() { namespace daObjVfan { namespace { -static int Mthd_Create(void* i_this) { +static cPhs_State Mthd_Create(void* i_this) { return static_cast(i_this)->Mthd_Create(); } -static int Mthd_Delete(void* i_this) { +static BOOL Mthd_Delete(void* i_this) { return static_cast(i_this)->Mthd_Delete(); } -static int Mthd_Execute(void* i_this) { +static BOOL Mthd_Execute(void* i_this) { return static_cast(i_this)->MoveBGExecute(); } -static int Mthd_Draw(void* i_this) { +static BOOL Mthd_Draw(void* i_this) { return static_cast(i_this)->Draw(); } -static int Mthd_IsDelete(void* i_this) { +static BOOL Mthd_IsDelete(void* i_this) { return static_cast(i_this)->IsDelete(); } diff --git a/src/d/actor/d_a_obj_vgnfd.cpp b/src/d/actor/d_a_obj_vgnfd.cpp index db78e1b7a..620d10a73 100644 --- a/src/d/actor/d_a_obj_vgnfd.cpp +++ b/src/d/actor/d_a_obj_vgnfd.cpp @@ -155,8 +155,8 @@ BOOL daObjVgnfd_c::create_heap() { } /* 000004A4-00000704 .text _create__12daObjVgnfd_cFv */ -s32 daObjVgnfd_c::_create() { - s32 ret = cPhs_ERROR_e; +cPhs_State daObjVgnfd_c::_create() { + cPhs_State ret = cPhs_ERROR_e; fopAcM_SetupActor(this, daObjVgnfd_c); @@ -447,7 +447,7 @@ bool daObjVgnfd_c::_draw() { namespace { /* 000013F0-00001410 .text Mthd_Create__27@unnamed@d_a_obj_vgnfd_cpp@FPv */ -s32 Mthd_Create(void* i_ac) { +cPhs_State Mthd_Create(void* i_ac) { return ((daObjVgnfd_c*)i_ac)->_create(); } diff --git a/src/d/actor/d_a_obj_vmc.cpp b/src/d/actor/d_a_obj_vmc.cpp index 0c0930d4f..744e8eee0 100644 --- a/src/d/actor/d_a_obj_vmc.cpp +++ b/src/d/actor/d_a_obj_vmc.cpp @@ -137,12 +137,12 @@ void daObjVmc::Act_c::CreateInit() { } /* 000005BC-00000730 .text _create__Q28daObjVmc5Act_cFv */ -s32 daObjVmc::Act_c::_create() { +cPhs_State daObjVmc::Act_c::_create() { fopAcM_SetupActor(this, Act_c); mHasTreeBg = false; - s32 ret = dComIfG_resLoad(&mPhs, M_arcname); + cPhs_State ret = dComIfG_resLoad(&mPhs, M_arcname); if (ret == cPhs_COMPLEATE_e) { if (fopAcM_entrySolidHeap(this, solidHeapCB, 0x32a0) != 0) { @@ -321,7 +321,7 @@ bool daObjVmc::Act_c::_draw() { namespace daObjVmc { namespace { /* 000012CC-000012EC .text Mthd_Create__Q28daObjVmc25@unnamed@d_a_obj_vmc_cpp@FPv */ -s32 Mthd_Create(void* i_ac) { +cPhs_State Mthd_Create(void* i_ac) { return ((Act_c*)i_ac)->_create(); } diff --git a/src/d/actor/d_a_obj_vmsdz.cpp b/src/d/actor/d_a_obj_vmsdz.cpp index dc0c829cb..626935798 100644 --- a/src/d/actor/d_a_obj_vmsdz.cpp +++ b/src/d/actor/d_a_obj_vmsdz.cpp @@ -34,8 +34,8 @@ BOOL daObjVmsdz_c::create_heap() { } /* 0000015C-00000208 .text _create__12daObjVmsdz_cFv */ -s32 daObjVmsdz_c::_create() { - s32 ret = cPhs_ERROR_e; +cPhs_State daObjVmsdz_c::_create() { + cPhs_State ret = cPhs_ERROR_e; fopAcM_SetupActor(this, daObjVmsdz_c); @@ -80,7 +80,7 @@ bool daObjVmsdz_c::_draw() { namespace { /* 00000300-00000320 .text Mthd_Create__27@unnamed@d_a_obj_vmsdz_cpp@FPv */ -s32 Mthd_Create(void* i_ac) { +cPhs_State Mthd_Create(void* i_ac) { return ((daObjVmsdz_c*)i_ac)->_create(); } diff --git a/src/d/actor/d_a_obj_vmsms.cpp b/src/d/actor/d_a_obj_vmsms.cpp index 6ab4f5051..9cdf8ac4e 100644 --- a/src/d/actor/d_a_obj_vmsms.cpp +++ b/src/d/actor/d_a_obj_vmsms.cpp @@ -34,8 +34,8 @@ BOOL daObjVmsms_c::create_heap() { } /* 0000015C-0000021C .text _create__12daObjVmsms_cFv */ -s32 daObjVmsms_c::_create() { - s32 ret = cPhs_ERROR_e; +cPhs_State daObjVmsms_c::_create() { + cPhs_State ret = cPhs_ERROR_e; fopAcM_SetupActor(this, daObjVmsms_c); @@ -89,7 +89,7 @@ bool daObjVmsms_c::_draw() { namespace { /* 0000036C-0000038C .text Mthd_Create__27@unnamed@d_a_obj_vmsms_cpp@FPv */ -s32 Mthd_Create(void* i_ac) { +cPhs_State Mthd_Create(void* i_ac) { return ((daObjVmsms_c*)i_ac)->_create(); } diff --git a/src/d/actor/d_a_obj_volcano.cpp b/src/d/actor/d_a_obj_volcano.cpp index 4b7e217b0..c8c49eca9 100644 --- a/src/d/actor/d_a_obj_volcano.cpp +++ b/src/d/actor/d_a_obj_volcano.cpp @@ -27,7 +27,7 @@ s32 daObjVolcano::Act_c::Create() { } /* 000009C8-00000BA0 .text Mthd_Create__Q212daObjVolcano5Act_cFv */ -void daObjVolcano::Act_c::Mthd_Create() { +cPhs_State daObjVolcano::Act_c::Mthd_Create() { /* Nonmatching */ } @@ -37,7 +37,7 @@ BOOL daObjVolcano::Act_c::Delete() { } /* 00000E60-00000EC0 .text Mthd_Delete__Q212daObjVolcano5Act_cFv */ -void daObjVolcano::Act_c::Mthd_Delete() { +BOOL daObjVolcano::Act_c::Mthd_Delete() { /* Nonmatching */ } @@ -109,27 +109,27 @@ BOOL daObjVolcano::Act_c::Draw() { namespace daObjVolcano { namespace { /* 00001B8C-00001BAC .text Mthd_Create__Q212daObjVolcano29@unnamed@d_a_obj_volcano_cpp@FPv */ -void Mthd_Create(void*) { +cPhs_State Mthd_Create(void*) { /* Nonmatching */ } /* 00001BAC-00001BCC .text Mthd_Delete__Q212daObjVolcano29@unnamed@d_a_obj_volcano_cpp@FPv */ -void Mthd_Delete(void*) { +BOOL Mthd_Delete(void*) { /* Nonmatching */ } /* 00001BCC-00001BEC .text Mthd_Execute__Q212daObjVolcano29@unnamed@d_a_obj_volcano_cpp@FPv */ -void Mthd_Execute(void*) { +BOOL Mthd_Execute(void*) { /* Nonmatching */ } /* 00001BEC-00001C18 .text Mthd_Draw__Q212daObjVolcano29@unnamed@d_a_obj_volcano_cpp@FPv */ -void Mthd_Draw(void*) { +BOOL Mthd_Draw(void*) { /* Nonmatching */ } /* 00001C18-00001C44 .text Mthd_IsDelete__Q212daObjVolcano29@unnamed@d_a_obj_volcano_cpp@FPv */ -void Mthd_IsDelete(void*) { +BOOL Mthd_IsDelete(void*) { /* Nonmatching */ } diff --git a/src/d/actor/d_a_obj_vtil.cpp b/src/d/actor/d_a_obj_vtil.cpp index 8190aeb8d..e07b7aa9d 100644 --- a/src/d/actor/d_a_obj_vtil.cpp +++ b/src/d/actor/d_a_obj_vtil.cpp @@ -17,7 +17,7 @@ void daObjVtil_c::create_heap() { } /* 0000016C-000003C0 .text _create__11daObjVtil_cFv */ -s32 daObjVtil_c::_create() { +cPhs_State daObjVtil_c::_create() { /* Nonmatching */ } @@ -173,27 +173,27 @@ bool daObjVtil_c::_draw() { namespace { /* 00001864-00001884 .text Mthd_Create__26@unnamed@d_a_obj_vtil_cpp@FPv */ -void Mthd_Create(void*) { +cPhs_State Mthd_Create(void*) { /* Nonmatching */ } /* 00001884-000018A8 .text Mthd_Delete__26@unnamed@d_a_obj_vtil_cpp@FPv */ -void Mthd_Delete(void*) { +BOOL Mthd_Delete(void*) { /* Nonmatching */ } /* 000018A8-000018CC .text Mthd_Execute__26@unnamed@d_a_obj_vtil_cpp@FPv */ -void Mthd_Execute(void*) { +BOOL Mthd_Execute(void*) { /* Nonmatching */ } /* 000018CC-000018F0 .text Mthd_Draw__26@unnamed@d_a_obj_vtil_cpp@FPv */ -void Mthd_Draw(void*) { +BOOL Mthd_Draw(void*) { /* Nonmatching */ } /* 000018F0-000018F8 .text Mthd_IsDelete__26@unnamed@d_a_obj_vtil_cpp@FPv */ -void Mthd_IsDelete(void*) { +BOOL Mthd_IsDelete(void*) { /* Nonmatching */ } diff --git a/src/d/actor/d_a_obj_vyasi.cpp b/src/d/actor/d_a_obj_vyasi.cpp index e81c069f9..dfca72c1f 100644 --- a/src/d/actor/d_a_obj_vyasi.cpp +++ b/src/d/actor/d_a_obj_vyasi.cpp @@ -102,7 +102,7 @@ void daObjVyasi::Act_c::create_heap() { } /* 00001290-000016E0 .text _create__Q210daObjVyasi5Act_cFv */ -s32 daObjVyasi::Act_c::_create() { +cPhs_State daObjVyasi::Act_c::_create() { /* Nonmatching */ } @@ -144,27 +144,27 @@ bool daObjVyasi::Act_c::_draw() { namespace daObjVyasi { namespace { /* 00002A6C-00002A8C .text Mthd_Create__Q210daObjVyasi27@unnamed@d_a_obj_vyasi_cpp@FPv */ -void Mthd_Create(void*) { +cPhs_State Mthd_Create(void*) { /* Nonmatching */ } /* 00002A8C-00002AB0 .text Mthd_Delete__Q210daObjVyasi27@unnamed@d_a_obj_vyasi_cpp@FPv */ -void Mthd_Delete(void*) { +BOOL Mthd_Delete(void*) { /* Nonmatching */ } /* 00002AB0-00002AD4 .text Mthd_Execute__Q210daObjVyasi27@unnamed@d_a_obj_vyasi_cpp@FPv */ -void Mthd_Execute(void*) { +BOOL Mthd_Execute(void*) { /* Nonmatching */ } /* 00002AD4-00002AF8 .text Mthd_Draw__Q210daObjVyasi27@unnamed@d_a_obj_vyasi_cpp@FPv */ -void Mthd_Draw(void*) { +BOOL Mthd_Draw(void*) { /* Nonmatching */ } /* 00002AF8-00002B00 .text Mthd_IsDelete__Q210daObjVyasi27@unnamed@d_a_obj_vyasi_cpp@FPv */ -void Mthd_IsDelete(void*) { +BOOL Mthd_IsDelete(void*) { /* Nonmatching */ } diff --git a/src/d/actor/d_a_obj_warpt.cpp b/src/d/actor/d_a_obj_warpt.cpp index c1e391d84..b2bacd9fb 100644 --- a/src/d/actor/d_a_obj_warpt.cpp +++ b/src/d/actor/d_a_obj_warpt.cpp @@ -193,7 +193,7 @@ void daObj_Warpt_c::createInit() { } /* 0000215C-00002378 .text _create__13daObj_Warpt_cFv */ -s32 daObj_Warpt_c::_create() { +cPhs_State daObj_Warpt_c::_create() { /* Nonmatching */ } diff --git a/src/d/actor/d_a_obj_wood.cpp b/src/d/actor/d_a_obj_wood.cpp index fba4d2a4c..ec64a6d59 100644 --- a/src/d/actor/d_a_obj_wood.cpp +++ b/src/d/actor/d_a_obj_wood.cpp @@ -9,7 +9,7 @@ #include "d/d_procname.h" #include "f_op/f_op_actor_mng.h" -s32 daObjWood::Act_c::_create() { +cPhs_State daObjWood::Act_c::_create() { fopAcM_SetupActor(this, Act_c); if (dComIfGp_createWood() != NULL) dComIfGp_getWood()->put_unit(current.pos, fopAcM_GetRoomNo(this)); @@ -30,7 +30,7 @@ bool daObjWood::Act_c::_draw() { } /* 00000078-00000190 .text Create__Q29daObjWood6MethodFPv */ -s32 daObjWood::Method::Create(void* i_this) { +cPhs_State daObjWood::Method::Create(void* i_this) { return ((Act_c*)i_this)->_create(); } diff --git a/src/d/actor/d_a_obj_xfuta.cpp b/src/d/actor/d_a_obj_xfuta.cpp index ae488519d..6e7ababa7 100644 --- a/src/d/actor/d_a_obj_xfuta.cpp +++ b/src/d/actor/d_a_obj_xfuta.cpp @@ -52,9 +52,9 @@ bool Act_c::create_heap() { } /* 0000015C-00000214 .text _create__Q210daObjXfuta5Act_cFv */ -s32 Act_c::_create() { +cPhs_State Act_c::_create() { fopAcM_SetupActor(this, Act_c); - int phase_state = dComIfG_resLoad(&mPhs, M_arcname); + cPhs_State phase_state = dComIfG_resLoad(&mPhs, M_arcname); if (phase_state == cPhs_COMPLEATE_e) { if (fopAcM_entrySolidHeap(this, solidHeapCB, 0x0)) { set_mtx(); @@ -104,23 +104,23 @@ bool Act_c::_draw() { namespace { -s32 Mthd_Create(void* i_this) { +cPhs_State Mthd_Create(void* i_this) { return static_cast(i_this)->_create(); } -s32 Mthd_Delete(void* i_this) { +BOOL Mthd_Delete(void* i_this) { return static_cast(i_this)->_delete(); } -s32 Mthd_Execute(void* i_this) { +BOOL Mthd_Execute(void* i_this) { return static_cast(i_this)->_execute(); } -s32 Mthd_Draw(void* i_this) { +BOOL Mthd_Draw(void* i_this) { return static_cast(i_this)->_draw(); } -s32 Mthd_IsDelete(void* i_this) { +BOOL Mthd_IsDelete(void* i_this) { return TRUE; } diff --git a/src/d/actor/d_a_obj_zouK.cpp b/src/d/actor/d_a_obj_zouK.cpp index 5ed291be6..4e17511f0 100644 --- a/src/d/actor/d_a_obj_zouK.cpp +++ b/src/d/actor/d_a_obj_zouK.cpp @@ -119,10 +119,10 @@ bool daObjZouk::Act_c::create_heap() { } /* 00000468-00000724 .text _create__Q29daObjZouk5Act_cFv */ -s32 daObjZouk::Act_c::_create() { +cPhs_State daObjZouk::Act_c::_create() { fopAcM_SetupActor(this, Act_c); - s32 ret = dComIfG_resLoad(&mPhs, M_arcname); + cPhs_State ret = dComIfG_resLoad(&mPhs, M_arcname); if (ret == cPhs_COMPLEATE_e) { if (fopAcM_entrySolidHeap(this, solidHeapCB, 0x0)) { @@ -323,7 +323,7 @@ void daObjZouk::Act_c::setEffectMtx(const cXyz* pos, f32 scaleMag) { namespace daObjZouk { namespace { - s32 Mthd_Create(void* i_this) { + cPhs_State Mthd_Create(void* i_this) { return ((Act_c*)i_this)->_create(); } diff --git a/src/d/actor/d_a_oq.cpp b/src/d/actor/d_a_oq.cpp index 7ec3064ff..5039f57bc 100644 --- a/src/d/actor/d_a_oq.cpp +++ b/src/d/actor/d_a_oq.cpp @@ -108,7 +108,7 @@ static BOOL useHeapInit(fopAc_ac_c*) { } /* 00004708-00004DBC .text daOQ_Create__FP10fopAc_ac_c */ -static s32 daOQ_Create(fopAc_ac_c*) { +static cPhs_State daOQ_Create(fopAc_ac_c*) { /* Nonmatching */ } diff --git a/src/d/actor/d_a_oship.cpp b/src/d/actor/d_a_oship.cpp index c24c7dc51..d1f59c597 100644 --- a/src/d/actor/d_a_oship.cpp +++ b/src/d/actor/d_a_oship.cpp @@ -202,7 +202,7 @@ void daOship_c::getArg() { } /* 00002F90-000030EC .text _create__9daOship_cFv */ -s32 daOship_c::_create() { +cPhs_State daOship_c::_create() { /* Nonmatching */ } diff --git a/src/d/actor/d_a_pedestal.cpp b/src/d/actor/d_a_pedestal.cpp index 24f1bc03f..68a742276 100644 --- a/src/d/actor/d_a_pedestal.cpp +++ b/src/d/actor/d_a_pedestal.cpp @@ -95,10 +95,10 @@ void daPds_c::CreateInit() { } /* 00000380-00000474 .text _create__Q210daPedestal7daPds_cFv */ -s32 daPds_c::_create() { +cPhs_State daPds_c::_create() { fopAcM_SetupActor(this, daPds_c); - s32 phase_state = dComIfG_resLoad(&mPhase, m_arcname); + cPhs_State phase_state = dComIfG_resLoad(&mPhase, m_arcname); if (phase_state == cPhs_COMPLEATE_e) { if (!fopAcM_entrySolidHeap(this, CheckCreateHeap, 0x2000)) { @@ -407,7 +407,7 @@ bool daPds_c::_draw() { } /* 00000F10-00000F30 .text daPds_Create__10daPedestalFPv */ -static s32 daPds_Create(void* i_this) { +static cPhs_State daPds_Create(void* i_this) { return static_cast(i_this)->_create(); } diff --git a/src/d/actor/d_a_ph.cpp b/src/d/actor/d_a_ph.cpp index 485277c3e..1b2056b8a 100644 --- a/src/d/actor/d_a_ph.cpp +++ b/src/d/actor/d_a_ph.cpp @@ -167,7 +167,7 @@ static BOOL useHeapInit(fopAc_ac_c*) { } /* 00006700-00006D1C .text daPH_Create__FP10fopAc_ac_c */ -static s32 daPH_Create(fopAc_ac_c*) { +static cPhs_State daPH_Create(fopAc_ac_c*) { /* Nonmatching */ } diff --git a/src/d/actor/d_a_pirate_flag.cpp b/src/d/actor/d_a_pirate_flag.cpp index b00ab1502..33a179f61 100644 --- a/src/d/actor/d_a_pirate_flag.cpp +++ b/src/d/actor/d_a_pirate_flag.cpp @@ -494,11 +494,11 @@ static BOOL daPirate_Flag_Delete(pirate_flag_class* i_this) { } /* 00001A90-00001C8C .text daPirate_Flag_Create__FP10fopAc_ac_c */ -static s32 daPirate_Flag_Create(fopAc_ac_c* i_this) { +static cPhs_State daPirate_Flag_Create(fopAc_ac_c* i_this) { pirate_flag_class* a_this = static_cast(i_this); fopAcM_SetupActor(i_this, pirate_flag_class); - s32 result = dComIfG_resLoad(&a_this->mPhs1, "Cloth"); + cPhs_State result = dComIfG_resLoad(&a_this->mPhs1, "Cloth"); if (result != cPhs_COMPLEATE_e) { return result; } diff --git a/src/d/actor/d_a_player_main.cpp b/src/d/actor/d_a_player_main.cpp index b526d9c35..747092a70 100644 --- a/src/d/actor/d_a_player_main.cpp +++ b/src/d/actor/d_a_player_main.cpp @@ -4429,7 +4429,7 @@ void daPy_lk_c::playerInit() { } /* 80125CC8-80125D30 .text phase_1__FP9daPy_lk_c */ -int phase_1(daPy_lk_c* i_this) { +cPhs_State phase_1(daPy_lk_c* i_this) { dComIfGp_setPlayer(0, i_this); dComIfGp_setLinkPlayer(i_this); @@ -4444,8 +4444,8 @@ int phase_1(daPy_lk_c* i_this) { } /* 80125D30-80125DB4 .text phase_2__FP9daPy_lk_c */ -int phase_2(daPy_lk_c* i_this) { - int result; +cPhs_State phase_2(daPy_lk_c* i_this) { + cPhs_State result; if (dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)) == NULL) { result = cPhs_INIT_e; @@ -4471,27 +4471,27 @@ daPy_footData_c::daPy_footData_c() { } /* 80127160-80127B50 .text makeBgWait__9daPy_lk_cFv */ -int daPy_lk_c::makeBgWait() { +cPhs_State daPy_lk_c::makeBgWait() { /* Nonmatching */ return cPhs_NEXT_e; } /* 80127B50-80127B70 .text phase_3__FP9daPy_lk_c */ -int phase_3(daPy_lk_c* i_this) { +cPhs_State phase_3(daPy_lk_c* i_this) { return i_this->makeBgWait(); } /* 80127B70-80127BA0 .text daPy_Create__FP10fopAc_ac_c */ -static s32 daPy_Create(fopAc_ac_c* i_this) { - static int (*l_method[4])(daPy_lk_c*) = { - phase_1, - phase_2, - phase_3, - NULL, +static cPhs_State daPy_Create(fopAc_ac_c* i_this) { + static cPhs__Handler l_method[] = { + (cPhs__Handler)phase_1, + (cPhs__Handler)phase_2, + (cPhs__Handler)phase_3, + (cPhs__Handler)NULL, }; daPy_lk_c* a_this = (daPy_lk_c*)i_this; - return dComLbG_PhaseHandler(a_this->getPhase(), (cPhs__Handler*)l_method, a_this); + return dComLbG_PhaseHandler(a_this->getPhase(), l_method, a_this); } /* 80127BA0-80127CC0 .text setSeAnime__9daPy_lk_cFPC14daPy_anmHeap_cP12J3DFrameCtrl */ diff --git a/src/d/actor/d_a_pt.cpp b/src/d/actor/d_a_pt.cpp index 1442d03ae..0e9182958 100644 --- a/src/d/actor/d_a_pt.cpp +++ b/src/d/actor/d_a_pt.cpp @@ -112,7 +112,7 @@ static BOOL useHeapInit(fopAc_ac_c*) { } /* 0000481C-00004B1C .text daPt_Create__FP10fopAc_ac_c */ -static s32 daPt_Create(fopAc_ac_c*) { +static cPhs_State daPt_Create(fopAc_ac_c*) { /* Nonmatching */ } diff --git a/src/d/actor/d_a_pw.cpp b/src/d/actor/d_a_pw.cpp index d5ad2ce9e..034c99469 100644 --- a/src/d/actor/d_a_pw.cpp +++ b/src/d/actor/d_a_pw.cpp @@ -482,7 +482,7 @@ static BOOL useHeapInit(fopAc_ac_c*) { } /* 00006720-00006BDC .text daPW_Create__FP10fopAc_ac_c */ -static s32 daPW_Create(fopAc_ac_c* i_actor) { +static cPhs_State daPW_Create(fopAc_ac_c* i_actor) { /* Nonmatching */ fopAcM_SetupActor(i_actor, pw_class); } diff --git a/src/d/actor/d_a_pz.cpp b/src/d/actor/d_a_pz.cpp index 779066630..e1631ade9 100644 --- a/src/d/actor/d_a_pz.cpp +++ b/src/d/actor/d_a_pz.cpp @@ -362,7 +362,7 @@ void daPz_c::createInit() { } /* 00006BAC-00006CB0 .text _create__6daPz_cFv */ -s32 daPz_c::_create() { +cPhs_State daPz_c::_create() { /* Nonmatching */ } diff --git a/src/d/actor/d_a_race_item.cpp b/src/d/actor/d_a_race_item.cpp index 83e4fc704..2a0c82bac 100644 --- a/src/d/actor/d_a_race_item.cpp +++ b/src/d/actor/d_a_race_item.cpp @@ -55,7 +55,7 @@ BOOL daRaceItem_c::Delete() { } /* 0000012C-00000318 .text create__12daRaceItem_cFv */ -s32 daRaceItem_c::create() { +cPhs_State daRaceItem_c::create() { fopAcM_SetupActor(this, daRaceItem_c); m_itemNo = fopAcM_GetParam(this) & 0xFF; @@ -66,7 +66,7 @@ s32 daRaceItem_c::create() { return cPhs_ERROR_e; } else { - s32 phase_state = dComIfG_resLoad(&mPhs, dItem_data::getFieldArc(m_itemNo)); + cPhs_State phase_state = dComIfG_resLoad(&mPhs, dItem_data::getFieldArc(m_itemNo)); if (phase_state == cPhs_COMPLEATE_e) { u32 heap_size = dItem_data::getHeapSize(m_itemNo); if (!fopAcM_entrySolidHeap(this, &CheckFieldItemCreateHeap, heap_size)) { diff --git a/src/d/actor/d_a_rd.cpp b/src/d/actor/d_a_rd.cpp index fb64b5fe5..1bed3db31 100644 --- a/src/d/actor/d_a_rd.cpp +++ b/src/d/actor/d_a_rd.cpp @@ -1815,10 +1815,10 @@ void daRd_c::getArg() { } /* 00004720-000047C8 .text _create__6daRd_cFv */ -s32 daRd_c::_create() { +cPhs_State daRd_c::_create() { fopAcM_SetupActor(this, daRd_c); - s32 phase_state = dComIfG_resLoad(&mPhs, m_arc_name); + cPhs_State phase_state = dComIfG_resLoad(&mPhs, m_arc_name); if (phase_state == cPhs_COMPLEATE_e) { getArg(); diff --git a/src/d/actor/d_a_sail.cpp b/src/d/actor/d_a_sail.cpp index a75952032..2fa0d71d4 100644 --- a/src/d/actor/d_a_sail.cpp +++ b/src/d/actor/d_a_sail.cpp @@ -763,12 +763,12 @@ static BOOL daSail_checkCreateHeap(fopAc_ac_c* i_actor) { } /* 00002254-000024E4 .text daSail_Create__FP10fopAc_ac_c */ -static s32 daSail_Create(fopAc_ac_c* i_actor) { +static cPhs_State daSail_Create(fopAc_ac_c* i_actor) { fopAcM_SetupActor(i_actor, sail_class); sail_class* i_this = (sail_class*)i_actor; { - int phase_state = dComIfG_resLoad(&i_this->mClothPhase, "Cloth"); + cPhs_State phase_state = dComIfG_resLoad(&i_this->mClothPhase, "Cloth"); if (phase_state != cPhs_COMPLEATE_e) { return phase_state; } @@ -778,7 +778,7 @@ static s32 daSail_Create(fopAc_ac_c* i_actor) { } } - int phase_state = cPhs_COMPLEATE_e; + cPhs_State phase_state = cPhs_COMPLEATE_e; if (fopAcM_entrySolidHeap(i_this, daSail_checkCreateHeap, 0x4C0)) { if (l_HIO.mNo < 0) { l_HIO.mNo = mDoHIO_root.m_subroot.createChild("海賊船の帆", &l_HIO); // "Pirate Ship's Sail" diff --git a/src/d/actor/d_a_saku.cpp b/src/d/actor/d_a_saku.cpp index 12148761f..351abd187 100644 --- a/src/d/actor/d_a_saku.cpp +++ b/src/d/actor/d_a_saku.cpp @@ -125,7 +125,7 @@ void changeXluMaterialAlpha(J3DMaterial*, unsigned char, bool) { } /* 00001B98-00001BB8 .text daSaku_Create__FP10fopAc_ac_c */ -static s32 daSaku_Create(fopAc_ac_c*) { +static cPhs_State daSaku_Create(fopAc_ac_c*) { /* Nonmatching */ } diff --git a/src/d/actor/d_a_salvage.cpp b/src/d/actor/d_a_salvage.cpp index b6ece2900..bc227e1e9 100644 --- a/src/d/actor/d_a_salvage.cpp +++ b/src/d/actor/d_a_salvage.cpp @@ -22,7 +22,7 @@ void daSalvage_c::CreateInit() { } /* 00000570-00000728 .text _create__11daSalvage_cFv */ -s32 daSalvage_c::_create() { +cPhs_State daSalvage_c::_create() { /* Nonmatching */ } diff --git a/src/d/actor/d_a_salvage_tbox.cpp b/src/d/actor/d_a_salvage_tbox.cpp index 275d28634..2e6a3bd2a 100644 --- a/src/d/actor/d_a_salvage_tbox.cpp +++ b/src/d/actor/d_a_salvage_tbox.cpp @@ -47,7 +47,7 @@ void daSTBox_c::CreateInit() { } /* 00000ADC-00000BFC .text _create__9daSTBox_cFv */ -s32 daSTBox_c::_create() { +cPhs_State daSTBox_c::_create() { /* Nonmatching */ } @@ -112,7 +112,7 @@ void daSTBox_c::actWaitDummy(int) { } /* 000013BC-000013DC .text daSTBox_Create__FPv */ -static s32 daSTBox_Create(void*) { +static cPhs_State daSTBox_Create(void*) { /* Nonmatching */ } diff --git a/src/d/actor/d_a_sbox.cpp b/src/d/actor/d_a_sbox.cpp index 1e74cffec..d7f6789ea 100644 --- a/src/d/actor/d_a_sbox.cpp +++ b/src/d/actor/d_a_sbox.cpp @@ -52,7 +52,7 @@ void daSbox_c::CreateInit() { } /* 000008F0-000009F0 .text create__8daSbox_cFv */ -s32 daSbox_c::create() { +cPhs_State daSbox_c::create() { /* Nonmatching */ } @@ -132,7 +132,7 @@ static BOOL daSbox_Delete(daSbox_c*) { } /* 00001640-00001660 .text daSbox_Create__FP10fopAc_ac_c */ -static s32 daSbox_Create(fopAc_ac_c*) { +static cPhs_State daSbox_Create(fopAc_ac_c*) { /* Nonmatching */ } diff --git a/src/d/actor/d_a_sea.cpp b/src/d/actor/d_a_sea.cpp index 578845dd5..a030c89c2 100644 --- a/src/d/actor/d_a_sea.cpp +++ b/src/d/actor/d_a_sea.cpp @@ -1171,7 +1171,7 @@ static BOOL CheckCreateHeap(fopAc_ac_c* i_this) { } /* 8015D924-8015D99C .text daSea_Create__FP10fopAc_ac_c */ -static s32 daSea_Create(fopAc_ac_c* i_this) { +static cPhs_State daSea_Create(fopAc_ac_c* i_this) { fopAcM_SetupActor(i_this, sea_class); if (!fopAcM_entrySolidHeap(i_this, CheckCreateHeap, 0xA000)) return cPhs_ERROR_e; diff --git a/src/d/actor/d_a_shand.cpp b/src/d/actor/d_a_shand.cpp index 98b8247df..0c4153f83 100644 --- a/src/d/actor/d_a_shand.cpp +++ b/src/d/actor/d_a_shand.cpp @@ -87,7 +87,7 @@ static BOOL daShand_solidHeapCB(fopAc_ac_c*) { } /* 00002380-00002630 .text daShand_Create__FP10fopAc_ac_c */ -static s32 daShand_Create(fopAc_ac_c*) { +static cPhs_State daShand_Create(fopAc_ac_c*) { /* Nonmatching */ } diff --git a/src/d/actor/d_a_ship.cpp b/src/d/actor/d_a_ship.cpp index 9efc8f4d2..e0c0e7f6f 100644 --- a/src/d/actor/d_a_ship.cpp +++ b/src/d/actor/d_a_ship.cpp @@ -452,12 +452,12 @@ static BOOL daShip_createHeap(fopAc_ac_c*) { } /* 0000BFD8-0000C790 .text create__8daShip_cFv */ -s32 daShip_c::create() { +cPhs_State daShip_c::create() { /* Nonmatching */ } /* 0000D018-0000D038 .text daShip_Create__FP10fopAc_ac_c */ -static s32 daShip_Create(fopAc_ac_c*) { +static cPhs_State daShip_Create(fopAc_ac_c*) { /* Nonmatching */ } diff --git a/src/d/actor/d_a_shop_item.cpp b/src/d/actor/d_a_shop_item.cpp index 30426d464..39eb18e89 100644 --- a/src/d/actor/d_a_shop_item.cpp +++ b/src/d/actor/d_a_shop_item.cpp @@ -100,14 +100,14 @@ BOOL daShopItem_c::clothCreate() { field_0x644 = (*clothFunc[field_0x648])(shopArc, clothArc, &tevStr, 0); if (field_0x644 == 0) { - return 0; + return FALSE; } } else { field_0x644 = 0; } - return 1; + return TRUE; } /* 000003BC-000005A8 .text set_mtx__12daShopItem_cFv */ @@ -154,7 +154,7 @@ bool daShopItem_c::_execute() { /* 000005F8-00000694 .text _draw__12daShopItem_cFv */ bool daShopItem_c::_draw() { - if(chkDraw() == 0) return 1; + if(!chkDraw()) return true; if(m_itemNo == WATER_STATUE || m_itemNo == POSTMAN_STATUE) { mpModel->getModelData()->getJointTree().getJointNodePointer(0)->setMtxCalc(0); @@ -202,7 +202,7 @@ int daShopItem_c::_create() { } arcName = getShopArcname(); - int result = dComIfG_resLoad(&mPhs, arcName); + cPhs_State result = dComIfG_resLoad(&mPhs, arcName); if(result != cPhs_COMPLEATE_e) { return result; } @@ -249,7 +249,7 @@ static BOOL daShopItem_Delete(void* i_this) { } inst->DeleteBase(inst->getShopArcname()); - return 1; + return TRUE; } /* 00000D2C-00000D50 .text daShopItem_Draw__FPv */ diff --git a/src/d/actor/d_a_shutter.cpp b/src/d/actor/d_a_shutter.cpp index d823202a8..cfa8f92e5 100644 --- a/src/d/actor/d_a_shutter.cpp +++ b/src/d/actor/d_a_shutter.cpp @@ -65,7 +65,7 @@ BOOL daShutter_c::CreateHeap() { } /* 000002B8-000004B4 .text Create__11daShutter_cFv */ -s32 daShutter_c::Create() { +BOOL daShutter_c::Create() { fopAcM_SetMtx(this, mpModel[0]->getBaseTRMtx()); Vec cullMin = m_cull_min[mType]; Vec cullMax = m_cull_max[mType]; @@ -93,14 +93,14 @@ s32 daShutter_c::Create() { if (m_close_ev_name[mType] != NULL) { mCloseEventIdx = dComIfGp_evmng_getEventIdx(m_close_ev_name[mType], 0xff); } - return 1; + return TRUE; } /* 000004B4-000005A0 .text _create__11daShutter_cFv */ -s32 daShutter_c::_create() { +cPhs_State daShutter_c::_create() { fopAcM_SetupActor(this, daShutter_c); mType = daShutter_prm::getType(this); - int result = dComIfG_resLoad(&mPhs, m_arcname[mType]); + cPhs_State result = dComIfG_resLoad(&mPhs, m_arcname[mType]); if (result == cPhs_COMPLEATE_e) { if (!fopAcM_entrySolidHeap(this, CheckCreateHeap, m_heapsize[mType])){ return cPhs_ERROR_e; @@ -278,7 +278,7 @@ bool daShutter_c::_draw() { } /* 00000DD8-00000DF8 .text daShutter_Create__FPv */ -static s32 daShutter_Create(void* i_this) { +static cPhs_State daShutter_Create(void* i_this) { return ((daShutter_c*)i_this)->_create(); } diff --git a/src/d/actor/d_a_shutter2.cpp b/src/d/actor/d_a_shutter2.cpp index eff3c5af6..45097202b 100644 --- a/src/d/actor/d_a_shutter2.cpp +++ b/src/d/actor/d_a_shutter2.cpp @@ -42,7 +42,7 @@ int daShutter2_c::CreateHeap() { } /* 00000194-00000350 .text Create__12daShutter2_cFv */ -int daShutter2_c::Create() { +BOOL daShutter2_c::Create() { fopAcM_SetMtx(this, mpModel->getBaseTRMtx()); Vec cullMin = m_cull_min[mType]; Vec cullMax = m_cull_max[mType]; @@ -69,10 +69,10 @@ int daShutter2_c::Create() { } /* 00000350-0000041C .text _create__12daShutter2_cFv */ -s32 daShutter2_c::_create() { +cPhs_State daShutter2_c::_create() { fopAcM_SetupActor(this, daShutter2_c); mType = 0; - int phase_state = dComIfG_resLoad(&mPhs, m_arcname[mType]); + cPhs_State phase_state = dComIfG_resLoad(&mPhs, m_arcname[mType]); if (phase_state == cPhs_COMPLEATE_e) { phase_state = MoveBGCreate(m_arcname[mType], m_dzbidx[mType], NULL, m_heapsize[mType]); if (phase_state == cPhs_ERROR_e) { @@ -218,7 +218,7 @@ BOOL daShutter2_c::Draw() { } /* 00000950-00000970 .text daShutter2_Create__FPv */ -static s32 daShutter2_Create(void* i_this) { +static cPhs_State daShutter2_Create(void* i_this) { return ((daShutter2_c*)i_this)->_create(); } diff --git a/src/d/actor/d_a_sie_flag.cpp b/src/d/actor/d_a_sie_flag.cpp index 088906cff..a9ef69258 100644 --- a/src/d/actor/d_a_sie_flag.cpp +++ b/src/d/actor/d_a_sie_flag.cpp @@ -32,7 +32,7 @@ void daSie_Flag_c::CreateInit() { } /* 000003D4-00000488 .text _create__12daSie_Flag_cFv */ -s32 daSie_Flag_c::_create() { +cPhs_State daSie_Flag_c::_create() { /* Nonmatching */ } diff --git a/src/d/actor/d_a_sitem.cpp b/src/d/actor/d_a_sitem.cpp index d5d9eb71c..b3e00b9b3 100644 --- a/src/d/actor/d_a_sitem.cpp +++ b/src/d/actor/d_a_sitem.cpp @@ -82,7 +82,7 @@ static BOOL daSitem_solidHeapCB(fopAc_ac_c*) { } /* 00002844-00002C04 .text daSitem_Create__FP10fopAc_ac_c */ -static s32 daSitem_Create(fopAc_ac_c*) { +static cPhs_State daSitem_Create(fopAc_ac_c*) { /* Nonmatching */ } diff --git a/src/d/actor/d_a_sk.cpp b/src/d/actor/d_a_sk.cpp index 9d453ad45..9d9d26273 100644 --- a/src/d/actor/d_a_sk.cpp +++ b/src/d/actor/d_a_sk.cpp @@ -48,7 +48,7 @@ static BOOL useHeapInit(fopAc_ac_c*) { } /* 00000A6C-00000E30 .text daSk_Create__FP10fopAc_ac_c */ -static s32 daSk_Create(fopAc_ac_c*) { +static cPhs_State daSk_Create(fopAc_ac_c*) { /* Nonmatching */ } diff --git a/src/d/actor/d_a_sk2.cpp b/src/d/actor/d_a_sk2.cpp index 5d1f34843..f0eb0d992 100644 --- a/src/d/actor/d_a_sk2.cpp +++ b/src/d/actor/d_a_sk2.cpp @@ -44,7 +44,7 @@ static BOOL useHeapInit(fopAc_ac_c*) { } /* 00000918-00000BC4 .text daSk2_Create__FP10fopAc_ac_c */ -static s32 daSk2_Create(fopAc_ac_c*) { +static cPhs_State daSk2_Create(fopAc_ac_c*) { /* Nonmatching */ } diff --git a/src/d/actor/d_a_spc_item01.cpp b/src/d/actor/d_a_spc_item01.cpp index a3242180b..452d310c7 100644 --- a/src/d/actor/d_a_spc_item01.cpp +++ b/src/d/actor/d_a_spc_item01.cpp @@ -74,14 +74,16 @@ BOOL daSpcItem01_c::_delete() { } /* 8015DBF4-8015DDD0 .text _create__13daSpcItem01_cFv */ -s32 daSpcItem01_c::_create() { +cPhs_State daSpcItem01_c::_create() { fopAcM_SetupActor(this, daSpcItem01_c); + m_itemNo = daSpcItem01_prm::getItemNo(this); if (m_itemNo == dItem_SHIELD_e && dComIfGs_isEventBit(0xE20)) { setLoadError(); return cPhs_ERROR_e; } - int phase_state = dComIfG_resLoad(&mPhs, dItem_data::getFieldArc(m_itemNo)); + + cPhs_State phase_state = dComIfG_resLoad(&mPhs, dItem_data::getFieldArc(m_itemNo)); if (phase_state == cPhs_COMPLEATE_e) { if (!fopAcM_entrySolidHeap(this, &CheckFieldItemCreateHeap, dItem_data::getHeapSize(m_itemNo))) @@ -90,6 +92,7 @@ s32 daSpcItem01_c::_create() { } CreateInit(); } + return phase_state; } @@ -263,7 +266,7 @@ static BOOL daSpcItem01_Delete(daSpcItem01_c* i_this) { } /* 8015E3D0-8015E3F0 .text daSpcItem01_Create__FP10fopAc_ac_c */ -static s32 daSpcItem01_Create(fopAc_ac_c* i_this) { +static cPhs_State daSpcItem01_Create(fopAc_ac_c* i_this) { return ((daSpcItem01_c*)i_this)->_create(); } diff --git a/src/d/actor/d_a_spotbox.cpp b/src/d/actor/d_a_spotbox.cpp index 59362e22b..0bd39f2d7 100644 --- a/src/d/actor/d_a_spotbox.cpp +++ b/src/d/actor/d_a_spotbox.cpp @@ -9,7 +9,7 @@ #include "m_Do/m_Do_mtx.h" #include "d/d_procname.h" -s32 daSpotbox_c::create() { +cPhs_State daSpotbox_c::create() { fopAcM_SetupActor(this, daSpotbox_c); f32 baseScale = getType() != 0 ? 1000.0f : 100.0f; scale.x *= baseScale; @@ -59,7 +59,7 @@ static BOOL daSpotbox_Delete(daSpotbox_c* i_this) { } /* 00000170-00000250 .text daSpotbox_Create__FP10fopAc_ac_c */ -static s32 daSpotbox_Create(fopAc_ac_c* i_this) { +static cPhs_State daSpotbox_Create(fopAc_ac_c* i_this) { daSpotbox_c* a_this = (daSpotbox_c*)i_this; return a_this->create(); } diff --git a/src/d/actor/d_a_ss.cpp b/src/d/actor/d_a_ss.cpp index 93abbd851..f6bec06d2 100644 --- a/src/d/actor/d_a_ss.cpp +++ b/src/d/actor/d_a_ss.cpp @@ -78,7 +78,7 @@ static BOOL useHeapInit(fopAc_ac_c*) { } /* 000030D4-0000339C .text daSs_Create__FP10fopAc_ac_c */ -static s32 daSs_Create(fopAc_ac_c*) { +static cPhs_State daSs_Create(fopAc_ac_c*) { /* Nonmatching */ } diff --git a/src/d/actor/d_a_ssk.cpp b/src/d/actor/d_a_ssk.cpp index f3d9533b6..471f1d2ec 100644 --- a/src/d/actor/d_a_ssk.cpp +++ b/src/d/actor/d_a_ssk.cpp @@ -53,7 +53,7 @@ static BOOL useHeapInit(fopAc_ac_c*) { } /* 00000EB8-00001244 .text daSsk_Create__FP10fopAc_ac_c */ -static s32 daSsk_Create(fopAc_ac_c*) { +static cPhs_State daSsk_Create(fopAc_ac_c*) { /* Nonmatching */ } diff --git a/src/d/actor/d_a_sss.cpp b/src/d/actor/d_a_sss.cpp index 9910c0a49..64f779c61 100644 --- a/src/d/actor/d_a_sss.cpp +++ b/src/d/actor/d_a_sss.cpp @@ -92,7 +92,7 @@ static BOOL daSss_solidHeapCB(fopAc_ac_c*) { } /* 000028C0-00002BB4 .text daSss_Create__FP10fopAc_ac_c */ -static s32 daSss_Create(fopAc_ac_c*) { +static cPhs_State daSss_Create(fopAc_ac_c*) { /* Nonmatching */ } diff --git a/src/d/actor/d_a_st.cpp b/src/d/actor/d_a_st.cpp index 29b453807..34351e76b 100644 --- a/src/d/actor/d_a_st.cpp +++ b/src/d/actor/d_a_st.cpp @@ -197,7 +197,7 @@ static BOOL createHeap(fopAc_ac_c*) { } /* 00008B44-00008F60 .text daSt_Create__FP10fopAc_ac_c */ -static s32 daSt_Create(fopAc_ac_c*) { +static cPhs_State daSt_Create(fopAc_ac_c*) { /* Nonmatching */ } diff --git a/src/d/actor/d_a_steam_tag.cpp b/src/d/actor/d_a_steam_tag.cpp index 62e47ecaa..f4e2d426e 100644 --- a/src/d/actor/d_a_steam_tag.cpp +++ b/src/d/actor/d_a_steam_tag.cpp @@ -199,10 +199,11 @@ daSteamTag_c::~daSteamTag_c() { return; } -s32 daSteamTag_c::create() { - int phase_state; +cPhs_State daSteamTag_c::create() { fopAcM_SetupActor(this, daSteamTag_c); CreateInit(); + + cPhs_State phase_state; if ((strcmp(dComIfGp_getStartStageName(),"Adanmae") == 0) && (current.roomNo == 0) && (checkItemGet(dItem_PEARL_DIN_e, TRUE))) { @@ -210,11 +211,12 @@ s32 daSteamTag_c::create() { } else { phase_state = cPhs_COMPLEATE_e; } + return phase_state; } /* 00000930-00000AD0 .text daSteamTag_Create__FP10fopAc_ac_c */ -static s32 daSteamTag_Create(fopAc_ac_c* i_this) { +static cPhs_State daSteamTag_Create(fopAc_ac_c* i_this) { return ((daSteamTag_c*)i_this)->create(); } diff --git a/src/d/actor/d_a_stone.cpp b/src/d/actor/d_a_stone.cpp index a0f31651c..05bf3ad07 100644 --- a/src/d/actor/d_a_stone.cpp +++ b/src/d/actor/d_a_stone.cpp @@ -22,7 +22,7 @@ void daStone::Act_c::chk_appear() { } /* 0000033C-00000744 .text _create__Q27daStone5Act_cFv */ -s32 daStone::Act_c::_create() { +cPhs_State daStone::Act_c::_create() { /* Nonmatching */ } @@ -212,7 +212,7 @@ bool daStone::Act_c::_draw() { } /* 0000344C-0000346C .text Create__Q27daStone6MethodFPv */ -s32 daStone::Method::Create(void*) { +cPhs_State daStone::Method::Create(void*) { /* Nonmatching */ } diff --git a/src/d/actor/d_a_stone2.cpp b/src/d/actor/d_a_stone2.cpp index a02f18c17..80afefd8c 100644 --- a/src/d/actor/d_a_stone2.cpp +++ b/src/d/actor/d_a_stone2.cpp @@ -42,7 +42,7 @@ void daStone2::Act_c::chk_appear() { } /* 000009F4-00000B3C .text Mthd_Create__Q28daStone25Act_cFv */ -void daStone2::Act_c::Mthd_Create() { +cPhs_State daStone2::Act_c::Mthd_Create() { /* Nonmatching */ } @@ -52,7 +52,7 @@ BOOL daStone2::Act_c::Delete() { } /* 00000B84-00000BEC .text Mthd_Delete__Q28daStone25Act_cFv */ -void daStone2::Act_c::Mthd_Delete() { +BOOL daStone2::Act_c::Mthd_Delete() { /* Nonmatching */ } @@ -244,27 +244,27 @@ BOOL daStone2::Act_c::Draw() { namespace daStone2 { namespace { /* 0000273C-0000275C .text Mthd_Create__Q28daStone224@unnamed@d_a_stone2_cpp@FPv */ -void Mthd_Create(void*) { +cPhs_State Mthd_Create(void*) { /* Nonmatching */ } /* 0000275C-0000277C .text Mthd_Delete__Q28daStone224@unnamed@d_a_stone2_cpp@FPv */ -void Mthd_Delete(void*) { +BOOL Mthd_Delete(void*) { /* Nonmatching */ } /* 0000277C-0000279C .text Mthd_Execute__Q28daStone224@unnamed@d_a_stone2_cpp@FPv */ -void Mthd_Execute(void*) { +BOOL Mthd_Execute(void*) { /* Nonmatching */ } /* 0000279C-000027C8 .text Mthd_Draw__Q28daStone224@unnamed@d_a_stone2_cpp@FPv */ -void Mthd_Draw(void*) { +BOOL Mthd_Draw(void*) { /* Nonmatching */ } /* 000027C8-000027F4 .text Mthd_IsDelete__Q28daStone224@unnamed@d_a_stone2_cpp@FPv */ -void Mthd_IsDelete(void*) { +BOOL Mthd_IsDelete(void*) { /* Nonmatching */ } diff --git a/src/d/actor/d_a_swattack.cpp b/src/d/actor/d_a_swattack.cpp index e46ebd9d7..f668edffb 100644 --- a/src/d/actor/d_a_swattack.cpp +++ b/src/d/actor/d_a_swattack.cpp @@ -57,7 +57,7 @@ void daSwAt_c::CreateInit() { } /* 00000120-0000020C .text _create__8daSwAt_cFv */ -s32 daSwAt_c::_create() { +cPhs_State daSwAt_c::_create() { fopAcM_SetupActor(this, daSwAt_c); CreateInit(); return cPhs_COMPLEATE_e; @@ -127,7 +127,7 @@ bool daSwAt_c::_draw() { } /* 00000564-00000584 .text daSwAt_Create__FPv */ -static s32 daSwAt_Create(void* i_this) { +static cPhs_State daSwAt_Create(void* i_this) { return ((daSwAt_c*)i_this)->_create(); } diff --git a/src/d/actor/d_a_swc00.cpp b/src/d/actor/d_a_swc00.cpp index 207d0049e..b6afa1319 100644 --- a/src/d/actor/d_a_swc00.cpp +++ b/src/d/actor/d_a_swc00.cpp @@ -43,7 +43,7 @@ static BOOL daSwc00_Delete(swc00_class* i_this) { } /* 00000190-00000274 .text daSwc00_Create__FP10fopAc_ac_c */ -static s32 daSwc00_Create(fopAc_ac_c* i_actor) { +static cPhs_State daSwc00_Create(fopAc_ac_c* i_actor) { fopAcM_SetupActor(i_actor, swc00_class); swc00_class* i_this = (swc00_class*)i_actor; diff --git a/src/d/actor/d_a_swhit0.cpp b/src/d/actor/d_a_swhit0.cpp index e8dea9425..50cf82c42 100644 --- a/src/d/actor/d_a_swhit0.cpp +++ b/src/d/actor/d_a_swhit0.cpp @@ -188,7 +188,7 @@ static BOOL CheckCreateHeap(fopAc_ac_c* i_actr) { } /* 00000508-000006C0 .text create__10daSwhit0_cFv */ -s32 daSwhit0_c::create() { +cPhs_State daSwhit0_c::create() { fopAcM_SetupActor(this, daSwhit0_c); shape_angle.z = 0; @@ -465,7 +465,7 @@ static s32 daSwhit0_Delete(daSwhit0_c* i_swhit) { } /* 00001450-00001470 .text daSwhit0_Create__FP10fopAc_ac_c */ -static s32 daSwhit0_Create(fopAc_ac_c* i_swhit) { +static cPhs_State daSwhit0_Create(fopAc_ac_c* i_swhit) { return static_cast(i_swhit)->create(); } diff --git a/src/d/actor/d_a_switem.cpp b/src/d/actor/d_a_switem.cpp index 3b1e0df67..e76ba775e 100644 --- a/src/d/actor/d_a_switem.cpp +++ b/src/d/actor/d_a_switem.cpp @@ -66,7 +66,7 @@ BOOL daSwItem_c::CreateInit() { } /* 00000154-00000250 .text _create__10daSwItem_cFv */ -s32 daSwItem_c::_create() { +cPhs_State daSwItem_c::_create() { fopAcM_SetupActor(this, daSwItem_c); if (!CreateInit()) { @@ -178,7 +178,7 @@ bool daSwItem_c::_draw() { } /* 00000774-00000794 .text daSwItem_Create__FPv */ -static BOOL daSwItem_Create(void* i_this) { +static cPhs_State daSwItem_Create(void* i_this) { return static_cast(i_this)->_create(); } diff --git a/src/d/actor/d_a_swpropeller.cpp b/src/d/actor/d_a_swpropeller.cpp index fc147a438..c89351067 100644 --- a/src/d/actor/d_a_swpropeller.cpp +++ b/src/d/actor/d_a_swpropeller.cpp @@ -33,7 +33,7 @@ static BOOL nodeCallBack(J3DNode*, int) { } /* 00000404-00000590 .text _create__10daSwProp_cFv */ -s32 daSwProp_c::_create() { +cPhs_State daSwProp_c::_create() { /* Nonmatching */ } @@ -53,7 +53,7 @@ bool daSwProp_c::_draw() { } /* 00000C00-00000C20 .text daSwProp_Create__FPv */ -static s32 daSwProp_Create(void*) { +static cPhs_State daSwProp_Create(void*) { /* Nonmatching */ } diff --git a/src/d/actor/d_a_swtact.cpp b/src/d/actor/d_a_swtact.cpp index 73c6b6977..ac83c107e 100644 --- a/src/d/actor/d_a_swtact.cpp +++ b/src/d/actor/d_a_swtact.cpp @@ -69,7 +69,7 @@ void daSwTact_c::set_mtx() { } /* 000002CC-0000038C .text _create__10daSwTact_cFv */ -s32 daSwTact_c::_create() { +cPhs_State daSwTact_c::_create() { fopAcM_SetupActor(this, daSwTact_c); s32 result = cPhs_COMPLEATE_e; @@ -180,7 +180,7 @@ bool daSwTact_c::_draw() { } /* 00000720-00000740 .text daSwTact_Create__FPv */ -static s32 daSwTact_Create(void* i_ac) { +static cPhs_State daSwTact_Create(void* i_ac) { return ((daSwTact_c *)i_ac)->_create(); } diff --git a/src/d/actor/d_a_swtdoor.cpp b/src/d/actor/d_a_swtdoor.cpp index 05b7e2fa7..0b38252f2 100644 --- a/src/d/actor/d_a_swtdoor.cpp +++ b/src/d/actor/d_a_swtdoor.cpp @@ -56,13 +56,13 @@ static BOOL useHeapInit(fopAc_ac_c* i_ac) { } /* 00000260-00000374 .text daSwtdoor_Create__FP10fopAc_ac_c */ -static s32 daSwtdoor_Create(fopAc_ac_c* i_ac) { +static cPhs_State daSwtdoor_Create(fopAc_ac_c* i_ac) { swtdoor_class * i_this; fopAcM_SetupActor(i_ac, swtdoor_class); i_this = (swtdoor_class *)i_ac; - s32 rt = dComIfG_resLoad(&i_this->mPhs, "Swtdoor"); + cPhs_State rt = dComIfG_resLoad(&i_this->mPhs, "Swtdoor"); if (rt == cPhs_ERROR_e) return cPhs_ERROR_e; diff --git a/src/d/actor/d_a_syan.cpp b/src/d/actor/d_a_syan.cpp index c4b86f4f2..487584134 100644 --- a/src/d/actor/d_a_syan.cpp +++ b/src/d/actor/d_a_syan.cpp @@ -205,11 +205,11 @@ static BOOL daSyan_solidHeapCB(fopAc_ac_c* i_ac) { } /* 00000E10-00000FE0 .text daSyan_Create__FP10fopAc_ac_c */ -static s32 daSyan_Create(fopAc_ac_c* i_ac) { +static cPhs_State daSyan_Create(fopAc_ac_c* i_ac) { /* Nonmatching */ fopAcM_SetupActor(i_ac, syan_class); syan_class* i_this = (syan_class*)i_ac; - s32 rt = dComIfG_resLoad(&i_this->mPhs, "Syan"); + cPhs_State rt = dComIfG_resLoad(&i_this->mPhs, "Syan"); if (rt == cPhs_COMPLEATE_e) { if (fopAcM_entrySolidHeap(i_this, daSyan_solidHeapCB, 0x3e40) != 0) { J3DModel* model = i_this->morf->getModel(); diff --git a/src/d/actor/d_a_tag_attention.cpp b/src/d/actor/d_a_tag_attention.cpp index 3a586932d..4b9bcd127 100644 --- a/src/d/actor/d_a_tag_attention.cpp +++ b/src/d/actor/d_a_tag_attention.cpp @@ -7,7 +7,7 @@ #include "d/d_procname.h" /* 00000078-00000188 .text _create__Q214daTagAttention5Act_cFv */ -s32 daTagAttention::Act_c::_create() { +cPhs_State daTagAttention::Act_c::_create() { /* Nonmatching */ } @@ -19,27 +19,27 @@ bool daTagAttention::Act_c::_execute() { namespace daTagAttention { namespace { /* 00000480-000004A0 .text Mthd_Create__Q214daTagAttention31@unnamed@d_a_tag_attention_cpp@FPv */ -void Mthd_Create(void*) { +cPhs_State Mthd_Create(void*) { /* Nonmatching */ } /* 000004A0-000004A8 .text Mthd_Delete__Q214daTagAttention31@unnamed@d_a_tag_attention_cpp@FPv */ -void Mthd_Delete(void*) { +BOOL Mthd_Delete(void*) { /* Nonmatching */ } /* 000004A8-000004C8 .text Mthd_Execute__Q214daTagAttention31@unnamed@d_a_tag_attention_cpp@FPv */ -void Mthd_Execute(void*) { +BOOL Mthd_Execute(void*) { /* Nonmatching */ } /* 000004C8-000004D0 .text Mthd_Draw__Q214daTagAttention31@unnamed@d_a_tag_attention_cpp@FPv */ -void Mthd_Draw(void*) { +BOOL Mthd_Draw(void*) { /* Nonmatching */ } /* 000004D0-000004D8 .text Mthd_IsDelete__Q214daTagAttention31@unnamed@d_a_tag_attention_cpp@FPv */ -void Mthd_IsDelete(void*) { +BOOL Mthd_IsDelete(void*) { /* Nonmatching */ } diff --git a/src/d/actor/d_a_tag_ba1.cpp b/src/d/actor/d_a_tag_ba1.cpp index 10132bc78..22d45f92f 100644 --- a/src/d/actor/d_a_tag_ba1.cpp +++ b/src/d/actor/d_a_tag_ba1.cpp @@ -52,12 +52,12 @@ bool daTag_Ba1_c::_delete() { } /* 00000394-00000454 .text _create__11daTag_Ba1_cFv */ -s32 daTag_Ba1_c::_create() { +cPhs_State daTag_Ba1_c::_create() { /* Nonmatching */ } /* 00000454-00000474 .text daTag_Ba1_Create__FP10fopAc_ac_c */ -static s32 daTag_Ba1_Create(fopAc_ac_c*) { +static cPhs_State daTag_Ba1_Create(fopAc_ac_c*) { /* Nonmatching */ } diff --git a/src/d/actor/d_a_tag_etc.cpp b/src/d/actor/d_a_tag_etc.cpp index 7d23b24f6..220d03582 100644 --- a/src/d/actor/d_a_tag_etc.cpp +++ b/src/d/actor/d_a_tag_etc.cpp @@ -99,7 +99,7 @@ void daTag_Etc_c::demoInitProc() { } /* 00000368-00000458 .text create__11daTag_Etc_cFv */ -s32 daTag_Etc_c::create() { +cPhs_State daTag_Etc_c::create() { float fVar1; u8 stageEVNTListIndex; @@ -238,7 +238,7 @@ static BOOL daTag_Etc_Delete(daTag_Etc_c* i_this) { } /* 00000768-00000788 .text daTag_Etc_Create__FP10fopAc_ac_c */ -static s32 daTag_Etc_Create(fopAc_ac_c* i_this) { +static cPhs_State daTag_Etc_Create(fopAc_ac_c* i_this) { return reinterpret_cast(i_this)->create(); } diff --git a/src/d/actor/d_a_tag_event.cpp b/src/d/actor/d_a_tag_event.cpp index 96e90629d..354830fb7 100644 --- a/src/d/actor/d_a_tag_event.cpp +++ b/src/d/actor/d_a_tag_event.cpp @@ -502,7 +502,7 @@ BOOL daTag_Event_c::execute() { return TRUE; } -s32 daTag_Event_c::create() { +cPhs_State daTag_Event_c::create() { fopAcM_SetupActor(this, daTag_Event_c); int swbit = getSwbit(); @@ -549,7 +549,7 @@ static BOOL daTag_Event_Delete(daTag_Event_c* i_this) { } /* 0000140C-00001524 .text daTag_Event_Create__FP10fopAc_ac_c */ -static s32 daTag_Event_Create(fopAc_ac_c* i_this) { +static cPhs_State daTag_Event_Create(fopAc_ac_c* i_this) { return static_cast(i_this)->create(); } diff --git a/src/d/actor/d_a_tag_evsw.cpp b/src/d/actor/d_a_tag_evsw.cpp index dc136e89c..e3f43366d 100644 --- a/src/d/actor/d_a_tag_evsw.cpp +++ b/src/d/actor/d_a_tag_evsw.cpp @@ -8,7 +8,7 @@ #include "d/d_com_inf_game.h" /* 00000078-000001F8 .text _create__Q29daTagEvsw5Act_cFv */ -s32 daTagEvsw::Act_c::_create() { +cPhs_State daTagEvsw::Act_c::_create() { fopAcM_SetupActor(this, Act_c); if (dComIfGs_isEventBit(prm_get_eventbitID())) { @@ -55,7 +55,7 @@ bool daTagEvsw::Act_c::_draw() { namespace daTagEvsw { namespace { /* 00000484-000004A4 .text Mthd_Create__Q29daTagEvsw26@unnamed@d_a_tag_evsw_cpp@FPv */ -s32 Mthd_Create(void* i_this) { +cPhs_State Mthd_Create(void* i_this) { return static_cast(i_this)->_create(); } diff --git a/src/d/actor/d_a_tag_ghostship.cpp b/src/d/actor/d_a_tag_ghostship.cpp index feaa0665b..ed266bf6c 100644 --- a/src/d/actor/d_a_tag_ghostship.cpp +++ b/src/d/actor/d_a_tag_ghostship.cpp @@ -119,7 +119,7 @@ void daTag_Gship_c::getArg() { } /* 00000594-000005EC .text _create__13daTag_Gship_cFv */ -s32 daTag_Gship_c::_create() { +cPhs_State daTag_Gship_c::_create() { fopAcM_SetupActor(this, daTag_Gship_c); getArg(); diff --git a/src/d/actor/d_a_tag_hint.cpp b/src/d/actor/d_a_tag_hint.cpp index 61f3ec7dd..2a5f29127 100644 --- a/src/d/actor/d_a_tag_hint.cpp +++ b/src/d/actor/d_a_tag_hint.cpp @@ -187,7 +187,7 @@ static BOOL daTag_Hint_Delete(daTag_Hint_c*) { } /* 00002074-00002194 .text daTag_Hint_Create__FP10fopAc_ac_c */ -static s32 daTag_Hint_Create(fopAc_ac_c*) { +static cPhs_State daTag_Hint_Create(fopAc_ac_c*) { /* Nonmatching */ } diff --git a/src/d/actor/d_a_tag_island.cpp b/src/d/actor/d_a_tag_island.cpp index 83d4f0193..d558387c6 100644 --- a/src/d/actor/d_a_tag_island.cpp +++ b/src/d/actor/d_a_tag_island.cpp @@ -446,7 +446,7 @@ BOOL daTag_Island_c::actionWait() { return TRUE; } -s32 daTag_Island_c::create() { +cPhs_State daTag_Island_c::create() { fopAcM_SetupActor(this, daTag_Island_c); s32 swbit = getSwbit(); makeEvId(); @@ -515,7 +515,7 @@ static BOOL daTag_Island_Delete(daTag_Island_c* i_this) { } /* 000012FC-000013D8 .text daTag_Island_Create__FP10fopAc_ac_c */ -static s32 daTag_Island_Create(fopAc_ac_c* i_ac) { +static cPhs_State daTag_Island_Create(fopAc_ac_c* i_ac) { return ((daTag_Island_c*)i_ac)->create(); } diff --git a/src/d/actor/d_a_tag_kb_item.cpp b/src/d/actor/d_a_tag_kb_item.cpp index 75dbdf685..25c7b1cc5 100644 --- a/src/d/actor/d_a_tag_kb_item.cpp +++ b/src/d/actor/d_a_tag_kb_item.cpp @@ -14,7 +14,7 @@ bool daTagKbItem_c::_delete() { dComIfGs_offSwitch(field_0x2a4, home.roomNo); } #endif - return 1; + return true; } /* 000000C8-0000010C .text CreateInit__13daTagKbItem_cFv */ @@ -30,7 +30,7 @@ void daTagKbItem_c::CreateInit() { } /* 0000010C-000001BC .text _create__13daTagKbItem_cFv */ -int daTagKbItem_c::_create() { +cPhs_State daTagKbItem_c::_create() { fopAcM_SetupActor(this, daTagKbItem_c); CreateInit(); @@ -51,37 +51,37 @@ bool daTagKbItem_c::_execute() { fopAcM_delete(this); } #endif - return 1; + return true; } /* 000001C4-000001CC .text _draw__13daTagKbItem_cFv */ bool daTagKbItem_c::_draw() { - return 1; + return true; } /* 000001CC-000001EC .text daTagKbItem_Create__FPv */ -static int daTagKbItem_Create(void* i_this) { +static cPhs_State daTagKbItem_Create(void* i_this) { return static_cast(i_this)->_create(); } /* 000001EC-00000210 .text daTagKbItem_Delete__FPv */ -static int daTagKbItem_Delete(void* i_this) { +static BOOL daTagKbItem_Delete(void* i_this) { return static_cast(i_this)->_delete(); } /* 00000210-00000234 .text daTagKbItem_Draw__FPv */ -static int daTagKbItem_Draw(void* i_this) { +static BOOL daTagKbItem_Draw(void* i_this) { return static_cast(i_this)->_draw(); } /* 00000234-00000258 .text daTagKbItem_Execute__FPv */ -static int daTagKbItem_Execute(void* i_this) { +static BOOL daTagKbItem_Execute(void* i_this) { return static_cast(i_this)->_execute(); } /* 00000258-00000260 .text daTagKbItem_IsDelete__FPv */ -static int daTagKbItem_IsDelete(void* i_this) { - return 1; +static BOOL daTagKbItem_IsDelete(void* i_this) { + return TRUE; } static actor_method_class daTagKbItemMethodTable = { diff --git a/src/d/actor/d_a_tag_kf1.cpp b/src/d/actor/d_a_tag_kf1.cpp index 481ece899..624e405be 100644 --- a/src/d/actor/d_a_tag_kf1.cpp +++ b/src/d/actor/d_a_tag_kf1.cpp @@ -137,12 +137,12 @@ bool daTag_Kf1_c::_delete() { } /* 00000CBC-00000E98 .text _create__11daTag_Kf1_cFv */ -s32 daTag_Kf1_c::_create() { +cPhs_State daTag_Kf1_c::_create() { /* Nonmatching */ } /* 000010C0-000010E0 .text daTag_Kf1_Create__FP10fopAc_ac_c */ -static s32 daTag_Kf1_Create(fopAc_ac_c*) { +static cPhs_State daTag_Kf1_Create(fopAc_ac_c*) { /* Nonmatching */ } diff --git a/src/d/actor/d_a_tag_kk1.cpp b/src/d/actor/d_a_tag_kk1.cpp index a48789848..0bc9bb0bf 100644 --- a/src/d/actor/d_a_tag_kk1.cpp +++ b/src/d/actor/d_a_tag_kk1.cpp @@ -32,12 +32,12 @@ bool daTag_Kk1_c::_delete() { } /* 000002A0-0000046C .text _create__11daTag_Kk1_cFv */ -s32 daTag_Kk1_c::_create() { +cPhs_State daTag_Kk1_c::_create() { /* Nonmatching */ } /* 00000694-000006B4 .text daTag_Kk1_Create__FP10fopAc_ac_c */ -static s32 daTag_Kk1_Create(fopAc_ac_c*) { +static cPhs_State daTag_Kk1_Create(fopAc_ac_c*) { /* Nonmatching */ } diff --git a/src/d/actor/d_a_tag_light.cpp b/src/d/actor/d_a_tag_light.cpp index e298eca1b..9157ddf21 100644 --- a/src/d/actor/d_a_tag_light.cpp +++ b/src/d/actor/d_a_tag_light.cpp @@ -22,7 +22,7 @@ void daTagLight::Act_c::create_heap() { } /* 0000035C-000006F0 .text _create__Q210daTagLight5Act_cFv */ -s32 daTagLight::Act_c::_create() { +cPhs_State daTagLight::Act_c::_create() { /* Nonmatching */ } @@ -99,27 +99,27 @@ bool daTagLight::Act_c::_draw() { namespace daTagLight { namespace { /* 00001EAC-00001ECC .text Mthd_Create__Q210daTagLight27@unnamed@d_a_tag_light_cpp@FPv */ -void Mthd_Create(void*) { +cPhs_State Mthd_Create(void*) { /* Nonmatching */ } /* 00001ECC-00001EF0 .text Mthd_Delete__Q210daTagLight27@unnamed@d_a_tag_light_cpp@FPv */ -void Mthd_Delete(void*) { +BOOL Mthd_Delete(void*) { /* Nonmatching */ } /* 00001EF0-00001F14 .text Mthd_Execute__Q210daTagLight27@unnamed@d_a_tag_light_cpp@FPv */ -void Mthd_Execute(void*) { +BOOL Mthd_Execute(void*) { /* Nonmatching */ } /* 00001F14-00001F38 .text Mthd_Draw__Q210daTagLight27@unnamed@d_a_tag_light_cpp@FPv */ -void Mthd_Draw(void*) { +BOOL Mthd_Draw(void*) { /* Nonmatching */ } /* 00001F38-00001F40 .text Mthd_IsDelete__Q210daTagLight27@unnamed@d_a_tag_light_cpp@FPv */ -void Mthd_IsDelete(void*) { +BOOL Mthd_IsDelete(void*) { /* Nonmatching */ } diff --git a/src/d/actor/d_a_tag_md_cb.cpp b/src/d/actor/d_a_tag_md_cb.cpp index df948b58f..1dc0370e5 100644 --- a/src/d/actor/d_a_tag_md_cb.cpp +++ b/src/d/actor/d_a_tag_md_cb.cpp @@ -12,7 +12,7 @@ daTag_MdCb_HIO_c::daTag_MdCb_HIO_c() { } /* 00000160-000002D0 .text create__12daTag_MdCb_cFv */ -s32 daTag_MdCb_c::create() { +cPhs_State daTag_MdCb_c::create() { /* Nonmatching */ } @@ -177,7 +177,7 @@ static BOOL daTag_MdCb_Delete(daTag_MdCb_c*) { } /* 00001990-000019B0 .text daTag_MdCb_Create__FP10fopAc_ac_c */ -static s32 daTag_MdCb_Create(fopAc_ac_c*) { +static cPhs_State daTag_MdCb_Create(fopAc_ac_c*) { /* Nonmatching */ } diff --git a/src/d/actor/d_a_tag_mk.cpp b/src/d/actor/d_a_tag_mk.cpp index 4ba17e0f0..608036b06 100644 --- a/src/d/actor/d_a_tag_mk.cpp +++ b/src/d/actor/d_a_tag_mk.cpp @@ -177,12 +177,12 @@ static BOOL daTag_Mk_Delete(daTag_Mk_c*) { } /* 00000F00-00000F20 .text daTag_Mk_Create__FP10fopAc_ac_c */ -static s32 daTag_Mk_Create(fopAc_ac_c*) { +static cPhs_State daTag_Mk_Create(fopAc_ac_c*) { /* Nonmatching */ } /* 00000F20-000011E4 .text create__10daTag_Mk_cFv */ -s32 daTag_Mk_c::create() { +cPhs_State daTag_Mk_c::create() { /* Nonmatching */ } diff --git a/src/d/actor/d_a_tag_msg.cpp b/src/d/actor/d_a_tag_msg.cpp index a60af66d2..48a9427e0 100644 --- a/src/d/actor/d_a_tag_msg.cpp +++ b/src/d/actor/d_a_tag_msg.cpp @@ -233,7 +233,7 @@ BOOL daTag_Msg_c::execute() { return TRUE; } -s32 daTag_Msg_c::create() { +cPhs_State daTag_Msg_c::create() { int swBit; fopAcM_SetupActor(this, daTag_Msg_c); swBit = (int)(getSwbit() & 0xFF); @@ -273,7 +273,7 @@ static BOOL daTag_Msg_Delete(daTag_Msg_c* a_this) { } /* 00000834-00000964 .text daTag_Msg_Create__FP10fopAc_ac_c */ -static s32 daTag_Msg_Create(fopAc_ac_c* i_this) { +static cPhs_State daTag_Msg_Create(fopAc_ac_c* i_this) { daTag_Msg_c* a_this = (daTag_Msg_c*)i_this; return a_this->create(); } diff --git a/src/d/actor/d_a_tag_photo.cpp b/src/d/actor/d_a_tag_photo.cpp index 6c17bec4b..2beef597d 100644 --- a/src/d/actor/d_a_tag_photo.cpp +++ b/src/d/actor/d_a_tag_photo.cpp @@ -27,7 +27,7 @@ void phase_2(daTagPhoto_c*) { } /* 00000198-000001C8 .text _create__12daTagPhoto_cFv */ -s32 daTagPhoto_c::_create() { +cPhs_State daTagPhoto_c::_create() { /* Nonmatching */ } diff --git a/src/d/actor/d_a_tag_ret.cpp b/src/d/actor/d_a_tag_ret.cpp index 1c4bff216..70037b191 100644 --- a/src/d/actor/d_a_tag_ret.cpp +++ b/src/d/actor/d_a_tag_ret.cpp @@ -43,7 +43,7 @@ static dCcD_SrcCyl cyl_check_src = { namespace daTagRet { /* 00000078-000001D4 .text _create__Q28daTagRet5Act_cFv */ - s32 Act_c::_create() { + cPhs_State Act_c::_create() { fopAcM_SetupActor(this, daTagRet::Act_c); if (checkItemGet(dItem_PEARL_FARORE_e, TRUE)) { @@ -93,7 +93,7 @@ namespace daTagRet { namespace { /* 00000468-00000488 .text Mthd_Create__Q28daTagRet25@unnamed@d_a_tag_ret_cpp@FPv */ - s32 Mthd_Create(void* i_this) { + cPhs_State Mthd_Create(void* i_this) { return ((Act_c*)i_this)->_create(); } diff --git a/src/d/actor/d_a_tag_so.cpp b/src/d/actor/d_a_tag_so.cpp index d7b91f7ca..5119aac0f 100644 --- a/src/d/actor/d_a_tag_so.cpp +++ b/src/d/actor/d_a_tag_so.cpp @@ -56,7 +56,7 @@ void daTag_So_c::getArg() { } /* 00000224-0000027C .text _create__10daTag_So_cFv */ -s32 daTag_So_c::_create() { +cPhs_State daTag_So_c::_create() { fopAcM_SetupActor(this, daTag_So_c); getArg(); return cPhs_COMPLEATE_e; diff --git a/src/d/actor/d_a_tag_volcano.cpp b/src/d/actor/d_a_tag_volcano.cpp index b12e0cb6d..70be1cccb 100644 --- a/src/d/actor/d_a_tag_volcano.cpp +++ b/src/d/actor/d_a_tag_volcano.cpp @@ -22,7 +22,7 @@ namespace daTagvolcano { } /* 00000078-000002B4 .text _create__Q212daTagvolcano5Act_cFv */ -s32 daTagvolcano::Act_c::_create() { +cPhs_State daTagvolcano::Act_c::_create() { fopAcM_SetupActor(this, Act_c); field_0x298 = 0; @@ -186,7 +186,7 @@ bool daTagvolcano::Act_c::_draw() { namespace daTagvolcano { namespace { - s32 Mthd_Create(void* i_this) { + cPhs_State Mthd_Create(void* i_this) { return ((Act_c*)i_this)->_create(); } diff --git a/src/d/actor/d_a_tag_waterlevel.cpp b/src/d/actor/d_a_tag_waterlevel.cpp index 5250a00f4..2acb787aa 100644 --- a/src/d/actor/d_a_tag_waterlevel.cpp +++ b/src/d/actor/d_a_tag_waterlevel.cpp @@ -4,7 +4,6 @@ // #include "d/actor/d_a_tag_waterlevel.h" -#include "d/d_a_obj.h" #include "d/d_com_inf_game.h" #include "d/d_kankyo.h" #include "d/d_procname.h" @@ -27,7 +26,7 @@ namespace daTagWaterlevel { } /* 00000078-000001D4 .text _create__Q28daTagRet5Act_cFv */ - s32 Act_c::_create() { + cPhs_State Act_c::_create() { fopAcM_SetupActor(this, Act_c); if ((prm_get_sch() & dKy_get_schbit() & 0xFF)) { @@ -113,7 +112,7 @@ namespace daTagWaterlevel { } namespace { - s32 Mthd_Create(void* i_this) { + cPhs_State Mthd_Create(void* i_this) { return ((Act_c*)i_this)->_create(); } diff --git a/src/d/actor/d_a_tama.cpp b/src/d/actor/d_a_tama.cpp index 8c8b13b6d..3e0598818 100644 --- a/src/d/actor/d_a_tama.cpp +++ b/src/d/actor/d_a_tama.cpp @@ -104,8 +104,8 @@ BOOL daTama_c::_delete() { } /* 000002DC-00000410 .text _create__8daTama_cFv */ -s32 daTama_c::_create() { - s32 rt = cPhs_COMPLEATE_e; +cPhs_State daTama_c::_create() { + cPhs_State rt = cPhs_COMPLEATE_e; fopAcM_SetupActor(this, daTama_c); if (!createInit()) rt = cPhs_ERROR_e; @@ -113,7 +113,7 @@ s32 daTama_c::_create() { } /* 00000638-00000658 .text daTama_Create__FP10fopAc_ac_c */ -static s32 daTama_Create(fopAc_ac_c* i_this) { +static cPhs_State daTama_Create(fopAc_ac_c* i_this) { return ((daTama_c*)i_this)->_create(); } diff --git a/src/d/actor/d_a_tbox.cpp b/src/d/actor/d_a_tbox.cpp index 5058b0410..c0ab59d69 100644 --- a/src/d/actor/d_a_tbox.cpp +++ b/src/d/actor/d_a_tbox.cpp @@ -1240,7 +1240,7 @@ static s32 daTbox_Delete(daTbox_c* i_tbox) { } /* 00003070-0000315C .text daTbox_Create__FP10fopAc_ac_c */ -static s32 daTbox_Create(fopAc_ac_c* i_actor) { +static cPhs_State daTbox_Create(fopAc_ac_c* i_actor) { static const u32 heapsize_tbl[] = { 0x2E40, 0x2D7C, diff --git a/src/d/actor/d_a_title.cpp b/src/d/actor/d_a_title.cpp index 0f1fa2098..ed57112e5 100644 --- a/src/d/actor/d_a_title.cpp +++ b/src/d/actor/d_a_title.cpp @@ -473,7 +473,7 @@ daTitle_c::~daTitle_c() { dComIfG_resDelete(&mPhs, ARCNAME); } -s32 daTitle_c::create() { +cPhs_State daTitle_c::create() { fopAcM_SetupActor(this, daTitle_c); #if VERSION == VERSION_PAL @@ -481,7 +481,7 @@ s32 daTitle_c::create() { sprintf(ARCNAME, "TlogoE%d\0", dComIfGs_getPalLanguage()); #endif - s32 phase_state = dComIfG_resLoad(&mPhs, ARCNAME); + cPhs_State phase_state = dComIfG_resLoad(&mPhs, ARCNAME); if (phase_state == cPhs_COMPLEATE_e) { mpTitleProc = new daTitle_proc_c(); @@ -563,7 +563,7 @@ static BOOL daTitle_Delete(daTitle_c* i_this) { } /* 00001D70-00001E28 .text daTitle_Create__FP10fopAc_ac_c */ -static s32 daTitle_Create(fopAc_ac_c* i_this) { +static cPhs_State daTitle_Create(fopAc_ac_c* i_this) { return static_cast(i_this)->create(); } diff --git a/src/d/actor/d_a_tn.cpp b/src/d/actor/d_a_tn.cpp index c6348d0d7..f581f8fdc 100644 --- a/src/d/actor/d_a_tn.cpp +++ b/src/d/actor/d_a_tn.cpp @@ -303,7 +303,7 @@ static BOOL useHeapInit(fopAc_ac_c*) { } /* 0000C4E0-0000CBFC .text daTn_Create__FP10fopAc_ac_c */ -static s32 daTn_Create(fopAc_ac_c*) { +static cPhs_State daTn_Create(fopAc_ac_c*) { /* Nonmatching */ } diff --git a/src/d/actor/d_a_toge.cpp b/src/d/actor/d_a_toge.cpp index 6a71b975a..7c7abb885 100644 --- a/src/d/actor/d_a_toge.cpp +++ b/src/d/actor/d_a_toge.cpp @@ -147,10 +147,10 @@ BOOL daToge_c::Create() { } /* 000004F4-00000620 .text _create__8daToge_cFv */ -s32 daToge_c::_create() { +cPhs_State daToge_c::_create() { fopAcM_SetupActor(this, daToge_c); - s32 phase_state = dComIfG_resLoad(&m_Phs, m_arcname); + cPhs_State phase_state = dComIfG_resLoad(&m_Phs, m_arcname); if (phase_state == cPhs_COMPLEATE_e) { if (!fopAcM_entrySolidHeap(this, CheckCreateHeap, 0x1400)) { @@ -297,7 +297,7 @@ BOOL daToge_c::_draw() { } /* 00000D44-00000D64 .text daToge_Create__FPv */ -static BOOL daToge_Create(void* i_this) { +static cPhs_State daToge_Create(void* i_this) { return static_cast(i_this)->_create(); } diff --git a/src/d/actor/d_a_tori_flag.cpp b/src/d/actor/d_a_tori_flag.cpp index 841cc1287..f44aa481e 100644 --- a/src/d/actor/d_a_tori_flag.cpp +++ b/src/d/actor/d_a_tori_flag.cpp @@ -110,9 +110,9 @@ s32 daTori_Flag_c::CreateInit() { } /* 000003C4-00000478 .text _create__13daTori_Flag_cFv */ -s32 daTori_Flag_c::_create() { +cPhs_State daTori_Flag_c::_create() { fopAcM_SetupActor(this, daTori_Flag_c); - int result = dComIfG_resLoad(&mPhsTrflag, M_arcname); + cPhs_State result = dComIfG_resLoad(&mPhsTrflag, M_arcname); if (result != cPhs_COMPLEATE_e) { return result; } diff --git a/src/d/actor/d_a_tornado.cpp b/src/d/actor/d_a_tornado.cpp index c9a8854ad..7f2e0d2a1 100644 --- a/src/d/actor/d_a_tornado.cpp +++ b/src/d/actor/d_a_tornado.cpp @@ -290,12 +290,12 @@ static BOOL daTornado_createHeap(fopAc_ac_c* i_this) { } /* 000010BC-000014D0 .text create__11daTornado_cFv */ -s32 daTornado_c::create() { +cPhs_State daTornado_c::create() { static cXyz small_scale(0.25f, 0.175f, 0.25f); static cXyz under_small_scale(0.251f, 0.25f, 0.251f); static cXyz under_scale(1.01f, 1.0f, 1.01f); - s32 rt = dComIfG_resLoad(&mPhs, l_arcName); + cPhs_State rt = dComIfG_resLoad(&mPhs, l_arcName); fopAcM_SetupActor(this, daTornado_c); if (rt == cPhs_COMPLEATE_e) { @@ -338,7 +338,7 @@ s32 daTornado_c::create() { } /* 0000162C-0000164C .text daTornado_Create__FP10fopAc_ac_c */ -static s32 daTornado_Create(fopAc_ac_c* i_this) { +static cPhs_State daTornado_Create(fopAc_ac_c* i_this) { return ((daTornado_c*)i_this)->create(); } diff --git a/src/d/actor/d_a_tpota.cpp b/src/d/actor/d_a_tpota.cpp index 9e9cbcb0d..b4f97b125 100644 --- a/src/d/actor/d_a_tpota.cpp +++ b/src/d/actor/d_a_tpota.cpp @@ -7,7 +7,7 @@ #include "d/d_procname.h" /* 00000078-000001D0 .text _create__9daTpota_cFv */ -s32 daTpota_c::_create() { +cPhs_State daTpota_c::_create() { /* Nonmatching */ } @@ -48,27 +48,27 @@ bool daTpota_c::_draw() { namespace { /* 000004D0-000004F0 .text Mthd_Create__23@unnamed@d_a_tpota_cpp@FPv */ -void Mthd_Create(void*) { +cPhs_State Mthd_Create(void*) { /* Nonmatching */ } /* 000004F0-00000514 .text Mthd_Delete__23@unnamed@d_a_tpota_cpp@FPv */ -void Mthd_Delete(void*) { +BOOL Mthd_Delete(void*) { /* Nonmatching */ } /* 00000514-00000538 .text Mthd_Execute__23@unnamed@d_a_tpota_cpp@FPv */ -void Mthd_Execute(void*) { +BOOL Mthd_Execute(void*) { /* Nonmatching */ } /* 00000538-0000055C .text Mthd_Draw__23@unnamed@d_a_tpota_cpp@FPv */ -void Mthd_Draw(void*) { +BOOL Mthd_Draw(void*) { /* Nonmatching */ } /* 0000055C-00000564 .text Mthd_IsDelete__23@unnamed@d_a_tpota_cpp@FPv */ -void Mthd_IsDelete(void*) { +BOOL Mthd_IsDelete(void*) { /* Nonmatching */ } diff --git a/src/d/actor/d_a_tsubo.cpp b/src/d/actor/d_a_tsubo.cpp index a6c9eb4e1..a1545cb55 100644 --- a/src/d/actor/d_a_tsubo.cpp +++ b/src/d/actor/d_a_tsubo.cpp @@ -37,7 +37,7 @@ void daTsubo::Act_c::create_init_bgc() { } /* 00000694-00000B10 .text _create__Q27daTsubo5Act_cFv */ -s32 daTsubo::Act_c::_create() { +cPhs_State daTsubo::Act_c::_create() { /* Nonmatching */ } @@ -587,7 +587,7 @@ bool daTsubo::Act_c::_draw() { } /* 00007D2C-00007D4C .text Create__Q27daTsubo6MethodFPv */ -s32 daTsubo::Method::Create(void*) { +cPhs_State daTsubo::Method::Create(void*) { /* Nonmatching */ } diff --git a/src/d/actor/d_a_vrbox.cpp b/src/d/actor/d_a_vrbox.cpp index 807070f04..e0ee05337 100644 --- a/src/d/actor/d_a_vrbox.cpp +++ b/src/d/actor/d_a_vrbox.cpp @@ -177,13 +177,13 @@ static BOOL daVrbox_solidHeapCB(fopAc_ac_c* i_actor) { } /* 8015E968-8015EA14 .text daVrbox_Create__FP10fopAc_ac_c */ -static s32 daVrbox_Create(fopAc_ac_c* i_actor) { +static cPhs_State daVrbox_Create(fopAc_ac_c* i_actor) { fopAcM_SetupActor(i_actor, vrbox_class); vrbox_class* i_this = static_cast(i_actor); i_this->m29C = 0; - s32 phase_state = cPhs_COMPLEATE_e; + cPhs_State phase_state = cPhs_COMPLEATE_e; if (fopAcM_entrySolidHeap(i_this, daVrbox_solidHeapCB, 0xC60)) { dComIfGp_onStatus(1); g_env_light.mbVrboxInvisible = 0; diff --git a/src/d/actor/d_a_vrbox2.cpp b/src/d/actor/d_a_vrbox2.cpp index 868c18b94..17bf15da0 100644 --- a/src/d/actor/d_a_vrbox2.cpp +++ b/src/d/actor/d_a_vrbox2.cpp @@ -274,11 +274,11 @@ static BOOL daVrbox2_solidHeapCB(fopAc_ac_c* i_actor) { } /* 8015F4D4-8015F550 .text daVrbox2_Create__FP10fopAc_ac_c */ -static s32 daVrbox2_Create(fopAc_ac_c* i_actor) { +static cPhs_State daVrbox2_Create(fopAc_ac_c* i_actor) { fopAcM_SetupActor(i_actor, vrbox2_class); vrbox2_class* i_this = static_cast(i_actor); - s32 phase_state = cPhs_COMPLEATE_e; + cPhs_State phase_state = cPhs_COMPLEATE_e; if (!fopAcM_entrySolidHeap(i_this, daVrbox2_solidHeapCB, 0x21a0)) phase_state = cPhs_ERROR_e; diff --git a/src/d/actor/d_a_wall.cpp b/src/d/actor/d_a_wall.cpp index 0f729d281..43931c43d 100644 --- a/src/d/actor/d_a_wall.cpp +++ b/src/d/actor/d_a_wall.cpp @@ -137,7 +137,7 @@ void daWall_c::CreateInit() { } /* 00000380-000004EC .text _create__8daWall_cFv */ -s32 daWall_c::_create() { +cPhs_State daWall_c::_create() { fopAcM_SetupActor(this, daWall_c); mType = fopAcM_GetParam(this) >> 8; mSwitchNo = fopAcM_GetParam(this) & 0xFF; @@ -146,7 +146,7 @@ s32 daWall_c::_create() { return cPhs_ERROR_e; } - s32 phase_state = dComIfG_resLoad(&mPhs, m_arcname[mType]); + cPhs_State phase_state = dComIfG_resLoad(&mPhs, m_arcname[mType]); if (phase_state == cPhs_COMPLEATE_e) { if (!fopAcM_entrySolidHeap(this, CheckCreateHeap, m_heapsize[mType])) { @@ -183,7 +183,7 @@ bool daWall_c::_execute() { }; (this->*mode_proc[mState])(); - return 1; + return true; } /* 00000980-00000A58 .text mode_wait__8daWall_cFv */ @@ -319,7 +319,7 @@ bool daWall_c::_draw() { } /* 00001044-00001064 .text daWall_Create__FPv */ -static s32 daWall_Create(void* i_this) { +static cPhs_State daWall_Create(void* i_this) { return ((daWall_c*)i_this)->_create(); } diff --git a/src/d/actor/d_a_warpdm20.cpp b/src/d/actor/d_a_warpdm20.cpp index b46e4d2a0..4c3352c19 100644 --- a/src/d/actor/d_a_warpdm20.cpp +++ b/src/d/actor/d_a_warpdm20.cpp @@ -27,7 +27,7 @@ void daWarpdm20_c::CreateInit() { } /* 000005C8-000006A0 .text _create__12daWarpdm20_cFv */ -s32 daWarpdm20_c::_create() { +cPhs_State daWarpdm20_c::_create() { /* Nonmatching */ } @@ -167,7 +167,7 @@ bool daWarpdm20_c::_draw() { } /* 000017C0-000017E0 .text daWarpdm20_Create__FPv */ -static s32 daWarpdm20_Create(void*) { +static cPhs_State daWarpdm20_Create(void*) { /* Nonmatching */ } diff --git a/src/d/actor/d_a_warpf.cpp b/src/d/actor/d_a_warpf.cpp index 1c74c36b1..87f9ccaa8 100644 --- a/src/d/actor/d_a_warpf.cpp +++ b/src/d/actor/d_a_warpf.cpp @@ -37,7 +37,7 @@ void daWarpf_c::CreateInit() { } /* 00000CFC-00000E74 .text _create__9daWarpf_cFv */ -s32 daWarpf_c::_create() { +cPhs_State daWarpf_c::_create() { /* Nonmatching */ } @@ -177,7 +177,7 @@ bool daWarpf_c::_draw() { } /* 00002340-00002360 .text daWarpf_Create__FPv */ -static s32 daWarpf_Create(void*) { +static cPhs_State daWarpf_Create(void*) { /* Nonmatching */ } diff --git a/src/d/actor/d_a_warpfout.cpp b/src/d/actor/d_a_warpfout.cpp index ddcd2e708..756e5af10 100644 --- a/src/d/actor/d_a_warpfout.cpp +++ b/src/d/actor/d_a_warpfout.cpp @@ -35,7 +35,7 @@ void daWarpfout_c::CreateInit() { } /* 0000008C-000000E4 .text _create__12daWarpfout_cFv */ -s32 daWarpfout_c::_create() { +cPhs_State daWarpfout_c::_create() { fopAcM_SetupActor(this, daWarpfout_c); CreateInit(); @@ -179,7 +179,7 @@ csXyz daWarpfout_c::get_effect_angle() { } /* 00000670-00000690 .text daWarpfout_Create__FPv */ -static s32 daWarpfout_Create(void* i) { +static cPhs_State daWarpfout_Create(void* i) { daWarpfout_c* i_this = static_cast(i); return i_this->_create(); diff --git a/src/d/actor/d_a_warpgn.cpp b/src/d/actor/d_a_warpgn.cpp index 42c861a0c..61aa68c12 100644 --- a/src/d/actor/d_a_warpgn.cpp +++ b/src/d/actor/d_a_warpgn.cpp @@ -27,7 +27,7 @@ void daWarpgn_c::CreateInit() { } /* 000007D0-000008F4 .text _create__10daWarpgn_cFv */ -s32 daWarpgn_c::_create() { +cPhs_State daWarpgn_c::_create() { /* Nonmatching */ } @@ -152,7 +152,7 @@ bool daWarpgn_c::_draw() { } /* 000018D4-000018F4 .text daWarpgn_Create__FPv */ -static s32 daWarpgn_Create(void*) { +static cPhs_State daWarpgn_Create(void*) { /* Nonmatching */ } diff --git a/src/d/actor/d_a_warphr.cpp b/src/d/actor/d_a_warphr.cpp index b5b3530cb..1d8d82f13 100644 --- a/src/d/actor/d_a_warphr.cpp +++ b/src/d/actor/d_a_warphr.cpp @@ -27,7 +27,7 @@ void daWarphr_c::CreateInit() { } /* 000006BC-00000768 .text _create__10daWarphr_cFv */ -s32 daWarphr_c::_create() { +cPhs_State daWarphr_c::_create() { /* Nonmatching */ } @@ -142,7 +142,7 @@ bool daWarphr_c::_draw() { } /* 000016E0-00001700 .text daWarphr_Create__FPv */ -static s32 daWarphr_Create(void*) { +static cPhs_State daWarphr_Create(void*) { /* Nonmatching */ } diff --git a/src/d/actor/d_a_warpls.cpp b/src/d/actor/d_a_warpls.cpp index 9fa00e7e3..340267797 100644 --- a/src/d/actor/d_a_warpls.cpp +++ b/src/d/actor/d_a_warpls.cpp @@ -27,7 +27,7 @@ void daWarpls_c::CreateInit() { } /* 00000764-0000082C .text _create__10daWarpls_cFv */ -s32 daWarpls_c::_create() { +cPhs_State daWarpls_c::_create() { /* Nonmatching */ } @@ -77,7 +77,7 @@ void daWarpls_c::warp_eff_start() { } /* 000010C8-000010E8 .text daWarpls_Create__FPv */ -static s32 daWarpls_Create(void*) { +static cPhs_State daWarpls_Create(void*) { /* Nonmatching */ } diff --git a/src/d/actor/d_a_warpmj.cpp b/src/d/actor/d_a_warpmj.cpp index a5d526c3c..e42136fbf 100644 --- a/src/d/actor/d_a_warpmj.cpp +++ b/src/d/actor/d_a_warpmj.cpp @@ -27,7 +27,7 @@ void daWarpmj_c::CreateInit() { } /* 00000630-00000778 .text _create__10daWarpmj_cFv */ -s32 daWarpmj_c::_create() { +cPhs_State daWarpmj_c::_create() { /* Nonmatching */ } @@ -122,7 +122,7 @@ bool daWarpmj_c::_draw() { } /* 0000114C-0000116C .text daWarpmj_Create__FPv */ -static s32 daWarpmj_Create(void*) { +static cPhs_State daWarpmj_Create(void*) { /* Nonmatching */ } diff --git a/src/d/actor/d_a_waterfall.cpp b/src/d/actor/d_a_waterfall.cpp index 6a62fe53f..9eed1843b 100644 --- a/src/d/actor/d_a_waterfall.cpp +++ b/src/d/actor/d_a_waterfall.cpp @@ -27,7 +27,7 @@ void daWfall_c::CreateInit() { } /* 00000708-00000838 .text _create__9daWfall_cFv */ -s32 daWfall_c::_create() { +cPhs_State daWfall_c::_create() { /* Nonmatching */ } @@ -102,7 +102,7 @@ void daWfall_c::set_se() { } /* 000013E0-00001400 .text daWfall_Create__FPv */ -static s32 daWfall_Create(void*) { +static cPhs_State daWfall_Create(void*) { /* Nonmatching */ } diff --git a/src/d/actor/d_a_wbird.cpp b/src/d/actor/d_a_wbird.cpp index 126cbb973..a9e09dc58 100644 --- a/src/d/actor/d_a_wbird.cpp +++ b/src/d/actor/d_a_wbird.cpp @@ -22,7 +22,7 @@ void daWbird_c::CreateInit() { } /* 00000388-000003E0 .text create__9daWbird_cFv */ -s32 daWbird_c::create() { +cPhs_State daWbird_c::create() { /* Nonmatching */ } @@ -67,7 +67,7 @@ static BOOL daWbird_Delete(daWbird_c*) { } /* 00000908-00000928 .text daWbird_Create__FP10fopAc_ac_c */ -static s32 daWbird_Create(fopAc_ac_c*) { +static cPhs_State daWbird_Create(fopAc_ac_c*) { /* Nonmatching */ } diff --git a/src/d/actor/d_a_wind_tag.cpp b/src/d/actor/d_a_wind_tag.cpp index 7a203b8de..acd739de7 100644 --- a/src/d/actor/d_a_wind_tag.cpp +++ b/src/d/actor/d_a_wind_tag.cpp @@ -184,10 +184,10 @@ void daWindTag::daWindTag_c::set_wind_angle() { } /* 000008D4-0000099C .text _create__Q29daWindTag11daWindTag_cFv */ -s32 daWindTag::daWindTag_c::_create() { +cPhs_State daWindTag::daWindTag_c::_create() { fopAcM_SetupActor(this, daWindTag_c); mType = (fopAcM_GetParam(this) >> 21) & 0x03; - s32 rt = dComIfG_resLoad(&mPhs, m_arcname[mType]); + cPhs_State rt = dComIfG_resLoad(&mPhs, m_arcname[mType]); if (rt == cPhs_COMPLEATE_e) { if (!fopAcM_entrySolidHeap(this, CheckCreateHeap, m_heapsize[mType])) return cPhs_ERROR_e; @@ -326,7 +326,7 @@ void daWindTag::daWindTag_c::MoveEmitter() { } /* 00001B00-00001B20 .text daWindTag_Create__FPv */ -static s32 daWindTag_Create(void* i_ac) { +static cPhs_State daWindTag_Create(void* i_ac) { return ((daWindTag::daWindTag_c*)i_ac)->_create(); } diff --git a/src/d/actor/d_a_windmill.cpp b/src/d/actor/d_a_windmill.cpp index 0e1cb4048..976385af3 100644 --- a/src/d/actor/d_a_windmill.cpp +++ b/src/d/actor/d_a_windmill.cpp @@ -48,7 +48,7 @@ void daWindMill_c::search_wind() { } /* 00000670-00000804 .text _create__12daWindMill_cFv */ -s32 daWindMill_c::_create() { +cPhs_State daWindMill_c::_create() { /* Nonmatching */ } @@ -83,7 +83,7 @@ bool daWindMill_c::_draw() { } /* 000017A4-000017C4 .text daWindMill_Create__FPv */ -static s32 daWindMill_Create(void* i_ac) { +static cPhs_State daWindMill_Create(void* i_ac) { return ((daWindMill_c*)i_ac)->_create(); } diff --git a/src/d/actor/d_a_wz.cpp b/src/d/actor/d_a_wz.cpp index f2daf7e66..a4e54a0fd 100644 --- a/src/d/actor/d_a_wz.cpp +++ b/src/d/actor/d_a_wz.cpp @@ -138,7 +138,7 @@ static BOOL useHeapInit2(fopAc_ac_c*) { } /* 00006888-000071C4 .text daWZ_Create__FP10fopAc_ac_c */ -static s32 daWZ_Create(fopAc_ac_c*) { +static cPhs_State daWZ_Create(fopAc_ac_c*) { /* Nonmatching */ } diff --git a/src/d/actor/d_a_ygcwp.cpp b/src/d/actor/d_a_ygcwp.cpp index ca00d08ec..dfa22b78c 100644 --- a/src/d/actor/d_a_ygcwp.cpp +++ b/src/d/actor/d_a_ygcwp.cpp @@ -76,9 +76,9 @@ BOOL daYgcwp_c::create_heap() { } /* 0000023C-000003A0 .text _create__9daYgcwp_cFv */ -s32 daYgcwp_c::_create() { +cPhs_State daYgcwp_c::_create() { fopAcM_SetupActor(this, daYgcwp_c); - s32 rt = dComIfG_resLoad(&mPhs, M_arcname); + cPhs_State rt = dComIfG_resLoad(&mPhs, M_arcname); if (rt == cPhs_COMPLEATE_e) { rt = cPhs_ERROR_e; if (fopAcM_entrySolidHeap(this, solidHeapCB, 0)) { @@ -202,7 +202,7 @@ bool daYgcwp_c::_draw() { namespace { /* 000008DC-000008FC .text Mthd_Create__23@unnamed@d_a_ygcwp_cpp@FPv */ -s32 Mthd_Create(void* i_ac) { +cPhs_State Mthd_Create(void* i_ac) { return ((daYgcwp_c*)i_ac)->_create(); } diff --git a/src/d/actor/d_a_ykgr.cpp b/src/d/actor/d_a_ykgr.cpp index 4503a5f5b..3836f3d3c 100644 --- a/src/d/actor/d_a_ykgr.cpp +++ b/src/d/actor/d_a_ykgr.cpp @@ -27,7 +27,7 @@ static s32 daYkgrCreate(void*) { } /* 00000428-00000680 .text _create__8daYkgr_cFv */ -s32 daYkgr_c::_create() { +cPhs_State daYkgr_c::_create() { /* Nonmatching */ } diff --git a/src/d/actor/d_a_yougan.cpp b/src/d/actor/d_a_yougan.cpp index 4e90e82e2..ed84dbf5c 100644 --- a/src/d/actor/d_a_yougan.cpp +++ b/src/d/actor/d_a_yougan.cpp @@ -62,7 +62,7 @@ static BOOL daYougan_solidHeapCB(fopAc_ac_c*) { } /* 000008A4-000008C4 .text daYougan_Create__FP10fopAc_ac_c */ -static s32 daYougan_Create(fopAc_ac_c*) { +static cPhs_State daYougan_Create(fopAc_ac_c*) { /* Nonmatching */ } diff --git a/src/d/d_auction_screen.cpp b/src/d/d_auction_screen.cpp index 2f91af008..39de94fa5 100644 --- a/src/d/d_auction_screen.cpp +++ b/src/d/d_auction_screen.cpp @@ -117,27 +117,27 @@ void dAs_c::_delete() { } /* 80160C7C-80160C9C .text dAs_Draw__FP5dAs_c */ -static void dAs_Draw(dAs_c*) { +static BOOL dAs_Draw(dAs_c*) { /* Nonmatching */ } /* 80160C9C-80160CBC .text dAs_Execute__FP5dAs_c */ -static void dAs_Execute(dAs_c*) { +static BOOL dAs_Execute(dAs_c*) { /* Nonmatching */ } /* 80160CBC-80160CC4 .text dAs_IsDelete__FP5dAs_c */ -static void dAs_IsDelete(dAs_c*) { +static BOOL dAs_IsDelete(dAs_c*) { /* Nonmatching */ } /* 80160CC4-80160CF8 .text dAs_Delete__FP5dAs_c */ -static void dAs_Delete(dAs_c*) { +static BOOL dAs_Delete(dAs_c*) { /* Nonmatching */ } /* 80160CF8-80160D20 .text dAs_Create__FP9msg_class */ -static void dAs_Create(msg_class*) { +static cPhs_State dAs_Create(msg_class*) { /* Nonmatching */ } diff --git a/src/d/d_bg_s_movebg_actor.cpp b/src/d/d_bg_s_movebg_actor.cpp index d70001721..72520f87b 100644 --- a/src/d/d_bg_s_movebg_actor.cpp +++ b/src/d/d_bg_s_movebg_actor.cpp @@ -25,9 +25,9 @@ int dBgS_MoveBgActor::m_dzb_id; MoveBGActor_SetFunc dBgS_MoveBgActor::m_set_func; /* 800A571C-800A57F4 .text MoveBGCreateHeap__16dBgS_MoveBgActorFv */ -int dBgS_MoveBgActor::MoveBGCreateHeap() { +BOOL dBgS_MoveBgActor::MoveBGCreateHeap() { if (!CreateHeap()) { - return 0; + return FALSE; } mpBgW = new dBgW(); @@ -37,14 +37,14 @@ int dBgS_MoveBgActor::MoveBGCreateHeap() { } } else { mpBgW = NULL; - return 0; + return FALSE; } - return 1; + return TRUE; } /* 800A57F4-800A58F4 .text MoveBGCreate__16dBgS_MoveBgActorFPCciPFP4dBgWPvR13cBgS_PolyInfobP4cXyzP5csXyzP5csXyz_vUl */ -int dBgS_MoveBgActor::MoveBGCreate(const char* i_arcName, int i_dzb_id, +cPhs_State dBgS_MoveBgActor::MoveBGCreate(const char* i_arcName, int i_dzb_id, MoveBGActor_SetFunc i_setFunc, u32 i_heapSize) { mDoMtx_stack_c::transS(current.pos.x, current.pos.y, current.pos.z); mDoMtx_stack_c::YrotM(shape_angle.y); @@ -71,8 +71,8 @@ int dBgS_MoveBgActor::MoveBGCreate(const char* i_arcName, int i_dzb_id, } /* 800A58F4-800A5980 .text MoveBGDelete__16dBgS_MoveBgActorFv */ -int dBgS_MoveBgActor::MoveBGDelete() { - int ret = Delete(); +BOOL dBgS_MoveBgActor::MoveBGDelete() { + BOOL ret = Delete(); if (mpBgW != NULL && mpBgW->ChkUsed()) { dComIfG_Bgsp()->Release(mpBgW); @@ -81,10 +81,10 @@ int dBgS_MoveBgActor::MoveBGDelete() { } /* 800A5980-800A5A3C .text MoveBGExecute__16dBgS_MoveBgActorFv */ -int dBgS_MoveBgActor::MoveBGExecute() { +BOOL dBgS_MoveBgActor::MoveBGExecute() { Mtx* new_mtx = NULL; - int ret = Execute(&new_mtx); + BOOL ret = Execute(&new_mtx); if (new_mtx == NULL) { mDoMtx_stack_c::transS(current.pos.x, current.pos.y, current.pos.z); mDoMtx_stack_c::YrotM(shape_angle.y); diff --git a/src/d/d_com_inf_game.cpp b/src/d/d_com_inf_game.cpp index dc2459f74..772084363 100644 --- a/src/d/d_com_inf_game.cpp +++ b/src/d/d_com_inf_game.cpp @@ -491,44 +491,53 @@ int dComIfG_changeOpeningScene(scene_class* i_scene, s16 i_procName) { } /* 8005326C-800532D8 .text dComIfG_resetToOpening__FP11scene_class */ -int dComIfG_resetToOpening(scene_class* i_scene) { +BOOL dComIfG_resetToOpening(scene_class* i_scene) { if (!mDoRst::isReset()) { - return 0; + return FALSE; } dComIfG_changeOpeningScene(i_scene, 8); mDoAud_bgmStop(30); mDoAud_resetProcess(); - return 1; + return TRUE; } /* 800532D8-80053330 .text phase_1__FPc */ -static int phase_1(char* i_arcName) { - return !dComIfG_setObjectRes(i_arcName, JKRArchive::DEFAULT_MOUNT_DIRECTION, NULL) ? cPhs_ERROR_e : cPhs_NEXT_e; +static cPhs_State phase_1(char* i_arcName) { + if (dComIfG_setObjectRes(i_arcName, JKRArchive::DEFAULT_MOUNT_DIRECTION, NULL) == FALSE) { + return cPhs_ERROR_e; + } else { + return cPhs_NEXT_e; + } } /* 80053330-80053388 .text phase_2__FPc */ -static int phase_2(char* i_arcName) { +static cPhs_State phase_2(char* i_arcName) { int syncStatus = dComIfG_syncObjectRes(i_arcName); if (syncStatus < 0) { return cPhs_ERROR_e; + } else if (syncStatus > 0) { + return cPhs_INIT_e; } else { - return syncStatus > 0 ? 0 : 2; + return cPhs_NEXT_e; } } /* 80053388-80053390 .text phase_3__FPc */ -static int phase_3(char* i_arcName) { +static cPhs_State phase_3(char* i_arcName) { return cPhs_COMPLEATE_e; } /* 80053390-800533D0 .text dComIfG_resLoad__FP30request_of_phase_process_classPCc */ -int dComIfG_resLoad(request_of_phase_process_class* i_phase, const char* i_arcName) { - static int (*l_method[3])(void*) = {(int (*)(void*))phase_1, (int (*)(void*))phase_2, - (int (*)(void*))phase_3}; +cPhs_State dComIfG_resLoad(request_of_phase_process_class* i_phase, const char* i_arcName) { + static cPhs__Handler l_method[] = { + (cPhs__Handler)phase_1, + (cPhs__Handler)phase_2, + (cPhs__Handler)phase_3 + }; - if (i_phase->id == cPhs_NEXT_e) { + if (i_phase->id == 2) { return cPhs_COMPLEATE_e; } @@ -539,9 +548,9 @@ int dComIfG_resLoad(request_of_phase_process_class* i_phase, const char* i_arcNa int dComIfG_resDelete(request_of_phase_process_class* i_phase, const char* i_resName) { JUT_ASSERT(VERSION_SELECT(1045, 1048, 1048), i_phase->id != 1); - if (i_phase->id == cPhs_NEXT_e) { + if (i_phase->id == 2) { dComIfG_deleteObjectRes(i_resName); - i_phase->id = cPhs_INIT_e; + i_phase->id = 0; } return 0; diff --git a/src/d/d_com_lib_game.cpp b/src/d/d_com_lib_game.cpp index 771406ad3..15af31b0d 100644 --- a/src/d/d_com_lib_game.cpp +++ b/src/d/d_com_lib_game.cpp @@ -7,15 +7,16 @@ #include "SSystem/SComponent/c_phase.h" /* 800565CC-8005662C .text dComLbG_PhaseHandler__FP30request_of_phase_process_classPPFPv_iPv */ -int dComLbG_PhaseHandler(request_of_phase_process_class* i_phaseReq, cPhs__Handler* i_handler, +cPhs_State dComLbG_PhaseHandler(request_of_phase_process_class* i_phaseReq, cPhs__Handler* i_handler, void* i_data) { - int phase = cPhs_Handler(i_phaseReq, i_handler, i_data); + cPhs_State phase = cPhs_Handler(i_phaseReq, i_handler, i_data); switch (phase) { case cPhs_NEXT_e: phase = dComLbG_PhaseHandler(i_phaseReq, i_handler, i_data); break; case cPhs_LOADING_e: case cPhs_STOP_e: + default: break; } diff --git a/src/d/d_envse.cpp b/src/d/d_envse.cpp index e1f6c11a3..2ff9fa85c 100644 --- a/src/d/d_envse.cpp +++ b/src/d/d_envse.cpp @@ -183,7 +183,7 @@ static BOOL dEnvSe_Delete(dEnvSe_c* i_this) { } /* 8017DB38-8017DB40 .text dEnvSe_Create__FP12kankyo_class */ -static s32 dEnvSe_Create(kankyo_class*) { +static cPhs_State dEnvSe_Create(kankyo_class*) { return cPhs_COMPLEATE_e; } diff --git a/src/d/d_gameover.cpp b/src/d/d_gameover.cpp index de00391c8..aab7f24c8 100644 --- a/src/d/d_gameover.cpp +++ b/src/d/d_gameover.cpp @@ -65,8 +65,8 @@ void dDlst_Gameover_CAPTURE_c::draw() { } /* 8018E4B4-8018E77C .text _create__11dGameover_cFv */ -s32 dGameover_c::_create() { - s32 rt = dComIfG_resLoad(&mPhs, "Gover"); +cPhs_State dGameover_c::_create() { + cPhs_State rt = dComIfG_resLoad(&mPhs, "Gover"); if (dMenu_flag() || (dComIfGp_isHeapLockFlag() != 0 && dComIfGp_isHeapLockFlag() != 4) || dComIfGp_getMesgStatus() != 0) return cPhs_INIT_e; @@ -437,7 +437,7 @@ static BOOL dGameover_Delete(dGameover_c* i_this) { } /* 8018F654-8018F674 .text dGameover_Create__FP9msg_class */ -static s32 dGameover_Create(msg_class* i_this) { +static cPhs_State dGameover_Create(msg_class* i_this) { return ((dGameover_c*)i_this)->_create(); } diff --git a/src/d/d_kankyo.cpp b/src/d/d_kankyo.cpp index d58829b01..72fb48457 100644 --- a/src/d/d_kankyo.cpp +++ b/src/d/d_kankyo.cpp @@ -2300,32 +2300,32 @@ void dScnKy_env_light_c::drawKankyo() { } /* 80194888-801948B4 .text dKy_Draw__FP17sub_kankyo__class */ -static int dKy_Draw(sub_kankyo__class*) { +static BOOL dKy_Draw(sub_kankyo__class*) { g_env_light.drawKankyo(); - return 1; + return TRUE; } /* 801948B4-801948E8 .text dKy_Execute__FP17sub_kankyo__class */ -static int dKy_Execute(sub_kankyo__class*) { +static BOOL dKy_Execute(sub_kankyo__class*) { dKy_event_proc(); g_env_light.exeKankyo(); dKyw_wind_set(); - return 1; + return TRUE; } /* 801948E8-801948F0 .text dKy_IsDelete__FP17sub_kankyo__class */ -static int dKy_IsDelete(sub_kankyo__class*) { - return 1; +static BOOL dKy_IsDelete(sub_kankyo__class*) { + return TRUE; } /* 801948F0-80194914 .text dKy_Delete__FP17sub_kankyo__class */ -static int dKy_Delete(sub_kankyo__class*) { +static BOOL dKy_Delete(sub_kankyo__class*) { plight_init(); - return 1; + return TRUE; } /* 80194914-80194974 .text dKy_Create__FPv */ -static int dKy_Create(void*) { +static cPhs_State dKy_Create(void*) { envcolor_init(); g_env_light.field_0xc78 = NULL; g_env_light.field_0xc44 = 1.0f; diff --git a/src/d/d_kankyo_wether.cpp b/src/d/d_kankyo_wether.cpp index 82156e5ce..e60bf82f1 100644 --- a/src/d/d_kankyo_wether.cpp +++ b/src/d/d_kankyo_wether.cpp @@ -1369,7 +1369,7 @@ void dKyw_evt_wind_set_go() { /* 8008A96C-8008A9F8 .text dKyw_gbwind_use_check__Fv */ BOOL dKyw_gbwind_use_check() { dStage_FileList_dt_c* fili_p = NULL; - int rt = 0; + BOOL rt = 0; if (g_env_light.mWind.mpWindVecOverride == NULL) { s32 roomNo = dComIfGp_roomControl_getStayNo(); @@ -1378,7 +1378,7 @@ BOOL dKyw_gbwind_use_check() { } if (fili_p != NULL && dStage_FileList_dt_GlobalWindLevel(fili_p) <= 2) { - rt = 1; + rt = TRUE; } } diff --git a/src/d/d_ky_thunder.cpp b/src/d/d_ky_thunder.cpp index 37ab8f479..78c9eb2c3 100644 --- a/src/d/d_ky_thunder.cpp +++ b/src/d/d_ky_thunder.cpp @@ -30,7 +30,7 @@ public: inline ~dThunder_c(); BOOL createHeap(); void adjustHeap(); - s32 create(); + cPhs_State create(); inline BOOL draw(); inline BOOL execute(); @@ -121,18 +121,18 @@ static BOOL dThunder_Delete(dThunder_c* i_this) { } /* 80198B68-80198BC4 .text dThunder_Create__FP12kankyo_class */ -static s32 dThunder_Create(kankyo_class* i_ky) { +static cPhs_State dThunder_Create(kankyo_class* i_ky) { dThunder_c * i_this = (dThunder_c *)i_ky; if (!i_this->createHeap()) return cPhs_ERROR_e; - s32 ret = i_this->create(); + cPhs_State ret = i_this->create(); i_this->adjustHeap(); return ret; } /* 80198BC4-801990CC .text create__10dThunder_cFv */ -s32 dThunder_c::create() { +cPhs_State dThunder_c::create() { dScnKy_env_light_c& envLight = dKy_getEnvlight(); camera_class *pCamera = (camera_class*)dComIfGp_getCamera(0); diff --git a/src/d/d_kyeff.cpp b/src/d/d_kyeff.cpp index fac25692c..e9f5d45ed 100644 --- a/src/d/d_kyeff.cpp +++ b/src/d/d_kyeff.cpp @@ -135,7 +135,7 @@ static BOOL dKyeff_Delete(dKyeff_c* i_this) { } /* 80198518-80198758 .text dKyeff_Create__FP12kankyo_class */ -static s32 dKyeff_Create(kankyo_class* i_ky) { +static cPhs_State dKyeff_Create(kankyo_class* i_ky) { dKyw_wether_init(); if (strcmp(dComIfGp_getStartStageName(), "Name") == 0) { diff --git a/src/d/d_kyeff2.cpp b/src/d/d_kyeff2.cpp index 0dc3d9aca..ca0acf0bd 100644 --- a/src/d/d_kyeff2.cpp +++ b/src/d/d_kyeff2.cpp @@ -48,7 +48,7 @@ static BOOL dKyeff2_Delete(dKyeff2_c* i_this) { } /* 801987EC-80198810 .text dKyeff2_Create__FP12kankyo_class */ -static s32 dKyeff2_Create(kankyo_class*) { +static cPhs_State dKyeff2_Create(kankyo_class*) { dKyw_wether_init2(); return cPhs_COMPLEATE_e; } diff --git a/src/d/d_level_se.cpp b/src/d/d_level_se.cpp index 566f07d06..3585d36d8 100644 --- a/src/d/d_level_se.cpp +++ b/src/d/d_level_se.cpp @@ -37,7 +37,7 @@ static BOOL dLevelSe_Delete(dLevelSe_c* i_this) { } /* 80199404-8019940C .text dLevelSe_Create__FP12kankyo_class */ -static s32 dLevelSe_Create(kankyo_class*) { +static cPhs_State dLevelSe_Create(kankyo_class*) { return cPhs_COMPLEATE_e; } diff --git a/src/d/d_menu_window.cpp b/src/d/d_menu_window.cpp index c7f986c8d..e4ed9d284 100644 --- a/src/d/d_menu_window.cpp +++ b/src/d/d_menu_window.cpp @@ -137,26 +137,26 @@ void dMs_placenameMove(sub_ms_screen_class*) { } /* 801DD6D8-801DD960 .text dMs_Draw__FP19sub_ms_screen_class */ -static void dMs_Draw(sub_ms_screen_class*) { +static BOOL dMs_Draw(sub_ms_screen_class*) { /* Nonmatching */ } /* 801DD960-801DF340 .text dMs_Execute__FP19sub_ms_screen_class */ -static void dMs_Execute(sub_ms_screen_class*) { +static BOOL dMs_Execute(sub_ms_screen_class*) { /* Nonmatching */ } /* 801DF340-801DF368 .text dMs_IsDelete__FP19sub_ms_screen_class */ -static void dMs_IsDelete(sub_ms_screen_class*) { +static BOOL dMs_IsDelete(sub_ms_screen_class*) { /* Nonmatching */ } /* 801DF368-801DF4C4 .text dMs_Delete__FP19sub_ms_screen_class */ -static void dMs_Delete(sub_ms_screen_class*) { +static BOOL dMs_Delete(sub_ms_screen_class*) { /* Nonmatching */ } /* 801DF4C4-801DF684 .text dMs_Create__FP9msg_class */ -static void dMs_Create(msg_class*) { +static cPhs_State dMs_Create(msg_class*) { /* Nonmatching */ } diff --git a/src/d/d_mesg.cpp b/src/d/d_mesg.cpp index d40ae1434..4d90a6093 100644 --- a/src/d/d_mesg.cpp +++ b/src/d/d_mesg.cpp @@ -413,12 +413,12 @@ void dMesg_closeProc(sub_mesg_class*) { } /* 801E6E00-801E6E44 .text dMsg_Draw__FP14sub_mesg_class */ -static void dMsg_Draw(sub_mesg_class*) { +static BOOL dMsg_Draw(sub_mesg_class*) { /* Nonmatching */ } /* 801E6E44-801E6F34 .text dMsg_Execute__FP14sub_mesg_class */ -static void dMsg_Execute(sub_mesg_class*) { +static BOOL dMsg_Execute(sub_mesg_class*) { /* Nonmatching */ } @@ -428,17 +428,17 @@ void dMesg_screenData_c::move() { } /* 801E6F38-801E6F40 .text dMsg_IsDelete__FP14sub_mesg_class */ -static void dMsg_IsDelete(sub_mesg_class*) { +static BOOL dMsg_IsDelete(sub_mesg_class*) { /* Nonmatching */ } /* 801E6F40-801E7130 .text dMsg_Delete__FP14sub_mesg_class */ -static void dMsg_Delete(sub_mesg_class*) { +static BOOL dMsg_Delete(sub_mesg_class*) { /* Nonmatching */ } /* 801E7130-801E7290 .text dMsg_Create__FP9msg_class */ -static void dMsg_Create(msg_class*) { +static cPhs_State dMsg_Create(msg_class*) { /* Nonmatching */ } diff --git a/src/d/d_message.cpp b/src/d/d_message.cpp index e47545758..d068a2e75 100644 --- a/src/d/d_message.cpp +++ b/src/d/d_message.cpp @@ -202,26 +202,26 @@ void dDlst_2DCopy_c::draw() { } /* 801EA0C8-801EA224 .text dMsg2_Draw__FP14sub_msg2_class */ -static void dMsg2_Draw(sub_msg2_class*) { +static BOOL dMsg2_Draw(sub_msg2_class*) { /* Nonmatching */ } /* 801EA224-801EA7C4 .text dMsg2_Execute__FP14sub_msg2_class */ -static void dMsg2_Execute(sub_msg2_class*) { +static BOOL dMsg2_Execute(sub_msg2_class*) { /* Nonmatching */ } /* 801EA7C4-801EA7CC .text dMsg2_IsDelete__FP14sub_msg2_class */ -static void dMsg2_IsDelete(sub_msg2_class*) { +static BOOL dMsg2_IsDelete(sub_msg2_class*) { /* Nonmatching */ } /* 801EA7CC-801EA97C .text dMsg2_Delete__FP14sub_msg2_class */ -static void dMsg2_Delete(sub_msg2_class*) { +static BOOL dMsg2_Delete(sub_msg2_class*) { /* Nonmatching */ } /* 801EA97C-801EAFC0 .text dMsg2_Create__FP9msg_class */ -static void dMsg2_Create(msg_class*) { +static cPhs_State dMsg2_Create(msg_class*) { /* Nonmatching */ } diff --git a/src/d/d_message_paper.cpp b/src/d/d_message_paper.cpp index f674e44ee..f47a5d149 100644 --- a/src/d/d_message_paper.cpp +++ b/src/d/d_message_paper.cpp @@ -232,26 +232,26 @@ void dDlst_2DMSG3_c::outFontDraw() { } /* 801EE104-801EE218 .text dMsg3_Draw__FP14sub_msg3_class */ -static void dMsg3_Draw(sub_msg3_class*) { +static BOOL dMsg3_Draw(sub_msg3_class*) { /* Nonmatching */ } /* 801EE218-801EE740 .text dMsg3_Execute__FP14sub_msg3_class */ -static void dMsg3_Execute(sub_msg3_class*) { +static BOOL dMsg3_Execute(sub_msg3_class*) { /* Nonmatching */ } /* 801EE740-801EE748 .text dMsg3_IsDelete__FP14sub_msg3_class */ -static void dMsg3_IsDelete(sub_msg3_class*) { +static BOOL dMsg3_IsDelete(sub_msg3_class*) { /* Nonmatching */ } /* 801EE748-801EE904 .text dMsg3_Delete__FP14sub_msg3_class */ -static void dMsg3_Delete(sub_msg3_class*) { +static BOOL dMsg3_Delete(sub_msg3_class*) { /* Nonmatching */ } /* 801EE904-801EEEFC .text dMsg3_Create__FP9msg_class */ -static void dMsg3_Create(msg_class*) { +static cPhs_State dMsg3_Create(msg_class*) { /* Nonmatching */ } diff --git a/src/d/d_meter.cpp b/src/d/d_meter.cpp index af16a8c1b..47c7688f1 100644 --- a/src/d/d_meter.cpp +++ b/src/d/d_meter.cpp @@ -1812,7 +1812,7 @@ static BOOL dMeter_Delete(sub_meter_class* i_this) { } /* 80205034-802057B8 .text dMeter_Create__FP9msg_class */ -static s32 dMeter_Create(msg_class* i_this) { +static cPhs_State dMeter_Create(msg_class* i_this) { /* Nonmatching */ mapAlpha = 0; menu_status = 0; diff --git a/src/d/d_minigame_starter.cpp b/src/d/d_minigame_starter.cpp index fa548867b..950f4962a 100644 --- a/src/d/d_minigame_starter.cpp +++ b/src/d/d_minigame_starter.cpp @@ -68,26 +68,26 @@ void dDlst_StarterScrnDraw_c::draw() { } /* 80206EDC-80206EFC .text dMinigame_Starter_Draw__FP19dMinigame_Starter_c */ -static void dMinigame_Starter_Draw(dMinigame_Starter_c*) { +static BOOL dMinigame_Starter_Draw(dMinigame_Starter_c*) { /* Nonmatching */ } /* 80206EFC-80206F1C .text dMinigame_Starter_Execute__FP19dMinigame_Starter_c */ -static void dMinigame_Starter_Execute(dMinigame_Starter_c*) { +static BOOL dMinigame_Starter_Execute(dMinigame_Starter_c*) { /* Nonmatching */ } /* 80206F1C-80206F24 .text dMinigame_Starter_IsDelete__FP19dMinigame_Starter_c */ -static void dMinigame_Starter_IsDelete(dMinigame_Starter_c*) { +static BOOL dMinigame_Starter_IsDelete(dMinigame_Starter_c*) { /* Nonmatching */ } /* 80206F24-80206F44 .text dMinigame_Starter_Delete__FP19dMinigame_Starter_c */ -static void dMinigame_Starter_Delete(dMinigame_Starter_c*) { +static BOOL dMinigame_Starter_Delete(dMinigame_Starter_c*) { /* Nonmatching */ } /* 80206F44-80206F64 .text dMinigame_Starter_Create__FP9msg_class */ -static void dMinigame_Starter_Create(msg_class*) { +static cPhs_State dMinigame_Starter_Create(msg_class*) { /* Nonmatching */ } diff --git a/src/d/d_minigame_terminater.cpp b/src/d/d_minigame_terminater.cpp index d9cf8dca4..512198461 100644 --- a/src/d/d_minigame_terminater.cpp +++ b/src/d/d_minigame_terminater.cpp @@ -132,26 +132,26 @@ void dDlst_TerminaterScrnDraw_c::draw() { } /* 8020A53C-8020A55C .text dMinigame_Terminater_Draw__FP22dMinigame_Terminater_c */ -static void dMinigame_Terminater_Draw(dMinigame_Terminater_c*) { +static BOOL dMinigame_Terminater_Draw(dMinigame_Terminater_c*) { /* Nonmatching */ } /* 8020A55C-8020A57C .text dMinigame_Terminater_Execute__FP22dMinigame_Terminater_c */ -static void dMinigame_Terminater_Execute(dMinigame_Terminater_c*) { +static BOOL dMinigame_Terminater_Execute(dMinigame_Terminater_c*) { /* Nonmatching */ } /* 8020A57C-8020A584 .text dMinigame_Terminater_IsDelete__FP22dMinigame_Terminater_c */ -static void dMinigame_Terminater_IsDelete(dMinigame_Terminater_c*) { +static BOOL dMinigame_Terminater_IsDelete(dMinigame_Terminater_c*) { /* Nonmatching */ } /* 8020A584-8020A5A4 .text dMinigame_Terminater_Delete__FP22dMinigame_Terminater_c */ -static void dMinigame_Terminater_Delete(dMinigame_Terminater_c*) { +static BOOL dMinigame_Terminater_Delete(dMinigame_Terminater_c*) { /* Nonmatching */ } /* 8020A5A4-8020A5C4 .text dMinigame_Terminater_Create__FP9msg_class */ -static void dMinigame_Terminater_Create(msg_class*) { +static cPhs_State dMinigame_Terminater_Create(msg_class*) { /* Nonmatching */ } diff --git a/src/d/d_msg.cpp b/src/d/d_msg.cpp index d7bb5dfaa..1e6ef4a1b 100644 --- a/src/d/d_msg.cpp +++ b/src/d/d_msg.cpp @@ -320,12 +320,12 @@ void dMsg_outnowProc(sub_msg_class*) { } /* 802143A8-80214560 .text dMsg_Draw__FP13sub_msg_class */ -static void dMsg_Draw(sub_msg_class*) { +static BOOL dMsg_Draw(sub_msg_class*) { /* Nonmatching */ } /* 80214560-802153B0 .text dMsg_Execute__FP13sub_msg_class */ -static void dMsg_Execute(sub_msg_class*) { +static BOOL dMsg_Execute(sub_msg_class*) { /* Nonmatching */ } @@ -335,12 +335,12 @@ static BOOL dMsg_IsDelete(sub_msg_class*) { } /* 802153B8-80215698 .text dMsg_Delete__FP13sub_msg_class */ -static void dMsg_Delete(sub_msg_class*) { +static BOOL dMsg_Delete(sub_msg_class*) { /* Nonmatching */ } /* 80215698-80215CD0 .text dMsg_Create__FP9msg_class */ -static void dMsg_Create(msg_class*) { +static cPhs_State dMsg_Create(msg_class*) { /* Nonmatching */ } diff --git a/src/d/d_operate_wind.cpp b/src/d/d_operate_wind.cpp index 7ad41d6ff..fc60b5c3a 100644 --- a/src/d/d_operate_wind.cpp +++ b/src/d/d_operate_wind.cpp @@ -290,7 +290,7 @@ static BOOL dOw_Delete(dOw_c* i_this) { } /* 80221A04-80221AA0 .text dOw_Create__FP9msg_class */ -static s32 dOw_Create(msg_class* i_msg) { +static cPhs_State dOw_Create(msg_class* i_msg) { dOw_c* i_this = (dOw_c*)i_msg; JKRExpHeap* heap = fopMsgM_createExpHeap(20000); diff --git a/src/d/d_ovlp_fade.cpp b/src/d/d_ovlp_fade.cpp index 4b34d621c..dec4788dc 100644 --- a/src/d/d_ovlp_fade.cpp +++ b/src/d/d_ovlp_fade.cpp @@ -87,7 +87,7 @@ static BOOL dOvlpFd_Delete(overlap1_class* i_this) { } /* 802237E0-802237F4 .text dOvlpFd_Create__FPv */ -static BOOL dOvlpFd_Create(void* i_this) { +static cPhs_State dOvlpFd_Create(void* i_this) { dOvlpFd_execute_f = dOvlpFd_FadeIn; return cPhs_COMPLEATE_e; } diff --git a/src/d/d_ovlp_fade2.cpp b/src/d/d_ovlp_fade2.cpp index 0eba7920d..48be2f782 100644 --- a/src/d/d_ovlp_fade2.cpp +++ b/src/d/d_ovlp_fade2.cpp @@ -230,7 +230,7 @@ static BOOL dOvlpFd2_Delete(dOvlpFd2_c*) { } /* 8022423C-80224268 .text dOvlpFd2_Create__FPv */ -static s32 dOvlpFd2_Create(void* i_this) { +static cPhs_State dOvlpFd2_Create(void* i_this) { new (i_this) dOvlpFd2_c(); return cPhs_COMPLEATE_e; } diff --git a/src/d/d_picture_box.cpp b/src/d/d_picture_box.cpp index 9d25150ee..a66431594 100644 --- a/src/d/d_picture_box.cpp +++ b/src/d/d_picture_box.cpp @@ -262,26 +262,26 @@ void dJle_Pb_c::_delete(JKRExpHeap*) { } /* 8022BB3C-8022BB7C .text dPb_Draw__FP12sub_pb_class */ -static void dPb_Draw(sub_pb_class*) { +static BOOL dPb_Draw(sub_pb_class*) { /* Nonmatching */ } /* 8022BB7C-8022BC84 .text dPb_Execute__FP12sub_pb_class */ -static void dPb_Execute(sub_pb_class*) { +static BOOL dPb_Execute(sub_pb_class*) { /* Nonmatching */ } /* 8022BC84-8022BC8C .text dPb_IsDelete__FP12sub_pb_class */ -static void dPb_IsDelete(sub_pb_class*) { +static BOOL dPb_IsDelete(sub_pb_class*) { /* Nonmatching */ } /* 8022BC8C-8022BD8C .text dPb_Delete__FP12sub_pb_class */ -static void dPb_Delete(sub_pb_class*) { +static BOOL dPb_Delete(sub_pb_class*) { /* Nonmatching */ } /* 8022BD8C-8022C03C .text dPb_Create__FP9msg_class */ -static void dPb_Create(msg_class*) { +static cPhs_State dPb_Create(msg_class*) { /* Nonmatching */ } diff --git a/src/d/d_place_name.cpp b/src/d/d_place_name.cpp index 82733b7fe..b823865e5 100644 --- a/src/d/d_place_name.cpp +++ b/src/d/d_place_name.cpp @@ -69,7 +69,7 @@ const char * name_texture[] = { class dPn_c : public msg_class { public: - s32 _create(); + cPhs_State _create(); BOOL _execute(); BOOL _draw(); BOOL _delete(); @@ -132,8 +132,8 @@ void dPlace_name_c::draw() { } /* 801611E0-801614E8 .text _create__5dPn_cFv */ -s32 dPn_c::_create() { - s32 rt = dComIfG_resLoad(&mPhs, "PName"); +cPhs_State dPn_c::_create() { + cPhs_State rt = dComIfG_resLoad(&mPhs, "PName"); if (dMenu_flag() || (dComIfGp_isHeapLockFlag() != 0 && dComIfGp_isHeapLockFlag() != 10) || dComIfGp_getMesgStatus() != 0) return cPhs_INIT_e; @@ -255,7 +255,7 @@ static BOOL dPn_Delete(dPn_c* i_this) { } /* 801616F4-80161714 .text dPn_Create__FP9msg_class */ -static s32 dPn_Create(msg_class* i_msg) { +static cPhs_State dPn_Create(msg_class* i_msg) { dPn_c * i_this = (dPn_c *)i_msg; return i_this->_create(); } diff --git a/src/d/d_resorce.cpp b/src/d/d_resorce.cpp index 984361bce..c2ec594ec 100644 --- a/src/d/d_resorce.cpp +++ b/src/d/d_resorce.cpp @@ -4,6 +4,7 @@ // #include "d/d_resorce.h" +#include "JSystem/JKernel/JKRMemArchive.h" #include "d/d_com_inf_game.h" #include "m_Do/m_Do_printf.h" #include "m_Do/m_Do_ext.h" @@ -547,7 +548,7 @@ dRes_control_c::~dRes_control_c() { } /* 8006EF34-8006F01C .text setRes__14dRes_control_cFPCcP11dRes_info_ciPCcUcP7JKRHeap */ -int dRes_control_c::setRes(const char* pArcName, dRes_info_c* pInfoArr, int infoNum, const char* pArcPath, u8 direction, JKRHeap* pHeap) { +BOOL dRes_control_c::setRes(const char* pArcName, dRes_info_c* pInfoArr, int infoNum, const char* pArcPath, u8 direction, JKRHeap* pHeap) { dRes_info_c * pInfo = getResInfo(pArcName, pInfoArr, infoNum); if (pInfo == NULL) { @@ -701,7 +702,7 @@ int dRes_control_c::syncAllRes(dRes_info_c* pInfo, int infoNum) { } /* 8006F430-8006F500 .text setStageRes__14dRes_control_cFPCcP7JKRHeap */ -int dRes_control_c::setStageRes(char const* pArcName, JKRHeap* pHeap) { +BOOL dRes_control_c::setStageRes(char const* pArcName, JKRHeap* pHeap) { char path[20]; snprintf(path, sizeof(path), "/res/Stage/%s/", strcmp(dComIfGp_getStartStageName(), "ma2room") == 0 && dComIfGs_isEventBit(0x1820) ? "ma3room" : dComIfGp_getStartStageName()); return setRes(pArcName, &mStageInfo[0], ARRAY_SIZE(mStageInfo), path, 1, pHeap); diff --git a/src/d/d_s_logo.cpp b/src/d/d_s_logo.cpp index 23df64b26..a1693e6c9 100644 --- a/src/d/d_s_logo.cpp +++ b/src/d/d_s_logo.cpp @@ -611,7 +611,7 @@ static BOOL dScnLogo_Delete(dScnLogo_c* i_this) { } /* 8022D984-8022DB20 .text phase_0__FP10dScnLogo_c */ -s32 phase_0(dScnLogo_c* i_this) { +cPhs_State phase_0(dScnLogo_c* i_this) { #if VERSION != VERSION_PAL if (!OSGetResetCode()) { if (!VIGetDTVStatus()) @@ -652,7 +652,7 @@ s32 phase_0(dScnLogo_c* i_this) { } /* 8022DB20-8022DC58 .text phase_1__FP10dScnLogo_c */ -s32 phase_1(dScnLogo_c* i_this) { +cPhs_State phase_1(dScnLogo_c* i_this) { if (dComIfG_syncAllObjectRes() != 0) return cPhs_INIT_e; @@ -701,7 +701,7 @@ mDoDvdThd_mountXArchive_c * onMemMount(const char* pArc) { } /* 8022DCA8-8022E9B4 .text phase_2__FP10dScnLogo_c */ -s32 phase_2(dScnLogo_c* i_this) { +cPhs_State phase_2(dScnLogo_c* i_this) { s32 rt; rt = dComIfG_syncObjectRes("Logo"); @@ -911,7 +911,7 @@ s32 phase_2(dScnLogo_c* i_this) { } /* 8022E9B4-8022E9F4 .text dScnLogo_Create__FP11scene_class */ -static s32 dScnLogo_Create(scene_class* i_scn) { +static cPhs_State dScnLogo_Create(scene_class* i_scn) { static cPhs__Handler l_method[] = { (cPhs__Handler)phase_0, (cPhs__Handler)phase_1, diff --git a/src/d/d_s_menu.cpp b/src/d/d_s_menu.cpp index 792478572..990792ccc 100644 --- a/src/d/d_s_menu.cpp +++ b/src/d/d_s_menu.cpp @@ -246,7 +246,7 @@ static BOOL dScnMenu_Delete(menu_of_scene_class* i_this) { } /* 8022F3C4-8022F4B0 .text phase_1__FP19menu_of_scene_class */ -s32 phase_1(menu_of_scene_class* i_this) { +cPhs_State phase_1(menu_of_scene_class* i_this) { /* Nonmatching */ i_this->command = mDoDvdThd_toMainRam_c::create("/res/Menu/Menu1.dat", 0, NULL); JUT_ASSERT(732, i_this->command != NULL); @@ -256,7 +256,7 @@ s32 phase_1(menu_of_scene_class* i_this) { } /* 8022F4B0-8022F70C .text phase_2__FP19menu_of_scene_class */ -s32 phase_2(menu_of_scene_class* i_this) { +cPhs_State phase_2(menu_of_scene_class* i_this) { /* Nonmatching */ if (!i_this->command->sync() || !i_this->fontCommand->sync()) { return cPhs_INIT_e; @@ -291,7 +291,7 @@ s32 phase_2(menu_of_scene_class* i_this) { } /* 8022F70C-8022F748 .text dScnMenu_Create__FP11scene_class */ -static s32 dScnMenu_Create(scene_class* i_scn) { +static cPhs_State dScnMenu_Create(scene_class* i_scn) { static cPhs__Handler l_method[] = { (cPhs__Handler)phase_1, (cPhs__Handler)phase_2, diff --git a/src/d/d_s_name.cpp b/src/d/d_s_name.cpp index db5791b46..eb6c480f5 100644 --- a/src/d/d_s_name.cpp +++ b/src/d/d_s_name.cpp @@ -30,6 +30,7 @@ #include "JSystem/J2DGraph/J2DOrthoGraph.h" #include "JSystem/J2DGraph/J2DScreen.h" #include "JSystem/JKernel/JKRExpHeap.h" +#include "JSystem/JKernel/JKRMemArchive.h" #include "weak_data_1811.h" // IWYU pragma: keep @@ -62,13 +63,16 @@ dSn_HIO_c::dSn_HIO_c() { } /* 8022F8F0-8022F95C .text phase_1__FPc */ -static s32 phase_1(char* resName) { +static cPhs_State phase_1(char* resName) { mDoAud_bgmStart(JA_BGM_SELECT); - return !dComIfG_setStageRes(resName, NULL) ? cPhs_ERROR_e : cPhs_NEXT_e; + if (dComIfG_setStageRes(resName, NULL) == FALSE) { + return cPhs_ERROR_e; + } + return cPhs_NEXT_e; } /* 8022F95C-8022F9B4 .text phase_2__FPc */ -static s32 phase_2(char* resName) { +static cPhs_State phase_2(char* resName) { s32 rt = dComIfG_syncStageRes(resName); if (rt < 0) return cPhs_ERROR_e; @@ -78,12 +82,12 @@ static s32 phase_2(char* resName) { } /* 8022F9B4-8022F9BC .text phase_3__FPc */ -static s32 phase_3(char*) { +static cPhs_State phase_3(char*) { return cPhs_COMPLEATE_e; } /* 8022F9BC-8022F9FC .text resLoad__FP30request_of_phase_process_classPc */ -s32 resLoad(request_of_phase_process_class* phase, char* resName) { +cPhs_State resLoad(request_of_phase_process_class* phase, char* resName) { static cPhs__Handler l_method[] = { (cPhs__Handler)phase_1, (cPhs__Handler)phase_2, @@ -96,13 +100,13 @@ s32 resLoad(request_of_phase_process_class* phase, char* resName) { } /* 8022F9FC-802301C8 .text create__10dScnName_cFv */ -s32 dScnName_c::create() { +cPhs_State dScnName_c::create() { dComIfGp_offEnableNextStage(); dComIfGp_setNextStage("Name", 0, 0); dComIfGp_setStartStage(dComIfGp_getNextStartStage()); dComIfGp_offEnableNextStage(); - s32 rt = resLoad(&mPhs, "Stage"); + cPhs_State rt = resLoad(&mPhs, "Stage"); if (rt == cPhs_COMPLEATE_e) { heap = JKRCreateExpHeap(0x68000, mDoExt_getGameHeap(), false); JUT_ASSERT(0x1c8, heap != NULL); @@ -918,28 +922,28 @@ void dScnName_c::changeGameScene() { } /* 80232338-80232358 .text dScnName_Draw__FP10dScnName_c */ -static s32 dScnName_Draw(dScnName_c* i_this) { +static BOOL dScnName_Draw(dScnName_c* i_this) { return i_this->draw(); } /* 80232358-80232378 .text dScnName_Execute__FP10dScnName_c */ -static s32 dScnName_Execute(dScnName_c* i_this) { +static BOOL dScnName_Execute(dScnName_c* i_this) { return i_this->execute(); } /* 80232378-80232380 .text dScnName_IsDelete__FP10dScnName_c */ -static s32 dScnName_IsDelete(dScnName_c*) { - return 1; +static BOOL dScnName_IsDelete(dScnName_c*) { + return TRUE; } /* 80232380-802323A8 .text dScnName_Delete__FP10dScnName_c */ -static s32 dScnName_Delete(dScnName_c* i_this) { +static BOOL dScnName_Delete(dScnName_c* i_this) { i_this->~dScnName_c(); - return 1; + return TRUE; } /* 802323A8-802323F8 .text dScnName_Create__FP11scene_class */ -static s32 dScnName_Create(scene_class* i_scn) { +static cPhs_State dScnName_Create(scene_class* i_scn) { dScnName_c* i_this = new (i_scn) dScnName_c(); return i_this->create(); } diff --git a/src/d/d_s_open.cpp b/src/d/d_s_open.cpp index a95f10272..11e59f1b1 100644 --- a/src/d/d_s_open.cpp +++ b/src/d/d_s_open.cpp @@ -15,11 +15,11 @@ #include "m_Do/m_Do_graphic.h" /* 80232A68-80232BC4 .text create__10dScnOpen_cFv */ -s32 dScnOpen_c::create() { +cPhs_State dScnOpen_c::create() { dComIfGp_offEnableNextStage(); mpProc = NULL; - s32 rt = dComIfG_resLoad(&mPhs, "Opening"); + cPhs_State rt = dComIfG_resLoad(&mPhs, "Opening"); if (rt == cPhs_COMPLEATE_e) { solid_heap = mDoExt_createSolidHeapFromGameToCurrent(0x20000, 0); JUT_ASSERT(0x3b, solid_heap != NULL); @@ -117,7 +117,7 @@ static BOOL dScnOpen_Delete(dScnOpen_c* i_this) { } /* 80232EDC-80232EFC .text dScnOpen_Create__FP11scene_class */ -static s32 dScnOpen_Create(scene_class* i_scn) { +static cPhs_State dScnOpen_Create(scene_class* i_scn) { dScnOpen_c* i_this = (dScnOpen_c*)i_scn; return i_this->create(); } diff --git a/src/d/d_s_play.cpp b/src/d/d_s_play.cpp index 70218cf6e..a9715bbb5 100644 --- a/src/d/d_s_play.cpp +++ b/src/d/d_s_play.cpp @@ -285,7 +285,7 @@ static request_of_phase_process_class dylPhase[PRELOAD_DYL_MAX]; static dScnPly_preLoad_HIO_c g_preLoadHIO; /* 80234B9C-80234FD0 .text dScnPly_Draw__FP13dScnPly_ply_c */ -static int dScnPly_Draw(dScnPly_ply_c* i_this) { +static BOOL dScnPly_Draw(dScnPly_ply_c* i_this) { dComIfG_Ccsp()->Move(); dComIfG_Bgsp()->ClrMoveFlag(); @@ -394,7 +394,7 @@ static int dScnPly_Draw(dScnPly_ply_c* i_this) { dComIfGp_map_mapBufferSendAGB(3); } - return 1; + return TRUE; } const char* sea_resName[] = { @@ -1036,7 +1036,7 @@ const PreLoadInfoT_s PreLoadInfoT[] = { }; /* 80234FD0-802350B4 .text dScnPly_Execute__FP13dScnPly_ply_c */ -static int dScnPly_Execute(dScnPly_ply_c* i_this) { +static BOOL dScnPly_Execute(dScnPly_ply_c* i_this) { if (!fopOvlpM_IsPeek()) { if (mDoAud_zelAudio_c::isBgmSet()) { mDoAud_sceneBgmStart(); @@ -1045,7 +1045,7 @@ static int dScnPly_Execute(dScnPly_ply_c* i_this) { } if (i_this->calcPauseTimer() != 0) { - return 1; + return TRUE; } } @@ -1063,12 +1063,12 @@ static int dScnPly_Execute(dScnPly_ply_c* i_this) { dComIfGp_getDetect().proc(); } - return 1; + return TRUE; } /* 802350B4-802350BC .text dScnPly_IsDelete__FP13dScnPly_ply_c */ -static int dScnPly_IsDelete(dScnPly_ply_c* i_this) { - return 1; +static BOOL dScnPly_IsDelete(dScnPly_ply_c* i_this) { + return TRUE; } static s8 preLoadNo = 0xFF; @@ -1171,16 +1171,16 @@ BOOL heapSizeCheck() { if (temp_f31 < 0.7f || temp_f30 < 0.7f || temp_f29 < 0.7f || temp_f28 < 0.7f || temp_f27 < 0.7f || temp_f1 < 0.7f) { - return 0; + return FALSE; } - return 1; + return TRUE; } /* 802355A8-802356B0 .text phase_00__FP13dScnPly_ply_c */ -int phase_00(dScnPly_ply_c* i_this) { +cPhs_State phase_00(dScnPly_ply_c* i_this) { if (mDoAud_isUsedHeapForStreamBuffer()) { - return 0; + return cPhs_INIT_e; } mDoGph_gInf_c::offBlure(); @@ -1215,7 +1215,7 @@ int phase_00(dScnPly_ply_c* i_this) { } /* 802356B0-802356E0 .text phase_01__FP13dScnPly_ply_c */ -int phase_01(dScnPly_ply_c* i_this) { +cPhs_State phase_01(dScnPly_ply_c* i_this) { if (!mDoAud_load1stDynamicWave()) { return cPhs_INIT_e; } else { @@ -1226,7 +1226,7 @@ int phase_01(dScnPly_ply_c* i_this) { static mDoDvdThd_mountXArchive_c* l_lkDemoAnmCommand; /* 802356E0-802357F4 .text phase_0__FP13dScnPly_ply_c */ -s32 phase_0(dScnPly_ply_c* i_this) { +cPhs_State phase_0(dScnPly_ply_c* i_this) { if (mDoAud_checkAllWaveLoadStatus()) { return cPhs_INIT_e; } else { @@ -1250,10 +1250,10 @@ s32 phase_0(dScnPly_ply_c* i_this) { } /* 802357F4-802359DC .text phase_1__FP13dScnPly_ply_c */ -int phase_1(dScnPly_ply_c* i_this) { +cPhs_State phase_1(dScnPly_ply_c* i_this) { if (l_lkDemoAnmCommand != NULL) { if (!l_lkDemoAnmCommand->sync()) { - return 0; + return cPhs_INIT_e; } JUT_ASSERT(VERSION_SELECT(3424, 3439, 3439), l_lkDemoAnmCommand->getArchive()); @@ -1282,7 +1282,7 @@ int phase_1(dScnPly_ply_c* i_this) { } /* 802359DC-80235ABC .text phase_2__FP13dScnPly_ply_c */ -int phase_2(dScnPly_ply_c* i_this) { +cPhs_State phase_2(dScnPly_ply_c* i_this) { int rt = dComIfG_syncStageRes("Stage"); JUT_ASSERT(VERSION_SELECT(3470, 3485, 3485), rt >= 0) @@ -1297,7 +1297,7 @@ int phase_2(dScnPly_ply_c* i_this) { } /* 80235ABC-80235B0C .text phase_3__FP13dScnPly_ply_c */ -int phase_3(dScnPly_ply_c* i_this) { +cPhs_State phase_3(dScnPly_ply_c* i_this) { if ((i_this->sceneCommand != NULL && !i_this->sceneCommand->sync()) || mDoAud_zelAudio_c::getInterface()->check1stDynamicWave()) { @@ -1308,7 +1308,7 @@ int phase_3(dScnPly_ply_c* i_this) { } /* 80235B0C-80236334 .text phase_4__FP13dScnPly_ply_c */ -s32 phase_4(dScnPly_ply_c* i_this) { +cPhs_State phase_4(dScnPly_ply_c* i_this) { if (i_this->sceneCommand != NULL) { JUT_ASSERT(VERSION_SELECT(3552, 3567, 3567), i_this->sceneCommand->getMemAddress() != NULL); dComIfGp_particle_createScene(i_this->sceneCommand->getMemAddress()); @@ -1424,7 +1424,7 @@ s32 phase_4(dScnPly_ply_c* i_this) { JUTGamePad::clearResetOccurred(); JUTGamePad::setResetCallback(mDoRst_resetCallBack, NULL); - s32 rt; + cPhs_State rt; if (preLoadNo < 0) return cPhs_COMPLEATE_e; @@ -1436,9 +1436,9 @@ s32 phase_4(dScnPly_ply_c* i_this) { } /* 80236334-80236444 .text phase_5__FP13dScnPly_ply_c */ -s32 phase_5(dScnPly_ply_c* i_this) { +cPhs_State phase_5(dScnPly_ply_c* i_this) { if (preLoadNo >= 0) { - s32 rt = cPhs_NEXT_e; + cPhs_State rt = cPhs_NEXT_e; const char** resName = PreLoadInfoT[preLoadNo].resName; s32 resNameNum = PreLoadInfoT[preLoadNo].resNameNum; if (resName != NULL && resName[0] != NULL) { @@ -1459,9 +1459,9 @@ s32 phase_5(dScnPly_ply_c* i_this) { } /* 80236444-80236554 .text phase_6__FP13dScnPly_ply_c */ -s32 phase_6(dScnPly_ply_c* i_this) { +cPhs_State phase_6(dScnPly_ply_c* i_this) { if (preLoadNo >= 0) { - s32 rt = cPhs_NEXT_e; + cPhs_State rt = cPhs_NEXT_e; const s16* dylKeyTbl = PreLoadInfoT[preLoadNo].dylKeyTbl; s32 dylKeyTblNum = PreLoadInfoT[preLoadNo].dylKeyTblNum; if (dylKeyTbl != NULL && dylKeyTbl[0] != NULL) { @@ -1482,12 +1482,12 @@ s32 phase_6(dScnPly_ply_c* i_this) { } /* 80236554-8023655C .text phase_compleate__FPv */ -int phase_compleate(void* i_this) { +cPhs_State phase_compleate(void* i_this) { return cPhs_COMPLEATE_e; } /* 8023655C-8023658C .text dScnPly_Create__FP11scene_class */ -static int dScnPly_Create(scene_class* i_this) { +static cPhs_State dScnPly_Create(scene_class* i_this) { static request_of_phase_process_fn l_method[] = { (request_of_phase_process_fn)phase_00, (request_of_phase_process_fn)phase_01, (request_of_phase_process_fn)phase_0, (request_of_phase_process_fn)phase_1, diff --git a/src/d/d_s_room.cpp b/src/d/d_s_room.cpp index fbf008f9e..d2f83f57f 100644 --- a/src/d/d_s_room.cpp +++ b/src/d/d_s_room.cpp @@ -158,14 +158,14 @@ static BOOL dScnRoom_Delete(room_of_scene_class* i_this) { } /* 80236D24-80236D58 .text phase_0__FP19room_of_scene_class */ -s32 phase_0(room_of_scene_class* i_this) { +cPhs_State phase_0(room_of_scene_class* i_this) { s32 roomNo = fopScnM_GetParam(i_this); dStage_roomControl_c::setStatusProcID(roomNo, fopScnM_GetID(i_this)); return cPhs_NEXT_e; } /* 80236D58-80236DE8 .text phase_1__FP19room_of_scene_class */ -s32 phase_1(room_of_scene_class* i_this) { +cPhs_State phase_1(room_of_scene_class* i_this) { s32 roomNo = fopScnM_GetParam(i_this); JKRExpHeap * pHeap = dStage_roomControl_c::getMemoryBlock(roomNo); if (pHeap != NULL && pHeap->getTotalUsedSize() != 0) @@ -182,7 +182,7 @@ s32 phase_1(room_of_scene_class* i_this) { } /* 80236DE8-802370A0 .text phase_2__FP19room_of_scene_class */ -s32 phase_2(room_of_scene_class* i_this) { +cPhs_State phase_2(room_of_scene_class* i_this) { const char * arcName = setArcName(i_this); s32 rt = dComIfG_syncStageRes(arcName); if (rt < 0) { @@ -235,7 +235,7 @@ s32 phase_2(room_of_scene_class* i_this) { } /* 802370B8-802371D0 .text phase_3__FP19room_of_scene_class */ -s32 phase_3(room_of_scene_class* i_this) { +cPhs_State phase_3(room_of_scene_class* i_this) { if (dStage_roomControl_c::getDemoArcName()[0] != '\0') { s32 rt = dComIfG_syncObjectRes(dStage_roomControl_c::getDemoArcName()); if (rt < 0) { @@ -260,7 +260,7 @@ s32 phase_3(room_of_scene_class* i_this) { } /* 802371D0-802372C4 .text phase_4__FP19room_of_scene_class */ -s32 phase_4(room_of_scene_class* i_this) { +cPhs_State phase_4(room_of_scene_class* i_this) { if (dComIfGp_getPlayer(0) == NULL) return cPhs_INIT_e; @@ -286,7 +286,7 @@ s32 phase_4(room_of_scene_class* i_this) { } /* 802372C4-802372F4 .text dScnRoom_Create__FP11scene_class */ -static s32 dScnRoom_Create(scene_class* i_scn) { +static cPhs_State dScnRoom_Create(scene_class* i_scn) { static cPhs__Handler l_method[] = { (cPhs__Handler)phase_0, (cPhs__Handler)phase_1, diff --git a/src/d/d_s_title.cpp b/src/d/d_s_title.cpp index df138ae76..951689bc4 100644 --- a/src/d/d_s_title.cpp +++ b/src/d/d_s_title.cpp @@ -49,7 +49,7 @@ static BOOL dScnTitle_Execute(title_of_scene_class* i_this) { #if VERSION == VERSION_PAL daMP_c *movie = dScnTitle_c::mMp; if (movie == NULL) { - s32 rt = fopAcM_SearchByID(i_this->mMoviePId, (fopAc_ac_c**)&movie); + BOOL rt = fopAcM_SearchByID(i_this->mMoviePId, (fopAc_ac_c**)&movie); JUT_ASSERT(0x8a, rt); if (movie == NULL) @@ -59,7 +59,7 @@ static BOOL dScnTitle_Execute(title_of_scene_class* i_this) { } #else daMP_c *movie; - s32 rt = fopAcM_SearchByID(i_this->mMoviePId, (fopAc_ac_c**)&movie); + BOOL rt = fopAcM_SearchByID(i_this->mMoviePId, (fopAc_ac_c**)&movie); JUT_ASSERT(0x83, rt); if (movie == NULL) @@ -102,7 +102,7 @@ static BOOL dScnTitle_Delete(title_of_scene_class* i_this) { } /* 802374D8-80237568 .text dScnTitle_Create__FP11scene_class */ -static s32 dScnTitle_Create(scene_class* i_scn) { +static cPhs_State dScnTitle_Create(scene_class* i_scn) { title_of_scene_class * i_this = (title_of_scene_class*) i_scn; if (JAInter::BankWave::checkAllWaveLoadStatus()) diff --git a/src/d/d_scope.cpp b/src/d/d_scope.cpp index 78851eb09..74e43e35f 100644 --- a/src/d/d_scope.cpp +++ b/src/d/d_scope.cpp @@ -187,26 +187,26 @@ void dScp_closeDemoProc(sub_scp_class*) { } /* 8023AD20-8023AD60 .text dScp_Draw__FP13sub_scp_class */ -static void dScp_Draw(sub_scp_class*) { +static BOOL dScp_Draw(sub_scp_class*) { /* Nonmatching */ } /* 8023AD60-8023AEF4 .text dScp_Execute__FP13sub_scp_class */ -static void dScp_Execute(sub_scp_class*) { +static BOOL dScp_Execute(sub_scp_class*) { /* Nonmatching */ } /* 8023AEF4-8023AEFC .text dScp_IsDelete__FP13sub_scp_class */ -static void dScp_IsDelete(sub_scp_class*) { +static BOOL dScp_IsDelete(sub_scp_class*) { /* Nonmatching */ } /* 8023AEFC-8023B094 .text dScp_Delete__FP13sub_scp_class */ -static void dScp_Delete(sub_scp_class*) { +static BOOL dScp_Delete(sub_scp_class*) { /* Nonmatching */ } /* 8023B094-8023B49C .text dScp_Create__FP9msg_class */ -static void dScp_Create(msg_class*) { +static cPhs_State dScp_Create(msg_class*) { /* Nonmatching */ } diff --git a/src/d/d_throwstone.cpp b/src/d/d_throwstone.cpp index 76cf68e90..58cc44c05 100644 --- a/src/d/d_throwstone.cpp +++ b/src/d/d_throwstone.cpp @@ -30,8 +30,8 @@ BOOL daThrowstone_c::CreateHeap() { return (mpModel != NULL) ? TRUE : FALSE; } -s32 daThrowstone_c::_create() { - s32 result = dComIfG_resLoad(&mPhs, M_arcname); +cPhs_State daThrowstone_c::_create() { + cPhs_State result = dComIfG_resLoad(&mPhs, M_arcname); if (result == cPhs_COMPLEATE_e) { fopAcM_SetupActor(this, daThrowstone_c); diff --git a/src/d/d_timer.cpp b/src/d/d_timer.cpp index e11869a19..576fc18f3 100644 --- a/src/d/d_timer.cpp +++ b/src/d/d_timer.cpp @@ -46,8 +46,8 @@ u32 VolcanoSeTable[] = { }; /* 8023B860-8023BCD8 .text _create__8dTimer_cFv */ -s32 dTimer_c::_create() { - s32 rt = dComIfG_resLoad(&mPhs, "Timer"); +cPhs_State dTimer_c::_create() { + cPhs_State rt = dComIfG_resLoad(&mPhs, "Timer"); fopMsg_prm_timer* prm; if (rt == cPhs_COMPLEATE_e) { prm = (fopMsg_prm_timer*)fopMsgM_GetAppend(this); @@ -737,7 +737,7 @@ static BOOL dTimer_Delete(dTimer_c* i_this) { } /* 8023DA08-8023DA28 .text dTimer_Create__FP9msg_class */ -static s32 dTimer_Create(msg_class* i_this) { +static cPhs_State dTimer_Create(msg_class* i_this) { return ((dTimer_c*)i_this)->_create(); } diff --git a/src/d/d_water_mark.cpp b/src/d/d_water_mark.cpp index b6dea08f7..9db0269b6 100644 --- a/src/d/d_water_mark.cpp +++ b/src/d/d_water_mark.cpp @@ -7,7 +7,7 @@ #include "f_op/f_op_kankyo.h" /* 8023DB48-8023DBF8 .text dWaterMark_Draw__FP12dWaterMark_c */ -static void dWaterMark_Draw(dWaterMark_c*) { +static BOOL dWaterMark_Draw(dWaterMark_c*) { /* Nonmatching */ } @@ -17,22 +17,22 @@ void dWaterMark_c::setMatrix() { } /* 8023DE2C-8023DF24 .text dWaterMark_Execute__FP12dWaterMark_c */ -static void dWaterMark_Execute(dWaterMark_c*) { +static BOOL dWaterMark_Execute(dWaterMark_c*) { /* Nonmatching */ } /* 8023DF24-8023DF2C .text dWaterMark_IsDelete__FP12dWaterMark_c */ -static void dWaterMark_IsDelete(dWaterMark_c*) { +static BOOL dWaterMark_IsDelete(dWaterMark_c*) { /* Nonmatching */ } /* 8023DF2C-8023DF80 .text dWaterMark_Delete__FP12dWaterMark_c */ -static void dWaterMark_Delete(dWaterMark_c*) { +static BOOL dWaterMark_Delete(dWaterMark_c*) { /* Nonmatching */ } /* 8023DF80-8023DFA0 .text dWaterMark_Create__FP12kankyo_class */ -static void dWaterMark_Create(kankyo_class*) { +static cPhs_State dWaterMark_Create(kankyo_class*) { /* Nonmatching */ } diff --git a/src/d/d_wind_arrow.cpp b/src/d/d_wind_arrow.cpp index eee0232ca..692a21581 100644 --- a/src/d/d_wind_arrow.cpp +++ b/src/d/d_wind_arrow.cpp @@ -107,7 +107,7 @@ static BOOL dWindArrow_Delete(dWindArrow_c* i_this) { return TRUE; } -s32 dWindArrow_c::create() { +cPhs_State dWindArrow_c::create() { new(this) dWindArrow_c(); J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("Always", ALWAYS_BDL_YA); @@ -133,11 +133,11 @@ s32 dWindArrow_c::create() { } /* 8023E7A8-8023E968 .text dWindArrow_Create__FP12kankyo_class */ -static s32 dWindArrow_Create(kankyo_class* i_k) { +static cPhs_State dWindArrow_Create(kankyo_class* i_k) { dWindArrow_c* i_this = (dWindArrow_c*)i_k; if (!i_this->createHeap()) return cPhs_ERROR_e; - s32 phase_state = i_this->create(); + cPhs_State phase_state = i_this->create(); i_this->adjustHeap(); return phase_state; } diff --git a/src/d/d_wpillar.cpp b/src/d/d_wpillar.cpp index 663bf1f49..f59226211 100644 --- a/src/d/d_wpillar.cpp +++ b/src/d/d_wpillar.cpp @@ -24,7 +24,7 @@ void dWpillar_c::draw() { } /* 8023ECF8-8023ED18 .text dWpillar_Draw__FP10dWpillar_c */ -static void dWpillar_Draw(dWpillar_c*) { +static BOOL dWpillar_Draw(dWpillar_c*) { /* Nonmatching */ } @@ -34,12 +34,12 @@ void dWpillar_c::execute() { } /* 8023EDB0-8023EDD0 .text dWpillar_Execute__FP10dWpillar_c */ -static void dWpillar_Execute(dWpillar_c*) { +static BOOL dWpillar_Execute(dWpillar_c*) { /* Nonmatching */ } /* 8023EDD0-8023EDD8 .text dWpillar_IsDelete__FP10dWpillar_c */ -static void dWpillar_IsDelete(dWpillar_c*) { +static BOOL dWpillar_IsDelete(dWpillar_c*) { /* Nonmatching */ } @@ -49,7 +49,7 @@ void dWpillar_c::wp_delete() { } /* 8023EE08-8023EE28 .text dWpillar_Delete__FP10dWpillar_c */ -static void dWpillar_Delete(dWpillar_c*) { +static BOOL dWpillar_Delete(dWpillar_c*) { /* Nonmatching */ } @@ -59,6 +59,6 @@ void dWpillar_c::create() { } /* 8023F5B0-8023F5D0 .text dWpillar_Create__FP12kankyo_class */ -static void dWpillar_Create(kankyo_class*) { +static cPhs_State dWpillar_Create(kankyo_class*) { /* Nonmatching */ } diff --git a/src/d/d_wpot_water.cpp b/src/d/d_wpot_water.cpp index c023a5df1..76a90a998 100644 --- a/src/d/d_wpot_water.cpp +++ b/src/d/d_wpot_water.cpp @@ -59,7 +59,7 @@ static BOOL dWpotWater_Delete(dWpotWater_c* i_this) { return TRUE; } -s32 dWpotWater_c::create() { +cPhs_State dWpotWater_c::create() { new(this) dWpotWater_c(); dComIfGp_particle_set(dPa_name::ID_SCENE_8083, &mPos); dComIfGp_particle_set(dPa_name::ID_SCENE_8084, &mPos); @@ -73,7 +73,7 @@ s32 dWpotWater_c::create() { } /* 8023F750-8023FFCC .text dWpotWater_Create__FP12kankyo_class */ -static s32 dWpotWater_Create(kankyo_class* i_k) { +static cPhs_State dWpotWater_Create(kankyo_class* i_k) { dWpotWater_c* i_this = (dWpotWater_c*)i_k; dBgS_GndChk gndChk; diff --git a/src/dolphin/gba/GBA.c b/src/dolphin/gba/GBA.c index 73a61088a..1017068c1 100644 --- a/src/dolphin/gba/GBA.c +++ b/src/dolphin/gba/GBA.c @@ -66,7 +66,6 @@ s32 GBAGetStatus(s32 chan, u8* status) { s32 GBAResetAsync(s32 chan, u8* status, GBACallback callback) { GBAControl* gba = &__GBA[chan]; - s32 ret; if (gba->callback != NULL) { return GBA_BUSY; } diff --git a/src/f_op/f_op_actor.cpp b/src/f_op/f_op_actor.cpp index b0429e5c8..d0ac5787a 100644 --- a/src/f_op/f_op_actor.cpp +++ b/src/f_op/f_op_actor.cpp @@ -32,7 +32,7 @@ s32 fopAc_IsActor(void* pProc) { /* 80023540-8002362C .text fopAc_Draw__FPv */ s32 fopAc_Draw(void* pProc) { fopAc_ac_c * actor = (fopAc_ac_c *)pProc; - s32 ret = TRUE; + BOOL ret = TRUE; if (!dMenu_flag()) { s32 moveApproval = dComIfGp_event_moveApproval(actor); @@ -68,9 +68,9 @@ s32 fopAc_Draw(void* pProc) { #define CHECK_VEC3_RANGE(line, v) JUT_ASSERT(line, -1.0e32f < v.x && v.x < 1.0e32f && -1.0e32f < v.y && v.y < 1.0e32f && -1.0e32f < v.z && v.z < 1.0e32f) /* 8002362C-80023BDC .text fopAc_Execute__FPv */ -s32 fopAc_Execute(void* pProc) { +BOOL fopAc_Execute(void* pProc) { fopAc_ac_c * actor = (fopAc_ac_c *)pProc; - s32 ret = TRUE; + BOOL ret = TRUE; CHECK_FLOAT_CLASS(0x27d, actor->current.pos.x); CHECK_FLOAT_CLASS(0x27e, actor->current.pos.y); @@ -114,19 +114,19 @@ s32 fopAc_Execute(void* pProc) { } /* 80023BDC-80023C30 .text fopAc_IsDelete__FPv */ -s32 fopAc_IsDelete(void* pProc) { +BOOL fopAc_IsDelete(void* pProc) { fopAc_ac_c * actor = (fopAc_ac_c *)pProc; - s32 ret = fpcMtd_IsDelete((process_method_class*)actor->sub_method, actor); - if (ret == 1) + BOOL ret = fpcMtd_IsDelete((process_method_class*)actor->sub_method, actor); + if (ret == TRUE) fopDwTg_DrawQTo(&actor->draw_tag); return ret; } /* 80023C30-80023CD4 .text fopAc_Delete__FPv */ -s32 fopAc_Delete(void* pProc) { +BOOL fopAc_Delete(void* pProc) { fopAc_ac_c * actor = (fopAc_ac_c *)pProc; - s32 ret = fpcMtd_Delete((process_method_class*)actor->sub_method, actor); - if (ret == 1) { + BOOL ret = fpcMtd_Delete((process_method_class*)actor->sub_method, actor); + if (ret == TRUE) { fopAcTg_ActorQTo(&actor->actor_tag); fopDwTg_DrawQTo(&actor->draw_tag); fopAcM_DeleteHeap(actor); @@ -140,7 +140,7 @@ s32 fopAc_Delete(void* pProc) { } /* 80023CD4-80023F78 .text fopAc_Create__FPv */ -s32 fopAc_Create(void* pProc) { +cPhs_State fopAc_Create(void* pProc) { fopAc_ac_c* actor = (fopAc_ac_c*)pProc; if (fpcM_IsFirstCreating(actor)) { @@ -184,7 +184,7 @@ s32 fopAc_Create(void* pProc) { dKy_tevstr_init(&actor->tevStr, actor->home.roomNo, 0xFF); } - s32 status = fpcMtd_Create((process_method_class*)actor->sub_method, actor); + cPhs_State status = fpcMtd_Create((process_method_class*)actor->sub_method, actor); if (status == cPhs_COMPLEATE_e) { s32 priority = fpcLf_GetPriority(actor); fopDwTg_ToDrawQ(&actor->draw_tag, priority); diff --git a/src/f_op/f_op_actor_iter.cpp b/src/f_op/f_op_actor_iter.cpp index bf456040c..b07d2f4e4 100644 --- a/src/f_op/f_op_actor_iter.cpp +++ b/src/f_op/f_op_actor_iter.cpp @@ -8,7 +8,7 @@ #include "SSystem/SComponent/c_tag_iter.h" #include "f_op/f_op_actor_tag.h" -int fopAcIt_Executor(fopAcIt_ExecutorFunc i_execFunc, void* i_data) { +BOOL fopAcIt_Executor(fopAcIt_ExecutorFunc i_execFunc, void* i_data) { method_filter filter; filter.mpMethodFunc = (cNdIt_MethodFunc)i_execFunc; filter.mpUserData = i_data; diff --git a/src/f_op/f_op_actor_mng.cpp b/src/f_op/f_op_actor_mng.cpp index 57c8097c9..31c42468b 100644 --- a/src/f_op/f_op_actor_mng.cpp +++ b/src/f_op/f_op_actor_mng.cpp @@ -49,29 +49,29 @@ void fopAcM_setRoomLayer(void* pProc, int room_no) { } /* 800241C0-80024230 .text fopAcM_SearchByID__FUiPP10fopAc_ac_c */ -s32 fopAcM_SearchByID(fpc_ProcID actorID, fopAc_ac_c** pDstActor) { +BOOL fopAcM_SearchByID(fpc_ProcID actorID, fopAc_ac_c** pDstActor) { if (fpcM_IsCreating(actorID)) { *pDstActor = NULL; } else { fopAc_ac_c *pActor = fopAcM_Search((fopAcIt_JudgeFunc)fpcSch_JudgeByID, &actorID); *pDstActor = pActor; if (*pDstActor == NULL) - return 0; + return FALSE; } - return 1; + return TRUE; } /* 80024230-800242AC .text fopAcM_SearchByName__FsPP10fopAc_ac_c */ -s32 fopAcM_SearchByName(s16 procName, fopAc_ac_c** pDstActor) { +BOOL fopAcM_SearchByName(s16 procName, fopAc_ac_c** pDstActor) { *pDstActor = fopAcM_Search((fopAcIt_JudgeFunc)fpcSch_JudgeForPName, &procName); if (*pDstActor == NULL) { - return 0; + return FALSE; } else { if (fpcM_IsCreating(fopAcM_GetID(*pDstActor))) { *pDstActor = NULL; } - return 1; + return TRUE; } } @@ -132,14 +132,14 @@ void fopAcM_Log(fopAc_ac_c*, char*) { } /* 80024478-800244B8 .text fopAcM_delete__FP10fopAc_ac_c */ -s32 fopAcM_delete(fopAc_ac_c* pActor) { +BOOL fopAcM_delete(fopAc_ac_c* pActor) { /* "Deleting Actor" */ fopAcM_Log(pActor, "アクターの削除"); return fpcM_Delete(pActor); } /* 800244B8-8002451C .text fopAcM_delete__FUi */ -s32 fopAcM_delete(fpc_ProcID actorID) { +BOOL fopAcM_delete(fpc_ProcID actorID) { fopAc_ac_c* pActor = (fopAc_ac_c*)fopAcM_SearchByID(actorID); if (pActor != NULL) { diff --git a/src/f_op/f_op_camera.cpp b/src/f_op/f_op_camera.cpp index ff3305ca1..818afb862 100644 --- a/src/f_op/f_op_camera.cpp +++ b/src/f_op/f_op_camera.cpp @@ -10,8 +10,8 @@ #include "d/d_s_play.h" /* 80029278-800292CC .text fopCam_Draw__FP12camera_class */ -s32 fopCam_Draw(camera_class* camera) { - s32 cam_proc = 1; +BOOL fopCam_Draw(camera_class* camera) { + BOOL cam_proc = TRUE; if (!dMenu_flag()) { cam_proc = fpcLf_DrawMethod(camera->mpMtd, camera); @@ -20,8 +20,8 @@ s32 fopCam_Draw(camera_class* camera) { } /* 800292CC-80029328 .text fopCam_Execute__FP12camera_class */ -s32 fopCam_Execute(camera_class* camera) { - int ret; +BOOL fopCam_Execute(camera_class* camera) { + BOOL ret; if (!dMenu_flag() && !dScnPly_ply_c::isPause()) { ret = fpcMtd_Execute((process_method_class*)camera->mpMtd, camera); @@ -31,23 +31,23 @@ s32 fopCam_Execute(camera_class* camera) { } /* 80029328-8002937C .text fopCam_IsDelete__FP12camera_class */ -s32 fopCam_IsDelete(camera_class* camera) { - s32 ret = fpcMtd_IsDelete((process_method_class*)camera->mpMtd, camera); - if (ret == 1) +BOOL fopCam_IsDelete(camera_class* camera) { + BOOL ret = fpcMtd_IsDelete((process_method_class*)camera->mpMtd, camera); + if (ret == TRUE) fopDwTg_DrawQTo(&camera->draw_tag); return ret; } /* 8002937C-800293D0 .text fopCam_Delete__FP12camera_class */ -s32 fopCam_Delete(camera_class* camera) { - s32 ret = fpcMtd_Delete((process_method_class*)camera->mpMtd, camera); - if (ret == 1) +BOOL fopCam_Delete(camera_class* camera) { + BOOL ret = fpcMtd_Delete((process_method_class*)camera->mpMtd, camera); + if (ret == TRUE) fopDwTg_DrawQTo(&camera->draw_tag); return ret; } /* 800293D0-80029468 .text fopCam_Create__FPv */ -s32 fopCam_Create(void* pProc) { +cPhs_State fopCam_Create(void* pProc) { camera_class* camera = (camera_class*)pProc; if (fpcM_IsFirstCreating(pProc)) { @@ -63,7 +63,7 @@ s32 fopCam_Create(void* pProc) { } } - s32 ret = fpcMtd_Create(&camera->mpMtd->base, camera); + cPhs_State ret = fpcMtd_Create(&camera->mpMtd->base, camera); if (ret == cPhs_COMPLEATE_e) { s32 priority = fpcLf_GetPriority(camera); fopDwTg_ToDrawQ(&camera->draw_tag, priority); diff --git a/src/f_op/f_op_camera_mng.cpp b/src/f_op/f_op_camera_mng.cpp index 5bb24c58e..4695e994d 100644 --- a/src/f_op/f_op_camera_mng.cpp +++ b/src/f_op/f_op_camera_mng.cpp @@ -16,8 +16,8 @@ u32 fopCamM_GetParam(camera_class* i_this) { } /* 80029470-800294D4 .text fopCamM_Create__FisPv */ -fpc_ProcID fopCamM_Create(int i_cameraIdx, s16 i_procName, void* param_3) { - l_fopCamM_id[i_cameraIdx] = fpcSCtRq_Request(fpcLy_CurrentLayer(), i_procName, 0, 0, param_3); +fpc_ProcID fopCamM_Create(int i_cameraIdx, s16 i_procName, void* i_append) { + l_fopCamM_id[i_cameraIdx] = fpcSCtRq_Request(fpcLy_CurrentLayer(), i_procName, NULL, NULL, i_append); return l_fopCamM_id[i_cameraIdx]; } diff --git a/src/f_op/f_op_kankyo.cpp b/src/f_op/f_op_kankyo.cpp index 768cf047a..7bef5a13b 100644 --- a/src/f_op/f_op_kankyo.cpp +++ b/src/f_op/f_op_kankyo.cpp @@ -12,8 +12,8 @@ #include "d/d_s_play.h" /* 8002A454-8002A4A4 .text fopKy_Draw__FPv */ -static int fopKy_Draw(void* i_ky) { - int ret; +static BOOL fopKy_Draw(void* i_ky) { + BOOL ret; kankyo_class* i_this = (kankyo_class*)i_ky; if (!dMenu_flag()) { @@ -24,8 +24,8 @@ static int fopKy_Draw(void* i_ky) { } /* 8002A4A4-8002A514 .text fopKy_Execute__FPv */ -static int fopKy_Execute(void* i_ky) { - int ret; +static BOOL fopKy_Execute(void* i_ky) { + BOOL ret; kankyo_class* i_this = (kankyo_class*)i_ky; if (!dScnPly_ply_c::isPause() && (!dMenu_flag() || fpcM_GetName(i_ky) == PROC_ENVSE || fpcM_GetName(i_ky) == PROC_LEVEL_SE)) { @@ -36,8 +36,8 @@ static int fopKy_Execute(void* i_ky) { } /* 8002A514-8002A568 .text fopKy_IsDelete__FPv */ -static int fopKy_IsDelete(void* i_ky) { - int ret; +static BOOL fopKy_IsDelete(void* i_ky) { + BOOL ret; kankyo_class* i_this = (kankyo_class*)i_ky; ret = fpcMtd_IsDelete((process_method_class*)i_this->sub_method, i_this); @@ -49,10 +49,10 @@ static int fopKy_IsDelete(void* i_ky) { } /* 8002A568-8002A5B4 .text fopKy_Delete__FPv */ -static int fopKy_Delete(void* i_ky) { +static BOOL fopKy_Delete(void* i_ky) { kankyo_class* i_this = (kankyo_class*)i_ky; - int ret = fpcMtd_Delete((process_method_class*)i_this->sub_method, i_this); + BOOL ret = fpcMtd_Delete((process_method_class*)i_this->sub_method, i_this); fopDwTg_DrawQTo(&i_this->draw_tag); return ret; @@ -61,7 +61,7 @@ static int fopKy_Delete(void* i_ky) { static int fopKy_KANKYO_TYPE; /* 8002A5B4-8002A688 .text fopKy_Create__FPv */ -static int fopKy_Create(void* i_ky) { +static cPhs_State fopKy_Create(void* i_ky) { kankyo_class* i_this = (kankyo_class*)i_ky; if (fpcM_IsFirstCreating(i_ky)) { @@ -80,7 +80,7 @@ static int fopKy_Create(void* i_ky) { } } - int ret = fpcMtd_Create((process_method_class*)i_this->sub_method, i_this); + cPhs_State ret = fpcMtd_Create((process_method_class*)i_this->sub_method, i_this); if (ret == cPhs_COMPLEATE_e) { s32 priority = fpcLf_GetPriority(i_this); fopDwTg_ToDrawQ(&i_this->draw_tag, priority); diff --git a/src/f_op/f_op_msg.cpp b/src/f_op/f_op_msg.cpp index 3aaf4be9d..b6e85790d 100644 --- a/src/f_op/f_op_msg.cpp +++ b/src/f_op/f_op_msg.cpp @@ -70,7 +70,7 @@ int fopMsg_Create(void* i_this) { } } - int status = fpcMtd_Create((process_method_class*)_this->sub_method, _this); + cPhs_State status = fpcMtd_Create((process_method_class*)_this->sub_method, _this); if (status == cPhs_COMPLEATE_e) { s32 priority = fpcLf_GetPriority(_this); fopDwTg_ToDrawQ(&_this->draw_tag, priority); diff --git a/src/f_op/f_op_overlap.cpp b/src/f_op/f_op_overlap.cpp index dfe819295..9c79c0ff2 100644 --- a/src/f_op/f_op_overlap.cpp +++ b/src/f_op/f_op_overlap.cpp @@ -28,7 +28,7 @@ static s32 fopOvlp_Delete(void* i_ovlp) { return fpcMtd_Delete((process_method_class*)i_this->sub_method, i_this); } -static s32 fopOvlp_Create(void* i_ovlp) { +static cPhs_State fopOvlp_Create(void* i_ovlp) { overlap_task_class* i_this = (overlap_task_class*)i_ovlp; if (fpcM_IsFirstCreating(i_this)) { diff --git a/src/f_op/f_op_overlap_mng.cpp b/src/f_op/f_op_overlap_mng.cpp index 4b55eaf37..b4a752287 100644 --- a/src/f_op/f_op_overlap_mng.cpp +++ b/src/f_op/f_op_overlap_mng.cpp @@ -29,7 +29,7 @@ int fopOvlpM_SceneIsStart() { } } -int fopOvlpM_IsOutReq(overlap_task_class* pTaskClass) { +BOOL fopOvlpM_IsOutReq(overlap_task_class* pTaskClass) { return pTaskClass->mRq.flag2 == 2; } @@ -42,33 +42,33 @@ void fopOvlpM_ToldAboutID(fpc_ProcID pcId) { l_fopOvlpM_overlap[0]->mpTask->mScenePId = pcId; } -int fopOvlpM_IsPeek() { +BOOL fopOvlpM_IsPeek() { if (l_fopOvlpM_overlap[0] != NULL) return l_fopOvlpM_overlap[0]->mIsPeek; else - return 0; + return FALSE; } -int fopOvlpM_IsDone() { +BOOL fopOvlpM_IsDone() { if (l_fopOvlpM_overlap[0] != NULL) return cReq_Is_Done(l_fopOvlpM_overlap[0]); else - return 0; + return FALSE; } -int fopOvlpM_IsDoingReq() { +BOOL fopOvlpM_IsDoingReq() { if (l_fopOvlpM_overlap[0] && l_fopOvlpM_overlap[0]->field_0x4 == 1) { - return 1; + return TRUE; } - return 0; + return FALSE; } -int fopOvlpM_ClearOfReq() { +BOOL fopOvlpM_ClearOfReq() { if (l_fopOvlpM_overlap[0] != NULL) return fopOvlpReq_OverlapClr(l_fopOvlpM_overlap[0]); else - return 0; + return FALSE; } static overlap_request_class l_fopOvlpM_Request; diff --git a/src/f_op/f_op_overlap_req.cpp b/src/f_op/f_op_overlap_req.cpp index 43ab7a0c7..26978f867 100644 --- a/src/f_op/f_op_overlap_req.cpp +++ b/src/f_op/f_op_overlap_req.cpp @@ -12,7 +12,7 @@ void fopOvlpReq_SetPeektime(overlap_request_class*, u16); static int fopOvlpReq_phase_Done(overlap_request_class* i_this) { - if (fpcM_Delete(i_this->mpTask) == 1) { + if (fpcM_Delete(i_this->mpTask) == TRUE) { i_this->mpTask = NULL; i_this->field_0x4 = 0; i_this->mPeektime = 0; @@ -76,9 +76,9 @@ static s32 fopOvlpReq_phase_IsCreated(overlap_request_class* i_this) { return cPhs_INIT_e; } -static s32 fopOvlpReq_phase_Create(overlap_request_class* i_this) { +static cPhs_State fopOvlpReq_phase_Create(overlap_request_class* i_this) { fpcLy_SetCurrentLayer(i_this->pCurrentLayer); - i_this->mPId = fpcSCtRq_Request(fpcLy_CurrentLayer(), i_this->mProcName, 0, 0, 0); + i_this->mPId = fpcSCtRq_Request(fpcLy_CurrentLayer(), i_this->mProcName, NULL, NULL, NULL); return cPhs_NEXT_e; } @@ -112,8 +112,8 @@ overlap_request_class* fopOvlpReq_Request(overlap_request_class* i_this, s16 pro return i_this; } -s32 fopOvlpReq_Handler(overlap_request_class* i_this) { - s32 phase_state = cPhs_Do(&i_this->mPhs, i_this); +cPhs_State fopOvlpReq_Handler(overlap_request_class* i_this) { + cPhs_State phase_state = cPhs_Do(&i_this->mPhs, i_this); switch (phase_state) { case cPhs_NEXT_e: @@ -147,10 +147,10 @@ void fopOvlpReq_SetPeektime(overlap_request_class* i_this, u16 peekTime) { i_this->mPeektime = peekTime; } -int fopOvlpReq_OverlapClr(overlap_request_class* i_this) { +BOOL fopOvlpReq_OverlapClr(overlap_request_class* i_this) { if (i_this->flag0 == 1 || !fopOvlpReq_Is_PeektimeLimit(i_this)) - return 0; + return FALSE; cReq_Create(i_this, 2); - return 1; + return TRUE; } diff --git a/src/f_op/f_op_scene.cpp b/src/f_op/f_op_scene.cpp index 6ac67d5e6..e35b32c76 100644 --- a/src/f_op/f_op_scene.cpp +++ b/src/f_op/f_op_scene.cpp @@ -7,29 +7,29 @@ #include "f_pc/f_pc_manager.h" #include "m_Do/m_Do_hostIO.h" -static void fopScn_Draw(scene_class* i_this) { - fpcNd_DrawMethod((nodedraw_method_class*)i_this->mpMtd, i_this); +static BOOL fopScn_Draw(scene_class* i_this) { + return fpcNd_DrawMethod((nodedraw_method_class*)i_this->mpMtd, i_this); } -static void fopScn_Execute(scene_class* i_this) { - fpcMtd_Execute((process_method_class*)i_this->mpMtd, i_this); +static BOOL fopScn_Execute(scene_class* i_this) { + return fpcMtd_Execute((process_method_class*)i_this->mpMtd, i_this); } -static s32 fopScn_IsDelete(void* i_this) { +static BOOL fopScn_IsDelete(void* i_this) { return fpcMtd_IsDelete((process_method_class*)((scene_class*)i_this)->mpMtd, i_this); } -static s32 fopScn_Delete(void* i_this) { +static BOOL fopScn_Delete(void* i_this) { scene_class* scene = static_cast(i_this); - s32 ret = fpcMtd_Delete((process_method_class*)scene->mpMtd, scene); - if (ret == 1) { + BOOL ret = fpcMtd_Delete((process_method_class*)scene->mpMtd, scene); + if (ret == TRUE) { fopScnTg_QueueTo(&scene->mScnTg); } mDoHIO_root.update(); return ret; } -static s32 fopScn_Create(void* i_this) { +static cPhs_State fopScn_Create(void* i_this) { scene_class* scene = static_cast(i_this); if (fpcM_IsFirstCreating(i_this)) { scene_process_profile_definition* profile = (scene_process_profile_definition*)fpcM_GetProfile(i_this); diff --git a/src/f_op/f_op_scene_mng.cpp b/src/f_op/f_op_scene_mng.cpp index bbf91d188..ac5197c64 100644 --- a/src/f_op/f_op_scene_mng.cpp +++ b/src/f_op/f_op_scene_mng.cpp @@ -16,15 +16,15 @@ scene_class* fopScnM_SearchByID(fpc_ProcID id) { static uint l_scnRqID = -1; -int fopScnM_ChangeReq(scene_class* i_scene, s16 procName, s16 fadeProcName, u16 fadePeekTime) { +BOOL fopScnM_ChangeReq(scene_class* i_scene, s16 procName, s16 fadeProcName, u16 fadePeekTime) { uint sceneRequestID = fopScnRq_Request(2, i_scene, procName, 0, fadeProcName, fadePeekTime); if (sceneRequestID == -1) { - return 0; + return FALSE; } l_scnRqID = sceneRequestID; - return 1; + return TRUE; } BOOL fopScnM_DeleteReq(scene_class* i_scene) { diff --git a/src/f_op/f_op_scene_req.cpp b/src/f_op/f_op_scene_req.cpp index 17d8c805c..e37ab44f9 100644 --- a/src/f_op/f_op_scene_req.cpp +++ b/src/f_op/f_op_scene_req.cpp @@ -9,37 +9,25 @@ #include "f_op/f_op_scene_pause.h" #include "f_pc/f_pc_executor.h" -static cPhs__Step fopScnRq_phase_ClearOverlap(scene_request_class* i_sceneReq) { - if (fopOvlpM_ClearOfReq() == 1) { - return cPhs_NEXT_e; - } else { - return cPhs_INIT_e; - } +static cPhs_State fopScnRq_phase_ClearOverlap(scene_request_class* i_sceneReq) { + return fopOvlpM_ClearOfReq() == TRUE ? cPhs_NEXT_e : cPhs_INIT_e; } -static cPhs__Step fopScnRq_phase_Execute(scene_request_class* i_sceneReq) { - return (cPhs__Step)fpcNdRq_Execute(&i_sceneReq->mCrtReq); +static cPhs_State fopScnRq_phase_Execute(scene_request_class* i_sceneReq) { + return fpcNdRq_Execute(&i_sceneReq->mCrtReq); } -static cPhs__Step fopScnRq_phase_IsDoingOverlap(scene_request_class* i_sceneReq) { - if (fopOvlpM_IsDoingReq() == 1) { - return cPhs_NEXT_e; - } else { - return cPhs_INIT_e; - } +static cPhs_State fopScnRq_phase_IsDoingOverlap(scene_request_class* i_sceneReq) { + return fopOvlpM_IsDoingReq() == TRUE ? cPhs_NEXT_e : cPhs_INIT_e; } -static cPhs__Step fopScnRq_phase_IsDoneOverlap(scene_request_class* i_sceneReq) { - if (fopOvlpM_IsDone() == 1) { - return cPhs_NEXT_e; - } else { - return cPhs_INIT_e; - } +static cPhs_State fopScnRq_phase_IsDoneOverlap(scene_request_class* i_sceneReq) { + return fopOvlpM_IsDone() == TRUE ? cPhs_NEXT_e : cPhs_INIT_e; } static s32 l_fopScnRq_IsUsingOfOverlap; -static cPhs__Step fopScnRq_phase_Done(scene_request_class* i_sceneReq) { +static cPhs_State fopScnRq_phase_Done(scene_request_class* i_sceneReq) { if (i_sceneReq->mCrtReq.mParameter != 1) { fopScnPause_Disable((scene_class*)fpcEx_SearchByID(i_sceneReq->mCrtReq.mCreatingID)); } @@ -48,10 +36,11 @@ static cPhs__Step fopScnRq_phase_Done(scene_request_class* i_sceneReq) { } static void fopScnRq_Execute(scene_request_class* i_sceneReq) { - int tmp = cPhs_Do(&i_sceneReq->mReqPhsProcCls, i_sceneReq); - switch (tmp) { - case 2: + cPhs_State phase_state = cPhs_Do(&i_sceneReq->mReqPhsProcCls, i_sceneReq); + switch (phase_state) { + case cPhs_NEXT_e: fopScnRq_Execute(i_sceneReq); + break; } } diff --git a/src/f_op/f_op_view.cpp b/src/f_op/f_op_view.cpp index 7f0995a6f..77fe4281e 100644 --- a/src/f_op/f_op_view.cpp +++ b/src/f_op/f_op_view.cpp @@ -6,24 +6,24 @@ #include "f_op/f_op_view.h" #include "f_pc/f_pc_manager.h" -void fopVw_Draw(view_class* i_this) { - fpcLf_DrawMethod(i_this->sub_method, i_this); +BOOL fopVw_Draw(view_class* i_this) { + return fpcLf_DrawMethod(i_this->sub_method, i_this); } -void fopVw_Execute(view_class* i_this) { - fpcMtd_Execute(&i_this->sub_method->base, i_this); +BOOL fopVw_Execute(view_class* i_this) { + return fpcMtd_Execute(&i_this->sub_method->base, i_this); } -s32 fopVw_IsDelete(void* i_this) { +BOOL fopVw_IsDelete(void* i_this) { view_class* _this = (view_class*)i_this; return fpcMtd_IsDelete(&_this->sub_method->base, _this); } -s32 fopVw_Delete(view_class* i_this) { +BOOL fopVw_Delete(view_class* i_this) { return fpcMtd_Delete(&i_this->sub_method->base, i_this); } -s32 fopVw_Create(void* i_this) { +cPhs_State fopVw_Create(void* i_this) { view_class* _this = (view_class*)i_this; view_process_profile_definition* pProf = @@ -35,7 +35,9 @@ s32 fopVw_Create(void* i_this) { } leafdraw_method_class g_fopVw_Method = { - (process_method_func)fopVw_Create, (process_method_func)fopVw_Delete, - (process_method_func)fopVw_Execute, (process_method_func)fopVw_IsDelete, + (process_method_func)fopVw_Create, + (process_method_func)fopVw_Delete, + (process_method_func)fopVw_Execute, + (process_method_func)fopVw_IsDelete, (process_method_func)fopVw_Draw, }; diff --git a/src/f_pc/f_pc_base.cpp b/src/f_pc/f_pc_base.cpp index 8f051dff0..9bbad4888 100644 --- a/src/f_pc/f_pc_base.cpp +++ b/src/f_pc/f_pc_base.cpp @@ -25,7 +25,7 @@ BOOL fpcBs_Is_JustOfType(int i_typeA, int i_typeB) { static int g_fpcBs_type; /* 8003C89C-8003C8DC .text fpcBs_MakeOfType__FPi */ -s32 fpcBs_MakeOfType(int* i_type) { +int fpcBs_MakeOfType(int* i_type) { static s32 t_type = 0x9130000; if (*i_type == 0) { *i_type = ++t_type; @@ -40,8 +40,8 @@ fpc_ProcID fpcBs_MakeOfId() { } /* 8003C904-8003C960 .text fpcBs_Execute__FP18base_process_class */ -s32 fpcBs_Execute(base_process_class* i_proc) { - s32 result; +BOOL fpcBs_Execute(base_process_class* i_proc) { + BOOL result; layer_class* savedLayer = fpcLy_CurrentLayer(); fpcLy_SetCurrentLayer(i_proc->mLyTg.mpLayer); result = fpcMtd_Execute(i_proc->mpPcMtd, i_proc); @@ -58,8 +58,8 @@ void fpcBs_DeleteAppend(base_process_class* i_proc) { } /* 8003C9A0-8003C9FC .text fpcBs_IsDelete__FP18base_process_class */ -s32 fpcBs_IsDelete(base_process_class* i_proc) { - s32 result; +BOOL fpcBs_IsDelete(base_process_class* i_proc) { + BOOL result; layer_class* savedLayer = fpcLy_CurrentLayer(); fpcLy_SetCurrentLayer(i_proc->mLyTg.mpLayer); result = fpcMtd_IsDelete(i_proc->mpPcMtd, i_proc); @@ -68,9 +68,9 @@ s32 fpcBs_IsDelete(base_process_class* i_proc) { } /* 8003C9FC-8003CA60 .text fpcBs_Delete__FP18base_process_class */ -s32 fpcBs_Delete(base_process_class* i_proc) { - s32 deleteResult = fpcMtd_Delete(i_proc->mpPcMtd, i_proc); - if (deleteResult == 1) { +BOOL fpcBs_Delete(base_process_class* i_proc) { + BOOL deleteResult = fpcMtd_Delete(i_proc->mpPcMtd, i_proc); + if (deleteResult == TRUE) { fpcBs_DeleteAppend(i_proc); i_proc->mBsType = 0; cMl::free(i_proc); @@ -112,7 +112,7 @@ base_process_class* fpcBs_Create(s16 i_profName, fpc_ProcID i_procID, void* i_da } /* 8003CB5C-8003CC08 .text fpcBs_SubCreate__FP18base_process_class */ -s32 fpcBs_SubCreate(base_process_class* i_proc) { +cPhs_State fpcBs_SubCreate(base_process_class* i_proc) { switch (fpcMtd_Create(i_proc->mpPcMtd, i_proc)) { case cPhs_NEXT_e: case cPhs_COMPLEATE_e: diff --git a/src/f_pc/f_pc_create_iter.cpp b/src/f_pc/f_pc_create_iter.cpp index 109593998..0e5709d2d 100644 --- a/src/f_pc/f_pc_create_iter.cpp +++ b/src/f_pc/f_pc_create_iter.cpp @@ -10,9 +10,9 @@ #include "f_pc/f_pc_layer.h" /* 8003CC08-8003CC44 .text fpcCtIt_Method__FPFPvPv_iPv */ -s32 fpcCtIt_Method(fpcCtIt_MethodFunc i_judgeFunc, void* i_data) { - node_method_data iter; - iter.mFunc = i_judgeFunc; +BOOL fpcCtIt_Method(fpcCtIt_MethodFunc i_judgeFunc, void* i_data) { + method_filter iter; + iter.mpMethodFunc = (cNdIt_MethodFunc)i_judgeFunc; iter.mpUserData = i_data; return cLsIt_Method(&g_fpcCtTg_Queue, (cNdIt_MethodFunc)cTgIt_MethodCall, &iter); } diff --git a/src/f_pc/f_pc_create_req.cpp b/src/f_pc/f_pc_create_req.cpp index be22a3ab8..7f10c5648 100644 --- a/src/f_pc/f_pc_create_req.cpp +++ b/src/f_pc/f_pc_create_req.cpp @@ -40,14 +40,14 @@ void fpcCtRq_ToCreateQ(create_request* i_request) { /* 8003CDE0-8003CE54 .text fpcCtRq_Delete__FP14create_request */ BOOL fpcCtRq_Delete(create_request* i_request) { fpcCtRq_CreateQTo(i_request); - if (i_request->mpCtRqMtd != NULL && fpcMtd_Method(i_request->mpCtRqMtd->mpDelete, i_request) == 0) { - return 0; + if (i_request->mpCtRqMtd != NULL && fpcMtd_Method(i_request->mpCtRqMtd->mpDelete, i_request) == FALSE) { + return FALSE; } else { if (i_request->mpRes) { i_request->mpRes->mpCtRq = NULL; } cMl::free(i_request); - return 1; + return TRUE; } } @@ -71,7 +71,7 @@ BOOL fpcCtRq_Cancel(create_request* i_request) { } /* 8003CEEC-8003CF08 .text fpcCtRq_IsDoing__FP14create_request */ -s32 fpcCtRq_IsDoing(create_request* i_request) { +BOOL fpcCtRq_IsDoing(create_request* i_request) { if (i_request != NULL) return i_request->mbIsCreating; else @@ -80,7 +80,7 @@ s32 fpcCtRq_IsDoing(create_request* i_request) { /* 8003CF08-8003CFC4 .text fpcCtRq_Do__FP14create_request */ BOOL fpcCtRq_Do(create_request* i_request) { - s32 phase = cPhs_COMPLEATE_e; + cPhs_State phase = cPhs_COMPLEATE_e; if (i_request->mpCtRqMtd != NULL) { cPhs__Handler pHandler = i_request->mpCtRqMtd->mpHandler; @@ -93,22 +93,22 @@ BOOL fpcCtRq_Do(create_request* i_request) { switch (phase) { case cPhs_COMPLEATE_e: { - s32 success = fpcEx_ToExecuteQ(i_request->mpRes); - if (success == 0) + BOOL success = fpcEx_ToExecuteQ(i_request->mpRes); + if (success == FALSE) return fpcCtRq_Cancel(i_request); else return fpcCtRq_Delete(i_request); } - case 3: + case cPhs_STOP_e: case cPhs_ERROR_e: return fpcCtRq_Cancel(i_request); } - return 1; + return TRUE; } /* 8003CFC4-8003CFF0 .text fpcCtRq_Handler__Fv */ -s32 fpcCtRq_Handler() { +BOOL fpcCtRq_Handler() { return fpcCtIt_Method((fpcCtIt_MethodFunc)fpcCtRq_Do, NULL); } diff --git a/src/f_pc/f_pc_creator.cpp b/src/f_pc/f_pc_creator.cpp index 52df73bbe..553ba5c74 100644 --- a/src/f_pc/f_pc_creator.cpp +++ b/src/f_pc/f_pc_creator.cpp @@ -13,7 +13,7 @@ BOOL fpcCt_IsCreatingByID(fpc_ProcID i_id) { } /* 8003D108-8003D12C .text fpcCt_IsDoing__FP18base_process_class */ -s32 fpcCt_IsDoing(base_process_class* i_proc) { +BOOL fpcCt_IsDoing(base_process_class* i_proc) { return fpcCtRq_IsDoing(i_proc->mpCtRq); } @@ -23,6 +23,6 @@ BOOL fpcCt_Abort(base_process_class* i_proc) { } /* 8003D150-8003D170 .text fpcCt_Handler__Fv */ -s32 fpcCt_Handler() { +BOOL fpcCt_Handler() { return fpcCtRq_Handler(); } diff --git a/src/f_pc/f_pc_deletor.cpp b/src/f_pc/f_pc_deletor.cpp index cdffc4345..4b5eaa617 100644 --- a/src/f_pc/f_pc_deletor.cpp +++ b/src/f_pc/f_pc_deletor.cpp @@ -38,77 +38,75 @@ void fpcDt_Handler(void) { } /* 8003D34C-8003D3C8 .text fpcDt_ToQueue__FP18base_process_class */ -s32 fpcDt_ToQueue(base_process_class* i_proc) { - if (i_proc->mUnk0 != 1 && fpcBs_IsDelete(i_proc) == 1) { +BOOL fpcDt_ToQueue(base_process_class* i_proc) { + if (i_proc->mUnk0 != 1 && fpcBs_IsDelete(i_proc) == TRUE) { if (fpcPi_IsInQueue(&i_proc->mPi) == 1) { fpcPi_Delete(&i_proc->mPi); } i_proc->mDtTg.mpLayer = i_proc->mLyTg.mpLayer; fpcDtTg_ToDeleteQ(&i_proc->mDtTg); fpcLy_DeletingMesg(i_proc->mLyTg.mpLayer); - return 1; + return TRUE; } else { - return 0; + return FALSE; } } /* 8003D3C8-8003D51C .text fpcDt_ToDeleteQ__FP18base_process_class */ -s32 fpcDt_ToDeleteQ(base_process_class* i_proc) { +BOOL fpcDt_ToDeleteQ(base_process_class* i_proc) { if (i_proc->mUnk0 == 1) { - return 0; + return FALSE; } else { if (cTg_IsUse(&i_proc->mDtTg.base) != 0) { - return 1; + return TRUE; } else { if (fpcBs_Is_JustOfType(g_fpcNd_type, i_proc->mSubType)) { process_node_class* procNode = (process_node_class*)i_proc; - if (fpcNd_IsDeleteTiming(procNode) == 0) { - return 0; + if (fpcNd_IsDeleteTiming(procNode) == FALSE) { + return FALSE; } else { layer_class* layer = &procNode->mLayer; if (!fpcLy_Cancel(layer)) JUT_ASSERT(196, FALSE); - if (fpcLyIt_OnlyHereLY(layer, (fpcLyIt_OnlyHereFunc)fpcDt_ToDeleteQ, NULL) == 0) { - return 0; + if (fpcLyIt_OnlyHereLY(layer, (fpcLyIt_OnlyHereFunc)fpcDt_ToDeleteQ, NULL) == FALSE) { + return FALSE; } } } - if (fpcDt_ToQueue(i_proc) == 1) { - // return type has to be BOOL - if (fpcEx_IsExist(i_proc->mBsPcId) == 1) { - if (fpcEx_ExecuteQTo(i_proc) == 0) { - return 0; + if (fpcDt_ToQueue(i_proc) == TRUE) { + if (fpcEx_IsExist(i_proc->mBsPcId) == TRUE) { + if (fpcEx_ExecuteQTo(i_proc) == FALSE) { + return FALSE; } } else { - // return type is wrong, has to be BOOL - if (fpcCt_Abort(i_proc) == 0) { - return 0; + if (fpcCt_Abort(i_proc) == FALSE) { + return FALSE; } } i_proc->mInitState = 3; - return 1; + return TRUE; } else { - return 0; + return FALSE; } } } } /* 8003D51C-8003D580 .text fpcDt_Delete__FPv */ -s32 fpcDt_Delete(void* i_proc) { +BOOL fpcDt_Delete(void* i_proc) { base_process_class* proc = static_cast(i_proc); if (proc != NULL) { - if (fpcCt_IsDoing(proc) == 1) - return 0; + if (fpcCt_IsDoing(proc) == TRUE) + return FALSE; if (proc->mInitState == 3) - return 0; + return FALSE; return fpcDt_ToDeleteQ(proc); } else { - return 1; + return TRUE; } } diff --git a/src/f_pc/f_pc_draw.cpp b/src/f_pc/f_pc_draw.cpp index ef7b7bcf1..6a75a266d 100644 --- a/src/f_pc/f_pc_draw.cpp +++ b/src/f_pc/f_pc_draw.cpp @@ -10,10 +10,10 @@ #include "f_pc/f_pc_pause.h" /* 8004042C-800404CC .text fpcDw_Execute__FP18base_process_class */ -s32 fpcDw_Execute(base_process_class* i_proc) { +BOOL fpcDw_Execute(base_process_class* i_proc) { if (!fpcPause_IsEnable(i_proc, 2)) { layer_class* curLay; - s32 ret; + BOOL ret; process_method_func draw_func; curLay = fpcLy_CurrentLayer(); if (fpcBs_Is_JustOfType(g_fpcLf_type, i_proc->mSubType)) { @@ -26,15 +26,15 @@ s32 fpcDw_Execute(base_process_class* i_proc) { fpcLy_SetCurrentLayer(curLay); return ret; } else { - return 0; + return FALSE; } } /* 800404CC-80040520 .text fpcDw_Handler__FPFPFPvPv_i_iPFPvPv_i */ -s32 fpcDw_Handler(fpcDw_HandlerFuncFunc param_1, fpcDw_HandlerFunc param_2) { - s32 ret; +BOOL fpcDw_Handler(fpcDw_HandlerFuncFunc i_iterHandler, fpcDw_HandlerFunc i_func) { + BOOL ret; cAPIGph_BeforeOfDraw(); - ret = param_1(param_2); + ret = i_iterHandler(i_func); cAPIGph_AfterOfDraw(); return ret; } diff --git a/src/f_pc/f_pc_executor.cpp b/src/f_pc/f_pc_executor.cpp index 740159f08..9716c7dd7 100644 --- a/src/f_pc/f_pc_executor.cpp +++ b/src/f_pc/f_pc_executor.cpp @@ -27,9 +27,9 @@ BOOL fpcEx_IsExist(fpc_ProcID i_id) { } /* 8003D63C-8003D690 .text fpcEx_Execute__FP18base_process_class */ -s32 fpcEx_Execute(base_process_class* i_proc) { +BOOL fpcEx_Execute(base_process_class* i_proc) { if (i_proc->mInitState != 2 || fpcPause_IsEnable(i_proc, 1) == 1) - return 0; + return FALSE; return fpcBs_Execute(i_proc); } @@ -58,25 +58,25 @@ s32 fpcEx_ToLineQ(base_process_class* i_proc) { } /* 8003D73C-8003D788 .text fpcEx_ExecuteQTo__FP18base_process_class */ -s32 fpcEx_ExecuteQTo(base_process_class* i_proc) { - s32 ret = fpcLyTg_QueueTo(&i_proc->mLyTg); - if (ret == 1) { +BOOL fpcEx_ExecuteQTo(base_process_class* i_proc) { + BOOL ret = fpcLyTg_QueueTo(&i_proc->mLyTg); + if (ret == TRUE) { i_proc->mInitState = 3; - return 1; + return TRUE; } else { - return 0; + return FALSE; } } /* 8003D788-8003D7E0 .text fpcEx_ToExecuteQ__FP18base_process_class */ -s32 fpcEx_ToExecuteQ(base_process_class* i_proc) { - s32 ret = fpcLyTg_ToQueue(&i_proc->mLyTg, i_proc->mPi.mInfoCurr.mLayer, +BOOL fpcEx_ToExecuteQ(base_process_class* i_proc) { + BOOL ret = fpcLyTg_ToQueue(&i_proc->mLyTg, i_proc->mPi.mInfoCurr.mLayer, i_proc->mPi.mInfoCurr.mListID, i_proc->mPi.mInfoCurr.mListPrio); - if (ret == 1) { + if (ret == TRUE) { fpcEx_ToLineQ(i_proc); - return 1; + return TRUE; } else { - return 0; + return FALSE; } } diff --git a/src/f_pc/f_pc_fstcreate_req.cpp b/src/f_pc/f_pc_fstcreate_req.cpp index 6f37b8595..cbda235e1 100644 --- a/src/f_pc/f_pc_fstcreate_req.cpp +++ b/src/f_pc/f_pc_fstcreate_req.cpp @@ -10,7 +10,7 @@ #include "SSystem/SComponent/c_phase.h" /* 80040520-80040570 .text fpcFCtRq_Do__FP19fast_create_request */ -s32 fpcFCtRq_Do(fast_create_request* i_createReq) { +cPhs_State fpcFCtRq_Do(fast_create_request* i_createReq) { if (i_createReq->mpFastCreateFunc != NULL && i_createReq->mpFastCreateFunc(i_createReq->base.mpRes, i_createReq->mpFastCreateData) == 0) { return cPhs_STOP_e; } else { @@ -19,21 +19,23 @@ s32 fpcFCtRq_Do(fast_create_request* i_createReq) { } /* 80040570-80040578 .text fpcFCtRq_Delete__FP19fast_create_request */ -s32 fpcFCtRq_Delete(fast_create_request* i_createReq) { - return 1; +BOOL fpcFCtRq_Delete(fast_create_request* i_createReq) { + return TRUE; } /* 80040578-80040648 .text fpcFCtRq_Request__FP11layer_classsPFPvPv_iPvPv */ base_process_class* fpcFCtRq_Request(layer_class* i_layer, s16 i_procTypeID, fstCreateFunc i_createFunc, void* i_createData, void* pData) { - static create_request_method_class submethod = {(cPhs__Handler)fpcFCtRq_Do, NULL, - (process_method_func)fpcFCtRq_Delete}; + static create_request_method_class submethod = { + (cPhs__Handler)fpcFCtRq_Do, + NULL, + (process_method_func)fpcFCtRq_Delete + }; if (!fpcLd_Use(i_procTypeID)) { return NULL; } else { - fast_create_request* request = - (fast_create_request*)fpcCtRq_Create(i_layer, 0x50, &submethod); + fast_create_request* request = (fast_create_request*)fpcCtRq_Create(i_layer, 0x50, &submethod); if (request != NULL) { base_process_class* proc; fpcLy_SetCurrentLayer(i_layer); diff --git a/src/f_pc/f_pc_layer.cpp b/src/f_pc/f_pc_layer.cpp index cef678601..5de5e6239 100644 --- a/src/f_pc/f_pc_layer.cpp +++ b/src/f_pc/f_pc_layer.cpp @@ -20,7 +20,7 @@ s32 fpcLy_ToCancelQ(layer_class* i_layer, process_method_tag_class* i_methods) { /* 8003D844-8003D870 .text fpcLy_CancelMethod__FP24process_method_tag_class */ bool fpcLy_CancelMethod(process_method_tag_class* i_layer) { - return fpcMtdTg_Do(i_layer) == 1; + return fpcMtdTg_Do(i_layer) == TRUE; } /* 8003D870-8003D894 .text fpcLy_IntoQueue__FP11layer_classiP16create_tag_classi */ @@ -128,18 +128,18 @@ void fpcLy_Regist(layer_class* i_layer) { } /* 8003DA60-8003DB14 .text fpcLy_Delete__FP11layer_class */ -s32 fpcLy_Delete(layer_class* i_layer) { +BOOL fpcLy_Delete(layer_class* i_layer) { if (i_layer->mNodeListTree.mpLists->mSize == 0 && i_layer->mCancelList.mSize == 0) { cLs_SingleCut((node_class*)i_layer); *i_layer = l_fpcLy_Crear; - return 1; + return TRUE; } else { - return 0; + return FALSE; } } /* 8003DB14-8003DB40 .text fpcLy_Cancel__FP11layer_class */ -s32 fpcLy_Cancel(layer_class* i_layer) { +BOOL fpcLy_Cancel(layer_class* i_layer) { return fpcMtdIt_Method(&i_layer->mCancelList, (fpcMtdIt_MethodFunc)fpcLy_CancelMethod); } diff --git a/src/f_pc/f_pc_layer_iter.cpp b/src/f_pc/f_pc_layer_iter.cpp index e68f6d230..558609499 100644 --- a/src/f_pc/f_pc_layer_iter.cpp +++ b/src/f_pc/f_pc_layer_iter.cpp @@ -9,16 +9,16 @@ #include "f_pc/f_pc_layer.h" /* 8003DE00-8003DE38 .text fpcLyIt_OnlyHere__FP11layer_classPFPvPv_iPv */ -s32 fpcLyIt_OnlyHere(layer_class* i_layer, fpcLyIt_OnlyHereFunc i_func, void* i_data) { - layer_iter lIter; - lIter.mpFunc = i_func; - lIter.mpUserData = i_data; - return cTrIt_Method(&i_layer->mNodeListTree, (cNdIt_MethodFunc)cTgIt_MethodCall, &lIter); +BOOL fpcLyIt_OnlyHere(layer_class* i_layer, fpcLyIt_OnlyHereFunc i_func, void* i_data) { + method_filter filter; + filter.mpMethodFunc = (cNdIt_MethodFunc)i_func; + filter.mpUserData = i_data; + return cTrIt_Method(&i_layer->mNodeListTree, (cNdIt_MethodFunc)cTgIt_MethodCall, &filter); } /* 8003DE38-8003DEA0 .text fpcLyIt_OnlyHereLY__FP11layer_classPFPvPv_iPv */ -s32 fpcLyIt_OnlyHereLY(layer_class* i_layer, fpcLyIt_OnlyHereFunc i_func, void* i_data) { - s32 result; +BOOL fpcLyIt_OnlyHereLY(layer_class* i_layer, fpcLyIt_OnlyHereFunc i_func, void* i_data) { + BOOL result; layer_class* currentLayer = fpcLy_CurrentLayer(); fpcLy_SetCurrentLayer(i_layer); result = fpcLyIt_OnlyHere(i_layer, i_func, i_data); @@ -28,23 +28,23 @@ s32 fpcLyIt_OnlyHereLY(layer_class* i_layer, fpcLyIt_OnlyHereFunc i_func, void* /* 8003DEA0-8003DED8 .text fpcLyIt_Judge__FP11layer_classPFPvPv_PvPv */ void* fpcLyIt_Judge(layer_class* i_layer, fpcLyIt_JudgeFunc i_func, void* i_data) { - layer_iter lIter; - lIter.mpFunc = i_func; - lIter.mpUserData = i_data; - return cTrIt_Judge(&i_layer->mNodeListTree, (cNdIt_JudgeFunc)cTgIt_JudgeFilter, &lIter); + judge_filter filter; + filter.mpJudgeFunc = (cNdIt_JudgeFunc)i_func; + filter.mpUserData = i_data; + return cTrIt_Judge(&i_layer->mNodeListTree, (cNdIt_JudgeFunc)cTgIt_JudgeFilter, &filter); } /* 8003DED8-8003DF4C .text fpcLyIt_AllJudge__FPFPvPv_PvPv */ void* fpcLyIt_AllJudge(fpcLyIt_JudgeFunc i_func, void* i_data) { - layer_iter lIter; + judge_filter filter; layer_class* current; - lIter.mpFunc = i_func; - lIter.mpUserData = i_data; + filter.mpJudgeFunc = (cNdIt_JudgeFunc)i_func; + filter.mpUserData = i_data; current = fpcLy_RootLayer(); while (current != NULL) { void* result = - cTrIt_Judge(¤t->mNodeListTree, (cNdIt_JudgeFunc)cTgIt_JudgeFilter, &lIter); + cTrIt_Judge(¤t->mNodeListTree, (cNdIt_JudgeFunc)cTgIt_JudgeFilter, &filter); if (result != NULL) { return result; } diff --git a/src/f_pc/f_pc_layer_tag.cpp b/src/f_pc/f_pc_layer_tag.cpp index 10a5cddec..e28540961 100644 --- a/src/f_pc/f_pc_layer_tag.cpp +++ b/src/f_pc/f_pc_layer_tag.cpp @@ -7,10 +7,10 @@ #include "f_pc/f_pc_layer.h" /* 8003DF4C-8003E044 .text fpcLyTg_ToQueue__FP26layer_management_tag_classUiUsUs */ -s32 fpcLyTg_ToQueue(layer_management_tag_class* i_lyTag, uint i_layerID, u16 i_listID, +BOOL fpcLyTg_ToQueue(layer_management_tag_class* i_lyTag, uint i_layerID, u16 i_listID, u16 i_listPriority) { if (i_lyTag->mpLayer == NULL && i_layerID == fpcLy_NONE_e) { - return 0; + return FALSE; } else { if (i_layerID != fpcLy_NONE_e && i_layerID != fpcLy_CURRENT_e && i_lyTag->mpLayer->mLayerID != i_layerID) { i_lyTag->mpLayer = fpcLy_Layer(i_layerID); @@ -21,45 +21,45 @@ s32 fpcLyTg_ToQueue(layer_management_tag_class* i_lyTag, uint i_layerID, u16 i_l if (idx != 0) { i_lyTag->mNodeListID = i_listID; i_lyTag->mNodeListIdx = idx - 1; - return 1; + return TRUE; } } else if (fpcLy_IntoQueue(i_lyTag->mpLayer, i_listID, &i_lyTag->mCreateTag, i_listPriority) != 0) { i_lyTag->mNodeListID = i_listID; i_lyTag->mNodeListIdx = i_listPriority; - return 1; + return TRUE; } - return 0; + return FALSE; } } /* 8003E044-8003E0A4 .text fpcLyTg_QueueTo__FP26layer_management_tag_class */ -s32 fpcLyTg_QueueTo(layer_management_tag_class* i_lyTag) { +BOOL fpcLyTg_QueueTo(layer_management_tag_class* i_lyTag) { if (fpcLy_QueueTo(i_lyTag->mpLayer, &i_lyTag->mCreateTag) == 1) { i_lyTag->mpLayer = NULL; i_lyTag->mNodeListID = 0xFFFF; i_lyTag->mNodeListIdx = 0xFFFF; - return 1; + return TRUE; } else { - return 0; + return FALSE; } } /* 8003E0A4-8003E128 .text fpcLyTg_Move__FP26layer_management_tag_classUiUsUs */ -s32 fpcLyTg_Move(layer_management_tag_class* i_lyTag, uint i_layerID, u16 i_listID, +BOOL fpcLyTg_Move(layer_management_tag_class* i_lyTag, uint i_layerID, u16 i_listID, u16 i_listPriority) { layer_class* layer = fpcLy_Layer(i_layerID); if (layer == NULL) { - return 0; - } else if (fpcLyTg_QueueTo(i_lyTag) == 0x1) { + return FALSE; + } else if (fpcLyTg_QueueTo(i_lyTag) == TRUE) { i_lyTag->mpLayer = layer; return fpcLyTg_ToQueue(i_lyTag, i_layerID, i_listID, i_listPriority); } else { - return 0; + return FALSE; } } /* 8003E128-8003E1DC .text fpcLyTg_Init__FP26layer_management_tag_classUiPv */ -s32 fpcLyTg_Init(layer_management_tag_class* i_lyTag, uint i_layerID, void* i_data) { +BOOL fpcLyTg_Init(layer_management_tag_class* i_lyTag, uint i_layerID, void* i_data) { static layer_management_tag_class crear = { NULL, NULL, NULL, NULL, 0, NULL, 0xFFFF, 0xFFFF, }; @@ -70,8 +70,8 @@ s32 fpcLyTg_Init(layer_management_tag_class* i_lyTag, uint i_layerID, void* i_da layer = fpcLy_Layer(i_layerID); if (layer != NULL) { i_lyTag->mpLayer = layer; - return 1; + return TRUE; } else { - return 0; + return FALSE; } } diff --git a/src/f_pc/f_pc_leaf.cpp b/src/f_pc/f_pc_leaf.cpp index 94ffaef5b..f9613b497 100644 --- a/src/f_pc/f_pc_leaf.cpp +++ b/src/f_pc/f_pc_leaf.cpp @@ -11,32 +11,32 @@ s16 fpcLf_GetPriority(leafdraw_class* i_leaf) { } /* 8003DC9C-8003DCC0 .text fpcLf_DrawMethod__FP21leafdraw_method_classPv */ -s32 fpcLf_DrawMethod(leafdraw_method_class* i_methods, void* i_data) { +BOOL fpcLf_DrawMethod(leafdraw_method_class* i_methods, void* i_data) { return fpcMtd_Method(i_methods->mpDrawFunc, i_data); } /* 8003DCC0-8003DCF8 .text fpcLf_Draw__FP14leafdraw_class */ -s32 fpcLf_Draw(leafdraw_class* i_leaf) { - s32 ret = 0; +BOOL fpcLf_Draw(leafdraw_class* i_leaf) { + BOOL ret = FALSE; if (i_leaf->mbUnk0 == 0) ret = fpcLf_DrawMethod(i_leaf->mpDrawMtd, i_leaf); return ret; } /* 8003DCF8-8003DD20 .text fpcLf_Execute__FP14leafdraw_class */ -s32 fpcLf_Execute(leafdraw_class* i_leaf) { +BOOL fpcLf_Execute(leafdraw_class* i_leaf) { return fpcMtd_Execute(&i_leaf->mpDrawMtd->base, i_leaf); } /* 8003DD20-8003DD48 .text fpcLf_IsDelete__FP14leafdraw_class */ -s32 fpcLf_IsDelete(leafdraw_class* i_leaf) { +BOOL fpcLf_IsDelete(leafdraw_class* i_leaf) { return fpcMtd_IsDelete(&i_leaf->mpDrawMtd->base, i_leaf); } /* 8003DD48-8003DD8C .text fpcLf_Delete__FP14leafdraw_class */ -s32 fpcLf_Delete(leafdraw_class* i_leaf) { - s32 ret = fpcMtd_Delete(&i_leaf->mpDrawMtd->base, i_leaf); - if (ret == 1) { +BOOL fpcLf_Delete(leafdraw_class* i_leaf) { + BOOL ret = fpcMtd_Delete(&i_leaf->mpDrawMtd->base, i_leaf); + if (ret == TRUE) { i_leaf->base.mSubType = 0; } return ret; @@ -45,7 +45,7 @@ s32 fpcLf_Delete(leafdraw_class* i_leaf) { int g_fpcLf_type; /* 8003DD8C-8003DE00 .text fpcLf_Create__FP14leafdraw_class */ -s32 fpcLf_Create(leafdraw_class* i_leaf) { +cPhs_State fpcLf_Create(leafdraw_class* i_leaf) { leaf_process_profile_definition* profDef; if (i_leaf->base.mInitState == 0) { profDef = (leaf_process_profile_definition*)i_leaf->base.mpProf; diff --git a/src/f_pc/f_pc_load.cpp b/src/f_pc/f_pc_load.cpp index 0c216fe40..4275c9cfa 100644 --- a/src/f_pc/f_pc_load.cpp +++ b/src/f_pc/f_pc_load.cpp @@ -3,8 +3,8 @@ // Translation Unit: f_pc_load.cpp // -#include "c/c_dylink.h" #include "f_pc/f_pc_load.h" +#include "c/c_dylink.h" #include "SSystem/SComponent/c_phase.h" /* 8003E230-8003E280 .text fpcLd_Use__Fs */ @@ -15,7 +15,7 @@ BOOL fpcLd_Use(s16 i_procName) { } /* 8003E280-8003E2A4 .text fpcLd_IsLoaded__Fs */ -s32 fpcLd_IsLoaded(s16 i_procName) { +BOOL fpcLd_IsLoaded(s16 i_procName) { return cDyl_IsLinked((int)i_procName); } @@ -25,14 +25,14 @@ void fpcLd_Free(s16 i_procName) { } /* 8003E2C8-8003E318 .text fpcLd_Load__Fs */ -s32 fpcLd_Load(s16 i_procName) { - s32 phase = cDyl_LinkASync((int)i_procName); +cPhs_State fpcLd_Load(s16 i_procName) { + cPhs_State phase = cDyl_LinkASync((int)i_procName); switch (phase) { case cPhs_COMPLEATE_e: return cPhs_COMPLEATE_e; - case 0: - return 0; + case cPhs_INIT_e: + return cPhs_INIT_e; default: return cPhs_ERROR_e; } diff --git a/src/f_pc/f_pc_manager.cpp b/src/f_pc/f_pc_manager.cpp index 48723a4bd..087d8fd26 100644 --- a/src/f_pc/f_pc_manager.cpp +++ b/src/f_pc/f_pc_manager.cpp @@ -37,22 +37,22 @@ #include "assets/font_data.h" /* 8003E318-8003E338 .text fpcM_Draw__FPv */ -void fpcM_Draw(void* i_proc) { - fpcDw_Execute((base_process_class*)i_proc); +BOOL fpcM_Draw(void* i_proc) { + return fpcDw_Execute((base_process_class*)i_proc); } /* 8003E338-8003E370 .text fpcM_DrawIterater__FPFPvPv_i */ -s32 fpcM_DrawIterater(fpcM_DrawIteraterFunc i_drawIterFunc) { +BOOL fpcM_DrawIterater(fpcM_DrawIteraterFunc i_drawIterFunc) { return fpcLyIt_OnlyHere(fpcLy_RootLayer(), (fpcLyIt_OnlyHereFunc)i_drawIterFunc, NULL); } /* 8003E370-8003E390 .text fpcM_Execute__FPv */ -s32 fpcM_Execute(void* i_proc) { +BOOL fpcM_Execute(void* i_proc) { return fpcEx_Execute((base_process_class*)i_proc); } /* 8003E390-8003E3B0 .text fpcM_Delete__FPv */ -s32 fpcM_Delete(void* i_proc) { +BOOL fpcM_Delete(void* i_proc) { return fpcDt_Delete((base_process_class*)i_proc); } diff --git a/src/f_pc/f_pc_method.cpp b/src/f_pc/f_pc_method.cpp index 9ca1e691c..355f0e70e 100644 --- a/src/f_pc/f_pc_method.cpp +++ b/src/f_pc/f_pc_method.cpp @@ -4,32 +4,31 @@ // #include "f_pc/f_pc_method.h" -#include "SSystem/SComponent/c_phase.h" /* 8003EF00-8003EF38 .text fpcMtd_Method__FPFPv_iPv */ -s32 fpcMtd_Method(process_method_func i_methodFunc, void* i_data) { +int fpcMtd_Method(process_method_func i_methodFunc, void* i_data) { if (i_methodFunc != NULL) return i_methodFunc(i_data); else - return cPhs_LOADING_e; + return TRUE; } /* 8003EF38-8003EF5C .text fpcMtd_Execute__FP20process_method_classPv */ -s32 fpcMtd_Execute(process_method_class* i_methods, void* i_data) { +BOOL fpcMtd_Execute(process_method_class* i_methods, void* i_data) { return fpcMtd_Method(i_methods->mpExecuteFunc, i_data); } /* 8003EF5C-8003EF80 .text fpcMtd_IsDelete__FP20process_method_classPv */ -s32 fpcMtd_IsDelete(process_method_class* i_methods, void* i_data) { +BOOL fpcMtd_IsDelete(process_method_class* i_methods, void* i_data) { return fpcMtd_Method(i_methods->mpIsDeleteFunc, i_data); } /* 8003EF80-8003EFA4 .text fpcMtd_Delete__FP20process_method_classPv */ -s32 fpcMtd_Delete(process_method_class* i_methods, void* i_data) { +BOOL fpcMtd_Delete(process_method_class* i_methods, void* i_data) { return fpcMtd_Method(i_methods->mpDeleteFunc, i_data); } /* 8003EFA4-8003EFC8 .text fpcMtd_Create__FP20process_method_classPv */ -s32 fpcMtd_Create(process_method_class* i_methods, void* i_data) { +cPhs_State fpcMtd_Create(process_method_class* i_methods, void* i_data) { return fpcMtd_Method(i_methods->mpCreateFunc, i_data); } diff --git a/src/f_pc/f_pc_method_iter.cpp b/src/f_pc/f_pc_method_iter.cpp index aedc9525f..cecf5a6af 100644 --- a/src/f_pc/f_pc_method_iter.cpp +++ b/src/f_pc/f_pc_method_iter.cpp @@ -7,6 +7,6 @@ #include "SSystem/SComponent/c_list_iter.h" /* 8004023C-80040260 .text fpcMtdIt_Method__FP15node_list_classPFPv_i */ -int fpcMtdIt_Method(node_list_class* i_nodeList, fpcMtdIt_MethodFunc i_methods) { +BOOL fpcMtdIt_Method(node_list_class* i_nodeList, fpcMtdIt_MethodFunc i_methods) { return cLsIt_Method(i_nodeList, (cNdIt_MethodFunc)i_methods, NULL); } diff --git a/src/f_pc/f_pc_method_tag.cpp b/src/f_pc/f_pc_method_tag.cpp index 4d79f380d..0ca2ba6d6 100644 --- a/src/f_pc/f_pc_method_tag.cpp +++ b/src/f_pc/f_pc_method_tag.cpp @@ -6,7 +6,7 @@ #include "f_pc/f_pc_method_tag.h" /* 80040260-80040290 .text fpcMtdTg_Do__FP24process_method_tag_class */ -s32 fpcMtdTg_Do(process_method_tag_class* i_methodTag) { +BOOL fpcMtdTg_Do(process_method_tag_class* i_methodTag) { return i_methodTag->mpFunc(i_methodTag->mpMthdData); } diff --git a/src/f_pc/f_pc_node.cpp b/src/f_pc/f_pc_node.cpp index 216c1f6cb..5555569db 100644 --- a/src/f_pc/f_pc_node.cpp +++ b/src/f_pc/f_pc_node.cpp @@ -7,13 +7,13 @@ #include "f_pc/f_pc_layer_iter.h" /* 8003EFC8-8003EFEC .text fpcNd_DrawMethod__FP21nodedraw_method_classPv */ -s32 fpcNd_DrawMethod(nodedraw_method_class* i_nodeMethods, void* i_data) { +BOOL fpcNd_DrawMethod(nodedraw_method_class* i_nodeMethods, void* i_data) { return fpcMtd_Method(i_nodeMethods->mpDrawFunc, i_data); } /* 8003EFEC-8003F058 .text fpcNd_Draw__FP18process_node_class */ -s32 fpcNd_Draw(process_node_class* i_procNode) { - s32 ret = 0; +BOOL fpcNd_Draw(process_node_class* i_procNode) { + BOOL ret = FALSE; if (i_procNode->mUnk0 == 0) { layer_class* curLayer_p = fpcLy_CurrentLayer(); fpcLy_SetCurrentLayer(&i_procNode->mLayer); @@ -24,8 +24,8 @@ s32 fpcNd_Draw(process_node_class* i_procNode) { } /* 8003F058-8003F0B4 .text fpcNd_Execute__FP18process_node_class */ -s32 fpcNd_Execute(process_node_class* i_procNode) { - s32 ret; +BOOL fpcNd_Execute(process_node_class* i_procNode) { + BOOL ret; layer_class* curLayer_p = fpcLy_CurrentLayer(); fpcLy_SetCurrentLayer(&i_procNode->mLayer); ret = fpcMtd_Execute(&i_procNode->mpNodeMtd->base, i_procNode); @@ -55,36 +55,36 @@ void* fpcNd_IsCreatingFromUnder(void* i_procNode) { static s32 g_fpcNd_IsCheckOfDeleteTiming = 1; /* 8003F134-8003F174 .text fpcNd_IsDeleteTiming__FP18process_node_class */ -s32 fpcNd_IsDeleteTiming(process_node_class* i_procNode) { +BOOL fpcNd_IsDeleteTiming(process_node_class* i_procNode) { if (g_fpcNd_IsCheckOfDeleteTiming == 1 && fpcNd_IsCreatingFromUnder(i_procNode) != NULL) { - return 0; + return FALSE; } else { - return 1; + return TRUE; } } /* 8003F174-8003F19C .text fpcNd_IsDelete__FP18process_node_class */ -s32 fpcNd_IsDelete(process_node_class* i_procNode) { +BOOL fpcNd_IsDelete(process_node_class* i_procNode) { return fpcMtd_IsDelete(&i_procNode->mpNodeMtd->base, i_procNode); } /* 8003F19C-8003F200 .text fpcNd_Delete__FP18process_node_class */ -s32 fpcNd_Delete(process_node_class* i_procNode) { +BOOL fpcNd_Delete(process_node_class* i_procNode) { if ((fpcLy_IsDeletingMesg(&i_procNode->mLayer) == 0) && fpcMtd_Delete(&i_procNode->mpNodeMtd->base, i_procNode) == 1) { i_procNode->base.mSubType = 0; return fpcLy_Delete(&i_procNode->mLayer); } else { - return 0; + return FALSE; } } /* 8003F200-8003F29C .text fpcNd_Create__FP18process_node_class */ -s32 fpcNd_Create(process_node_class* i_procNode) { +cPhs_State fpcNd_Create(process_node_class* i_procNode) { // this cast looks like a fake match, but it doesn't match without the cast, naive approach // swaps r31 and r30 most likely it gets casted to another unknown struct process_node_class* pProcNode = (process_node_class*)i_procNode; layer_class* curLayer_p; - s32 ret; + cPhs_State ret; if (pProcNode->base.mInitState == 0) { node_process_profile_definition* pProcProfileDef = (node_process_profile_definition*)pProcNode->base.mpProf; pProcNode->base.mSubType = fpcBs_MakeOfType(&g_fpcNd_type); diff --git a/src/f_pc/f_pc_node_req.cpp b/src/f_pc/f_pc_node_req.cpp index 7c86af262..912deaf4f 100644 --- a/src/f_pc/f_pc_node_req.cpp +++ b/src/f_pc/f_pc_node_req.cpp @@ -31,55 +31,67 @@ void fpcNdRq_ToRequestQ(node_create_request* i_NdCtReq) { } /* 8003F328-8003F380 .text fpcNdRq_phase_IsCreated__FP19node_create_request */ -s32 fpcNdRq_phase_IsCreated(node_create_request* i_NdCtReq) { +cPhs_State fpcNdRq_phase_IsCreated(node_create_request* i_NdCtReq) { if (fpcCtRq_IsCreatingByID(i_NdCtReq->mCreatingID) == TRUE) { return cPhs_INIT_e; } else { - return fpcEx_IsExist(i_NdCtReq->mCreatingID) == TRUE ? 2 : 3; + if (fpcEx_IsExist(i_NdCtReq->mCreatingID) == TRUE) { + return cPhs_NEXT_e; + } else { + return cPhs_STOP_e; + } } } /* 8003F380-8003F3DC .text fpcNdRq_phase_Create__FP19node_create_request */ -s32 fpcNdRq_phase_Create(node_create_request* i_NdCtReq) { +cPhs_State fpcNdRq_phase_Create(node_create_request* i_NdCtReq) { i_NdCtReq->mCreatingID = fpcSCtRq_Request(i_NdCtReq->mpLayerClass, i_NdCtReq->mProcName, (stdCreateFunc)i_NdCtReq->mpNodeCrReqMthCls->mpPostMethodFunc, i_NdCtReq, i_NdCtReq->mpUserData); - return i_NdCtReq->mCreatingID == fpcM_ERROR_PROCESS_ID_e ? 3 : 2; + if (i_NdCtReq->mCreatingID == fpcM_ERROR_PROCESS_ID_e) { + return cPhs_STOP_e; + } else { + return cPhs_NEXT_e; + } } /* 8003F3DC-8003F3E4 .text fpcNdRq_phase_IsDeleteTiming__FP19node_create_request */ -s32 fpcNdRq_phase_IsDeleteTiming(node_create_request* i_NdCtReq) { - return 2; +cPhs_State fpcNdRq_phase_IsDeleteTiming(node_create_request* i_NdCtReq) { + return cPhs_NEXT_e; } /* 8003F3E4-8003F414 .text fpcNdRq_phase_IsDeleted__FP19node_create_request */ -s32 fpcNdRq_phase_IsDeleted(node_create_request* i_NdCtReq) { - return fpcDt_IsComplete() == 0 ? cPhs_INIT_e : 2; +cPhs_State fpcNdRq_phase_IsDeleted(node_create_request* i_NdCtReq) { + if (fpcDt_IsComplete() == FALSE) { + return cPhs_INIT_e; + } else { + return cPhs_NEXT_e; + } } /* 8003F414-8003F468 .text fpcNdRq_phase_Delete__FP19node_create_request */ -s32 fpcNdRq_phase_Delete(node_create_request* i_NdCtReq) { +cPhs_State fpcNdRq_phase_Delete(node_create_request* i_NdCtReq) { if (i_NdCtReq->mNodeProc.mpNodeProc != NULL) { - if (fpcDt_Delete(&i_NdCtReq->mNodeProc.mpNodeProc->base) == 0) { + if (fpcDt_Delete(&i_NdCtReq->mNodeProc.mpNodeProc->base) == FALSE) { return cPhs_INIT_e; } i_NdCtReq->mNodeProc.mpNodeProc = NULL; } - return 2; + return cPhs_NEXT_e; } /* 8003F468-8003F4B0 .text fpcNdRq_DoPhase__FP19node_create_request */ -s32 fpcNdRq_DoPhase(node_create_request* i_NdCtReq) { - s32 result = cPhs_Handler(&i_NdCtReq->mReqPhsProc, i_NdCtReq->mpPhsHandler, i_NdCtReq); - if (result == 2) { +cPhs_State fpcNdRq_DoPhase(node_create_request* i_NdCtReq) { + cPhs_State result = cPhs_Handler(&i_NdCtReq->mReqPhsProc, i_NdCtReq->mpPhsHandler, i_NdCtReq); + if (result == cPhs_NEXT_e) { return fpcNdRq_DoPhase(i_NdCtReq); } return result; } /* 8003F4B0-8003F514 .text fpcNdRq_Execute__FP19node_create_request */ -s32 fpcNdRq_Execute(node_create_request* i_NdCtReq) { - s32 result = fpcNdRq_DoPhase(i_NdCtReq); +cPhs_State fpcNdRq_Execute(node_create_request* i_NdCtReq) { + cPhs_State result = fpcNdRq_DoPhase(i_NdCtReq); switch (result) { case cPhs_INIT_e: case cPhs_LOADING_e: @@ -95,18 +107,25 @@ s32 fpcNdRq_Execute(node_create_request* i_NdCtReq) { } /* 8003F514-8003F57C .text fpcNdRq_Delete__FP19node_create_request */ -s32 fpcNdRq_Delete(node_create_request* i_NdCtReq) { +BOOL fpcNdRq_Delete(node_create_request* i_NdCtReq) { fpcNdRq_RequestQTo(i_NdCtReq); - if (i_NdCtReq->mpNodeCrReqMthCls != NULL && i_NdCtReq->mpNodeCrReqMthCls->mpUnkFunc != NULL && fpcMtd_Method(i_NdCtReq->mpNodeCrReqMthCls->mpUnkFunc, i_NdCtReq) == 0) - return 0; + if ( + i_NdCtReq->mpNodeCrReqMthCls != NULL && + i_NdCtReq->mpNodeCrReqMthCls->mpUnkFunc != NULL && + fpcMtd_Method(i_NdCtReq->mpNodeCrReqMthCls->mpUnkFunc, i_NdCtReq) == FALSE + ) + return FALSE; cMl::free(i_NdCtReq); - return 1; + return TRUE; } /* 8003F57C-8003F5D4 .text fpcNdRq_Cancel__FP19node_create_request */ -s32 fpcNdRq_Cancel(node_create_request* i_NdCtReq) { - if (i_NdCtReq->mpNodeCrReqMthCls != NULL && fpcMtd_Method(i_NdCtReq->mpNodeCrReqMthCls->mpCancelFunc, i_NdCtReq) == 0) - return 0; +BOOL fpcNdRq_Cancel(node_create_request* i_NdCtReq) { + if ( + i_NdCtReq->mpNodeCrReqMthCls != NULL && + fpcMtd_Method(i_NdCtReq->mpNodeCrReqMthCls->mpCancelFunc, i_NdCtReq) == FALSE + ) + return FALSE; return fpcNdRq_Delete(i_NdCtReq); } @@ -119,13 +138,13 @@ s32 fpcNdRq_Handler() { case cPhs_STOP_e: case cPhs_ERROR_e: currentNode = NODE_GET_NEXT(currentNode); - if (fpcNdRq_Cancel(req) == 0) { + if (fpcNdRq_Cancel(req) == FALSE) { return 0; } break; case cPhs_COMPLEATE_e: currentNode = NODE_GET_NEXT(currentNode); - if (fpcNdRq_Delete(req) == 0) { + if (fpcNdRq_Delete(req) == FALSE) { return 0; } break; diff --git a/src/f_pc/f_pc_priority.cpp b/src/f_pc/f_pc_priority.cpp index 86455b55d..25068620f 100644 --- a/src/f_pc/f_pc_priority.cpp +++ b/src/f_pc/f_pc_priority.cpp @@ -9,7 +9,7 @@ #include "f_pc/f_pc_layer_tag.h" /* 8003FC08-8003FC28 .text fpcPi_IsInQueue__FP22process_priority_class */ -s32 fpcPi_IsInQueue(process_priority_class* i_procPriority) { +BOOL fpcPi_IsInQueue(process_priority_class* i_procPriority) { return cTg_IsUse(&i_procPriority->base); } @@ -57,7 +57,7 @@ process_priority_class* fpcPi_GetFromQueue() { } /* 8003FD40-8003FD8C .text fpcPi_Delete__FP22process_priority_class */ -s32 fpcPi_Delete(process_priority_class* i_procPriority) { +BOOL fpcPi_Delete(process_priority_class* i_procPriority) { static process_priority_queue_info crear = { 0xFFFFFFFF, 0xFFFF, @@ -68,7 +68,7 @@ s32 fpcPi_Delete(process_priority_class* i_procPriority) { i_procPriority->mInfoQ.mLayer = crear.mLayer; i_procPriority->mInfoQ.mListID = crear.mListID; i_procPriority->mInfoQ.mListPrio = crear.mListPrio; - return 1; + return TRUE; } /* 8003FD8C-8003FDC0 .text fpcPi_IsNormal__FUiUsUs */ @@ -125,11 +125,11 @@ s32 fpcPi_Change(process_priority_class* i_procPriority, uint i_layer, u16 i_lis /* 8003FF00-8003FF94 .text fpcPi_Handler__Fv */ s32 fpcPi_Handler() { process_priority_class* i_procPriority; - while (i_procPriority = fpcPi_GetFromQueue()) { + while ((i_procPriority = fpcPi_GetFromQueue())) { base_process_class* pProc = (base_process_class*)i_procPriority->base.mpTagData; layer_management_tag_class* pLayerTag = &pProc->mLyTg; line_tag* pLineTag = &pProc->mLnTg; - if (fpcLyTg_Move(pLayerTag, i_procPriority->mInfoQ.mLayer, i_procPriority->mInfoQ.mListID, i_procPriority->mInfoQ.mListPrio) == 1) { + if (fpcLyTg_Move(pLayerTag, i_procPriority->mInfoQ.mLayer, i_procPriority->mInfoQ.mListID, i_procPriority->mInfoQ.mListPrio) == TRUE) { fpcLnTg_Move(pLineTag, i_procPriority->mInfoCurr.mListID); i_procPriority->mInfoCurr.mLayer = i_procPriority->mInfoQ.mLayer; i_procPriority->mInfoCurr.mListID = i_procPriority->mInfoQ.mListID; diff --git a/src/f_pc/f_pc_stdcreate_req.cpp b/src/f_pc/f_pc_stdcreate_req.cpp index 8836016cb..331a149de 100644 --- a/src/f_pc/f_pc_stdcreate_req.cpp +++ b/src/f_pc/f_pc_stdcreate_req.cpp @@ -9,7 +9,7 @@ #include "f_pc/f_pc_manager.h" /* 80040648-8004069C .text fpcSCtRq_phase_Load__FP29standard_create_request_class */ -s32 fpcSCtRq_phase_Load(standard_create_request_class* i_SCtReq) { +cPhs_State fpcSCtRq_phase_Load(standard_create_request_class* i_SCtReq) { switch (fpcLd_Load(i_SCtReq->mProcName)) { case cPhs_INIT_e: return cPhs_INIT_e; @@ -23,7 +23,7 @@ s32 fpcSCtRq_phase_Load(standard_create_request_class* i_SCtReq) { /* 8004069C-80040704 .text fpcSCtRq_phase_CreateProcess__FP29standard_create_request_class */ -s32 fpcSCtRq_phase_CreateProcess(standard_create_request_class* i_SCtReq) { +cPhs_State fpcSCtRq_phase_CreateProcess(standard_create_request_class* i_SCtReq) { fpcLy_SetCurrentLayer(i_SCtReq->base.mpLayer); i_SCtReq->base.mpRes = fpcBs_Create(i_SCtReq->mProcName, i_SCtReq->base.mBsPcId, i_SCtReq->mpUserData); if (i_SCtReq->base.mpRes == NULL) { @@ -36,13 +36,13 @@ s32 fpcSCtRq_phase_CreateProcess(standard_create_request_class* i_SCtReq) { } /* 80040704-8004073C .text fpcSCtRq_phase_SubCreateProcess__FP29standard_create_request_class */ -s32 fpcSCtRq_phase_SubCreateProcess(standard_create_request_class* i_SCtReq) { +cPhs_State fpcSCtRq_phase_SubCreateProcess(standard_create_request_class* i_SCtReq) { fpcLy_SetCurrentLayer(i_SCtReq->base.mpLayer); return fpcBs_SubCreate(i_SCtReq->base.mpRes); } /* 8004073C-80040794 .text fpcSCtRq_phase_IsComplete__FP29standard_create_request_class */ -s32 fpcSCtRq_phase_IsComplete(standard_create_request_class* i_SCtReq) { +cPhs_State fpcSCtRq_phase_IsComplete(standard_create_request_class* i_SCtReq) { process_node_class* procNode = (process_node_class*)i_SCtReq->base.mpRes; if (fpcBs_Is_JustOfType(g_fpcNd_type, procNode->base.mSubType) == 1) { if (fpcLy_IsCreatingMesg(&procNode->mLayer) == 1) { @@ -53,8 +53,8 @@ s32 fpcSCtRq_phase_IsComplete(standard_create_request_class* i_SCtReq) { } /* 80040794-800407E4 .text fpcSCtRq_phase_PostMethod__FP29standard_create_request_class */ -s32 fpcSCtRq_phase_PostMethod(standard_create_request_class* i_SCtReq) { - if (i_SCtReq->mpCallBack != NULL && i_SCtReq->mpCallBack(i_SCtReq->base.mpRes, i_SCtReq->mpCallBackUserData) == 0) { +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) { return cPhs_INIT_e; } else { return cPhs_NEXT_e; @@ -62,13 +62,13 @@ s32 fpcSCtRq_phase_PostMethod(standard_create_request_class* i_SCtReq) { } /* 800407E4-800407EC .text fpcSCtRq_phase_Done__FP29standard_create_request_class */ -s32 fpcSCtRq_phase_Done(standard_create_request_class* i_SCtReq) { +cPhs_State fpcSCtRq_phase_Done(standard_create_request_class* i_SCtReq) { return cPhs_NEXT_e; } /* 800407EC-8004085C .text fpcSCtRq_Handler__FP29standard_create_request_class */ -s32 fpcSCtRq_Handler(standard_create_request_class* i_SCtReq) { - s32 phase_state = cPhs_Do(&i_SCtReq->mPhase, i_SCtReq); +cPhs_State fpcSCtRq_Handler(standard_create_request_class* i_SCtReq) { + cPhs_State phase_state = cPhs_Do(&i_SCtReq->mPhase, i_SCtReq); switch (phase_state) { case cPhs_NEXT_e: @@ -83,17 +83,17 @@ s32 fpcSCtRq_Handler(standard_create_request_class* i_SCtReq) { } /* 8004085C-80040864 .text fpcSCtRq_Delete__FP29standard_create_request_class */ -s32 fpcSCtRq_Delete(standard_create_request_class* i_SCtReq) { - return 1; +BOOL fpcSCtRq_Delete(standard_create_request_class* i_SCtReq) { + return TRUE; } /* 80040864-8004086C .text fpcSCtRq_Cancel__FP29standard_create_request_class */ -s32 fpcSCtRq_Cancel(standard_create_request_class* i_SCtReq) { - return 1; +BOOL fpcSCtRq_Cancel(standard_create_request_class* i_SCtReq) { + return TRUE; } /* 8004086C-80040900 .text fpcSCtRq_Request__FP11layer_classsPFPvPv_iPvPv */ -fpc_ProcID fpcSCtRq_Request(layer_class* i_layer, s16 i_procName, stdCreateFunc i_createFunc, 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) { static create_request_method_class submethod = { (cPhs__Handler)fpcSCtRq_Handler, (process_method_func)fpcSCtRq_Cancel, @@ -121,7 +121,7 @@ fpc_ProcID fpcSCtRq_Request(layer_class* i_layer, s16 i_procName, stdCreateFunc request->mProcName = i_procName; request->mpCallBack = i_createFunc; request->mpCallBackUserData = param_4; - request->mpUserData = param_5; + request->mpUserData = i_append; return request->base.mBsPcId; } }