From 71bd0eaaeff0a53cc86c2636bc2aaa8f4ab4c71f Mon Sep 17 00:00:00 2001
From: JappaWakka <jjlspeelman@outlook.com>
Date: Fri, 21 Jul 2023 19:30:18 +0200
Subject: [PATCH] Hopefully fix a music volume bug

---
 P3D/Resources/Sound/MusicManager.vb | 11 ++++++-----
 P3D/Screens/MainMenu/PauseScreen.vb |  4 ++--
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/P3D/Resources/Sound/MusicManager.vb b/P3D/Resources/Sound/MusicManager.vb
index 5157a5209..1fb1e05be 100644
--- a/P3D/Resources/Sound/MusicManager.vb
+++ b/P3D/Resources/Sound/MusicManager.vb
@@ -142,6 +142,7 @@ Public Class MusicManager
     Public Shared audioFileWMA As MediaFoundationReader
     Public Shared _stream As WaveChannel32
 
+    Public Shared Property PauseVolume As Single = 1.0F
     Public Shared Property MasterVolume As Single = 1.0F
     Public Shared ReadOnly Property CurrentSong As SongContainer
         Get
@@ -300,15 +301,15 @@ Public Class MusicManager
                 'End If
             End If
         End If
-        If Core.GameInstance.IsActive AndAlso _lastVolume <> (Volume * MasterVolume) Then
+        If Core.GameInstance.IsActive AndAlso _lastVolume <> (Volume * PauseVolume * MasterVolume) Then
             UpdateVolume()
         End If
     End Sub
 
     Public Shared Sub UpdateVolume()
-        _lastVolume = Volume * MasterVolume
+        _lastVolume = Volume * PauseVolume * MasterVolume
         If Not _stream Is Nothing Then
-            _stream.Volume = Volume * MasterVolume
+            _stream.Volume = Volume * PauseVolume * MasterVolume
         End If
     End Sub
 
@@ -703,8 +704,8 @@ Public Class MusicManager
             {
                 {"welcome", "RouteMusic1"},
                 {"battle", "johto_wild"},
-                {"batleintro", "battle_intro"},
-                {"johto_battle_intro", "battle_intro"},
+                {"batleintro", "johto_wild_intro"},
+                {"johto_battle_intro", "johto_wild_intro"},
                 {"darkcave", "dark_cave"},
                 {"showmearound", "show_me_around"},
                 {"sprouttower", "sprout_tower"},
diff --git a/P3D/Screens/MainMenu/PauseScreen.vb b/P3D/Screens/MainMenu/PauseScreen.vb
index 748d4bccf..46a366c86 100644
--- a/P3D/Screens/MainMenu/PauseScreen.vb
+++ b/P3D/Screens/MainMenu/PauseScreen.vb
@@ -323,12 +323,12 @@
     End Sub
 
     Public Overrides Sub ChangeTo()
-        MusicManager.MasterVolume /= 4
+        MusicManager.PauseVolume = 0.25F
         MusicManager.UpdateVolume()
     End Sub
 
     Public Overrides Sub ChangeFrom()
-        MusicManager.MasterVolume *= 4
+        MusicManager.PauseVolume = 1.0F
         MusicManager.UpdateVolume()
     End Sub
 End Class
\ No newline at end of file