Switch return type of _execute/_draw/_delete to be bool by default …

…instead of `BOOL` It's not completely consistent, but it seems like the majority used `bool`, and only a handful used `BOOL`. So I switched all of them to `bool` except for 13 TUs that stopped matching when changed like this.
zeldaret · Feb 1, 2025 · 025b7e4 · 025b7e4
1 parent 39aace2
commit 025b7e4
Show file tree

Hide file tree

Showing 328 changed files with 936 additions and 936 deletions.
diff --git 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:
-    inline BOOL _delete();
+    inline bool _delete();
 
     void CreateHeap();
     void CreateInit();
     void create_acorn();
     void create_acorn_sub(bool);
     s32 _create();
     void set_mtx();
-    BOOL _execute();
-    BOOL _draw();
+    bool _execute();
+    bool _draw();
 
 public:
     /* Place member variables here */

diff --git 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:
-    BOOL _delete();
+    bool _delete();
     void CreateHeap();
     void CreateInit();
     s32 _create();
     void set_mtx();
     void setMoveBGMtx();
-    BOOL _execute();
-    BOOL _draw();
+    bool _execute();
+    bool _draw();
 
 public:
     /* Place member variables here */

diff --git a/include/d/actor/d_a_beam.h b/include/d/actor/d_a_beam.h
@@ -6,8 +6,8 @@
 class daBeam_c : public fopAc_ac_c {
 public:
     inline s32 _create();
-    inline BOOL _delete();
-    inline BOOL _draw();
+    inline bool _delete();
+    inline bool _draw();
     void beamCheck() {}
     void beamOff() {}
     void beamOn() {}
@@ -25,7 +25,7 @@ class daBeam_c : public fopAc_ac_c {
     void set_mtx();
     void CreateHeap();
     void CreateInit();
-    BOOL _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
@@ -16,7 +16,7 @@ class daBFlower_c : public fopAc_ac_c {
         STATE_DEAD_e,
     };
 
-    inline BOOL _delete();
+    inline bool _delete();
 
     BOOL CreateHeap();
     void CreateInit();

diff --git a/include/d/actor/d_a_bigelf.h b/include/d/actor/d_a_bigelf.h
@@ -78,9 +78,9 @@ class daBigelf_c : public fopAc_ac_c {
     void event0();
     void dead();
     void wait_action(void*);
-    BOOL _draw();
-    BOOL _execute();
-    BOOL _delete();
+    bool _draw();
+    bool _execute();
+    bool _delete();
     s32 _create();
     void CreateHeap();
 

diff --git a/include/d/actor/d_a_canon.h b/include/d/actor/d_a_canon.h
@@ -6,9 +6,9 @@
 class daCanon_c : public fopAc_ac_c {
 public:
     inline s32 _create();
-    inline BOOL _delete();
-    inline BOOL _draw();
-    inline BOOL _execute();
+    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
@@ -46,9 +46,9 @@ namespace daComing2 {
         void coming_process_init(short);
         void coming_process_main();
         s32 _create();
-        BOOL _delete();
-        BOOL _execute();
-        BOOL _draw();
+        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
@@ -27,9 +27,9 @@ namespace daComing3 {
         void solidHeapCB(fopAc_ac_c*);
         void create_heap();
         s32 _create();
-        BOOL _delete();
-        BOOL _execute();
-        BOOL _draw();
+        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
@@ -11,7 +11,7 @@ class daDai_c : public fopAc_ac_c {
     void incNowDaizaNum() {}
     void incNowItemNum() {}
 
-    BOOL _delete();
+    bool _delete();
     void CreateHeap();
     void CreateInit();
     s32 _create();
@@ -20,9 +20,9 @@ class daDai_c : public fopAc_ac_c {
     void checkOrder();
     void XyCheckCB(int);
     void XyEventCB(int);
-    BOOL _execute();
+    bool _execute();
     void proc();
-    BOOL _draw();
+    bool _draw();
     void getMsg();
     void next_msgStatus(unsigned long*);
 

diff --git a/include/d/actor/d_a_daiocta.h b/include/d/actor/d_a_daiocta.h
@@ -55,15 +55,15 @@ class daDaiocta_c : public fopAc_ac_c {
     void modeProc(Proc_e, Mode_e);
     void setAnm();
     void setWater();
-    BOOL _execute();
+    bool _execute();
     void drawAwa();
     void drawSuikomi();
     void drawDebug();
-    BOOL _draw();
+    bool _draw();
     void getArg();
     void createInit();
     s32 _create();
-    BOOL _delete();
+    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
@@ -21,11 +21,11 @@ class daDaiocta_Eye_c : public fopAc_ac_c {
     void modeDeathInit();
     void modeDeath();
     void modeProcCall();
-    BOOL _execute();
-    BOOL _draw();
+    bool _execute();
+    bool _draw();
     void createInit();
     s32 _create();
-    BOOL _delete();
+    bool _delete();
 
 public:
     /* Place member variables here */

diff --git 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:
-    BOOL _delete();
+    bool _delete();
     void CreateInit();
     s32 _create();
-    BOOL _execute();
+    bool _execute();
     void search_wind();
     void ctrlEffect();
     void demo_proc();
@@ -20,7 +20,7 @@ class daFire_c : public fopAc_ac_c {
     void execPlayFire();
     void setDirParticle(cXyz*);
     void checkCol();
-    BOOL _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
@@ -105,16 +105,16 @@ class daFm_c : public fopEn_enemy_c {
     void setHoleEffect();
     void holeExecute();
     void setHoleScale(float, float, float);
-    BOOL _execute();
+    bool _execute();
     void MtxToRot(float(*)[4], csXyz*);
     void debugDraw();
     void holeDraw();
     void bodyDraw();
-    BOOL _draw();
+    bool _draw();
     void getArg();
     void createInit();
     s32 _create();
-    BOOL _delete();
+    bool _delete();
 
 public:
     /* 0x2AC */ u8 m2AC[0x2C5 - 0x2AC];

diff --git a/include/d/actor/d_a_goal_flag.h b/include/d/actor/d_a_goal_flag.h
@@ -6,9 +6,9 @@
 class daGoal_Flag_c : public fopAc_ac_c {
 public:
     inline s32 _create();
-    inline BOOL _delete();
-    inline BOOL _draw();
-    inline BOOL _execute();
+    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
@@ -17,9 +17,9 @@ class daGrid_c : public fopAc_ac_c {
     void force_calc_wind_rel_angle(short) {}
 
     s32 _create();
-    BOOL _delete();
-    BOOL _execute();
-    BOOL _draw();
+    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
@@ -42,12 +42,12 @@ class daGy_c : public fopEn_enemy_c {
     void lineCheck(cXyz*, cXyz*);
     void checkTgHit();
     void getWaterY();
-    BOOL _execute();
+    bool _execute();
     void drawDebug();
-    BOOL _draw();
+    bool _draw();
     void createInit();
     s32 _create();
-    BOOL _delete();
+    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
@@ -30,15 +30,15 @@ class daGy_Ctrl_c : public fopAc_ac_c {
     void modeHideInit();
     void modeHide();
     void deadCheckGy();
-    BOOL _execute();
-    BOOL _draw();
+    bool _execute();
+    bool _draw();
     void createInitNoArer();
     void createInit();
     void getParam(unsigned long, unsigned char, unsigned char);
     void getArg();
     void checkGyCtrlExist();
     s32 _create();
-    BOOL _delete();
+    bool _delete();
 
 public:
     /* Place member variables here */

diff --git 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:
-    BOOL _delete();
+    bool _delete();
     void CreateHeap();
     void CreateInit();
     s32 _create();
     void set_mtx();
-    BOOL _execute();
+    bool _execute();
     void lift_wave();
     void path_move();
     void lift_normal_move();
     void set_next_pnt();
-    BOOL _draw();
+    bool _draw();
 
 public:
     /* Place member variables here */

diff --git a/include/d/actor/d_a_kaji.h b/include/d/actor/d_a_kaji.h
@@ -22,8 +22,8 @@ class daKaji_c : public fopAc_ac_c {
     void setAnm(int, f32) {}
 
     inline s32 _create();
-    inline BOOL _delete();
-    inline BOOL _execute();
+    inline bool _delete();
+    inline bool _execute();
     inline bool _draw();
 
     BOOL CreateHeap();

diff --git a/include/d/actor/d_a_kmon.h b/include/d/actor/d_a_kmon.h
@@ -6,9 +6,9 @@
 class daKmon_c : public fopAc_ac_c {
 public:
     inline s32 _create();
-    inline BOOL _delete();
-    inline BOOL _draw();
-    inline BOOL _execute();
+    inline bool _delete();
+    inline bool _draw();
+    inline bool _execute();
 
     void set_mtx();
     void CreateHeap();

diff --git a/include/d/actor/d_a_lbridge.h b/include/d/actor/d_a_lbridge.h
@@ -7,7 +7,7 @@
 
 class daLbridge_c : public fopAc_ac_c {
 public:
-    inline BOOL _delete();
+    inline bool _delete();
 
     BOOL CreateHeap();
     void CreateInit();

diff --git 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:
-    BOOL _delete();
+    bool _delete();
     void CreateHeap();
     void CreateInit();
     s32 _create();
     void set_mtx();
     void setMoveBGMtx();
-    BOOL _execute();
+    bool _execute();
     void emitterCtrl();
     void MoveDownLift();
-    BOOL _draw();
+    bool _draw();
 
     void checkEndDownLift();
     void MoveUpLift();

diff --git 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:
-    inline BOOL _draw();
+    inline bool _draw();
 
-    BOOL _delete();
+    bool _delete();
     void CreateHeap();
     void CreateInit();
     s32 _create();
     void set_mtx();
     void setMoveBGMtx();
-    BOOL _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
@@ -9,9 +9,9 @@ class dBgW;
 class daLwood_c : public fopAc_ac_c {
 public:
     inline s32 _create();
-    inline BOOL _delete();
-    inline BOOL _draw();
-    inline BOOL _execute();
+    inline bool _delete();
+    inline bool _draw();
+    inline bool _execute();
     f32 getYureScale() const { return mScale; }
     s16 getYureTimer() const { return mTimer; }
     void setMoveBGMtx(); // weak but not inlined?