From 74f42b235819f551c8a98f1b95153ec902502b11 Mon Sep 17 00:00:00 2001 From: Ryan Dwyer Date: Thu, 27 Aug 2020 20:24:01 +1000 Subject: [PATCH] Decompile audioRestartDefaultTrack --- src/game/game_16cfa0.c | 33 ++++++++++----------------------- src/include/game/game_16cfa0.h | 2 +- 2 files changed, 11 insertions(+), 24 deletions(-) diff --git a/src/game/game_16cfa0.c b/src/game/game_16cfa0.c index 5d6063599..92238e4f5 100644 --- a/src/game/game_16cfa0.c +++ b/src/game/game_16cfa0.c @@ -1170,29 +1170,16 @@ glabel audioSetTrack /* f16df80: 27bd0018 */ addiu $sp,$sp,0x18 ); -GLOBAL_ASM( -glabel audioRestartDefaultTrack -/* f16df84: 3c0e8006 */ lui $t6,%hi(var800624a4) -/* f16df88: 8dce24a4 */ lw $t6,%lo(var800624a4)($t6) -/* f16df8c: 27bdffe8 */ addiu $sp,$sp,-24 -/* f16df90: 3c01800a */ lui $at,%hi(g_Vars+0x4c8) -/* f16df94: afbf0014 */ sw $ra,0x14($sp) -/* f16df98: 15c00009 */ bnez $t6,.L0f16dfc0 -/* f16df9c: ac20a488 */ sw $zero,%lo(g_Vars+0x4c8)($at) -/* f16dfa0: 0fc5b490 */ jal func0f16d240 -/* f16dfa4: 24040001 */ addiu $a0,$zero,0x1 -/* f16dfa8: 0fc5b490 */ jal func0f16d240 -/* f16dfac: 24040005 */ addiu $a0,$zero,0x5 -/* f16dfb0: 3c013f00 */ lui $at,0x3f00 -/* f16dfb4: 44816000 */ mtc1 $at,$f12 -/* f16dfb8: 0fc5b52e */ jal func0f16d4b8 -/* f16dfbc: 00000000 */ nop -.L0f16dfc0: -/* f16dfc0: 8fbf0014 */ lw $ra,0x14($sp) -/* f16dfc4: 27bd0018 */ addiu $sp,$sp,0x18 -/* f16dfc8: 03e00008 */ jr $ra -/* f16dfcc: 00000000 */ nop -); +void audioRestartDefaultTrack(void) +{ + g_Vars.unk0004c8 = 0; + + if (var800624a4 == 0) { + func0f16d240(1); + func0f16d240(5); + func0f16d4b8(0.5f); + } +} void audioSetAuxTrack(s32 tracknum) { diff --git a/src/include/game/game_16cfa0.h b/src/include/game/game_16cfa0.h index b00ad3e4d..9ae936a41 100644 --- a/src/include/game/game_16cfa0.h +++ b/src/include/game/game_16cfa0.h @@ -34,7 +34,7 @@ u32 audioPlayTrack(u32 arg0); u32 audioRestartTrack(void); u32 func0f16deb8(u32 arg0); u32 audioSetTrack(u32 arg0); -u32 audioRestartDefaultTrack(void); +void audioRestartDefaultTrack(void); void audioSetAuxTrack(s32 tracknum); void audioRestartAuxTrack(void); void audioPlayXTrack(s32 index, u32 arg1, u32 duration);