From d7ce2edaffd0cf5988e5d9cb5b2ae255a8252804 Mon Sep 17 00:00:00 2001 From: Ryan Dwyer Date: Thu, 30 Jan 2020 23:27:58 +1000 Subject: [PATCH] Decompile func0f0b9650 --- src/game/game_0b28d0.c | 17 +++++------------ src/include/game/game_0b28d0.h | 2 +- src/include/setup/setup_0160b0.h | 1 + 3 files changed, 7 insertions(+), 13 deletions(-) diff --git a/src/game/game_0b28d0.c b/src/game/game_0b28d0.c index e33ce69fc..1fe195860 100644 --- a/src/game/game_0b28d0.c +++ b/src/game/game_0b28d0.c @@ -8068,18 +8068,11 @@ void func0f0b963c(s32 tickmode) g_Vars.in_cutscene = false; } -GLOBAL_ASM( -glabel func0f0b9650 -/* f0b9650: 27bdffe8 */ addiu $sp,$sp,-24 -/* f0b9654: afbf0014 */ sw $ra,0x14($sp) -/* f0b9658: 0fc2e58f */ jal func0f0b963c -/* f0b965c: 00002025 */ or $a0,$zero,$zero -/* f0b9660: 8fbf0014 */ lw $ra,0x14($sp) -/* f0b9664: 3c018007 */ lui $at,0x8007 -/* f0b9668: ac200744 */ sw $zero,0x744($at) -/* f0b966c: 03e00008 */ jr $ra -/* f0b9670: 27bd0018 */ addiu $sp,$sp,0x18 -); +void func0f0b9650(void) +{ + func0f0b963c(0); + var80070744 = 0; +} GLOBAL_ASM( glabel func0f0b9674 diff --git a/src/include/game/game_0b28d0.h b/src/include/game/game_0b28d0.h index a54ce6a73..c84073193 100644 --- a/src/include/game/game_0b28d0.h +++ b/src/include/game/game_0b28d0.h @@ -79,7 +79,7 @@ u32 func0f0b872c(void); u32 func0f0b8ba0(void); u32 func0f0b9538(void); void func0f0b963c(s32 tickmode); -u32 func0f0b9650(void); +void func0f0b9650(void); u32 func0f0b9674(void); u32 func0f0b96e8(void); u32 func0f0b9a20(void); diff --git a/src/include/setup/setup_0160b0.h b/src/include/setup/setup_0160b0.h index 64cad1e26..043ad9b8e 100644 --- a/src/include/setup/setup_0160b0.h +++ b/src/include/setup/setup_0160b0.h @@ -60,6 +60,7 @@ extern u32 var800705bc; extern u32 var800705c0; extern u32 var800706c8; extern bool g_HiRes; +extern u32 var80070744; extern u32 var8007074c; extern u32 var80070764; extern u32 var80070768;