Skip to content

Commit

Permalink
Fixed overlay symbol (kerning table) being referenced directly, added…
Browse files Browse the repository at this point in the history
… map file generation to patch compilation
  • Loading branch information
Mr-Wiseguy committed May 6, 2024
1 parent 4c3d48b commit ac14e4c
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 1 deletion.
1 change: 1 addition & 0 deletions patches/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,4 @@
*.elf
*.bin
./funcs.h
patches.map
2 changes: 1 addition & 1 deletion patches/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
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

C_SRCS := $(wildcard *.c)
Expand Down
5 changes: 5 additions & 0 deletions patches/options.c
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,11 @@ extern u64 gFileSelYesButtonENGTex[];
extern u64 gFileSelQuitButtonENGTex[];

// 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 };

TexturePtr sFileInfoBoxTextures[] = {
Expand Down

0 comments on commit ac14e4c

Please sign in to comment.