From e85309a66c6cc6f9404e71aa095bab8d6e80a073 Mon Sep 17 00:00:00 2001 From: Ryan Dwyer Date: Thu, 3 Sep 2020 23:18:33 +1000 Subject: [PATCH] Decompile func0000e990 --- src/include/game/game_095320.h | 2 +- src/lib/lib_0d520.c | 21 ++++++--------------- 2 files changed, 7 insertions(+), 16 deletions(-) diff --git a/src/include/game/game_095320.h b/src/include/game/game_095320.h index d6917614c..9724636a7 100644 --- a/src/include/game/game_095320.h +++ b/src/include/game/game_095320.h @@ -12,7 +12,7 @@ s32 objectiveGetCount(void); u32 objectiveGetDifficultyBits(s32 index); u32 objectiveGetStatus(u32 arg0); u32 objectiveIsAllComplete(void); -u32 func0f095bf4(void); +void func0f095bf4(void); u32 func0f095c04(void); void func0f095d64(void); void objectiveCheckRoomEntered(s32 currentroom); diff --git a/src/lib/lib_0d520.c b/src/lib/lib_0d520.c index 4db1e1e6e..d3d056bca 100644 --- a/src/lib/lib_0d520.c +++ b/src/lib/lib_0d520.c @@ -1617,21 +1617,12 @@ s32 getCurrentStageId(void) return g_StageNum; } -GLOBAL_ASM( -glabel func0000e990 -/* e990: 27bdffe8 */ addiu $sp,$sp,-24 -/* e994: afbf0014 */ sw $ra,0x14($sp) -/* e998: 0fc25759 */ jal func0f095d64 -/* e99c: 00000000 */ nop -/* e9a0: 0fc256fd */ jal func0f095bf4 -/* e9a4: 00000000 */ nop -/* e9a8: 0c0039a1 */ jal func0000e684 -/* e9ac: 00000000 */ nop -/* e9b0: 8fbf0014 */ lw $ra,0x14($sp) -/* e9b4: 27bd0018 */ addiu $sp,$sp,0x18 -/* e9b8: 03e00008 */ jr $ra -/* e9bc: 00000000 */ nop -); +void func0000e990(void) +{ + func0f095d64(); + func0f095bf4(); + func0000e684(); +} GLOBAL_ASM( glabel func0000e9c0