Update decomp and symbols

banjo.us.rev0.toml

@@ -4,16 +4,35 @@
 entrypoint = 0x80000400
 # Paths are relative to the location of this config file.
 output_func_path = "RecompiledFuncs"
-symbols_file_path = "BanjoRecompSyms/bk.us.rev0.syms.toml"
 rom_file_path = "banjo.us.v10.decompressed.z64"
+symbols_file_path = "BanjoRecompSyms/bk.us.rev0.syms.toml"
 # elf_path = "banjo.us.v10.elf"
+# use_mdebug = true
+# trace_mode = true
+bss_section_suffix = "_bss"
 
 manual_funcs = [
-    { name = "__n_CSPVoiceHandler", section = ".core1", vram = 0x8025E438, size = 0x684 },
+    { name = "boot___osLeoAbnormalResume", section = ".boot_bk_boot", vram = 0x800037E4, size = 0xE8 },
+    { name = "boot___osLeoResume", section = ".boot_bk_boot", vram = 0x800038CC, size = 0xEC },
+]
+
+mdebug_file_mappings = [
+    { filename = "src/TTC/ch/clam.c", input_section = ".text", output_section = ".TTC" },
+    { filename = "src/TTC/ch/blubber.c", input_section = ".text", output_section = ".TTC" },
+    { filename = "src/TTC/ch/lockup.c", input_section = ".text", output_section = ".TTC" },
+    { filename = "src/TTC/ch/treasure.c", input_section = ".text", output_section = ".TTC" },
+    { filename = "src/SM/ch/attacktutorial.c", input_section = ".text", output_section = ".SM" },
+    { filename = "src/SM/ch/vegetables.c", input_section = ".text", output_section = ".SM" },
 ]
 
 [patches]
 
+ignored = [
+    "boot_n_aspMainTextStart",
+    "boot_gSPF3DEX_fifoTextStart",
+    "boot_gSPL3DEX_fifoTextStart",
+]
+
 renamed = [
     "wmemcpy"
 ]

patches.toml

@@ -9,7 +9,7 @@ single_file_output = true
 use_absolute_symbols = true
 # Point the recompiler at the symbol files so that it can resolve relocations during recompilation.
 func_reference_syms_file = "BanjoRecompSyms/bk.us.rev0.syms.toml"
-data_reference_syms_files = [ "BanjoRecompSyms/bk.us.rev0.datasyms.toml", "BanjoRecompSyms/bk.us.rev0.datasyms_static.toml" ]
+data_reference_syms_files = [ "BanjoRecompSyms/bk.us.rev0.datasyms.toml" ]
 # Tell the recompiler to write the output binary. Doing this instead of using objcopy allows the recompiler to patch MIPS32 relocs.
 output_binary_path = "patches/patches.bin"
 # Do not emit warnings for unpaired LO16 values, as clang produces many of them.

patches/actor_patches.c

@@ -45,7 +45,7 @@ RECOMP_PATCH ActorMarker * marker_init(s32 *pos, MarkerDrawFunc draw_func, int a
     marker->actrArrayIdx = 0;
     marker->unk14_10 = 0;
     marker->modelId = 0;
-    marker->unk3E_1 = 0;
+    marker->isBanjoOnTop = 0;
     marker->unk14_22 = 0;
     marker->unk14_21 = 0;
     marker->yaw = 0;
@@ -66,7 +66,7 @@ RECOMP_PATCH ActorMarker * marker_init(s32 *pos, MarkerDrawFunc draw_func, int a
     marker->unk18 = 0;
     marker->actorUpdateFunc = NULL;
     marker->actorFreeFunc = NULL;
-    marker->unk28 = 0;
+    marker->commonParticleIndex = 0;
     marker->actorUpdate2Func = NULL;
     marker->unk38[0] = 0;
     marker->unk38[1] = 0;

patches/print.c

@@ -17,3 +17,12 @@ RECOMP_EXPORT int recomp_printf(const char* fmt, ...) {
 
     return ret;
 }
+
+void rmonPrintf_recomp(const char* fmt, ...) {
+    va_list args;
+    va_start(args, fmt);
+
+    int ret = _Printf(&proutPrintf, NULL, fmt, args);
+
+    va_end(args);
+}

patches/xldtob.c

@@ -1,3 +1,6 @@
+#pragma GCC diagnostic ignored "-Wpointer-sign"
+#pragma GCC diagnostic ignored "-Wlogical-op-parentheses"
+
 #include "patches.h"
 #include "string.h"
 #include "xstdio.h"
@@ -55,7 +58,7 @@ static const ldouble pows[] = {10e0L, 10e1L, 10e3L, 10e7L, 10e15L, 10e31L, 10e63
 #define _D2 2
 #define _D3 3
 
-#define ALIGN(s, align) (((unsigned int)(s) + ((align)-1)) & ~((align)-1))
+// #define ALIGN(s, align) (((unsigned int)(s) + ((align)-1)) & ~((align)-1))
 
 void _Ldtob(_Pft* px, char code) {
     char buff[BUFF_LEN];

patches/xprintf.c

@@ -1,3 +1,6 @@
+#pragma GCC diagnostic ignored "-Wpointer-sign"
+#pragma GCC diagnostic ignored "-Wunused-value"
+
 #include "patches.h"
 #include "string.h"
 #include "stdarg.h"