gr: Fix type of OnDemoInit callbacks

src/melee/gm/gm_16A2.c

@@ -75,7 +75,7 @@ void fn_80169434(GmRouteCallback fn)
     gm_1601_GetUnkData()->x1B8 = fn;
 }
 
-bool fn_80169444(bool arg0)
+bool fn_80169444(int arg0)
 {
     struct lbl_8046B488_t* gp = gm_1601_GetUnkData();
 

src/melee/gm/gm_16A2.h

@@ -12,7 +12,7 @@ s32 gm_80169394(void);
 s32 fn_801693A8(void);
 bool gm_801693BC(int);
 void fn_80169434(GmRouteCallback fn);
-bool fn_80169444(bool);
+bool fn_80169444(int);
 int gm_801694A0(HSD_GObj*);
 void* gm_80169520(void);
 void* gm_80169530(void);

src/melee/gr/grbigblue.c

@@ -214,7 +214,7 @@ const grBb_LineIds grBb_803B8134 = { {
     50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65,
 } };
 
-void grBigBlue_801E57BC(bool arg) {}
+static void grBigBlue_801E57BC(int arg) {}
 
 void grBigBlue_801E57C0(void)
 {

src/melee/gr/grbigblue.h

@@ -7,7 +7,6 @@
 
 #include <dolphin/mtx.h>
 
-/* 1E57BC */ void grBigBlue_801E57BC(bool);
 /* 1E57C0 */ void grBigBlue_801E57C0(void);
 /* 1E59C8 */ void grBigBlue_801E59C8(void);
 /* 1E59CC */ void grBigBlue_801E59CC(void);

src/melee/gr/grbigblueroute.c

@@ -154,7 +154,7 @@ static void order_data(void)
 }
 #endif
 
-void grBigBlueRoute_8020B864(bool arg)
+void grBigBlueRoute_8020B864(int arg)
 {
     HSD_GObj* gobj;
     gobj = Ground_GetMapGObj(0x1F);

src/melee/gr/grbigblueroute.h

@@ -9,7 +9,7 @@
 
 #include <dolphin/mtx.h>
 
-/* 20B864 */ void grBigBlueRoute_8020B864(bool);
+/* 20B864 */ void grBigBlueRoute_8020B864(int);
 /* 20B89C */ void grBigBlueRoute_8020B89C(void);
 /* 20B920 */ void grBigBlueRoute_8020B920(void);
 /* 20B95C */ void grBigBlueRoute_8020B95C(void);

src/melee/gr/grcastle.c

@@ -215,7 +215,7 @@ typedef struct grCastle_YOffsets {
     f32 v[6];
 } grCastle_YOffsets;
 
-void grCastle_801CD338(bool arg0)
+void grCastle_801CD338(int arg0)
 {
     HSD_GObj* gobj;
     HSD_JObj* jobj;

src/melee/gr/grcastle.h

@@ -11,7 +11,7 @@
 
 #include <dolphin/mtx.h>
 
-/* 1CD338 */ void grCastle_801CD338(bool);
+/* 1CD338 */ void grCastle_801CD338(int);
 /* 1CD37C */ void grCastle_801CD37C(void);
 /* 1CD4A0 */ void grCastle_801CD4A0(void);
 /* 1CD4A4 */ void grCastle_801CD4A4(void);

src/melee/gr/grfigure1.c

@@ -167,4 +167,4 @@ static bool grFigure1_OnCheckShadowRender(Vec3* v, int n, HSD_JObj* o)
     return true;
 }
 
-void grFigure1_8020E270(bool n) {}
+void grFigure1_8020E270(int n) {}

src/melee/gr/grfigure1.h

@@ -3,7 +3,7 @@
 
 #include "gr/forward.h"
 
-/* 20E270 */ void grFigure1_8020E270(bool);
+/* 20E270 */ void grFigure1_8020E270(int);
 /* 3E62C0 */ extern StageData grEF1_StageData;
 
 #endif

src/melee/gr/grfigure3.c

@@ -14,7 +14,7 @@
 #include <baselib/gobj.h>
 #include <baselib/gobjproc.h>
 
-static void grFigure3_8020E504(bool number);
+static void grFigure3_8020E504(int number);
 static void grFigure3_8020E508(void);
 static void grFigure3_OnLoad(void);
 static void grFigure3_OnStart(void);
@@ -62,7 +62,7 @@ StageData grEF3_StageData = {
 
 static void* yakumono_param;
 
-static void grFigure3_8020E504(bool number) {}
+static void grFigure3_8020E504(int number) {}
 
 static void grFigure3_8020E508(void)
 {

src/melee/gr/grflatzone.c

@@ -122,7 +122,7 @@ StageData grFz_StageData = {
 static struct grFlatzone_YakumonoParam* yakumono_param;
 static const Vec3 grFz_803B8430 = { 0 };
 
-void grFlatzone_80216E74(bool arg0) {}
+void grFlatzone_80216E74(int arg0) {}
 
 void grFlatzone_80216E78(void)
 {

src/melee/gr/grflatzone.h

@@ -7,7 +7,7 @@
 
 #include <dolphin/mtx.h>
 
-/* 216E74 */ void grFlatzone_80216E74(bool);
+/* 216E74 */ void grFlatzone_80216E74(int);
 /* 216E78 */ void grFlatzone_80216E78(void);
 /* 216F38 */ void grFlatzone_UnkStage0_OnLoad(void);
 /* 216F3C */ void grFlatzone_UnkStage0_OnStart(void);

src/melee/gr/grfourside.c

@@ -132,7 +132,7 @@ StageData grFs_StageData = {
     ARRAY_SIZE(grFs_803E3CE8),
 };
 
-void grFourside_801F2D0C(bool arg) {}
+void grFourside_801F2D0C(int arg) {}
 
 void grFourside_801F2D10(void)
 {

src/melee/gr/grfourside.h

@@ -7,7 +7,7 @@
 #include "lb/forward.h"
 #include <baselib/forward.h>
 
-/* 1F2D0C */ void grFourside_801F2D0C(bool);
+/* 1F2D0C */ void grFourside_801F2D0C(int);
 /* 1F2D10 */ void grFourside_801F2D10(void);
 /* 1F2DA0 */ void grFourside_801F2DA0(void);
 /* 1F2DA4 */ void grFourside_801F2DA4(void);

src/melee/gr/grgarden.c

@@ -70,7 +70,7 @@ StageData grGd_StageData = {
 
 static struct grGarden_YakumonoParam* yakumono_param;
 
-void grGarden_80202B6C(bool arg) {}
+void grGarden_80202B6C(int arg) {}
 
 void grGarden_80202B70(void)
 {

src/melee/gr/grgarden.h

@@ -6,7 +6,7 @@
 #include "gr/forward.h"
 #include "it/forward.h"
 
-/* 202B6C */ void grGarden_80202B6C(bool);
+/* 202B6C */ void grGarden_80202B6C(int);
 /* 202B70 */ void grGarden_80202B70(void);
 /* 202C24 */ void grGarden_80202C24(void);
 /* 202C4C */ void grGarden_80202C4C(void);

src/melee/gr/grgreatbay.c

@@ -196,7 +196,7 @@ typedef struct grGb_804D69E0_t {
 } grGb_804D69E0_t;
 grGb_804D69E0_t grGb_804D69E0;
 
-void grGreatBay_801F423C(bool unused)
+void grGreatBay_801F423C(int unused)
 {
     return;
 }

src/melee/gr/grgreatbay.h

@@ -9,7 +9,7 @@
 
 #include <dolphin/mtx.h>
 
-/* 1F423C */ void grGreatBay_801F423C(bool);
+/* 1F423C */ void grGreatBay_801F423C(int);
 /* 1F4240 */ void grGreatBay_801F4240(void);
 /* 1F42D0 */ void grGreatBay_801F42D0(void);
 /* 1F42D4 */ void grGreatBay_801F42D4(void);

src/melee/gr/grgreens.c

@@ -191,7 +191,7 @@ static inline struct grGreens_BlockVars* getBlock(Ground* gp, int i, int j)
     return &gp->u.greens.x8_blocks[i][j];
 }
 
-void grGreens_80213458(bool arg)
+void grGreens_80213458(int arg)
 {
     grGr_804D6AAC = 1;
 }

src/melee/gr/grgreens.h

@@ -9,7 +9,7 @@
 
 #include <dolphin/mtx.h>
 
-/* 213458 */ void grGreens_80213458(bool);
+/* 213458 */ void grGreens_80213458(int);
 /* 213464 */ void grGreens_Init(void);
 /* 2134F4 */ void grGreens_802134F4(void);
 /* 2134F8 */ void grGreens_802134F8(void);

src/melee/gr/grheal.c

@@ -30,7 +30,7 @@ typedef struct grHeal_UnkData {
     s32 x4;
 } grHeal_UnkData;
 
-/* 21EF38 */ static void grHeal_8021EF38(bool);
+/* 21EF38 */ static void grHeal_8021EF38(int);
 /* 21EF3C */ static void grHeal_8021EF3C(void);
 /* 21EFBC */ static void grHeal_8021EFBC(void);
 /* 21EFC0 */ static void grHeal_8021EFC0(void);
@@ -138,7 +138,7 @@ s16 grHeal_804D49D8[4] = { 7, 8, 9, 0 };
 
 static grHeal_UnkData* grHeal_804D6AF0[2];
 
-void grHeal_8021EF38(bool arg0) {}
+void grHeal_8021EF38(int arg0) {}
 
 void grHeal_8021EF3C(void)
 {

src/melee/gr/grhomerun.c

@@ -90,7 +90,7 @@ StageData grHr_StageData = {
     1,
 };
 
-void grHomeRun_8021C750(bool arg) {}
+void grHomeRun_8021C750(int arg) {}
 
 void grHomeRun_8021C754(void)
 {

src/melee/gr/grhomerun.h

@@ -9,7 +9,7 @@
 
 #include <dolphin/mtx.h>
 
-/* 21C750 */ void grHomeRun_8021C750(bool);
+/* 21C750 */ void grHomeRun_8021C750(int);
 /* 21C754 */ void grHomeRun_8021C754(void);
 /* 21C7FC */ void grHomeRun_8021C7FC(void);
 /* 21C800 */ void grHomeRun_8021C800(void);

src/melee/gr/gricemt.c

@@ -127,7 +127,7 @@ struct grIceMt_YakumonoParam {
     float xCC;
 };
 
-/* 1F6868 */ static void grIceMt_801F6868(bool id);
+/* 1F6868 */ static void grIceMt_801F6868(int id);
 /* 1F686C */ static void grIceMt_801F686C(void);
 /* 1F7080 */ static void grIceMt_801F7080(void);
 /* 1F71DC */ static void grIceMt_801F71DC(void);
@@ -193,7 +193,7 @@ grIceMt_801FA0BC(struct grIceMt_GObj9_GObj10_UnderUpperIdPair* ids);
 /* 1FA364 */ static bool grIceMt_801FA364(struct grIceMt_FA364_State* state,
                                           float* out, GrIceMtCb cb,
                                           Ground_GObj* gobj);
-/* 1FA4CC */ static int fn_801FA4CC(int num);
+/* 1FA4CC */ static bool fn_801FA4CC(int num);
 /* 1FA500 */ static int grIceMt_801FA500(HSD_GObj*, HSD_JObj*);
 /* 1FA854 */ static void grIceMt_801FA854(void);
 /* 1FA8F8 */ static DynamicsDesc* grIceMt_801FA8F8(enum_t id);
@@ -408,7 +408,7 @@ static const GrIm588 grIm_804DB59C = { 3, 4 };
 static const GrIm588 grIm_804DB5A0 = { 1, 2 };
 static const GrIm588 grIm_804DB5A4 = { 3, 4 };
 
-void grIceMt_801F6868(bool id) {}
+void grIceMt_801F6868(int id) {}
 
 void grIceMt_801F686C(void)
 {
@@ -1943,13 +1943,13 @@ bool grIceMt_801FA364(struct grIceMt_FA364_State* state, f32* out,
     return ret;
 }
 
-int fn_801FA4CC(int num)
+bool fn_801FA4CC(int num)
 { // https://decomp.me/scratch/pSJNA
     if (num == 1) {
         Ground_801C5740(num);
-        num = 1;
+        num = true;
     } else {
-        num = 0;
+        num = false;
     }
     return num;
 }

src/melee/gr/grinishie1.c

@@ -29,7 +29,7 @@
 #include <sysdolphin/baselib/memory.h>
 #include <sysdolphin/baselib/random.h>
 
-/* 1FA908 */ static void grInishie1_801FA908(bool);
+/* 1FA908 */ static void grInishie1_801FA908(int);
 /* 1FA90C */ static void grInishie1_801FA90C(void);
 /* 1FA984 */ static void grInishie1_801FA984(void);
 /* 1FA988 */ static void grInishie1_801FA988(void);
@@ -222,7 +222,7 @@ static void order_data(void)
 }
 #endif
 
-void grInishie1_801FA908(bool arg) {}
+void grInishie1_801FA908(int arg) {}
 
 /// corresponds with the 3 - 13 - 3 block pattern on the stage
 #define BLOCK_COUNT 19

src/melee/gr/grinishie2.c

@@ -181,7 +181,7 @@ struct grInishie2_YakumonoParam {
 
 static struct grInishie2_YakumonoParam* yakumono_param;
 
-void grInishie2_801FCBC0(bool arg) {}
+void grInishie2_801FCBC0(int arg) {}
 
 void grInishie2_801FCBC4(void)
 {

src/melee/gr/grinishie2.h

@@ -7,7 +7,7 @@
 
 #include <dolphin/mtx.h>
 
-/* 1FCBC0 */ void grInishie2_801FCBC0(bool);
+/* 1FCBC0 */ void grInishie2_801FCBC0(int);
 /* 1FCBC4 */ void grInishie2_801FCBC4(void);
 /* 1FCCAC */ void grInishie2_801FCCAC(void);
 /* 1FCCB0 */ void grInishie2_801FCCB0(void);

src/melee/gr/grizumi.c

@@ -177,7 +177,7 @@ StageData grIz_StageData = {
     3,
 };
 
-void grIzumi_801CBB84(bool x)
+void grIzumi_801CBB84(int x)
 {
     return;
 }

src/melee/gr/grizumi.h

@@ -9,7 +9,7 @@
 
 #include <dolphin/mtx.h>
 
-/* 1CBB84 */ void grIzumi_801CBB84(bool);
+/* 1CBB84 */ void grIzumi_801CBB84(int);
 /* 1CBB88 */ void grIzumi_801CBB88(void);
 /* 1CBC0C */ void grIzumi_OnLoad(void);
 /* 1CBCBC */ void grIzumi_OnStart(void);

src/melee/gr/grkinokoroute.c

@@ -104,7 +104,7 @@ StageData grNKr_StageData = {
     0,
 };
 
-void grKinokoRoute_8020741C(bool arg) {}
+void grKinokoRoute_8020741C(int arg) {}
 
 void grKinokoRoute_80207420(void)
 {
@@ -558,9 +558,9 @@ bool grKinokoRoute_80208480(int arg)
 {
     if (arg == 1) {
         Ground_801C5740(arg);
-        return 1;
+        return true;
     }
-    return 0;
+    return false;
 }
 
 void grKinokoRoute_802084B4(HSD_GObj* gobj)

src/melee/gr/grkinokoroute.h

@@ -9,7 +9,7 @@
 
 #include <dolphin/mtx.h>
 
-/* 20741C */ void grKinokoRoute_8020741C(bool);
+/* 20741C */ void grKinokoRoute_8020741C(int);
 /* 207420 */ void grKinokoRoute_80207420(void);
 /* 207490 */ void grKinokoRoute_80207490(void);
 /* 2074D8 */ void grKinokoRoute_802074D8(void);
@@ -33,7 +33,7 @@
 /* 207C88 */ void grKinokoRoute_80207C88(Ground_GObj*);
 /* 208368 */ void grKinokoRoute_80208368(Ground_GObj*);
 /* 20836C */ void grKinokoRoute_8020836C(Ground_GObj*, int);
-/* 208480 */ bool grKinokoRoute_80208480(bool);
+/* 208480 */ bool grKinokoRoute_80208480(int);
 /* 2084B4 */ void grKinokoRoute_802084B4(Ground_GObj*);
 /* 208564 */ void grKinokoRoute_80208564(Ground_GObj*);
 /* 208660 */ bool grKinokoRoute_80208660(int unused, Fighter_GObj*);

src/melee/gr/grkongo.c

@@ -1142,7 +1142,7 @@ f32 grKongo_801D8314(void)
     return var_f31;
 }
 
-void grKongo_801D5238(bool arg) {}
+void grKongo_801D5238(int arg) {}
 
 void grKongo_801D523C(void)
 {

src/melee/gr/grkongo.h

@@ -6,7 +6,7 @@
 #include "gr/forward.h"
 #include <baselib/forward.h>
 
-/* 1D5238 */ void grKongo_801D5238(bool);
+/* 1D5238 */ void grKongo_801D5238(int);
 /* 1D523C */ void grKongo_801D523C(void);
 /* 1D52F8 */ void grKongo_801D52F8(void);
 /* 1D52FC */ void grKongo_801D52FC(void);

src/melee/gr/grkraid.h

@@ -7,7 +7,7 @@
 
 #include <dolphin/mtx.h>
 
-/* 1FDFF8 */ void grKraid_OnDemoInit(bool);
+/* 1FDFF8 */ void grKraid_OnDemoInit(int);
 /* 1FDFFC */ void grKraid_OnInit(void);
 /* 1FE094 */ void grKraid_OnLoad(void);
 /* 1FE098 */ void grKraid_OnStart(void);