From ac14e4ca3f444b62ad6b1e47e316e816a3d41480 Mon Sep 17 00:00:00 2001 From: Mr-Wiseguy Date: Mon, 6 May 2024 14:11:00 -0400 Subject: [PATCH] Fixed overlay symbol (kerning table) being referenced directly, added map file generation to patch compilation --- patches/.gitignore | 1 + patches/Makefile | 2 +- patches/options.c | 5 +++++ 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/patches/.gitignore b/patches/.gitignore index 5b5151a..4a9c156 100644 --- a/patches/.gitignore +++ b/patches/.gitignore @@ -3,3 +3,4 @@ *.elf *.bin ./funcs.h +patches.map diff --git a/patches/Makefile b/patches/Makefile index 59940c0..0263ba3 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 +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) diff --git a/patches/options.c b/patches/options.c index 4a0504b..4273df6 100644 --- a/patches/options.c +++ b/patches/options.c @@ -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[] = {