Create return type cleanup, use dist enum

src/d/actor/d_a_arrow.cpp

@@ -1237,7 +1237,7 @@ BOOL daArrow_c::_delete() {
 }
 
 /* 800D8200-800D8220       .text daArrowCreate__FPv */
-static s32 daArrowCreate(void* i_this) {
+static cPhs_State daArrowCreate(void* i_this) {
     return static_cast<daArrow_c*>(i_this)->_create();
 }
 

src/d/actor/d_a_auction.cpp

@@ -1625,7 +1625,7 @@ int daAuction_c::getRand(int max) {
 }
 
 /* 00003C08-00003C28       .text daAuctionCreate__FPv */
-static s32 daAuctionCreate(void* i_this) {
+static cPhs_State daAuctionCreate(void* i_this) {
     return static_cast<daAuction_c*>(i_this)->_create();
 }
 

src/d/actor/d_a_beam.cpp

@@ -141,7 +141,7 @@ void daBeam_c::wait_proc() {
 }
 
 /* 00001C84-00001CA4       .text daBeamCreate__FPv */
-static s32 daBeamCreate(void* i_this) {
+static cPhs_State daBeamCreate(void* i_this) {
     return ((daBeam_c*)i_this)->_create();
 }
 

src/d/actor/d_a_bst.cpp

@@ -2170,7 +2170,7 @@ static BOOL daBst_Execute(bst_class* i_this) {
 
                 if (i_this->mEyeHealth[j] > 0 && i_this->field_0x10D6 != 7) {
                     actor->attention_info.flags = fopAc_Attn_LOCKON_BATTLE_e;
-                    actor->attention_info.distances[2] = 4;
+                    actor->attention_info.distances[fopAc_Attn_TYPE_BATTLE_e] = 4;
 
                     fopAcM_seStart(i_this, JA_SE_CM_BST_HEAD_WORKING, 0);
                     continue;
@@ -2579,7 +2579,7 @@ static cPhs_State daBst_Create(fopAc_ac_c* a_this) {
         }
 
         i_this->attention_info.flags = fopAc_Attn_LOCKON_BATTLE_e;
-        i_this->attention_info.distances[2] = 4;
+        i_this->attention_info.distances[fopAc_Attn_TYPE_BATTLE_e] = 4;
         if (hio_set == 0) {
             i_this->mHioSet = 1;
             hio_set = 1;

src/d/actor/d_a_canon.cpp

@@ -207,7 +207,7 @@ void daCanon_c::GameInfo2DDraw() {
 }
 
 /* 00002074-00002094       .text daCanonCreate__FPv */
-static s32 daCanonCreate(void* i_this) {
+static cPhs_State daCanonCreate(void* i_this) {
     return ((daCanon_c*)i_this)->_create();
 }
 

src/d/actor/d_a_daiocta.cpp

@@ -325,7 +325,7 @@ bool daDaiocta_c::_delete() {
 }
 
 /* 0000513C-0000515C       .text daDaioctaCreate__FPv */
-static s32 daDaioctaCreate(void* i_this) {
+static cPhs_State daDaioctaCreate(void* i_this) {
     return ((daDaiocta_c*)i_this)->_create();
 }
 

src/d/actor/d_a_daiocta_eye.cpp

@@ -144,7 +144,7 @@ bool daDaiocta_Eye_c::_delete() {
 }
 
 /* 000017B4-000017D4       .text daDaiocta_EyeCreate__FPv */
-static s32 daDaiocta_EyeCreate(void* i_this) {
+static cPhs_State daDaiocta_EyeCreate(void* i_this) {
     return ((daDaiocta_Eye_c*)i_this)->_create();
 }
 

src/d/actor/d_a_fm.cpp

@@ -605,7 +605,7 @@ bool daFm_c::_delete() {
 }
 
 /* 0000A0FC-0000A11C       .text daFmCreate__FPv */
-static s32 daFmCreate(void* i_this) {
+static cPhs_State daFmCreate(void* i_this) {
     return ((daFm_c*)i_this)->_create();
 }
 

src/d/actor/d_a_goal_flag.cpp

@@ -98,7 +98,7 @@ void daGoal_Flag_c::RaceEnd() {
 }
 
 /* 000023E0-00002400       .text daGoal_FlagCreate__FPv */
-static s32 daGoal_FlagCreate(void* i_this) {
+static cPhs_State daGoal_FlagCreate(void* i_this) {
     return ((daGoal_Flag_c*)i_this)->_create();
 }
 

src/d/actor/d_a_gy.cpp

@@ -310,7 +310,7 @@ bool daGy_c::_delete() {
 }
 
 /* 00005AD4-00005AF4       .text daGyCreate__FPv */
-static s32 daGyCreate(void* i_this) {
+static cPhs_State daGyCreate(void* i_this) {
     return ((daGy_c*)i_this)->_create();
 }
 

src/d/actor/d_a_gy_ctrl.cpp

@@ -148,7 +148,7 @@ bool daGy_Ctrl_c::_delete() {
 }
 
 /* 00001C44-00001C64       .text daGy_CtrlCreate__FPv */
-static s32 daGy_CtrlCreate(void* i_this) {
+static cPhs_State daGy_CtrlCreate(void* i_this) {
     return ((daGy_Ctrl_c*)i_this)->_create();
 }
 

src/d/actor/d_a_hot_floor.cpp

@@ -97,7 +97,7 @@ bool daHot_Floor_c::_draw() {
 }
 
 /* 00000264-000002F8       .text daHot_FloorCreate__FPv */
-static s32 daHot_FloorCreate(void* i_this) {
+static cPhs_State daHot_FloorCreate(void* i_this) {
     return ((daHot_Floor_c*)i_this)->_create();
 }
 

src/d/actor/d_a_kaji.cpp

@@ -100,7 +100,7 @@ bool daKaji_c::_draw() {
 }
 
 /* 000001F4-00000344       .text daKajiCreate__FPv */
-static s32 daKajiCreate(void* i_this) {
+static cPhs_State daKajiCreate(void* i_this) {
     return ((daKaji_c*)i_this)->_create();
 }
 

src/d/actor/d_a_kmon.cpp

@@ -33,7 +33,7 @@ void daKmon_c::checkTalk() {
 }
 
 /* 000006E8-000007F8       .text daKmonCreate__FPv */
-static s32 daKmonCreate(void*) {
+static cPhs_State daKmonCreate(void*) {
     /* Nonmatching */
 }
 

src/d/actor/d_a_npc_ah.cpp

@@ -219,7 +219,7 @@ void daNpcAh_c::chkEndEvent() {
 }
 
 /* 00002338-00002358       .text daNpc_AhCreate__FPv */
-static s32 daNpc_AhCreate(void* i_this) {
+static cPhs_State daNpc_AhCreate(void* i_this) {
     return ((daNpcAh_c*)i_this)->_create();
 }
 

src/d/actor/d_a_npc_auction.cpp

@@ -194,7 +194,7 @@ void daNpcAuction_c::clrEmitter() {
 }
 
 /* 000029DC-00002A0C       .text daNpc_AuctionCreate__FPv */
-static s32 daNpc_AuctionCreate(void*) {
+static cPhs_State daNpc_AuctionCreate(void*) {
     /* Nonmatching */
 }
 

src/d/actor/d_a_npc_bmcon1.cpp

@@ -278,7 +278,7 @@ void daNpcBmcon_c::isClear() {
 }
 
 /* 00003DFC-00003E1C       .text daNpc_BmconCreate__FPv */
-static s32 daNpc_BmconCreate(void* i_this) {
+static cPhs_State daNpc_BmconCreate(void* i_this) {
     return ((daNpcBmcon_c*)i_this)->_create();
 }
 

src/d/actor/d_a_npc_btsw.cpp

@@ -448,8 +448,8 @@ BOOL daNpc_Btsw_c::CreateInit() {
     eventInfo.setXyCheckCB(daNpc_Btsw_XyCheckCB);
     mEventCut.setActorInfo2("Btsw", this);
 
-    attention_info.distances[1] = 0x6F;
-    attention_info.distances[3] = 0x6F;
+    attention_info.distances[fopAc_Attn_TYPE_TALK_e] = 0x6F;
+    attention_info.distances[fopAc_Attn_TYPE_SPEAK_e] = 0x6F;
     field_0x9C8 = -1;
     field_0x952 = 0;
     field_0x953 = 0;

src/d/actor/d_a_npc_ji1.cpp

@@ -1183,7 +1183,7 @@ BOOL daNpc_Ji1_c::speakAction(void*) {
                     else if(field_0xC90 == 3) {
                         mMsgNo = 0x983;
                         attention_info.flags |= fopAc_Attn_LOCKON_BATTLE_e;
-                        attention_info.distances[2] = 3;
+                        attention_info.distances[fopAc_Attn_TYPE_BATTLE_e] = 3;
                     }
                     else {
                         mMsgNo = 0x980;
@@ -1198,7 +1198,7 @@ BOOL daNpc_Ji1_c::speakAction(void*) {
                     else if(field_0xC90 == 3) {
                         mMsgNo = 0x96C;
                         attention_info.flags &= ~fopAc_Attn_LOCKON_BATTLE_e;
-                        attention_info.distances[2] = 0xB5;
+                        attention_info.distances[fopAc_Attn_TYPE_BATTLE_e] = 0xB5;
                     }
                     else {
                         mMsgNo = 0x985;

src/d/actor/d_a_npc_kg1.cpp

@@ -146,7 +146,7 @@ void daNpc_Kg1_c::setAnm() {
 }
 
 /* 00001F8C-00001FAC       .text daNpc_Kg1Create__FPv */
-static s32 daNpc_Kg1Create(void* i_this) {
+static cPhs_State daNpc_Kg1Create(void* i_this) {
     return ((daNpc_Kg1_c*)i_this)->_create();
 }
 

src/d/actor/d_a_npc_km1.cpp

@@ -70,8 +70,8 @@ bool daNpc_Km1_c::createInit() {
 
     mEventCut.setActorInfo2("Km1", this);
     attention_info.flags = fopAc_Attn_LOCKON_TALK_e | fopAc_Attn_ACTION_SPEAK_e;
-    attention_info.distances[1] = 0xAB;
-    attention_info.distances[3] = 0xA9;
+    attention_info.distances[fopAc_Attn_TYPE_TALK_e] = 0xAB;
+    attention_info.distances[fopAc_Attn_TYPE_SPEAK_e] = 0xA9;
     gravity = -4.0f;
     field_0x798 = current.pos;
     set_action(&daNpc_Km1_c::wait_action1,NULL);

src/d/actor/d_a_npc_mn.cpp

@@ -379,7 +379,7 @@ void daNpcMn_c::isChangePos(unsigned char) {
 }
 
 /* 00003CE8-00003D08       .text daNpc_MnCreate__FPv */
-static s32 daNpc_MnCreate(void* i_this) {
+static cPhs_State daNpc_MnCreate(void* i_this) {
     return ((daNpcMn_c*)i_this)->_create();
 }
 

src/d/actor/d_a_npc_mt.cpp

@@ -294,7 +294,7 @@ void daNpcMt_c::changePhotoNo(u8) {
 }
 
 /* 00002D4C-00002D6C       .text daNpc_MtCreate__FPv */
-static s32 daNpc_MtCreate(void* i_this) {
+static cPhs_State daNpc_MtCreate(void* i_this) {
     return ((daNpcMt_c*)i_this)->_create();
 }
 

src/d/actor/d_a_npc_nz.cpp

@@ -952,7 +952,7 @@ bool daNpc_Nz_c::_delete() {
 }
 
 /* 00002E6C-00002E8C       .text daNpc_NzCreate__FPv */
-static s32 daNpc_NzCreate(void* i_this) {
+static cPhs_State daNpc_NzCreate(void* i_this) {
     return static_cast<daNpc_Nz_c*>(i_this)->_create();
 }
 

src/d/actor/d_a_npc_p2.cpp

@@ -304,7 +304,7 @@ bool daNpc_P2_c::_delete() {
 }
 
 /* 00004D54-00004D74       .text daNpc_P2Create__FPv */
-static s32 daNpc_P2Create(void* i_this) {
+static cPhs_State daNpc_P2Create(void* i_this) {
     return ((daNpc_P2_c*)i_this)->_create();
 }
 

src/d/actor/d_a_npc_people.cpp

@@ -8353,7 +8353,7 @@ void daNpcPeople_c::warp() {
 }
 
 /* 000098DC-000098FC       .text daNpc_PeopleCreate__FPv */
-static s32 daNpc_PeopleCreate(void* i_this) {
+static cPhs_State daNpc_PeopleCreate(void* i_this) {
     return static_cast<daNpcPeople_c*>(i_this)->_create();
 }
 

src/d/actor/d_a_npc_photo.cpp

@@ -2252,7 +2252,7 @@ void daNpcPhoto_c::setCollision(dCcD_Cyl* cyl, cXyz center, f32 radius, f32 heig
 }
 
 /* 00004D44-00004D64       .text daNpc_PhotoCreate__FPv */
-static s32 daNpc_PhotoCreate(void* i_this) {
+static cPhs_State daNpc_PhotoCreate(void* i_this) {
     return static_cast<daNpcPhoto_c*>(i_this)->_create();
 }
 

src/d/actor/d_a_npc_roten.cpp

@@ -2882,7 +2882,7 @@ void daNpcRoten_c::setCollisionH() {
 }
 
 /* 00003F08-00003F28       .text daNpc_RotenCreate__FPv */
-static s32 daNpc_RotenCreate(void* i_this) {
+static cPhs_State daNpc_RotenCreate(void* i_this) {
     return static_cast<daNpcRoten_c*>(i_this)->_create();
 }
 

src/d/actor/d_a_npc_so.cpp

@@ -368,7 +368,7 @@ bool daNpc_So_c::_delete() {
 }
 
 /* 00004754-00004774       .text daNpc_SoCreate__FPv */
-static s32 daNpc_SoCreate(void* i_this) {
+static cPhs_State daNpc_SoCreate(void* i_this) {
     return ((daNpc_So_c*)i_this)->_create();
 }
 

src/d/actor/d_a_npc_sv.cpp

@@ -230,7 +230,7 @@ void daNpcSv_c::isTalkOK() {
 }
 
 /* 00002958-00002978       .text daNpc_PeopleCreate__FPv */
-static s32 daNpc_PeopleCreate(void* i_this) {
+static cPhs_State daNpc_PeopleCreate(void* i_this) {
     return ((daNpcSv_c*)i_this)->_create();
 }
 

src/d/actor/d_a_obj_balancelift.cpp

@@ -86,7 +86,7 @@ void daBalancelift_c::CreateInit() {
 }
 
 /* 00000F34-000010E0       .text daBalanceliftCreate__FPv */
-static s32 daBalanceliftCreate(void*) {
+static cPhs_State daBalanceliftCreate(void*) {
     /* Nonmatching */
 }
 

src/d/actor/d_a_obj_bemos.cpp

@@ -250,7 +250,7 @@ void daBemos_c::getBeamActor() {
 }
 
 /* 00003F70-00003F90       .text daBemosCreate__FPv */
-static s32 daBemosCreate(void* i_this) {
+static cPhs_State daBemosCreate(void* i_this) {
     return ((daBemos_c*)i_this)->_create();
 }
 

src/d/actor/d_a_obj_bscurtain.cpp

@@ -97,7 +97,7 @@ bool daObj_Bscurtain_c::_draw() {
 }
 
 /* 00000370-00000400       .text daObj_BscurtainCreate__FPv */
-static s32 daObj_BscurtainCreate(void* i_this) {
+static cPhs_State daObj_BscurtainCreate(void* i_this) {
     return ((daObj_Bscurtain_c*)i_this)->_create();
 }
 

src/d/actor/d_a_obj_canon.cpp

@@ -614,7 +614,7 @@ bool daObj_Canon_c::_delete() {
 }
 
 /* 00001C50-00001C70       .text daObj_CanonCreate__FPv */
-static s32 daObj_CanonCreate(void* i_this) {
+static cPhs_State daObj_CanonCreate(void* i_this) {
     return ((daObj_Canon_c*)i_this)->_create();
 }
 

src/d/actor/d_a_obj_demo_barrel.cpp

@@ -28,7 +28,7 @@ void daObj_Demo_Barrel_c::CreateHeap() {
 }
 
 /* 00000538-000005EC       .text daObj_Demo_BarrelCreate__FPv */
-static s32 daObj_Demo_BarrelCreate(void*) {
+static cPhs_State daObj_Demo_BarrelCreate(void*) {
     /* Nonmatching */
 }
 

src/d/actor/d_a_obj_figure.cpp

@@ -1023,7 +1023,7 @@ int daObjFigure_c::getFigureBmd(u8 figureNo) {
 }
 
 /* 00001A80-00001AA0       .text daSampleCreate__FPv */
-static s32 daSampleCreate(void* i_this) {
+static cPhs_State daSampleCreate(void* i_this) {
     return static_cast<daObjFigure_c*>(i_this)->_create();
 }
 

src/d/actor/d_a_obj_hat.cpp

@@ -212,7 +212,7 @@ void daObjHat_c::setSpeed(cXyz speed) {
 }
 
 /* 00000A20-00000A40       .text daSampleCreate__FPv */
-static s32 daSampleCreate(void* i_this) {
+static cPhs_State daSampleCreate(void* i_this) {
     return static_cast<daObjHat_c*>(i_this)->_create();
 }
 

src/d/actor/d_a_obj_hole.cpp

@@ -278,7 +278,7 @@ bool daObj_Hole_c::_delete() {
 }
 
 /* 0000125C-0000127C       .text daObj_HoleCreate__FPv */
-static s32 daObj_HoleCreate(void* i_actor) {
+static cPhs_State daObj_HoleCreate(void* i_actor) {
     return static_cast<daObj_Hole_c*>(i_actor)->_create();
 }
 

src/d/actor/d_a_obj_ikada.cpp

@@ -309,7 +309,7 @@ bool daObj_Ikada_c::_delete() {
 }
 
 /* 0000543C-0000545C       .text daObj_IkadaCreate__FPv */
-static s32 daObj_IkadaCreate(void* i_this) {
+static cPhs_State daObj_IkadaCreate(void* i_this) {
     return ((daObj_Ikada_c*)i_this)->_create();
 }
 

src/d/actor/d_a_obj_kanoke.cpp

@@ -191,7 +191,7 @@ void daObjKanoke_c::setMtxHuta(cXyz*) {
 }
 
 /* 00001E4C-00001E6C       .text daObjKanokeCreate__FPv */
-static s32 daObjKanokeCreate(void* i_this) {
+static cPhs_State daObjKanokeCreate(void* i_this) {
     return ((daObjKanoke_c*)i_this)->_create();
 }
 

src/d/actor/d_a_obj_lpalm.cpp

@@ -108,7 +108,7 @@ bool daObjLpalm_c::_delete() {
 }
 
 /* 00000404-000004A4       .text daObjLpalmCreate__FPv */
-static s32 daObjLpalmCreate(void* i_this) {
+static cPhs_State daObjLpalmCreate(void* i_this) {
     return ((daObjLpalm_c*)i_this)->_create();
 }
 

src/d/actor/d_a_obj_majyuu_door.cpp

@@ -125,7 +125,7 @@ bool daObj_MjDoor_c::_draw() {
 }
 
 /* 00000F28-00000F48       .text daObj_MjDoorCreate__FPv */
-static s32 daObj_MjDoorCreate(void* i_this) {
+static cPhs_State daObj_MjDoorCreate(void* i_this) {
     return ((daObj_MjDoor_c*)i_this)->_create();
 }
 

src/d/actor/d_a_obj_quake.cpp

@@ -191,7 +191,7 @@ s32 daObjQuake_c::getPrmPower() {
 }
 
 /* 000006F8-00000718       .text daObjQuakeCreate__FPv */
-static s32 daObjQuakeCreate(void* i_this) {
+static cPhs_State daObjQuakeCreate(void* i_this) {
     return static_cast<daObjQuake_c*>(i_this)->_create();
 }
 

src/d/actor/d_a_obj_roten.cpp

@@ -131,7 +131,7 @@ cPhs_State daObj_Roten_c::_create() {
 }
 
 /* 00000410-00000530       .text daObj_RotenCreate__FPv */
-static s32 daObj_RotenCreate(void* i_actor) {
+static cPhs_State daObj_RotenCreate(void* i_actor) {
     return static_cast<daObj_Roten_c*>(i_actor)->_create();
 }
 

src/d/actor/d_a_obj_stair.cpp

@@ -76,7 +76,7 @@ BOOL daObj_Stair_c::Delete() {
 }
 
 /* 000004B8-000004D8       .text daObj_StairCreate__FPv */
-static s32 daObj_StairCreate(void* i_this) {
+static cPhs_State daObj_StairCreate(void* i_this) {
     return ((daObj_Stair_c*)i_this)->_create();
 }
 

src/d/actor/d_a_obj_tousekiki.cpp

@@ -18,7 +18,7 @@ void daObj_Tousekiki_c::CreateHeap() {
 }
 
 /* 000002BC-000002DC       .text daObj_TousekikiCreate__FPv */
-static s32 daObj_TousekikiCreate(void* i_this) {
+static cPhs_State daObj_TousekikiCreate(void* i_this) {
     return ((daObj_Tousekiki_c*)i_this)->_create();
 }
 

src/d/actor/d_a_obj_warpt.cpp

@@ -267,7 +267,7 @@ bool daObj_Warpt_c::_delete() {
 }
 
 /* 00002858-00002878       .text daObj_WarptCreate__FPv */
-static s32 daObj_WarptCreate(void* i_this) {
+static cPhs_State daObj_WarptCreate(void* i_this) {
     return ((daObj_Warpt_c*)i_this)->_create();
 }
 

src/d/actor/d_a_rd.cpp

@@ -1868,7 +1868,7 @@ bool daRd_c::_delete() {
 }
 
 /* 00004FB8-00004FD8       .text daRdCreate__FPv */
-static s32 daRdCreate(void* i_this) {
+static cPhs_State daRdCreate(void* i_this) {
     return static_cast<daRd_c*>(i_this)->_create();
 }
 

src/d/actor/d_a_salvage.cpp

@@ -143,7 +143,7 @@ void daSalvage_c::debugDraw() {
 }
 
 /* 00002410-00002430       .text daSalvageCreate__FPv */
-static s32 daSalvageCreate(void* i_this) {
+static cPhs_State daSalvageCreate(void* i_this) {
     return ((daSalvage_c*)i_this)->_create();
 }
 

src/d/actor/d_a_sie_flag.cpp

@@ -240,7 +240,7 @@ bool daSie_Flag_c::_draw() {
 }
 
 /* 00000B94-00000BB4       .text daSie_FlagCreate__FPv */
-static s32 daSie_FlagCreate(void* i_this) {
+static cPhs_State daSie_FlagCreate(void* i_this) {
     return ((daSie_Flag_c*)i_this)->_create();
 }
 

src/d/actor/d_a_tag_ghostship.cpp

@@ -134,7 +134,7 @@ bool daTag_Gship_c::_delete() {
 }
 
 /* 000005F4-00000614 .text daTag_GshipCreate__FPv */
-static s32 daTag_GshipCreate(void* i_this) {
+static cPhs_State daTag_GshipCreate(void* i_this) {
     return static_cast<daTag_Gship_c*>(i_this)->_create();
 }
 

src/d/actor/d_a_tag_photo.cpp

@@ -115,7 +115,7 @@ cPhs_State daTagPhoto_c::_create() {
         NULL
     };
 
-    dComLbG_PhaseHandler(&mPhs, l_method, this);
+    return dComLbG_PhaseHandler(&mPhs, l_method, this);
 }
 
 /* 000001C8-000001D0       .text createHeap__12daTagPhoto_cFv */
@@ -129,8 +129,8 @@ cPhs_State daTagPhoto_c::createInit() {
     mPhotoTalk2EventIdx = dComIfGp_evmng_getEventIdx("PHOTO_TALK2");
     mEventCut.setActorInfo("TagPo", this);
     eventInfo.setEventId(mPhotoTalk2EventIdx);
-    attention_info.distances[1] = 0x23;
-    attention_info.distances[3] = 0x24;
+    attention_info.distances[fopAc_Attn_TYPE_TALK_e] = 0x23;
+    attention_info.distances[fopAc_Attn_TYPE_SPEAK_e] = 0x24;
     attention_info.flags = fopAc_Attn_TALKFLAG_CHECK_e | fopAc_Attn_ACTION_SPEAK_e | fopAc_Attn_LOCKON_TALK_e;
     shape_angle = current.angle;
 
@@ -373,7 +373,7 @@ u8 daTagPhoto_c::getPrmTagNo() {
 }
 
 /* 00000928-00000948       .text daTagPhotoCreate__FPv */
-static s32 daTagPhotoCreate(void* i_this) {
+static cPhs_State daTagPhotoCreate(void* i_this) {
     return ((daTagPhoto_c*)i_this)->_create();
 }
 

src/d/actor/d_a_tag_so.cpp

@@ -66,7 +66,7 @@ bool daTag_So_c::_delete() {
 }
 
 /* 00000284-000002A4       .text daTag_SoCreate__FPv */
-static s32 daTag_SoCreate(void* i_this) {
+static cPhs_State daTag_SoCreate(void* i_this) {
     return ((daTag_So_c*)i_this)->_create();
 }
 

src/d/actor/d_a_tori_flag.cpp

@@ -129,7 +129,7 @@ cPhs_State daTori_Flag_c::_create() {
 }
 
 /* 000003A4-000003C4       .text daTori_FlagCreate__FPv */
-static s32 daTori_FlagCreate(void* i_this) {
+static cPhs_State daTori_FlagCreate(void* i_this) {
     return ((daTori_Flag_c*)i_this)->_create();
 }
 

src/d/actor/d_a_ykgr.cpp

@@ -23,7 +23,7 @@ void daYkgr_c::getPosRate() {
 }
 
 /* 00000408-00000428       .text daYkgrCreate__FPv */
-static s32 daYkgrCreate(void* i_this) {
+static cPhs_State daYkgrCreate(void* i_this) {
     return ((daYkgr_c*)i_this)->_create();
 }
 

src/d/d_throwstone.cpp

@@ -55,7 +55,7 @@ cPhs_State daThrowstone_c::_create() {
 }
 
 /* 8023B5DC-8023B6DC       .text daThrowstoneCreate__FPv */
-static s32 daThrowstoneCreate(void* ptr) {
+static cPhs_State daThrowstoneCreate(void* ptr) {
     return ((daThrowstone_c*)ptr)->_create();
 }