Merge branch 'main' into fx-and-commands

pmret · Oct 20, 2024 · 6fb26ac · 6fb26ac
2 parents 34ffa62 + 8dd922b
commit 6fb26ac
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 1 deletion.
diff --git a/ver/ique/splat.yaml b/ver/ique/splat.yaml
@@ -8,20 +8,22 @@ options:
   platform: n64
   subalign: 8
 
+
   base_path: ../..
   target_path: ver/ique/baserom.z64
   extensions_path: tools/splat_ext
   symbol_addrs_path: ver/ique/symbol_addrs.txt
   ld_script_path: ver/ique/papermario.ld
   ld_symbol_header_path: ver/ique/build/include/ld_addrs.h
+  ld_generate_symbol_per_data_segment: True
   src_path: src
   asm_path: ver/ique/asm
   asset_path: assets/ique
   build_path: ver/ique/build
   cache_path: ver/ique/.splat_cache
   create_undefined_funcs_auto: False
-  undefined_funcs_auto_path: ver/ique/undefined_funcs_auto.txt
   create_undefined_syms_auto: False
+  undefined_funcs_auto_path: ver/ique/undefined_funcs_auto.txt
   undefined_syms_auto_path: ver/ique/undefined_syms_auto.txt
   symbol_name_format: IQUE_$VRAM
   symbol_name_format_no_rom: IQUE_$VRAM_$SEG

diff --git a/ver/jp/splat.yaml b/ver/jp/splat.yaml
@@ -15,6 +15,7 @@ options:
   symbol_addrs_path: ver/jp/symbol_addrs.txt
   ld_script_path: ver/jp/papermario.ld
   ld_symbol_header_path: ver/jp/build/include/ld_addrs.h
+  ld_generate_symbol_per_data_segment: True
   src_path: src
   asm_path: ver/jp/asm
   asset_path: assets/jp

diff --git a/ver/pal/splat.yaml b/ver/pal/splat.yaml
@@ -15,6 +15,7 @@ options:
   symbol_addrs_path: ver/pal/symbol_addrs.txt
   ld_script_path: ver/pal/papermario.ld
   ld_symbol_header_path: ver/pal/build/include/ld_addrs.h
+  ld_generate_symbol_per_data_segment: True
   src_path: src
   asm_path: ver/pal/asm
   asset_path: assets/pal

diff --git a/ver/us/splat.yaml b/ver/us/splat.yaml
@@ -15,6 +15,7 @@ options:
   symbol_addrs_path: ver/us/symbol_addrs.txt
   ld_script_path: ver/us/papermario.ld
   ld_symbol_header_path: ver/us/build/include/ld_addrs.h
+  ld_generate_symbol_per_data_segment: True
   src_path: src
   asm_path: ver/us/asm
   asset_path: assets/us