Mirrors
/
Zelda64Recomp
mirror of https://github.com/Mr-Wiseguy/Zelda64Recomp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed overlay symbol (kerning table) being referenced directly, added map file generation to patch compilation

This commit is contained in:
Mr-Wiseguy 2024-05-06 14:11:00 -04:00
parent 4c3d48ba8f
commit ac14e4ca3f
3 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
patches/.gitignore vendored
View File

@ -3,3 +3,4 @@
*.elf *.elf
*.bin *.bin
./funcs.h ./funcs.h
patches.map

2
patches/Makefile
View File

@ -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 \ -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 -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 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 LDFLAGS := -nostdlib -T patches.ld -T syms.ld --just-symbols=../mm.us.rev1.elf --allow-multiple-definition -Map patches.map
BINFLAGS := -O binary --remove-section=.bss --remove-section=.pad --remove-section=.text BINFLAGS := -O binary --remove-section=.bss --remove-section=.pad --remove-section=.text
C_SRCS := $(wildcard *.c) C_SRCS := $(wildcard *.c)

5
patches/options.c
View File

@ -42,6 +42,11 @@ extern u64 gFileSelYesButtonENGTex[];
extern u64 gFileSelQuitButtonENGTex[]; extern u64 gFileSelQuitButtonENGTex[];
// TODO extern these when the recompiler handles relocations automatically. // TODO extern these when the recompiler handles relocations automatically.
s16 D_80814280[] = {
2, 3, 2, 2, 2, 2, 2, 2, 2, 2, 1, 2, 0, 1, 1, 2, 1, 1, 4, 2, 2, 2, 1, 1, 0, 2, 0, 1, 1, 1, 1, 1, 0,
1, 1, 1, 2, 2, 2, 2, 2, 3, 2, 2, 4, 3, 2, 4, 1, 2, 2, 1, 1, 2, 2, 3, 2, 2, 0, 2, 2, 2, 0, 3, 1, 0,
};
s16 sWindowContentColors[] = { 100, 150, 255 }; s16 sWindowContentColors[] = { 100, 150, 255 };
TexturePtr sFileInfoBoxTextures[] = { TexturePtr sFileInfoBoxTextures[] = {