Fixed multiple evolution softlock

This commit is contained in:
JappaWakka 2024-02-27 09:54:47 +01:00
parent bb78bb3543
commit 2551f0d5c7

View File

@ -148,9 +148,7 @@
Me.Identification = Identifications.EvolutionScreen Me.Identification = Identifications.EvolutionScreen
PlayerStatistics.Track("Evolutions", 1) PlayerStatistics.Track("Evolutions", 1)
If Me.AttackLearnList.Count > 0 Then Me.AttackLearnList.Clear()
AttackLearnList.Clear()
End If
Me.PreScreen = currentScreen Me.PreScreen = currentScreen
Me.FromBattle = FromBattle Me.FromBattle = FromBattle
Me.CanEnd = False Me.CanEnd = False
@ -312,8 +310,8 @@
If CanEnd = False Then If CanEnd = False Then
If AttackLearnList.Count > 0 Then If AttackLearnList.Count > 0 Then
Core.SetScreen(New LearnAttackScreen(Core.CurrentScreen, evolvedPokemon, AttackLearnList)) Core.SetScreen(New LearnAttackScreen(Core.CurrentScreen, evolvedPokemon, AttackLearnList))
CanEnd = True
End If End If
CanEnd = True
Else Else
If Core.CurrentScreen.Identification = Identifications.EvolutionScreen Then If Core.CurrentScreen.Identification = Identifications.EvolutionScreen Then
Endscene() Endscene()