From 14b509830fdcabcaece31a5e6d421f88427a5cfd Mon Sep 17 00:00:00 2001
From: Alex Bates <hi@imalex.xyz>
Date: Thu, 22 Oct 2020 03:14:13 +0100
Subject: [PATCH] #define map-namespaced functions with M

---
 src/world/area_kmr/kmr_12/events.c | 2 +-
 src/world/area_kmr/kmr_12/header.c | 2 +-
 src/world/area_kmr/kmr_12/kmr_12.h | 3 ++-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/world/area_kmr/kmr_12/events.c b/src/world/area_kmr/kmr_12/events.c
index adfefe17c4..b56c1e1d21 100644
--- a/src/world/area_kmr/kmr_12/events.c
+++ b/src/world/area_kmr/kmr_12/events.c
@@ -69,7 +69,7 @@ Script M(ReadWestSign) = {
     SI_RESUME_GROUP(1),
 
     SI_SET(SI_FLAG(0), FALSE),
-    SI_CALL(M(GetGoomba)),
+    SI_CALL(GetGoomba),
     SI_IF_NE(SI_VAR(0), FALSE),
         SI_CALL(GetNpcVar, NpcId_GOOMBA, 0, SI_VAR(0)),
         SI_IF_EQ(SI_VAR(0), FALSE),
diff --git a/src/world/area_kmr/kmr_12/header.c b/src/world/area_kmr/kmr_12/header.c
index 5d51db0b27..5d9a96fdf0 100644
--- a/src/world/area_kmr/kmr_12/header.c
+++ b/src/world/area_kmr/kmr_12/header.c
@@ -19,7 +19,7 @@ Script M(PlayMusic) = {
     SI_END(),
 };
 
-ApiStatus M(GetGoomba)(ScriptInstance* script, s32 isInitialCall) {
+ApiStatus GetGoomba(ScriptInstance* script, s32 isInitialCall) {
     script->varTable[0] = get_enemy_safe(NpcId_GOOMBA);
     return ApiStatus_DONE2;
 }
diff --git a/src/world/area_kmr/kmr_12/kmr_12.h b/src/world/area_kmr/kmr_12/kmr_12.h
index 6cb287685a..406b7f4299 100644
--- a/src/world/area_kmr/kmr_12/kmr_12.h
+++ b/src/world/area_kmr/kmr_12/kmr_12.h
@@ -5,7 +5,8 @@
 
 #define NpcId_GOOMBA 0
 
-ApiStatus M(GetGoomba)(ScriptInstance* script, s32 isInitialCall);
+#define GetGoomba M(GetGoomba)
+ApiStatus GetGoomba(ScriptInstance* script, s32 isInitialCall);
 
 Script M(Main);
 Script M(PlayMusic);