Merge remote-tracking branch 'decomp/main' into compile

include/d/actor/d_a_arrow.h

@@ -53,7 +53,7 @@ public:
     int procSlingHit();
     int execute();
     int draw();
-    cPhs__Step create();
+    cPhs_Step create();
     ~daArrow_c();
 
     void setBombArrowExplode() { field_0x950 = 0; }

include/d/actor/d_a_b_ds.h

@@ -175,7 +175,7 @@ public:
     int execute();
     int _delete();
     int CreateHeap();
-    cPhs__Step create();
+    cPhs_Step create();
     daB_DS_c();
 
     cXyz getHandPosR();

include/d/actor/d_a_b_yo.h

@@ -65,7 +65,7 @@ public:
     int _delete();
     int CreateHeap();
     int CreateHeap2();
-    cPhs__Step create();
+    cPhs_Step create();
 
     u8 getModelNo() { return mModelNo; }
     s16 getFrizadRollAngle() { return mIceAngle; }

include/d/actor/d_a_b_yo_ice.h

@@ -46,7 +46,7 @@ public:
     int execute();
     int _delete();
     int CreateHeap();
-    cPhs__Step create();
+    cPhs_Step create();
     daB_YOI_c();
 
     void setSubNumber(int i_subNumber) { mSubNumber = i_subNumber; }

include/d/actor/d_a_balloon_2D.h

@@ -1,7 +1,7 @@
 #ifndef D_A_BALLOON_2D_H
 #define D_A_BALLOON_2D_H
 
-#include "dolphin/types.h"
+#include <dolphin/types.h>
 #include "f_op/f_op_actor.h"
 #include "SSystem/SComponent/c_phase.h"
 #include "d/d_drawlist.h"

include/d/actor/d_a_door_boss.h

@@ -31,7 +31,7 @@ public:
     int CreateHeap();
     void calcMtx();
     int CreateInit();
-    cPhs__Step create();
+    cPhs_Step create();
     int getDemoAction();
     void demoProc();
     void calcGoal(cXyz*, int);

include/d/actor/d_a_door_bossL1.h

@@ -1,7 +1,7 @@
 #ifndef D_A_DOOR_BOSSL1_H
 #define D_A_DOOR_BOSSL1_H
 
-#include "dolphin/types.h"
+#include <dolphin/types.h>
 #include "f_op/f_op_actor.h"
 #include "d/d_bg_w.h"
 #include "d/d_bg_s_acch.h"

include/d/actor/d_a_door_bossL5.h

@@ -1,7 +1,7 @@
 #ifndef D_A_DOOR_BOSSL5_H
 #define D_A_DOOR_BOSSL5_H
 
-#include "dolphin/types.h"
+#include <dolphin/types.h>
 #include "f_op/f_op_actor.h"
 #include "SSystem/SComponent/c_phase.h"
 #include "d/d_bg_w.h"

include/d/actor/d_a_door_mbossL1.h

@@ -1,7 +1,7 @@
 #ifndef D_A_DOOR_MBOSSL1_H
 #define D_A_DOOR_MBOSSL1_H
 
-#include "dolphin/types.h"
+#include <dolphin/types.h>
 #include "f_op/f_op_actor.h"
 #include "SSystem/SComponent/c_phase.h"
 #include "d/d_bg_w.h"

include/d/actor/d_a_door_shutter.h

@@ -1,7 +1,7 @@
 #ifndef D_A_DOOR_SHUTTER_H
 #define D_A_DOOR_SHUTTER_H
 
-#include "dolphin/types.h"
+#include <dolphin/types.h>
 #include "f_op/f_op_actor.h"
 #include "SSystem/SComponent/c_phase.h"
 #include "d/d_bg_w.h"

include/d/actor/d_a_e_db_leaf.h

@@ -2,7 +2,7 @@
 #define D_A_E_DB_LEAF_H
 
 #include "d/d_com_inf_game.h"
-#include "dolphin/types.h"
+#include <dolphin/types.h>
 
 /**
  * @ingroup actors-enemies

include/d/actor/d_a_e_dt.h

@@ -74,7 +74,7 @@ public:
     int execute();
     int _delete();
     int CreateHeap();
-    cPhs__Step create();
+    cPhs_Step create();
 
     bool isFlyingAttack() { return mFlyingAttack; }
     bool isFlyingAttackLand() { return mFlyingAttackLand; }

include/d/actor/d_a_e_fb.h

@@ -37,7 +37,7 @@ public:
     int execute();
     int _delete();
     int CreateHeap();
-    cPhs__Step create();
+    cPhs_Step create();
     daE_FB_c();
 
 private:

include/d/actor/d_a_e_gm.h

@@ -51,7 +51,7 @@ public:
     int execute();
     int _delete();
     int CreateHeap();
-    cPhs__Step create();
+    cPhs_Step create();
 
     void InstantKill() { field_0xa76 = 1; }
     u8 CheckDeath() { return field_0xa68; }

include/d/actor/d_a_e_oc.h

@@ -77,7 +77,7 @@ public:
     int execute();
     int _delete();
     int CreateHeap();
-    cPhs__Step create();
+    cPhs_Step create();
 
     bool isHomeWait() { return mIsHomeWait; }
     bool isBattleOn() { return mBattleOn; }

include/d/actor/d_a_e_oct_bg.h

@@ -1,7 +1,7 @@
 #ifndef D_A_E_OCT_BG_H
 #define D_A_E_OCT_BG_H
 
-#include "dolphin/types.h"
+#include <dolphin/types.h>
 #include "f_op/f_op_actor.h"
 #include "d/d_bg_s_acch.h"
 #include "Z2AudioLib/Z2Creature.h"

include/d/actor/d_a_e_ot.h

@@ -38,7 +38,7 @@ public:
     int execute();
     int _delete();
     int CreateHeap();
-    cPhs__Step create();
+    cPhs_Step create();
 
     int getChildNo() { return mChildNo; }
     int getActionMode() { return mAction; }

include/d/actor/d_a_e_pm.h

@@ -77,7 +77,7 @@ public:
     void setGakkiBaseMtx();
     void setLampBaseMtx();
     void SkipChk();
-    cPhs__Step Create();
+    cPhs_Step Create();
 
     void AppearSet() { mAppear = true; }
     u8 ActionChk() { return mPuppetDelete; }

include/d/actor/d_a_e_sb.h

@@ -56,7 +56,7 @@ public:
     int Draw();
     int Delete();
     void setBaseMtx();
-    cPhs__Step Create();
+    cPhs_Step Create();
 private:
     /* 0x5AC */ int field_0x5ac;
     /* 0x5B0 */ int field_0x5b0;

include/d/actor/d_a_e_sm.h

@@ -55,7 +55,7 @@ public:
     int Delete();
     int CreateHeap();
     void initCoSph();
-    cPhs__Step Create();
+    cPhs_Step Create();
     daE_SM_c();
 
     /* 0x05AC */ request_of_phase_process_class mPhase;

include/d/actor/d_a_e_sw.h

@@ -55,7 +55,7 @@ public:
     int execute();
     int _delete();
     int CreateHeap();
-    cPhs__Step create();
+    cPhs_Step create();
     void d_setAction(void (daE_SW_c::*)());
     void d_checkFall();
     void d_damage_check();

include/d/actor/d_a_e_tk.h

@@ -6,6 +6,7 @@
 #include "d/d_cc_uty.h"
 #include "d/d_path.h"
 #include "f_op/f_op_actor.h"
+#include "m_Do/m_Do_ext.h"
 
 /**
  * @ingroup actors-enemies
@@ -60,17 +61,18 @@ public:
 
 STATIC_ASSERT(sizeof(e_tk_class) == 0xA64);
 
-class daE_TK_HIO_c {
+class daE_TK_HIO_c : public JORReflexible {
 public:
     daE_TK_HIO_c();
-    virtual ~daE_TK_HIO_c() {}
+    void genMessage(JORMContext*);
+    virtual ~daE_TK_HIO_c() {};
 
-    /* 0x04 */ s8 field_0x04;
-    /* 0x08 */ f32 mRadiusScale;
-    /* 0x0C */ f32 mPlayerRange1;
-    /* 0x10 */ f32 mPlayerRange2;
-    /* 0x14 */ f32 mSpeedModifier1;
-    /* 0x18 */ f32 mSpeedModifier2;
+    /* 0x04 */ s8 mNo;
+    /* 0x08 */ f32 mBaseSize;
+    /* 0x0C */ f32 mPlayerDetectionDistanceNear;
+    /* 0x10 */ f32 mPlayerDetectionDistanceFar;
+    /* 0x14 */ f32 mSwimSpeedModifier;
+    /* 0x18 */ f32 mFleeSpeedModifier;
 };
 
 STATIC_ASSERT(sizeof(daE_TK_HIO_c) == 0x1C);

include/d/actor/d_a_e_tk2.h

@@ -5,6 +5,7 @@
 #include "d/d_cc_d.h"
 #include "d/d_cc_uty.h"
 #include "f_op/f_op_actor.h"
+#include "m_Do/m_Do_ext.h"
 
 /**
  * @ingroup actors-enemies
@@ -54,17 +55,18 @@ public:
 
 STATIC_ASSERT(sizeof(e_tk2_class) == 0xA50);
 
-class daE_TK2_HIO_c {
+class daE_TK2_HIO_c : public JORReflexible {
 public:
     daE_TK2_HIO_c();
     virtual ~daE_TK2_HIO_c() {};
+    void genMessage(JORMContext *);
 
-    /* 0x04 */ s8 field_0x04;
-    /* 0x08 */ f32 mRadiusScale;
-    /* 0x0C */ f32 mPlayerRange1;
-    /* 0x10 */ f32 mPlayerRange2;
-    /* 0x14 */ f32 mSpeedModifier1; /* Unused */
-    /* 0x18 */ f32 mSpeedModifier2; /* Unused */
+    /* 0x04 */ s8 mNo;
+    /* 0x08 */ f32 mBaseSize;
+    /* 0x0C */ f32 mPlayerDetectionDistanceNear;
+    /* 0x10 */ f32 mPlayerDetectionDistanceFar;
+    /* 0x14 */ f32 mSwimSpeedModifier; /* Unused */
+    /* 0x18 */ f32 mFleeSpeedModifier; /* Unused */
 };
 
 STATIC_ASSERT(sizeof(daE_TK2_HIO_c) == 0x1C);

include/d/actor/d_a_e_ymb.h

@@ -78,7 +78,7 @@ public:
     int execute();
     int _delete();
     int CreateHeap();
-    cPhs__Step create();
+    cPhs_Step create();
 
     int getMaxLockAttack() { return 6; }
     u8 getSwitchBit() { return mSwitchBit; }

include/d/actor/d_a_e_zh.h

@@ -52,7 +52,7 @@ public:
     int execute();
     int _delete();
     int CreateHeap();
-    cPhs__Step create();
+    cPhs_Step create();
     daE_ZH_c();
 
     /* 0x5AC */ request_of_phase_process_class mPhase;

include/d/actor/d_a_e_zm.h

@@ -35,7 +35,7 @@ public:
     int execute();
     int _delete();
     int CreateHeap();
-    cPhs__Step create();
+    cPhs_Step create();
 
     /* 0x5AC */ request_of_phase_process_class mPhase;
     /* 0x5B4 */ mDoExt_McaMorfSO* mpModelMorf;

include/d/actor/d_a_fr.h

@@ -4,7 +4,7 @@
 #include "d/d_bg_s_acch.h"
 #include "d/d_cc_d.h"
 #include "d/d_msg_flow.h"
-#include "dolphin/types.h"
+#include <dolphin/types.h>
 #include "SSystem/SComponent/c_phase.h"
 #include "f_op/f_op_actor_mng.h"
 

include/d/actor/d_a_kytag12.h

@@ -1,7 +1,7 @@
 #ifndef D_A_KYTAG12_H
 #define D_A_KYTAG12_H
 
-#include "dolphin/types.h"
+#include <dolphin/types.h>
 #include "f_op/f_op_actor_mng.h"
 
 /**

include/d/actor/d_a_kytag13.h

@@ -1,7 +1,7 @@
 #ifndef D_A_KYTAG13_H
 #define D_A_KYTAG13_H
 
-#include "dolphin/types.h"
+#include <dolphin/types.h>
 #include "f_op/f_op_actor_mng.h"
 
 /**

include/d/actor/d_a_midna.h

@@ -253,7 +253,7 @@ public:
     int initInvModel(u16, J3DModel**, mDoExt_invisibleModel*, u32);
     int initDemoModel(J3DModel**, char const*, u32);
     int createHeap();
-    cPhs__Step create();
+    cPhs_Step create();
     void allAnimePlay();
     void setMatrix();
     void setBodyPartMatrix();

include/d/actor/d_a_npc_aru.h

@@ -94,7 +94,7 @@ public:
     typedef int (daNpc_Aru_c::*cutFunc)(int);
 
     ~daNpc_Aru_c();
-    cPhs__Step create();
+    cPhs_Step create();
     int CreateHeap();
     int Delete();
     int Execute();

include/d/actor/d_a_npc_ash.h

@@ -96,7 +96,7 @@ public:
 public:
     daNpcAsh_c();
     ~daNpcAsh_c();
-    cPhs__Step Create();
+    cPhs_Step Create();
     BOOL CreateHeap();
     int Delete();
     int Execute();

include/d/actor/d_a_npc_ashB.h

@@ -100,7 +100,7 @@ public:
 public:
     daNpcAshB_c();
     ~daNpcAshB_c();
-    cPhs__Step Create();
+    cPhs_Step Create();
     BOOL CreateHeap();
     int Delete();
     int Execute();

include/d/actor/d_a_npc_bans.h

@@ -45,7 +45,7 @@ public:
     typedef int (daNpc_Bans_c::*cutFunc)(int);
 
     ~daNpc_Bans_c();
-    cPhs__Step create();
+    cPhs_Step create();
     int CreateHeap();
     int Delete();
     int Execute();

include/d/actor/d_a_npc_bouS.h

@@ -53,7 +53,7 @@ public:
 
     daNpcBouS_c();
     ~daNpcBouS_c();
-    cPhs__Step Create();
+    cPhs_Step Create();
     int CreateHeap();
     int Delete();
     int Execute();

include/d/actor/d_a_npc_cd2.h

@@ -5,7 +5,7 @@
 #include "d/actor/d_a_tag_escape.h"
 #include "d/d_npc_lib.h"
 #include "d/d_path.h"
-#include "dolphin/types.h"
+#include <dolphin/types.h>
 
 enum {
     MdlMANa_e = 0,

include/d/actor/d_a_npc_chat.h

@@ -49,13 +49,13 @@ public:
     J3DModel* ObjCreate(int);
     J3DModel* ChairCreate(f32);
     bool isM_();
-    cPhs__Step loadResrc(int, int);
+    cPhs_Step loadResrc(int, int);
     J3DModelData* getNpcMdlDataP(int);
     J3DModelData* getObjMdlDataP(int);
     J3DAnmTexPattern* getTexAnmP(int);
     BOOL removeResrc(int, int);
     BOOL setAttention(int);
-    cPhs__Step Create();
+    cPhs_Step Create();
     BOOL CreateHeap();
     int Delete();
     int Execute();

include/d/actor/d_a_npc_coach.h

@@ -245,7 +245,7 @@ public:
     void calcHorsePath();
     int draw();
     ~daNpcCoach_c();
-    cPhs__Step create();
+    cPhs_Step create();
     void create_init();
     inline void initCollision();
     void initBaseMtx();

include/d/actor/d_a_npc_doorboy.h

@@ -45,7 +45,7 @@ public:
 
     daNpcDoorBoy_c();
     ~daNpcDoorBoy_c();
-    cPhs__Step Create();
+    cPhs_Step Create();
     int CreateHeap();
     int Delete();
     int Execute();

include/d/actor/d_a_npc_fairy.h

@@ -161,7 +161,7 @@ public:
     typedef int (daNpc_Fairy_c::*cutFunc)(int);
 
     ~daNpc_Fairy_c();
-    cPhs__Step Create();
+    cPhs_Step Create();
     int CreateHeap();
     void setAnmData();
     bool setMotionAnm(int, f32, int);

include/d/actor/d_a_npc_fguard.h

@@ -16,7 +16,7 @@
 class daNpcFgd_c : public daNpcCd2_c {
 public:
     void initPosAngle(Vec&, s16);
-    cPhs__Step create();
+    cPhs_Step create();
     void create_init();
     inline virtual ~daNpcFgd_c();
 

include/d/actor/d_a_npc_grc.h

@@ -47,7 +47,7 @@ public:
 
     daNpc_grC_c();
     ~daNpc_grC_c();
-    cPhs__Step create();
+    cPhs_Step create();
     int CreateHeap();
     int Delete();
     int Execute();

include/d/actor/d_a_npc_grm.h

@@ -82,7 +82,7 @@ public:
     };
 
     ~daNpc_grM_c();
-    cPhs__Step create();
+    cPhs_Step create();
     int CreateHeap();
     int Delete();
     int Execute();

include/d/actor/d_a_npc_grmc.h

@@ -74,7 +74,7 @@ public:
     typedef int (daNpc_grMC_c::*actionFunc)(void*);
 
     ~daNpc_grMC_c();
-    cPhs__Step create();
+    cPhs_Step create();
     int CreateHeap();
     int Delete();
     int Execute();

include/d/actor/d_a_npc_gro.h

@@ -44,7 +44,7 @@ public:
     
     daNpc_grO_c();
     ~daNpc_grO_c();
-    cPhs__Step create();
+    cPhs_Step create();
     int CreateHeap();
     int Delete();
     int Execute();

include/d/actor/d_a_npc_grr.h

@@ -45,7 +45,7 @@ public:
     typedef int (daNpc_grR_c::*actionFunc)(void*);
     daNpc_grR_c();
     ~daNpc_grR_c();
-    cPhs__Step create();
+    cPhs_Step create();
     int CreateHeap();
     int Delete();
     int Execute();

include/d/actor/d_a_npc_grz.h

@@ -64,7 +64,7 @@ public:
 
     daNpc_Grz_c();
     ~daNpc_Grz_c();
-    cPhs__Step create();
+    cPhs_Step create();
     int CreateHeap();
     int Delete();
     int Execute();

include/d/actor/d_a_npc_gwolf.h

@@ -53,7 +53,7 @@ public:
     typedef BOOL (daNpc_GWolf_c::*cutFunc)(int);
 
     daNpc_GWolf_c();
-    cPhs__Step create();
+    cPhs_Step create();
     int CreateHeap();
     int Delete();
     int Execute();

include/d/actor/d_a_npc_ins.h

@@ -52,7 +52,7 @@ public:
 
     daNpcIns_c();
     ~daNpcIns_c();
-    cPhs__Step Create();
+    cPhs_Step Create();
     int CreateHeap();
     int Delete();
     int Execute();

include/d/actor/d_a_npc_kasi_hana.h

@@ -123,7 +123,7 @@ public:
 
     daNpcKasiHana_c();
     ~daNpcKasiHana_c();
-    cPhs__Step Create();
+    cPhs_Step Create();
     int CreateHeap();
     int Delete();
     int Execute();

include/d/actor/d_a_npc_kasi_kyu.h

@@ -47,7 +47,7 @@ public:
 
     daNpcKasiKyu_c();
     ~daNpcKasiKyu_c();
-    cPhs__Step Create();
+    cPhs_Step Create();
     int CreateHeap();
     int Delete();
     int Execute();

include/d/actor/d_a_npc_kasi_mich.h

@@ -48,7 +48,7 @@ public:
 
     daNpcKasiMich_c();
     ~daNpcKasiMich_c();
-    cPhs__Step Create();
+    cPhs_Step Create();
     int CreateHeap();
     int Delete();
     int Execute();

include/d/actor/d_a_npc_kolin.h

@@ -51,7 +51,7 @@ public:
     typedef int (daNpc_Kolin_c::*actionFunc)(void*);
 
     ~daNpc_Kolin_c();
-    cPhs__Step create();
+    cPhs_Step create();
     int CreateHeap();
     int Delete();
     int Execute();

include/d/actor/d_a_npc_kolinb.h

@@ -99,7 +99,7 @@ public:
     typedef int (daNpc_Kolinb_c::*actionFunc)(void*);
 
     ~daNpc_Kolinb_c();
-    cPhs__Step create();
+    cPhs_Step create();
     int CreateHeap();
     int Delete();
     int Execute();

include/d/actor/d_a_npc_moir.h

@@ -145,7 +145,7 @@ public:
 
     daNpcMoiR_c();
     ~daNpcMoiR_c();
-    cPhs__Step Create();
+    cPhs_Step Create();
     int CreateHeap();
     int Delete();
     int Execute();

include/d/actor/d_a_npc_pachi_besu.h

@@ -45,7 +45,7 @@ public:
     typedef BOOL (daNpc_Pachi_Besu_c::*cutFunc)(int);
 
     ~daNpc_Pachi_Besu_c();
-    cPhs__Step create();
+    cPhs_Step create();
     int CreateHeap();
     int Delete();
     int Execute();

include/d/actor/d_a_npc_pachi_maro.h

@@ -77,7 +77,7 @@ public:
     typedef int (daNpc_Pachi_Maro_c::*cutFunc)(int);
 
     ~daNpc_Pachi_Maro_c();
-    cPhs__Step create();
+    cPhs_Step create();
     int CreateHeap();
     int Delete();
     int Execute();

include/d/actor/d_a_npc_pachi_taro.h

@@ -78,7 +78,7 @@ public:
     typedef int (daNpc_Pachi_Taro_c::*cutFunc)(int);
 
     ~daNpc_Pachi_Taro_c();
-    cPhs__Step create();
+    cPhs_Step create();
     int CreateHeap();
     int Delete();
     int Execute();

include/d/actor/d_a_npc_passer.h

@@ -29,7 +29,7 @@ public:
 
     ~daNpcPasser_c();
     int createHeap();
-    cPhs__Step create();
+    cPhs_Step create();
     int execute();
     int draw();
     void setAction(daNpcPasser_c::Mode_e);

include/d/actor/d_a_npc_passer2.h

@@ -28,7 +28,7 @@ public:
     void executePath();
     void setAngle();
     void pathMoveF();
-    cPhs__Step create();
+    cPhs_Step create();
     void create_init();
     inline ~daNpcPasser2_c();
 

include/d/actor/d_a_npc_post.h

@@ -83,7 +83,7 @@ public:
     typedef int (daNpc_Post_c::*cutFunc)(int);
 
     ~daNpc_Post_c();
-    cPhs__Step create();
+    cPhs_Step create();
     int CreateHeap();
     int Delete();
     int Execute();

include/d/actor/d_a_npc_raca.h

@@ -84,7 +84,7 @@ public:
     typedef int (daNpc_Raca_c::*cutFunc)(int);
 
     ~daNpc_Raca_c();
-    cPhs__Step create();
+    cPhs_Step create();
     int CreateHeap();
     int Delete();
     int Execute();

include/d/actor/d_a_npc_seirei.h

@@ -47,7 +47,7 @@ public:
     typedef BOOL (daNpc_Seirei_c::*cutFunc)(int);
 
     ~daNpc_Seirei_c();
-    cPhs__Step create();
+    cPhs_Step create();
     int CreateHeap();
     int Delete();
     int Execute();

include/d/actor/d_a_npc_shad.h

@@ -140,7 +140,7 @@ public:
 
     daNpcShad_c();
     virtual ~daNpcShad_c();
-    cPhs__Step Create();
+    cPhs_Step Create();
     int CreateHeap();
     int Delete();
     int Execute();

include/d/actor/d_a_npc_shaman.h

@@ -44,7 +44,7 @@ public:
     typedef BOOL (daNpc_Sha_c::*queryFunc)();
     
     ~daNpc_Sha_c();
-    cPhs__Step create();
+    cPhs_Step create();
     int CreateHeap();
     int Delete();
     int Execute();

include/d/actor/d_a_npc_shoe.h

@@ -62,7 +62,7 @@ public:
 
     daNpcShoe_c();
     ~daNpcShoe_c();
-    cPhs__Step Create();
+    cPhs_Step Create();
     BOOL CreateHeap();
     int Delete();
     int Execute();

include/d/actor/d_a_npc_soldierA.h

@@ -44,7 +44,7 @@ public:
 
     daNpc_SoldierA_c();
     ~daNpc_SoldierA_c();
-    cPhs__Step create();
+    cPhs_Step create();
     int CreateHeap();
     int Delete();
     int Execute();

include/d/actor/d_a_npc_soldierB.h

@@ -43,7 +43,7 @@ public:
 
     daNpc_SoldierB_c();
     ~daNpc_SoldierB_c();
-    cPhs__Step create();
+    cPhs_Step create();
     int CreateHeap();
     int Delete();
     int Execute();

include/d/actor/d_a_npc_the.h

@@ -129,7 +129,7 @@ public:
     BOOL test(void*);
     BOOL EvCut_TwResistance(int);
     BOOL EvCut_Introduction(int);
-    cPhs__Step create();
+    cPhs_Step create();
     void reset();
     /*  inline  */ inline int Draw();
     inline void setParam();

include/d/actor/d_a_npc_theB.h

@@ -80,7 +80,7 @@ public:
 
     daNpcTheB_c();
     ~daNpcTheB_c();
-    cPhs__Step create();
+    cPhs_Step create();
     int CreateHeap();
     int Delete();
     int Execute();

include/d/actor/d_a_npc_tkc.h

@@ -59,7 +59,7 @@ public:
 
     daNpcTkc_c();
     ~daNpcTkc_c();
-    cPhs__Step Create();
+    cPhs_Step Create();
     int CreateHeap();
     int Delete();
     int Execute();

include/d/actor/d_a_npc_tks.h

@@ -73,7 +73,7 @@ public:
 
     daNpcTks_c();
     ~daNpcTks_c();
-    cPhs__Step Create();
+    cPhs_Step Create();
     int CreateHeap();
     int Delete();
     int Execute();

include/d/actor/d_a_npc_toby.h

@@ -1,7 +1,7 @@
 #ifndef D_A_NPC_TOBY_H
 #define D_A_NPC_TOBY_H
 
-#include "dolphin/types.h"
+#include <dolphin/types.h>
 #include "d/actor/d_a_npc.h"
 
 struct daNpc_Toby_HIOParam {

include/d/actor/d_a_npc_wrestler.h

@@ -131,7 +131,7 @@ public:
     typedef BOOL (daNpcWrestler_c::*EventFn)(int);
 
     daNpcWrestler_c();
-    cPhs__Step Create();
+    cPhs_Step Create();
     int CreateHeap();
     int Delete();
     int Execute();

include/d/actor/d_a_npc_yamid.h

@@ -45,7 +45,7 @@ public:
     typedef int (daNpc_yamiD_c::*actionFunc)(void*);
 
     ~daNpc_yamiD_c();
-    cPhs__Step create();
+    cPhs_Step create();
     int CreateHeap();
     int Delete();
     int Execute();

include/d/actor/d_a_npc_yamis.h

@@ -44,7 +44,7 @@ public:
     typedef int (daNpc_yamiS_c::*actionFunc)(void*);
 
     ~daNpc_yamiS_c();
-    cPhs__Step create();
+    cPhs_Step create();
     int CreateHeap();
     int Delete();
     int Execute();

include/d/actor/d_a_npc_yamit.h

@@ -45,7 +45,7 @@ public:
     typedef int (daNpc_yamiT_c::*actionFunc)(void*);
 
     ~daNpc_yamiT_c();
-    cPhs__Step create();
+    cPhs_Step create();
     int CreateHeap();
     int Delete();
     int Execute();

include/d/actor/d_a_npc_yelia.h

@@ -42,7 +42,7 @@ public:
 class daNpc_Yelia_c : public daNpcT_c {
 public:
     ~daNpc_Yelia_c();
-    cPhs__Step create();
+    cPhs_Step create();
     int CreateHeap();
     int Delete();
     int Execute();

include/d/actor/d_a_npc_ykm.h

@@ -195,7 +195,7 @@ public:
     typedef BOOL (daNpc_ykM_c::*ActionFn)(void*);
     
     ~daNpc_ykM_c();
-    cPhs__Step create();
+    cPhs_Step create();
     int CreateHeap();
     int Delete();
     int Execute();

include/d/actor/d_a_npc_zanb.h

@@ -43,7 +43,7 @@ public:
     typedef int (daNpc_zanB_c::*cutFunc)(int);
     
     ~daNpc_zanB_c();
-    cPhs__Step create();
+    cPhs_Step create();
     int CreateHeap();
     int Delete();
     int Execute();

include/d/actor/d_a_npc_zelRo.h

@@ -99,7 +99,7 @@ public:
     typedef int (daNpc_ZelRo_c::*cutFunc)(int);
 
     ~daNpc_ZelRo_c();
-    cPhs__Step create();
+    cPhs_Step create();
     int CreateHeap();
     int Delete();
     int Execute();

include/d/actor/d_a_npc_zra.h

@@ -265,7 +265,7 @@ public:
 
     daNpc_zrA_c();
     ~daNpc_zrA_c();
-    cPhs__Step create();
+    cPhs_Step create();
     int CreateHeap();
     int Delete();
     int Execute();

include/d/actor/d_a_npc_zrc.h

@@ -51,7 +51,7 @@ public:
 
     daNpc_zrC_c();
     ~daNpc_zrC_c();
-    cPhs__Step create();
+    cPhs_Step create();
     int CreateHeap();
     int Delete();
     int Execute();

include/d/actor/d_a_npc_zrz.h

@@ -57,7 +57,7 @@ public:
 
     daNpc_zrZ_c();
     ~daNpc_zrZ_c();
-    cPhs__Step create();
+    cPhs_Step create();
     int CreateHeap();
     int Delete();
     int Execute();

include/d/actor/d_a_obj_amiShutter.h

@@ -33,7 +33,7 @@ public:
 
     void setBaseMtx();
     int CreateHeap();
-    cPhs__Step create();
+    cPhs_Step create();
     int Execute(Mtx**);
     void moveShutter();
     BOOL playerAreaCheck();

include/d/actor/d_a_obj_ari.h

@@ -38,7 +38,7 @@ public:
     void setBaseMtx();
     /*  inline  */ inline int Draw();
     bool CreateChk();
-    cPhs__Step create();
+    cPhs_Step create();
 
 private:
     /* 0x590 */ dBgS_GndChk mGndChk;

include/d/actor/d_a_obj_avalanche.h

@@ -1,7 +1,7 @@
 #ifndef D_A_OBJ_AVALANCHE_H
 #define D_A_OBJ_AVALANCHE_H
 
-#include "dolphin/types.h"
+#include <dolphin/types.h>
 #include "d/d_bg_s_movebg_actor.h"
 #include "f_op/f_op_actor_mng.h"
 

include/d/actor/d_a_obj_barDesk.h

@@ -18,7 +18,7 @@ class daBarDesk_c : public dBgS_MoveBgActor {
 public:
     void setBaseMtx();
     int CreateHeap();
-    cPhs__Step create();
+    cPhs_Step create();
     int Execute(Mtx**);
     void windowProc();
     void init_modeWait();

include/d/actor/d_a_obj_bed.h

@@ -4,7 +4,7 @@
 #include "SSystem/SComponent/c_phase.h"
 #include "d/d_bg_s_acch.h"
 #include "f_op/f_op_actor.h"
-#include "dolphin/types.h"
+#include <dolphin/types.h>
 
 class dBgW;
 
@@ -64,7 +64,7 @@ public:
     /* 0x840 */ /* vtable */
 
     virtual ~daObj_Bed_c();
-    cPhs__Step create();
+    cPhs_Step create();
     int CreateHeap();
     int Delete();
     int Execute();

include/d/actor/d_a_obj_bmWindow.h

@@ -1,7 +1,7 @@
 #ifndef D_A_OBJ_BMWINDOW_H
 #define D_A_OBJ_BMWINDOW_H
 
-#include "dolphin/types.h"
+#include <dolphin/types.h>
 #include "d/d_bg_s_movebg_actor.h"
 #include "d/d_cc_d.h"
 #include "f_op/f_op_actor_mng.h"

include/d/actor/d_a_obj_bosswarp.h

@@ -32,7 +32,7 @@ public:
     void setBaseMtx();
     int Create();
     int CreateHeap();
-    cPhs__Step create();
+    cPhs_Step create();
     void appear(int);
     void set_appear();
     void disappear(int);

include/d/actor/d_a_obj_bsGate.h

@@ -23,7 +23,7 @@ public:
 
     void setBaseMtx();
     int CreateHeap();
-    cPhs__Step create();
+    cPhs_Step create();
     int Execute(Mtx**);
     void moveGate();
     void init_modeWait();

include/d/actor/d_a_obj_burnbox.h

@@ -19,7 +19,7 @@ public:
     void setBaseMtx();
     int Create();
     int CreateHeap();
-    cPhs__Step create1st();
+    cPhs_Step create1st();
     int Execute(Mtx**);
     int Draw();
     int Delete();

include/d/actor/d_a_obj_cdoor.h

@@ -29,7 +29,7 @@ public:
 
     virtual ~daObjCdoor_c();
     int CreateHeap();
-    cPhs__Step create();
+    cPhs_Step create();
     void setMatrix();
     int Execute(Mtx**);
     void execCdoor();

include/d/actor/d_a_obj_chandelier.h

@@ -41,7 +41,7 @@ public:
     void moveSwingFall();
     void hookSwingInitParm();
 
-    virtual cPhs__Step create1st();
+    virtual cPhs_Step create1st();
     virtual ~daObjChandelier_c();
 
     u8 getSW_0() { return fopAcM_GetParamBit(this, 4, 8); }

include/d/actor/d_a_obj_cho.h

@@ -43,7 +43,7 @@ public:
     int Delete();
     void setBaseMtx();
     bool CreateChk();
-    cPhs__Step create();
+    cPhs_Step create();
     inline int Draw();
 
 private:

include/d/actor/d_a_obj_crvfence.h

@@ -28,7 +28,7 @@ public:
     void Action();
     void setBaseMtx();
     int CreateHeap();
-    cPhs__Step create();
+    cPhs_Step create();
     int Create();
     int Execute(Mtx**);
     int Draw();

include/d/actor/d_a_obj_dan.h

@@ -37,7 +37,7 @@ public:
     void setBaseMtx();
     /*  inline  */ inline int Draw();
     bool CreateChk();
-    cPhs__Step create();
+    cPhs_Step create();
 
 private:
     /* 0x590 */ dCcD_Stts mCcStts;

include/d/actor/d_a_obj_goGate.h

@@ -24,7 +24,7 @@ public:
 
     void setBaseMtx();
     int CreateHeap();
-    cPhs__Step create();
+    cPhs_Step create();
     int Execute(Mtx**);
     void moveGate();
     void init_modeWait();

include/d/actor/d_a_obj_gra2.h

@@ -102,7 +102,7 @@ public:
     static void rideCallBack(dBgW*, fopAc_ac_c*, fopAc_ac_c*);
     daObj_GrA_c();
     ~daObj_GrA_c();
-    cPhs__Step create();
+    cPhs_Step create();
     int CreateHeap();
     int Delete();
     int Execute(Mtx**);