From e65814a367767564f1abc8049eb2de50cfbec4dc Mon Sep 17 00:00:00 2001 From: Phillip Stephens Date: Tue, 7 Feb 2023 21:39:29 -0800 Subject: [PATCH] Fix TRK_MINNOW_DOLPHIN.a linking TRK_MINNOW_DOLPHIN doesn't spawn in the correct location when building MP as loose files, this fixes that, however it throws data % off in calcprogress --- configure.py | 8 ++++++-- ldscript.lcf | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/configure.py b/configure.py index c560cabf..0b1359bd 100755 --- a/configure.py +++ b/configure.py @@ -10,7 +10,7 @@ LIBS = [ ], }, { - "lib": "MetroidPrimeCW", + "lib": "MetroidPrime", "cflags": "$cflags_retro", "mw_version": "1.3.2", "host": True, @@ -1179,7 +1179,11 @@ if __name__ == "__main__": n.variable("asflags", asflags) ldflags = "-fp fmadd -nodefaults -lcf ldscript.lcf" if args.map: - map_path = build_path / "MetroidPrime.MAP" + if args.debug: + map_path = build_path / "MetroidCWD.MAP" + else: + map_path = build_path / "MetroidCW.MAP" + ldflags += f" -map {map_path}" if args.debug: ldflags += " -g" diff --git a/ldscript.lcf b/ldscript.lcf index 85590b41..70870cf0 100644 --- a/ldscript.lcf +++ b/ldscript.lcf @@ -10,7 +10,7 @@ SECTIONS .init ALIGN(0x20):{} extab ALIGN(0x20):{} extabindex ALIGN(0x20):{} - .text ALIGN(0x20):{} + .text ALIGN(0x20):{TRK_MINNOW_DOLPHIN.a} .ctors ALIGN(0x20):{} .dtors ALIGN(0x20):{} .rodata ALIGN(0x20):{}