From 0a2a1f16627dc07abb8f2b1ee652f1e3618e8546 Mon Sep 17 00:00:00 2001
From: Ethan Roseman <ethteck@gmail.com>
Date: Sun, 29 Nov 2020 23:52:12 -0500
Subject: [PATCH] removing unnecessary syms

---
 src/world/world.c       | 10 +++++-----
 tools/n64splat          |  2 +-
 undefined_syms_auto.txt |  7 -------
 3 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/src/world/world.c b/src/world/world.c
index 1c00349aad..faf03ef1bb 100644
--- a/src/world/world.c
+++ b/src/world/world.c
@@ -57,13 +57,13 @@ static const s32 rodata_73DA0[] = {
     0x83438369, 0x838B837B, 0x83808377, 0x83430000,
     0x83748340, 0x83438369, 0x838B834E, 0x838A8357,
     0x83430000, 0X82C282A4, 0x82B682E5, 0x82A40000,
-
-    // These string literals belong to load_map_by_IDs
-    0x25735F73, 0x68617065, 0x00000000, // "%_shape"
-    0x25735F68, 0x69740000, // "%s_hit"
-    0x25735F74, 0x65780000, // "%s_tex"
 };
 
+// These string literals belong to load_map_by_IDs
+static const char D_80098A10[] = "%s_shape";
+static const char D_80098A1C[] = "%s_hit";
+static const char D_80098A24[] = "%s_tex";
+
 INCLUDE_ASM(s32, "world/world", load_map_by_IDs);
 
 INCLUDE_ASM(s32, "world/world", get_current_map_config);
diff --git a/tools/n64splat b/tools/n64splat
index 17406ad52b..e3567f6194 160000
--- a/tools/n64splat
+++ b/tools/n64splat
@@ -1 +1 @@
-Subproject commit 17406ad52ba7dbce0129a928c6124673a875e851
+Subproject commit e3567f61948b26a0938e6c580549fd9df82fa0db
diff --git a/undefined_syms_auto.txt b/undefined_syms_auto.txt
index a76e4479ff..fade50103d 100644
--- a/undefined_syms_auto.txt
+++ b/undefined_syms_auto.txt
@@ -522,9 +522,6 @@ D_80098940 = 0x80098940;
 D_80098968 = 0x80098968;
 D_80098970 = 0x80098970;
 D_80098990 = 0x80098990;
-D_80098A10 = 0x80098A10;
-D_80098A1C = 0x80098A1C;
-D_80098A24 = 0x80098A24;
 D_80099AA0 = 0x80099AA0;
 D_80099B20 = 0x80099B20;
 D_80099B40 = 0x80099B40;
@@ -1269,9 +1266,6 @@ D_8014EFC8 = 0x8014EFC8;
 D_8014EFCC = 0x8014EFCC;
 D_8014F0C8 = 0x8014F0C8;
 D_8014F110 = 0x8014F110;
-D_8014F120 = 0x8014F120;
-D_8014F128 = 0x8014F128;
-D_8014F12F = 0x8014F12F;
 D_8014F130 = 0x8014F130;
 D_8014F134 = 0x8014F134;
 D_8014F150 = 0x8014F150;
@@ -4506,7 +4500,6 @@ D_802D9D70 = 0x802D9D70;
 D_802D9D71 = 0x802D9D71;
 D_802D9D72 = 0x802D9D72;
 D_802D9D73 = 0x802D9D73;
-D_802D9D80 = 0x802D9D80;
 D_802D9D98 = 0x802D9D98;
 D_802D9DA8 = 0x802D9DA8;
 D_802D9DBC = 0x802D9DBC;