From dd72dfcd1f4f7b17247b86aa59af1b77380f3710 Mon Sep 17 00:00:00 2001
From: Alex Bates <hi@imalex.xyz>
Date: Mon, 19 Oct 2020 23:22:18 +0100
Subject: [PATCH] fix kmr_12 split

---
 src/world/area_kmr/kmr_12/events.c | 7 ++-----
 src/world/area_kmr/kmr_12/header.c | 5 +++++
 tools/splat.yaml                   | 5 ++---
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/world/area_kmr/kmr_12/events.c b/src/world/area_kmr/kmr_12/events.c
index 501b1c91ac..e59fa67db7 100644
--- a/src/world/area_kmr/kmr_12/events.c
+++ b/src/world/area_kmr/kmr_12/events.c
@@ -2,6 +2,8 @@
 #include "script_api/map.h"
 
 Bytecode kmr_12_play_music[];
+ApiStatus get_goomba_ref(ScriptInstance* script, s32 isInitialCall);
+
 Bytecode make_entities[];
 Bytecode read_sign[];
 
@@ -61,11 +63,6 @@ StaticNpcSettings goomba_npc_settings = {
     .defeatScript = (Bytecode*)0x8007809C,
 };
 
-ApiStatus get_goomba_ref(ScriptInstance* script, s32 isInitialCall) {
-    script->varTable[0] = get_enemy_safe(0);
-    return ApiStatus_DONE2;
-}
-
 Bytecode read_sign[] = { // *INDENT-OFF*
     SI_GROUP(0),
 
diff --git a/src/world/area_kmr/kmr_12/header.c b/src/world/area_kmr/kmr_12/header.c
index 39fbac2ab7..986503f3c6 100644
--- a/src/world/area_kmr/kmr_12/header.c
+++ b/src/world/area_kmr/kmr_12/header.c
@@ -20,3 +20,8 @@ Bytecode kmr_12_play_music[] = {
     SI_RETURN(),
     SI_END(),
 };
+
+ApiStatus get_goomba_ref(ScriptInstance* script, s32 isInitialCall) {
+    script->varTable[0] = get_enemy_safe(0);
+    return ApiStatus_DONE2;
+}
diff --git a/tools/splat.yaml b/tools/splat.yaml
index 87270a8327..38f559e929 100644
--- a/tools/splat.yaml
+++ b/tools/splat.yaml
@@ -1151,10 +1151,9 @@ segments:
     start: 0x8EB360
     vram: 0x80240000
     files:
-      - [0x8EB360, "c", "world/area_kmr/kmr_12/events"]
+      - [0x8EB360, "c", "world/area_kmr/kmr_12/header"]
       - [0x8EB390, ".data", "world/area_kmr/kmr_12/header"]
-      - [0x8EB360, "c", "world/area_kmr/kmr_12/events"]
-      - [0x8EB360, ".data", "world/area_kmr/kmr_12/events"]
+      - [0x8EB420, ".data", "world/area_kmr/kmr_12/events"]
       - [0x8EBE10, ".rodata", "world/area_kmr/kmr_12/events"]
   - name: world/area_kmr/kmr_20
     type: code