From 8be527b2cf7f1b1c7ba421b777959137fc71516f Mon Sep 17 00:00:00 2001
From: Ethan Roseman <ethteck@gmail.com>
Date: Wed, 23 Sep 2020 23:38:08 -0400
Subject: [PATCH] Splat update & one new code file

---
 .../{code_109660_len_1270 => code_10A8D0}/func_802E9050.s      | 0
 papermario.ld                                                  | 1 +
 src/code_109660_len_1270.c                                     | 2 --
 src/code_10A8D0.c                                              | 3 +++
 tools/n64splat                                                 | 2 +-
 tools/splat.yaml                                               | 3 ++-
 6 files changed, 7 insertions(+), 4 deletions(-)
 rename asm/nonmatchings/{code_109660_len_1270 => code_10A8D0}/func_802E9050.s (100%)
 create mode 100644 src/code_10A8D0.c

diff --git a/asm/nonmatchings/code_109660_len_1270/func_802E9050.s b/asm/nonmatchings/code_10A8D0/func_802E9050.s
similarity index 100%
rename from asm/nonmatchings/code_109660_len_1270/func_802E9050.s
rename to asm/nonmatchings/code_10A8D0/func_802E9050.s
diff --git a/papermario.ld b/papermario.ld
index 8cfa118026..7f99335930 100644
--- a/papermario.ld
+++ b/papermario.ld
@@ -242,6 +242,7 @@ SECTIONS
         build/src/code_107830_len_e70.o(.text);
         build/src/code_1086a0_len_fc0.o(.text);
         build/src/code_109660_len_1270.o(.text);
+        build/src/code_10A8D0.o(.text);
     }
 
     /* 0x00000000 10A9F0-131340 [26950] */
diff --git a/src/code_109660_len_1270.c b/src/code_109660_len_1270.c
index b2ba5c67a3..98f3005b9e 100644
--- a/src/code_109660_len_1270.c
+++ b/src/code_109660_len_1270.c
@@ -65,5 +65,3 @@ void func_802E8E10(Entity* entity) {
 INCLUDE_ASM("code_109660_len_1270", push_entity_matrix);
 
 INCLUDE_ASM("code_109660_len_1270", func_802E8F94);
-
-INCLUDE_ASM("code_109660_len_1270", func_802E9050);
diff --git a/src/code_10A8D0.c b/src/code_10A8D0.c
new file mode 100644
index 0000000000..50dafd5aeb
--- /dev/null
+++ b/src/code_10A8D0.c
@@ -0,0 +1,3 @@
+#include "common.h"
+
+INCLUDE_ASM("code_10A8D0", func_802E9050);
diff --git a/tools/n64splat b/tools/n64splat
index e9d9a22063..459ea1ba69 160000
--- a/tools/n64splat
+++ b/tools/n64splat
@@ -1 +1 @@
-Subproject commit e9d9a22063fb19d270829950f4b79a5670bd4bd4
+Subproject commit 459ea1ba69529e6c3f3821d34964753cfaaeebb9
diff --git a/tools/splat.yaml b/tools/splat.yaml
index 1de0d7a32c..0c8519cc49 100644
--- a/tools/splat.yaml
+++ b/tools/splat.yaml
@@ -1,6 +1,6 @@
 name: "Paper Mario (North America)"
 basename: "papermario"
-# options: ["find-file-boundaries"]
+options: ["find-file-boundaries", "skip-asm"]
 compiler: "GCC"
 segments:
   - name: header
@@ -255,6 +255,7 @@ segments:
     - [0x107830, "c", "code_107830_len_e70"]
     - [0x1086a0, "c", "code_1086a0_len_fc0"]
     - [0x109660, "c", "code_109660_len_1270"]
+    - [0x10A8D0, "c", "code_10A8D0"]
   - [0x10A9F0, "bin"] # todo split this further
   - [0x131340, "bin"] # 0x8023E000
   - name: code