From 136ccd41d01175e3b9c7ad66e9a0efe4bbad2e8b Mon Sep 17 00:00:00 2001
From: Banjo Kazooie <banjo.decomp@gmail.com>
Date: Sun, 3 Nov 2024 14:25:45 -0600
Subject: [PATCH] correct MMM warnings

---
 src/MMM/code_2040.c | 4 ++--
 src/MMM/code_3120.c | 2 +-
 src/MMM/code_3420.c | 5 +++--
 src/MMM/code_3D50.c | 3 ++-
 src/MMM/code_47D0.c | 4 ++--
 5 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/src/MMM/code_2040.c b/src/MMM/code_2040.c
index b57abd13..d694e2f9 100644
--- a/src/MMM/code_2040.c
+++ b/src/MMM/code_2040.c
@@ -256,8 +256,8 @@ Actor *func_80388994(ActorMarker *marker, Gfx **gfx, Mtx **mtx, Vtx **vtx) {
 
     this = actor_drawFullDepth(marker, gfx, mtx, vtx);
     if (marker->unk14_21 && (this->lifetime_value != 0.0f)) {
-        func_8034A174((struct5Bs *) marker->unk44, 5, &sp84);
-        func_8034A174((struct5Bs *) marker->unk44, 6, &sp78);
+        func_8034A174(marker->unk44, 5, sp84);
+        func_8034A174(marker->unk44, 6, sp78);
         for(i = 0;  i < 8; i++){
             sp6C[0] = sp6C[2] = 0.0f;
             sp6C[1] = randf2(5.0f, 20.0f);
diff --git a/src/MMM/code_3120.c b/src/MMM/code_3120.c
index 849a960a..4a6f8989 100644
--- a/src/MMM/code_3120.c
+++ b/src/MMM/code_3120.c
@@ -2,7 +2,7 @@
 #include "functions.h"
 #include "variables.h"
 
-Struct5Es * func_80309B48(f32[3], f32[3], f32[3], u32);
+BKCollisionTri * func_80309B48(f32[3], f32[3], f32[3], u32);
 
 /* .bss */
 struct{
diff --git a/src/MMM/code_3420.c b/src/MMM/code_3420.c
index 6f88463d..ee84b37c 100644
--- a/src/MMM/code_3420.c
+++ b/src/MMM/code_3420.c
@@ -4,6 +4,7 @@
 
 /* extern functions */
 extern void MMM_func_8038B6D4(f32* arg0, s32 arg1);
+extern void *func_803517B8(s32);
 
 /* internal definitions */
 typedef struct {
@@ -178,7 +179,7 @@ void func_803898EC() {
 
 void func_80389910() {
     gcdialog_showText(ASSET_AD5_DIALOG_UNKNOWN, 0xE, NULL, NULL, MMM_func_80389810, NULL);
-    timedFunc_set_2(0.0f, func_8025A6EC, COMUSIC_2D_PUZZLE_SOLVED_FANFARE, 0x7FFF);
+    timedFunc_set_2(0.0f, (GenFunction_2)func_8025A6EC, COMUSIC_2D_PUZZLE_SOLVED_FANFARE, 0x7FFF);
     timed_setStaticCameraToNode(2.0f, 0);
     timedFunc_set_0(2.1f, MMM_func_803898A0);
     timedFunc_set_0(6.0f, func_803898EC);
@@ -314,7 +315,7 @@ void code3420_handleOrganGame(s32 arg0, s32 arg1) {
     f32 key_position[3];
     bool is_black_key;
 
-    Me.unk8 = &D_8038BF20;
+    Me.unk8 = D_8038BF20;
     func_80250170(0, 0x6A, 0);
     Me.state = 0;
 
diff --git a/src/MMM/code_3D50.c b/src/MMM/code_3D50.c
index a44d294e..3a0fc831 100644
--- a/src/MMM/code_3D50.c
+++ b/src/MMM/code_3D50.c
@@ -10,7 +10,8 @@ typedef struct {
     f32 unk4;
 }Struct_MMM_3D50_0;
 
-extern void func_8028F620(Struct_MMM_3D50_0 *, f32, f32);
+extern bool func_8028F620(f32[3], f32, f32);
+extern BKModel *mapModel_getModel(s32 arg0);
 
 typedef struct {
     u8 *unk0;
diff --git a/src/MMM/code_47D0.c b/src/MMM/code_47D0.c
index 143be85f..abc70857 100644
--- a/src/MMM/code_47D0.c
+++ b/src/MMM/code_47D0.c
@@ -49,7 +49,7 @@ void chTumblar_draw(Struct_MMM_47D0_0 *arg0, struct struct_68_s *arg1, f32 posit
     }
 }
 
-void chTumblar_copyPosition(s32 arg0, s32 arg1, f32 arg2[3]) {
+void chTumblar_copyPosition(s32 arg0, Struct68s *arg1, f32 arg2[3]) {
     func_8035179C_copyPosition(arg1, arg2);
 }
 
@@ -57,7 +57,7 @@ bool chTumblar_isDisappeared(Struct_MMM_47D0_0 *arg0, s32 arg1) {
     return arg0->state == TUMBLAR_STATE_3_DISAPPEARED;
 }
 
-bool chTumblar_isBanjoAbove(s32 arg0, s32 arg1) {
+bool chTumblar_isBanjoAbove(Struct_MMM_47D0_0 *arg0, Struct68s *arg1) {
     f32 plyr_pos[3];
     f32 position[3];