diff --git a/src/game/game_16cfa0.c b/src/game/game_16cfa0.c index 83d3dad03..0e104c812 100644 --- a/src/game/game_16cfa0.c +++ b/src/game/game_16cfa0.c @@ -778,28 +778,16 @@ glabel func0f16d91c /* f16d9a4: ac3840c0 */ sw $t8,%lo(var800840c0)($at) ); -GLOBAL_ASM( -glabel func0f16d9a8 -/* f16d9a8: 27bdffe8 */ addiu $sp,$sp,-24 -/* f16d9ac: afbf0014 */ sw $ra,0x14($sp) -/* f16d9b0: 3c01800b */ lui $at,%hi(var800aa5d0) -/* f16d9b4: 44806000 */ mtc1 $zero,$f12 -/* f16d9b8: 0fc5b52e */ jal func0f16d4b8 -/* f16d9bc: ac24a5d0 */ sw $a0,%lo(var800aa5d0)($at) -/* f16d9c0: 3c04800b */ lui $a0,%hi(var800aa5d0) -/* f16d9c4: 0fc5db36 */ jal func0f176cd8 -/* f16d9c8: 8c84a5d0 */ lw $a0,%lo(var800aa5d0)($a0) -/* f16d9cc: 04420005 */ bltzl $v0,.L0f16d9e4 -/* f16d9d0: 8fbf0014 */ lw $ra,0x14($sp) -/* f16d9d4: 44806000 */ mtc1 $zero,$f12 -/* f16d9d8: 0fc5b552 */ jal func0f16d548 -/* f16d9dc: 00000000 */ nop -/* f16d9e0: 8fbf0014 */ lw $ra,0x14($sp) -.L0f16d9e4: -/* f16d9e4: 27bd0018 */ addiu $sp,$sp,0x18 -/* f16d9e8: 03e00008 */ jr $ra -/* f16d9ec: 00000000 */ nop -); +void func0f16d9a8(s32 stagenum) +{ + var800aa5d0 = stagenum; + + func0f16d4b8(0); + + if (func0f176cd8(var800aa5d0) >= 0) { + func0f16d548(0); + } +} void func0f16d9f0(s32 stagenum) { diff --git a/src/include/game/game_16cfa0.h b/src/include/game/game_16cfa0.h index df5ca15a1..d43319747 100644 --- a/src/include/game/game_16cfa0.h +++ b/src/include/game/game_16cfa0.h @@ -14,8 +14,8 @@ void func0f16d324(void); void func0f16d3d0(void); u32 func0f16d430(void); u32 func0f16d44c(void); -u32 func0f16d4b8(void); -u32 func0f16d548(void); +void func0f16d4b8(f32 arg0); +void func0f16d548(f32 arg0); u32 func0f16d6c0(void); u32 func0f16d89c(void); u32 func0f16d91c(void); diff --git a/src/include/game/game_176080.h b/src/include/game/game_176080.h index 9f8adb6f0..49e0eeede 100644 --- a/src/include/game/game_176080.h +++ b/src/include/game/game_176080.h @@ -12,7 +12,7 @@ u32 func0f1763f4(void); u32 func0f176668(void); u32 func0f1766b4(void); u32 func0f176c40(void); -u32 func0f176cd8(void); +s32 func0f176cd8(s32 stagenum); u32 func0f176d20(void); #endif