From 56527e85c0f5b9f3158431a36ed9b14e29f7ffb4 Mon Sep 17 00:00:00 2001 From: "Jasper \"JappaWakka\" Speelman" Date: Sat, 9 Apr 2022 22:08:52 +0200 Subject: [PATCH] Fix for battlemusic playing after end battle --- P3D/Battle/BattleSystemV2/BattleScreen.vb | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/P3D/Battle/BattleSystemV2/BattleScreen.vb b/P3D/Battle/BattleSystemV2/BattleScreen.vb index 65ea22efd..c7f8c32d2 100644 --- a/P3D/Battle/BattleSystemV2/BattleScreen.vb +++ b/P3D/Battle/BattleSystemV2/BattleScreen.vb @@ -1218,7 +1218,10 @@ nextIndex: End If p.ResetTemp() Next + If hasLevelUp = False Then + MusicManager._afterBattleIntroSong = Nothing + MusicManager._introContinueSong = SavedOverworld.Level.MusicLoop Core.SetScreen(New TransitionScreen(Me, SavedOverworld.OverworldScreen, New Color(255, 255, 254), False, AddressOf ChangeSavedScreen)) Else Dim EvolvePokeList As New List(Of Integer) @@ -1235,6 +1238,8 @@ nextIndex: Next If EvolvePokeList.Count = 0 Then + MusicManager._afterBattleIntroSong = Nothing + MusicManager._introContinueSong = SavedOverworld.Level.MusicLoop Core.SetScreen(New TransitionScreen(Me, SavedOverworld.OverworldScreen, New Color(255, 255, 254), False, AddressOf ChangeSavedScreen)) Else Core.SetScreen(New TransitionScreen(Me, New EvolutionScreen(Core.CurrentScreen, EvolvePokeList, "", EvolutionCondition.EvolutionTrigger.LevelUp, True), Color.Black, False))