From 1bb263893545344e30ca4041e2b212ece31c3161 Mon Sep 17 00:00:00 2001 From: dcvz Date: Fri, 17 May 2024 17:00:23 +0200 Subject: [PATCH] Update file names --- aspMain.us.rev1.toml | 2 +- njpgdspMain.us.rev1.toml | 2 +- patches/Makefile | 2 +- us.rev1.toml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/aspMain.us.rev1.toml b/aspMain.us.rev1.toml index 8692a08..94bf2ad 100644 --- a/aspMain.us.rev1.toml +++ b/aspMain.us.rev1.toml @@ -1,7 +1,7 @@ text_offset = 0xC40FF0 text_size = 0x1000 text_address = 0x04001000 -rom_file_path = "mm.us.rev1_uncompressed.z64" +rom_file_path = "mm.us.rev1.rom_uncompressed.z64" output_file_path = "rsp/aspMain.cpp" output_function_name = "aspMain" extra_indirect_branch_targets = [ diff --git a/njpgdspMain.us.rev1.toml b/njpgdspMain.us.rev1.toml index 9b7f219..32d3e76 100644 --- a/njpgdspMain.us.rev1.toml +++ b/njpgdspMain.us.rev1.toml @@ -1,6 +1,6 @@ text_offset = 0xC438B0 text_size = 0xAF0 text_address = 0x04001080 -rom_file_path = "mm.us.rev1_uncompressed.z64" +rom_file_path = "mm.us.rev1.rom_uncompressed.z64" output_file_path = "rsp/njpgdspMain.cpp" output_function_name = "njpgdspMain" diff --git a/patches/Makefile b/patches/Makefile index 0263ba3..8e59105 100644 --- a/patches/Makefile +++ b/patches/Makefile @@ -8,7 +8,7 @@ CFLAGS := -target mips -mips2 -mabi=32 -O2 -G0 -mno-abicalls -mno-odd-spreg -m -fomit-frame-pointer -ffast-math -fno-unsafe-math-optimizations -fno-builtin-memset \ -Wall -Wextra -Wno-incompatible-library-redeclaration -Wno-unused-parameter -Wno-unknown-pragmas -Wno-unused-variable -Wno-missing-braces -Wno-unsupported-floating-point-opt CPPFLAGS := -nostdinc -D_LANGUAGE_C -DMIPS -I dummy_headers -I ../lib/mm-decomp/include -I ../lib/mm-decomp/src -I ../lib/mm-decomp/assets -I../lib/rt64/include -LDFLAGS := -nostdlib -T patches.ld -T syms.ld --just-symbols=../mm.us.rev1.elf --allow-multiple-definition -Map patches.map +LDFLAGS := -nostdlib -T patches.ld -T syms.ld --just-symbols=../mm.us.rev1.rom_uncompressed.elf --allow-multiple-definition -Map patches.map BINFLAGS := -O binary --remove-section=.bss --remove-section=.pad --remove-section=.text C_SRCS := $(wildcard *.c) diff --git a/us.rev1.toml b/us.rev1.toml index 2653749..f3bc8b0 100644 --- a/us.rev1.toml +++ b/us.rev1.toml @@ -6,7 +6,7 @@ entrypoint = 0x80080000 output_func_path = "RecompiledFuncs" relocatable_sections_path = "overlays.us.rev1.txt" symbols_file_path = "us.rev1.syms.toml" -rom_file_path = "mm.us.rev1_uncompressed.z64" +rom_file_path = "mm.us.rev1.rom_uncompressed.z64" [patches] stubs = [