From 543e4df9200d77631036a8b3f94facf7092f2142 Mon Sep 17 00:00:00 2001
From: Joey Ballentine <joeyjballentine@gmail.com>
Date: Mon, 24 Feb 2025 18:12:50 -0600
Subject: [PATCH] Random zMusic improvements

---
 src/SB/Game/zMusic.cpp | 23 ++++++++++++++++-------
 1 file changed, 16 insertions(+), 7 deletions(-)

diff --git a/src/SB/Game/zMusic.cpp b/src/SB/Game/zMusic.cpp
index 2b991801d..438b803bd 100644
--- a/src/SB/Game/zMusic.cpp
+++ b/src/SB/Game/zMusic.cpp
@@ -12,12 +12,8 @@ extern zMusicTrackInfo sMusicTrack[2];
 extern zVolumeInfo volume;
 extern U32 sMusicPaused;
 extern S32 sMusicLastEnum[2];
-extern F32 lbl_803CDD48; //0f by default.
-extern F32 minDelay; //Value is defaulted at 0.001f.
 extern U32 sMusicSoundID[24][2];
 extern zMusicSituation sMusicInfo[8];
-extern F32 lbl_803CCA78;
-extern F32 lbl_803CD118;
 extern zMusicSituation* sMusicQueueData[2];
 extern F32 sMusicTimer[2];
 
@@ -26,12 +22,14 @@ extern zGlobals globals;
 
 extern const char zMusic_strings[];
 
+static const F32 minDelay = 0.001f;
+
 #ifdef NON_MATCHING
 void volume_reset()
 {
-    volume.cur = lbl_803CCA78;
-    volume.end = lbl_803CD118;
-    volume.inc = lbl_803CCA78;
+    volume.cur = 0.0f;
+    volume.end = 1.0f;
+    volume.inc = 0.5f;
     memset(volume.adjusted, 0, sizeof(volume.adjusted));
 }
 #endif
@@ -292,6 +290,17 @@ void zMusicSetVolume(F32 vol, F32 delay)
     volume.inc = (vol - volume.cur) / delay;
 }
 
+// This version of it matches 33%. It's also functionally incorrect.
+void zMusicSetVolume(float vol, float delay)
+{
+    volume.cur = vol; // This makes it introduce the "frsp" instruction.
+    volume.inc = vol - volume.cur;
+
+    if (delay > minDelay) // Doing the if statement likes this makes it generate the "blelr" instruction
+    {
+        volume.inc = vol / delay;
+    }
+}
 #endif
 
 void zMusicReset()