tyler.durden
/
P3D-Legacy
mirror of https://github.com/P3D-Legacy/P3D-Legacy.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix for battlemusic playing after end battle

This commit is contained in:
Jasper "JappaWakka" Speelman 2022-04-09 22:08:52 +02:00
parent 2efdad493a
commit 56527e85c0
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
P3D/Battle/BattleSystemV2/BattleScreen.vb
View File

@ -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))