From 9f14aadac0b3c25a988b0da76ea239fe46bc4123 Mon Sep 17 00:00:00 2001 From: Ryan Dwyer Date: Thu, 27 Aug 2020 21:36:39 +1000 Subject: [PATCH] Decompile func0f16da2c --- src/game/game_16cfa0.c | 21 ++++++--------------- src/include/game/game_16cfa0.h | 2 +- src/include/game/game_176080.h | 2 +- 3 files changed, 8 insertions(+), 17 deletions(-) diff --git a/src/game/game_16cfa0.c b/src/game/game_16cfa0.c index a707e88a1..4e993a4b5 100644 --- a/src/game/game_16cfa0.c +++ b/src/game/game_16cfa0.c @@ -754,21 +754,12 @@ void func0f16d9f0(s32 stagenum) var800aa5d0 = stagenum; } -GLOBAL_ASM( -glabel func0f16d9fc -/* f16d9fc: 27bdffe8 */ addiu $sp,$sp,-24 -/* f16da00: afbf0014 */ sw $ra,0x14($sp) -/* f16da04: 0fc5b50c */ jal func0f16d430 -/* f16da08: 00000000 */ nop -/* f16da0c: 0fc5b4f4 */ jal func0f16d3d0 -/* f16da10: 00000000 */ nop -/* f16da14: 0fc5b513 */ jal func0f16d44c -/* f16da18: 00000000 */ nop -/* f16da1c: 8fbf0014 */ lw $ra,0x14($sp) -/* f16da20: 27bd0018 */ addiu $sp,$sp,0x18 -/* f16da24: 03e00008 */ jr $ra -/* f16da28: 00000000 */ nop -); +void func0f16d9fc(void) +{ + func0f16d430(); + func0f16d3d0(); + func0f16d44c(); +} void func0f16da2c(void) { diff --git a/src/include/game/game_16cfa0.h b/src/include/game/game_16cfa0.h index dc7ec62ef..86c16f738 100644 --- a/src/include/game/game_16cfa0.h +++ b/src/include/game/game_16cfa0.h @@ -21,7 +21,7 @@ void func0f16d89c(f32 arg0); void audioSetBgMusic(s32 tracknum); void func0f16d9a8(s32 stagenum); void func0f16d9f0(s32 stagenum); -u32 func0f16d9fc(void); +void func0f16d9fc(void); void func0f16da2c(void); void func0f16daa4(void); void audioSetBgMusicForMenu(void); diff --git a/src/include/game/game_176080.h b/src/include/game/game_176080.h index 8106366f8..a04f0d601 100644 --- a/src/include/game/game_176080.h +++ b/src/include/game/game_176080.h @@ -13,6 +13,6 @@ u32 func0f176668(void); u32 func0f1766b4(void); u32 func0f176c40(void); s32 func0f176cd8(s32 stagenum); -s32 func0f176d20(u32 arg0); +s32 func0f176d20(s32 stagenum); #endif