From e5ded2f5dff589c57ff63e7673cbb6abec80cb3e Mon Sep 17 00:00:00 2001 From: Ryan Dwyer Date: Thu, 3 Sep 2020 23:22:07 +1000 Subject: [PATCH] Decompile func0000e95c --- src/include/game/pak/pak.h | 2 +- src/lib/lib_0d520.c | 20 ++++++-------------- 2 files changed, 7 insertions(+), 15 deletions(-) diff --git a/src/include/game/pak/pak.h b/src/include/game/pak/pak.h index 41c8bcd45..d7ebe0383 100644 --- a/src/include/game/pak/pak.h +++ b/src/include/game/pak/pak.h @@ -94,7 +94,7 @@ u32 func0f11bc54(s8 arg0, u32 arg1, u32 arg2, u32 arg3, u32 arg4, u32 arg5, u32 bool pakRepair(s32 arg0); u32 func0f11c39c(u32 arg0, u32 arg1, u32 ar2, u32 arg3); void func0f11c54c(void); -u32 func0f11c6d0(void); +void func0f11c6d0(void); void func0f11c7a0(void); u32 func0f11ca30(void); void func0f11cb9c(u32 arg0); diff --git a/src/lib/lib_0d520.c b/src/lib/lib_0d520.c index 640d95eed..840dfac36 100644 --- a/src/lib/lib_0d520.c +++ b/src/lib/lib_0d520.c @@ -1597,21 +1597,13 @@ glabel func0000e684 /* e958: 27bd0030 */ addiu $sp,$sp,0x30 ); -GLOBAL_ASM( -glabel func0000e95c -/* e95c: 27bdffe8 */ addiu $sp,$sp,-24 -/* e960: afbf0014 */ sw $ra,0x14($sp) -/* e964: 0fc471b4 */ jal func0f11c6d0 -/* e968: afa40018 */ sw $a0,0x18($sp) -/* e96c: 8fbf0014 */ lw $ra,0x14($sp) -/* e970: 8fae0018 */ lw $t6,0x18($sp) -/* e974: 3c018006 */ lui $at,%hi(var8005dd54) -/* e978: 27bd0018 */ addiu $sp,$sp,0x18 -/* e97c: 03e00008 */ jr $ra -/* e980: ac2edd54 */ sw $t6,%lo(var8005dd54)($at) -); +void func0000e95c(s32 stagenum) +{ + func0f11c6d0(); + + var8005dd54 = stagenum; +} -// func0000e984 s32 getCurrentStageId(void) { return g_StageNum;