From 73e85dd9615baddb65065d42fc96bbfd6d8820ce Mon Sep 17 00:00:00 2001
From: Alex Bates <16batesa@gmail.com>
Date: Wed, 23 Dec 2020 12:43:16 +0000
Subject: [PATCH] lint

---
 src/world/partner/goombaria.c |  6 +++---
 src/world/partner/goombario.c | 24 ++++++++++++------------
 src/world/partner/goompa.c    |  6 +++---
 src/world/partner/twink.c     |  6 +++---
 4 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/src/world/partner/goombaria.c b/src/world/partner/goombaria.c
index 985a776218..8cab1ec052 100644
--- a/src/world/partner/goombaria.c
+++ b/src/world/partner/goombaria.c
@@ -2,9 +2,9 @@
 #include "goombaria.h"
 #include "../partners.h"
 
-void world_goombaria_init(Npc* npc) {
-    npc->collisionHeight = 24;
-    npc->collisionRadius = 20;
+void world_goombaria_init(Npc* partner) {
+    partner->collisionHeight = 24;
+    partner->collisionRadius = 20;
 }
 
 ApiStatus GoombariaTakeOut(ScriptInstance* script, s32 isInitialCall) {
diff --git a/src/world/partner/goombario.c b/src/world/partner/goombario.c
index af5fca4331..4005a85590 100644
--- a/src/world/partner/goombario.c
+++ b/src/world/partner/goombario.c
@@ -15,9 +15,9 @@ s32 func_802BD100(s32 arg0) {
     return 0;
 }
 
-void world_goombario_init(Npc* npc) {
-    npc->collisionHeight = 24;
-    npc->collisionRadius = 20;
+void world_goombario_init(Npc* partner) {
+    partner->collisionHeight = 24;
+    partner->collisionRadius = 20;
 }
 
 INCLUDE_ASM(ApiStatus, "world/partner/goombario", func_802BD188, ScriptInstance* script, s32 isInitialCall);
@@ -80,15 +80,15 @@ INCLUDE_ASM(void, "world/partner/goombario", world_goombario_pre_battle, s32 arg
 
 s32 func_802BD5D8_data[] = {
     0x00000015, 0x001B0000, 0x00000018, 0x001B0000, 0x00000016, 0x001B0001, 0x00000019, 0x001B0001,
-	0x00000017, 0x001B0003, 0x0000001A, 0x001B0003, 0x0000000D, 0x001B0005, 0x0000000E, 0x001B0005,
-	0x0000000F, 0x001B0006, 0x00000010, 0x001B0006, 0x0000000B, 0x001B0007, 0x0000000C, 0x001B0008,
-	0x00000014, 0x001B0009, 0x0000002E, 0x001B000A, 0x0000002F, 0x001B000A, 0x00000007, 0x001B000B,
-	0x00000008, 0x001B000B, 0x00000009, 0x001B000C, 0x0000000A, 0x001B000E, 0x0000002B, 0x001B0010,
-	0x00000003, 0x001B0011, 0x00000004, 0x001B0011, 0x00000005, 0x001B0011, 0x00000006, 0x001B0011,
-	0x00000033, 0x001B0012, 0x00000034, 0x001B0013, 0x00000026, 0x001B0014, 0x00000032, 0x001B0015,
-	0x00000024, 0x001B0017, 0x00000025, 0x001B001A, 0x00000031, 0x001B001D, 0x00000035, 0x001B001F,
-	0x00000036, 0x001B0020, 0x00000038, 0x001B0021, 0x00000037, 0x001B0022, 0x0000003A, 0x001B0023,
-	0x00000039, 0x001B0024, 0xFFFFFFFF
+    0x00000017, 0x001B0003, 0x0000001A, 0x001B0003, 0x0000000D, 0x001B0005, 0x0000000E, 0x001B0005,
+    0x0000000F, 0x001B0006, 0x00000010, 0x001B0006, 0x0000000B, 0x001B0007, 0x0000000C, 0x001B0008,
+    0x00000014, 0x001B0009, 0x0000002E, 0x001B000A, 0x0000002F, 0x001B000A, 0x00000007, 0x001B000B,
+    0x00000008, 0x001B000B, 0x00000009, 0x001B000C, 0x0000000A, 0x001B000E, 0x0000002B, 0x001B0010,
+    0x00000003, 0x001B0011, 0x00000004, 0x001B0011, 0x00000005, 0x001B0011, 0x00000006, 0x001B0011,
+    0x00000033, 0x001B0012, 0x00000034, 0x001B0013, 0x00000026, 0x001B0014, 0x00000032, 0x001B0015,
+    0x00000024, 0x001B0017, 0x00000025, 0x001B001A, 0x00000031, 0x001B001D, 0x00000035, 0x001B001F,
+    0x00000036, 0x001B0020, 0x00000038, 0x001B0021, 0x00000037, 0x001B0022, 0x0000003A, 0x001B0023,
+    0x00000039, 0x001B0024, 0xFFFFFFFF
 };
 
 Script world_goombario_take_out = SCRIPT({
diff --git a/src/world/partner/goompa.c b/src/world/partner/goompa.c
index 815a915b76..c606a2c151 100644
--- a/src/world/partner/goompa.c
+++ b/src/world/partner/goompa.c
@@ -1,9 +1,9 @@
 #include "common.h"
 #include "goompa.h"
 
-void world_goompa_init(Npc* npc) {
-    npc->collisionHeight = 24;
-    npc->collisionRadius = 20;
+void world_goompa_init(Npc* partner) {
+    partner->collisionHeight = 24;
+    partner->collisionRadius = 20;
 }
 
 ApiStatus GoompaTakeOut(ScriptInstance* script, s32 isInitialCall) {
diff --git a/src/world/partner/twink.c b/src/world/partner/twink.c
index 83e386a59d..b2f17d23fe 100644
--- a/src/world/partner/twink.c
+++ b/src/world/partner/twink.c
@@ -2,9 +2,9 @@
 #include "../partners.h"
 #include "twink.h"
 
-void world_twink_init(Npc* npc) {
-    npc->collisionHeight = 20;
-    npc->collisionRadius = 20;
+void world_twink_init(Npc* partner) {
+    partner->collisionHeight = 20;
+    partner->collisionRadius = 20;
 }
 
 ApiStatus TwinkTakeOut(ScriptInstance* script, s32 isInitialCall) {