From 62e04bccc42569ba822b578e50a2225e9e9b2942 Mon Sep 17 00:00:00 2001
From: Alex Bates <hi@imalex.xyz>
Date: Tue, 9 Feb 2021 16:49:45 +0000
Subject: [PATCH] clean up wPartners

---
 src/world/partner/goombario.c | 4 ++--
 src/world/partner/goombario.h | 2 +-
 src/world/partners.c          | 2 +-
 src/world/partners.h          | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/world/partner/goombario.c b/src/world/partner/goombario.c
index 5f5cf5a2c9..3f3e7ed82a 100644
--- a/src/world/partner/goombario.c
+++ b/src/world/partner/goombario.c
@@ -61,7 +61,7 @@ ApiStatus func_802BDB84(ScriptInstance* script, s32 isInitialCall) {
 
 // Something is up with D_8010EBB0 I think. It might be a struct or something
 #ifdef NON_MATCHING
-void world_goombario_pre_battle(s32 arg0) {
+void world_goombario_pre_battle(Npc* partner) {
     if (D_8010EBB0[0] != 0) {
         func_80027088(0);
         enable_player_input();
@@ -74,7 +74,7 @@ void world_goombario_pre_battle(s32 arg0) {
     D_8010EBB0[3] = 1;
 }
 #else
-INCLUDE_ASM(void, "world/partner/goombario", world_goombario_pre_battle, s32 arg0);
+INCLUDE_ASM(void, "world/partner/goombario", world_goombario_pre_battle, Npc* partner);
 #endif
 
 s32 D_802BDC40_317B60[] = {
diff --git a/src/world/partner/goombario.h b/src/world/partner/goombario.h
index 73b99651be..da8b6be25d 100644
--- a/src/world/partner/goombario.h
+++ b/src/world/partner/goombario.h
@@ -7,7 +7,7 @@
 void world_goombario_init(Npc* partner);
 s32 world_goombario_can_pause(Npc* partner);
 ApiStatus func_802BDB84(ScriptInstance* script, s32 isInitialCall);
-void world_goombario_pre_battle(s32 arg0);
+void world_goombario_pre_battle(Npc* partner);
 
 Script world_goombario_take_out;
 Script world_goombario_update;
diff --git a/src/world/partners.c b/src/world/partners.c
index 16c158fb70..0ecd65d0d7 100644
--- a/src/world/partners.c
+++ b/src/world/partners.c
@@ -64,7 +64,7 @@ f32 D_800F8030 = 0.0f;
 s8 D_800F8034[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 };
 s16 D_800F803A = 0;
 
-WorldPartner wPartners[] = {
+WorldPartner wPartners[12] = {
     {}, // None
     {
         // Goombario
diff --git a/src/world/partners.h b/src/world/partners.h
index 3c4b3e6994..a395ccf437 100644
--- a/src/world/partners.h
+++ b/src/world/partners.h
@@ -25,7 +25,7 @@ typedef struct WorldPartner {
 /// Set to 0 when partner NPC loaded
 extern s32 D_8010C954;
 extern s32 D_8010CFD8;
-WorldPartner wPartners[0x11]; // wPartners
+WorldPartner wPartners[12]; // wPartners
 extern WorldPartner* D_8010CFEC; // wPartner
 extern NpcId D_8010CFD0; // wPartnerNpcIndex
 extern Npc* D_8010C930; // wPartnerNpc