From 74b04bbb9854e9e9237cf2b18106807aaa0d4e4f Mon Sep 17 00:00:00 2001
From: Ryan Dwyer <ryandwyer1@gmail.com>
Date: Sun, 31 Oct 2021 20:17:05 +1000
Subject: [PATCH] Decompile sndGetMusicChannelVolume

---
 src/include/lib/snd.h |  2 +-
 src/lib/snd.c         | 22 ++++++----------------
 2 files changed, 7 insertions(+), 17 deletions(-)

diff --git a/src/include/lib/snd.h b/src/include/lib/snd.h
index e353a1dbe..86589c0f1 100644
--- a/src/include/lib/snd.h
+++ b/src/include/lib/snd.h
@@ -24,7 +24,7 @@ void sndInit(void);
 bool sndIsMp3(u16 soundnum);
 bool snd0000fbc4(s16 arg0);
 bool snd0000fc48(struct var80094ed8 *arg0, s32 tracknum);
-u32 snd0000fd74(void);
+u16 sndGetMusicChannelVolume(struct var80094ed8 *arg0);
 void sndSetMusicChannelVolume(struct var80094ed8 *arg0, u16 volume);
 void snd0000fe18(void);
 void snd0000fe20(void);
diff --git a/src/lib/snd.c b/src/lib/snd.c
index 47a5664df..f1feb3a1a 100644
--- a/src/lib/snd.c
+++ b/src/lib/snd.c
@@ -2520,7 +2520,7 @@ glabel snd0000fc48
 /*     fd34:	8e0400f8 */ 	lw	$a0,0xf8($s0)
 /*     fd38:	0c00e6f8 */ 	jal	func00039be0
 /*     fd3c:	02002825 */ 	or	$a1,$s0,$zero
-/*     fd40:	0c003f5d */ 	jal	snd0000fd74
+/*     fd40:	0c003f5d */ 	jal	sndGetMusicChannelVolume
 /*     fd44:	02002025 */ 	or	$a0,$s0,$zero
 /*     fd48:	02002025 */ 	or	$a0,$s0,$zero
 /*     fd4c:	0c003f67 */ 	jal	sndSetMusicChannelVolume
@@ -2651,7 +2651,7 @@ glabel snd0000fc48
 /*    10284:	8e0400f8 */ 	lw	$a0,0xf8($s0)
 /*    10288:	0c00ebec */ 	jal	func00039be0
 /*    1028c:	02002825 */ 	or	$a1,$s0,$zero
-/*    10290:	0c0040b1 */ 	jal	snd0000fd74
+/*    10290:	0c0040b1 */ 	jal	sndGetMusicChannelVolume
 /*    10294:	02002025 */ 	or	$a0,$s0,$zero
 /*    10298:	02002025 */ 	or	$a0,$s0,$zero
 /*    1029c:	0c0040bb */ 	jal	sndSetMusicChannelVolume
@@ -2668,20 +2668,10 @@ glabel snd0000fc48
 );
 #endif
 
-GLOBAL_ASM(
-glabel snd0000fd74
-/*     fd74:	3c0e8006 */ 	lui	$t6,%hi(g_SndDisabled)
-/*     fd78:	8dcedda0 */ 	lw	$t6,%lo(g_SndDisabled)($t6)
-/*     fd7c:	24037fff */ 	addiu	$v1,$zero,0x7fff
-/*     fd80:	51c00004 */ 	beqzl	$t6,.L0000fd94
-/*     fd84:	94830100 */ 	lhu	$v1,0x100($a0)
-/*     fd88:	03e00008 */ 	jr	$ra
-/*     fd8c:	3062ffff */ 	andi	$v0,$v1,0xffff
-/*     fd90:	94830100 */ 	lhu	$v1,0x100($a0)
-.L0000fd94:
-/*     fd94:	03e00008 */ 	jr	$ra
-/*     fd98:	3062ffff */ 	andi	$v0,$v1,0xffff
-);
+u16 sndGetMusicChannelVolume(struct var80094ed8 *arg0)
+{
+	return g_SndDisabled ? 0x7fff : arg0->volume;
+}
 
 void sndSetMusicChannelVolume(struct var80094ed8 *arg0, u16 volume)
 {