From 0eddb70011e8701bea9c61d6fd3544e3bec1cba3 Mon Sep 17 00:00:00 2001 From: JappaWakka Date: Tue, 29 Aug 2023 19:20:54 +0200 Subject: [PATCH] Bring back fading out music with switching maps --- P3D/Battle/BattleSystemV2/BattleScreen.vb | 4 ++-- P3D/Overworld/OverworldCamera.vb | 2 +- P3D/Overworld/OverworldScreen.vb | 2 +- P3D/Overworld/SecretBase/SecretBaseScreen.vb | 2 +- P3D/Screens/Pokemon/EvolutionScreen.vb | 2 +- P3D/Screens/Pokemon/PartyScreen.vb | 2 +- P3D/World/Level.vb | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/P3D/Battle/BattleSystemV2/BattleScreen.vb b/P3D/Battle/BattleSystemV2/BattleScreen.vb index a1e367726..a8a172088 100644 --- a/P3D/Battle/BattleSystemV2/BattleScreen.vb +++ b/P3D/Battle/BattleSystemV2/BattleScreen.vb @@ -1365,7 +1365,7 @@ nextIndex: If hasLevelUp = False Then MusicManager.Stop() - MusicManager.Play(SavedOverworld.Level.MusicLoop) + MusicManager.Play(SavedOverworld.Level.MusicLoop, True, 0.01F) Core.SetScreen(New TransitionScreen(Me, SavedOverworld.OverworldScreen, New Color(255, 255, 255), False, AddressOf ChangeSavedScreen)) Else Dim EvolvePokeList As New List(Of Integer) @@ -1383,7 +1383,7 @@ nextIndex: If EvolvePokeList.Count = 0 Then MusicManager.Stop() - MusicManager.Play(SavedOverworld.Level.MusicLoop) + MusicManager.Play(SavedOverworld.Level.MusicLoop, True, 0.01F) Core.SetScreen(New TransitionScreen(Me, SavedOverworld.OverworldScreen, New Color(255, 255, 255), False, AddressOf ChangeSavedScreen)) Else Core.SetScreen(New TransitionScreen(Me, New EvolutionScreen(Core.CurrentScreen, EvolvePokeList, "", EvolutionCondition.EvolutionTrigger.LevelUp, True), Color.Black, False)) diff --git a/P3D/Overworld/OverworldCamera.vb b/P3D/Overworld/OverworldCamera.vb index 7d55da0a0..148b1685f 100644 --- a/P3D/Overworld/OverworldCamera.vb +++ b/P3D/Overworld/OverworldCamera.vb @@ -888,7 +888,7 @@ Public Class OverworldCamera Screen.Level.OverworldPokemon.Visible = False If Screen.Level.IsRadioOn = False OrElse GameJolt.PokegearScreen.StationCanPlay(Screen.Level.SelectedRadioStation) = False Then - MusicManager.Play(Screen.Level.MusicLoop) + MusicManager.Play(Screen.Level.MusicLoop, True, 0.01F) End If End If End If diff --git a/P3D/Overworld/OverworldScreen.vb b/P3D/Overworld/OverworldScreen.vb index 8943db698..83d3ae508 100644 --- a/P3D/Overworld/OverworldScreen.vb +++ b/P3D/Overworld/OverworldScreen.vb @@ -137,7 +137,7 @@ Public Class OverworldScreen If Level.Riding = True Then MusicManager.Play("ride", True) 'Play "ride" when player is riding. Else - MusicManager.Play(Level.MusicLoop, True) 'Play default MusicLoop. + MusicManager.Play(Level.MusicLoop, True, 0.01F) 'Play default MusicLoop. End If End If diff --git a/P3D/Overworld/SecretBase/SecretBaseScreen.vb b/P3D/Overworld/SecretBase/SecretBaseScreen.vb index 49333db1a..7d158ca78 100644 --- a/P3D/Overworld/SecretBase/SecretBaseScreen.vb +++ b/P3D/Overworld/SecretBase/SecretBaseScreen.vb @@ -23,7 +23,7 @@ Level.Load("|") Me.SecretBase.LoadSecretBaseFromStore(Screen.Level) - MusicManager.Play(Level.MusicLoop, True) + MusicManager.Play(Level.MusicLoop, True, 0.01F) End Sub Public Overrides Sub Update() diff --git a/P3D/Screens/Pokemon/EvolutionScreen.vb b/P3D/Screens/Pokemon/EvolutionScreen.vb index 0eaecab52..8e52f7bff 100644 --- a/P3D/Screens/Pokemon/EvolutionScreen.vb +++ b/P3D/Screens/Pokemon/EvolutionScreen.vb @@ -328,7 +328,7 @@ s = s.PreScreen End While Core.SetScreen(New TransitionScreen(s, s.PreScreen, Color.Black, False)) - MusicManager.Play(SavedMusic) + MusicManager.Play(SavedMusic, True, 0.01F) Else Dim s As Screen = Core.CurrentScreen While s.Identification <> Identifications.BattleScreen diff --git a/P3D/Screens/Pokemon/PartyScreen.vb b/P3D/Screens/Pokemon/PartyScreen.vb index bf327c56d..8aa8bdf27 100644 --- a/P3D/Screens/Pokemon/PartyScreen.vb +++ b/P3D/Screens/Pokemon/PartyScreen.vb @@ -1025,7 +1025,7 @@ Public Class PartyScreen End If If Screen.Level.IsRadioOn = False OrElse GameJolt.PokegearScreen.StationCanPlay(Screen.Level.SelectedRadioStation) = False Then - MusicManager.Play(Level.MusicLoop) + MusicManager.Play(Level.MusicLoop, True, 0.01F) End If Else If Screen.Level.Surfing = False And Screen.Camera.IsMoving() = False And Screen.Camera.Turning = False And Level.CanRide() = True Then diff --git a/P3D/World/Level.vb b/P3D/World/Level.vb index 8ee0333fb..b3219f63c 100644 --- a/P3D/World/Level.vb +++ b/P3D/World/Level.vb @@ -1072,7 +1072,7 @@ Public Class Level MusicManager.Play("ride", True) Else If MusicManager.GetSong(MusicLoop) IsNot Nothing Then - MusicManager.Play(MusicLoop, True) + MusicManager.Play(MusicLoop, True, 0.01F) Else MusicManager.Play("silence") End If