diff --git a/src/ov_SC01_005/ov_SC01_005_jr_8017ED5C.c b/src/ov_SC01_005/ov_SC01_005_jr_8017ED5C.c
index 265c165a8f..4ca926f317 100644
--- a/src/ov_SC01_005/ov_SC01_005_jr_8017ED5C.c
+++ b/src/ov_SC01_005/ov_SC01_005_jr_8017ED5C.c
@@ -3885,7 +3885,7 @@ s32 a0;
 }
 
 
-extern void func_8017FBCC(void);
+extern void func_8017FBCC(s32 arg0);
 extern void func_8017FD50(s32 a0);
 extern s32 func_801789AC(s32 arg0);
 extern void func_80178D18(void);
@@ -3896,7 +3896,7 @@ void func_80180974(s32 a0)
     s32 v0;
 
     if (*(s16 *)(a0 + 0x100) == 0) {
-        func_8017FBCC();
+        ((void (*)())func_8017FBCC)();
     } else {
         func_8017FD50(a0);
     }
diff --git a/src/ov_SC01_006/ov_SC01_006_jr_8017ED5C.c b/src/ov_SC01_006/ov_SC01_006_jr_8017ED5C.c
index b859a62deb..df9907ec2c 100644
--- a/src/ov_SC01_006/ov_SC01_006_jr_8017ED5C.c
+++ b/src/ov_SC01_006/ov_SC01_006_jr_8017ED5C.c
@@ -3917,7 +3917,7 @@ s32 a0;
 extern s32 func_801789AC(s32 arg0);
 extern void func_801746A4(void);
 extern void func_80178D18(void);
-extern void func_8017FBCC(void);
+extern void func_8017FBCC(s32 arg0);
 extern void func_8017FD50(s32);
 
 void func_80180974(a0)
@@ -3926,7 +3926,7 @@ s32 a0;
     s32 v0;
 
     if (*(s16 *)(a0 + 0x100) == 0) {
-        func_8017FBCC();
+        ((void (*)())func_8017FBCC)();
     } else {
         func_8017FD50(a0);
     }
diff --git a/src/ov_SC02_041/ov_SC02_041_jr_8017BEBC.c b/src/ov_SC02_041/ov_SC02_041_jr_8017BEBC.c
index 08604f2640..9aff2e2d88 100644
--- a/src/ov_SC02_041/ov_SC02_041_jr_8017BEBC.c
+++ b/src/ov_SC02_041/ov_SC02_041_jr_8017BEBC.c
@@ -7957,7 +7957,7 @@ extern s32 rand(void);
  * func_8018317C's).  Its own .s takes TWO args ($a0 = entity-owner, $a1 = id):
  * do NOT adopt the 1-arg `void f(void*)` spelling that the *unrelated* overlay
  * ov_SC03_001 uses for its own different function at the same address. */
-extern void func_801832F8(s32 a0, s32 a1);
+extern s32 func_801832F8(s32 a0, u16 a1);
 
 /* Spawn a 0x4F entity for `a0`, then jitter its three s16 fields at +0x6/+0xA/+0xE
  * by a random amount (mod 28 / 32 / 28, sign picked by a second rand()), flip the
@@ -8026,7 +8026,7 @@ s32 func_8018317C(s32 a0) {
      * not reproduce the target order -- only both together do, hence a real
      * barrier rather than a statement reorder. */
     __asm__ __volatile__("" ::: "memory");
-    func_801832F8(a0, 0x7F3);
+    ((s32 (*)())func_801832F8)(a0, 0x7F3);
     return s2;
 }
 
diff --git a/src/ov_SC03_105/ov_SC03_105_jr_8017C8D0.c b/src/ov_SC03_105/ov_SC03_105_jr_8017C8D0.c
index cba755cf00..680ea7c675 100644
--- a/src/ov_SC03_105/ov_SC03_105_jr_8017C8D0.c
+++ b/src/ov_SC03_105/ov_SC03_105_jr_8017C8D0.c
@@ -4113,7 +4113,7 @@ extern s32 func_8012BEE8(s32 a0);
 extern s32 func_8012CBF4(s32 a0);
 extern s32 func_8012CBA4(s32 a0);
 extern s32 func_8012C51C(void *a0, s32 a1);
-extern void func_8017F018(s32 a0);
+extern s32 func_8017F018(s32 a0);
 extern void func_8017F0C8(s32 a0, s32 a1);
 extern void func_8002D4C8(s32 a0, s32 a1);
 
@@ -4183,7 +4183,7 @@ void func_8017EE34(s32 a0) {
             return;
         }
     }
-    func_8017F018(s0);
+    ((s32 (*)())func_8017F018)(s0);
 }
 
 
diff --git a/src/ov_SC03_105/ov_SC03_105_jr_801813BC.c b/src/ov_SC03_105/ov_SC03_105_jr_801813BC.c
index 0c0f8bd450..136ec28749 100644
--- a/src/ov_SC03_105/ov_SC03_105_jr_801813BC.c
+++ b/src/ov_SC03_105/ov_SC03_105_jr_801813BC.c
@@ -2800,7 +2800,7 @@ extern u8   D_8018E11C[];
 extern void func_8017EC98(void *a0);
 extern s32 func_8012CBA4(s32 a0);
 extern s32 func_8012C51C(void *a0, s32 a1);
-extern void func_8017F018(s32 a0);
+extern s32 func_8017F018(s32 a0);
 extern void func_8017EE34(s32 a0);
 extern void func_8017EF94(s32 a0);
 extern s32 func_80132EF4(s32 a0, s32 a1);
diff --git a/src/ov_SC03_105/ov_SC03_105_jr_80181C84.c b/src/ov_SC03_105/ov_SC03_105_jr_80181C84.c
index 2ce97a8152..274dc0482d 100644
--- a/src/ov_SC03_105/ov_SC03_105_jr_80181C84.c
+++ b/src/ov_SC03_105/ov_SC03_105_jr_80181C84.c
@@ -2800,7 +2800,7 @@ extern u8   D_8018E11C[];
 extern void func_8017EC98(void *a0);
 extern s32 func_8012CBA4(s32 a0);
 extern s32 func_8012C51C(void *a0, s32 a1);
-extern void func_8017F018(s32 a0);
+extern s32 func_8017F018(s32 a0);
 extern void func_8017EE34(s32 a0);
 extern void func_8017EF94(s32 a0);
 extern s32 func_80132EF4(s32 a0, s32 a1);
diff --git a/src/ov_SC03_105/ov_SC03_105_jr_80186B24.c b/src/ov_SC03_105/ov_SC03_105_jr_80186B24.c
index 0c5e1130b6..92e20ed1c1 100644
--- a/src/ov_SC03_105/ov_SC03_105_jr_80186B24.c
+++ b/src/ov_SC03_105/ov_SC03_105_jr_80186B24.c
@@ -2813,7 +2813,7 @@ extern u8   D_8018E11C[];
 extern void func_8017EC98(void *a0);
 extern s32 func_8012CBA4(s32 a0);
 extern s32 func_8012C51C(void *a0, s32 a1);
-extern void func_8017F018(s32 a0);
+extern s32 func_8017F018(s32 a0);
 extern void func_8017EE34(s32 a0);
 extern void func_8017EF94(s32 a0);
 extern s32 func_80132EF4(s32 a0, s32 a1);
diff --git a/src/ov_SC03_105/ov_SC03_105_jr_80186DDC.c b/src/ov_SC03_105/ov_SC03_105_jr_80186DDC.c
index ea985238bf..50137c0461 100644
--- a/src/ov_SC03_105/ov_SC03_105_jr_80186DDC.c
+++ b/src/ov_SC03_105/ov_SC03_105_jr_80186DDC.c
@@ -2804,7 +2804,7 @@ extern s32 func_8012BEE8(s32 a0);
 extern s32 func_8012CBF4(s32 a0);
 extern s32 func_8012CBA4(s32 a0);
 extern s32 func_8012C51C(void *a0, s32 a1);
-extern void func_8017F018(s32 a0);
+extern s32 func_8017F018(s32 a0);
 extern void func_8017EE34(s32 a0);
 extern void func_8017EF94(s32 a0);
 extern s32 func_80132EF4(s32 a0, s32 a1);
diff --git a/src/ov_SC03_111/ov_SC03_111_jr_8017EC58.c b/src/ov_SC03_111/ov_SC03_111_jr_8017EC58.c
index ac73227c25..c7b2dfb8ef 100644
--- a/src/ov_SC03_111/ov_SC03_111_jr_8017EC58.c
+++ b/src/ov_SC03_111/ov_SC03_111_jr_8017EC58.c
@@ -4041,9 +4041,9 @@ s32 func_801812B4(void *arg0) {
 }
 
 
-extern s32 func_80181344(void);
+extern void func_80181344(void);
     void func_80181324(void) {
-        func_80181344();
+        ((void (*)())func_80181344)();
     }
 
 
diff --git a/src/ov_SC03_124/ov_SC03_124_jr_8017AE2C.c b/src/ov_SC03_124/ov_SC03_124_jr_8017AE2C.c
index b44efdfa87..fb3382a0e6 100644
--- a/src/ov_SC03_124/ov_SC03_124_jr_8017AE2C.c
+++ b/src/ov_SC03_124/ov_SC03_124_jr_8017AE2C.c
@@ -6539,7 +6539,7 @@ extern short D_8018FC3C;
 extern void func_8001C214(s32 a0, s32 a1);
 extern void func_8012C1B8(void);
 extern void func_8012CAE4(void *a0);
-extern void func_8018095C();
+extern s32 func_8018095C(void *a0);
 extern void func_801843E0(void*, s32);
 
 void func_801808B8(arg0)
diff --git a/src/ov_SC04_002/ov_SC04_002_jr_8017BEBC.c b/src/ov_SC04_002/ov_SC04_002_jr_8017BEBC.c
index f5b1d4cccb..dd74dfd039 100644
--- a/src/ov_SC04_002/ov_SC04_002_jr_8017BEBC.c
+++ b/src/ov_SC04_002/ov_SC04_002_jr_8017BEBC.c
@@ -7201,7 +7201,7 @@ void func_80182328(s32 a0)
 
 
 extern s32 func_801826E8(s32 a0);
-extern s32 func_80182CBC(s32 a0, void *a1);
+extern void func_80182CBC(s32 a0, void *a1);
 
 void func_801823BC(s32 arg0) {
     s32 ret;
@@ -7214,7 +7214,7 @@ void func_801823BC(s32 arg0) {
         *(s32 *)(arg0 + 0x18) = 0;
         *(s32 *)(arg0 + 0x4) = *(s32 *)(arg0 + 0x38);
         *(s32 *)(arg0 + 0xC) = *(s32 *)(arg0 + 0x40);
-        func_80182CBC(arg0, ret);
+        ((void (*)())func_80182CBC)(arg0, ret);
     }
 }
 
@@ -7253,7 +7253,7 @@ void func_80182424(void *a0) {
 extern void func_8012CBF4(s32 a0);
 extern void func_801319E0(s32 a0);
 extern s32 func_801826E8(s32 a0);
-extern s32 func_80182CBC(s32 a0, void *a1);
+extern void func_80182CBC(s32 a0, void *a1);
 extern void func_8012ADE4(u8 *a0);
 extern void func_80131E00(void *a0, s32 a1);
 extern void func_80131C78(s32 a0);
@@ -7269,7 +7269,7 @@ void func_801824A4(s32 param_1) {
     }
     hit = func_801826E8(param_1);
     if (hit != 0) {
-        func_80182CBC(param_1, hit);
+        ((void (*)())func_80182CBC)(param_1, hit);
         func_8012ADE4((u8 *)param_1);
     } else if (flag != 0x2000) {
         func_8012ADE4((u8 *)param_1);
diff --git a/src/ov_SC04_005/ov_SC04_005_jr_8017BEBC.c b/src/ov_SC04_005/ov_SC04_005_jr_8017BEBC.c
index ef3844ccf3..cfc02b1743 100644
--- a/src/ov_SC04_005/ov_SC04_005_jr_8017BEBC.c
+++ b/src/ov_SC04_005/ov_SC04_005_jr_8017BEBC.c
@@ -9780,7 +9780,7 @@ extern s32 rand(void);
  * func_80185B70's).  Its own .s takes TWO args ($a0 = entity-owner, $a1 = id):
  * do NOT adopt the 1-arg `void f(void*)` spelling that the *unrelated* overlay
  * ov_SC03_001 uses for its own different function at the same address. */
-extern void func_80185CEC(s32 a0, s32 a1);
+extern s32 func_80185CEC(s32 a0, u16 a1);
 
 /* Spawn a 0x4F entity for `a0`, then jitter its three s16 fields at +0x6/+0xA/+0xE
  * by a random amount (mod 28 / 32 / 28, sign picked by a second rand()), flip the
@@ -9849,7 +9849,7 @@ s32 func_80185B70(s32 a0) {
      * not reproduce the target order -- only both together do, hence a real
      * barrier rather than a statement reorder. */
     __asm__ __volatile__("" ::: "memory");
-    func_80185CEC(a0, 0x7F3);
+    ((s32 (*)())func_80185CEC)(a0, 0x7F3);
     return s2;
 }
 
diff --git a/src/ov_SC04_007/ov_SC04_007_jr_8017BEBC.c b/src/ov_SC04_007/ov_SC04_007_jr_8017BEBC.c
index f0864604f8..c861036b23 100644
--- a/src/ov_SC04_007/ov_SC04_007_jr_8017BEBC.c
+++ b/src/ov_SC04_007/ov_SC04_007_jr_8017BEBC.c
@@ -7026,7 +7026,7 @@ extern s32 rand(void);
  * func_801821DC's).  Its own .s takes TWO args ($a0 = entity-owner, $a1 = id):
  * do NOT adopt the 1-arg `void f(void*)` spelling that the *unrelated* overlay
  * ov_SC03_001 uses for its own different function at the same address. */
-extern void func_80182358(s32 a0, s32 a1);
+extern s32 func_80182358(s32 a0, u16 a1);
 
 /* Spawn a 0x4F entity for `a0`, then jitter its three s16 fields at +0x6/+0xA/+0xE
  * by a random amount (mod 28 / 32 / 28, sign picked by a second rand()), flip the
@@ -7095,7 +7095,7 @@ s32 func_801821DC(s32 a0) {
      * not reproduce the target order -- only both together do, hence a real
      * barrier rather than a statement reorder. */
     __asm__ __volatile__("" ::: "memory");
-    func_80182358(a0, 0x7F3);
+    ((s32 (*)())func_80182358)(a0, 0x7F3);
     return s2;
 }
 
diff --git a/src/ov_SC04_011/ov_SC04_011_jr_8017D494.c b/src/ov_SC04_011/ov_SC04_011_jr_8017D494.c
index a7da6192b2..1b32956f2c 100644
--- a/src/ov_SC04_011/ov_SC04_011_jr_8017D494.c
+++ b/src/ov_SC04_011/ov_SC04_011_jr_8017D494.c
@@ -11629,7 +11629,7 @@ void func_801896F8(s32 a0)
 #include "common.h"
 
 extern s32 func_80132EF4(s32 a0, s32 a1);
-extern void func_8018985C(void *a0, void *a1);
+extern s32 func_8018985C(void *a0, void *a1);
 extern void func_8012C218(void *a0);
 extern unsigned char D_80194950;
 
@@ -11651,7 +11651,7 @@ void func_80189764(void *a0) {
     }
 
     if (*(s16 *)((s32)a0 + 0xFE) != 0) {
-        func_8018985C(a0, &D_80194950);
+        ((s32 (*)())func_8018985C)(a0, &D_80194950);
     }
 
     if (*(s16 *)(*(s32 *)((s32)a0 + 0x20) + 0x1A) <= 0) {
@@ -13641,7 +13641,7 @@ void func_8018C260(s32 a0) {
 
 #include "common.h"
 
-extern void func_8018985C(void *a0, void *a1);
+extern s32 func_8018985C(void *a0, void *a1);
 extern void func_80188764(s32 param_1);
 extern s32 D_80194818;
 
@@ -13652,7 +13652,7 @@ void func_8018C310(void *a0)
 
     *(u16 *)(obj + 0x1A) += 0x800;
 
-    func_8018985C(a0, &D_80194818);
+    ((s32 (*)())func_8018985C)(a0, &D_80194818);
 
     if (*(s16 *)(*(s32 *)((s32)s0 + 0x20) + 0x1A) >= 0x1800) {
         func_80188764((s32)s0);
@@ -13663,7 +13663,7 @@ void func_8018C310(void *a0)
 extern void func_8012BEE8(u8 *a0);
 extern void func_8012C218(void *a0);
 extern void func_80133298(s32 *a0);
-extern void func_8018985C(void *a0, void *a1);
+extern s32 func_8018985C(void *a0, void *a1);
 extern s32 D_80194818;
 
 void func_8018C378(void *arg0)
@@ -13682,7 +13682,7 @@ void func_8018C378(void *arg0)
     } else {
         if (*(u8 *)((s32)arg0 + 0x74)) {
             func_80133298((s32 *)arg0);
-            func_8018985C(arg0, &D_80194818);
+            ((s32 (*)())func_8018985C)(arg0, &D_80194818);
         }
     }
 }
@@ -13837,11 +13837,11 @@ void func_8018C64C(s32 param_1)
 }
 
 
-extern void func_8018985C(void *a0, void *a1);
+extern s32 func_8018985C(void *a0, void *a1);
     extern unsigned char D_80194950;
     void func_8018C72C(void *a0) {
         if (*(unsigned char *)((char *)a0 + 0x74)) {
-            func_8018985C(a0, &D_80194950);
+            ((s32 (*)())func_8018985C)(a0, &D_80194950);
         }
     }
 
diff --git a/src/ov_SC05_003/ov_SC05_003_jr_8017BEBC.c b/src/ov_SC05_003/ov_SC05_003_jr_8017BEBC.c
index 640cb96944..ed5f627878 100644
--- a/src/ov_SC05_003/ov_SC05_003_jr_8017BEBC.c
+++ b/src/ov_SC05_003/ov_SC05_003_jr_8017BEBC.c
@@ -6149,14 +6149,14 @@ void func_801814D8(s32 arg0, s32 arg1) {
 
 
 
-extern void func_80181720(void *a0);
+extern s32 func_80181720(void *arg0);
 
 void func_80181540(void *a0) {
 
     extern void (*D_801A47A8[])(void);
     D_801A47A8[*(u16 *)((s32)a0 + 0x2)]();
     if (*(u16 *)a0 != 0) {
-        func_80181720(a0);
+        ((s32 (*)())func_80181720)(a0);
     }
 }
 
diff --git a/src/ov_SC05_018/ov_SC05_018_jr_8017D604.c b/src/ov_SC05_018/ov_SC05_018_jr_8017D604.c
index 7136e52371..f71975e307 100644
--- a/src/ov_SC05_018/ov_SC05_018_jr_8017D604.c
+++ b/src/ov_SC05_018/ov_SC05_018_jr_8017D604.c
@@ -4821,7 +4821,7 @@ extern s16 D_801E664C;
 extern s32 rand(void);
 extern void func_80016714(void *a0, s32 a1);
 extern void func_8012C218(void *a0);
-extern s32 func_80181294(u16 a0, s16 a1);
+extern s32 func_80181294(u16 a0, s32 a1);
 extern void func_8018124C(void);
 extern void func_801810B0();
 
@@ -4839,7 +4839,7 @@ void func_80180DBC(void *a0) {
             D_801E664C = ((t - D_8018A9FC) << 12) / D_8018A9FE;
             for (i = 0; i < 0x10; i++) {
                 *(s16 *)((s32)&D_801E660C + i * 2) =
-                    func_80181294(*(u16 *)((s32)&D_801E662C + i * 2), D_801E664C);
+                    ((s32 (*)())func_80181294)(*(u16 *)((s32)&D_801E662C + i * 2), D_801E664C);
             }
             func_8018124C();
         } else {