From 2551f0d5c755e94f939db8707ea24d71ea89d330 Mon Sep 17 00:00:00 2001
From: JappaWakka <jjlspeelman@outlook.com>
Date: Tue, 27 Feb 2024 09:54:47 +0100
Subject: [PATCH] Fixed multiple evolution softlock

---
 P3D/Screens/Pokemon/EvolutionScreen.vb | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/P3D/Screens/Pokemon/EvolutionScreen.vb b/P3D/Screens/Pokemon/EvolutionScreen.vb
index b812b0f3e..9c9a11704 100644
--- a/P3D/Screens/Pokemon/EvolutionScreen.vb
+++ b/P3D/Screens/Pokemon/EvolutionScreen.vb
@@ -148,9 +148,7 @@
         Me.Identification = Identifications.EvolutionScreen
         PlayerStatistics.Track("Evolutions", 1)
 
-        If Me.AttackLearnList.Count > 0 Then
-            AttackLearnList.Clear()
-        End If
+        Me.AttackLearnList.Clear()
         Me.PreScreen = currentScreen
         Me.FromBattle = FromBattle
         Me.CanEnd = False
@@ -312,8 +310,8 @@
                     If CanEnd = False Then
                         If AttackLearnList.Count > 0 Then
                             Core.SetScreen(New LearnAttackScreen(Core.CurrentScreen, evolvedPokemon, AttackLearnList))
-                            CanEnd = True
                         End If
+                        CanEnd = True
                     Else
                         If Core.CurrentScreen.Identification = Identifications.EvolutionScreen Then
                             Endscene()