diff options
| author | LagoLunatic <LagoLunatic@users.noreply.github.com> | 2023-11-24 16:49:23 -0500 |
|---|---|---|
| committer | LagoLunatic <LagoLunatic@users.noreply.github.com> | 2023-11-24 16:49:23 -0500 |
| commit | 8a2bc19a89c26f329b3c4369e29cadd39d26460d (patch) | |
| tree | f8f7b1a1f4c6c23853645b51ab60fe754bc78096 /include/d/actor | |
| parent | d87b01b34a3f14d8c7741e8af54e5f4ca18d42bb (diff) | |
Better defaults for create/delete/execute/draw/isdelete
Diffstat (limited to 'include/d/actor')
287 files changed, 1067 insertions, 1067 deletions
diff --git a/include/d/actor/d_a_acorn_leaf.h b/include/d/actor/d_a_acorn_leaf.h index b023d9ee..c20ed5a5 100644 --- a/include/d/actor/d_a_acorn_leaf.h +++ b/include/d/actor/d_a_acorn_leaf.h @@ -5,16 +5,16 @@ class daAleaf_c : public fopAc_ac_c { public: - void _delete() {} + inline BOOL _delete(); void CreateHeap(); void CreateInit(); void create_acorn(); void create_acorn_sub(bool); - void _create(); + s32 _create(); void set_mtx(); - void _execute(); - void _draw(); + BOOL _execute(); + BOOL _draw(); public: /* Place member variables here */ diff --git a/include/d/actor/d_a_alldie.h b/include/d/actor/d_a_alldie.h index 78b19e4a..572ed9d7 100644 --- a/include/d/actor/d_a_alldie.h +++ b/include/d/actor/d_a_alldie.h @@ -5,8 +5,8 @@ class daAlldie_c : public fopAc_ac_c { public: - void create() {} - void draw() {} + inline s32 create(); + inline BOOL draw(); void setActio(unsigned char) {} public: diff --git a/include/d/actor/d_a_amiprop.h b/include/d/actor/d_a_amiprop.h index 8be8a195..5da09084 100644 --- a/include/d/actor/d_a_amiprop.h +++ b/include/d/actor/d_a_amiprop.h @@ -5,14 +5,14 @@ class daAmiProp_c : public fopAc_ac_c { public: - void _delete(); + BOOL _delete(); void CreateHeap(); void CreateInit(); - void _create(); + s32 _create(); void set_mtx(); void setMoveBGMtx(); - void _execute(); - void _draw(); + BOOL _execute(); + BOOL _draw(); public: /* Place member variables here */ diff --git a/include/d/actor/d_a_arrow_iceeff.h b/include/d/actor/d_a_arrow_iceeff.h index 99e0d444..82760461 100644 --- a/include/d/actor/d_a_arrow_iceeff.h +++ b/include/d/actor/d_a_arrow_iceeff.h @@ -5,10 +5,10 @@ class daArrow_Iceeff_c : public fopAc_ac_c { public: - void _create() {} - void _delete() {} - void _draw() {} - void _execute() {} + inline s32 _create(); + inline BOOL _delete(); + inline BOOL _draw(); + inline BOOL _execute(); void CreateHeap(); void CreateInit(); diff --git a/include/d/actor/d_a_arrow_lighteff.h b/include/d/actor/d_a_arrow_lighteff.h index 6d599f76..376a222c 100644 --- a/include/d/actor/d_a_arrow_lighteff.h +++ b/include/d/actor/d_a_arrow_lighteff.h @@ -5,10 +5,10 @@ class daArrow_Lighteff_c : public fopAc_ac_c { public: - void _create() {} - void _delete() {} - void _draw() {} - void _execute() {} + inline s32 _create(); + inline BOOL _delete(); + inline BOOL _draw(); + inline BOOL _execute(); void brk_play() {} void setTopPos(); diff --git a/include/d/actor/d_a_atdoor.h b/include/d/actor/d_a_atdoor.h index a3dc5140..16e5b017 100644 --- a/include/d/actor/d_a_atdoor.h +++ b/include/d/actor/d_a_atdoor.h @@ -5,15 +5,15 @@ class daAtdoor_c : public fopAc_ac_c { public: - void draw() {} - void execute() {} + inline BOOL draw(); + inline BOOL execute(); void setAction(unsigned char) {} void getSwbit(); void CreateHeap(); void calcMtx(); void CreateInit(); - void create(); + s32 create(); public: /* Place member variables here */ diff --git a/include/d/actor/d_a_auction.h b/include/d/actor/d_a_auction.h index 93fd7f0d..3a216c7d 100644 --- a/include/d/actor/d_a_auction.h +++ b/include/d/actor/d_a_auction.h @@ -28,12 +28,12 @@ public: void setNpcID(int, unsigned int) {} void setStart(unsigned char) {} - void _create(); + s32 _create(); void createHeap(); void createInit(); - void _delete(); - void _draw(); - void _execute(); + BOOL _delete(); + BOOL _draw(); + BOOL _execute(); void executeWait(); void executeNormal(); void executeStart(); diff --git a/include/d/actor/d_a_beam.h b/include/d/actor/d_a_beam.h index 50465eb8..a3dd16fd 100644 --- a/include/d/actor/d_a_beam.h +++ b/include/d/actor/d_a_beam.h @@ -5,9 +5,9 @@ class daBeam_c : public fopAc_ac_c { public: - void _create() {} - void _delete() {} - void _draw() {} + inline s32 _create(); + inline BOOL _delete(); + inline BOOL _draw(); void beamCheck() {} void beamOff() {} void beamOn() {} @@ -25,7 +25,7 @@ public: void set_mtx(); void CreateHeap(); void CreateInit(); - void _execute(); + BOOL _execute(); void checkRange(csXyz*); void move_search(); void fix_search(); diff --git a/include/d/actor/d_a_bflower.h b/include/d/actor/d_a_bflower.h index ddec3f65..bff1e9c1 100644 --- a/include/d/actor/d_a_bflower.h +++ b/include/d/actor/d_a_bflower.h @@ -5,19 +5,19 @@ class daBFlower_c : public fopAc_ac_c { public: - void _delete() {} + inline BOOL _delete(); void CreateHeap(); void CreateInit(); void init_bck_anm(short); - void _create(); + s32 _create(); void set_mtx(); - void _execute(); + BOOL _execute(); void actLive(); void actDead(); void animPlay(); void setCollision(); - void _draw(); + BOOL _draw(); public: /* Place member variables here */ diff --git a/include/d/actor/d_a_bigelf.h b/include/d/actor/d_a_bigelf.h index a3480c7f..0477e5ec 100644 --- a/include/d/actor/d_a_bigelf.h +++ b/include/d/actor/d_a_bigelf.h @@ -77,10 +77,10 @@ public: void event0(); void dead(); void wait_action(void*); - void _draw(); - void _execute(); - void _delete(); - void _create(); + BOOL _draw(); + BOOL _execute(); + BOOL _delete(); + s32 _create(); void CreateHeap(); public: diff --git a/include/d/actor/d_a_boko.h b/include/d/actor/d_a_boko.h index c59c67f9..4b664e5b 100644 --- a/include/d/actor/d_a_boko.h +++ b/include/d/actor/d_a_boko.h @@ -45,7 +45,7 @@ public: void keDraw(); void keCalc1(ke_c_s*, int); void keCalc(); - void draw(); + BOOL draw(); void setTopRootPos(int); void setBaseMatrix(); void checkNoDraw(); @@ -58,10 +58,10 @@ public: void procMove(); void procThrow(); void procCarry(); - void execute(); + BOOL execute(); void bokoDelete(); void createHeap(); - void create(); + s32 create(); public: /* 0x290 */ request_of_phase_process_class mPhs; diff --git a/include/d/actor/d_a_boomerang.h b/include/d/actor/d_a_boomerang.h index f2bf626c..33c0475b 100644 --- a/include/d/actor/d_a_boomerang.h +++ b/include/d/actor/d_a_boomerang.h @@ -7,7 +7,7 @@ class daBoomerang_blur_c : public fopAc_ac_c { public: void initBlur(float(*)[4], short); void copyBlur(float(*)[4], short); - void draw(); + BOOL draw(); public: /* Place member variables here */ diff --git a/include/d/actor/d_a_branch.h b/include/d/actor/d_a_branch.h index d4bb8a1c..7820cbc8 100644 --- a/include/d/actor/d_a_branch.h +++ b/include/d/actor/d_a_branch.h @@ -18,9 +18,9 @@ public: dComIfG_resDelete(&mPhs, m_arcname); } - void create() {} - void draw() {} - void execute() {} + inline s32 create(); + inline BOOL draw(); + inline BOOL execute(); void set_mtx(); void set_anim(int, int, int); diff --git a/include/d/actor/d_a_canon.h b/include/d/actor/d_a_canon.h index 3d29306e..43f424fd 100644 --- a/include/d/actor/d_a_canon.h +++ b/include/d/actor/d_a_canon.h @@ -5,10 +5,10 @@ class daCanon_c : public fopAc_ac_c { public: - void _create() {} - void _delete() {} - void _draw() {} - void _execute() {} + inline s32 _create(); + inline BOOL _delete(); + inline BOOL _draw(); + inline BOOL _execute(); void checkProcess(void (daCanon_c::*)()) {} void getCanonPtr() {} void setProcess(void (daCanon_c::*)()) {} diff --git a/include/d/actor/d_a_coming2.h b/include/d/actor/d_a_coming2.h index c9ae4599..148a10eb 100644 --- a/include/d/actor/d_a_coming2.h +++ b/include/d/actor/d_a_coming2.h @@ -39,10 +39,10 @@ namespace daComing2 { void coming_game_main(); void coming_process_init(short); void coming_process_main(); - void _create(); - void _delete(); - void _execute(); - void _draw(); + s32 _create(); + BOOL _delete(); + BOOL _execute(); + BOOL _draw(); public: /* Place member variables here */ diff --git a/include/d/actor/d_a_coming3.h b/include/d/actor/d_a_coming3.h index 77534cbb..dbff9817 100644 --- a/include/d/actor/d_a_coming3.h +++ b/include/d/actor/d_a_coming3.h @@ -23,10 +23,10 @@ namespace daComing3 { void collision_main(); void solidHeapCB(fopAc_ac_c*); void create_heap(); - void _create(); - void _delete(); - void _execute(); - void _draw(); + s32 _create(); + BOOL _delete(); + BOOL _execute(); + BOOL _draw(); public: /* Place member variables here */ diff --git a/include/d/actor/d_a_dai.h b/include/d/actor/d_a_dai.h index d68645cd..3b92ace6 100644 --- a/include/d/actor/d_a_dai.h +++ b/include/d/actor/d_a_dai.h @@ -12,18 +12,18 @@ public: void incNowItemNum() {} void init() {} - void _delete(); + BOOL _delete(); void CreateHeap(); void CreateInit(); - void _create(); + s32 _create(); void set_mtx(); void eventOrder(); void checkOrder(); void XyCheckCB(int); void XyEventCB(int); - void _execute(); + BOOL _execute(); void proc(); - void _draw(); + BOOL _draw(); void getMsg(); void next_msgStatus(unsigned long*); diff --git a/include/d/actor/d_a_dai_item.h b/include/d/actor/d_a_dai_item.h index 6da61754..a3e3246a 100644 --- a/include/d/actor/d_a_dai_item.h +++ b/include/d/actor/d_a_dai_item.h @@ -13,12 +13,12 @@ class daStandItem_c : public fopAc_ac_c { public: void getItemNo() const {} - void _delete(); + BOOL _delete(); void CreateHeap(); void CreateInit(); - void _create(); + s32 _create(); void set_mtx(); - void _execute(); + BOOL _execute(); void itemProc(); void actionFobj00(); void actionFobj01(); @@ -41,7 +41,7 @@ public: void mode_wait(); void mode_drop_init(); void mode_drop(); - void _draw(); + BOOL _draw(); public: /* 0x290 */ request_of_phase_process_class mPhsDai; diff --git a/include/d/actor/d_a_daiocta.h b/include/d/actor/d_a_daiocta.h index 2b30981d..ed01ece5 100644 --- a/include/d/actor/d_a_daiocta.h +++ b/include/d/actor/d_a_daiocta.h @@ -54,15 +54,15 @@ public: void modeProc(Proc_e, Mode_e); void setAnm(); void setWater(); - void _execute(); + BOOL _execute(); void drawAwa(); void drawSuikomi(); void drawDebug(); - void _draw(); + BOOL _draw(); void getArg(); void createInit(); - void _create(); - void _delete(); + s32 _create(); + BOOL _delete(); public: /* 0x290 */ u8 field_0x290[0x574 - 0x290]; diff --git a/include/d/actor/d_a_daiocta_eye.h b/include/d/actor/d_a_daiocta_eye.h index 8fe2a14b..d65cb0a4 100644 --- a/include/d/actor/d_a_daiocta_eye.h +++ b/include/d/actor/d_a_daiocta_eye.h @@ -20,11 +20,11 @@ public: void modeDeathInit(); void modeDeath(); void modeProcCall(); - void _execute(); - void _draw(); + BOOL _execute(); + BOOL _draw(); void createInit(); - void _create(); - void _delete(); + s32 _create(); + BOOL _delete(); public: /* Place member variables here */ diff --git a/include/d/actor/d_a_deku_item.h b/include/d/actor/d_a_deku_item.h index 2823378a..91645654 100644 --- a/include/d/actor/d_a_deku_item.h +++ b/include/d/actor/d_a_deku_item.h @@ -5,12 +5,12 @@ class daDekuItem_c : public fopAc_ac_c { public: - void _delete(); + BOOL _delete(); void CreateHeap(); void CreateInit(); - void _create(); + s32 _create(); void set_mtx(); - void _execute(); + BOOL _execute(); void mode_proc_call(); void mode_wait(); void mode_getdemo_init(); @@ -18,7 +18,7 @@ public: void mode_getdemo(); void eventOrder(); void checkOrder(); - void _draw(); + BOOL _draw(); public: /* Place member variables here */ diff --git a/include/d/actor/d_a_demo_item.h b/include/d/actor/d_a_demo_item.h index 026b8bea..aa482ff3 100644 --- a/include/d/actor/d_a_demo_item.h +++ b/include/d/actor/d_a_demo_item.h @@ -5,13 +5,13 @@ class daDitem_c : public fopAc_ac_c { public: - void Delete() {} + inline BOOL Delete(); void chkArgFlag(unsigned char) {} void clrFlag() {} - void create() {} - void draw() {} - void execute() {} - void isdelete() {} + inline s32 create(); + inline BOOL draw(); + inline BOOL execute(); + inline BOOL isdelete(); void setOffsetPos(cXyz) {} void setParticle(); diff --git a/include/d/actor/d_a_demo_kmm.h b/include/d/actor/d_a_demo_kmm.h index 79838209..b6ca1eae 100644 --- a/include/d/actor/d_a_demo_kmm.h +++ b/include/d/actor/d_a_demo_kmm.h @@ -5,15 +5,15 @@ class daDemo_Kmm_c : public fopAc_ac_c { public: - void draw() {} - void execute() {} + inline BOOL draw(); + inline BOOL execute(); void setAction(unsigned char) {} void CreateHeap(); void calcMtx(); void setAnime(int, int, float, float); void CreateInit(); - void create(); + s32 create(); public: /* Place member variables here */ diff --git a/include/d/actor/d_a_door10.h b/include/d/actor/d_a_door10.h index bb7d4ba1..d6138a3b 100644 --- a/include/d/actor/d_a_door10.h +++ b/include/d/actor/d_a_door10.h @@ -7,7 +7,7 @@ class daDoor10_c : public fopAc_ac_c { public: void checkFlag(unsigned short) {} - void execute() {} + inline BOOL execute(); void offFlag(unsigned short) {} void onFlag(unsigned short) {} void setAction(unsigned char) {} @@ -34,9 +34,9 @@ public: void closeEnd(); void calcMtx(); void CreateInit(); - void create(); + s32 create(); void demoProc(); - void draw(); + BOOL draw(); public: /* 0x000 */ dDoor_info_c parent; diff --git a/include/d/actor/d_a_door12.h b/include/d/actor/d_a_door12.h index d6c608af..71010bf0 100644 --- a/include/d/actor/d_a_door12.h +++ b/include/d/actor/d_a_door12.h @@ -8,7 +8,7 @@ class daDoor12_c : public fopAc_ac_c { public: void checkFlag(unsigned short) {} - void execute() {} + inline BOOL execute(); void offFlag(unsigned short) {} void onFlag(unsigned short) {} void setAction(unsigned char) {} @@ -38,9 +38,9 @@ public: void closeEnd(); void calcMtx(); void CreateInit(); - void create(); + s32 create(); void demoProc(); - void draw(); + BOOL draw(); public: /* 0x000 */ dDoor_info_c parent; diff --git a/include/d/actor/d_a_dummy.h b/include/d/actor/d_a_dummy.h index 59a1cf93..f7602a4e 100644 --- a/include/d/actor/d_a_dummy.h +++ b/include/d/actor/d_a_dummy.h @@ -8,11 +8,11 @@ namespace daDummy { public: void solidHeapCB(fopAc_ac_c*); void create_heap(); - void _create(); - void _delete(); + s32 _create(); + BOOL _delete(); void set_mtx(); - void _execute(); - void _draw(); + BOOL _execute(); + BOOL _draw(); public: /* Place member variables here */ diff --git a/include/d/actor/d_a_fallrock.h b/include/d/actor/d_a_fallrock.h index 3f88516a..196aea4e 100644 --- a/include/d/actor/d_a_fallrock.h +++ b/include/d/actor/d_a_fallrock.h @@ -5,9 +5,9 @@ class daFallRock_c : public fopAc_ac_c { public: - void create() {} - void draw() {} - void execute() {} + inline s32 create(); + inline BOOL draw(); + inline BOOL execute(); void CreateHeap(); void set_mtx(); diff --git a/include/d/actor/d_a_fallrock_tag.h b/include/d/actor/d_a_fallrock_tag.h index 0fe4efcb..5b9fbd8b 100644 --- a/include/d/actor/d_a_fallrock_tag.h +++ b/include/d/actor/d_a_fallrock_tag.h @@ -5,9 +5,9 @@ class daFallRockTag_c : public fopAc_ac_c { public: - void create() {} - void draw() {} - void execute() {} + inline s32 create(); + inline BOOL draw(); + inline BOOL execute(); void getData() {} void createRock(cXyz*, cXyz*, csXyz*, int, unsigned long); diff --git a/include/d/actor/d_a_fan.h b/include/d/actor/d_a_fan.h index 4eb3dd65..7134f75d 100644 --- a/include/d/actor/d_a_fan.h +++ b/include/d/actor/d_a_fan.h @@ -5,15 +5,15 @@ class daFan_c : public fopAc_ac_c { public: - void Delete(); + BOOL Delete(); void CreateHeap(); - void Create(); - void _create(); + s32 Create(); + s32 _create(); void set_mtx(); void set_wind_length(float); void set_cps(float); void Execute(float(**)[3][4]); - void Draw(); + BOOL Draw(); public: /* Place member variables here */ diff --git a/include/d/actor/d_a_fire.h b/include/d/actor/d_a_fire.h index 0f19c453..9f36350e 100644 --- a/include/d/actor/d_a_fire.h +++ b/include/d/actor/d_a_fire.h @@ -5,10 +5,10 @@ class daFire_c : public fopAc_ac_c { public: - void _delete(); + BOOL _delete(); void CreateInit(); - void _create(); - void _execute(); + s32 _create(); + BOOL _execute(); void search_wind(); void ctrlEffect(); void demo_proc(); @@ -20,7 +20,7 @@ public: void execPlayFire(); void setDirParticle(cXyz*); void checkCol(); - void _draw(); + BOOL _draw(); public: /* Place member variables here */ diff --git a/include/d/actor/d_a_floor.h b/include/d/actor/d_a_floor.h index faa4740b..83fbc1ee 100644 --- a/include/d/actor/d_a_floor.h +++ b/include/d/actor/d_a_floor.h @@ -5,14 +5,14 @@ class daFloor_c : public fopAc_ac_c { public: - void Delete(); + BOOL Delete(); void CreateHeap(); - void Create(); - void _create(); + s32 Create(); + s32 _create(); void set_mtx(); void Execute(float(**)[3][4]); void set_effect(); - void Draw(); + BOOL Draw(); public: /* Place member variables here */ diff --git a/include/d/actor/d_a_fm.h b/include/d/actor/d_a_fm.h index 6c945cb2..8fc3f85e 100644 --- a/include/d/actor/d_a_fm.h +++ b/include/d/actor/d_a_fm.h @@ -103,16 +103,16 @@ public: void setHoleEffect(); void holeExecute(); void setHoleScale(float, float, float); - void _execute(); + BOOL _execute(); void MtxToRot(float(*)[4], csXyz*); void debugDraw(); void holeDraw(); void bodyDraw(); - void _draw(); + BOOL _draw(); void getArg(); void createInit(); - void _create(); - void _delete(); + s32 _create(); + BOOL _delete(); public: /* 0x2AC */ u8 m2AC[0x2C5 - 0x2AC]; diff --git a/include/d/actor/d_a_ghostship.h b/include/d/actor/d_a_ghostship.h index 8e7bfd87..c2221d4d 100644 --- a/include/d/actor/d_a_ghostship.h +++ b/include/d/actor/d_a_ghostship.h @@ -5,10 +5,10 @@ class daGhostship_c : public fopAc_ac_c { public: - void _create() {} - void _delete() {} - void _draw() {} - void _execute() {} + inline s32 _create(); + inline BOOL _delete(); + inline BOOL _draw(); + inline BOOL _execute(); void checkInShip() {} void getAlpha() {} void setMtx() {} diff --git a/include/d/actor/d_a_goal_flag.h b/include/d/actor/d_a_goal_flag.h index 8dffe7a2..822dedbc 100644 --- a/include/d/actor/d_a_goal_flag.h +++ b/include/d/actor/d_a_goal_flag.h @@ -5,10 +5,10 @@ class daGoal_Flag_c : public fopAc_ac_c { public: - void _create() {} - void _delete() {} - void _draw() {} - void _execute() {} + inline s32 _create(); + inline BOOL _delete(); + inline BOOL _draw(); + inline BOOL _execute(); void getRopePos(int, int) {} void setAction(int (daGoal_Flag_c::*)()) {} diff --git a/include/d/actor/d_a_grid.h b/include/d/actor/d_a_grid.h index 1f6578fc..e53a71c9 100644 --- a/include/d/actor/d_a_grid.h +++ b/include/d/actor/d_a_grid.h @@ -7,10 +7,10 @@ class daGrid_c : public fopAc_ac_c { public: void force_calc_wind_rel_angle(short) {} - void _create(); - void _delete(); - void _execute(); - void _draw(); + s32 _create(); + BOOL _delete(); + BOOL _execute(); + BOOL _draw(); public: /* Place member variables here */ diff --git a/include/d/actor/d_a_gy.h b/include/d/actor/d_a_gy.h index a3d40a7d..e1c5fb2d 100644 --- a/include/d/actor/d_a_gy.h +++ b/include/d/actor/d_a_gy.h @@ -45,12 +45,12 @@ public: void lineCheck(cXyz*, cXyz*); void checkTgHit(); void getWaterY(); - void _execute(); + BOOL _execute(); void drawDebug(); - void _draw(); + BOOL _draw(); void createInit(); - void _create(); - void _delete(); + s32 _create(); + BOOL _delete(); public: /* 0x2AC */ u8 m2AC[0x2D4 - 0x2AC]; diff --git a/include/d/actor/d_a_gy_ctrl.h b/include/d/actor/d_a_gy_ctrl.h index 7e83fb19..dfee4a1b 100644 --- a/include/d/actor/d_a_gy_ctrl.h +++ b/include/d/actor/d_a_gy_ctrl.h @@ -26,15 +26,15 @@ public: void modeHideInit(); void modeHide(); void deadCheckGy(); - void _execute(); - void _draw(); + BOOL _execute(); + BOOL _draw(); void createInitNoArer(); void createInit(); void getParam(unsigned long, unsigned char, unsigned char); void getArg(); void checkGyCtrlExist(); - void _create(); - void _delete(); + s32 _create(); + BOOL _delete(); public: /* Place member variables here */ diff --git a/include/d/actor/d_a_hmlif.h b/include/d/actor/d_a_hmlif.h index 3e9b63ea..27a48449 100644 --- a/include/d/actor/d_a_hmlif.h +++ b/include/d/actor/d_a_hmlif.h @@ -5,10 +5,10 @@ class daHmlif_c : public fopAc_ac_c { public: - void Delete(); + BOOL Delete(); void daHmlifDelete(); void CreateHeap(); - void Create(); + s32 Create(); void daHmlifCreate(); void set_mtx(); void Execute(float(**)[3][4]); @@ -21,7 +21,7 @@ public: void set_next_pnt(); void setNextPath(); void chkSwitchPathType(); - void Draw(); + BOOL Draw(); public: /* Place member variables here */ diff --git a/include/d/actor/d_a_hookshot.h b/include/d/actor/d_a_hookshot.h index d4c8ace7..5803bfa9 100644 --- a/include/d/actor/d_a_hookshot.h +++ b/include/d/actor/d_a_hookshot.h @@ -9,7 +9,7 @@ class daHookshot_shape : public J3DPacket { public: - void draw(); + BOOL draw(); daHookshot_shape() {} ~daHookshot_shape() {} }; diff --git a/include/d/actor/d_a_hys.h b/include/d/actor/d_a_hys.h index 69e3357a..948582d0 100644 --- a/include/d/actor/d_a_hys.h +++ b/include/d/actor/d_a_hys.h @@ -5,19 +5,19 @@ class daHys_c : public fopAc_ac_c { public: - void _create() {} + inline s32 _create(); void set_mtx() {} - void Delete(); + BOOL Delete(); void CreateHeap(); - void Create(); + s32 Create(); void Execute(float(**)[3][4]); void mode_proc_call(); void mode_wait(); void mode_sw_on_init(); void mode_sw_on(); void mode_wait_init(); - void Draw(); + BOOL Draw(); public: /* Place member variables here */ diff --git a/include/d/actor/d_a_icelift.h b/include/d/actor/d_a_icelift.h index 07413e1e..d1ff0c4a 100644 --- a/include/d/actor/d_a_icelift.h +++ b/include/d/actor/d_a_icelift.h @@ -5,17 +5,17 @@ class daIlift_c : public fopAc_ac_c { public: - void _delete(); + BOOL _delete(); void CreateHeap(); void CreateInit(); - void _create(); + s32 _create(); void set_mtx(); - void _execute(); + BOOL _execute(); void lift_wave(); void path_move(); void lift_normal_move(); void set_next_pnt(); - void _draw(); + BOOL _draw(); public: /* Place member variables here */ diff --git a/include/d/actor/d_a_ikari.h b/include/d/actor/d_a_ikari.h index 260f37a9..7b020c55 100644 --- a/include/d/actor/d_a_ikari.h +++ b/include/d/actor/d_a_ikari.h @@ -9,10 +9,10 @@ public: void setMtx(); void _createHeap(); void getArg(); - void _execute(); - void _draw(); - void _create(); - void _delete(); + BOOL _execute(); + BOOL _draw(); + s32 _create(); + BOOL _delete(); public: /* 0x290 */ request_of_phase_process_class mPhs; diff --git a/include/d/actor/d_a_kddoor.h b/include/d/actor/d_a_kddoor.h index 431560f8..4186c47f 100644 --- a/include/d/actor/d_a_kddoor.h +++ b/include/d/actor/d_a_kddoor.h @@ -6,7 +6,7 @@ class daKddoor_c : public fopAc_ac_c { public: void checkFlag(unsigned short) {} - void execute() {} + inline BOOL execute(); void offFlag(unsigned short) {} void onFlag(unsigned short) {} void setAction(unsigned char) {} @@ -35,9 +35,9 @@ public: void closeEnd(); void calcMtx(); void CreateInit(); - void create(); + s32 create(); void demoProc(); - void draw(); + BOOL draw(); public: /* Place member variables here */ diff --git a/include/d/actor/d_a_kmon.h b/include/d/actor/d_a_kmon.h index 3aeebd92..b49b28a2 100644 --- a/include/d/actor/d_a_kmon.h +++ b/include/d/actor/d_a_kmon.h @@ -5,10 +5,10 @@ class daKmon_c : public fopAc_ac_c { public: - void _create() {} - void _delete() {} - void _draw() {} - void _execute() {} + inline s32 _create(); + inline BOOL _delete(); + inline BOOL _draw(); + inline BOOL _execute(); void set_mtx(); void CreateHeap(); diff --git a/include/d/actor/d_a_knob00.h b/include/d/actor/d_a_knob00.h index f43563b1..704e7752 100644 --- a/include/d/actor/d_a_knob00.h +++ b/include/d/actor/d_a_knob00.h @@ -8,7 +8,7 @@ class daKnob00_c : public fopAc_ac_c { public: void checkFlag(unsigned short) {} - void execute() {} + inline BOOL execute(); void nextAction() {} void offFlag(unsigned short) {} void onFlag(unsigned short) {} @@ -26,7 +26,7 @@ public: void chkException(); void calcMtx(); void CreateInit(); - void create(); + s32 create(); void setStart(float, float); void setAngle(); void adjustmentProc(); @@ -42,7 +42,7 @@ public: void actionInit(); void actionFigure(); void actionDead(); - void draw(); + BOOL draw(); public: /* 0x000 */ dDoor_info_c parent; diff --git a/include/d/actor/d_a_komore.h b/include/d/actor/d_a_komore.h index 3f48264f..d95cf542 100644 --- a/include/d/actor/d_a_komore.h +++ b/include/d/actor/d_a_komore.h @@ -8,11 +8,11 @@ namespace daKomore { public: void solidHeapCB(fopAc_ac_c*); void create_heap(); - void _create(); - void _delete(); + s32 _create(); + BOOL _delete(); void set_mtx(); - void _execute(); - void _draw(); + BOOL _execute(); + BOOL _draw(); public: /* Place member variables here */ diff --git a/include/d/actor/d_a_lbridge.h b/include/d/actor/d_a_lbridge.h index 0bf31cc7..d5818bc5 100644 --- a/include/d/actor/d_a_lbridge.h +++ b/include/d/actor/d_a_lbridge.h @@ -5,21 +5,21 @@ class daLbridge_c : public fopAc_ac_c { public: - void _delete() {} + inline BOOL _delete(); void CreateHeap(); void CreateInit(); - void _create(); + s32 _create(); void set_mtx(); void setMoveBGMtx(); - void _execute(); + BOOL _execute(); void sw_check(); void demo(); void appear_bridge(); void disappear_bridge(); void set_on_se(); void set_off_se(); - void _draw(); + BOOL _draw(); public: /* Place member variables here */ diff --git a/include/d/actor/d_a_leaflift.h b/include/d/actor/d_a_leaflift.h index 571085d8..188175a8 100644 --- a/include/d/actor/d_a_leaflift.h +++ b/include/d/actor/d_a_leaflift.h @@ -5,16 +5,16 @@ class daLlift_c : public fopAc_ac_c { public: - void _delete(); + BOOL _delete(); void CreateHeap(); void CreateInit(); - void _create(); + s32 _create(); void set_mtx(); void setMoveBGMtx(); - void _execute(); + BOOL _execute(); void emitterCtrl(); void MoveDownLift(); - void _draw(); + BOOL _draw(); public: /* Place member variables here */ diff --git a/include/d/actor/d_a_lod_bg.h b/include/d/actor/d_a_lod_bg.h index f20aca3f..f646dcd5 100644 --- a/include/d/actor/d_a_lod_bg.h +++ b/include/d/actor/d_a_lod_bg.h @@ -9,8 +9,8 @@ class daLodbg_c : public fopAc_ac_c { public: void createHeap() {} - void draw() {} - void execute() {} + inline BOOL draw(); + inline BOOL execute(); void setExecute(int (daLodbg_c::*)()) {} void deleteModelData(); diff --git a/include/d/actor/d_a_lstair.h b/include/d/actor/d_a_lstair.h index 5eae8c51..f4afa1dc 100644 --- a/include/d/actor/d_a_lstair.h +++ b/include/d/actor/d_a_lstair.h @@ -5,15 +5,15 @@ class daLStair_c : public fopAc_ac_c { public: - void _draw() {} + inline BOOL _draw(); - void _delete(); + BOOL _delete(); void CreateHeap(); void CreateInit(); - void _create(); + s32 _create(); void set_mtx(); void setMoveBGMtx(); - void _execute(); + BOOL _execute(); void demoMove(); void checkAppear(); void moveBG(); diff --git a/include/d/actor/d_a_lwood.h b/include/d/actor/d_a_lwood.h index e8f4313f..3290b36a 100644 --- a/include/d/actor/d_a_lwood.h +++ b/include/d/actor/d_a_lwood.h @@ -5,10 +5,10 @@ class daLwood_c : public fopAc_ac_c { public: - void _create() {} - void _delete() {} - void _draw() {} - void _execute() {} + inline s32 _create(); + inline BOOL _delete(); + inline BOOL _draw(); + inline BOOL _execute(); void getYureScale() const {} void getYureTimer() const {} void setMoveBGMtx() {} diff --git a/include/d/actor/d_a_machine.h b/include/d/actor/d_a_machine.h index d5c3e59c..1266a142 100644 --- a/include/d/actor/d_a_machine.h +++ b/include/d/actor/d_a_machine.h @@ -5,21 +5,21 @@ class daMachine_c : public fopAc_ac_c { public: - void _delete(); + BOOL _delete(); void CreateHeap(); void CreateInit(); void path_move(); void set_next_pnt(); void search_wind_mill(); void set_speed(); - void _create(); + s32 _create(); void set_mtx(); - void _execute(); + BOOL _execute(); void attack(); void set_cube(); void set_body(); void set_at(); - void _draw(); + BOOL _draw(); public: /* Place member variables here */ diff --git a/include/d/actor/d_a_mbdoor.h b/include/d/actor/d_a_mbdoor.h index beb32a47..eb9ea7f7 100644 --- a/include/d/actor/d_a_mbdoor.h +++ b/include/d/actor/d_a_mbdoor.h @@ -7,8 +7,8 @@ class daMbdoor_c : public fopAc_ac_c { public: - void draw() {} - void execute() {} + inline BOOL draw(); + inline BOOL execute(); void setAction(unsigned char) {} void calcMtx(); diff --git a/include/d/actor/d_a_mdoor.h b/include/d/actor/d_a_mdoor.h index 15ac3b5c..380670ca 100644 --- a/include/d/actor/d_a_mdoor.h +++ b/include/d/actor/d_a_mdoor.h @@ -7,8 +7,8 @@ class daMdoor_c : public fopAc_ac_c { public: void chkFlag(unsigned short) {} void clrFlag(unsigned short) {} - void draw() {} - void execute() {} + inline BOOL draw(); + inline BOOL execute(); void nextAction() {} void setAction(unsigned char) {} void setFlag(unsigned short) {} @@ -22,7 +22,7 @@ public: void smokeInit(); void smokeEnd(); void CreateInit(); - void create(); + s32 create(); void demoProc(); public: diff --git a/include/d/actor/d_a_mgameboard.h b/include/d/actor/d_a_mgameboard.h index ccba0ade..28f22e8c 100644 --- a/include/d/actor/d_a_mgameboard.h +++ b/include/d/actor/d_a_mgameboard.h @@ -11,9 +11,9 @@ class dDlst_2DObject_c; class daMgBoard_c : public fopAc_ac_c { public: - void _create() {} - void _delete() {} - void _draw() {} + inline s32 _create(); + inline BOOL _delete(); + inline BOOL _draw(); void reqClearGame() {} void set_mtx() {} @@ -27,7 +27,7 @@ public: void set_2dposition(); void CreateInit(); void MiniGameInit(); - void _execute(); + BOOL _execute(); void execGameMain(); void execEndGame(); void MinigameMain(); diff --git a/include/d/actor/d_a_mmusic.h b/include/d/actor/d_a_mmusic.h index d96903f1..490054e2 100644 --- a/include/d/actor/d_a_mmusic.h +++ b/include/d/actor/d_a_mmusic.h @@ -10,13 +10,13 @@ namespace daMmusic { void create_heap(); void Macore_is_playing(); void set_mtx(); - void _create(); - void _delete(); + s32 _create(); + BOOL _delete(); void init_se(); void manage_se(int); void delete_se(); - void _execute(); - void _draw(); + BOOL _execute(); + BOOL _draw(); public: /* Place member variables here */ diff --git a/include/d/actor/d_a_mtoge.h b/include/d/actor/d_a_mtoge.h index 4beca76a..4f1dfdb7 100644 --- a/include/d/actor/d_a_mtoge.h +++ b/include/d/actor/d_a_mtoge.h @@ -7,15 +7,15 @@ class daMtoge_c : public fopAc_ac_c { public: - void draw() {} - void execute() {} + inline BOOL draw(); + inline BOOL execute(); void setAction(unsigned char) {} void getSwbit(); void CreateHeap(); void calcMtx(); void CreateInit(); - void create(); + s32 create(); public: /* 0x290 */ request_of_phase_process_class mPhaseProcReq; diff --git a/include/d/actor/d_a_npc_ac1.h b/include/d/actor/d_a_npc_ac1.h index 1e86a183..913023b8 100644 --- a/include/d/actor/d_a_npc_ac1.h +++ b/include/d/actor/d_a_npc_ac1.h @@ -56,10 +56,10 @@ public: void wait_action1(void*); void demo(); void shadowDraw(); - void _draw(); - void _execute(); - void _delete(); - void _create(); + BOOL _draw(); + BOOL _execute(); + BOOL _delete(); + s32 _create(); void create_Anm(); void create_wng_Anm(); void create_arm_Anm(); diff --git a/include/d/actor/d_a_npc_ah.h b/include/d/actor/d_a_npc_ah.h index 5d819f8e..9298b6aa 100644 --- a/include/d/actor/d_a_npc_ah.h +++ b/include/d/actor/d_a_npc_ah.h @@ -9,12 +9,12 @@ public: void getPhaseP() {} void setResFlag(unsigned char) {} - void _create(); + s32 _create(); void createHeap(); void createInit(); - void _delete(); - void _draw(); - void _execute(); + BOOL _delete(); + BOOL _draw(); + BOOL _execute(); void executeCommon(); void executeSetMode(unsigned char); void executeWaitInit(); diff --git a/include/d/actor/d_a_npc_aj1.h b/include/d/actor/d_a_npc_aj1.h index bbf380ef..ab315670 100644 --- a/include/d/actor/d_a_npc_aj1.h +++ b/include/d/actor/d_a_npc_aj1.h @@ -84,10 +84,10 @@ public: void wait_action2(void*); void demo(); void shadowDraw(); - void _draw(); - void _execute(); - void _delete(); - void _create(); + BOOL _draw(); + BOOL _execute(); + BOOL _delete(); + s32 _create(); void bodyCreateHeap(); void itemCreateHeap(); void CreateHeap(); diff --git a/include/d/actor/d_a_npc_auction.h b/include/d/actor/d_a_npc_auction.h index 683eaf44..ac46ab07 100644 --- a/include/d/actor/d_a_npc_auction.h +++ b/include/d/actor/d_a_npc_auction.h @@ -5,10 +5,10 @@ class daNpcAuction_c : public fopAc_ac_c { public: - void _create() {} - void _delete() {} - void _draw() {} - void _execute() {} + inline s32 _create(); + inline BOOL _delete(); + inline BOOL _draw(); + inline BOOL _execute(); void getMdlNo() {} void getPhaseP() {} void getPiconOfsY() {} diff --git a/include/d/actor/d_a_npc_ba1.h b/include/d/actor/d_a_npc_ba1.h index a142511a..8d56bba1 100644 --- a/include/d/actor/d_a_npc_ba1.h +++ b/include/d/actor/d_a_npc_ba1.h @@ -81,10 +81,10 @@ public: void wait_action4(void*); void demo(); void shadowDraw(); - void _draw(); - void _execute(); - void _delete(); - void _create(); + BOOL _draw(); + BOOL _execute(); + BOOL _delete(); + s32 _create(); void create_Anm(); void create_itm_Mdl(); void CreateHeap(); diff --git a/include/d/actor/d_a_npc_bj1.h b/include/d/actor/d_a_npc_bj1.h index d07b0c93..c2d000dd 100644 --- a/include/d/actor/d_a_npc_bj1.h +++ b/include/d/actor/d_a_npc_bj1.h @@ -96,10 +96,10 @@ public: void wait_action4(void*); void demo(); void shadowDraw(); - void _draw(); - void _execute(); - void _delete(); - void _create(); + BOOL _draw(); + BOOL _execute(); + BOOL _delete(); + s32 _create(); void create_Anm(); void create_prp_Anm(); void create_itm_Mdl(); diff --git a/include/d/actor/d_a_npc_bm1.h b/include/d/actor/d_a_npc_bm1.h index 714093de..58391ff6 100644 --- a/include/d/actor/d_a_npc_bm1.h +++ b/include/d/actor/d_a_npc_bm1.h @@ -144,10 +144,10 @@ public: void wait_actionA(void*); void demo(); void shadowDraw(); - void _draw(); - void _execute(); - void _delete(); - void _create(); + BOOL _draw(); + BOOL _execute(); + BOOL _delete(); + s32 _create(); void create_Anm(); void create_hed_Anm(); void create_wng_Anm(); diff --git a/include/d/actor/d_a_npc_bmcon1.h b/include/d/actor/d_a_npc_bmcon1.h index 3606d13e..ec690b9a 100644 --- a/include/d/actor/d_a_npc_bmcon1.h +++ b/include/d/actor/d_a_npc_bmcon1.h @@ -15,12 +15,12 @@ public: void setResFlag(unsigned char) {} void nodeArmControl(J3DNode*, J3DModel*); - void _create(); + s32 _create(); void createHeap(); void createInit(); - void _delete(); - void _draw(); - void _execute(); + BOOL _delete(); + BOOL _draw(); + BOOL _execute(); void executeCommon(); void executeSetMode(unsigned char); void executeWaitInit(); diff --git a/include/d/actor/d_a_npc_bms1.h b/include/d/actor/d_a_npc_bms1.h index 29130eef..0248ee92 100644 --- a/include/d/actor/d_a_npc_bms1.h +++ b/include/d/actor/d_a_npc_bms1.h @@ -50,10 +50,10 @@ public: void privateCut(); void demo_move(); void demo_end_init(); - void _draw(); - void _execute(); - void _delete(); - void _create(); + BOOL _draw(); + BOOL _execute(); + BOOL _delete(); + s32 _create(); void CreateHeap(); public: diff --git a/include/d/actor/d_a_npc_bmsw.h b/include/d/actor/d_a_npc_bmsw.h index 8d35bbe9..cac0e40f 100644 --- a/include/d/actor/d_a_npc_bmsw.h +++ b/include/d/actor/d_a_npc_bmsw.h @@ -30,10 +30,10 @@ public: void setGameGetRupee(short); void TimerCountDown(); void shiwake_game_action(void*); - void _draw(); - void _execute(); - void _delete(); - void _create(); + BOOL _draw(); + BOOL _execute(); + BOOL _delete(); + s32 _create(); void CreateHeap(); public: diff --git a/include/d/actor/d_a_npc_bs1.h b/include/d/actor/d_a_npc_bs1.h index 27c3fbf6..3ee93ec6 100644 --- a/include/d/actor/d_a_npc_bs1.h +++ b/include/d/actor/d_a_npc_bs1.h @@ -62,10 +62,10 @@ public: void evn_mantan_init(); void privateCut(); void event_action(void*); - void _draw(); - void _execute(); - void _delete(); - void _create(); + BOOL _draw(); + BOOL _execute(); + BOOL _delete(); + s32 _create(); void CreateHeap(); public: diff --git a/include/d/actor/d_a_npc_btsw.h b/include/d/actor/d_a_npc_btsw.h index f2751fd6..83b5a68b 100644 --- a/include/d/actor/d_a_npc_btsw.h +++ b/include/d/actor/d_a_npc_btsw.h @@ -29,10 +29,10 @@ public: void TimerCountDown(); void shiwake_game_action(void*); void getdemo_action(void*); - void _draw(); - void _execute(); - void _delete(); - void _create(); + BOOL _draw(); + BOOL _execute(); + BOOL _delete(); + s32 _create(); void CreateHeap(); public: diff --git a/include/d/actor/d_a_npc_btsw2.h b/include/d/actor/d_a_npc_btsw2.h index 339aa356..61b8fadd 100644 --- a/include/d/actor/d_a_npc_btsw2.h +++ b/include/d/actor/d_a_npc_btsw2.h @@ -25,10 +25,10 @@ public: void talk01(); void pathMove(); void wait_action(void*); - void _create(); - void _delete(); - void _execute(); - void _draw(); + s32 _create(); + BOOL _delete(); + BOOL _execute(); + BOOL _draw(); public: /* Place member variables here */ diff --git a/include/d/actor/d_a_npc_cb1.h b/include/d/actor/d_a_npc_cb1.h index 01647b0d..bc9d8cab 100644 --- a/include/d/actor/d_a_npc_cb1.h +++ b/include/d/actor/d_a_npc_cb1.h @@ -69,7 +69,7 @@ public: void isTagCheckOK(); void setMessageAnimation(unsigned char); - void create(); + s32 create(); void createHeap(); void setAction(int (daNpc_Cb1_c::**)(void*), int (daNpc_Cb1_c::*)(void*), void*); void setWaitAction(void*); @@ -163,8 +163,8 @@ public: void lookBack(int); void setBaseMtx(); void init(); - void draw(); - void execute(); + BOOL draw(); + BOOL execute(); public: /* 0x4EC */ request_of_phase_process_class m4EC; diff --git a/include/d/actor/d_a_npc_co1.h b/include/d/actor/d_a_npc_co1.h index f433f8d4..65e27407 100644 --- a/include/d/actor/d_a_npc_co1.h +++ b/include/d/actor/d_a_npc_co1.h @@ -57,10 +57,10 @@ public: void wait_action1(void*); void demo(); void shadowDraw(); - void _draw(); - void _execute(); - void _delete(); - void _create(); + BOOL _draw(); + BOOL _execute(); + BOOL _delete(); + s32 _create(); void create_Anm(); void create_prl_Anm(); void create_itm_Mdl(); diff --git a/include/d/actor/d_a_npc_de1.h b/include/d/actor/d_a_npc_de1.h index 6e468ac3..035e551e 100644 --- a/include/d/actor/d_a_npc_de1.h +++ b/include/d/actor/d_a_npc_de1.h @@ -49,10 +49,10 @@ public: void wait_action1(void*); void wait_action2(void*); void demo(); - void _draw(); - void _execute(); - void _delete(); - void _create(); + BOOL _draw(); + BOOL _execute(); + BOOL _delete(); + s32 _create(); void CreateHeap(); public: diff --git a/include/d/actor/d_a_npc_ds1.h b/include/d/actor/d_a_npc_ds1.h index fb324f7e..b8e8058a 100644 --- a/include/d/actor/d_a_npc_ds1.h +++ b/include/d/actor/d_a_npc_ds1.h @@ -57,10 +57,10 @@ public: void dummy_action(void*); void RoomEffectSet(); void RoomEffectDelete(); - void _draw(); - void _execute(); - void _delete(); - void _create(); + BOOL _draw(); + BOOL _execute(); + BOOL _delete(); + s32 _create(); void CreateHeap(); public: diff --git a/include/d/actor/d_a_npc_fa1.h b/include/d/actor/d_a_npc_fa1.h index f08292c4..fa537cac 100644 --- a/include/d/actor/d_a_npc_fa1.h +++ b/include/d/actor/d_a_npc_fa1.h @@ -39,8 +39,8 @@ public: void setPointLightParam(); void createInit(); - void _draw(); - void _execute(); + BOOL _draw(); + BOOL _execute(); void checkBinCatch(); void position_move(float, float); void BGCheck(); @@ -81,8 +81,8 @@ public: void init_bigelf_change(); void bigelf_change(); void findPlayer(); - void _delete(); - void _create(); + BOOL _delete(); + s32 _create(); void CreateHeap(); void setMtx(); diff --git a/include/d/actor/d_a_npc_gk1.h b/include/d/actor/d_a_npc_gk1.h index 63f5bb8a..b6fa685a 100644 --- a/include/d/actor/d_a_npc_gk1.h +++ b/include/d/actor/d_a_npc_gk1.h @@ -50,10 +50,10 @@ public: void wait_action1(void*); void demo(); void shadowDraw(); - void _draw(); - void _execute(); - void _delete(); - void _create(); + BOOL _draw(); + BOOL _execute(); + BOOL _delete(); + s32 _create(); void bodyCreateHeap(); void itemCreateHeap(); void hat_CreateHeap(); diff --git a/include/d/actor/d_a_npc_gp1.h b/include/d/actor/d_a_npc_gp1.h index dfeac09d..bfb044f4 100644 --- a/include/d/actor/d_a_npc_gp1.h +++ b/include/d/actor/d_a_npc_gp1.h @@ -60,10 +60,10 @@ public: void wait_2(); void wait_action1(void*); void demo(); - void _draw(); - void _execute(); - void _delete(); - void _create(); + BOOL _draw(); + BOOL _execute(); + BOOL _delete(); + s32 _create(); void create_Anm(); void CreateHeap(); diff --git a/include/d/actor/d_a_npc_hi1.h b/include/d/actor/d_a_npc_hi1.h index eb7b9512..360ab352 100644 --- a/include/d/actor/d_a_npc_hi1.h +++ b/include/d/actor/d_a_npc_hi1.h @@ -52,10 +52,10 @@ public: void wait_action1(void*); void demo(); void shadowDraw(); - void _draw(); - void _execute(); - void _delete(); - void _create(); + BOOL _draw(); + BOOL _execute(); + BOOL _delete(); + s32 _create(); void bodyCreateHeap(); void CreateHeap(); diff --git a/include/d/actor/d_a_npc_ho.h b/include/d/actor/d_a_npc_ho.h index ef7f5fea..0c18ed36 100644 --- a/include/d/actor/d_a_npc_ho.h +++ b/include/d/actor/d_a_npc_ho.h @@ -55,10 +55,10 @@ public: void give02(); void preach(); void wait_action(void*); - void _draw(); - void _execute(); - void _delete(); - void _create(); + BOOL _draw(); + BOOL _execute(); + BOOL _delete(); + s32 _create(); void CreateHeap(); public: diff --git a/include/d/actor/d_a_npc_jb1.h b/include/d/actor/d_a_npc_jb1.h index 2f684e1d..5f91da8b 100644 --- a/include/d/actor/d_a_npc_jb1.h +++ b/include/d/actor/d_a_npc_jb1.h @@ -40,10 +40,10 @@ public: void wait_1(); void wait_action1(void*); void demo(); - void _draw(); - void _execute(); - void _delete(); - void _create(); + BOOL _draw(); + BOOL _execute(); + BOOL _delete(); + s32 _create(); void create_Anm(); void create_lgt(); void CreateHeap(); diff --git a/include/d/actor/d_a_npc_ji1.h b/include/d/actor/d_a_npc_ji1.h index 8d94ad26..52c79a80 100644 --- a/include/d/actor/d_a_npc_ji1.h +++ b/include/d/actor/d_a_npc_ji1.h @@ -99,12 +99,12 @@ public: void checkCutType(int, int); void setAnimFromMsgNo(unsigned long); void setAnm(int, float, int); - void _create(); + s32 _create(); void CreateHeap(); void CreateInit(); - void _delete(); - void _execute(); - void _draw(); + BOOL _delete(); + BOOL _execute(); + BOOL _draw(); void chkAttention(cXyz, short); void lookBack(); void setHitParticle(cXyz*, unsigned long); diff --git a/include/d/actor/d_a_npc_kf1.h b/include/d/actor/d_a_npc_kf1.h index 71f3cca6..8169be2e 100644 --- a/include/d/actor/d_a_npc_kf1.h +++ b/include/d/actor/d_a_npc_kf1.h @@ -84,10 +84,10 @@ public: void wait_action1(void*); void demo(); void shadowDraw(); - void _draw(); - void _execute(); - void _delete(); - void _create(); + BOOL _draw(); + BOOL _execute(); + BOOL _delete(); + s32 _create(); void bodyCreateHeap(); void itemCreateHeap(); void CreateHeap(); diff --git a/include/d/actor/d_a_npc_kg1.h b/include/d/actor/d_a_npc_kg1.h index 8b26ef05..d84c4d9d 100644 --- a/include/d/actor/d_a_npc_kg1.h +++ b/include/d/actor/d_a_npc_kg1.h @@ -7,10 +7,10 @@ class daNpc_Kg1_c : public fopAc_ac_c { public: - void _create() {} - void _delete() {} - void _draw() {} - void _execute() {} + inline s32 _create(); + inline BOOL _delete(); + inline BOOL _draw(); + inline BOOL _execute(); void getAttentionBasePos() {} void getEyePos() {} void setAction(void (daNpc_Kg1_c::*)()) {} diff --git a/include/d/actor/d_a_npc_kg2.h b/include/d/actor/d_a_npc_kg2.h index 3ab8e295..72810778 100644 --- a/include/d/actor/d_a_npc_kg2.h +++ b/include/d/actor/d_a_npc_kg2.h @@ -39,10 +39,10 @@ public: void processMove(); void wait_action(void*); void event_wait_action(void*); - void _create(); - void _delete(); - void _execute(); - void _draw(); + s32 _create(); + BOOL _delete(); + BOOL _execute(); + BOOL _draw(); public: /* Place member variables here */ diff --git a/include/d/actor/d_a_npc_kk1.h b/include/d/actor/d_a_npc_kk1.h index 6c363fd8..e09be501 100644 --- a/include/d/actor/d_a_npc_kk1.h +++ b/include/d/actor/d_a_npc_kk1.h @@ -108,10 +108,10 @@ public: void wait_action1(void*); void demo(); void shadowDraw(); - void _draw(); - void _execute(); - void _delete(); - void _create(); + BOOL _draw(); + BOOL _execute(); + BOOL _delete(); + s32 _create(); void bodyCreateHeap(); void effcCreateHeap(); void CreateHeap(); diff --git a/include/d/actor/d_a_npc_km1.h b/include/d/actor/d_a_npc_km1.h index 9df3adfb..efc7b135 100644 --- a/include/d/actor/d_a_npc_km1.h +++ b/include/d/actor/d_a_npc_km1.h @@ -49,10 +49,10 @@ public: void talk01(); void wait_action1(void*); void demo(); - void _draw(); - void _execute(); - void _delete(); - void _create(); + BOOL _draw(); + BOOL _execute(); + BOOL _delete(); + s32 _create(); void CreateHeap(); public: diff --git a/include/d/actor/d_a_npc_ko1.h b/include/d/actor/d_a_npc_ko1.h index 5d2243f7..afa9ebab 100644 --- a/include/d/actor/d_a_npc_ko1.h +++ b/include/d/actor/d_a_npc_ko1.h @@ -122,10 +122,10 @@ public: void wait_action4(void*); void demo(); void shadowDraw(); - void _draw(); - void _execute(); - void _delete(); - void _create(); + BOOL _draw(); + BOOL _execute(); + BOOL _delete(); + s32 _create(); void create_Anm(); void create_hed_Anm(); void create_bln_Anm(); diff --git a/include/d/actor/d_a_npc_kp1.h b/include/d/actor/d_a_npc_kp1.h index d73af0a2..99764260 100644 --- a/include/d/actor/d_a_npc_kp1.h +++ b/include/d/actor/d_a_npc_kp1.h @@ -52,10 +52,10 @@ public: void wait_action1(void*); void demo(); void shadowDraw(); - void _draw(); - void _execute(); - void _delete(); - void _create(); + BOOL _draw(); + BOOL _execute(); + BOOL _delete(); + s32 _create(); void CreateHeap(); public: diff --git a/include/d/actor/d_a_npc_mk.h b/include/d/actor/d_a_npc_mk.h index 712aaf7f..3a3b3472 100644 --- a/include/d/actor/d_a_npc_mk.h +++ b/include/d/actor/d_a_npc_mk.h @@ -76,10 +76,10 @@ public: void seek_action(void*); void hind_action(void*); void visit_action(void*); - void _draw(); - void _execute(); - void _delete(); - void _create(); + BOOL _draw(); + BOOL _execute(); + BOOL _delete(); + s32 _create(); void CreateHeap(); public: diff --git a/include/d/actor/d_a_npc_mn.h b/include/d/actor/d_a_npc_mn.h index bc652f02..3456e714 100644 --- a/include/d/actor/d_a_npc_mn.h +++ b/include/d/actor/d_a_npc_mn.h @@ -11,12 +11,12 @@ public: void getPosFlag() {} void setResFlag(unsigned char) {} - void _create(); + s32 _create(); void createHeap(); void createInit(); - void _delete(); - void _draw(); - void _execute(); + BOOL _delete(); + BOOL _draw(); + BOOL _execute(); void executeCommon(); void executeSetMode(unsigned char); void executeWaitInit(); diff --git a/include/d/actor/d_a_npc_mt.h b/include/d/actor/d_a_npc_mt.h index 2ebbfa70..f5014b34 100644 --- a/include/d/actor/d_a_npc_mt.h +++ b/include/d/actor/d_a_npc_mt.h @@ -17,12 +17,12 @@ public: void getPhaseP() {} void setResFlag(unsigned char) {} - void _create(); + s32 _create(); void createHeap(); void createInit(); - void _delete(); - void _draw(); - void _execute(); + BOOL _delete(); + BOOL _draw(); + BOOL _execute(); void executeCommon(); void executeSetMode(unsigned char); void executeWaitInit(); diff --git a/include/d/actor/d_a_npc_nz.h b/include/d/actor/d_a_npc_nz.h index 245aac07..4f2da73d 100644 --- a/include/d/actor/d_a_npc_nz.h +++ b/include/d/actor/d_a_npc_nz.h @@ -29,13 +29,13 @@ public: void deleteShopItem(); void next_msgStatus(unsigned long*); void anmAtr(unsigned short); - void _execute(); - void _draw(); + BOOL _execute(); + BOOL _draw(); void createInit(); void setSmokeParticle(); void getArg(); - void _create(); - void _delete(); + s32 _create(); + BOOL _delete(); void _searchEsa(fopAc_ac_c*); void cutProc(); void cutEatesaStart(); diff --git a/include/d/actor/d_a_npc_ob1.h b/include/d/actor/d_a_npc_ob1.h index 638b3355..35c452d8 100644 --- a/include/d/actor/d_a_npc_ob1.h +++ b/include/d/actor/d_a_npc_ob1.h @@ -68,10 +68,10 @@ public: void wait_action2(void*); void demo(); void shadowDraw(); - void _draw(); - void _execute(); - void _delete(); - void _create(); + BOOL _draw(); + BOOL _execute(); + BOOL _delete(); + s32 _create(); void create_Anm(); void create_hed_Mdl(); void CreateHeap(); diff --git a/include/d/actor/d_a_npc_os.h b/include/d/actor/d_a_npc_os.h index 6aea183b..6cbf71e3 100644 --- a/include/d/actor/d_a_npc_os.h +++ b/include/d/actor/d_a_npc_os.h @@ -40,7 +40,7 @@ public: void onWaterHit() {} void setCattleRoomNo(signed char) {} - void create(); + s32 create(); void createHeap(); void jointCheck(signed char); void wakeupCheck(); @@ -123,10 +123,10 @@ public: void lookBack(int, int, int); void setBaseMtx(); void init(); - void draw(); + BOOL draw(); void animationPlay(); void smokeSet(unsigned short); - void execute(); + BOOL execute(); public: /* 0x4EC */ request_of_phase_process_class mPhs; diff --git a/include/d/actor/d_a_npc_p1.h b/include/d/actor/d_a_npc_p1.h index 5329d5c5..9033e74f 100644 --- a/include/d/actor/d_a_npc_p1.h +++ b/include/d/actor/d_a_npc_p1.h @@ -27,13 +27,13 @@ public: void minigameExplainCut(); void privateCut(); void setAttentionPos(cXyz*); - void _create(); + s32 _create(); void CreateHeap(); - void _delete(); + BOOL _delete(); void getKajiID(); void kaji_anm(); - void _execute(); - void _draw(); + BOOL _execute(); + BOOL _draw(); void lookBack(); public: diff --git a/include/d/actor/d_a_npc_p2.h b/include/d/actor/d_a_npc_p2.h index 47382105..bd683c1d 100644 --- a/include/d/actor/d_a_npc_p2.h +++ b/include/d/actor/d_a_npc_p2.h @@ -56,7 +56,7 @@ public: void talk01(); void intro_action(void*); void wait_action(void*); - void _execute(); + BOOL _execute(); void draw_item(J3DModel*, signed char); void drawDagger(); void drawHead(); @@ -64,12 +64,12 @@ public: void drawP2a(); void drawP2b(); void drawP2c(); - void _draw(); + BOOL _draw(); void getArg(); void _createHeap(); void createInit(); - void _create(); - void _delete(); + s32 _create(); + BOOL _delete(); void cutProc(); void cutTalkStart(int); void cutTalkProc(int); diff --git a/include/d/actor/d_a_npc_people.h b/include/d/actor/d_a_npc_people.h index d734c243..3603f6c7 100644 --- a/include/d/actor/d_a_npc_people.h +++ b/include/d/actor/d_a_npc_people.h @@ -18,12 +18,12 @@ public: void setResFlag(unsigned char) {} void setTalk(unsigned char) {} - void _create(); + s32 _create(); void createHeap(); void createInit(); - void _delete(); - void _draw(); - void _execute(); + BOOL _delete(); + BOOL _draw(); + BOOL _execute(); void executeCommon(); void executeSetMode(unsigned char); void executeWaitInit(); diff --git a/include/d/actor/d_a_npc_pf1.h b/include/d/actor/d_a_npc_pf1.h index e6dcbff8..8314a9db 100644 --- a/include/d/actor/d_a_npc_pf1.h +++ b/include/d/actor/d_a_npc_pf1.h @@ -62,10 +62,10 @@ public: void wait_action1(void*); void demo(); void shadowDraw(); - void _draw(); - void _execute(); - void _delete(); - void _create(); + BOOL _draw(); + BOOL _execute(); + BOOL _delete(); + s32 _create(); void bodyCreateHeap(); void CreateHeap(); diff --git a/include/d/actor/d_a_npc_photo.h b/include/d/actor/d_a_npc_photo.h index ed684e62..ae8dc9f6 100644 --- a/include/d/actor/d_a_npc_photo.h +++ b/include/d/actor/d_a_npc_photo.h @@ -14,12 +14,12 @@ public: void setPosFlag(unsigned char) {} void setResFlag(unsigned char) {} - void _create(); + s32 _create(); void createHeap(); void createInit(); - void _delete(); - void _draw(); - void _execute(); + BOOL _delete(); + BOOL _draw(); + BOOL _execute(); void executeCommon(); void executeSetMode(unsigned char); void executeWait(); diff --git a/include/d/actor/d_a_npc_pm1.h b/include/d/actor/d_a_npc_pm1.h index e3e78e19..b5e14247 100644 --- a/include/d/actor/d_a_npc_pm1.h +++ b/include/d/actor/d_a_npc_pm1.h @@ -49,10 +49,10 @@ public: void talk01(); void wait_action1(void*); void demo(); - void _draw(); - void _execute(); - void _delete(); - void _create(); + BOOL _draw(); + BOOL _execute(); + BOOL _delete(); + s32 _create(); void CreateHeap(); public: diff --git a/include/d/actor/d_a_npc_roten.h b/include/d/actor/d_a_npc_roten.h index 0b11154f..c6acb5b6 100644 --- a/include/d/actor/d_a_npc_roten.h +++ b/include/d/actor/d_a_npc_roten.h @@ -10,12 +10,12 @@ public: void setNpcNo(unsigned char) {} void setResFlag(unsigned char) {} - void _create(); + s32 _create(); void createHeap(); void createInit(); - void _delete(); - void _draw(); - void _execute(); + BOOL _delete(); + BOOL _draw(); + BOOL _execute(); void executeCommon(); void executeSetMode(unsigned char); void executeWaitInit(); diff --git a/include/d/actor/d_a_npc_rsh1.h b/include/d/actor/d_a_npc_rsh1.h index 13f78c34..3f25f72e 100644 --- a/include/d/actor/d_a_npc_rsh1.h +++ b/include/d/actor/d_a_npc_rsh1.h @@ -56,10 +56,10 @@ public: void privateCut(); void event_action(void*); void dummy_action(void*); - void _draw(); - void _execute(); - void _delete(); - void _create(); + BOOL _draw(); + BOOL _execute(); + BOOL _delete(); + s32 _create(); void CreateHeap(); void set_mtx(); diff --git a/include/d/actor/d_a_npc_sarace.h b/include/d/actor/d_a_npc_sarace.h index 87d0c00b..c7847de3 100644 --- a/include/d/actor/d_a_npc_sarace.h +++ b/include/d/actor/d_a_npc_sarace.h @@ -30,10 +30,10 @@ public: void wait_action(void*); void event_endCheck_action(void*); void set_mtx(); - void _draw(); - void _execute(); - void _delete(); - void _create(); + BOOL _draw(); + BOOL _execute(); + BOOL _delete(); + s32 _create(); void CreateHeap(); public: diff --git a/include/d/actor/d_a_npc_so.h b/include/d/actor/d_a_npc_so.h index 6c559572..b00d8cf4 100644 --- a/include/d/actor/d_a_npc_so.h +++ b/include/d/actor/d_a_npc_so.h @@ -111,14 +111,14 @@ public: void eventOrder(); void checkOrder(); void setScale(); - void _execute(); + BOOL _execute(); void debugDraw(); void hudeDraw(); - void _draw(); + BOOL _draw(); void createInit(); void getArg(); - void _create(); - void _delete(); + s32 _create(); + BOOL _delete(); public: /* Place member variables here */ diff --git a/include/d/actor/d_a_npc_sv.h b/include/d/actor/d_a_npc_sv.h index 3093e0c0..fcd684cd 100644 --- a/include/d/actor/d_a_npc_sv.h +++ b/include/d/actor/d_a_npc_sv.h @@ -11,12 +11,12 @@ public: void getPhaseP() {} void setResFlag(unsigned char) {} - void _create(); + s32 _create(); void createHeap(); void createInit(); - void _delete(); - void _draw(); - void _execute(); + BOOL _delete(); + BOOL _draw(); + BOOL _execute(); void executeCommon(); void executeSetMode(unsigned char); void executeWaitInit(); diff --git a/include/d/actor/d_a_npc_tc.h b/include/d/actor/d_a_npc_tc.h index 905c57aa..158e2e10 100644 --- a/include/d/actor/d_a_npc_tc.h +++ b/include/d/actor/d_a_npc_tc.h @@ -58,12 +58,12 @@ public: void wait_action(void*); void calc_sitpos(); void set_mtx(); - void _draw(); + BOOL _draw(); void setTower(); - void _execute(); - void _delete(); + BOOL _execute(); + BOOL _delete(); void isCreate(); - void _create(); + s32 _create(); void _createHeap(); void next_msgStatusNormal2(unsigned long*); void getMsgNormal2(); diff --git a/include/d/actor/d_a_npc_tt.h b/include/d/actor/d_a_npc_tt.h index 7b3235d1..50f29634 100644 --- a/include/d/actor/d_a_npc_tt.h +++ b/include/d/actor/d_a_npc_tt.h @@ -64,10 +64,10 @@ public: void wait_action(void*); void set_ke_root(int, int, int); void ke_execute(); - void _draw(); - void _execute(); - void _delete(); - void _create(); + BOOL _draw(); + BOOL _execute(); + BOOL _delete(); + s32 _create(); void CreateHeap(); public: diff --git a/include/d/actor/d_a_npc_uk.h b/include/d/actor/d_a_npc_uk.h index cbe229c9..aa69d230 100644 --- a/include/d/actor/d_a_npc_uk.h +++ b/include/d/actor/d_a_npc_uk.h @@ -80,10 +80,10 @@ public: void seek_action(void*); void hind_action(void*); void visit_action(void*); - void _draw(); - void _execute(); - void _delete(); - void _create(); + BOOL _draw(); + BOOL _execute(); + BOOL _delete(); + s32 _create(); void CreateHeap(); public: diff --git a/include/d/actor/d_a_npc_ym1.h b/include/d/actor/d_a_npc_ym1.h index 4298d3a0..d535a50a 100644 --- a/include/d/actor/d_a_npc_ym1.h +++ b/include/d/actor/d_a_npc_ym1.h @@ -76,10 +76,10 @@ public: void demo_action1(void*); void demo(); void shadowDraw(); - void _draw(); - void _execute(); - void _delete(); - void _create(); + BOOL _draw(); + BOOL _execute(); + BOOL _delete(); + s32 _create(); void bodyCreateHeap(); void headCreateHeap(); void itemCreateHeap(); diff --git a/include/d/actor/d_a_npc_yw1.h b/include/d/actor/d_a_npc_yw1.h index c75ad11b..80989bb4 100644 --- a/include/d/actor/d_a_npc_yw1.h +++ b/include/d/actor/d_a_npc_yw1.h @@ -69,10 +69,10 @@ public: void wait_action2(void*); void demo(); void shadowDraw(); - void _draw(); - void _execute(); - void _delete(); - void _create(); + BOOL _draw(); + BOOL _execute(); + BOOL _delete(); + s32 _create(); void bodyCreateHeap(); void headCreateHeap(); void CreateHeap(); diff --git a/include/d/actor/d_a_npc_zk1.h b/include/d/actor/d_a_npc_zk1.h index ec0370ba..14e62749 100644 --- a/include/d/actor/d_a_npc_zk1.h +++ b/include/d/actor/d_a_npc_zk1.h @@ -48,10 +48,10 @@ public: void wait_action1(void*); void demo(); void shadowDraw(); - void _draw(); - void _execute(); - void _delete(); - void _create(); + BOOL _draw(); + BOOL _execute(); + BOOL _delete(); + s32 _create(); void bodyCreateHeap(); void CreateHeap(); diff --git a/include/d/actor/d_a_obj_Itnak.h b/include/d/actor/d_a_obj_Itnak.h index 4b19df46..42b38b41 100644 --- a/include/d/actor/d_a_obj_Itnak.h +++ b/include/d/actor/d_a_obj_Itnak.h @@ -13,14 +13,14 @@ namespace daObjItnak { void solidHeapCB(fopAc_ac_c*); void create_heap(); - void _create(); - void _delete(); + s32 _create(); + BOOL _delete(); void set_mtx(); void set_co_se(dCcD_Cyl*); void manage_draw_flag(); void set_collision(); - void _execute(); - void _draw(); + BOOL _execute(); + BOOL _draw(); public: /* Place member variables here */ diff --git a/include/d/actor/d_a_obj_Vds.h b/include/d/actor/d_a_obj_Vds.h index f0cbac0e..ccab07e9 100644 --- a/include/d/actor/d_a_obj_Vds.h +++ b/include/d/actor/d_a_obj_Vds.h @@ -27,11 +27,11 @@ namespace daObjVds { void Event_exe(); void solidHeapCB(fopAc_ac_c*); void create_heap(); - void _create(); - void _delete(); + s32 _create(); + BOOL _delete(); void set_mtx(); - void _execute(); - void _draw(); + BOOL _execute(); + BOOL _draw(); public: /* Place member variables here */ diff --git a/include/d/actor/d_a_obj_YLzou.h b/include/d/actor/d_a_obj_YLzou.h index 907f890b..1c96fa6c 100644 --- a/include/d/actor/d_a_obj_YLzou.h +++ b/include/d/actor/d_a_obj_YLzou.h @@ -18,8 +18,8 @@ public: void eff_smoke_slip_remove(); void eff_smoke_proc(); void vib_proc(); - void _create(); - void _delete(); + s32 _create(); + BOOL _delete(); void move_ylzou_demo_start_wait_act_proc(); void demo_regist_wait_act_proc(); void demo_vib_start_wait_act_proc(); @@ -39,8 +39,8 @@ public: void go_up_stairs_demo_move_start_wait_act_init_proc(); void go_up_stairs_demo_move_act_init_proc(); void setup_action(int); - void _execute(); - void _draw(); + BOOL _execute(); + BOOL _draw(); public: /* Place member variables here */ diff --git a/include/d/actor/d_a_obj_Yboil.h b/include/d/actor/d_a_obj_Yboil.h index 13cc2800..0adb33a2 100644 --- a/include/d/actor/d_a_obj_Yboil.h +++ b/include/d/actor/d_a_obj_Yboil.h @@ -6,10 +6,10 @@ class daObjYboil_c : public fopAc_ac_c { public: - void _create() {} - void _delete() {} - void _draw() {} - void _execute() {} + inline s32 _create(); + inline BOOL _delete(); + inline BOOL _draw(); + inline BOOL _execute(); void prm_get_swSave() const {} void set_sea_material(J3DMaterial*) {} diff --git a/include/d/actor/d_a_obj_adnno.h b/include/d/actor/d_a_obj_adnno.h index 70944a20..214dd78e 100644 --- a/include/d/actor/d_a_obj_adnno.h +++ b/include/d/actor/d_a_obj_adnno.h @@ -5,10 +5,10 @@ class daObjAdnno_c : public fopAc_ac_c { public: - void _create() {} - void _delete() {} - void _draw() {} - void _execute() {} + inline s32 _create(); + inline BOOL _delete(); + inline BOOL _draw(); + inline BOOL _execute(); void CreateInit(); void set_mtx(); diff --git a/include/d/actor/d_a_obj_apzl.h b/include/d/actor/d_a_obj_apzl.h index fd72c4b0..6ce8bab5 100644 --- a/include/d/actor/d_a_obj_apzl.h +++ b/include/d/actor/d_a_obj_apzl.h @@ -5,10 +5,10 @@ class daObjApzl_c : public fopAc_ac_c { public: - void _create() {} - void _delete() {} - void _draw() {} - void _execute() {} + inline s32 _create(); + inline BOOL _delete(); + inline BOOL _draw(); + inline BOOL _execute(); void getblank() {} void move_piece(); diff --git a/include/d/actor/d_a_obj_ashut.h b/include/d/actor/d_a_obj_ashut.h index 3ca68195..39e5b708 100644 --- a/include/d/actor/d_a_obj_ashut.h +++ b/include/d/actor/d_a_obj_ashut.h @@ -11,9 +11,9 @@ namespace daObjAshut { void prm_get_swSave() const {} void CreateHeap(); - void Create(); + s32 Create(); void Mthd_Create(); - void Delete(); + BOOL Delete(); void Mthd_Delete(); void set_mtx(); void init_mtx(); @@ -29,7 +29,7 @@ namespace daObjAshut { void mode_demoreq_init(daObjAshut::Act_c::Mode_e); void mode_demoreq(); void Execute(float(**)[3][4]); - void Draw(); + BOOL Draw(); public: /* Place member variables here */ diff --git a/include/d/actor/d_a_obj_auzu.h b/include/d/actor/d_a_obj_auzu.h index 5e84ccc6..ebdb5ee6 100644 --- a/include/d/actor/d_a_obj_auzu.h +++ b/include/d/actor/d_a_obj_auzu.h @@ -19,17 +19,17 @@ namespace daObjAuzu { void solidHeapCB(fopAc_ac_c*); void create_heap(); - void _create(); - void _delete(); + s32 _create(); + BOOL _delete(); void is_exist() const; void set_mtx(); void init_mtx(); void set_state_map(); void ship_whirl(); void bgm_start(); - void _execute(); + BOOL _execute(); void set_material(J3DMaterial*, unsigned char); - void _draw(); + BOOL _draw(); public: /* Place member variables here */ diff --git a/include/d/actor/d_a_obj_aygr.h b/include/d/actor/d_a_obj_aygr.h index 3b13e5e5..1e0b522f 100644 --- a/include/d/actor/d_a_obj_aygr.h +++ b/include/d/actor/d_a_obj_aygr.h @@ -9,14 +9,14 @@ namespace daObjAygr { void prm_get_mdl() const {} void CreateHeap(); - void Create(); + s32 Create(); void Mthd_Create(); - void Delete(); + BOOL Delete(); void Mthd_Delete(); void set_mtx(); void init_mtx(); void Execute(float(**)[3][4]); - void Draw(); + BOOL Draw(); public: /* Place member variables here */ diff --git a/include/d/actor/d_a_obj_balancelift.h b/include/d/actor/d_a_obj_balancelift.h index ac12ce82..797479b4 100644 --- a/include/d/actor/d_a_obj_balancelift.h +++ b/include/d/actor/d_a_obj_balancelift.h @@ -5,10 +5,10 @@ class daBalancelift_c : public fopAc_ac_c { public: - void _create() {} - void _delete() {} - void _draw() {} - void _execute() {} + inline s32 _create(); + inline BOOL _delete(); + inline BOOL _draw(); + inline BOOL _execute(); void calc_quat(); void set_mtx(); diff --git a/include/d/actor/d_a_obj_barrel.h b/include/d/actor/d_a_obj_barrel.h index b33ed81c..036b6a1e 100644 --- a/include/d/actor/d_a_obj_barrel.h +++ b/include/d/actor/d_a_obj_barrel.h @@ -14,8 +14,8 @@ namespace daObjBarrel { void solidHeapCB(fopAc_ac_c*); void create_heap(); - void _create(); - void _delete(); + s32 _create(); + BOOL _delete(); void mode_wait_init(); void mode_wait(); void mode_carry_init(); @@ -49,8 +49,8 @@ namespace daObjBarrel { void damage_cc_proc(); void damage_bg_proc(); void damage_bg_proc_directly(); - void _execute(); - void _draw(); + BOOL _execute(); + BOOL _draw(); public: /* Place member variables here */ diff --git a/include/d/actor/d_a_obj_barrel2.h b/include/d/actor/d_a_obj_barrel2.h index 4534879c..ef3b9c8d 100644 --- a/include/d/actor/d_a_obj_barrel2.h +++ b/include/d/actor/d_a_obj_barrel2.h @@ -23,8 +23,8 @@ namespace daObjBarrel2 { void solidHeapCB(fopAc_ac_c*); void create_heap(); - void _create(); - void _delete(); + s32 _create(); + BOOL _delete(); void tg_hitCB(fopAc_ac_c*, dCcD_GObjInf*, fopAc_ac_c*, dCcD_GObjInf*); void co_hitCB(fopAc_ac_c*, dCcD_GObjInf*, fopAc_ac_c*, dCcD_GObjInf*); void cull_set_draw(); @@ -67,8 +67,8 @@ namespace daObjBarrel2 { void mine_chk_range_explode(); void mine_chk_range_damage(); void execute_sub(); - void _execute(); - void _draw(); + BOOL _execute(); + BOOL _draw(); public: /* Place member variables here */ diff --git a/include/d/actor/d_a_obj_barrier.h b/include/d/actor/d_a_obj_barrier.h index b06aa474..79f8a1da 100644 --- a/include/d/actor/d_a_obj_barrier.h +++ b/include/d/actor/d_a_obj_barrier.h @@ -32,9 +32,9 @@ public: bool checkHitActor(fopAc_ac_c*); void birth(fopAc_ac_c*, f32, cXyz, cXyz, int); bool init(); - void create(); - void execute(); - void draw(); + s32 create(); + BOOL execute(); + BOOL draw(); f32 getBtkFrame(int i_idx) { return mBtk[i_idx].getFrame(); } diff --git a/include/d/actor/d_a_obj_bemos.h b/include/d/actor/d_a_obj_bemos.h index fb09a576..e97da350 100644 --- a/include/d/actor/d_a_obj_bemos.h +++ b/include/d/actor/d_a_obj_bemos.h @@ -5,10 +5,10 @@ class daBemos_c : public fopAc_ac_c { public: - void _create() {} - void _delete() {} - void _draw() {} - void _execute() {} + inline s32 _create(); + inline BOOL _delete(); + inline BOOL _draw(); + inline BOOL _execute(); void checkEyeProc(int (daBemos_c::*)()) {} void setEyeProc(int (daBemos_c::*)()) {} diff --git a/include/d/actor/d_a_obj_buoyflag.h b/include/d/actor/d_a_obj_buoyflag.h index 28225d15..d749906f 100644 --- a/include/d/actor/d_a_obj_buoyflag.h +++ b/include/d/actor/d_a_obj_buoyflag.h @@ -30,10 +30,10 @@ namespace daObjBuoyflag { } void setup(MtxP mtx) { cMtx_copy(mtx, m1090); } - void _create() {} - void _delete() {} - void _draw() {} - void _execute() {} + inline s32 _create(); + inline BOOL _delete(); + inline BOOL _draw(); + inline BOOL _execute(); void jump_to_sea(float, float, short) {} void make_barrel2_mine(unsigned int, cXyz*, int, csXyz*, daObjBuoyflag::Texture_e, bool) {} void make_barrel2_norm(unsigned int, cXyz*, int, csXyz*, daObjBuoyflag::Texture_e) {} diff --git a/include/d/actor/d_a_obj_buoyrace.h b/include/d/actor/d_a_obj_buoyrace.h index 5ae6069a..8133364d 100644 --- a/include/d/actor/d_a_obj_buoyrace.h +++ b/include/d/actor/d_a_obj_buoyrace.h @@ -6,10 +6,10 @@ namespace daObjBuoyrace { class Act_c : public fopAc_ac_c { public: - void _create() {} - void _delete() {} - void _draw() {} - void _execute() {} + inline s32 _create(); + inline BOOL _delete(); + inline BOOL _draw(); + inline BOOL _execute(); void attr() const {} void prm_get_id() const {} void prm_get_line() const {} diff --git a/include/d/actor/d_a_obj_cafelmp.h b/include/d/actor/d_a_obj_cafelmp.h index ad561525..4269a8dd 100644 --- a/include/d/actor/d_a_obj_cafelmp.h +++ b/include/d/actor/d_a_obj_cafelmp.h @@ -5,10 +5,10 @@ class daObjCafelmp_c : public fopAc_ac_c { public: - void _create() {} - void _delete() {} - void _draw() {} - void _execute() {} + inline s32 _create(); + inline BOOL _delete(); + inline BOOL _draw(); + inline BOOL _execute(); void CreateInit(); void set_mtx(); diff --git a/include/d/actor/d_a_obj_canon.h b/include/d/actor/d_a_obj_canon.h index c381551d..69c04c37 100644 --- a/include/d/actor/d_a_obj_canon.h +++ b/include/d/actor/d_a_obj_canon.h @@ -28,13 +28,13 @@ public: void modeAppearInit(); void modeAppear(); void modeProc(daObj_Canon_c::Proc_e, int); - void _execute(); + BOOL _execute(); void debugDraw(); - void _draw(); + BOOL _draw(); void createInit(); void getArg(); - void _create(); - void _delete(); + s32 _create(); + BOOL _delete(); public: /* Place member variables here */ diff --git a/include/d/actor/d_a_obj_coming.h b/include/d/actor/d_a_obj_coming.h index 2dd0c9f0..a6c74082 100644 --- a/include/d/actor/d_a_obj_coming.h +++ b/include/d/actor/d_a_obj_coming.h @@ -15,8 +15,8 @@ namespace daObjComing { void prm_get_waitTime() const {} void chk_switch(); - void _create(); - void _delete(); + s32 _create(); + BOOL _delete(); void get_aqua_y(const cXyz*); void chk_ship_range(const fopAc_ac_c*) const; void chk_ship_spd(const fopAc_ac_c*) const; @@ -33,8 +33,8 @@ namespace daObjComing { void mode_barrel2_wait(daObjComing::Ctrl_c*); void mode_barrel2_appear(daObjComing::Ctrl_c*); void mode_barrel2_leave(daObjComing::Ctrl_c*); - void _execute(); - void _draw(); + BOOL _execute(); + BOOL _draw(); public: /* Place member variables here */ diff --git a/include/d/actor/d_a_obj_correct.h b/include/d/actor/d_a_obj_correct.h index 69103ef5..fff43d56 100644 --- a/include/d/actor/d_a_obj_correct.h +++ b/include/d/actor/d_a_obj_correct.h @@ -11,8 +11,8 @@ namespace daObjCorrect { void prm_get_swSave() const {} void prm_get_type() const {} - void _create(); - void _delete(); + s32 _create(); + BOOL _delete(); void chk_try_actor0(fopAc_ac_c*); void chk_try_actor1(daObjTry::Act_c*, daObjTry::Type_e, float) const; void chk_try_actor2(daObjTry::Act_c*, daObjTry::Type_e, bool, float, float) const; @@ -34,7 +34,7 @@ namespace daObjCorrect { void demo_req(); void demo_run_init(); void demo_run(); - void _execute(); + BOOL _execute(); public: /* Place member variables here */ diff --git a/include/d/actor/d_a_obj_demo_barrel.h b/include/d/actor/d_a_obj_demo_barrel.h index 3a409790..27ec43f7 100644 --- a/include/d/actor/d_a_obj_demo_barrel.h +++ b/include/d/actor/d_a_obj_demo_barrel.h @@ -5,10 +5,10 @@ class daObj_Demo_Barrel_c : public fopAc_ac_c { public: - void _create() {} - void _delete() {} - void _draw() {} - void _execute() {} + inline s32 _create(); + inline BOOL _delete(); + inline BOOL _draw(); + inline BOOL _execute(); void demo_move() {} void set_mtx() {} diff --git a/include/d/actor/d_a_obj_dmgroom.h b/include/d/actor/d_a_obj_dmgroom.h index d2296332..8f62ffe5 100644 --- a/include/d/actor/d_a_obj_dmgroom.h +++ b/include/d/actor/d_a_obj_dmgroom.h @@ -5,10 +5,10 @@ class daObjDmgroom_c : public fopAc_ac_c { public: - void _create() {} - void _delete() {} - void _draw() {} - void _execute() {} + inline s32 _create(); + inline BOOL _delete(); + inline BOOL _draw(); + inline BOOL _execute(); void CreateInit(); void set_mtx(); diff --git a/include/d/actor/d_a_obj_doguu.h b/include/d/actor/d_a_obj_doguu.h index a6f4864a..8e91fa3f 100644 --- a/include/d/actor/d_a_obj_doguu.h +++ b/include/d/actor/d_a_obj_doguu.h @@ -5,10 +5,10 @@ class daObjDoguu_c : public fopAc_ac_c { public: - void _create() {} - void _delete() {} - void _draw() {} - void _execute() {} + inline s32 _create(); + inline BOOL _delete(); + inline BOOL _draw(); + inline BOOL _execute(); void setEffectMtx(const cXyz*, float) {} void setPointLight(); diff --git a/include/d/actor/d_a_obj_doguu_demo.h b/include/d/actor/d_a_obj_doguu_demo.h index 4a84b8d4..1212c4b1 100644 --- a/include/d/actor/d_a_obj_doguu_demo.h +++ b/include/d/actor/d_a_obj_doguu_demo.h @@ -5,10 +5,10 @@ class daObjDoguuD_c : public fopAc_ac_c { public: - void _create() {} - void _delete() {} - void _draw() {} - void _execute() {} + inline s32 _create(); + inline BOOL _delete(); + inline BOOL _draw(); + inline BOOL _execute(); void CreateHeap(); void CreateInit(); diff --git a/include/d/actor/d_a_obj_dragonhead.h b/include/d/actor/d_a_obj_dragonhead.h index 88978a43..2c9c8cb5 100644 --- a/include/d/actor/d_a_obj_dragonhead.h +++ b/include/d/actor/d_a_obj_dragonhead.h @@ -5,10 +5,10 @@ class daObjDragonhead_c : public fopAc_ac_c { public: - void _create() {} - void _delete() {} - void _draw() {} - void _execute() {} + inline s32 _create(); + inline BOOL _delete(); + inline BOOL _draw(); + inline BOOL _execute(); void CreateInit(); void set_mtx(); diff --git a/include/d/actor/d_a_obj_drift.h b/include/d/actor/d_a_obj_drift.h index b21b9c6f..24243a68 100644 --- a/include/d/actor/d_a_obj_drift.h +++ b/include/d/actor/d_a_obj_drift.h @@ -10,12 +10,12 @@ namespace daObjDrift { void prm_get_type() const {} void CreateHeap(); - void Create(); + s32 Create(); void Mthd_Create(); void make_flower(); void calc_flower_param(cXyz*, csXyz*); void set_flower_current(); - void Delete(); + BOOL Delete(); void Mthd_Delete(); void mode_wait_init(); void mode_wait(); @@ -26,7 +26,7 @@ namespace daObjDrift { void rideCB(dBgW*, fopAc_ac_c*, fopAc_ac_c*); void set_current(); void Execute(float(**)[3][4]); - void Draw(); + BOOL Draw(); public: /* Place member variables here */ diff --git a/include/d/actor/d_a_obj_ebomzo.h b/include/d/actor/d_a_obj_ebomzo.h index f716e03c..80cf5bc9 100644 --- a/include/d/actor/d_a_obj_ebomzo.h +++ b/include/d/actor/d_a_obj_ebomzo.h @@ -9,9 +9,9 @@ namespace daObjEbomzo { void prm_get_swSave() const {} void CreateHeap(); - void Create(); + s32 Create(); void Mthd_Create(); - void Delete(); + BOOL Delete(); void Mthd_Delete(); void set_mtx(); void init_mtx(); @@ -19,7 +19,7 @@ namespace daObjEbomzo { void demo(); void fall(); void Execute(float(**)[3][4]); - void Draw(); + BOOL Draw(); public: /* Place member variables here */ diff --git a/include/d/actor/d_a_obj_eff.h b/include/d/actor/d_a_obj_eff.h index ae3014a6..5d0bf3e2 100644 --- a/include/d/actor/d_a_obj_eff.h +++ b/include/d/actor/d_a_obj_eff.h @@ -29,7 +29,7 @@ namespace daObjEff { void eff_set_pinecone_smoke(); void eff_set_woodBox_smoke(); void eff_set(); - void _create(); + s32 _create(); void remove_barrel_smoke(); void remove_stool_smoke(); void remove_skull_smoke(); @@ -37,7 +37,7 @@ namespace daObjEff { void remove_pinecone_smoke(); void remove_woodBox_smoke(); void remove(); - void _delete(); + BOOL _delete(); void die_barrel_smoke(); void die_stool_smoke(); void die_skull_smoke(); @@ -45,7 +45,7 @@ namespace daObjEff { void die_pinecone_smoke(); void die_woodBox_smoke(); void die(); - void _execute(); + BOOL _execute(); public: /* Place member variables here */ diff --git a/include/d/actor/d_a_obj_ekskz.h b/include/d/actor/d_a_obj_ekskz.h index 56c22e86..6af704c0 100644 --- a/include/d/actor/d_a_obj_ekskz.h +++ b/include/d/actor/d_a_obj_ekskz.h @@ -14,14 +14,14 @@ namespace daObjEkskz { void prm_get_swSave() const {} void CreateHeap(); - void Create(); + s32 Create(); void Mthd_Create(); - void Delete(); + BOOL Delete(); void Mthd_Delete(); void set_mtx(); void init_mtx(); void Execute(float(**)[3][4]); - void Draw(); + BOOL Draw(); public: /* 0x000 */ dBgS_MoveBgActor parent; diff --git a/include/d/actor/d_a_obj_eskban.h b/include/d/actor/d_a_obj_eskban.h index 749f1a95..4b6dcb93 100644 --- a/include/d/actor/d_a_obj_eskban.h +++ b/include/d/actor/d_a_obj_eskban.h @@ -9,9 +9,9 @@ namespace daObjEskban { void prm_get_swSave() const {} void CreateHeap(); - void Create(); + s32 Create(); void Mthd_Create(); - void Delete(); + BOOL Delete(); void Mthd_Delete(); void set_mtx(); void init_mtx(); @@ -19,7 +19,7 @@ namespace daObjEskban { void eff_b_break(unsigned short); void daObjEskban_effect_set(); void Execute(float(**)[3][4]); - void Draw(); + BOOL Draw(); public: /* Place member variables here */ diff --git a/include/d/actor/d_a_obj_ferris.h b/include/d/actor/d_a_obj_ferris.h index 3a0fae44..1e7588c9 100644 --- a/include/d/actor/d_a_obj_ferris.h +++ b/include/d/actor/d_a_obj_ferris.h @@ -14,8 +14,8 @@ namespace daObjFerris { void solidHeapCB(fopAc_ac_c*); void create_heap(); void ride_call_back(dBgW*, fopAc_ac_c*, fopAc_ac_c*); - void _create(); - void _delete(); + s32 _create(); + BOOL _delete(); void set_mtx(int); void init_mtx(); void now_event(short); @@ -25,8 +25,8 @@ namespace daObjFerris { void rot_mng(); void set_collision(); void make_lean(); - void _execute(); - void _draw(); + BOOL _execute(); + BOOL _draw(); public: /* Place member variables here */ diff --git a/include/d/actor/d_a_obj_figure.h b/include/d/actor/d_a_obj_figure.h index aafea5d7..0097a875 100644 --- a/include/d/actor/d_a_obj_figure.h +++ b/include/d/actor/d_a_obj_figure.h @@ -16,12 +16,12 @@ public: void isDispFigure() {} void setResFlag(unsigned char) {} - void _create(); + s32 _create(); void createHeap(); void createInit(); - void _delete(); - void _draw(); - void _execute(); + BOOL _delete(); + BOOL _draw(); + BOOL _execute(); void executeNormal(); void eventMove(); void privateCut(); diff --git a/include/d/actor/d_a_obj_firewall.h b/include/d/actor/d_a_obj_firewall.h index 62dfb75b..41cb02d2 100644 --- a/include/d/actor/d_a_obj_firewall.h +++ b/include/d/actor/d_a_obj_firewall.h @@ -20,8 +20,8 @@ public: void set_pl_se(); void setup_burn_up(); void setup_put_the_fire_out(); - void _create(); - void _delete(); + s32 _create(); + BOOL _delete(); void wait_act_proc(); void wait2_act_proc(); void wait3_act_proc(); @@ -29,8 +29,8 @@ public: void demo_end_wait_act_proc(); void burn_wait_act_proc(); void retire_act_proc(); - void _execute(); - void _draw(); + BOOL _execute(); + BOOL _draw(); public: /* Place member variables here */ diff --git a/include/d/actor/d_a_obj_flame.h b/include/d/actor/d_a_obj_flame.h index 7c0bd2ca..75b1ab2b 100644 --- a/include/d/actor/d_a_obj_flame.h +++ b/include/d/actor/d_a_obj_flame.h @@ -10,10 +10,10 @@ namespace daObjFlame { class Act_c : public fopAc_ac_c { public: - void _create() {} - void _delete() {} - void _draw() {} - void _execute() {} + inline s32 _create(); + inline BOOL _delete(); + inline BOOL _draw(); + inline BOOL _execute(); void _is_delete() {} void attr_base() const {} void attr_scl() const {} diff --git a/include/d/actor/d_a_obj_ftree.h b/include/d/actor/d_a_obj_ftree.h index dbdfc856..c135db88 100644 --- a/include/d/actor/d_a_obj_ftree.h +++ b/include/d/actor/d_a_obj_ftree.h @@ -77,11 +77,11 @@ namespace daObjFtree { void solidHeapCB(fopAc_ac_c*); void NodeCallBack_Effect(J3DNode*, int); void create_heap(); - void _create(); - void _delete(); + s32 _create(); + BOOL _delete(); void set_mtx(); - void _execute(); - void _draw(); + BOOL _execute(); + BOOL _draw(); public: /* 0x290 */ void* m290; diff --git a/include/d/actor/d_a_obj_gaship.h b/include/d/actor/d_a_obj_gaship.h index 5b4b46ae..874c73e1 100644 --- a/include/d/actor/d_a_obj_gaship.h +++ b/include/d/actor/d_a_obj_gaship.h @@ -9,11 +9,11 @@ namespace daObjGaship { void birth_flag(); void solidHeapCB(fopAc_ac_c*); void create_heap(); - void _create(); - void _delete(); + s32 _create(); + BOOL _delete(); void set_mtx(); - void _execute(); - void _draw(); + BOOL _execute(); + BOOL _draw(); public: /* Place member variables here */ diff --git a/include/d/actor/d_a_obj_gaship2.h b/include/d/actor/d_a_obj_gaship2.h index 344f9a10..1e5d556b 100644 --- a/include/d/actor/d_a_obj_gaship2.h +++ b/include/d/actor/d_a_obj_gaship2.h @@ -8,11 +8,11 @@ namespace daObjGaship2 { public: void solidHeapCB(fopAc_ac_c*); void create_heap(); - void _create(); - void _delete(); + s32 _create(); + BOOL _delete(); void set_mtx(); - void _execute(); - void _draw(); + BOOL _execute(); + BOOL _draw(); public: /* Place member variables here */ diff --git a/include/d/actor/d_a_obj_gnnbtltaki.h b/include/d/actor/d_a_obj_gnnbtltaki.h index 1bdeacbb..62d1dbc3 100644 --- a/include/d/actor/d_a_obj_gnnbtltaki.h +++ b/include/d/actor/d_a_obj_gnnbtltaki.h @@ -7,11 +7,11 @@ class daObjGnnbtaki_c : public fopAc_ac_c { public: void solidHeapCB(fopAc_ac_c*); void create_heap(); - void _create(); - void _delete(); + s32 _create(); + BOOL _delete(); void init_mtx(); - void _execute(); - void _draw(); + BOOL _execute(); + BOOL _draw(); public: /* Place member variables here */ diff --git a/include/d/actor/d_a_obj_gnndemotakie.h b/include/d/actor/d_a_obj_gnndemotakie.h index c62af77b..ddc13101 100644 --- a/include/d/actor/d_a_obj_gnndemotakie.h +++ b/include/d/actor/d_a_obj_gnndemotakie.h @@ -7,11 +7,11 @@ class daObjGnntakie_c : public fopAc_ac_c { public: void solidHeapCB(fopAc_ac_c*); void create_heap(); - void _create(); - void _delete(); + s32 _create(); + BOOL _delete(); void init_mtx(); - void _execute(); - void _draw(); + BOOL _execute(); + BOOL _draw(); public: /* Place member variables here */ diff --git a/include/d/actor/d_a_obj_gnndemotakis.h b/include/d/actor/d_a_obj_gnndemotakis.h index be874af0..e8de8610 100644 --- a/include/d/actor/d_a_obj_gnndemotakis.h +++ b/include/d/actor/d_a_obj_gnndemotakis.h @@ -7,11 +7,11 @@ class daObjGnntakis_c : public fopAc_ac_c { public: void solidHeapCB(fopAc_ac_c*); void create_heap(); - void _create(); - void _delete(); + s32 _create(); + BOOL _delete(); void init_mtx(); - void _execute(); - void _draw(); + BOOL _execute(); + BOOL _draw(); public: /* Place member variables here */ diff --git a/include/d/actor/d_a_obj_gryw00.h b/include/d/actor/d_a_obj_gryw00.h index 476a4ab4..b8af598f 100644 --- a/include/d/actor/d_a_obj_gryw00.h +++ b/include/d/actor/d_a_obj_gryw00.h @@ -14,9 +14,9 @@ public: void particle_delete(); void set_se(); void CreateHeap(); - void Create(); + s32 Create(); void Mthd_Create(); - void Delete(); + BOOL Delete(); void Mthd_Delete(); void switch_wait_act_proc(); void spread_water_face_act_proc(); @@ -24,7 +24,7 @@ public: void anime_loop_start_wait_act_proc(); void high_water_level_act_proc(); void Execute(float(**)[3][4]); - void Draw(); + BOOL Draw(); public: /* Place member variables here */ diff --git a/include/d/actor/d_a_obj_gtaki.h b/include/d/actor/d_a_obj_gtaki.h index 0e049ef6..ff517609 100644 --- a/include/d/actor/d_a_obj_gtaki.h +++ b/include/d/actor/d_a_obj_gtaki.h @@ -5,10 +5,10 @@ class daObjGtaki_c : public fopAc_ac_c { public: - void _create() {} - void _delete() {} - void _draw() {} - void _execute() {} + inline s32 _create(); + inline BOOL _delete(); + inline BOOL _draw(); + inline BOOL _execute(); void set_effect() {} void setDummyTexture(); diff --git a/include/d/actor/d_a_obj_hami2.h b/include/d/actor/d_a_obj_hami2.h index 56f2062d..cd7a6b77 100644 --- a/include/d/actor/d_a_obj_hami2.h +++ b/include/d/actor/d_a_obj_hami2.h @@ -9,9 +9,9 @@ namespace daObjHami2 { void prm_get_swSave() const {} void CreateHeap(); - void Create(); + s32 Create(); void Mthd_Create(); - void Delete(); + BOOL Delete(); void Mthd_Delete(); void set_mtx(); void init_mtx(); @@ -22,7 +22,7 @@ namespace daObjHami2 { void daObjHami2_close_demo_wait(); void daObjHami2_close_demo(); void Execute(float(**)[3][4]); - void Draw(); + BOOL Draw(); public: /* Place member variables here */ diff --git a/include/d/actor/d_a_obj_hami3.h b/include/d/actor/d_a_obj_hami3.h index 4e7e3bea..3a767750 100644 --- a/include/d/actor/d_a_obj_hami3.h +++ b/include/d/actor/d_a_obj_hami3.h @@ -11,9 +11,9 @@ namespace daObjHami3 { void prm_get_swSave2() const {} void CreateHeap(); - void Create(); + s32 Create(); void Mthd_Create(); - void Delete(); + BOOL Delete(); void Mthd_Delete(); void set_mtx(); void init_mtx(); @@ -24,7 +24,7 @@ namespace daObjHami3 { void daObjHami3_close_demo_wait(); void daObjHami3_close_demo(); void Execute(float(**)[3][4]); - void Draw(); + BOOL Draw(); public: /* Place member variables here */ diff --git a/include/d/actor/d_a_obj_hami4.h b/include/d/actor/d_a_obj_hami4.h index da2416b1..a459cc41 100644 --- a/include/d/actor/d_a_obj_hami4.h +++ b/include/d/actor/d_a_obj_hami4.h @@ -5,10 +5,10 @@ class daObjHami4_c : public fopAc_ac_c { public: - void _create() {} - void _delete() {} - void _draw() {} - void _execute() {} + inline s32 _create(); + inline BOOL _delete(); + inline BOOL _draw(); + inline BOOL _execute(); void prm_get_swSave() const {} void CreateHeap(); diff --git a/include/d/actor/d_a_obj_hat.h b/include/d/actor/d_a_obj_hat.h index 7938e0cd..f19aa8e0 100644 --- a/include/d/actor/d_a_obj_hat.h +++ b/include/d/actor/d_a_obj_hat.h @@ -5,12 +5,12 @@ class daObjHat_c : public fopAc_ac_c { public: - void _create(); + s32 _create(); void createHeap(); void createInit(); - void _delete(); - void _draw(); - void _execute(); + BOOL _delete(); + BOOL _draw(); + BOOL _execute(); void executeNormal(); void getPrmHatNo(); void setMtx(); diff --git a/include/d/actor/d_a_obj_hbrf1.h b/include/d/actor/d_a_obj_hbrf1.h index 722cd465..3fc08e1c 100644 --- a/include/d/actor/d_a_obj_hbrf1.h +++ b/include/d/actor/d_a_obj_hbrf1.h @@ -11,9 +11,9 @@ namespace daObjHbrf1 { void prm_get_swSave() const {} void CreateHeap(); - void Create(); + s32 Create(); void Mthd_Create(); - void Delete(); + BOOL Delete(); void Mthd_Delete(); void set_mtx(); void init_mtx(); @@ -26,7 +26,7 @@ namespace daObjHbrf1 { void daObjHbrf1_down_demo_timer(); void daObjHbrf1_down_demo(); void Execute(float(**)[3][4]); - void Draw(); + BOOL Draw(); public: /* Place member variables here */ diff --git a/include/d/actor/d_a_obj_hcbh.h b/include/d/actor/d_a_obj_hcbh.h index 78661fa9..525b10ca 100644 --- a/include/d/actor/d_a_obj_hcbh.h +++ b/include/d/actor/d_a_obj_hcbh.h @@ -21,12 +21,12 @@ public: void co_hitCallback(fopAc_ac_c*, dCcD_GObjInf*, fopAc_ac_c*, dCcD_GObjInf*); void particle_set(); void make_item(); - void _create(); - void _delete(); + s32 _create(); + BOOL _delete(); void wait_act_proc(); void fall_act_proc(); - void _execute(); - void _draw(); + BOOL _execute(); + BOOL _draw(); public: /* Place member variables here */ diff --git a/include/d/actor/d_a_obj_hha.h b/include/d/actor/d_a_obj_hha.h index 24a25f9b..5ce63ce8 100644 --- a/include/d/actor/d_a_obj_hha.h +++ b/include/d/actor/d_a_obj_hha.h @@ -9,8 +9,8 @@ public: void solidHeapCB(fopAc_ac_c*); void create_heap(); - void _create(); - void _delete(); + s32 _create(); + BOOL _delete(); void set_tex(float, float, int); void init_mtx(); void init_co(); @@ -21,8 +21,8 @@ public: void water_manager(); void part_manager(); void ygush_manager(); - void _execute(); - void _draw(); + BOOL _execute(); + BOOL _draw(); public: /* Place member variables here */ diff --git a/include/d/actor/d_a_obj_hlift.h b/include/d/actor/d_a_obj_hlift.h index 02a8e59f..ebad7a15 100644 --- a/include/d/actor/d_a_obj_hlift.h +++ b/include/d/actor/d_a_obj_hlift.h @@ -12,9 +12,9 @@ namespace daObjHlift { void prm_get_swSave() const {} void CreateHeap(); - void Create(); + s32 Create(); void Mthd_Create(); - void Delete(); + BOOL Delete(); void Mthd_Delete(); void mode_lower_init(); void mode_lower(); @@ -34,7 +34,7 @@ namespace daObjHlift { void chk_demo_end(); void se_whole(); void Execute(float(**)[3][4]); - void Draw(); + BOOL Draw(); public: /* Place member variables here */ diff --git a/include/d/actor/d_a_obj_homen.h b/include/d/actor/d_a_obj_homen.h index a8eb3a73..4a0c3a35 100644 --- a/include/d/actor/d_a_obj_homen.h +++ b/include/d/actor/d_a_obj_homen.h @@ -16,8 +16,8 @@ namespace daObjHomen { void solidHeapCB(fopAc_ac_c*); void create_heap(); - void _create(); - void _delete(); + s32 _create(); + BOOL _delete(); void set_mtx(); void init_mtx(); void exe_event(); @@ -42,8 +42,8 @@ namespace daObjHomen { void set_co_collision(); void set_at_collision(); void adjust_hookshot(); - void _execute(); - void _draw(); + BOOL _execute(); + BOOL _draw(); public: /* Place member variables here */ diff --git a/include/d/actor/d_a_obj_hsehi1.h b/include/d/actor/d_a_obj_hsehi1.h index e0752aad..276d6b3b 100644 --- a/include/d/actor/d_a_obj_hsehi1.h +++ b/include/d/actor/d_a_obj_hsehi1.h @@ -29,7 +29,7 @@ public: void drawStart(); void setBaseMtx(); void createHeap(); - void create(); + s32 create(); void init(); void action(void*); void setAction(int (daObj_hsh_c::*)(void*), void*); @@ -59,8 +59,8 @@ public: void talk(int); void getMsg(); void next_msgStatus(unsigned long*); - void execute(); - void draw(); + BOOL execute(); + BOOL draw(); public: /* Place member variables here */ diff --git a/include/d/actor/d_a_obj_ice.h b/include/d/actor/d_a_obj_ice.h index c083d3b7..fe4d1f35 100644 --- a/include/d/actor/d_a_obj_ice.h +++ b/include/d/actor/d_a_obj_ice.h @@ -16,12 +16,12 @@ public: void solidHeapCB(fopAc_ac_c*); void create_heap(); void tg_hitCallback(fopAc_ac_c*, dCcD_GObjInf*, fopAc_ac_c*, dCcD_GObjInf*); - void _create(); - void _delete(); + s32 _create(); + BOOL _delete(); void wait_act_proc(); void fade_out_retire_act_proc(); - void _execute(); - void _draw(); + BOOL _execute(); + BOOL _draw(); public: /* Place member variables here */ diff --git a/include/d/actor/d_a_obj_iceisland.h b/include/d/actor/d_a_obj_iceisland.h index 6ec323ce..19c7065f 100644 --- a/include/d/actor/d_a_obj_iceisland.h +++ b/include/d/actor/d_a_obj_iceisland.h @@ -5,10 +5,10 @@ class daObjIceisland_c : public fopAc_ac_c { public: - void _create() {} - void _delete() {} - void _draw() {} - void _execute() {} + inline s32 _create(); + inline BOOL _delete(); + inline BOOL _draw(); + inline BOOL _execute(); void CreateHeap(); void daObjIceisland_particle_set(); diff --git a/include/d/actor/d_a_obj_ikada.h b/include/d/actor/d_a_obj_ikada.h index b627f24e..9a234e15 100644 --- a/include/d/actor/d_a_obj_ikada.h +++ b/include/d/actor/d_a_obj_ikada.h @@ -69,14 +69,14 @@ public: void modeStopBombTerryInit(); void modeStopBombTerry(); void epProc(); - void _execute(); + BOOL _execute(); void debugDraw(); - void _draw(); + BOOL _draw(); void getArg(); void createInit(); void _createHeap(); - void _create(); - void _delete(); + s32 _create(); + BOOL _delete(); public: /* 0x0290 */ u32 mType; diff --git a/include/d/actor/d_a_obj_jump.h b/include/d/actor/d_a_obj_jump.h index 19eaa891..a78475a0 100644 --- a/include/d/actor/d_a_obj_jump.h +++ b/include/d/actor/d_a_obj_jump.h @@ -20,9 +20,9 @@ namespace daObjJump { void prm_get_type() const {} void CreateHeap(); - void Create(); + s32 Create(); void Mthd_Create(); - void Delete(); + BOOL Delete(); void Mthd_Delete(); void set_mtx(); void init_mtx(); @@ -44,7 +44,7 @@ namespace daObjJump { void mode_u_w_init(); void mode_u_w(); void Execute(float(**)[3][4]); - void Draw(); + BOOL Draw(); public: /* 0x290 */ u8 m290[0x336 - 0x290]; diff --git a/include/d/actor/d_a_obj_kanat.h b/include/d/actor/d_a_obj_kanat.h index 5c96b10d..39492ebd 100644 --- a/include/d/actor/d_a_obj_kanat.h +++ b/include/d/actor/d_a_obj_kanat.h @@ -9,14 +9,14 @@ namespace daObjKanat { void prm_get_swSave() const {} void CreateHeap(); - void Create(); + s32 Create(); void Mthd_Create(); - void Delete(); + BOOL Delete(); void Mthd_Delete(); void set_mtx(); void init_mtx(); void Execute(float(**)[3][4]); - void Draw(); + BOOL Draw(); public: /* Place member variables here */ diff --git a/include/d/actor/d_a_obj_kanoke.h b/include/d/actor/d_a_obj_kanoke.h index 5d781e0b..cd552d02 100644 --- a/include/d/actor/d_a_obj_kanoke.h +++ b/include/d/actor/d_a_obj_kanoke.h @@ -5,12 +5,12 @@ class daObjKanoke_c : public fopAc_ac_c { public: - void _create(); + s32 _create(); void createHeap(); void createInit(); - void _delete(); - void _draw(); - void _execute(); + BOOL _delete(); + BOOL _draw(); + BOOL _execute(); void executeNormal(); void executeYureYoko(); void executeOpenYoko(); diff --git a/include/d/actor/d_a_obj_ladder.h b/include/d/actor/d_a_obj_ladder.h index 60492903..1be60b9d 100644 --- a/include/d/actor/d_a_obj_ladder.h +++ b/include/d/actor/d_a_obj_ladder.h @@ -11,9 +11,9 @@ namespace daObjLadder { void prm_get_type() const {} void CreateHeap(); - void Create(); + s32 Create(); void Mthd_Create(); - void Delete(); + BOOL Delete(); void Mthd_Delete(); void demo_end_reset(); void mode_wait_init(); @@ -29,7 +29,7 @@ namespace daObjLadder { void set_mtx(); void init_mtx(); void Execute(float(**)[3][4]); - void Draw(); + BOOL Draw(); public: /* Place member variables here */ diff --git a/include/d/actor/d_a_obj_leaves.h b/include/d/actor/d_a_obj_leaves.h index 194942f5..83b23438 100644 --- a/include/d/actor/d_a_obj_leaves.h +++ b/include/d/actor/d_a_obj_leaves.h @@ -17,14 +17,14 @@ public: void solidHeapCB(fopAc_ac_c*); void create_heap(); void tg_hitCallback(fopAc_ac_c*, dCcD_GObjInf*, fopAc_ac_c*, dCcD_GObjInf*); - void _create(); - void _delete(); + s32 _create(); + BOOL _delete(); void wait_proc(); void alpha_calc_start_wait_proc(); void item_set_wait_proc(); void retire_wait_proc(); - void _execute(); - void _draw(); + BOOL _execute(); + BOOL _draw(); public: /* Place member variables here */ diff --git a/include/d/actor/d_a_obj_light.h b/include/d/actor/d_a_obj_light.h index 30355af6..5de5b30f 100644 --- a/include/d/actor/d_a_obj_light.h +++ b/include/d/actor/d_a_obj_light.h @@ -10,8 +10,8 @@ namespace daObjLight { void create_heap(); void init_collision(); void set_collision(); - void _create(); - void _delete(); + s32 _create(); + BOOL _delete(); void set_fire(int); void draw_fire(); void exe_fire(); @@ -23,8 +23,8 @@ namespace daObjLight { void renew_angle(); void control_light(); void control_treasure(); - void _execute(); - void _draw(); + BOOL _execute(); + BOOL _draw(); public: /* Place member variables here */ diff --git a/include/d/actor/d_a_obj_lpalm.h b/include/d/actor/d_a_obj_lpalm.h index d9408010..4f8ef848 100644 --- a/include/d/actor/d_a_obj_lpalm.h +++ b/include/d/actor/d_a_obj_lpalm.h @@ -7,10 +7,10 @@ class daObjLpalm_c : public fopAc_ac_c { public: - void _create() {} - void _delete() {} - void _draw() {} - void _execute() {} + inline s32 _create(); + inline BOOL _delete(); + inline BOOL _draw(); + inline BOOL _execute(); void attr() const {} void set_mtx() {} diff --git a/include/d/actor/d_a_obj_magmarock.h b/include/d/actor/d_a_obj_magmarock.h index d9d3880e..357a6ed0 100644 --- a/include/d/actor/d_a_obj_magmarock.h +++ b/include/d/actor/d_a_obj_magmarock.h @@ -7,10 +7,10 @@ namespace daObjMagmarock { class Act_c : public fopAc_ac_c { public: void MeltDownRequest() {} - void _create() {} - void _delete() {} - void _draw() {} - void _execute() {} + inline s32 _create(); + inline BOOL _delete(); + inline BOOL _draw(); + inline BOOL _execute(); void checkProcess(void (daObjMagmarock::Act_c::*)()) {} void setProcess(void (daObjMagmarock::Act_c::*)()) {} diff --git a/include/d/actor/d_a_obj_majyuu_door.h b/include/d/actor/d_a_obj_majyuu_door.h index a39ee89b..a5e97ea5 100644 --- a/include/d/actor/d_a_obj_majyuu_door.h +++ b/include/d/actor/d_a_obj_majyuu_door.h @@ -11,16 +11,16 @@ public: void _createHeap(); void getArg(); void CreateInit(); - void _create(); - void _delete(); + s32 _create(); + BOOL _delete(); void setCollision(); void modeWaitInit(); void modeWait(); void smoke_set(); void modeDeleteInit(); void modeDelete(); - void _execute(); - void _draw(); + BOOL _execute(); + BOOL _draw(); public: /* Place member variables here */ diff --git a/include/d/actor/d_a_obj_mkie.h b/include/d/actor/d_a_obj_mkie.h index bd8317fe..b3e36584 100644 --- a/include/d/actor/d_a_obj_mkie.h +++ b/include/d/actor/d_a_obj_mkie.h @@ -23,9 +23,9 @@ namespace daObjMkie { void CreateHeap(); void init_cc(); void set_cc_pos(); - void Create(); + s32 Create(); void Mthd_Create(); - void Delete(); + BOOL Delete(); void Mthd_Delete(); void set_mtx(); void init_mtx(); @@ -41,7 +41,7 @@ namespace daObjMkie { void mode_demo(); void mode_proc_call(); void Execute(float(**)[3][4]); - void Draw(); + BOOL Draw(); public: /* 0x290 */ u8 m290[0xF58 - 0x290]; diff --git a/include/d/actor/d_a_obj_mkiek.h b/include/d/actor/d_a_obj_mkiek.h index 8652ded6..4d89450b 100644 --- a/include/d/actor/d_a_obj_mkiek.h +++ b/include/d/actor/d_a_obj_mkiek.h @@ -10,9 +10,9 @@ namespace daObjMkiek { void prm_get_swSave() const {} void CreateHeap(); - void Create(); + s32 Create(); void Mthd_Create(); - void Delete(); + BOOL Delete(); void Mthd_Delete(); void set_mtx(); void init_mtx(); @@ -20,7 +20,7 @@ namespace daObjMkiek { void demo_wait(); void demo(); void Execute(float(**)[3][4]); - void Draw(); + BOOL Draw(); public: /* Place member variables here */ diff --git a/include/d/actor/d_a_obj_mmrr.h b/include/d/actor/d_a_obj_mmrr.h index d0cf1357..2eda0eb9 100644 --- a/include/d/actor/d_a_obj_mmrr.h +++ b/include/d/actor/d_a_obj_mmrr.h @@ -17,16 +17,16 @@ namespace daObjMmrr { void set_cc_rec_pos(); void set_cc_trans_pos(); void set_cull(); - void _create(); - void _delete(); + s32 _create(); + BOOL _delete(); void set_mtx(); void init_mtx(); void chk_light(); void eff_start(); void eff_stop(); void eff_remove(); - void _execute(); - void _draw(); + BOOL _execute(); + BOOL _draw(); public: /* 0x290 */ u8 m290[0xBF8 - 0x290]; diff --git a/include/d/actor/d_a_obj_msdan_sub.h b/include/d/actor/d_a_obj_msdan_sub.h index a5f4d24e..8c595227 100644 --- a/include/d/actor/d_a_obj_msdan_sub.h +++ b/include/d/actor/d_a_obj_msdan_sub.h @@ -11,14 +11,14 @@ namespace daObjMsdanSub { void prm_get_swSave() const {} void CreateHeap(); - void Create(); + s32 Create(); void Mthd_Create(); - void Delete(); + BOOL Delete(); void Mthd_Delete(); void set_mtx(); void init_mtx(); void Execute(float(**)[3][4]); - void Draw(); + BOOL Draw(); public: /* Place member variables here */ diff --git a/include/d/actor/d_a_obj_msdan_sub2.h b/include/d/actor/d_a_obj_msdan_sub2.h index c124d94a..84565949 100644 --- a/include/d/actor/d_a_obj_msdan_sub2.h +++ b/include/d/actor/d_a_obj_msdan_sub2.h @@ -10,14 +10,14 @@ namespace daObjMsdanSub2 { void prm_get_swSave() const {} void CreateHeap(); - void Create(); + s32 Create(); void Mthd_Create(); - void Delete(); + BOOL Delete(); void Mthd_Delete(); void set_mtx(); void init_mtx(); void Execute(float(**)[3][4]); - void Draw(); + BOOL Draw(); public: /* Place member variables here */ diff --git a/include/d/actor/d_a_obj_mshokki.h b/include/d/actor/d_a_obj_mshokki.h index b16d5c62..5657503e 100644 --- a/include/d/actor/d_a_obj_mshokki.h +++ b/include/d/actor/d_a_obj_mshokki.h @@ -15,10 +15,10 @@ public: void co_hitCallback(fopAc_ac_c*, dCcD_GObjInf*, fopAc_ac_c*, dCcD_GObjInf*); void break_proc(); void set_se(); - void _create(); - void _delete(); - void _execute(); - void _draw(); + s32 _create(); + BOOL _delete(); + BOOL _execute(); + BOOL _draw(); public: /* Place member variables here */ diff --git a/include/d/actor/d_a_obj_mtest.h b/include/d/actor/d_a_obj_mtest.h index 187b53ec..3e624092 100644 --- a/include/d/actor/d_a_obj_mtest.h +++ b/include/d/actor/d_a_obj_mtest.h @@ -13,14 +13,14 @@ namespace daObjMtest { void chk_appear(); void CreateHeap(); - void Create(); + s32 Create(); void Mthd_Create(); - void Delete(); + BOOL Delete(); void Mthd_Delete(); void set_mtx(); void init_mtx(); void Execute(float(**)[3][4]); - void Draw(); + BOOL Draw(); public: /* Place member variables here */ diff --git a/include/d/actor/d_a_obj_nest.h b/include/d/actor/d_a_obj_nest.h index adbba0c2..ae03180d 100644 --- a/include/d/actor/d_a_obj_nest.h +++ b/include/d/actor/d_a_obj_nest.h @@ -8,9 +8,9 @@ namespace daObjNest { class Act_c : public fopAc_ac_c { public: void CreateHeap(); - void Create(); + s32 Create(); void Mthd_Create(); - void Delete(); + BOOL Delete(); void Mthd_Delete(); void set_mtx(); void init_mtx(); @@ -18,7 +18,7 @@ namespace daObjNest { void vib_set(float); void vib_proc(); void Execute(float(**)[3][4]); - void Draw(); + BOOL Draw(); public: /* Place member variables here */ diff --git a/include/d/actor/d_a_obj_ohatch.h b/include/d/actor/d_a_obj_ohatch.h index 9456175f..f05a3984 100644 --- a/include/d/actor/d_a_obj_ohatch.h +++ b/include/d/actor/d_a_obj_ohatch.h @@ -11,15 +11,15 @@ public: void init_mtx(); void solidHeapCB(fopAc_ac_c*); void create_heap(); - void _create(); - void _delete(); + s32 _create(); + BOOL _delete(); void close_wait_act_proc(); void tremor_act_proc(); void open_act_proc(); void vibrate_act_proc(); void open_wait_act_proc(); - void _execute(); - void _draw(); + BOOL _execute(); + BOOL _draw(); public: /* Place member variables here */ diff --git a/include/d/actor/d_a_obj_ojtree.h b/include/d/actor/d_a_obj_ojtree.h index df0adb28..d65ba030 100644 --- a/include/d/actor/d_a_obj_ojtree.h +++ b/include/d/actor/d_a_obj_ojtree.h @@ -7,14 +7,14 @@ namespace daObjOjtree { class Act_c : public fopAc_ac_c { public: void CreateHeap(); - void Create(); + s32 Create(); void Mthd_Create(); - void Delete(); + BOOL Delete(); void Mthd_Delete(); void set_mtx(); void init_mtx(); void Execute(float(**)[3][4]); - void Draw(); + BOOL Draw(); public: /* Place member variables here */ diff --git a/include/d/actor/d_a_obj_ospbox.h b/include/d/actor/d_a_obj_ospbox.h index 55866118..8c815b28 100644 --- a/include/d/actor/d_a_obj_ospbox.h +++ b/include/d/actor/d_a_obj_ospbox.h @@ -10,9 +10,9 @@ namespace daObjOspbox { void prm_get_spec() const {} void CreateHeap(); - void Create(); + s32 Create(); void Mthd_Create(); - void Delete(); + BOOL Delete(); void Mthd_Delete(); void set_mtx(); void init_mtx(); @@ -22,7 +22,7 @@ namespace daObjOspbox { void set_ground(); void init_ground(); void Execute(float(**)[3][4]); - void Draw(); + BOOL Draw(); public: /* Place member variables here */ diff --git a/include/d/actor/d_a_obj_otble.h b/include/d/actor/d_a_obj_otble.h index c99118f6..7e766cfc 100644 --- a/include/d/actor/d_a_obj_otble.h +++ b/include/d/actor/d_a_obj_otble.h @@ -6,13 +6,13 @@ namespace daObj_Otble { class Act_c : public fopAc_ac_c { public: - void _create() {} - void _delete() {} + inline s32 _create(); + inline BOOL _delete(); void attr() const {} void set_mtx(); - void _execute(); - void _draw(); + BOOL _execute(); + BOOL _draw(); void _createHeap(); void CreateInit(); diff --git a/include/d/actor/d_a_obj_pbco.h b/include/d/actor/d_a_obj_pbco.h index 80faff1c..465da043 100644 --- a/include/d/actor/d_a_obj_pbco.h +++ b/include/d/actor/d_a_obj_pbco.h @@ -5,10 +5,10 @@ class daObj_Pbco_c : public fopAc_ac_c { public: - void _create() {} - void _delete() {} - void _draw() {} - void _execute() {} + inline s32 _create(); + inline BOOL _delete(); + inline BOOL _draw(); + inline BOOL _execute(); void set_mtx(); void CreateHeap(); diff --git a/include/d/actor/d_a_obj_pbka.h b/include/d/actor/d_a_obj_pbka.h index 8ede2711..1a8912b4 100644 --- a/include/d/actor/d_a_obj_pbka.h +++ b/include/d/actor/d_a_obj_pbka.h @@ -5,10 +5,10 @@ class daObjPbka_c : public fopAc_ac_c { public: - void _create() {} - void _delete() {} - void _draw() {} - void _execute() {} + inline s32 _create(); + inline BOOL _delete(); + inline BOOL _draw(); + inline BOOL _execute(); void CreateInit(); void set_mtx(); diff --git a/include/d/actor/d_a_obj_pfall.h b/include/d/actor/d_a_obj_pfall.h index cf154b9e..60fd7fe6 100644 --- a/include/d/actor/d_a_obj_pfall.h +++ b/include/d/actor/d_a_obj_pfall.h @@ -12,8 +12,8 @@ public: void set_mtx(); void CreateHeap(); void CreateInit(); - void _create(); - void _delete(); + s32 _create(); + BOOL _delete(); void cutProc(); void cutWaitStart(int); void cutWaitProc(int); @@ -26,9 +26,9 @@ public: void mode_event_init(); void mode_event(); void mode_proc_call(); - void _execute(); + BOOL _execute(); void nz_draw(); - void _draw(); + BOOL _draw(); public: /* 0x290 */ void* m290; diff --git a/include/d/actor/d_a_obj_pirateship.h b/include/d/actor/d_a_obj_pirateship.h index a8252658..806fa402 100644 --- a/include/d/actor/d_a_obj_pirateship.h +++ b/include/d/actor/d_a_obj_pirateship.h @@ -6,10 +6,10 @@ namespace daObjPirateship { class Act_c : public fopAc_ac_c { public: - void _create() {} - void _delete() {} - void _draw() {} - void _execute() {} + inline s32 _create(); + inline BOOL _delete(); + inline BOOL _draw(); + inline BOOL _execute(); void getKajiID() {} void set_mtx(); @@ -20,10 +20,10 @@ namespace daObjPirateship { void CreateWave(); void SetWave(); void DeleteWave(); - void Create(); + s32 Create(); void Execute(float(**)[3][4]); - void Draw(); - void Delete(); + BOOL Draw(); + BOOL Delete(); void demo_move(); public: diff --git a/include/d/actor/d_a_obj_plant.h b/include/d/actor/d_a_obj_plant.h index 4f4df638..18c1311f 100644 --- a/include/d/actor/d_a_obj_plant.h +++ b/include/d/actor/d_a_obj_plant.h @@ -5,10 +5,10 @@ class daObjPlant_c : public fopAc_ac_c { public: - void _create() {} - void _delete() {} - void _draw() {} - void _execute() {} + inline s32 _create(); + inline BOOL _delete(); + inline BOOL _draw(); + inline BOOL _execute(); void CreateHeap(); void CreateInit(); diff --git a/include/d/actor/d_a_obj_quake.h b/include/d/actor/d_a_obj_quake.h index 1577561f..4d313ae5 100644 --- a/include/d/actor/d_a_obj_quake.h +++ b/include/d/actor/d_a_obj_quake.h @@ -5,10 +5,10 @@ class daObjQuake_c : public fopAc_ac_c { public: - void _create(); - void _delete(); + s32 _create(); + BOOL _delete(); void _is_delete(); - void _execute(); + BOOL _execute(); void getPrmType(); void getPrmSch(); void getPrmPower(); diff --git a/include/d/actor/d_a_obj_rcloud.h b/include/d/actor/d_a_obj_rcloud.h index 87f8bafc..e44d5e47 100644 --- a/include/d/actor/d_a_obj_rcloud.h +++ b/include/d/actor/d_a_obj_rcloud.h @@ -12,15 +12,15 @@ public: void init_mtx(); void solidHeapCB(fopAc_ac_c*); void create_heap(); - void _create(); - void _delete(); + s32 _create(); + BOOL _delete(); void wait_act_proc(); void clouds_lift_start_wait_act_proc(); void clouds_lift_act_proc(); void setup_action(int); - void _execute(); + BOOL _execute(); void setTexMtx(); - void _draw(); + BOOL _draw(); public: /* 0x290 */ request_of_phase_process_class mPhsBVkumo; diff --git a/include/d/actor/d_a_obj_rflw.h b/include/d/actor/d_a_obj_rflw.h index 54d3d990..3932eace 100644 --- a/include/d/actor/d_a_obj_rflw.h +++ b/include/d/actor/d_a_obj_rflw.h @@ -5,10 +5,10 @@ class daObjRflw_c : public fopAc_ac_c { public: - void _create() {} - void _delete() {} - void _draw() {} - void _execute() {} + inline s32 _create(); + inline BOOL _delete(); + inline BOOL _draw(); + inline BOOL _execute(); void CreateHeap(); void CreateInit(); diff --git a/include/d/actor/d_a_obj_rforce.h b/include/d/actor/d_a_obj_rforce.h index 85665c74..2722b55f 100644 --- a/include/d/actor/d_a_obj_rforce.h +++ b/include/d/actor/d_a_obj_rforce.h @@ -8,11 +8,11 @@ namespace daObjRforce { public: void solidHeapCB(fopAc_ac_c*); void create_heap(); - void _create(); - void _delete(); + s32 _create(); + BOOL _delete(); void set_mtx(); - void _execute(); - void _draw(); + BOOL _execute(); + BOOL _draw(); public: /* Place member variables here */ diff --git a/include/d/actor/d_a_obj_roten.h b/include/d/actor/d_a_obj_roten.h index ce8add7c..e1ce58b7 100644 --- a/include/d/actor/d_a_obj_roten.h +++ b/include/d/actor/d_a_obj_roten.h @@ -5,10 +5,10 @@ class daObj_Roten_c : public fopAc_ac_c { public: - void _create() {} - void _delete() {} - void _draw() {} - void _execute() {} + inline s32 _create(); + inline BOOL _delete(); + inline BOOL _draw(); + inline BOOL _execute(); void set_mtx(); void CreateHeap(); diff --git a/include/d/actor/d_a_obj_search.h b/include/d/actor/d_a_obj_search.h index 9e2eb34a..2d09dbc4 100644 --- a/include/d/actor/d_a_obj_search.h +++ b/include/d/actor/d_a_obj_search.h @@ -38,9 +38,9 @@ namespace daObj_Search { void attr() const; void SetArgData(); void CreateInit(); - void _create(); + s32 _create(); void smoke_set(float, int); - void _execute(); + BOOL _execute(); void check_bk_control(); void set_mtx_base(); void set_mtx_light_A(); @@ -52,9 +52,9 @@ namespace daObj_Search { void player_check(); void set_path_info(); void is_path_info(); - void _draw(); - void _delete(); - void _isdelete(); + BOOL _draw(); + BOOL _delete(); + BOOL _isdelete(); public: /* Place member variables here */ diff --git a/include/d/actor/d_a_obj_shelf.h b/include/d/actor/d_a_obj_shelf.h index 6e788a41..98a47069 100644 --- a/include/d/actor/d_a_obj_shelf.h +++ b/include/d/actor/d_a_obj_shelf.h @@ -9,9 +9,9 @@ namespace daObjShelf { void prm_get_groundma() const {} void CreateHeap(); - void Create(); + s32 Create(); void Mthd_Create(); - void Delete(); + BOOL Delete(); void Mthd_Delete(); void hold_event() const; void mode_wait_init(); @@ -27,7 +27,7 @@ namespace daObjShelf { void set_mtx(); void init_mtx(); void Execute(float(**)[3][4]); - void Draw(); + BOOL Draw(); public: /* Place member variables here */ diff --git a/include/d/actor/d_a_obj_shmrgrd.h b/include/d/actor/d_a_obj_shmrgrd.h index 7cf58af8..17766588 100644 --- a/include/d/actor/d_a_obj_shmrgrd.h +++ b/include/d/actor/d_a_obj_shmrgrd.h @@ -13,8 +13,8 @@ public: void solidHeapCB(fopAc_ac_c*); void create_heap(); - void _create(); - void _delete(); + s32 _create(); + BOOL _delete(); void search_target_next(daObjShmrgrd_c*); void register_list(); void leave_list(); @@ -37,8 +37,8 @@ public: void mode_u_l(); void mode_lower_init(); void mode_lower(); - void _execute(); - void _draw(); + BOOL _execute(); + BOOL _draw(); public: /* Place member variables here */ diff --git a/include/d/actor/d_a_obj_smplbg.h b/include/d/actor/d_a_obj_smplbg.h index 5f2c54a5..960b0a78 100644 --- a/include/d/actor/d_a_obj_smplbg.h +++ b/include/d/actor/d_a_obj_smplbg.h @@ -13,15 +13,15 @@ namespace daObjSmplbg { void prm_get_type() const {} void CreateHeap(); - void Create(); + s32 Create(); void Mthd_Create(); - void Delete(); + BOOL Delete(); void Mthd_Delete(); void set_mtx(); void init_mtx(); void exec_qtkhd(); void Execute(float(**)[3][4]); - void Draw(); + BOOL Draw(); public: /* Place member variables here */ diff --git a/include/d/actor/d_a_obj_stair.h b/include/d/actor/d_a_obj_stair.h index 3db7e353..b183d018 100644 --- a/include/d/actor/d_a_obj_stair.h +++ b/include/d/actor/d_a_obj_stair.h @@ -5,17 +5,17 @@ class daObj_Stair_c : public fopAc_ac_c { public: - void _create() {} - void _delete() {} - void _draw() {} - void _execute() {} + inline s32 _create(); + inline BOOL _delete(); + inline BOOL _draw(); + inline BOOL _execute(); void set_mtx() {} void CreateHeap(); - void Create(); + s32 Create(); void Execute(float(**)[3][4]); - void Draw(); - void Delete(); + BOOL Draw(); + BOOL Delete(); public: /* Place member variables here */ diff --git a/include/d/actor/d_a_obj_swflat.h b/include/d/actor/d_a_obj_swflat.h index b407a610..4360711e 100644 --- a/include/d/actor/d_a_obj_swflat.h +++ b/include/d/actor/d_a_obj_swflat.h @@ -11,15 +11,15 @@ namespace daObjSwflat { void prmGetType() const {} void CreateHeap(); - void Create(); + s32 Create(); void Mthd_Create(); - void Delete(); + BOOL Delete(); void Mthd_Delete(); void set_mtx(); void init_mtx(); void Execute(float(**)[3][4]); - void Draw(); - void IsDelete(); + BOOL Draw(); + BOOL IsDelete(); public: /* Place member variables here */ diff --git a/include/d/actor/d_a_obj_swhammer.h b/include/d/actor/d_a_obj_swhammer.h index a1a4aead..8efb5f70 100644 --- a/include/d/actor/d_a_obj_swhammer.h +++ b/include/d/actor/d_a_obj_swhammer.h @@ -14,10 +14,10 @@ namespace daObjSwhammer { void prm_get_swSave2() const {} void CreateHeap(); - void Create(); - void _create(); - void Delete(); - void _delete(); + s32 Create(); + s32 _create(); + BOOL Delete(); + BOOL _delete(); void set_mtx(); void init_mtx(); void set_damage(); @@ -37,7 +37,7 @@ namespace daObjSwhammer { void mode_l_u_init(); void mode_l_u(); void Execute(float(**)[3][4]); - void Draw(); + BOOL Draw(); public: /* Place member variables here */ diff --git a/include/d/actor/d_a_obj_swheavy.h b/include/d/actor/d_a_obj_swheavy.h index aba2f110..afaa4833 100644 --- a/include/d/actor/d_a_obj_swheavy.h +++ b/include/d/actor/d_a_obj_swheavy.h @@ -17,8 +17,8 @@ namespace daObjSwheavy { void solidHeapCB(fopAc_ac_c*); void create_heap(); - void _create(); - void _delete(); + s32 _create(); + BOOL _delete(); void set_mtx(); void init_mtx(); void rideCB(dBgW*, fopAc_ac_c*, fopAc_ac_c*); @@ -33,8 +33,8 @@ namespace daObjSwheavy { void mode_lower(); void mode_l_u_init(); void mode_l_u(); - void _execute(); - void _draw(); + BOOL _execute(); + BOOL _draw(); public: /* Place member variables here */ diff --git a/include/d/actor/d_a_obj_swlight.h b/include/d/actor/d_a_obj_swlight.h index e45e2ffa..2a18dd5d 100644 --- a/include/d/actor/d_a_obj_swlight.h +++ b/include/d/actor/d_a_obj_swlight.h @@ -18,8 +18,8 @@ namespace daObjSwlight { void is_switch2() const; void solidHeapCB(fopAc_ac_c*); void create_heap(); - void _create(); - void _delete(); + s32 _create(); + BOOL _delete(); void jnodeCB_moon(J3DNode*, int); void set_mtx(); void init_mtx(); @@ -38,8 +38,8 @@ namespace daObjSwlight { void mode_active_moon(); void mode_active_sun_init(); void mode_active_sun(); - void _execute(); - void _draw(); + BOOL _execute(); + BOOL _draw(); public: /* Place member variables here */ diff --git a/include/d/actor/d_a_obj_table.h b/include/d/actor/d_a_obj_table.h index ed164734..95c5a12b 100644 --- a/include/d/actor/d_a_obj_table.h +++ b/include/d/actor/d_a_obj_table.h @@ -11,14 +11,14 @@ namespace daObjTable { void prm_get_mdl() const {} void CreateHeap(); - void Create(); + s32 Create(); void Mthd_Create(); - void Delete(); + BOOL Delete(); void Mthd_Delete(); void set_mtx(); void init_mtx(); void Execute(float(**)[3][4]); - void Draw(); + BOOL Draw(); public: /* 0x000 */ dBgS_MoveBgActor parent; diff --git a/include/d/actor/d_a_obj_tenmado.h b/include/d/actor/d_a_obj_tenmado.h index f22cde8b..be60e20b 100644 --- a/include/d/actor/d_a_obj_tenmado.h +++ b/include/d/actor/d_a_obj_tenmado.h @@ -10,14 +10,14 @@ namespace daObjTenmado { void prm_get_swSave2() const {} void CreateHeap(); - void Create(); + s32 Create(); void Mthd_Create(); - void Delete(); + BOOL Delete(); void Mthd_Delete(); void set_mtx(); void init_mtx(); void Execute(float(**)[3][4]); - void Draw(); + BOOL Draw(); public: /* Place member variables here */ diff --git a/include/d/actor/d_a_obj_tide.h b/include/d/actor/d_a_obj_tide.h index 13e81412..f0639591 100644 --- a/include/d/actor/d_a_obj_tide.h +++ b/include/d/actor/d_a_obj_tide.h @@ -10,9 +10,9 @@ namespace daObjTide { void prm_get_type() const {} void CreateHeap(); - void Create(); + s32 Create(); void Mthd_Create(); - void Delete(); + BOOL Delete(); void Mthd_Delete(); void set_mtx(); void init_mtx(); @@ -37,7 +37,7 @@ namespace daObjTide { void se_stop_up(); void se_pos_up(); void Execute(float(**)[3][4]); - void Draw(); + BOOL Draw(); public: /* Place member variables here */ diff --git a/include/d/actor/d_a_obj_timer.h b/include/d/actor/d_a_obj_timer.h index e7993e60..01a52c6b 100644 --- a/include/d/actor/d_a_obj_timer.h +++ b/include/d/actor/d_a_obj_timer.h @@ -10,13 +10,13 @@ namespace daObjTimer { void prm_get_time() const {} void stopTimer() {} - void _create(); - void _delete(); + s32 _create(); + BOOL _delete(); void mode_wait_init(); void mode_wait(); void mode_count_init(); void mode_count(); - void _execute(); + BOOL _execute(); public: /* Place member variables here */ diff --git a/include/d/actor/d_a_obj_tntrap.h b/include/d/actor/d_a_obj_tntrap.h index 8de5cbd7..dbe7b7eb 100644 --- a/include/d/actor/d_a_obj_tntrap.h +++ b/include/d/actor/d_a_obj_tntrap.h @@ -20,8 +20,8 @@ public: void set_tri(int); void chk_event_flg(); void set_em_set_offsetY(); - void _create(); - void _delete(); + s32 _create(); + BOOL _delete(); void trap_off_wait_act_proc(); void trap_on_wait_act_proc(); void demo_regist_wait_act_proc(); @@ -36,8 +36,8 @@ public: void demo_wait2_act_init_proc(); void demo_end_wait_act_init_proc(); void setup_action(int); - void _execute(); - void _draw(); + BOOL _execute(); + BOOL _draw(); public: /* Place member variables here */ diff --git a/include/d/actor/d_a_obj_tousekiki.h b/include/d/actor/d_a_obj_tousekiki.h index 81e2b750..f582a0f4 100644 --- a/include/d/actor/d_a_obj_tousekiki.h +++ b/include/d/actor/d_a_obj_tousekiki.h @@ -5,10 +5,10 @@ class daObj_Tousekiki_c : public fopAc_ac_c { public: - void _create() {} - void _delete() {} - void _draw() {} - void _execute() {} + inline s32 _create(); + inline BOOL _delete(); + inline BOOL _draw(); + inline BOOL _execute(); void demo_move() {} void set_mtx() {} diff --git a/include/d/actor/d_a_obj_tower.h b/include/d/actor/d_a_obj_tower.h index fc342b88..c0bd9294 100644 --- a/include/d/actor/d_a_obj_tower.h +++ b/include/d/actor/d_a_obj_tower.h @@ -6,10 +6,10 @@ class daObjTower_c : public fopAc_ac_c { public: - void _create() {} - void _delete() {} - void _draw() {} - void _execute() {} + inline s32 _create(); + inline BOOL _delete(); + inline BOOL _draw(); + inline BOOL _execute(); void CreateHeap(); void CreateInit(); diff --git a/include/d/actor/d_a_obj_trap.h b/include/d/actor/d_a_obj_trap.h index f5a603a5..8efac9c3 100644 --- a/include/d/actor/d_a_obj_trap.h +++ b/include/d/actor/d_a_obj_trap.h @@ -11,8 +11,8 @@ public: void solidHeapCB(fopAc_ac_c*); void create_heap(); - void _create(); - void _delete(); + s32 _create(); + BOOL _delete(); void init_mtx(); void set_co_pos(); void get_ground(); @@ -27,8 +27,8 @@ public: void bound(); void set_shine(); void shine_move(); - void _execute(); - void _draw(); + BOOL _execute(); + BOOL _draw(); public: /* Place member variables here */ diff --git a/include/d/actor/d_a_obj_tribox.h b/include/d/actor/d_a_obj_tribox.h index 8d2674ba..28e5c8b4 100644 --- a/include/d/actor/d_a_obj_tribox.h +++ b/include/d/actor/d_a_obj_tribox.h @@ -25,8 +25,8 @@ namespace daObjTribox { void create_block_after(); void create_correct_before(); void create_correct_after(); - void _create(); - void _delete(); + s32 _create(); + BOOL _delete(); void set_mtx(); void init_mtx(); void push_pullCB(fopAc_ac_c*, fopAc_ac_c*, short, dBgW::PushPullLabel); @@ -76,8 +76,8 @@ namespace daObjTribox { void mode_proc_call(); void execute_block(); void execute_correct(); - void _execute(); - void _draw(); + BOOL _execute(); + BOOL _draw(); public: /* Place member variables here */ diff --git a/include/d/actor/d_a_obj_try.h b/include/d/actor/d_a_obj_try.h index 9b57412a..3a659019 100644 --- a/include/d/actor/d_a_obj_try.h +++ b/include/d/actor/d_a_obj_try.h @@ -19,8 +19,8 @@ namespace daObjTry { void init_cc(); void search_sameType(void*, void*); void chk_appear() const; - void _create(); - void _delete(); + s32 _create(); + BOOL _delete(); void mode_restart_init(); void mode_restart(); void mode_wait_init(); @@ -54,8 +54,8 @@ namespace daObjTry { void make_vib(); void check_circle(); void get_water_h(); - void _execute(); - void _draw(); + BOOL _execute(); + BOOL _draw(); public: /* Place member variables here */ diff --git a/include/d/actor/d_a_obj_usovmc.h b/include/d/actor/d_a_obj_usovmc.h index 59d33d83..0045f203 100644 --- a/include/d/actor/d_a_obj_usovmc.h +++ b/include/d/actor/d_a_obj_usovmc.h @@ -7,14 +7,14 @@ namespace daObjUsovmc { class Act_c : public fopAc_ac_c { public: void CreateHeap(); - void Create(); + s32 Create(); void Mthd_Create(); - void Delete(); + BOOL Delete(); void Mthd_Delete(); void set_mtx(); void init_mtx(); void Execute(float(**)[3][4]); - void Draw(); + BOOL Draw(); public: /* Place member variables here */ diff --git a/include/d/actor/d_a_obj_vfan.h b/include/d/actor/d_a_obj_vfan.h index 41209e63..f28e1bec 100644 --- a/include/d/actor/d_a_obj_vfan.h +++ b/include/d/actor/d_a_obj_vfan.h @@ -12,15 +12,15 @@ namespace daObjVfan { void prm_get_swSave() const {} void CreateHeap(); - void Create(); + s32 Create(); void Mthd_Create(); - void Delete(); + BOOL Delete(); void Mthd_Delete(); void set_mtx(); void init_mtx(); void ParticleSet(); void Execute(float(**)[3][4]); - void Draw(); + BOOL Draw(); public: /* 0x000 */ dBgS_MoveBgActor parent; diff --git a/include/d/actor/d_a_obj_vgnfd.h b/include/d/actor/d_a_obj_vgnfd.h index d0d9ce2f..fcbb2de5 100644 --- a/include/d/actor/d_a_obj_vgnfd.h +++ b/include/d/actor/d_a_obj_vgnfd.h @@ -12,15 +12,15 @@ public: void solidHeapCB(fopAc_ac_c*); void create_bdl_brk(int); void create_heap(); - void _create(); - void _delete(); + s32 _create(); + BOOL _delete(); void get_start_demo_idx(); void check_fin(); void on_fin(); void init_mtx(); void set_timer(); - void _execute(); - void _draw(); + BOOL _execute(); + BOOL _draw(); public: /* Place member variables here */ diff --git a/include/d/actor/d_a_obj_vmc.h b/include/d/actor/d_a_obj_vmc.h index 47ce9d0d..74c3a741 100644 --- a/include/d/actor/d_a_obj_vmc.h +++ b/include/d/actor/d_a_obj_vmc.h @@ -12,16 +12,16 @@ namespace daObjVmc { void solidHeapCB(fopAc_ac_c*); void create_heap(); void CreateInit(); - void _create(); - void _delete(); + s32 _create(); + BOOL _delete(); void set_mtx(); void init_mtx(); void daObjVmc_base_main(); void daObjVmc_tree_demo_wait(); void daObjVmc_tree_demo_main(); void daObjVmc_tree_main(); - void _execute(); - void _draw(); + BOOL _execute(); + BOOL _draw(); public: /* Place member variables here */ diff --git a/include/d/actor/d_a_obj_vmsdz.h b/include/d/actor/d_a_obj_vmsdz.h index 48efe799..7c150143 100644 --- a/include/d/actor/d_a_obj_vmsdz.h +++ b/include/d/actor/d_a_obj_vmsdz.h @@ -7,11 +7,11 @@ class daObjVmsdz_c : public fopAc_ac_c { public: void solidHeapCB(fopAc_ac_c*); void create_heap(); - void _create(); - void _delete(); + s32 _create(); + BOOL _delete(); void init_mtx(); - void _execute(); - void _draw(); + BOOL _execute(); + BOOL _draw(); public: /* Place member variables here */ diff --git a/include/d/actor/d_a_obj_vmsms.h b/include/d/actor/d_a_obj_vmsms.h index a4a0f76f..4f3c5063 100644 --- a/include/d/actor/d_a_obj_vmsms.h +++ b/include/d/actor/d_a_obj_vmsms.h @@ -9,11 +9,11 @@ public: void solidHeapCB(fopAc_ac_c*); void create_heap(); - void _create(); - void _delete(); + s32 _create(); + BOOL _delete(); void init_mtx(); - void _execute(); - void _draw(); + BOOL _execute(); + BOOL _draw(); public: /* Place member variables here */ diff --git a/include/d/actor/d_a_obj_volcano.h b/include/d/actor/d_a_obj_volcano.h index 8dfce454..5b9665bf 100644 --- a/include/d/actor/d_a_obj_volcano.h +++ b/include/d/actor/d_a_obj_volcano.h @@ -12,9 +12,9 @@ namespace daObjVolcano { void StartFire(); void StopFire(); void CreateHeap(); - void Create(); + s32 Create(); void Mthd_Create(); - void Delete(); + BOOL Delete(); void Mthd_Delete(); void set_mtx(); void init_mtx(); @@ -28,7 +28,7 @@ namespace daObjVolcano { void daObjVolcano_fail_demo_main(); void Execute(float(**)[3][4]); void set_material(J3DMaterial*, unsigned char); - void Draw(); + BOOL Draw(); public: /* Place member variables here */ diff --git a/include/d/actor/d_a_obj_vtil.h b/include/d/actor/d_a_obj_vtil.h index c85b31c1..56e0b9d5 100644 --- a/include/d/actor/d_a_obj_vtil.h +++ b/include/d/actor/d_a_obj_vtil.h @@ -11,8 +11,8 @@ public: void solidHeapCB(fopAc_ac_c*); void create_heap(); - void _create(); - void _delete(); + s32 _create(); + BOOL _delete(); void tell_agb_attack(); void tell_agb_sink(); void init_mtx(); @@ -39,8 +39,8 @@ public: void hit_bg(); void make_vib(); void check_circle(); - void _execute(); - void _draw(); + BOOL _execute(); + BOOL _draw(); public: /* Place member variables here */ diff --git a/include/d/actor/d_a_obj_vyasi.h b/include/d/actor/d_a_obj_vyasi.h index f243afe8..678e1f9c 100644 --- a/include/d/actor/d_a_obj_vyasi.h +++ b/include/d/actor/d_a_obj_vyasi.h @@ -30,14 +30,14 @@ namespace daObjVyasi { void process_main(); void solidHeapCB(fopAc_ac_c*); void create_heap(); - void _create(); - void _delete(); + s32 _create(); + BOOL _delete(); void set_mtx(); void calc_dif_angle(); void quaternion_main(); void leaf_scale_main(); - void _execute(); - void _draw(); + BOOL _execute(); + BOOL _draw(); public: /* 0x0290 */ u8 m0290[0x0294 - 0x0290]; diff --git a/include/d/actor/d_a_obj_warpt.h b/include/d/actor/d_a_obj_warpt.h index c96a7063..ab34fde8 100644 --- a/include/d/actor/d_a_obj_warpt.h +++ b/include/d/actor/d_a_obj_warpt.h @@ -37,12 +37,12 @@ public: void modeEventOpenInit(); void modeEventOpen(); void modeProc(daObj_Warpt_c::Proc_e, int); - void _execute(); - void _draw(); + BOOL _execute(); + BOOL _draw(); void getArg(); void createInit(); - void _create(); - void _delete(); + s32 _create(); + BOOL _delete(); public: /* Place member variables here */ diff --git a/include/d/actor/d_a_obj_xfuta.h b/include/d/actor/d_a_obj_xfuta.h index 0ea06587..7a2bffb9 100644 --- a/include/d/actor/d_a_obj_xfuta.h +++ b/include/d/actor/d_a_obj_xfuta.h @@ -9,11 +9,11 @@ namespace daObjXfuta { public: void solidHeapCB(fopAc_ac_c*); void create_heap(); - void _create(); - void _delete(); + s32 _create(); + BOOL _delete(); void set_mtx(); - void _execute(); - void _draw(); + BOOL _execute(); + BOOL _draw(); public: /* 0x290 */ void* vtbl; diff --git a/include/d/actor/d_a_obj_zouK.h b/include/d/actor/d_a_obj_zouK.h index f0a0ee63..4c162501 100644 --- a/include/d/actor/d_a_obj_zouK.h +++ b/include/d/actor/d_a_obj_zouK.h @@ -17,14 +17,14 @@ namespace daObjZouk { void solidHeapCB(fopAc_ac_c*); void create_heap(); - void _create(); - void _delete(); + s32 _create(); + BOOL _delete(); void set_mtx(); void texture_scroll(); void play_stop_joint_anime(); void jokai_demo(); - void _execute(); - void _draw(); + BOOL _execute(); + BOOL _draw(); public: /* 0x290 */ void* vtbl; diff --git a/include/d/actor/d_a_oship.h b/include/d/actor/d_a_oship.h index 1e1be8d8..faeeb331 100644 --- a/include/d/actor/d_a_oship.h +++ b/include/d/actor/d_a_oship.h @@ -48,13 +48,13 @@ public: void modeDeleteInit(); void modeDelete(); void modeProc(daOship_c::Proc_e, int); - void _execute(); - void _draw(); + BOOL _execute(); + BOOL _draw(); void createInit(); void _createHeap(); void getArg(); - void _create(); - void _delete(); + s32 _create(); + BOOL _delete(); public: /* 0x290 */ u8 m290[0x2AC - 0x290]; diff --git a/include/d/actor/d_a_pedestal.h b/include/d/actor/d_a_pedestal.h index b2d027f9..4842706a 100644 --- a/include/d/actor/d_a_pedestal.h +++ b/include/d/actor/d_a_pedestal.h @@ -8,10 +8,10 @@ namespace daPedestal { class daPds_c : public fopAc_ac_c { public: - void _delete(); + BOOL _delete(); void CreateHeap(); void CreateInit(); - void _create(); + s32 _create(); void getMyStaffId(); void wakeupCheck(); void finishCheck(); @@ -28,8 +28,8 @@ namespace daPedestal { void set_mtx(); void initBrkAnm(unsigned char, bool); void playBrkAnm(); - void _execute(); - void _draw(); + BOOL _execute(); + BOOL _draw(); public: /* 0x290 */ u8 m290[0x298 - 0x290]; diff --git a/include/d/actor/d_a_pz.h b/include/d/actor/d_a_pz.h index 5d2e63dc..fb3ab1e2 100644 --- a/include/d/actor/d_a_pz.h +++ b/include/d/actor/d_a_pz.h @@ -74,15 +74,15 @@ public: void modeFollowInit(); void modeFollow(); void modeProc(daPz_c::Proc_e, int); - void _execute(); + BOOL _execute(); void bowDraw(); void bodyDraw(); void drawShadow(); - void _draw(); + BOOL _draw(); void bodyCreateInit(); void createInit(); - void _create(); - void _delete(); + s32 _create(); + BOOL _delete(); public: /* 0x06C4 */ int mMode; diff --git a/include/d/actor/d_a_race_item.h b/include/d/actor/d_a_race_item.h index 63600467..6ca65a91 100644 --- a/include/d/actor/d_a_race_item.h +++ b/include/d/actor/d_a_race_item.h @@ -6,13 +6,13 @@ class daRaceItem_c : public fopAc_ac_c { public: - void draw() {} - void execute() {} + inline BOOL draw(); + inline BOOL execute(); void setListStart() {} void set_mtx(); - void Delete(); - void create(); + BOOL Delete(); + s32 create(); void CreateInit(); void checkGet(); diff --git a/include/d/actor/d_a_salvage.h b/include/d/actor/d_a_salvage.h index d8379b04..f79d767c 100644 --- a/include/d/actor/d_a_salvage.h +++ b/include/d/actor/d_a_salvage.h @@ -40,9 +40,9 @@ public: void CreateHeap(); void CreateInit(); - void _create(); - void _delete(); - void _execute(); + s32 _create(); + BOOL _delete(); + BOOL _execute(); void checkOrder(); void eventOrder(); void proc_wait_init(); @@ -59,7 +59,7 @@ public: void getDistance(int, float*); void send_agb(); void debug_print2(); - void _draw(); + BOOL _draw(); void set_mtx(J3DModel*, int); void isEffectKind(int); void debugDraw(); diff --git a/include/d/actor/d_a_salvage_tbox.h b/include/d/actor/d_a_salvage_tbox.h index 200baaad..75e6a097 100644 --- a/include/d/actor/d_a_salvage_tbox.h +++ b/include/d/actor/d_a_salvage_tbox.h @@ -5,14 +5,14 @@ class daSTBox_c : public fopAc_ac_c { public: - void _draw() {} + inline BOOL _draw(); - void _delete(); + BOOL _delete(); void CreateHeap(); void CreateInit(); - void _create(); + s32 _create(); void set_mtx(); - void _execute(); + BOOL _execute(); void initWait(int); void initWait02(int); void initWaitGetItem(int); diff --git a/include/d/actor/d_a_sbox.h b/include/d/actor/d_a_sbox.h index 9f507df1..ebf803ce 100644 --- a/include/d/actor/d_a_sbox.h +++ b/include/d/actor/d_a_sbox.h @@ -7,8 +7,8 @@ class daSbox_c : public fopAc_ac_c { public: void chkFlag(unsigned short) {} void clrFlag(unsigned short) {} - void draw() {} - void execute() {} + inline BOOL draw(); + inline BOOL execute(); void setAction(unsigned char) {} void setFlag(unsigned short) {} @@ -20,7 +20,7 @@ public: void lightProc(); void lightInit(); void CreateInit(); - void create(); + s32 create(); void demoInitWait(); void demoProcWait(); void demoInitOpen(); diff --git a/include/d/actor/d_a_sea.h b/include/d/actor/d_a_sea.h index 5ff48224..95f67d46 100644 --- a/include/d/actor/d_a_sea.h +++ b/include/d/actor/d_a_sea.h @@ -60,7 +60,7 @@ public: void SetCullStopFlag(); void CheckRoomChange(); void execute(cXyz&); - void draw(); + BOOL draw(); ~daSea_packet_c() {} public: diff --git a/include/d/actor/d_a_seatag.h b/include/d/actor/d_a_seatag.h index 5e89edd9..1251bd25 100644 --- a/include/d/actor/d_a_seatag.h +++ b/include/d/actor/d_a_seatag.h @@ -5,9 +5,9 @@ class daSeatag_c : public fopAc_ac_c { public: - void create() {} - void draw() {} - void execute() {} + inline s32 create(); + inline BOOL draw(); + inline BOOL execute(); public: /* Place member variables here */ diff --git a/include/d/actor/d_a_ship.h b/include/d/actor/d_a_ship.h index 211e66e6..cb265a36 100644 --- a/include/d/actor/d_a_ship.h +++ b/include/d/actor/d_a_ship.h @@ -92,7 +92,7 @@ public: void craneJointCallBack(); void headJointCallBack0(); void headJointCallBack1(int); - void draw(); + BOOL draw(); void checkForceMessage(); void setInitMessage(); void setNextMessage(msg_class*); @@ -163,10 +163,10 @@ public: void setTornadoActor(); void setWhirlActor(); void setHeadAnm(); - void execute(); + BOOL execute(); void shipDelete(); void createHeap(); - void create(); + s32 create(); void checkForceMove() const; void initStartPos(cXyz const*, s16); diff --git a/include/d/actor/d_a_shop_item.h b/include/d/actor/d_a_shop_item.h index 579373d9..d24691ef 100644 --- a/include/d/actor/d_a_shop_item.h +++ b/include/d/actor/d_a_shop_item.h @@ -11,7 +11,7 @@ struct daShopItem_c_m_data { }; struct daShopItem_c : public daItemBase_c { - void _delete() {} + inline BOOL _delete(); void setTevType(int) {} char* getShopArcname(); diff --git a/include/d/actor/d_a_shutter.h b/include/d/actor/d_a_shutter.h index db02b1e1..3e217a29 100644 --- a/include/d/actor/d_a_shutter.h +++ b/include/d/actor/d_a_shutter.h @@ -6,15 +6,15 @@ class daShutter_c : public fopAc_ac_c { public: - void _delete(); + BOOL _delete(); void CreateHeap(); - void Create(); - void _create(); + s32 Create(); + s32 _create(); void set_mtx(); - void _execute(); + BOOL _execute(); void shutter_move(); void demo(); - void _draw(); + BOOL _draw(); public: /* 0x290 */ request_of_phase_process_class mPhs; diff --git a/include/d/actor/d_a_shutter2.h b/include/d/actor/d_a_shutter2.h index ee57c886..eec0c37a 100644 --- a/include/d/actor/d_a_shutter2.h +++ b/include/d/actor/d_a_shutter2.h @@ -5,15 +5,15 @@ class daShutter2_c : public fopAc_ac_c { public: - void Delete(); + BOOL Delete(); void CreateHeap(); - void Create(); - void _create(); + s32 Create(); + s32 _create(); void set_mtx(); void Execute(float(**)[3][4]); void shutter_move(); void demo(); - void Draw(); + BOOL Draw(); public: /* Place member variables here */ diff --git a/include/d/actor/d_a_sie_flag.h b/include/d/actor/d_a_sie_flag.h index aed74aa6..150b34e2 100644 --- a/include/d/actor/d_a_sie_flag.h +++ b/include/d/actor/d_a_sie_flag.h @@ -11,10 +11,10 @@ public: void set_mtx(); void CreateHeap(); void CreateInit(); - void _create(); - void _delete(); - void _execute(); - void _draw(); + s32 _create(); + BOOL _delete(); + BOOL _execute(); + BOOL _draw(); public: /* 0x290 */ request_of_phase_process_class mPhsEshata; diff --git a/include/d/actor/d_a_spc_item01.h b/include/d/actor/d_a_spc_item01.h index 5db7a615..ff5e0631 100644 --- a/include/d/actor/d_a_spc_item01.h +++ b/include/d/actor/d_a_spc_item01.h @@ -6,17 +6,17 @@ class daSpcItem01_c : public fopAc_ac_c { public: void set_mtx(); - void _delete(); - void _create(); + BOOL _delete(); + s32 _create(); void CreateInit(); - void _execute(); + BOOL _execute(); void set_effect(); void scale_anim(); void anim_play(); void move(); void rotate_item(); void setCol(); - void _draw(); + BOOL _draw(); void setTevStr(); public: diff --git a/include/d/actor/d_a_steam_tag.h b/include/d/actor/d_a_steam_tag.h index 7adf2bd7..5a8a83eb 100644 --- a/include/d/actor/d_a_steam_tag.h +++ b/include/d/actor/d_a_steam_tag.h @@ -7,9 +7,9 @@ class daSteamTag_c : public fopAc_ac_c { public: - void create() {} - void draw() {} - void execute() {} + inline s32 create(); + inline BOOL draw(); + inline BOOL execute(); void getData(); void CreateInit(); diff --git a/include/d/actor/d_a_stone2.h b/include/d/actor/d_a_stone2.h index 2954e60b..bf456ce2 100644 --- a/include/d/actor/d_a_stone2.h +++ b/include/d/actor/d_a_stone2.h @@ -19,10 +19,10 @@ namespace daStone2 { void is_switch() const; void on_switch() const; void CreateHeap(); - void Create(); + s32 Create(); void chk_appear(); void Mthd_Create(); - void Delete(); + BOOL Delete(); void Mthd_Delete(); void set_mtx(); void init_mtx(); @@ -60,7 +60,7 @@ namespace daStone2 { void demo_proc_call(); void Execute(float(**)[3][4]); void draw_shadow(); - void Draw(); + BOOL Draw(); public: /* Place member variables here */ diff --git a/include/d/actor/d_a_swhit0.h b/include/d/actor/d_a_swhit0.h index c3930f6a..d8f48681 100644 --- a/include/d/actor/d_a_swhit0.h +++ b/include/d/actor/d_a_swhit0.h @@ -13,7 +13,7 @@ public: } inline s32 draw(); - void execute() {} + inline BOOL execute(); s32 getSwNo(); u8 getEvNo(); diff --git a/include/d/actor/d_a_swpropeller.h b/include/d/actor/d_a_swpropeller.h index 1381f410..bc9ffbb9 100644 --- a/include/d/actor/d_a_swpropeller.h +++ b/include/d/actor/d_a_swpropeller.h @@ -8,13 +8,13 @@ class daSwProp_c : public fopAc_ac_c { public: - void _delete(); + BOOL _delete(); void CreateHeap(); void CreateInit(); - void _create(); + s32 _create(); void set_mtx(); - void _execute(); - void _draw(); + BOOL _execute(); + BOOL _draw(); public: /* 0x290 */ u8 m290[0x294 - 0x290]; diff --git a/include/d/actor/d_a_tag_attention.h b/include/d/actor/d_a_tag_attention.h index d8c9ee96..8c2e3651 100644 --- a/include/d/actor/d_a_tag_attention.h +++ b/include/d/actor/d_a_tag_attention.h @@ -10,8 +10,8 @@ namespace daTagAttention { void prm_get_Type() const {} void prm_get_swSave() const {} - void _create(); - void _execute(); + s32 _create(); + BOOL _execute(); public: /* Place member variables here */ diff --git a/include/d/actor/d_a_tag_ba1.h b/include/d/actor/d_a_tag_ba1.h index 49d19b17..e4bcbf6d 100644 --- a/include/d/actor/d_a_tag_ba1.h +++ b/include/d/actor/d_a_tag_ba1.h @@ -8,10 +8,10 @@ public: void XyCheck_cB(int); void XyEvent_cB(int); void createInit(); - void _draw(); - void _execute(); - void _delete(); - void _create(); + BOOL _draw(); + BOOL _execute(); + BOOL _delete(); + s32 _create(); public: /* Place member variables here */ diff --git a/include/d/actor/d_a_tag_etc.h b/include/d/actor/d_a_tag_etc.h index 472cac58..f5b3aaab 100644 --- a/include/d/actor/d_a_tag_etc.h +++ b/include/d/actor/d_a_tag_etc.h @@ -5,8 +5,8 @@ class daTag_Etc_c : public fopAc_ac_c { public: - void draw() {} - void execute() {} + inline BOOL draw(); + inline BOOL execute(); void setActio(unsigned char) {} void getEventNo(); @@ -15,7 +15,7 @@ public: void otherCheck(fopAc_ac_c*); void demoProc(); void demoInitProc(); - void create(); + s32 create(); public: /* Place member variables here */ diff --git a/include/d/actor/d_a_tag_event.h b/include/d/actor/d_a_tag_event.h index 9150116d..1806b513 100644 --- a/include/d/actor/d_a_tag_event.h +++ b/include/d/actor/d_a_tag_event.h @@ -5,9 +5,9 @@ class daTag_Event_c : public fopAc_ac_c { public: - void create() {} - void draw() {} - void execute() {} + inline s32 create(); + inline BOOL draw(); + inline BOOL execute(); void setActio(unsigned char) {} void getEventNo(); diff --git a/include/d/actor/d_a_tag_evsw.h b/include/d/actor/d_a_tag_evsw.h index 1b6e9bb1..94bc8990 100644 --- a/include/d/actor/d_a_tag_evsw.h +++ b/include/d/actor/d_a_tag_evsw.h @@ -10,10 +10,10 @@ namespace daTagEvsw { void prm_get_eventbitID() const {} void prm_get_swSave() const {} - void _create(); - void _delete(); - void _execute(); - void _draw(); + s32 _create(); + BOOL _delete(); + BOOL _execute(); + BOOL _draw(); public: /* Place member variables here */ diff --git a/include/d/actor/d_a_tag_ghostship.h b/include/d/actor/d_a_tag_ghostship.h index ab13f3b9..64b5f6b1 100644 --- a/include/d/actor/d_a_tag_ghostship.h +++ b/include/d/actor/d_a_tag_ghostship.h @@ -12,11 +12,11 @@ public: void modeClearEventInit(); void modeClearEvent(); void modeProc(daTag_Gship_c::Proc_e, int); - void _execute(); - void _draw(); + BOOL _execute(); + BOOL _draw(); void getArg(); - void _create(); - void _delete(); + s32 _create(); + BOOL _delete(); public: /* 0x290 */ PTMF* m290; diff --git a/include/d/actor/d_a_tag_hint.h b/include/d/actor/d_a_tag_hint.h index 630494a5..df159d0d 100644 --- a/include/d/actor/d_a_tag_hint.h +++ b/include/d/actor/d_a_tag_hint.h @@ -6,9 +6,9 @@ class daTag_Hint_c : public fopAc_ac_c { public: void chkFlag(unsigned short) {} - void create() {} - void draw() {} - void execute() {} + inline s32 create(); + inline BOOL draw(); + inline BOOL execute(); void setActio(unsigned char) {} void setFlag(unsigned short) {} diff --git a/include/d/actor/d_a_tag_island.h b/include/d/actor/d_a_tag_island.h index 65f07416..1771004d 100644 --- a/include/d/actor/d_a_tag_island.h +++ b/include/d/actor/d_a_tag_island.h @@ -7,9 +7,9 @@ class daTag_Island_c : public fopAc_ac_c { public: void chkFlag(unsigned short) {} void clrFlag(unsigned short) {} - void create() {} - void draw() {} - void execute() {} + inline s32 create(); + inline BOOL draw(); + inline BOOL execute(); void setActio(unsigned char) {} void setFlag(unsigned short) {} diff --git a/include/d/actor/d_a_tag_kf1.h b/include/d/actor/d_a_tag_kf1.h index 70b234b5..adf071ee 100644 --- a/include/d/actor/d_a_tag_kf1.h +++ b/include/d/actor/d_a_tag_kf1.h @@ -26,10 +26,10 @@ public: void wait01(); void wait02(); void wait_action1(void*); - void _draw(); - void _execute(); - void _delete(); - void _create(); + BOOL _draw(); + BOOL _execute(); + BOOL _delete(); + s32 _create(); public: /* Place member variables here */ diff --git a/include/d/actor/d_a_tag_kk1.h b/include/d/actor/d_a_tag_kk1.h index 42daf203..7f248e29 100644 --- a/include/d/actor/d_a_tag_kk1.h +++ b/include/d/actor/d_a_tag_kk1.h @@ -6,10 +6,10 @@ class daTag_Kk1_c : public fopAc_ac_c { public: void createInit(); - void _draw(); - void _execute(); - void _delete(); - void _create(); + BOOL _draw(); + BOOL _execute(); + BOOL _delete(); + s32 _create(); public: /* Place member variables here */ diff --git a/include/d/actor/d_a_tag_light.h b/include/d/actor/d_a_tag_light.h index 8ef28bc6..06867a80 100644 --- a/include/d/actor/d_a_tag_light.h +++ b/include/d/actor/d_a_tag_light.h @@ -19,8 +19,8 @@ namespace daTagLight { void get_cc_r() const; void solidHeapCB(fopAc_ac_c*); void create_heap(); - void _create(); - void _delete(); + s32 _create(); + BOOL _delete(); void chk_sw() const; void chk_sch() const; void chk_light() const; @@ -30,9 +30,9 @@ namespace daTagLight { void set_spot_mtx(); void set_spot(); void init_spot(); - void _execute(); + BOOL _execute(); void set_material(J3DMaterial*, unsigned char); - void _draw(); + BOOL _draw(); public: /* Place member variables here */ diff --git a/include/d/actor/d_a_tag_md_cb.h b/include/d/actor/d_a_tag_md_cb.h index a2c02dc6..390a3c5a 100644 --- a/include/d/actor/d_a_tag_md_cb.h +++ b/include/d/actor/d_a_tag_md_cb.h @@ -9,7 +9,7 @@ public: void onEventAccept() {} void setTimer(short) {} - void create(); + s32 create(); void init(); void checkTimer(); void checkEventFinish(); @@ -35,8 +35,8 @@ public: void checkCommandTalk(); void checkAreaIn(fopAc_ac_c*); void checkCondition(); - void execute(); - void draw(); + BOOL execute(); + BOOL draw(); public: /* Place member variables here */ diff --git a/include/d/actor/d_a_tag_mk.h b/include/d/actor/d_a_tag_mk.h index ef71ea99..af2b94de 100644 --- a/include/d/actor/d_a_tag_mk.h +++ b/include/d/actor/d_a_tag_mk.h @@ -5,8 +5,8 @@ class daTag_Mk_c : public fopAc_ac_c { public: - void create() {} - void draw() {} + inline s32 create(); + inline BOOL draw(); void setAction(unsigned char) {} void getSwbit(); @@ -38,7 +38,7 @@ public: void actionTagWp2(); void actionTagWp(); void actionDaichi(); - void execute(); + BOOL execute(); public: /* Place member variables here */ diff --git a/include/d/actor/d_a_tag_msg.h b/include/d/actor/d_a_tag_msg.h index b734365f..faf2d143 100644 --- a/include/d/actor/d_a_tag_msg.h +++ b/include/d/actor/d_a_tag_msg.h @@ -5,9 +5,9 @@ class daTag_Msg_c : public fopAc_ac_c { public: - void create() {} - void draw() {} - void execute() {} + inline s32 create(); + inline BOOL draw(); + inline BOOL execute(); void setActio(unsigned char) {} public: diff --git a/include/d/actor/d_a_tag_photo.h b/include/d/actor/d_a_tag_photo.h index 5c18b9e3..92a19910 100644 --- a/include/d/actor/d_a_tag_photo.h +++ b/include/d/actor/d_a_tag_photo.h @@ -7,13 +7,13 @@ class daTagPhoto_c : public fopAc_ac_c { public: void getTagNo() {} - void _create(); + s32 _create(); void createHeap(); void createInit(); - void _delete(); - void _draw(); + BOOL _delete(); + BOOL _draw(); void setMode(unsigned char); - void _execute(); + BOOL _execute(); void executeWait(); void executeTalk(); void checkOrder(); diff --git a/include/d/actor/d_a_tag_so.h b/include/d/actor/d_a_tag_so.h index b60b3e60..fb663417 100644 --- a/include/d/actor/d_a_tag_so.h +++ b/include/d/actor/d_a_tag_so.h @@ -10,12 +10,12 @@ public: void isMinigame() {} void isTag() {} - void _execute(); + BOOL _execute(); void debugDraw(); - void _draw(); + BOOL _draw(); void getArg(); - void _create(); - void _delete(); + s32 _create(); + BOOL _delete(); public: /* Place member variables here */ diff --git a/include/d/actor/d_a_tag_volcano.h b/include/d/actor/d_a_tag_volcano.h index 57de44cc..60dbc983 100644 --- a/include/d/actor/d_a_tag_volcano.h +++ b/include/d/actor/d_a_tag_volcano.h @@ -11,11 +11,11 @@ namespace daTagvolcano { void prm_get_timer() const {} void prm_get_type() const {} - void _create(); + s32 _create(); void check_timer_clear(); - void _delete(); - void _execute(); - void _draw(); + BOOL _delete(); + BOOL _execute(); + BOOL _draw(); public: /* Place member variables here */ diff --git a/include/d/actor/d_a_tag_waterlevel.h b/include/d/actor/d_a_tag_waterlevel.h index c260671a..ac22d230 100644 --- a/include/d/actor/d_a_tag_waterlevel.h +++ b/include/d/actor/d_a_tag_waterlevel.h @@ -10,11 +10,11 @@ namespace daTagWaterlevel { void get_state() {} void prm_get_sch() const {} - void _create(); - void _delete(); + s32 _create(); + BOOL _delete(); void bgm_proc(); - void _execute(); - void _draw(); + BOOL _execute(); + BOOL _draw(); public: /* Place member variables here */ diff --git a/include/d/actor/d_a_tama.h b/include/d/actor/d_a_tama.h index e288df39..cbe10556 100644 --- a/include/d/actor/d_a_tama.h +++ b/include/d/actor/d_a_tama.h @@ -10,10 +10,10 @@ public: void setSpd(float) {} void createInit(); - void _draw(); - void _execute(); - void _delete(); - void _create(); + BOOL _draw(); + BOOL _execute(); + BOOL _delete(); + s32 _create(); public: /* Place member variables here */ diff --git a/include/d/actor/d_a_tbox.h b/include/d/actor/d_a_tbox.h index a8e50da9..69834062 100644 --- a/include/d/actor/d_a_tbox.h +++ b/include/d/actor/d_a_tbox.h @@ -11,7 +11,7 @@ class daTbox_c : public fopAc_ac_c { public: void action() {} void deleteProc() {} - void draw() {} + inline BOOL draw(); void flagCheck(unsigned short) {} void flagClr() {} void flagOff(unsigned short) {} diff --git a/include/d/actor/d_a_title.h b/include/d/actor/d_a_title.h index 91cb2b84..beeb0c54 100644 --- a/include/d/actor/d_a_title.h +++ b/include/d/actor/d_a_title.h @@ -10,9 +10,9 @@ public: class daTitle_c : public fopAc_ac_c { public: - void create() {} - void draw() {} - void execute() {} + inline s32 create(); + inline BOOL draw(); + inline BOOL execute(); public: /* Place member variables here */ diff --git a/include/d/actor/d_a_toge.h b/include/d/actor/d_a_toge.h index d83a3f7d..79aa7c91 100644 --- a/include/d/actor/d_a_toge.h +++ b/include/d/actor/d_a_toge.h @@ -7,16 +7,16 @@ class daToge_c : public fopAc_ac_c { public: void set_mtx() {} - void _delete(); + BOOL _delete(); void CreateHeap(); - void Create(); - void _create(); - void _execute(); + s32 Create(); + s32 _create(); + BOOL _execute(); void set_collision(); void search_wind(); void toge_move(); void toge_seStart(unsigned long); - void _draw(); + BOOL _draw(); public: /* Place member variables here */ diff --git a/include/d/actor/d_a_tori_flag.h b/include/d/actor/d_a_tori_flag.h index f1ac9488..3d10c9dc 100644 --- a/include/d/actor/d_a_tori_flag.h +++ b/include/d/actor/d_a_tori_flag.h @@ -8,10 +8,10 @@ class daTori_Flag_c : public fopAc_ac_c { public: - void _create() {} - void _delete() {} - void _draw() {} - void _execute() {} + inline s32 _create(); + inline BOOL _delete(); + inline BOOL _draw(); + inline BOOL _execute(); void set_mtx(); void CreateHeap(); diff --git a/include/d/actor/d_a_tornado.h b/include/d/actor/d_a_tornado.h index 59a144e0..05cd3f73 100644 --- a/include/d/actor/d_a_tornado.h +++ b/include/d/actor/d_a_tornado.h @@ -13,11 +13,11 @@ public: void setScaleOn() {} void jointCallBack(int); - void draw(); - void execute(); + BOOL draw(); + BOOL execute(); void tornado_delete(); void createHeap(); - void create(); + s32 create(); public: /* Place member variables here */ diff --git a/include/d/actor/d_a_tpota.h b/include/d/actor/d_a_tpota.h index 0ce0cfc7..24d64e13 100644 --- a/include/d/actor/d_a_tpota.h +++ b/include/d/actor/d_a_tpota.h @@ -6,14 +6,14 @@ class daTpota_c : public fopAc_ac_c { public: - void _create(); - void _delete(); + s32 _create(); + BOOL _delete(); void make_ripple(cXyz); void check_water_h(JPABaseParticle*, float); void clear_splash(); void renew_splash(); - void _execute(); - void _draw(); + BOOL _execute(); + BOOL _draw(); public: /* Place member variables here */ diff --git a/include/d/actor/d_a_tsubo.h b/include/d/actor/d_a_tsubo.h index 19bc8a86..c9244064 100644 --- a/include/d/actor/d_a_tsubo.h +++ b/include/d/actor/d_a_tsubo.h @@ -44,9 +44,9 @@ namespace daTsubo { void create_init_cull(); void create_init_cc(); void create_init_bgc(); - void _create(); + s32 _create(); void _is_delete(); - void _delete(); + BOOL _delete(); void spec_make_boko(int); void spec_init(); void spec_set_actor(); @@ -152,8 +152,8 @@ namespace daTsubo { void se_pickup(); void set_senv(int, int) const; void cam_lockoff() const; - void _execute(); - void _draw(); + BOOL _execute(); + BOOL _draw(); public: /* 0x290 */ request_of_phase_process_class mPhs; diff --git a/include/d/actor/d_a_wall.h b/include/d/actor/d_a_wall.h index c042ec1f..87aa2466 100644 --- a/include/d/actor/d_a_wall.h +++ b/include/d/actor/d_a_wall.h @@ -5,19 +5,19 @@ class daWall_c : public fopAc_ac_c { public: - void _delete(); + BOOL _delete(); void CreateHeap(); void CreateInit(); - void _create(); + s32 _create(); void set_mtx(); void setMoveBGMtx(); - void _execute(); + BOOL _execute(); void mode_wait(); void mode_break(); void set_tri(); void set_effect(); void set_se(); - void _draw(); + BOOL _draw(); public: /* Place member variables here */ diff --git a/include/d/actor/d_a_warpdm20.h b/include/d/actor/d_a_warpdm20.h index 337d5dae..d4ecd32d 100644 --- a/include/d/actor/d_a_warpdm20.h +++ b/include/d/actor/d_a_warpdm20.h @@ -7,11 +7,11 @@ class daWarpdm20_c : public fopAc_ac_c { public: void set_mtx() {} - void _delete(); + BOOL _delete(); void CreateHeap(); void CreateInit(); - void _create(); - void _execute(); + s32 _create(); + BOOL _execute(); void normal_execute(); void demo_execute(); void demo_proc(); @@ -36,7 +36,7 @@ public: void set_wpsenko(); void init_bck_anm(int); void check_warp(); - void _draw(); + BOOL _draw(); public: /* Place member variables here */ diff --git a/include/d/actor/d_a_warpf.h b/include/d/actor/d_a_warpf.h index ccbd3d19..65b5e607 100644 --- a/include/d/actor/d_a_warpf.h +++ b/include/d/actor/d_a_warpf.h @@ -6,12 +6,12 @@ class daWarpf_c : public fopAc_ac_c { public: void CreateHeap(); - void _delete(); + BOOL _delete(); void checkEndDemo(); void onEndDemo(); void CreateInit(); - void _create(); - void _execute(); + s32 _create(); + BOOL _execute(); void eventOrder(); void checkOrder(); void demo_proc(); @@ -37,7 +37,7 @@ public: void setEndAnim(); void set_se(); void set_mtx(); - void _draw(); + BOOL _draw(); public: /* Place member variables here */ diff --git a/include/d/actor/d_a_warpfout.h b/include/d/actor/d_a_warpfout.h index 03e169f6..26e03245 100644 --- a/include/d/actor/d_a_warpfout.h +++ b/include/d/actor/d_a_warpfout.h @@ -5,12 +5,12 @@ class daWarpfout_c : public fopAc_ac_c { public: - void _draw() {} + inline BOOL _draw(); - void _delete(); + BOOL _delete(); void CreateInit(); - void _create(); - void _execute(); + s32 _create(); + BOOL _execute(); void checkOrder(); void eventOrder(); void demo_proc(); diff --git a/include/d/actor/d_a_warpgn.h b/include/d/actor/d_a_warpgn.h index c53e48a2..ae75a289 100644 --- a/include/d/actor/d_a_warpgn.h +++ b/include/d/actor/d_a_warpgn.h @@ -7,11 +7,11 @@ class daWarpgn_c : public fopAc_ac_c { public: void set_mtx() {} - void _delete(); + BOOL _delete(); void CreateHeap(); void CreateInit(); - void _create(); - void _execute(); + s32 _create(); + BOOL _execute(); void normal_execute(); void demo_execute(); void demo_proc(); @@ -33,7 +33,7 @@ public: void set_end_anim(); void check_warp(); void checkValidWarp(); - void _draw(); + BOOL _draw(); public: /* Place member variables here */ diff --git a/include/d/actor/d_a_warphr.h b/include/d/actor/d_a_warphr.h index 441c3b8d..c3f5c9a2 100644 --- a/include/d/actor/d_a_warphr.h +++ b/include/d/actor/d_a_warphr.h @@ -7,11 +7,11 @@ class daWarphr_c : public fopAc_ac_c { public: void set_mtx() {} - void _delete(); + BOOL _delete(); void CreateHeap(); void CreateInit(); - void _create(); - void _execute(); + s32 _create(); + BOOL _execute(); void normal_execute(); void demo_execute(); void demo_proc(); @@ -31,7 +31,7 @@ public: void set_end_anim(); void get_return_count(); void check_warp(); - void _draw(); + BOOL _draw(); public: /* Place member variables here */ diff --git a/include/d/actor/d_a_warpls.h b/include/d/actor/d_a_warpls.h index 3057272e..a6ca7e7d 100644 --- a/include/d/actor/d_a_warpls.h +++ b/include/d/actor/d_a_warpls.h @@ -5,14 +5,14 @@ class daWarpls_c : public fopAc_ac_c { public: - void _draw() {} + inline BOOL _draw(); void set_mtx() {} - void _delete(); + BOOL _delete(); void CreateHeap(); void CreateInit(); - void _create(); - void _execute(); + s32 _create(); + BOOL _execute(); void checkOrder(); void eventOrder(); void setStatus(); diff --git a/include/d/actor/d_a_warpmj.h b/include/d/actor/d_a_warpmj.h index 21c386ae..ac8d56e0 100644 --- a/include/d/actor/d_a_warpmj.h +++ b/include/d/actor/d_a_warpmj.h @@ -7,11 +7,11 @@ class daWarpmj_c : public fopAc_ac_c { public: void set_mtx() {} - void _delete(); + BOOL _delete(); void CreateHeap(); void CreateInit(); - void _create(); - void _execute(); + s32 _create(); + BOOL _execute(); void normal_execute(); void demo_execute(); void demo_proc(); @@ -27,7 +27,7 @@ public: void setEndAnm(); void getSeaY(cXyz); void check_warp(); - void _draw(); + BOOL _draw(); public: /* Place member variables here */ diff --git a/include/d/actor/d_a_waterfall.h b/include/d/actor/d_a_waterfall.h index 4bf95462..1753de56 100644 --- a/include/d/actor/d_a_waterfall.h +++ b/include/d/actor/d_a_waterfall.h @@ -5,16 +5,16 @@ class daWfall_c : public fopAc_ac_c { public: - void _draw() {} + inline BOOL _draw(); - void _delete(); + BOOL _delete(); void CreateHeap(); void CreateInit(); - void _create(); + s32 _create(); void set_mtx(); void set_gate_mtx(); void set_minamo_mtx(); - void _execute(); + BOOL _execute(); void mode_proc_call(); void mode_wtr_on_init(); void mode_wtr_on(); diff --git a/include/d/actor/d_a_wbird.h b/include/d/actor/d_a_wbird.h index 4a259f5a..e5c2ab5c 100644 --- a/include/d/actor/d_a_wbird.h +++ b/include/d/actor/d_a_wbird.h @@ -5,14 +5,14 @@ class daWbird_c : public fopAc_ac_c { public: - void draw() {} - void execute() {} + inline BOOL draw(); + inline BOOL execute(); void setAction(unsigned char) {} void calcMtx(); void setStartPos(); void CreateInit(); - void create(); + s32 create(); void actionWait(); void actionEnd(); void actionMove(); diff --git a/include/d/actor/d_a_wind_tag.h b/include/d/actor/d_a_wind_tag.h index 0540a47f..45071ac4 100644 --- a/include/d/actor/d_a_wind_tag.h +++ b/include/d/actor/d_a_wind_tag.h @@ -9,19 +9,19 @@ namespace daWindTag { void getCurLength() const {} void getMaxLength() const {} - void _delete(); + BOOL _delete(); void CreateHeap(); void CreateInit(); void set_wind_angle(); - void _create(); + s32 _create(); void set_mtx(); void checkSizeSpecialBig(); void set_wind_se_sub(unsigned long, cXyz*); void set_wind_se(); - void _execute(); + BOOL _execute(); void path_move(); void set_next_pnt(); - void _draw(); + BOOL _draw(); void MoveEmitter(); public: diff --git a/include/d/actor/d_a_windmill.h b/include/d/actor/d_a_windmill.h index 6af335b0..eaa9d275 100644 --- a/include/d/actor/d_a_windmill.h +++ b/include/d/actor/d_a_windmill.h @@ -9,17 +9,17 @@ public: void getRotSpeed() const {} void getType() const {} - void _delete(); + BOOL _delete(); void CreateHeap(); void CreateInit(); void search_wind(); - void _create(); + s32 _create(); void set_mtx(); - void _execute(); + BOOL _execute(); void hane_move(); void set_at(); void set_co(); - void _draw(); + BOOL _draw(); public: /* Place member variables here */ diff --git a/include/d/actor/d_a_ygcwp.h b/include/d/actor/d_a_ygcwp.h index 01cfbeb9..a9d6aa2f 100644 --- a/include/d/actor/d_a_ygcwp.h +++ b/include/d/actor/d_a_ygcwp.h @@ -10,13 +10,13 @@ public: void solidHeapCB(fopAc_ac_c*); void create_heap(); - void _create(); - void _delete(); + s32 _create(); + BOOL _delete(); void init_mtx(); void make_shine(); void set_timer(); - void _execute(); - void _draw(); + BOOL _execute(); + BOOL _draw(); public: /* Place member variables here */ diff --git a/include/d/actor/d_a_ykgr.h b/include/d/actor/d_a_ykgr.h index b99baaaf..c47950e0 100644 --- a/include/d/actor/d_a_ykgr.h +++ b/include/d/actor/d_a_ykgr.h @@ -15,10 +15,10 @@ public: static JPABaseEmitter* m_emitter; static u8 m_alpha_flag; - void _create() {} - void _delete() {} - void _draw() {} - void _execute() {} + inline s32 _create(); + inline BOOL _delete(); + inline BOOL _draw(); + inline BOOL _execute(); void hide() {} void init() {} void setAimRate(float) {} |
