Next PSP DRA file (#2180)

Small one. Finishes out the subweapons, I believe.
Xeeynamo · Feb 5, 2025 · 253ea0f · 253ea0f
1 parent ac8c594
commit 253ea0f
Show file tree

Hide file tree

Showing 4 changed files with 100 additions and 107 deletions.
diff --git a/Makefile.psp.mk b/Makefile.psp.mk
@@ -91,7 +91,7 @@ $(BUILD_DIR)/st%.ld: $(CONFIG_DIR)/splat.pspeu.st%.yaml $(PSX_BASE_SYMS) $(CONFI
 $(BUILD_DIR)/tt_%.ld: $(CONFIG_DIR)/splat.pspeu.tt_%.yaml $(PSX_BASE_SYMS) $(CONFIG_DIR)/symbols.pspeu.tt_%.txt
 	$(SPLAT_PIP) $<
 
-ST_DRA_MERGE = 624DC 628AC 6BF64 6D584 6E42C 6FDF8 704D0 84B88
+ST_DRA_MERGE = 624DC 628AC 6BF64 6D584 6E42C 6FDF8 704D0 84B88 8A0A4
 $(BUILD_DIR)/dra.elf: $(BUILD_DIR)/dra.ld $(addprefix $(BUILD_DIR)/src/dra/,$(addsuffix .c.o,$(ST_DRA_MERGE))) $$(call list_o_files_psp,dra_psp)
 	$(call link_with_deadstrip,dra,$@)
 $(BUILD_DIR)/tt_%.elf: $(BUILD_DIR)/tt_%.ld $$(call list_o_files_psp,servant/tt_$$*) $(BUILD_DIR)/assets/servant/tt_%/mwo_header.bin.o

diff --git a/config/splat.pspeu.dra.yaml b/config/splat.pspeu.dra.yaml
@@ -108,7 +108,7 @@ segments:
       - [0x3B280, c, dra/6FDF8]
       - [0x3B9B0, c, dra/6BF64]
       - [0x3D738, c, dra/84B88]
-      - [0x45688, c, dra_psp/45688]
+      - [0x45688, c, dra/8A0A4]
       - [0x47EA8, c, dra_psp/47EA8]
       - [0x47F50, c, dra_psp/47F50]
       - [0x4A0E0, c, dra_psp/4A0E0]
@@ -190,7 +190,7 @@ segments:
       - [0xEE828, .rodata, dra_psp/32DA0]
       - [0xEE840, .rodata, dra/704D0]
       - [0xEE898, .rodata, dra/84B88]
-      - [0xEE8B8, .rodata, dra_psp/45688]
+      - [0xEE8B8, .rodata, dra/8A0A4]
       - [0xEE8D8, .rodata, dra_psp/47F50]
       - [0xEE928, .rodata, dra_psp/4B440]
       - [0xEE968, .rodata, dra_psp/4BC00]