Add cPhs_State typedef and use it everywhere

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 */

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);

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 */

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);

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);

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 */

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 */

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();

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();
     

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; }
 

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();

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:

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();

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();

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();

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 */

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();

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() {}

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();

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();

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:

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;

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();

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();

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();
 

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();

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();

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();

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();

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();

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:

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:

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();

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();

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 */

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();
 

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();
 

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();

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();
 

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?

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;

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();

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;

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:

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();

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();

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();

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:

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:

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;

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();

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();

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();

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();

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();
 

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();

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();

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();

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();

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();

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();

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();

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();

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:

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();

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:

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() {}

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);

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();

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[];
 

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*);

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();

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();

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();

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();

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();

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();

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();

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();

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:

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:

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;

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:

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();

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*);

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();

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:

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:

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();
 

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();

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();
 

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();
 

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:

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:

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();

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();

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*);

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();

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();

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();