offset goodness

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 ###
 

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

tools/n64splat

@@ -1 +1 @@
-Subproject commit 21d525b121842e79c6b2103ef40156afdeafcf6a
+Subproject commit 19f24f535d41dd776fe33e667da323be3cfbec2c

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

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

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):

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):