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
This commit is contained in:
Phillip Stephens 2023-02-07 21:39:29 -08:00
parent b1137488f6
commit e65814a367
2 changed files with 7 additions and 3 deletions

View File

@ -10,7 +10,7 @@ LIBS = [
], ],
}, },
{ {
"lib": "MetroidPrimeCW", "lib": "MetroidPrime",
"cflags": "$cflags_retro", "cflags": "$cflags_retro",
"mw_version": "1.3.2", "mw_version": "1.3.2",
"host": True, "host": True,
@ -1179,7 +1179,11 @@ if __name__ == "__main__":
n.variable("asflags", asflags) n.variable("asflags", asflags)
ldflags = "-fp fmadd -nodefaults -lcf ldscript.lcf" ldflags = "-fp fmadd -nodefaults -lcf ldscript.lcf"
if args.map: 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}" ldflags += f" -map {map_path}"
if args.debug: if args.debug:
ldflags += " -g" ldflags += " -g"

View File

@ -10,7 +10,7 @@ SECTIONS
.init ALIGN(0x20):{} .init ALIGN(0x20):{}
extab ALIGN(0x20):{} extab ALIGN(0x20):{}
extabindex ALIGN(0x20):{} extabindex ALIGN(0x20):{}
.text ALIGN(0x20):{} .text ALIGN(0x20):{TRK_MINNOW_DOLPHIN.a}
.ctors ALIGN(0x20):{} .ctors ALIGN(0x20):{}
.dtors ALIGN(0x20):{} .dtors ALIGN(0x20):{}
.rodata ALIGN(0x20):{} .rodata ALIGN(0x20):{}