From 1a6507625b2295a60b2a01aed41a6a9168a7c2d9 Mon Sep 17 00:00:00 2001
From: Ryan Dwyer <ryandwyer1@gmail.com>
Date: Thu, 27 Aug 2020 20:16:31 +1000
Subject: [PATCH] Decompile audioRestartAuxTrack

---
 src/game/data/data_02a0e0.c         |  2 +-
 src/game/game_16cfa0.c              | 19 +++++--------------
 src/include/game/data/data_02a0e0.h |  1 +
 src/include/game/game_16cfa0.h      |  2 +-
 4 files changed, 8 insertions(+), 16 deletions(-)

diff --git a/src/game/data/data_02a0e0.c b/src/game/data/data_02a0e0.c
index 590d7a3a3..4961537c9 100644
--- a/src/game/data/data_02a0e0.c
+++ b/src/game/data/data_02a0e0.c
@@ -21,7 +21,7 @@
 s32 g_AudioCurrentBgMusicNum = -1;
 u32 var800840c4 = 0x00000000;
 u32 var800840c8 = 0xffffffff;
-u32 var800840cc = 0xffffffff;
+s32 var800840cc = -1;
 u32 var800840d0 = 0xffffffff;
 u32 var800840d4 = 0x00000000;
 u32 var800840d8 = 0x00000000;
diff --git a/src/game/game_16cfa0.c b/src/game/game_16cfa0.c
index 54690a4d8..cbbb47b58 100644
--- a/src/game/game_16cfa0.c
+++ b/src/game/game_16cfa0.c
@@ -1223,20 +1223,11 @@ glabel audioSetAuxTrack
 /*  f16e028:	00000000 */ 	nop
 );
 
-GLOBAL_ASM(
-glabel audioRestartAuxTrack
-/*  f16e02c:	27bdffe8 */ 	addiu	$sp,$sp,-24
-/*  f16e030:	afbf0014 */ 	sw	$ra,0x14($sp)
-/*  f16e034:	240effff */ 	addiu	$t6,$zero,-1
-/*  f16e038:	3c018008 */ 	lui	$at,%hi(var800840cc)
-/*  f16e03c:	ac2e40cc */ 	sw	$t6,%lo(var800840cc)($at)
-/*  f16e040:	0fc5b490 */ 	jal	func0f16d240
-/*  f16e044:	24040005 */ 	addiu	$a0,$zero,0x5
-/*  f16e048:	8fbf0014 */ 	lw	$ra,0x14($sp)
-/*  f16e04c:	27bd0018 */ 	addiu	$sp,$sp,0x18
-/*  f16e050:	03e00008 */ 	jr	$ra
-/*  f16e054:	00000000 */ 	nop
-);
+void audioRestartAuxTrack(void)
+{
+	var800840cc = -1;
+	func0f16d240(5);
+}
 
 void audioPlayXTrack(s32 index, u32 arg1, u32 duration)
 {
diff --git a/src/include/game/data/data_02a0e0.h b/src/include/game/data/data_02a0e0.h
index c5c0613d3..798136f4c 100644
--- a/src/include/game/data/data_02a0e0.h
+++ b/src/include/game/data/data_02a0e0.h
@@ -4,6 +4,7 @@
 
 extern s32 g_AudioCurrentBgMusicNum;
 extern u32 var800840c4;
+extern s32 var800840cc;
 extern u32 var800840d4;
 extern u32 var800840d8;
 extern u32 var800840e0;
diff --git a/src/include/game/game_16cfa0.h b/src/include/game/game_16cfa0.h
index d1cf9ee5c..217cf02fe 100644
--- a/src/include/game/game_16cfa0.h
+++ b/src/include/game/game_16cfa0.h
@@ -36,7 +36,7 @@ u32 func0f16deb8(u32 arg0);
 u32 audioSetTrack(u32 arg0);
 u32 audioRestartDefaultTrack(void);
 u32 audioSetAuxTrack(u32 arg0);
-u32 audioRestartAuxTrack(void);
+void audioRestartAuxTrack(void);
 void audioPlayXTrack(s32 index, u32 arg1, u32 duration);
 void audioStopTrack(s32 index);
 u32 func0f16e138(void);