diff --git a/src/game/data/data_02a0e0.c b/src/game/data/data_02a0e0.c index 05ffee157..2097f1107 100644 --- a/src/game/data/data_02a0e0.c +++ b/src/game/data/data_02a0e0.c @@ -25,7 +25,7 @@ s32 var800840cc = -1; u32 var800840d0 = 0xffffffff; u32 var800840d4 = 0x00000000; u32 var800840d8 = 0x00000000; -u32 var800840dc = 0x00000000; +s32 var800840dc = 0; u32 var800840e0 = 0x0000000f; u32 var800840e4 = 0x00000000; u32 var800840e8 = 0x00000000; diff --git a/src/game/game_16cfa0.c b/src/game/game_16cfa0.c index 31c038b4e..075d7d489 100644 --- a/src/game/game_16cfa0.c +++ b/src/game/game_16cfa0.c @@ -1030,34 +1030,18 @@ glabel func0f16dd14 /* f16ddac: 00000000 */ nop ); -GLOBAL_ASM( -glabel func0f16ddb0 -/* f16ddb0: 27bdffe8 */ addiu $sp,$sp,-24 -/* f16ddb4: afbf0014 */ sw $ra,0x14($sp) -/* f16ddb8: 24040004 */ addiu $a0,$zero,0x4 -/* f16ddbc: 3c054000 */ lui $a1,0x4000 -/* f16ddc0: 0fc5b4ab */ jal func0f16d2ac -/* f16ddc4: 00003025 */ or $a2,$zero,$zero -/* f16ddc8: 3c0e8008 */ lui $t6,%hi(var800840d8) -/* f16ddcc: 8dce40d8 */ lw $t6,%lo(var800840d8)($t6) -/* f16ddd0: 3c014000 */ lui $at,0x4000 -/* f16ddd4: 44816000 */ mtc1 $at,$f12 -/* f16ddd8: 11c00005 */ beqz $t6,.L0f16ddf0 -/* f16dddc: 00000000 */ nop -/* f16dde0: 0fc5b627 */ jal func0f16d89c -/* f16dde4: 00000000 */ nop -/* f16dde8: 10000004 */ b .L0f16ddfc -/* f16ddec: 8fbf0014 */ lw $ra,0x14($sp) -.L0f16ddf0: -/* f16ddf0: 0fc5b52e */ jal func0f16d4b8 -/* f16ddf4: 00000000 */ nop -/* f16ddf8: 8fbf0014 */ lw $ra,0x14($sp) -.L0f16ddfc: -/* f16ddfc: 3c018008 */ lui $at,%hi(var800840dc) -/* f16de00: ac2040dc */ sw $zero,%lo(var800840dc)($at) -/* f16de04: 03e00008 */ jr $ra -/* f16de08: 27bd0018 */ addiu $sp,$sp,0x18 -); +void func0f16ddb0(void) +{ + func0f16d2ac(4, 2, 0); + + if (var800840d8) { + func0f16d89c(2); + } else { + func0f16d4b8(2); + } + + var800840dc = 0; +} void audioPlayTrack(s32 tracknum) { diff --git a/src/include/game/data/data_02a0e0.h b/src/include/game/data/data_02a0e0.h index c40cf209e..726c8f473 100644 --- a/src/include/game/data/data_02a0e0.h +++ b/src/include/game/data/data_02a0e0.h @@ -8,6 +8,7 @@ extern s32 var800840c8; extern s32 var800840cc; extern u32 var800840d4; extern u32 var800840d8; +extern s32 var800840dc; extern u32 var800840e0; extern u32 var800840f0; extern u32 var800840f4; diff --git a/src/include/game/game_16cfa0.h b/src/include/game/game_16cfa0.h index 1234f303e..555bea912 100644 --- a/src/include/game/game_16cfa0.h +++ b/src/include/game/game_16cfa0.h @@ -17,7 +17,7 @@ void func0f16d44c(void); void func0f16d4b8(f32 arg0); void func0f16d548(f32 arg0); u32 func0f16d6c0(void); -u32 func0f16d89c(void); +void func0f16d89c(f32 arg0); void audioSetBgMusic(s32 tracknum); void func0f16d9a8(s32 stagenum); void func0f16d9f0(s32 stagenum); @@ -29,7 +29,7 @@ void func0f16db3c(void); void func0f16dba4(void); u32 func0f16dc78(void); void func0f16dd14(void); -u32 func0f16ddb0(void); +void func0f16ddb0(void); void audioPlayTrack(s32 tracknum); void audioRestartTrack(void); void func0f16deb8(s32 tracknum);