diff --git a/src/melee/gm/gm_16A2.c b/src/melee/gm/gm_16A2.c
index 9ac76f5f29..ae82f05e5b 100644
--- a/src/melee/gm/gm_16A2.c
+++ b/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();
 
diff --git a/src/melee/gm/gm_16A2.h b/src/melee/gm/gm_16A2.h
index bace5bb338..b9df95b38f 100644
--- a/src/melee/gm/gm_16A2.h
+++ b/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);
diff --git a/src/melee/gr/grbigblue.c b/src/melee/gr/grbigblue.c
index c5578496bb..f2c9f13b9e 100644
--- a/src/melee/gr/grbigblue.c
+++ b/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)
 {
diff --git a/src/melee/gr/grbigblue.h b/src/melee/gr/grbigblue.h
index 42c822025c..2b102b8112 100644
--- a/src/melee/gr/grbigblue.h
+++ b/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);
diff --git a/src/melee/gr/grbigblueroute.c b/src/melee/gr/grbigblueroute.c
index f1322ebf65..9e6e3ea5ab 100644
--- a/src/melee/gr/grbigblueroute.c
+++ b/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);
diff --git a/src/melee/gr/grbigblueroute.h b/src/melee/gr/grbigblueroute.h
index f423d2f1e4..d7f97c5b23 100644
--- a/src/melee/gr/grbigblueroute.h
+++ b/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);
diff --git a/src/melee/gr/grcastle.c b/src/melee/gr/grcastle.c
index 6a6f2200d1..3c2bc2fded 100644
--- a/src/melee/gr/grcastle.c
+++ b/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;
diff --git a/src/melee/gr/grcastle.h b/src/melee/gr/grcastle.h
index fa9adc7972..e49b2e52b7 100644
--- a/src/melee/gr/grcastle.h
+++ b/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);
diff --git a/src/melee/gr/grfigure1.c b/src/melee/gr/grfigure1.c
index b02ba785a3..fa142b701c 100644
--- a/src/melee/gr/grfigure1.c
+++ b/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) {}
diff --git a/src/melee/gr/grfigure1.h b/src/melee/gr/grfigure1.h
index 6746510297..f36163db57 100644
--- a/src/melee/gr/grfigure1.h
+++ b/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
diff --git a/src/melee/gr/grfigure3.c b/src/melee/gr/grfigure3.c
index 00ec6885d8..393b68967b 100644
--- a/src/melee/gr/grfigure3.c
+++ b/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)
 {
diff --git a/src/melee/gr/grflatzone.c b/src/melee/gr/grflatzone.c
index f18a10f12d..f19d9a9dea 100644
--- a/src/melee/gr/grflatzone.c
+++ b/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)
 {
diff --git a/src/melee/gr/grflatzone.h b/src/melee/gr/grflatzone.h
index 7896d04ad7..152eb00c2b 100644
--- a/src/melee/gr/grflatzone.h
+++ b/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);
diff --git a/src/melee/gr/grfourside.c b/src/melee/gr/grfourside.c
index 6575832251..7843a34fc6 100644
--- a/src/melee/gr/grfourside.c
+++ b/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)
 {
diff --git a/src/melee/gr/grfourside.h b/src/melee/gr/grfourside.h
index 06101271f7..f12383aee3 100644
--- a/src/melee/gr/grfourside.h
+++ b/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);
diff --git a/src/melee/gr/grgarden.c b/src/melee/gr/grgarden.c
index fd526e5625..e48918465a 100644
--- a/src/melee/gr/grgarden.c
+++ b/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)
 {
diff --git a/src/melee/gr/grgarden.h b/src/melee/gr/grgarden.h
index c52876e1ca..b7cad7a5a3 100644
--- a/src/melee/gr/grgarden.h
+++ b/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);
diff --git a/src/melee/gr/grgreatbay.c b/src/melee/gr/grgreatbay.c
index fcf66eb580..a31bad306d 100644
--- a/src/melee/gr/grgreatbay.c
+++ b/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;
 }
diff --git a/src/melee/gr/grgreatbay.h b/src/melee/gr/grgreatbay.h
index d58b97b28f..7309508269 100644
--- a/src/melee/gr/grgreatbay.h
+++ b/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);
diff --git a/src/melee/gr/grgreens.c b/src/melee/gr/grgreens.c
index 6539667f9c..30b08bdbdd 100644
--- a/src/melee/gr/grgreens.c
+++ b/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;
 }
diff --git a/src/melee/gr/grgreens.h b/src/melee/gr/grgreens.h
index 80e3294859..2e0397ed7a 100644
--- a/src/melee/gr/grgreens.h
+++ b/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);
diff --git a/src/melee/gr/grheal.c b/src/melee/gr/grheal.c
index d7982f18dd..daa37598a8 100644
--- a/src/melee/gr/grheal.c
+++ b/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)
 {
diff --git a/src/melee/gr/grhomerun.c b/src/melee/gr/grhomerun.c
index 561e8946eb..3911f5abc0 100644
--- a/src/melee/gr/grhomerun.c
+++ b/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)
 {
diff --git a/src/melee/gr/grhomerun.h b/src/melee/gr/grhomerun.h
index 0a35670b8f..a842e854dd 100644
--- a/src/melee/gr/grhomerun.h
+++ b/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);
diff --git a/src/melee/gr/gricemt.c b/src/melee/gr/gricemt.c
index 1687772755..596e3ff24c 100644
--- a/src/melee/gr/gricemt.c
+++ b/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;
 }
diff --git a/src/melee/gr/grinishie1.c b/src/melee/gr/grinishie1.c
index 8fa59c47db..c0052a767f 100644
--- a/src/melee/gr/grinishie1.c
+++ b/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
diff --git a/src/melee/gr/grinishie2.c b/src/melee/gr/grinishie2.c
index f135201194..b15c4d81a3 100644
--- a/src/melee/gr/grinishie2.c
+++ b/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)
 {
diff --git a/src/melee/gr/grinishie2.h b/src/melee/gr/grinishie2.h
index 3036961989..3c8ce275fa 100644
--- a/src/melee/gr/grinishie2.h
+++ b/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);
diff --git a/src/melee/gr/grizumi.c b/src/melee/gr/grizumi.c
index 132b877c06..6b5acbe453 100644
--- a/src/melee/gr/grizumi.c
+++ b/src/melee/gr/grizumi.c
@@ -177,7 +177,7 @@ StageData grIz_StageData = {
     3,
 };
 
-void grIzumi_801CBB84(bool x)
+void grIzumi_801CBB84(int x)
 {
     return;
 }
diff --git a/src/melee/gr/grizumi.h b/src/melee/gr/grizumi.h
index 47306cd035..ff05f05380 100644
--- a/src/melee/gr/grizumi.h
+++ b/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);
diff --git a/src/melee/gr/grkinokoroute.c b/src/melee/gr/grkinokoroute.c
index e3925c9cfe..4d3efa4f5e 100644
--- a/src/melee/gr/grkinokoroute.c
+++ b/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)
diff --git a/src/melee/gr/grkinokoroute.h b/src/melee/gr/grkinokoroute.h
index 9e034f9514..0fb244369a 100644
--- a/src/melee/gr/grkinokoroute.h
+++ b/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*);
diff --git a/src/melee/gr/grkongo.c b/src/melee/gr/grkongo.c
index 3d6d38d4dd..18e531a600 100644
--- a/src/melee/gr/grkongo.c
+++ b/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)
 {
diff --git a/src/melee/gr/grkongo.h b/src/melee/gr/grkongo.h
index a1cd05b6e3..588ada194c 100644
--- a/src/melee/gr/grkongo.h
+++ b/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);
diff --git a/src/melee/gr/grkraid.h b/src/melee/gr/grkraid.h
index 1d62a52ae3..f32511fa4e 100644
--- a/src/melee/gr/grkraid.h
+++ b/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);
diff --git a/src/melee/gr/grlast.c b/src/melee/gr/grlast.c
index aece14308f..b158c86651 100644
--- a/src/melee/gr/grlast.c
+++ b/src/melee/gr/grlast.c
@@ -70,7 +70,7 @@
 /* 21B2E0 */ static void grLast_8021B2E0(Ground_GObj*);
 /* 21B2E4 */ static void grLast_8021B2E4(Ground_GObj*);
 /* 21B2E8 */ static void grLast_8021B2E8(Ground_GObj*);
-/* 21B5C4 */ static bool grLast_8021B5C4(Ground_GObj*);
+/* 21B5C4 */ static int grLast_8021B5C4(Ground_GObj*);
 /* 21B920 */ static void grLast_8021B920(Ground_GObj*, int);
 /* 21C40C */ static void grLast_8021C40C(Ground_GObj*, GXColor, float);
 /* 21C500 */ static void grLast_8021C500(Ground_GObj*);
diff --git a/src/melee/gr/grlib.h b/src/melee/gr/grlib.h
index 200d77bf32..1dfd604f72 100644
--- a/src/melee/gr/grlib.h
+++ b/src/melee/gr/grlib.h
@@ -28,6 +28,6 @@
 /* 1C9E40 */ int grLib_801C9E40(void);
 /* 1C9E50 */ void grLib_801C9E50(s16);
 /* 1C9E60 */ bool grLib_801C9E60(Vec3*);
-/* 1C9EE8 */ int grLib_801C9EE8(Vec3*, float);
+/* 1C9EE8 */ bool grLib_801C9EE8(Vec3*, float);
 
 #endif
diff --git a/src/melee/gr/grmutecity.c b/src/melee/gr/grmutecity.c
index e1be6a73b1..72adc0d399 100644
--- a/src/melee/gr/grmutecity.c
+++ b/src/melee/gr/grmutecity.c
@@ -361,7 +361,7 @@ static struct grMc_YakumonoParam* yakumono_param;
 
 static s32 grMc_804D69D4;
 
-void grMuteCity_801EFC68(bool arg) {}
+void grMuteCity_801EFC68(int arg) {}
 
 void grMuteCity_801EFC6C(void)
 {
@@ -1912,7 +1912,11 @@ s32 grMuteCity_801F2AB0(s32 arg0, HSD_JObj* arg1)
         if ((appsrt = gen->appsrt) == NULL) {
             appsrt = psAddGeneratorAppSRT_begin(gen, 0);
             if (appsrt == NULL) {
+#ifdef MUST_MATCH
                 return;
+#else
+                return 0;
+#endif
             }
         }
         appsrt->xA2 = 0;
diff --git a/src/melee/gr/grmutecity.h b/src/melee/gr/grmutecity.h
index 2f0cbeb68a..3368966761 100644
--- a/src/melee/gr/grmutecity.h
+++ b/src/melee/gr/grmutecity.h
@@ -9,7 +9,7 @@
 #include <dolphin/mtx.h>
 #include <baselib/spline.h>
 
-/* 1EFC68 */ void grMuteCity_801EFC68(bool);
+/* 1EFC68 */ void grMuteCity_801EFC68(int);
 /* 1EFC6C */ void grMuteCity_801EFC6C(void);
 /* 1EFCDC */ void grMuteCity_801EFCDC(void);
 /* 1EFCE0 */ void grMuteCity_801EFCE0(void);
diff --git a/src/melee/gr/groldkongo.c b/src/melee/gr/groldkongo.c
index d9101b03f9..1a95174518 100644
--- a/src/melee/gr/groldkongo.c
+++ b/src/melee/gr/groldkongo.c
@@ -63,7 +63,7 @@ struct grOldKongo_YakumonoParam {
     s32 x6C;
 };
 
-/* 20F468 */ static void grOldKongo_8020F468(bool);
+/* 20F468 */ static void grOldKongo_8020F468(int);
 /* 20F46C */ static void grOldKongo_8020F46C(void);
 /* 20F4E4 */ static void grOldKongo_8020F4E4(void);
 /* 20F4E8 */ static void grOldKongo_8020F4E8(void);
@@ -144,7 +144,7 @@ StageData grOk_StageData = {
     ARRAY_SIZE(grOk_803E6580),
 };
 
-void grOldKongo_8020F468(bool arg) {}
+void grOldKongo_8020F468(int arg) {}
 
 void grOldKongo_8020F46C(void)
 {
diff --git a/src/melee/gr/groldpupupu.c b/src/melee/gr/groldpupupu.c
index de3a80b467..8c9b16373f 100644
--- a/src/melee/gr/groldpupupu.c
+++ b/src/melee/gr/groldpupupu.c
@@ -138,7 +138,7 @@ StageData grOp_StageData = {
     0,
 };
 
-void grOldPupupu_802107DC(bool arg) {}
+void grOldPupupu_802107DC(int arg) {}
 
 void grOldPupupu_802107E0(void)
 {
diff --git a/src/melee/gr/groldpupupu.h b/src/melee/gr/groldpupupu.h
index 6ab634a7cb..2003a25543 100644
--- a/src/melee/gr/groldpupupu.h
+++ b/src/melee/gr/groldpupupu.h
@@ -6,7 +6,7 @@
 
 #include <dolphin/mtx.h>
 
-/* 2107DC */ void grOldPupupu_802107DC(bool);
+/* 2107DC */ void grOldPupupu_802107DC(int);
 /* 2107E0 */ void grOldPupupu_802107E0(void);
 /* 210884 */ void grOldPupupu_80210884(void);
 /* 210888 */ void grOldPupupu_80210888(void);
diff --git a/src/melee/gr/groldyoshi.c b/src/melee/gr/groldyoshi.c
index f5b44776dc..ce8613dace 100644
--- a/src/melee/gr/groldyoshi.c
+++ b/src/melee/gr/groldyoshi.c
@@ -66,7 +66,7 @@ static struct {
     s16 x18;
 }* yakumono_param;
 
-void grOldYoshi_8020E798(bool arg) {}
+void grOldYoshi_8020E798(int arg) {}
 
 void grOldYoshi_8020E79C(void)
 {
diff --git a/src/melee/gr/groldyoshi.h b/src/melee/gr/groldyoshi.h
index 35577d9aba..1ee748b8a1 100644
--- a/src/melee/gr/groldyoshi.h
+++ b/src/melee/gr/groldyoshi.h
@@ -5,7 +5,7 @@
 
 #include <dolphin/mtx.h>
 
-/* 20E798 */ void grOldYoshi_8020E798(bool);
+/* 20E798 */ void grOldYoshi_8020E798(int);
 /* 20E79C */ void grOldYoshi_8020E79C(void);
 /* 20E824 */ void grOldYoshi_8020E824(void);
 /* 20E828 */ void grOldYoshi_8020E828(void);
diff --git a/src/melee/gr/gronett.c b/src/melee/gr/gronett.c
index f02ebbe345..6b93ef7eb0 100644
--- a/src/melee/gr/gronett.c
+++ b/src/melee/gr/gronett.c
@@ -119,7 +119,7 @@ static struct grOnett_StageParam* yakumono_param;
 
 static s32 grOt_804D69C4;
 
-void grOnett_801E3734(bool arg) {}
+void grOnett_801E3734(int arg) {}
 
 void grOnett_801E3738(void)
 {
diff --git a/src/melee/gr/gronett.h b/src/melee/gr/gronett.h
index f8eb614aca..2e6b3d9994 100644
--- a/src/melee/gr/gronett.h
+++ b/src/melee/gr/gronett.h
@@ -9,7 +9,7 @@
 
 #include <dolphin/mtx.h>
 
-/* 1E3734 */ void grOnett_801E3734(bool);
+/* 1E3734 */ void grOnett_801E3734(int);
 /* 1E3738 */ void grOnett_801E3738(void);
 /* 1E37C4 */ void grOnett_801E37C4(void);
 /* 1E37C8 */ void grOnett_801E37C8(void);
diff --git a/src/melee/gr/grpura.c b/src/melee/gr/grpura.c
index aea2276c43..5ef6194b36 100644
--- a/src/melee/gr/grpura.c
+++ b/src/melee/gr/grpura.c
@@ -40,7 +40,7 @@ struct GrPuVtxMapEntry {
     /* 0x8 */ HSD_JObj* jobj;
 };
 
-/* 211CFC */ static void grPura_80211CFC(bool);
+/* 211CFC */ static void grPura_80211CFC(int);
 /* 211D00 */ static void grPura_80211D00(void);
 /* 211DD8 */ static void grPura_80211DD8(void);
 /* 211DDC */ static void grPura_80211DDC(void);
@@ -293,7 +293,7 @@ StageData grPu_StageData = {
     0,
 };
 
-void grPura_80211CFC(bool num) {}
+void grPura_80211CFC(int num) {}
 
 /* 4D6AA0 */ static void* yakumono_param;
 
diff --git a/src/melee/gr/grpushon.c b/src/melee/gr/grpushon.c
index 1242c56964..3494d0fda2 100644
--- a/src/melee/gr/grpushon.c
+++ b/src/melee/gr/grpushon.c
@@ -115,7 +115,7 @@ StageData grPushOn_StageData = {
     0,
 };
 
-void grPushOn_802182C4(bool arg) {}
+void grPushOn_802182C4(int arg) {}
 
 void grPushOn_802182C8(void)
 {
diff --git a/src/melee/gr/grpushon.h b/src/melee/gr/grpushon.h
index 3659f8691e..5488f48187 100644
--- a/src/melee/gr/grpushon.h
+++ b/src/melee/gr/grpushon.h
@@ -3,7 +3,7 @@
 
 #include "gr/forward.h"
 
-/* 2182C4 */ void grPushOn_802182C4(bool);
+/* 2182C4 */ void grPushOn_802182C4(int);
 /* 2182C8 */ void grPushOn_802182C8(void);
 /* 218330 */ void grPushOn_80218330(void);
 /* 218378 */ void grPushOn_80218378(void);
diff --git a/src/melee/gr/grrcruise.c b/src/melee/gr/grrcruise.c
index 1e287ad3dd..d654c3f0ab 100644
--- a/src/melee/gr/grrcruise.c
+++ b/src/melee/gr/grrcruise.c
@@ -124,7 +124,7 @@ struct StageData grRc_StageData = {
 
 static struct grRCruise_YakumonoParam* yakumono_param;
 
-void grRCruise_801FF164(bool arg) {}
+void grRCruise_801FF164(int arg) {}
 
 void grRCruise_801FF168(void)
 {
diff --git a/src/melee/gr/grrcruise.h b/src/melee/gr/grrcruise.h
index 1e67626da1..a036bd9740 100644
--- a/src/melee/gr/grrcruise.h
+++ b/src/melee/gr/grrcruise.h
@@ -5,7 +5,7 @@
 
 #include <dolphin/mtx.h>
 
-/* 1FF164 */ void grRCruise_801FF164(bool);
+/* 1FF164 */ void grRCruise_801FF164(int);
 /* 1FF168 */ void grRCruise_801FF168(void);
 /* 1FF298 */ void grRCruise_801FF298(void);
 /* 1FF29C */ void grRCruise_801FF29C(void);
diff --git a/src/melee/gr/grshrine.c b/src/melee/gr/grshrine.c
index 59c06c39eb..8f0dd8af13 100644
--- a/src/melee/gr/grshrine.c
+++ b/src/melee/gr/grshrine.c
@@ -16,7 +16,7 @@
 #include <baselib/gobj.h>
 #include <baselib/gobjproc.h>
 
-static void grShrine_80201C60(bool);
+static void grShrine_80201C60(int);
 static void grShrine_80201C64(void);
 static void grShrine_UnkStage0_OnLoad(void);
 static void grShrine_UnkStage0_OnStart(void);
@@ -65,7 +65,7 @@ StageData grSh_StageData = {
     0,
 };
 
-static void grShrine_80201C60(bool arg0) {}
+static void grShrine_80201C60(int arg0) {}
 
 static void grShrine_80201C64(void)
 {
diff --git a/src/melee/gr/grshrineroute.c b/src/melee/gr/grshrineroute.c
index a313f6c8ad..e4749acf44 100644
--- a/src/melee/gr/grshrineroute.c
+++ b/src/melee/gr/grshrineroute.c
@@ -56,7 +56,7 @@ struct grSh_Route_LightConfig {
     /* 0x30 */ GXDistAttnFn dist_func;
 };
 
-/* 2087B8 */ static void grShrineRoute_OnDemoInit(bool);
+/* 2087B8 */ static void grShrineRoute_OnDemoInit(int);
 /* 2087BC */ static void grShrineRoute_OnInit(void);
 /* 20882C */ static void grShrineRoute_OnLoad(void);
 /* 208850 */ static void grShrineRoute_OnStart(void);
@@ -178,7 +178,7 @@ StageData grSh_Route_StageData = {
 
 static struct grShrineRoute_YakumonoParam* yakumono_param;
 
-void grShrineRoute_OnDemoInit(bool arg) {}
+void grShrineRoute_OnDemoInit(int arg) {}
 
 void grShrineRoute_OnInit(void)
 {
@@ -538,8 +538,8 @@ void grShrineRoute_80208F70(Ground_GObj* gobj)
                             }
                         }
                         grZakoGenerator_801CAF08();
-                        grShrineRoute_8020B020((HSD_GObj*) gobj,
-                                               (s32) gp->u.shrineroute.xC8, 1);
+                        grShrineRoute_8020B020(gobj, gp->u.shrineroute.xC8,
+                                               true);
                     }
                 }
             }
@@ -605,7 +605,7 @@ void grShrineRoute_80208F70(Ground_GObj* gobj)
                 (u16) (gp->u.shrineroute.xC6 |
                        (1 << (gp->u.shrineroute.xC8 - 0xBD)));
             grZakoGenerator_801CAEF0(1);
-            grShrineRoute_8020B020((HSD_GObj*) gobj, -1, 0);
+            grShrineRoute_8020B020((HSD_GObj*) gobj, -1, false);
             gp->u.shrineroute.xCE = 0x3C;
             mpJointListAdd(0);
             mpJointListAdd(1);
@@ -1532,7 +1532,7 @@ void grShrineRoute_8020AF38(HSD_GObj* gobj, s32 arg1)
     }
 }
 
-void grShrineRoute_8020B020(HSD_GObj* gobj, int r4, int r5)
+void grShrineRoute_8020B020(HSD_GObj* gobj, int r4, bool hide)
 {
     Ground* gp = gobj->user_data;
     int comp;
@@ -1543,7 +1543,7 @@ void grShrineRoute_8020B020(HSD_GObj* gobj, int r4, int r5)
         if (r4 == -1 || i != comp) {
             if (gp->u.map.symbol[i]) {
                 if (GET_JOBJ(gp->u.map.symbol[i])) {
-                    if (r5) {
+                    if (hide) {
                         HSD_JObjSetFlagsAll(gp->u.map.symbol[i]->hsd_obj,
                                             JOBJ_HIDDEN);
                     } else {
diff --git a/src/melee/gr/grstory.c b/src/melee/gr/grstory.c
index 99dc2b1daa..bf4e7680b0 100644
--- a/src/melee/gr/grstory.c
+++ b/src/melee/gr/grstory.c
@@ -23,7 +23,7 @@ struct grStory_YakumonoParam {
     float vpos[6];
 };
 
-/* 1E302C */ static void grStory_801E302C(bool);
+/* 1E302C */ static void grStory_801E302C(int);
 /* 1E36D0 */ static DynamicsDesc* grStory_801E36D0(enum_t);
 
 static StageCallbacks grSt_StageCallbacks[] = {
@@ -71,7 +71,7 @@ StageData grSt_StageData = {
     0,
 };
 
-static void grStory_801E302C(bool _) {}
+static void grStory_801E302C(int _) {}
 
 void grStory_801E3030(void)
 {
diff --git a/src/melee/gr/grtclink.c b/src/melee/gr/grtclink.c
index 74ff9717e9..a331fac92d 100644
--- a/src/melee/gr/grtclink.c
+++ b/src/melee/gr/grtclink.c
@@ -52,7 +52,7 @@ StageData grTCLink_StageData = {
     0,
 };
 
-void grTCLink_8021FF44(bool unused) {}
+void grTCLink_8021FF44(int unused) {}
 
 void grTCLink_8021FF48(void)
 {
diff --git a/src/melee/gr/grtclink.h b/src/melee/gr/grtclink.h
index 3752fa2668..f24ca7d772 100644
--- a/src/melee/gr/grtclink.h
+++ b/src/melee/gr/grtclink.h
@@ -9,7 +9,7 @@
 
 #include <dolphin/mtx.h>
 
-/* 21FF44 */ void grTCLink_8021FF44(bool);
+/* 21FF44 */ void grTCLink_8021FF44(int);
 /* 21FF48 */ void grTCLink_8021FF48(void);
 /* 21FFB8 */ void grTclink_UnkStage0_OnLoad(void);
 /* 21FFBC */ void grTclink_UnkStage0_OnStart(void);
diff --git a/src/melee/gr/grtdonkey.c b/src/melee/gr/grtdonkey.c
index 918c656267..ce574e9050 100644
--- a/src/melee/gr/grtdonkey.c
+++ b/src/melee/gr/grtdonkey.c
@@ -11,7 +11,7 @@
 #include <dolphin/mtx.h>
 #include <baselib/gobjproc.h>
 
-/* 220228 */ static void grTDonkey_80220228(bool);
+/* 220228 */ static void grTDonkey_80220228(int);
 /* 22022C */ static void grTDonkey_8022022C(void);
 /* 22029C */ static void grTdonkey_UnkStage0_OnLoad(void);
 /* 2202A0 */ static void grTdonkey_UnkStage0_OnStart(void);
@@ -73,7 +73,7 @@ StageData grTDk_StageData = {
     0,
 };
 
-static void grTDonkey_80220228(bool arg0) {}
+static void grTDonkey_80220228(int arg0) {}
 
 static void grTDonkey_8022022C(void)
 {
diff --git a/src/melee/gr/grtdrmario.c b/src/melee/gr/grtdrmario.c
index 46abfb34ed..ba34dcd07c 100644
--- a/src/melee/gr/grtdrmario.c
+++ b/src/melee/gr/grtdrmario.c
@@ -15,7 +15,7 @@
 #include <dolphin/mtx.h>
 #include <baselib/gobjproc.h>
 
-/* 22050C */ static void grtDrMario_8022050C(bool);
+/* 22050C */ static void grtDrMario_8022050C(int);
 /* 220510 */ static void grtDrMario_80220510(void);
 /* 220580 */ static void grTdrmario_UnkStage0_OnLoad(void);
 /* 220584 */ static void grTdrmario_UnkStage0_OnStart(void);
@@ -77,7 +77,7 @@ StageData grTDr_StageData = {
     0,
 };
 
-void grtDrMario_8022050C(bool unk0) {}
+void grtDrMario_8022050C(int unk0) {}
 
 void grtDrMario_80220510(void)
 {
diff --git a/src/melee/gr/grtemblem.c b/src/melee/gr/grtemblem.c
index 3f03071204..370ba2562b 100644
--- a/src/melee/gr/grtemblem.c
+++ b/src/melee/gr/grtemblem.c
@@ -17,7 +17,7 @@
 #include <dolphin/mtx.h>
 #include <baselib/gobjproc.h>
 
-static void grTRoy_802243F4(bool);
+static void grTRoy_802243F4(int);
 static void grTRoy_802243F8(void);
 static void grTemblem_UnkStage0_OnLoad(void);
 static void grTemblem_UnkStage0_OnStart(void);
@@ -76,7 +76,7 @@ StageData grTFe_StageData = {
     1,
 };
 
-static void grTRoy_802243F4(bool arg0) {}
+static void grTRoy_802243F4(int arg0) {}
 
 static void grTRoy_802243F8(void)
 {
diff --git a/src/melee/gr/grtest.c b/src/melee/gr/grtest.c
index 0eb9a6c8d3..1347d87e89 100644
--- a/src/melee/gr/grtest.c
+++ b/src/melee/gr/grtest.c
@@ -48,7 +48,7 @@ StageData grTe_StageData = {
 
 float grTe_804D6A48;
 
-void grTest_80206E2C(bool unused) {}
+void grTest_80206E2C(int unused) {}
 
 void grTest_80206E30(void)
 {
diff --git a/src/melee/gr/grtest.h b/src/melee/gr/grtest.h
index 7c01d19083..99eed9482e 100644
--- a/src/melee/gr/grtest.h
+++ b/src/melee/gr/grtest.h
@@ -6,7 +6,7 @@
 
 #include <dolphin/mtx.h>
 
-/* 206E2C */ void grTest_80206E2C(bool);
+/* 206E2C */ void grTest_80206E2C(int);
 /* 206E30 */ void grTest_80206E30(void);
 /* 207014 */ void grTest_UnkStage0_OnLoad(void);
 /* 207018 */ void grTest_UnkStage0_OnStart(void);
diff --git a/src/melee/gr/grtfalco.c b/src/melee/gr/grtfalco.c
index 6f9822b93e..27096f7959 100644
--- a/src/melee/gr/grtfalco.c
+++ b/src/melee/gr/grtfalco.c
@@ -17,7 +17,7 @@
 #include <baselib/gobj.h>
 #include <baselib/gobjproc.h>
 
-/* 2207F0 */ static void grTFalco_802207F0(bool);
+/* 2207F0 */ static void grTFalco_802207F0(int);
 /* 2207F4 */ static void grTFalco_802207F4(void);
 /* 22086C */ static void grTfalco_UnkStage0_OnLoad(void);
 /* 220870 */ static void grTfalco_UnkStage0_OnStart(void);
@@ -88,7 +88,7 @@ struct grTFalco_YakumonoParam {
 
 static struct grTFalco_YakumonoParam* yakumono_param;
 
-void grTFalco_802207F0(bool arg0) {}
+void grTFalco_802207F0(int arg0) {}
 
 void grTFalco_802207F4(void)
 {
diff --git a/src/melee/gr/grtfox.c b/src/melee/gr/grtfox.c
index 22e46f6bda..cf03d996a9 100644
--- a/src/melee/gr/grtfox.c
+++ b/src/melee/gr/grtfox.c
@@ -19,7 +19,7 @@ struct grTFox_YakumonoParam {
     UNK_T unkC;
 };
 
-static void grTFox_80220B80(bool);
+static void grTFox_80220B80(int);
 static void grTFox_80220B84(void);
 static void grTFox_UnkStage0_OnLoad(void);
 static void grTFox_UnkStage0_OnStart(void);
@@ -64,7 +64,7 @@ StageData grTFx_StageData = {
     1,
 };
 
-void grTFox_80220B80(bool unk) {}
+void grTFox_80220B80(int unk) {}
 
 void grTFox_80220B84(void)
 {
diff --git a/src/melee/gr/grtgamewatch.c b/src/melee/gr/grtgamewatch.c
index 33d626660e..a9ddcce4f5 100644
--- a/src/melee/gr/grtgamewatch.c
+++ b/src/melee/gr/grtgamewatch.c
@@ -35,7 +35,7 @@ StageData grTGw_StageData = {
     (1 << 0),
 };
 
-void grTGameWatch_80224110(bool unused)
+void grTGameWatch_80224110(int unused)
 {
     return;
 }
diff --git a/src/melee/gr/grtgamewatch.h b/src/melee/gr/grtgamewatch.h
index 2cb6df4a9f..3d3549acd3 100644
--- a/src/melee/gr/grtgamewatch.h
+++ b/src/melee/gr/grtgamewatch.h
@@ -7,7 +7,7 @@
 
 #include <dolphin/mtx.h>
 
-/* 224110 */ void grTGameWatch_80224110(bool);
+/* 224110 */ void grTGameWatch_80224110(int);
 /* 224114 */ void grTGameWatch_80224114(void);
 /* 224184 */ void grTgamewatch_UnkStage0_OnLoad(void);
 /* 224188 */ void grTgamewatch_UnkStage0_OnStart(void);
diff --git a/src/melee/gr/grtganon.c b/src/melee/gr/grtganon.c
index 33f6e48dad..e8cc8ea9cb 100644
--- a/src/melee/gr/grtganon.c
+++ b/src/melee/gr/grtganon.c
@@ -46,7 +46,7 @@ typedef struct grTGn_YakumonoParam {
 
 static grTGn_YakumonoParam* yakumono_param;
 
-void grTGanon_802246D8(bool unused)
+void grTGanon_802246D8(int unused)
 {
     return;
 }
diff --git a/src/melee/gr/grtganon.h b/src/melee/gr/grtganon.h
index e909fa7bdf..12c8baa280 100644
--- a/src/melee/gr/grtganon.h
+++ b/src/melee/gr/grtganon.h
@@ -7,7 +7,7 @@
 
 #include <dolphin/mtx.h>
 
-/* 2246D8 */ void grTGanon_802246D8(bool);
+/* 2246D8 */ void grTGanon_802246D8(int);
 /* 2246DC */ void grTGanon_802246DC(void);
 /* 224754 */ void grTganon_UnkStage0_OnLoad(void);
 /* 224758 */ void grTganon_UnkStage0_OnStart(void);
diff --git a/src/melee/gr/grticeclimber.c b/src/melee/gr/grticeclimber.c
index 5b56341915..a522369357 100644
--- a/src/melee/gr/grticeclimber.c
+++ b/src/melee/gr/grticeclimber.c
@@ -18,7 +18,7 @@
 #include <baselib/gobjproc.h>
 #include <baselib/jobj.h>
 
-/* 220F10 */ static void grTIceClimber_80220F10(bool);
+/* 220F10 */ static void grTIceClimber_80220F10(int);
 /* 220F14 */ static void grTIceClimber_80220F14(void);
 /* 220F84 */ static void grTiceclimber_UnkStage0_OnLoad(void);
 /* 220F88 */ static void grTiceclimber_UnkStage0_OnStart(void);
@@ -83,7 +83,7 @@ StageData grTIc_StageData = {
     0,
 };
 
-void grTIceClimber_80220F10(bool unused) {}
+void grTIceClimber_80220F10(int unused) {}
 
 void grTIceClimber_80220F14(void)
 {
diff --git a/src/melee/gr/grtkirby.c b/src/melee/gr/grtkirby.c
index 8aab8234cb..92c7013031 100644
--- a/src/melee/gr/grtkirby.c
+++ b/src/melee/gr/grtkirby.c
@@ -16,7 +16,7 @@
 #include <dolphin/mtx.h>
 #include <baselib/gobjproc.h>
 
-void grTKirby_80221364(bool);                  /* static */
+void grTKirby_80221364(int);                   /* static */
 void grTKirby_80221368(void);                  /* static */
 void grTkirby_UnkStage0_OnLoad(void);          /* static */
 void grTkirby_UnkStage0_OnStart(void);         /* static */
@@ -78,7 +78,7 @@ StageData grTKb_StageData = {
     0,
 };
 
-void grTKirby_80221364(bool unk) {}
+void grTKirby_80221364(int unk) {}
 
 void grTKirby_80221368(void)
 {
diff --git a/src/melee/gr/grtkoopa.c b/src/melee/gr/grtkoopa.c
index 845a2156c7..2892aae7aa 100644
--- a/src/melee/gr/grtkoopa.c
+++ b/src/melee/gr/grtkoopa.c
@@ -16,7 +16,7 @@
 #include <baselib/gobj.h>
 #include <baselib/gobjproc.h>
 
-/* 221648 */ static void grTKoopa_80221648(bool);
+/* 221648 */ static void grTKoopa_80221648(int);
 /* 22164C */ static void grTKoopa_8022164C(void);
 /* 2216BC */ static void grTkoopa_UnkStage0_OnLoad(void);
 /* 2216C0 */ static void grTkoopa_UnkStage0_OnStart(void);
@@ -78,7 +78,7 @@ StageData grTKp_StageData = {
     0,
 };
 
-static void grTKoopa_80221648(bool arg0) {}
+static void grTKoopa_80221648(int arg0) {}
 
 static void grTKoopa_8022164C(void)
 {
diff --git a/src/melee/gr/grtlink.c b/src/melee/gr/grtlink.c
index d454ff429d..474b14e529 100644
--- a/src/melee/gr/grtlink.c
+++ b/src/melee/gr/grtlink.c
@@ -15,7 +15,7 @@
 #include <dolphin/mtx.h>
 #include <baselib/gobjproc.h>
 
-/* 22192C */ static void grTLink_8022192C(bool);
+/* 22192C */ static void grTLink_8022192C(int);
 /* 221930 */ static void grTLink_80221930(void);
 /* 2219A0 */ static void grTlink_UnkStage0_OnLoad(void);
 /* 2219A4 */ static void grTlink_UnkStage0_OnStart(void);
@@ -77,7 +77,7 @@ StageData grTLk_StageData = {
     0,
 };
 
-void grTLink_8022192C(bool unk0) {}
+void grTLink_8022192C(int unk0) {}
 
 void grTLink_80221930(void)
 {
diff --git a/src/melee/gr/grtluigi.c b/src/melee/gr/grtluigi.c
index f54f8e0e22..952cd26cda 100644
--- a/src/melee/gr/grtluigi.c
+++ b/src/melee/gr/grtluigi.c
@@ -47,7 +47,7 @@ StageData grTLg_StageData = {
     1,
 };
 
-void grTLuigi_80221C10(bool arg0) {}
+void grTLuigi_80221C10(int arg0) {}
 
 void grTLuigi_80221C14(void)
 {
diff --git a/src/melee/gr/grtluigi.h b/src/melee/gr/grtluigi.h
index 2543ee9417..dad0196521 100644
--- a/src/melee/gr/grtluigi.h
+++ b/src/melee/gr/grtluigi.h
@@ -9,7 +9,7 @@
 
 #include <dolphin/mtx.h>
 
-/* 221C10 */ void grTLuigi_80221C10(bool);
+/* 221C10 */ void grTLuigi_80221C10(int);
 /* 221C14 */ void grTLuigi_80221C14(void);
 /* 221C84 */ void grTluigi_UnkStage0_OnLoad(void);
 /* 221C88 */ void grTluigi_UnkStage0_OnStart(void);
diff --git a/src/melee/gr/grtmario.c b/src/melee/gr/grtmario.c
index cce7471ef9..3e790ac3e8 100644
--- a/src/melee/gr/grtmario.c
+++ b/src/melee/gr/grtmario.c
@@ -18,7 +18,7 @@
 #include <baselib/gobj.h>
 #include <baselib/gobjproc.h>
 
-/* 21F840 */ static void grTMario_8021F840(bool);
+/* 21F840 */ static void grTMario_8021F840(int);
 /* 21F844 */ static void grTMario_8021F844(void);
 /* 21F8B4 */ static void grTmario_UnkStage0_OnLoad(void);
 /* 21F8B8 */ static void grTmario_UnkStage0_OnStart(void);
@@ -83,7 +83,7 @@ StageData grTMr_StageData = {
     0,
 };
 
-void grTMario_8021F840(bool unk) {}
+void grTMario_8021F840(int unk) {}
 
 void grTMario_8021F844(void)
 {
diff --git a/src/melee/gr/grtmars.c b/src/melee/gr/grtmars.c
index 9263f1a858..7f2f6937eb 100644
--- a/src/melee/gr/grtmars.c
+++ b/src/melee/gr/grtmars.c
@@ -11,7 +11,7 @@
 #include <dolphin/mtx.h>
 #include <baselib/gobjproc.h>
 
-/* 221EF4 */ static void grTMars_80221EF4(bool);
+/* 221EF4 */ static void grTMars_80221EF4(int);
 /* 221EF8 */ static void grTMars_80221EF8(void);
 /* 221F68 */ static void grTmars_UnkStage0_OnLoad(void);
 /* 221F6C */ static void grTmars_UnkStage0_OnStart(void);
@@ -71,7 +71,7 @@ StageData grTMs_StageData = {
     0,
 };
 
-static void grTMars_80221EF4(bool arg0) {}
+static void grTMars_80221EF4(int arg0) {}
 
 static void grTMars_80221EF8(void)
 {
diff --git a/src/melee/gr/grtmewtwo.c b/src/melee/gr/grtmewtwo.c
index a05625877d..28b80d11ca 100644
--- a/src/melee/gr/grtmewtwo.c
+++ b/src/melee/gr/grtmewtwo.c
@@ -31,7 +31,7 @@ typedef struct grTMewtwo_UnkStruct {
     DynamicsDesc* x18;
 } grTMewtwo_UnkStruct;
 
-/* 2221D8 */ static void grTMewtwo_802221D8(bool arg0);
+/* 2221D8 */ static void grTMewtwo_802221D8(int arg0);
 /* 2221DC */ static void grTMewtwo_802221DC(void);
 /* 222254 */ static void grTmewtwo_UnkStage0_OnLoad(void);
 /* 222258 */ static void grTmewtwo_UnkStage0_OnStart(void);
@@ -100,7 +100,7 @@ StageData grTMewtwo_StageData = {
     NULL,
 };
 
-void grTMewtwo_802221D8(bool arg0) {}
+void grTMewtwo_802221D8(int arg0) {}
 
 void grTMewtwo_802221DC(void)
 {
diff --git a/src/melee/gr/grtness.c b/src/melee/gr/grtness.c
index d712ed200f..5ccfea589b 100644
--- a/src/melee/gr/grtness.c
+++ b/src/melee/gr/grtness.c
@@ -14,7 +14,7 @@
 #include <baselib/gobj.h>
 #include <baselib/gobjproc.h>
 
-/* 2225D0 */ static void grTNess_802225D0(bool);
+/* 2225D0 */ static void grTNess_802225D0(int);
 /* 2225D4 */ static void grTNess_802225D4(void);
 /* 222644 */ static void grTness_UnkStage0_OnLoad(void);
 /* 222648 */ static void grTness_UnkStage0_OnStart(void);
@@ -72,7 +72,7 @@ StageData grTNs_StageData = {
     0x00000001,
 };
 
-static void grTNess_802225D0(bool arg0)
+static void grTNess_802225D0(int arg0)
 {
     return;
 }
diff --git a/src/melee/gr/grtpeach.c b/src/melee/gr/grtpeach.c
index fe6886aeb0..0a1244f4f9 100644
--- a/src/melee/gr/grtpeach.c
+++ b/src/melee/gr/grtpeach.c
@@ -16,7 +16,7 @@
 #include <baselib/gobj.h>
 #include <baselib/gobjproc.h>
 
-/* 2228B4 */ static void grTPeach_802228B4(bool arg0);
+/* 2228B4 */ static void grTPeach_802228B4(int arg0);
 /* 2228B8 */ static void grTPeach_802228B8(void);
 /* 222928 */ static void grTpeach_UnkStage0_OnLoad(void);
 /* 22292C */ static void grTpeach_UnkStage0_OnStart(void);
@@ -85,7 +85,7 @@ StageData grTPe_StageData = {
     0,
 };
 
-void grTPeach_802228B4(bool arg0) {}
+void grTPeach_802228B4(int arg0) {}
 
 void grTPeach_802228B8(void)
 {
diff --git a/src/melee/gr/grtpichu.c b/src/melee/gr/grtpichu.c
index e2d90f8878..fcd986c928 100644
--- a/src/melee/gr/grtpichu.c
+++ b/src/melee/gr/grtpichu.c
@@ -15,7 +15,7 @@
 #include <dolphin/mtx.h>
 #include <baselib/gobjproc.h>
 
-/* 222B98 */ static void grTPichu_80222B98(bool);
+/* 222B98 */ static void grTPichu_80222B98(int);
 /* 222B9C */ static void grTPichu_80222B9C(void);
 /* 222C0C */ static void grTpichu_UnkStage0_OnLoad(void);
 /* 222C10 */ static void grTpichu_UnkStage0_OnStart(void);
@@ -77,7 +77,7 @@ StageData grTPc_StageData = {
     0,
 };
 
-static void grTPichu_80222B98(bool arg0) {}
+static void grTPichu_80222B98(int arg0) {}
 
 static void grTPichu_80222B9C(void)
 {
diff --git a/src/melee/gr/grtpikachu.c b/src/melee/gr/grtpikachu.c
index 38939cdea5..acd608b20a 100644
--- a/src/melee/gr/grtpikachu.c
+++ b/src/melee/gr/grtpikachu.c
@@ -34,7 +34,7 @@ StageData grTPk_StageData = {
     (1 << 0),
 };
 
-void grTPikachu_80222E7C(bool unused)
+void grTPikachu_80222E7C(int unused)
 {
     return;
 }
diff --git a/src/melee/gr/grtpikachu.h b/src/melee/gr/grtpikachu.h
index d7d8fee6c0..851106d57b 100644
--- a/src/melee/gr/grtpikachu.h
+++ b/src/melee/gr/grtpikachu.h
@@ -9,7 +9,7 @@
 
 #include <dolphin/mtx.h>
 
-/* 222E7C */ void grTPikachu_80222E7C(bool);
+/* 222E7C */ void grTPikachu_80222E7C(int);
 /* 222E80 */ void grTPikachu_80222E80(void);
 /* 222EF0 */ void grTpikachu_UnkStage0_OnLoad(void);
 /* 222EF4 */ void grTpikachu_UnkStage0_OnStart(void);
diff --git a/src/melee/gr/grtpurin.c b/src/melee/gr/grtpurin.c
index a65a3d53dc..9a37a406d3 100644
--- a/src/melee/gr/grtpurin.c
+++ b/src/melee/gr/grtpurin.c
@@ -44,7 +44,7 @@ typedef struct grTPrSpecialParams {
 
 static grTPrSpecialParams* yakumono_param;
 
-void grTPurin_80223160(bool unused)
+void grTPurin_80223160(int unused)
 {
     return;
 }
diff --git a/src/melee/gr/grtpurin.h b/src/melee/gr/grtpurin.h
index 126606abc1..2241f195c4 100644
--- a/src/melee/gr/grtpurin.h
+++ b/src/melee/gr/grtpurin.h
@@ -10,7 +10,7 @@
 
 #include <dolphin/mtx.h>
 
-/* 223160 */ void grTPurin_80223160(bool);
+/* 223160 */ void grTPurin_80223160(int);
 /* 223164 */ void grTPurin_80223164(void);
 /* 2231DC */ void grTpurin_UnkStage0_OnLoad(void);
 /* 2231E0 */ void grTpurin_UnkStage0_OnStart(void);
diff --git a/src/melee/gr/grtseak.c b/src/melee/gr/grtseak.c
index 303a7ca28b..e6fe7ffd71 100644
--- a/src/melee/gr/grtseak.c
+++ b/src/melee/gr/grtseak.c
@@ -15,7 +15,7 @@
 #include <dolphin/mtx.h>
 #include <baselib/gobjproc.h>
 
-/* 223864 */ static void grTSeak_OnDemoInit(bool);
+/* 223864 */ static void grTSeak_OnDemoInit(int);
 /* 223868 */ static void grTSeak_OnInit(void);
 /* 2238D8 */ static void grTseak_OnLoad(void);
 /* 2238DC */ static void grTseak_OnStart(void);
@@ -75,7 +75,7 @@ StageData grTSk_StageData = {
     1,
 };
 
-void grTSeak_OnDemoInit(bool unk0) {}
+void grTSeak_OnDemoInit(int unk0) {}
 
 void grTSeak_OnInit(void)
 {
diff --git a/src/melee/gr/grtyoshi.c b/src/melee/gr/grtyoshi.c
index 8c4d71e6db..66c47d8257 100644
--- a/src/melee/gr/grtyoshi.c
+++ b/src/melee/gr/grtyoshi.c
@@ -15,7 +15,7 @@
 #include <baselib/gobjproc.h>
 #include <baselib/jobj.h>
 
-/* 223B48 */ static void grTYoshi_OnDemoInit(bool);
+/* 223B48 */ static void grTYoshi_OnDemoInit(int);
 /* 223B4C */ static void grTYoshi_OnInit(void);
 /* 223BBC */ static void grTYoshi_OnLoad(void);
 /* 223BC0 */ static void grTYoshi_OnStart(void);
@@ -77,7 +77,7 @@ StageData grTYs_StageData = {
     0,
 };
 
-static void grTYoshi_OnDemoInit(bool arg0) {}
+static void grTYoshi_OnDemoInit(int arg0) {}
 
 static void grTYoshi_OnInit(void)
 {
diff --git a/src/melee/gr/grtzelda.c b/src/melee/gr/grtzelda.c
index b4b8e85a95..6c1d9517bb 100644
--- a/src/melee/gr/grtzelda.c
+++ b/src/melee/gr/grtzelda.c
@@ -17,7 +17,7 @@
 #include <dolphin/mtx.h>
 #include <baselib/gobjproc.h>
 
-void grTZelda_OnDemoInit(bool);                           /* static */
+void grTZelda_OnDemoInit(int);                            /* static */
 void grTZelda_OnInit(void);                               /* static */
 void grTZelda_OnLoad(void);                               /* static */
 void grTZelda_OnStart(void);                              /* static */
diff --git a/src/melee/gr/grvenom.c b/src/melee/gr/grvenom.c
index 37a984a45c..72d569e1b7 100644
--- a/src/melee/gr/grvenom.c
+++ b/src/melee/gr/grvenom.c
@@ -410,7 +410,8 @@ void grVenom_8020362C(void)
         }
     }
 }
-void grVenom_80203B14(bool arg) {}
+
+void grVenom_80203B14(int arg) {}
 
 static inline void inlineA0(void)
 {
diff --git a/src/melee/gr/grvenom.h b/src/melee/gr/grvenom.h
index 384b60a5b5..d420d27f67 100644
--- a/src/melee/gr/grvenom.h
+++ b/src/melee/gr/grvenom.h
@@ -6,7 +6,7 @@
 #include "gr/forward.h"
 
 /* 20362C */ UNK_RET grVenom_8020362C(UNK_PARAMS);
-/* 203B14 */ void grVenom_80203B14(bool);
+/* 203B14 */ void grVenom_80203B14(int);
 /* 203B18 */ void grVenom_80203B18(void);
 /* 203DD0 */ void grVenom_80203DD0(void);
 /* 203E80 */ void grVenom_80203E80(void);
diff --git a/src/melee/gr/gryorster.c b/src/melee/gr/gryorster.c
index 43e50aa6f9..44a42f1465 100644
--- a/src/melee/gr/gryorster.c
+++ b/src/melee/gr/gryorster.c
@@ -76,7 +76,7 @@ typedef struct grYt_804D6A20_t {
 } grYt_804D6A20_t;
 grYt_804D6A20_t grYt_804D6A20;
 
-void grYorster_80201FA0(bool unused)
+void grYorster_80201FA0(int unused)
 {
     return;
 }
diff --git a/src/melee/gr/gryorster.h b/src/melee/gr/gryorster.h
index 94c1f3a981..188938d037 100644
--- a/src/melee/gr/gryorster.h
+++ b/src/melee/gr/gryorster.h
@@ -7,7 +7,7 @@
 
 #include <dolphin/mtx.h>
 
-/* 201FA0 */ void grYorster_80201FA0(bool);
+/* 201FA0 */ void grYorster_80201FA0(int);
 /* 201FA4 */ void grYorster_80201FA4(void);
 /* 20200C */ void grYorster_8020200C(void);
 /* 202010 */ void grYorster_80202010(void);
diff --git a/src/melee/gr/grzebes.c b/src/melee/gr/grzebes.c
index ca078f8865..d27492d7ea 100644
--- a/src/melee/gr/grzebes.c
+++ b/src/melee/gr/grzebes.c
@@ -27,7 +27,7 @@
 #include <baselib/lobj.h>
 #include <baselib/random.h>
 
-/* 1D84A0 */ static void grZebes_801D84A0(bool arg);
+/* 1D84A0 */ static void grZebes_801D84A0(int arg);
 /* 1D8528 */ static void grZebes_801D8528(void);
 /* 1D852C */ void grZebes_801D852C(void);
 /* 1D8550 */ static bool grZebes_801D8550(void);
@@ -249,7 +249,7 @@ StageData grZe_StageData = {
     ARRAY_SIZE(grZe_803E1A10),
 };
 
-void grZebes_801D84A0(bool arg) {}
+void grZebes_801D84A0(int arg) {}
 
 void grZebes_801D84A4(void)
 {
diff --git a/src/melee/gr/grzebesroute.c b/src/melee/gr/grzebesroute.c
index 80678da8f8..ad96f4fd2c 100644
--- a/src/melee/gr/grzebesroute.c
+++ b/src/melee/gr/grzebesroute.c
@@ -79,7 +79,7 @@ StageData grZe_Route_StageData = {
 
 static struct grZebesRoute_YakumonoParam* yakumono_param;
 
-void grZebesRoute_8020B160(bool arg) {}
+void grZebesRoute_8020B160(int arg) {}
 
 void grZebesRoute_8020B164(void)
 {
diff --git a/src/melee/gr/grzebesroute.h b/src/melee/gr/grzebesroute.h
index 3677151158..00f63cfadd 100644
--- a/src/melee/gr/grzebesroute.h
+++ b/src/melee/gr/grzebesroute.h
@@ -6,7 +6,7 @@
 
 #include <dolphin/mtx.h>
 
-/* 20B160 */ void grZebesRoute_8020B160(bool);
+/* 20B160 */ void grZebesRoute_8020B160(int);
 /* 20B164 */ void grZebesRoute_8020B164(void);
 /* 20B1D4 */ void grZebesRoute_8020B1D4(void);
 /* 20B1F4 */ void grZebesRoute_8020B1F4(void);