From 0a38d165d278c6d94cf7e9a8afda513c8614c83d Mon Sep 17 00:00:00 2001
From: Ethan Roseman <ethteck@gmail.com>
Date: Sun, 29 Nov 2020 13:32:02 -0500
Subject: [PATCH] offset goodness

---
 Makefile                                | 2 +-
 asm/data/si.data.s                      | 2 +-
 tools/n64splat                          | 2 +-
 tools/splat.yaml                        | 2 +-
 tools/splat_ext/PaperMarioMapFS.py      | 2 +-
 tools/splat_ext/PaperMarioMessages.py   | 2 +-
 tools/splat_ext/PaperMarioNpcSprites.py | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/Makefile b/Makefile
index 1d57de9875..5c27894e32 100644
--- a/Makefile
+++ b/Makefile
@@ -249,7 +249,7 @@ $(BUILD_DIR)/$(TARGET).bin: $(BUILD_DIR)/$(TARGET).elf
 	$(OBJCOPY) $< $@ -O binary
 
 include/ld_addrs.h: $(BUILD_DIR)/$(LD_SCRIPT)
-	grep -E "[^ ]+ =" $< -o | sed 's/^/extern void* /; s/ =/;/' > $@
+	grep -E "[^\. ]+ =" $< -o | sed 's/^/extern void* /; s/ =/;/' > $@
 
 ### Make Settings ###
 
diff --git a/asm/data/si.data.s b/asm/data/si.data.s
index e394ba4b89..a7e460dcf5 100644
--- a/asm/data/si.data.s
+++ b/asm/data/si.data.s
@@ -18,4 +18,4 @@ glabel D_802D9D34
 .word 0x00000043, 0x00000001, 0x802D5B10, 0x00000002, 0x00000000, 0x00000001, 0x00000000
 
 glabel D_802D9D50
-.word 0x00000043, 0x00000001, func_802D7BA4, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0xFEFE00FF, 0x00000000, 0x00000000, 0x00000000
+.word 0x00000043, 0x00000001, func_802D7BA4, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0xFEFE00FF, 0x00000000, 0x00000000, 0x00000000
\ No newline at end of file
diff --git a/tools/n64splat b/tools/n64splat
index 21d525b121..19f24f535d 160000
--- a/tools/n64splat
+++ b/tools/n64splat
@@ -1 +1 @@
-Subproject commit 21d525b121842e79c6b2103ef40156afdeafcf6a
+Subproject commit 19f24f535d41dd776fe33e667da323be3cfbec2c
diff --git a/tools/splat.yaml b/tools/splat.yaml
index baced438e3..1b0d757844 100644
--- a/tools/splat.yaml
+++ b/tools/splat.yaml
@@ -270,7 +270,7 @@ segments:
     - [0xFE650, .data, code_e79b0_len_1920]
     - [0xFE660, data, si]
     - [0xFE730, .rodata, code_e79b0_len_1920]
-  - [0xFE748, bin] # rodata chunk for above overlay; here to avoid the 0x10 alignment
+    - [0xFE748, bin] # rodata chunk for above overlay; here to avoid the 0x10 alignment
   - type: code
     start: 0xFEE30
     vram: 0x802DBD40
diff --git a/tools/splat_ext/PaperMarioMapFS.py b/tools/splat_ext/PaperMarioMapFS.py
index 2fc070e7c9..a2ff417ba1 100644
--- a/tools/splat_ext/PaperMarioMapFS.py
+++ b/tools/splat_ext/PaperMarioMapFS.py
@@ -59,7 +59,7 @@ class N64SegPaperMarioMapFS(N64Segment):
 
 
     def get_ld_files(self):
-        return [("bin/assets", self.name, ".data")]
+        return [("bin/assets", self.name, ".data", self.rom_start)]
 
 
     @staticmethod
diff --git a/tools/splat_ext/PaperMarioMessages.py b/tools/splat_ext/PaperMarioMessages.py
index 07aac08679..2485a64ee1 100644
--- a/tools/splat_ext/PaperMarioMessages.py
+++ b/tools/splat_ext/PaperMarioMessages.py
@@ -378,7 +378,7 @@ class N64SegPaperMarioMessages(N64Segment):
                     self.f.write("\n[/message]\n")
 
     def get_ld_files(self):
-        return [("", self.name, ".data")]
+        return [("", self.name, ".data", self.rom_start)]
 
     @staticmethod
     def get_default_name(addr):
diff --git a/tools/splat_ext/PaperMarioNpcSprites.py b/tools/splat_ext/PaperMarioNpcSprites.py
index 718b6a0e3d..5242e84213 100644
--- a/tools/splat_ext/PaperMarioNpcSprites.py
+++ b/tools/splat_ext/PaperMarioNpcSprites.py
@@ -294,7 +294,7 @@ class N64SegPaperMarioNpcSprites(N64Segment):
             sprite.write_to_dir(sprite_dir)
 
     def get_ld_files(self):
-        return [("sprite", self.name, ".data")]
+        return [("sprite", self.name, ".data", self.rom_start)]
 
     @staticmethod
     def get_default_name(addr):