Missed some spots where `cPhs_State` should be used

33 files changed, 59 insertions, 61 deletions

diff --git a/src/d/actor/d_a_agbsw0.cpp b/src/d/actor/d_a_agbsw0.cpp
index 2c1a6dff..ee066409 100644
--- a/src/d/actor/d_a_agbsw0.cpp
+++ b/src/d/actor/d_a_agbsw0.cpp
@@ -149,7 +149,7 @@ BOOL daAgbsw0_c::draw() {
 }
 
 /* 00004F80-00005458       .text create__10daAgbsw0_cFv */
-int daAgbsw0_c::create() {
+cPhs_State daAgbsw0_c::create() {
     u8 type = getType();
     u8 sw0 = getSw0();
     s16 paramNo = getParamNo();
@@ -2571,7 +2571,7 @@ static BOOL daAgbsw0_Delete(daAgbsw0_c* i_this) {
 }
 
 /* 00004E98-00004F80       .text daAgbsw0_Create__FP10fopAc_ac_c */
-static int daAgbsw0_Create(fopAc_ac_c* i_this) {
+static cPhs_State daAgbsw0_Create(fopAc_ac_c* i_this) {
     fopAcM_SetupActor(i_this, daAgbsw0_c);
 
     return static_cast<daAgbsw0_c*>(i_this)->create();
diff --git a/src/d/actor/d_a_bomb3.inc b/src/d/actor/d_a_bomb3.inc
index 521439d4..d86bb654 100644
--- a/src/d/actor/d_a_bomb3.inc
+++ b/src/d/actor/d_a_bomb3.inc
@@ -1323,7 +1323,7 @@ static BOOL daBomb_createHeap(fopAc_ac_c* i_this) {
 }
 
 /* 800DCAFC-800DCC0C       .text create__8daBomb_cFv */
-int daBomb_c::create() {
+cPhs_State daBomb_c::create() {
     int state = prm_get_state();
     if(state == 5 || state == 6) {
         mType = 1;
@@ -1358,7 +1358,7 @@ int daBomb_c::create() {
 }
 
 /* 800DCEF8-800DCF18       .text daBomb_Create__FP10fopAc_ac_c */
-static int daBomb_Create(fopAc_ac_c* i_this) {
+static cPhs_State daBomb_Create(fopAc_ac_c* i_this) {
     return static_cast<daBomb_c*>(i_this)->create();
 }
 
diff --git a/src/d/actor/d_a_hmlif.cpp b/src/d/actor/d_a_hmlif.cpp
index 87b120d0..7506fe12 100644
--- a/src/d/actor/d_a_hmlif.cpp
+++ b/src/d/actor/d_a_hmlif.cpp
@@ -27,7 +27,7 @@ s32 daHmlif_c::Create() {
 }
 
 /* 000007C8-00000930       .text daHmlifCreate__9daHmlif_cFv */
-void daHmlif_c::daHmlifCreate() {
+cPhs_State daHmlif_c::daHmlifCreate() {
     /* Nonmatching */
 }
 
diff --git a/src/d/actor/d_a_ib.cpp b/src/d/actor/d_a_ib.cpp
index f9fc72b5..ed60e35a 100644
--- a/src/d/actor/d_a_ib.cpp
+++ b/src/d/actor/d_a_ib.cpp
@@ -407,7 +407,7 @@ static BOOL CheckCreateHeap(fopAc_ac_c* i_this) {
 }
 
 /* 800F4698-800F4870       .text _daIball_create__9daIball_cFv */
-s32 daIball_c::_daIball_create() {
+cPhs_State daIball_c::_daIball_create() {
     fopAcM_SetupActor(this, daIball_c);
     
     if (!fopAcM_entrySolidHeap(this, CheckCreateHeap, 0x3500)) {
diff --git a/src/d/actor/d_a_ikari.cpp b/src/d/actor/d_a_ikari.cpp
index e89767de..22b4d515 100644
--- a/src/d/actor/d_a_ikari.cpp
+++ b/src/d/actor/d_a_ikari.cpp
@@ -115,7 +115,7 @@ bool daIkari_c::_draw() {
 }
 
 /* 00000494-000005B0       .text _create__9daIkari_cFv */
-int daIkari_c::_create() {
+cPhs_State daIkari_c::_create() {
     cPhs_State phase = dComIfG_resLoad(&mPhs, M_arcname);
 
     fopAcM_SetupActor(this, daIkari_c);
@@ -150,7 +150,7 @@ bool daIkari_c::_delete() {
 }
 
 /* 000005E0-00000600       .text daIkariCreate__FPv */
-static s32 daIkariCreate(void* i_this) {
+static cPhs_State daIkariCreate(void* i_this) {
     return ((daIkari_c*)i_this)->_create();
 }
 
diff --git a/src/d/actor/d_a_item.cpp b/src/d/actor/d_a_item.cpp
index f17a1253..2a05cf1c 100644
--- a/src/d/actor/d_a_item.cpp
+++ b/src/d/actor/d_a_item.cpp
@@ -213,7 +213,7 @@ void daItem_c::CreateInit() {
 }
 
 /* 800F53EC-800F5668       .text _daItem_create__8daItem_cFv */
-s32 daItem_c::_daItem_create() {
+cPhs_State daItem_c::_daItem_create() {
     fopAcM_SetupActor(this, daItem_c);
     
     m_itemNo = daItem_prm::getItemNo(this);
diff --git a/src/d/actor/d_a_kytag04.cpp b/src/d/actor/d_a_kytag04.cpp
index 3b507672..228d4c47 100644
--- a/src/d/actor/d_a_kytag04.cpp
+++ b/src/d/actor/d_a_kytag04.cpp
@@ -45,7 +45,7 @@ static BOOL daKytag04_Delete(kytag04_class*) {
 }
 
 /* 00000168-00000208       .text daKytag04_Create__FP10fopAc_ac_c */
-static int daKytag04_Create(fopAc_ac_c* i_this)  {
+static cPhs_State daKytag04_Create(fopAc_ac_c* i_this)  {
     fopAcM_SetupActor(i_this, kytag04_class);
     kytag04_class* a_this = (kytag04_class*)i_this;
     a_this->mState = 0;
diff --git a/src/d/actor/d_a_kytag06.cpp b/src/d/actor/d_a_kytag06.cpp
index 08a3cca3..45efc7ee 100644
--- a/src/d/actor/d_a_kytag06.cpp
+++ b/src/d/actor/d_a_kytag06.cpp
@@ -57,20 +57,19 @@ static BOOL daKytag06_Delete(kytag06_class*) {
 }
 
 /* 000001A4-00000224       .text daKytag06_Create__FP10fopAc_ac_c */
-static int daKytag06_Create(fopAc_ac_c* i_this) {
+static cPhs_State daKytag06_Create(fopAc_ac_c* i_this) {
+    fopAcM_SetupActor(i_this, kytag06_class);
     kytag06_class* a_this = (kytag06_class*)i_this;
-    int var;
 
-    fopAcM_SetupActor(a_this, kytag06_class);
-
-    if(dComIfGs_isSymbol(0) != 0) {
-        var = 5;
+    cPhs_State phase_state;
+    if(dComIfGs_isSymbol(0)) {
+        phase_state = cPhs_ERROR_e;
     } else {
         a_this->field_0x294 = 0;
-        var = 4;
+        phase_state = cPhs_COMPLEATE_e;
     }
 
-    return var;
+    return phase_state;
 }
 
 static actor_method_class l_daKytag06_Method = {
diff --git a/src/d/actor/d_a_movie_player.cpp b/src/d/actor/d_a_movie_player.cpp
index 2b2e0327..ec87f31b 100644
--- a/src/d/actor/d_a_movie_player.cpp
+++ b/src/d/actor/d_a_movie_player.cpp
@@ -3011,7 +3011,7 @@ u32 daMP_c::daMP_c_Get_arg_data() {
 }
 
 /* 00006390-00006500       .text daMP_c_Init__6daMP_cFv */
-int daMP_c::daMP_c_Init() {
+cPhs_State daMP_c::daMP_c_Init() {
     /* Nonmatching */
     static u8 set_vfilter[7] = {
         0x00, 0x00, 0x15, 0x16, 0x15, 0x00, 0x00,
diff --git a/src/d/actor/d_a_mozo.cpp b/src/d/actor/d_a_mozo.cpp
index 5a695eed..2d10c860 100644
--- a/src/d/actor/d_a_mozo.cpp
+++ b/src/d/actor/d_a_mozo.cpp
@@ -170,7 +170,7 @@ void daMozo_c::setAnm(int, float) {
 }
 
 /* 00001F70-00002228       .text CreateInit__8daMozo_cFv */
-s32 daMozo_c::CreateInit() {
+cPhs_State daMozo_c::CreateInit() {
     /* Nonmatching */
     J3DModelData* mdlData = mAnimMorf->getModel()->getModelData();
 
diff --git a/src/d/actor/d_a_npc_people.cpp b/src/d/actor/d_a_npc_people.cpp
index 42974485..ba7812d9 100644
--- a/src/d/actor/d_a_npc_people.cpp
+++ b/src/d/actor/d_a_npc_people.cpp
@@ -4283,7 +4283,7 @@ s16 daNpcPeople_photoCB(void* i_this, int param_1) {
 }
 
 /* 00000E6C-00001518       .text createInit__13daNpcPeople_cFv */
-s32 daNpcPeople_c::createInit() {
+cPhs_State daNpcPeople_c::createInit() {
     int temp = 0xFF;
 
     u8 pathIndex = getPrmRailID();
diff --git a/src/d/actor/d_a_npc_roten.cpp b/src/d/actor/d_a_npc_roten.cpp
index 12892d32..64f379b0 100644
--- a/src/d/actor/d_a_npc_roten.cpp
+++ b/src/d/actor/d_a_npc_roten.cpp
@@ -1693,7 +1693,7 @@ static s16 daNpcRoten_XyEventCB(void* i_this, int param_1) {
 }
 
 /* 00000EA8-000011C8       .text createInit__12daNpcRoten_cFv */
-s32 daNpcRoten_c::createInit() {
+cPhs_State daNpcRoten_c::createInit() {
     int weight = 0xFF;
     if(getPrmRailID() != 0xFF) {
         mPathRun.setInf(getPrmRailID(), fopAcM_GetRoomNo(this), true);
diff --git a/src/d/actor/d_a_obj_bscurtain.cpp b/src/d/actor/d_a_obj_bscurtain.cpp
index cf4a8bd6..5c3a8a31 100644
--- a/src/d/actor/d_a_obj_bscurtain.cpp
+++ b/src/d/actor/d_a_obj_bscurtain.cpp
@@ -54,7 +54,7 @@ BOOL daObj_Bscurtain_c::CreateHeap() {
 }
 
 /* 00000334-00000370       .text CreateInit__17daObj_Bscurtain_cFv */
-s32 daObj_Bscurtain_c::CreateInit() {
+cPhs_State daObj_Bscurtain_c::CreateInit() {
     set_mtx();
     fopAcM_SetMtx(this, mpModel->getBaseTRMtx());
     return cPhs_COMPLEATE_e;
diff --git a/src/d/actor/d_a_obj_doguu_demo.cpp b/src/d/actor/d_a_obj_doguu_demo.cpp
index 76f08ebc..d9f43384 100644
--- a/src/d/actor/d_a_obj_doguu_demo.cpp
+++ b/src/d/actor/d_a_obj_doguu_demo.cpp
@@ -6,7 +6,6 @@
 #include "d/actor/d_a_obj_doguu_demo.h"
 #include "d/res/res_doguud.h"
 #include "d/d_bg_w.h"
-#include "d/d_cc_d.h"
 #include "d/d_com_inf_game.h"
 #include "d/d_procname.h"
 #include "f_op/f_op_actor.h"
@@ -79,7 +78,7 @@ cPhs_State daObjDoguuD_c::_create() {
 }
 
 /* 00000314-000003BC       .text daObjDoguuD_create__FPv */
-static s32 daObjDoguuD_create(void* i_this) {
+static cPhs_State daObjDoguuD_create(void* i_this) {
     return ((daObjDoguuD_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 0307a5eb..4414e81b 100644
--- a/src/d/actor/d_a_obj_figure.cpp
+++ b/src/d/actor/d_a_obj_figure.cpp
@@ -1010,7 +1010,7 @@ BOOL daObjFigure_c::createHeap() {
 }
 
 /* 00000A90-00000BF4       .text createInit__13daObjFigure_cFv */
-s32 daObjFigure_c::createInit() {
+cPhs_State daObjFigure_c::createInit() {
     mStts.Init(0xFF, 0xFF, this);
     mCyl1.Set(l_cyl_src);
     mCyl1.SetStts(&mStts);
diff --git a/src/d/actor/d_a_obj_hat.cpp b/src/d/actor/d_a_obj_hat.cpp
index c4123f48..abab3386 100644
--- a/src/d/actor/d_a_obj_hat.cpp
+++ b/src/d/actor/d_a_obj_hat.cpp
@@ -107,7 +107,7 @@ BOOL daObjHat_c::createHeap() {
 }
 
 /* 000005D4-000006AC       .text createInit__10daObjHat_cFv */
-s32 daObjHat_c::createInit() {
+cPhs_State daObjHat_c::createInit() {
     mStts.Init(2, 0xff, this);
     mCyl.Set(l_cyl_src);
     mCyl.SetStts(&mStts);
diff --git a/src/d/actor/d_a_obj_pbco.cpp b/src/d/actor/d_a_obj_pbco.cpp
index f5b0609f..f963a8d6 100644
--- a/src/d/actor/d_a_obj_pbco.cpp
+++ b/src/d/actor/d_a_obj_pbco.cpp
@@ -77,7 +77,7 @@ cPhs_State daObj_Pbco_c::_create() {
 }
 
 /* 000003A4-00000434       .text daObj_PbcoCreate__FPv */
-static int daObj_PbcoCreate(void* i_this) {
+static cPhs_State daObj_PbcoCreate(void* i_this) {
     return static_cast<daObj_Pbco_c*>(i_this)->_create();
 }
 
diff --git a/src/d/actor/d_a_obj_pbka.cpp b/src/d/actor/d_a_obj_pbka.cpp
index e1ae614b..8c02c6a7 100644
--- a/src/d/actor/d_a_obj_pbka.cpp
+++ b/src/d/actor/d_a_obj_pbka.cpp
@@ -57,7 +57,7 @@ cPhs_State daObjPbka_c::_create() {
 }
 
 /* 0000024C-000002EC       .text daObjPbka_Create__FPv */
-static int daObjPbka_Create(void* i_this) {
+static cPhs_State daObjPbka_Create(void* i_this) {
     return static_cast<daObjPbka_c*>(i_this)->_create();
 }
 
diff --git a/src/d/actor/d_a_obj_roten.cpp b/src/d/actor/d_a_obj_roten.cpp
index c644b6f6..c5f80df1 100644
--- a/src/d/actor/d_a_obj_roten.cpp
+++ b/src/d/actor/d_a_obj_roten.cpp
@@ -58,7 +58,7 @@ BOOL daObj_Roten_c::CreateHeap() {
 }
 
 /* 000002E4-00000348       .text CreateInit__13daObj_Roten_cFv */
-s32 daObj_Roten_c::CreateInit() {
+cPhs_State daObj_Roten_c::CreateInit() {
     set_mtx();
     fopAcM_SetMtx(this, mpModel->getBaseTRMtx());
     mpBgW->SetCrrFunc(dBgS_MoveBGProc_Typical);
diff --git a/src/d/actor/d_a_obj_toripost.cpp b/src/d/actor/d_a_obj_toripost.cpp
index 19ff0064..6c4bcff9 100644
--- a/src/d/actor/d_a_obj_toripost.cpp
+++ b/src/d/actor/d_a_obj_toripost.cpp
@@ -957,7 +957,7 @@ void daObjTpost_c::getArg() {
 }
 
 /* 00001BA8-00001D88       .text _create__12daObjTpost_cFv */
-int daObjTpost_c::_create() {
+cPhs_State daObjTpost_c::_create() {
     fopAcM_SetupActor(this, daObjTpost_c);
 
     getArg();
@@ -980,7 +980,7 @@ bool daObjTpost_c::_delete() {
 }
 
 /* 000020C4-000020E4       .text daObjTpostCreate__FPv */
-static int daObjTpostCreate(void* i_this) {
+static cPhs_State daObjTpostCreate(void* i_this) {
     return static_cast<daObjTpost_c*>(i_this)->_create();
 }
 
diff --git a/src/d/actor/d_a_oship.cpp b/src/d/actor/d_a_oship.cpp
index d1f59c59..2c0d218c 100644
--- a/src/d/actor/d_a_oship.cpp
+++ b/src/d/actor/d_a_oship.cpp
@@ -212,7 +212,7 @@ bool daOship_c::_delete() {
 }
 
 /* 00003F20-00003F40       .text daOshipCreate__FPv */
-static s32 daOshipCreate(void*) {
+static cPhs_State daOshipCreate(void*) {
     /* Nonmatching */
 }
 
diff --git a/src/d/actor/d_a_pz.cpp b/src/d/actor/d_a_pz.cpp
index e1631ade..abacd8bf 100644
--- a/src/d/actor/d_a_pz.cpp
+++ b/src/d/actor/d_a_pz.cpp
@@ -372,7 +372,7 @@ bool daPz_c::_delete() {
 }
 
 /* 00007E20-00007E40       .text daPzCreate__FPv */
-static s32 daPzCreate(void*) {
+static cPhs_State daPzCreate(void*) {
     /* Nonmatching */
 }
 
diff --git a/src/d/actor/d_a_race_item.cpp b/src/d/actor/d_a_race_item.cpp
index 2a0c82ba..f3fb8d27 100644
--- a/src/d/actor/d_a_race_item.cpp
+++ b/src/d/actor/d_a_race_item.cpp
@@ -260,7 +260,7 @@ static BOOL daRaceItem_Delete(daRaceItem_c* i_this) {
 }
 
 /* 00000C6C-00000C8C       .text daRaceItem_Create__FP10fopAc_ac_c */
-static int daRaceItem_Create(fopAc_ac_c* i_this) {
+static cPhs_State daRaceItem_Create(fopAc_ac_c* i_this) {
     return static_cast<daRaceItem_c*>(i_this)->create();
 }
 
diff --git a/src/d/actor/d_a_rectangle.cpp b/src/d/actor/d_a_rectangle.cpp
index 18bb31d2..22096bb4 100644
--- a/src/d/actor/d_a_rectangle.cpp
+++ b/src/d/actor/d_a_rectangle.cpp
@@ -29,7 +29,7 @@ static BOOL daRct_Delete(RECTANGLE_class* i_this) {
 }
 
 /* 00000098-000000A0       .text daRct_Create__FP10fopAc_ac_c */
-static int daRct_Create(fopAc_ac_c* i_this) {
+static cPhs_State daRct_Create(fopAc_ac_c* i_this) {
     return cPhs_COMPLEATE_e;
 }
 
diff --git a/src/d/actor/d_a_saku.cpp b/src/d/actor/d_a_saku.cpp
index 351abd18..542d5ea5 100644
--- a/src/d/actor/d_a_saku.cpp
+++ b/src/d/actor/d_a_saku.cpp
@@ -130,7 +130,7 @@ static cPhs_State daSaku_Create(fopAc_ac_c*) {
 }
 
 /* 00001BB8-00001F28       .text _daSaku_create__8daSaku_cFv */
-s32 daSaku_c::_daSaku_create() {
+cPhs_State daSaku_c::_daSaku_create() {
     /* Nonmatching */
 }
 
diff --git a/src/d/actor/d_a_seatag.cpp b/src/d/actor/d_a_seatag.cpp
index b43d38d9..d2fe72d3 100644
--- a/src/d/actor/d_a_seatag.cpp
+++ b/src/d/actor/d_a_seatag.cpp
@@ -27,7 +27,7 @@ static BOOL daSeatag_Delete(daSeatag_c* a_this) {
 }
 
 /* 000000C0-00000110       .text daSeatag_Create__FP10fopAc_ac_c */
-static int daSeatag_Create(fopAc_ac_c* a_this) {
+static cPhs_State daSeatag_Create(fopAc_ac_c* a_this) {
     fopAcM_SetupActor(a_this, daSeatag_c);
     return cPhs_COMPLEATE_e;
 }
diff --git a/src/d/actor/d_a_shop_item.cpp b/src/d/actor/d_a_shop_item.cpp
index 39eb18e8..08da9959 100644
--- a/src/d/actor/d_a_shop_item.cpp
+++ b/src/d/actor/d_a_shop_item.cpp
@@ -186,12 +186,12 @@ void daShopItem_c::setTevStr() {
 }
 
 /* 000007A4-000007C4       .text daShopItem_Create__FPv */
-static int daShopItem_Create(void* i_this) {
+static cPhs_State daShopItem_Create(void* i_this) {
     return static_cast<daShopItem_c*>(i_this)->_create();
 }
 
 /* 000007C4-00000AA4       .text _create__12daShopItem_cFv */
-int daShopItem_c::_create() {
+cPhs_State daShopItem_c::_create() {
     fopAcM_SetupActor(this, daShopItem_c);
     
     m_itemNo = fopAcM_GetParamBit(fopAcM_GetParam(this), 0, 8);
diff --git a/src/d/actor/d_a_tbox.cpp b/src/d/actor/d_a_tbox.cpp
index c0ab59d6..39b4868d 100644
--- a/src/d/actor/d_a_tbox.cpp
+++ b/src/d/actor/d_a_tbox.cpp
@@ -81,7 +81,7 @@ daTbox_HIO_c::daTbox_HIO_c() {
 }
 
 /* 00000124-00000550       .text commonShapeSet__8daTbox_cFv */
-s32 daTbox_c::commonShapeSet() {
+cPhs_State daTbox_c::commonShapeSet() {
     modelInfo& mdlInfo = getModelInfo();
 
     // Load model
@@ -165,7 +165,7 @@ s32 daTbox_c::commonShapeSet() {
 }
 
 /* 00000598-00000764       .text effectShapeSet__8daTbox_cFv */
-s32 daTbox_c::effectShapeSet() {
+cPhs_State daTbox_c::effectShapeSet() {
     J3DModelData* flashModelData = (J3DModelData*)dComIfG_getObjectRes("Dalways", DALWAYS_BDL_IT_TAKARA_FLASH);
     JUT_ASSERT(0x117, flashModelData != NULL);
 
@@ -195,7 +195,7 @@ s32 daTbox_c::effectShapeSet() {
 }
 
 /* 00000764-00000928       .text envShapeSet__8daTbox_cFv */
-s32 daTbox_c::envShapeSet() {
+cPhs_State daTbox_c::envShapeSet() {
     modelInfo& mdlInfo = getModelInfo();
 
     // Load model
@@ -226,7 +226,7 @@ s32 daTbox_c::envShapeSet() {
 }
 
 /* 00000928-00000BB0       .text bgCheckSet__8daTbox_cFv */
-s32 daTbox_c::bgCheckSet() {
+cPhs_State daTbox_c::bgCheckSet() {
     modelInfo& mdlInfo = getModelInfo();
 
     cBgD_t* bgd = (cBgD_t*)dComIfG_getObjectRes("Dalways", mdlInfo.closedColId);
diff --git a/src/d/actor/d_a_yougan.cpp b/src/d/actor/d_a_yougan.cpp
index ed84dbf5..f96db5da 100644
--- a/src/d/actor/d_a_yougan.cpp
+++ b/src/d/actor/d_a_yougan.cpp
@@ -17,7 +17,7 @@ static BOOL daYougan_Draw(daYougan_c*) {
 }
 
 /* 00000178-000002A8       .text _daYougan_draw__10daYougan_cFv */
-void daYougan_c::_daYougan_draw() {
+BOOL daYougan_c::_daYougan_draw() {
     /* Nonmatching */
 }
 
@@ -27,7 +27,7 @@ static BOOL daYougan_Execute(daYougan_c*) {
 }
 
 /* 000002C8-00000554       .text _daYougan_execute__10daYougan_cFv */
-void daYougan_c::_daYougan_execute() {
+BOOL daYougan_c::_daYougan_execute() {
     /* Nonmatching */
 }
 
@@ -37,7 +37,7 @@ static BOOL daYougan_IsDelete(daYougan_c*) {
 }
 
 /* 00000574-0000057C       .text _daYougan_isdelete__10daYougan_cFv */
-void daYougan_c::_daYougan_isdelete() {
+BOOL daYougan_c::_daYougan_isdelete() {
     /* Nonmatching */
 }
 
@@ -47,12 +47,12 @@ static BOOL daYougan_Delete(daYougan_c*) {
 }
 
 /* 0000059C-00000600       .text _daYougan_delete__10daYougan_cFv */
-void daYougan_c::_daYougan_delete() {
+BOOL daYougan_c::_daYougan_delete() {
     /* Nonmatching */
 }
 
 /* 00000600-00000884       .text useHeapInit__10daYougan_cFv */
-void daYougan_c::useHeapInit() {
+BOOL daYougan_c::useHeapInit() {
     /* Nonmatching */
 }
 
@@ -67,7 +67,7 @@ static cPhs_State daYougan_Create(fopAc_ac_c*) {
 }
 
 /* 000008C4-000009C8       .text _daYougan_create__10daYougan_cFv */
-void daYougan_c::_daYougan_create() {
+cPhs_State daYougan_c::_daYougan_create() {
     /* Nonmatching */
 }
 
diff --git a/src/d/d_door.cpp b/src/d/d_door.cpp
index 90d78f8d..e53d4f61 100644
--- a/src/d/d_door.cpp
+++ b/src/d/d_door.cpp
@@ -417,8 +417,8 @@ void dDoor_smoke_c::smokeEnd() {
 }
 
 /* 8006C448-8006C478       .text keyResLoad__12dDoor_key2_cFv */
-void dDoor_key2_c::keyResLoad() {
-    dComIfG_resLoad(&mPhs, "Key");
+cPhs_State dDoor_key2_c::keyResLoad() {
+    return dComIfG_resLoad(&mPhs, "Key");
 }
 
 /* 8006C478-8006C4A8       .text keyResDelete__12dDoor_key2_cFv */
@@ -683,7 +683,7 @@ BOOL dDoor_msg_c::proc(cXyz* pos) {
 }
 
 /* 8006D0DC-8006D11C       .text resLoad__12dDoor_hkyo_cFv */
-s32 dDoor_hkyo_c::resLoad() {
+cPhs_State dDoor_hkyo_c::resLoad() {
     if (m11 == 0) {
         return cPhs_COMPLEATE_e;
     }
diff --git a/src/d/d_ovlp_fade4.cpp b/src/d/d_ovlp_fade4.cpp
index 441d8090..6aa6d5a9 100644
--- a/src/d/d_ovlp_fade4.cpp
+++ b/src/d/d_ovlp_fade4.cpp
@@ -362,7 +362,7 @@ BOOL dOvlpFd4_Delete(dOvlpFd4_c*) {
 }
 
 /* 80225694-802256C0       .text dOvlpFd4_Create__FPv */
-s32 dOvlpFd4_Create(void* i_this) {
+cPhs_State dOvlpFd4_Create(void* i_this) {
     new (i_this) dOvlpFd4_c();
     return cPhs_COMPLEATE_e;
 }
diff --git a/src/f_op/f_op_msg.cpp b/src/f_op/f_op_msg.cpp
index b6e85790..d01f458e 100644
--- a/src/f_op/f_op_msg.cpp
+++ b/src/f_op/f_op_msg.cpp
@@ -52,7 +52,7 @@ int fopMsg_Delete(void* i_this) {
 static int fopMsg_MSG_TYPE;
 
 /* 8002A788-8002A860       .text fopMsg_Create__FPv */
-int fopMsg_Create(void* i_this) {
+cPhs_State fopMsg_Create(void* i_this) {
     msg_class* _this = (msg_class*)i_this;
 
     if (fpcM_IsFirstCreating(_this)) {
diff --git a/src/f_op/f_op_overlap_req.cpp b/src/f_op/f_op_overlap_req.cpp
index 26978f86..5f42befd 100644
--- a/src/f_op/f_op_overlap_req.cpp
+++ b/src/f_op/f_op_overlap_req.cpp
@@ -11,7 +11,7 @@
 
 void fopOvlpReq_SetPeektime(overlap_request_class*, u16);
 
-static int fopOvlpReq_phase_Done(overlap_request_class* i_this) {
+static cPhs_State fopOvlpReq_phase_Done(overlap_request_class* i_this) {
     if (fpcM_Delete(i_this->mpTask) == TRUE) {
         i_this->mpTask = NULL;
         i_this->field_0x4 = 0;
@@ -24,7 +24,7 @@ static int fopOvlpReq_phase_Done(overlap_request_class* i_this) {
     return cPhs_INIT_e;
 }
 
-static s32 fopOvlpReq_phase_IsDone(overlap_request_class* i_this) {
+static cPhs_State fopOvlpReq_phase_IsDone(overlap_request_class* i_this) {
     cReq_Done(i_this);
     if (i_this->mDelay-- <= 0)
         return cPhs_NEXT_e;
@@ -32,7 +32,7 @@ static s32 fopOvlpReq_phase_IsDone(overlap_request_class* i_this) {
         return cPhs_INIT_e;
 }
 
-static s32 fopOvlpReq_phase_IsWaitOfFadeout(overlap_request_class* i_this) {
+static cPhs_State fopOvlpReq_phase_IsWaitOfFadeout(overlap_request_class* i_this) {
     if (cReq_Is_Done(&i_this->mpTask->mRq)) {
         i_this->mIsPeek = 0;
         return cPhs_NEXT_e;
@@ -41,7 +41,7 @@ static s32 fopOvlpReq_phase_IsWaitOfFadeout(overlap_request_class* i_this) {
     return cPhs_INIT_e;
 }
 
-static s32 fopOvlpReq_phase_WaitOfFadeout(overlap_request_class* i_this) {
+static cPhs_State fopOvlpReq_phase_WaitOfFadeout(overlap_request_class* i_this) {
     if (i_this->mPeektime)
         i_this->mPeektime--;
 
@@ -54,7 +54,7 @@ static s32 fopOvlpReq_phase_WaitOfFadeout(overlap_request_class* i_this) {
     return cPhs_INIT_e;
 }
 
-static s32 fopOvlpReq_phase_IsComplete(overlap_request_class* i_this) {
+static cPhs_State fopOvlpReq_phase_IsComplete(overlap_request_class* i_this) {
     if (cReq_Is_Done(&i_this->mpTask->mRq)) {
         cReq_Done(i_this);
         return cPhs_NEXT_e;
@@ -63,7 +63,7 @@ static s32 fopOvlpReq_phase_IsComplete(overlap_request_class* i_this) {
     return cPhs_INIT_e;
 }
 
-static s32 fopOvlpReq_phase_IsCreated(overlap_request_class* i_this) {
+static cPhs_State fopOvlpReq_phase_IsCreated(overlap_request_class* i_this) {
     if (fpcM_IsCreating(i_this->mPId) == 0) {
         base_process_class* pBaseProc = fpcEx_SearchByID(i_this->mPId);
         if (pBaseProc == NULL)