Match zMusicUnpause

bfbbdecomp · Oct 12, 2024 · 02ef034 · 02ef034
1 parent 90fd857
commit 02ef034
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 29 deletions.
diff --git a/src/SB/Game/zMusic.cpp b/src/SB/Game/zMusic.cpp
@@ -114,8 +114,7 @@ void zMusicInit()
     volume_reset();
 }
 
-// Correct, but won't work due to the switch case jump table (messes with offsets)
-S32 getCurrLevelMusicEnum()
+static S32 getCurrLevelMusicEnum()
 {
     S32 snd_enum;
 
@@ -247,39 +246,36 @@ void zMusicPause()
     }
 }
 
-// WIP.
-#if 0
-// Only thing that doesn't compile correctly is the function call to xSndPlay, in which a bunch of stuff is in the wrong order it looks like.
 void zMusicUnpause(S32 kill)
 {
-    if (sMusicPaused != 0)
+    if (sMusicPaused == 0)
     {
-        for (S32 i = 0; i < 2; i++)
+        return;
+    }
+
+    for (S32 i = 0; i < 2; i++)
+    {
+        zMusicTrackInfo* track = &sMusicTrack[i];
+        if (track->snd_id == 0)
         {
-            zMusicTrackInfo* track = &sMusicTrack[i];
-            U32 prioBase = 0x800 * i;
-            if (track->snd_id != 0)
-            {
-                if (kill != 0)
-                {
-                    track->snd_id = 0;
-                }
-                else
-                {
-                    U32 res =
-                        xSndPlay(track->assetID, track->lastVol, lbl_803CDD48, 0xff,
-                                 prioBase | (int)(-track->loop | track->loop) >> 0x1f & 0x8000U |
-                                     0x10000 | 0x20000,
-                                 0, SND_CAT_MUSIC, lbl_803CDD48);
-                    track->snd_id = res;
-                }
-            }
+            continue;
+        }
+
+        if (kill != 0)
+        {
+            track->snd_id = 0;
+        }
+        else
+        {
+            S32 flags = i * 0x800;
+            flags |= ((track->loop != 0) ? 0x8000 : 0) | 0x10000;
+            flags |= 0x20000;
+            track->snd_id = xSndPlay(track->assetID, track->lastVol, 0.0f, 0xff, flags, 0, SND_CAT_MUSIC, 0.0f);
         }
-        sMusicPaused = 0;
     }
-}
 
-#endif
+    sMusicPaused = 0;
+}
 
 // WIP.
 #if 0

diff --git a/src/SB/Game/zMusic.h b/src/SB/Game/zMusic.h
@@ -38,7 +38,6 @@ struct zMusicTrackInfo
 
 void volume_reset();
 void zMusicRefreshVolume();
-S32 getCurrLevelMusicEnum();
 void zMusicNotify(S32 situation);
 void zMusicSetVolume(F32 vol, F32 delay);
 void zMusicKill();