From 7a1c23dc31cf5304f4de5b91df83e38c7c7932cc Mon Sep 17 00:00:00 2001
From: Ryan Dwyer <ryandwyer1@gmail.com>
Date: Thu, 27 Aug 2020 20:33:52 +1000
Subject: [PATCH] Decompile func0f16deb8

---
 src/game/data/data_02a0e0.c         |  2 +-
 src/game/game_16cfa0.c              | 27 ++++++++-------------------
 src/include/game/data/data_02a0e0.h |  1 +
 src/include/game/game_16cfa0.h      |  2 +-
 4 files changed, 11 insertions(+), 21 deletions(-)

diff --git a/src/game/data/data_02a0e0.c b/src/game/data/data_02a0e0.c
index 4961537c9..05ffee157 100644
--- a/src/game/data/data_02a0e0.c
+++ b/src/game/data/data_02a0e0.c
@@ -20,7 +20,7 @@
 
 s32 g_AudioCurrentBgMusicNum = -1;
 u32 var800840c4 = 0x00000000;
-u32 var800840c8 = 0xffffffff;
+s32 var800840c8 = -1;
 s32 var800840cc = -1;
 u32 var800840d0 = 0xffffffff;
 u32 var800840d4 = 0x00000000;
diff --git a/src/game/game_16cfa0.c b/src/game/game_16cfa0.c
index 56b37c7ae..4cc46484f 100644
--- a/src/game/game_16cfa0.c
+++ b/src/game/game_16cfa0.c
@@ -1099,25 +1099,14 @@ void audioRestartTrack(void)
 	func0f16d4b8(0.5f);
 }
 
-GLOBAL_ASM(
-glabel func0f16deb8
-/*  f16deb8:	27bdffe8 */ 	addiu	$sp,$sp,-24
-/*  f16debc:	afbf0014 */ 	sw	$ra,0x14($sp)
-/*  f16dec0:	afa40018 */ 	sw	$a0,0x18($sp)
-/*  f16dec4:	0fc5b490 */ 	jal	func0f16d240
-/*  f16dec8:	24040001 */ 	addiu	$a0,$zero,0x1
-/*  f16decc:	8fae0018 */ 	lw	$t6,0x18($sp)
-/*  f16ded0:	3c018008 */ 	lui	$at,%hi(var800840c8)
-/*  f16ded4:	ac2e40c8 */ 	sw	$t6,%lo(var800840c8)($at)
-/*  f16ded8:	3c013f00 */ 	lui	$at,0x3f00
-/*  f16dedc:	44816000 */ 	mtc1	$at,$f12
-/*  f16dee0:	0fc5b52e */ 	jal	func0f16d4b8
-/*  f16dee4:	00000000 */ 	nop
-/*  f16dee8:	8fbf0014 */ 	lw	$ra,0x14($sp)
-/*  f16deec:	27bd0018 */ 	addiu	$sp,$sp,0x18
-/*  f16def0:	03e00008 */ 	jr	$ra
-/*  f16def4:	00000000 */ 	nop
-);
+void func0f16deb8(s32 tracknum)
+{
+	func0f16d240(1);
+
+	var800840c8 = tracknum;
+
+	func0f16d4b8(0.5f);
+}
 
 void audioSetTrack(s32 tracknum)
 {
diff --git a/src/include/game/data/data_02a0e0.h b/src/include/game/data/data_02a0e0.h
index 798136f4c..c40cf209e 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 var800840c8;
 extern s32 var800840cc;
 extern u32 var800840d4;
 extern u32 var800840d8;
diff --git a/src/include/game/game_16cfa0.h b/src/include/game/game_16cfa0.h
index a06640f26..cc77b3528 100644
--- a/src/include/game/game_16cfa0.h
+++ b/src/include/game/game_16cfa0.h
@@ -32,7 +32,7 @@ void func0f16dd14(void);
 u32 func0f16ddb0(void);
 u32 audioPlayTrack(u32 arg0);
 void audioRestartTrack(void);
-u32 func0f16deb8(u32 arg0);
+void func0f16deb8(s32 tracknum);
 void audioSetTrack(s32 tracknum);
 void audioRestartDefaultTrack(void);
 void audioSetAuxTrack(s32 tracknum);