From 306ae61454a3d22532310e10ea12006979492c17 Mon Sep 17 00:00:00 2001 From: Ryan Dwyer Date: Tue, 14 Sep 2021 20:41:17 +1000 Subject: [PATCH] pal-final: Decompile bossfileLoadFull --- src/game/game_110680.c | 23 +++++------------------ src/include/game/lang.h | 1 + 2 files changed, 6 insertions(+), 18 deletions(-) diff --git a/src/game/game_110680.c b/src/game/game_110680.c index 3540bff4a..e0229bb6e 100644 --- a/src/game/game_110680.c +++ b/src/game/game_110680.c @@ -81,29 +81,16 @@ void bossfileSetAndSaveDefaults(void) bossfileSave(); } -#if VERSION >= VERSION_PAL_FINAL -GLOBAL_ASM( -glabel bossfileLoadFull -/* f111198: 27bdffe8 */ addiu $sp,$sp,-24 -/* f11119c: afbf0014 */ sw $ra,0x14($sp) -/* f1111a0: 0fc444ba */ jal bossfileLoad -/* f1111a4: 00000000 */ nop -/* f1111a8: 3c04800a */ lui $a0,0x800a -/* f1111ac: 0fc5bdd7 */ jal func0f16f75c -/* f1111b0: 9484a992 */ lhu $a0,-0x566e($a0) -/* f1111b4: 8fbf0014 */ lw $ra,0x14($sp) -/* f1111b8: 27bd0018 */ addiu $sp,$sp,0x18 -/* f1111bc: 24020001 */ li $v0,0x1 -/* f1111c0: 03e00008 */ jr $ra -/* f1111c4: 00000000 */ nop -); -#else bool bossfileLoadFull(void) { bossfileLoad(); + +#if PAL + func0f16f75c(g_Vars.unk000482); +#endif + return true; } -#endif void func0f1106ec(void) { diff --git a/src/include/game/lang.h b/src/include/game/lang.h index c221d3ca8..ebea86bc0 100644 --- a/src/include/game/lang.h +++ b/src/include/game/lang.h @@ -12,5 +12,6 @@ void langSetBankSimple(s32 bank); void langSetBank(s32 bank, u8 *arg1, s32 arg2); void langClearBank(s32 bank); char *langGet(s32 textid); +void func0f16f75c(u32 arg0); #endif