From 1b648fcc5b1171fd2d190be134c24aa446bdad2b Mon Sep 17 00:00:00 2001
From: Drew T <50529377+Druthulu@users.noreply.github.com>
Date: Thu, 3 Sep 2026 18:48:28 -0600
Subject: [PATCH] =?UTF-8?q?Revert=20"plumb(main):=20=C2=A7378=20self-calle?=
 =?UTF-8?q?r=20casts=20+=20decl=20sync=20for=207=20self=5Fdecl=5Ftu=20draf?=
 =?UTF-8?q?ts"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit commit:3801.
---
 src/800.c   | 12 ++++++------
 src/800_c.c |  4 ++--
 src/800c3.c | 12 ++++++------
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/800.c b/src/800.c
index 73043794fc..47458baa1a 100644
--- a/src/800.c
+++ b/src/800.c
@@ -707,10 +707,10 @@ s32 func_800130D0(s32 arg0, s32 arg1, s32 arg2) {
     return (s16)(arg0 + ((s32 (*)(s16, s16, s16))func_8001311C)(arg0, arg1, arg2));
 }
 
-extern s32 func_80013154(s16 x, s16 y, s16 step);
+extern s32 func_80013154(s32 a0, s32 a1, s32 a2);
 
 s16 func_8001311C(s16 a0, s16 a1, s16 a2) {
-    return ((s32 (*)())func_80013154)(a0, a1, a2);
+    return func_80013154(a0, a1, a2);
 }
 
 /* func_80013154 — cookbook §265 VERBATIM-ASM bank (file-scope form), generated by
@@ -2627,8 +2627,8 @@ extern u8 D_800B9A11;
 extern u8 D_800AF630[];
 extern u8 *D_800A5E60;
 extern s32 GetTPage(s32, s32, s32, s32);
-extern void func_80015608(void *a0, u32 *a1);
-extern void func_80015760(Obj_80015760 *obj, s32 *ot);
+extern void func_80015608(s32, s32);
+extern void func_80015760(s32, s32);
 
 void func_80015498(void)
 {
@@ -2666,11 +2666,11 @@ void func_80015498(void)
                 entry += 0x10;
                 continue;
             do_call1:
-                ((void (*)())func_80015608)((s32)entry, (s32)ot);
+                func_80015608((s32)entry, (s32)ot);
                 entry += 0x10;
                 continue;
             do_call2:
-                ((void (*)())func_80015760)((s32)entry, (s32)ot);
+                func_80015760((s32)entry, (s32)ot);
             incr_shared:
                 entry += 0x10;
             } while (entry < end);
diff --git a/src/800_c.c b/src/800_c.c
index c6189509c4..e5d45d9d23 100644
--- a/src/800_c.c
+++ b/src/800_c.c
@@ -3395,7 +3395,7 @@ void func_80039F14(u8 *arg0, s16 arg1, u8 arg2) {
 }
 
 extern void func_80039C70(u8 *arg0, s16 arg1, s16 arg2);   /* §376: matches the definition */
-extern void func_80039DEC(void *a0, s16 a1, s16 a2);
+extern void func_80039DEC(void *arg0, s16 arg1, u8 arg2);
 
 void func_80039F50(u8 **a0, s16 a1)
 {
@@ -3435,7 +3435,7 @@ void func_80039F50(u8 **a0, s16 a1)
         pbVar5[0x21] = bVar6 | 2;
         break;
     case 0x63:
-        ((void (*)())func_80039DEC)(pvVar4, a1, bVar2);
+        func_80039DEC(pvVar4, a1, bVar2);
         break;
     }
 }
diff --git a/src/800c3.c b/src/800c3.c
index a16fc2b888..5dd653dbca 100644
--- a/src/800c3.c
+++ b/src/800c3.c
@@ -459,10 +459,10 @@ s32 func_8005D410(s32 arg0, s32 arg1, s32 arg2) {
 }
 
 extern void* (*D_80072970)(void);
-extern s32 func_8005E79C(void *a0, void *a1);
+extern void func_8005E79C();
 
 void func_8005D4B8(void *a0, void *a1) {
-    ((s32 (*)())func_8005E79C)(D_80072970(), a1);
+    func_8005E79C(D_80072970(), a1);
 }
 
 extern void* (*D_80072970)(void);
@@ -863,7 +863,7 @@ typedef struct {
 } Ctx_8005E228;
 
 s32 func_8005E374();
-s32 func_8005E3AC(Ctx *s, s32 size);
+void func_8005E3AC();
 
 s32 func_8005E228(Ctx_8005E228 *s) {
     u8 t;
@@ -891,7 +891,7 @@ s32 func_8005E228(Ctx_8005E228 *s) {
             s->b49 = 2;
         } else {
             s->b46 = 0xFF;
-            ((s32 (*)())func_8005E3AC)(s, (u8 *)s + 0x63);
+            func_8005E3AC(s, (u8 *)s + 0x63);
             s->b46 = 2;
         }
         return 0;
@@ -911,7 +911,7 @@ INCLUDE_ASM("asm/nonmatchings/800c3", func_8005E3AC);
 extern void func_8005EA68(void *arg0, s32 arg1);
 extern void func_8005EA88(void *arg0, s32 arg1);
 extern void func_8005EAA8(void *arg0, s32 arg1);
-extern void func_8005EAC8(void *arg0);
+extern void func_8005EAC8(void);
 
 void func_8005E480(void *arg0) {
     switch (*(u8 *)((s32)arg0 + 0x46)) {
@@ -925,7 +925,7 @@ void func_8005E480(void *arg0) {
         if (*(u8 *)((s32)arg0 + 0x48) == 0) {
             func_8005EAA8(arg0, *(u8 *)((s32)arg0 + 0x47));
         } else {
-            ((void (*)())func_8005EAC8)();
+            func_8005EAC8();
         }
         break;
     }