From 338b22fdfd8e50433458a665c3f53a057b9308a5 Mon Sep 17 00:00:00 2001
From: JappaWakka <jjlspeelman@outlook.com>
Date: Tue, 18 Jul 2023 17:45:47 +0200
Subject: [PATCH] =?UTF-8?q?Form=20switch=20in=20pok=C3=A9dex=20controller?=
 =?UTF-8?q?=20controlled=20+=20fix?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 P3D/Screens/Pokedex/PokedexScreen.vb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/P3D/Screens/Pokedex/PokedexScreen.vb b/P3D/Screens/Pokedex/PokedexScreen.vb
index 9c3731ed4..91943d859 100644
--- a/P3D/Screens/Pokedex/PokedexScreen.vb
+++ b/P3D/Screens/Pokedex/PokedexScreen.vb
@@ -1374,6 +1374,7 @@ Public Class PokedexViewScreen
             Me.Pokemon = PokedexScreen.TempPokemonStorage(newDexIndex)
             Me.DexIndex = newDexIndex
             Me.Forms.Clear()
+            Me.EvolutionLineConnections.Clear()
             Me.Forms.Add(Me.Pokemon.Number.ToString)
             Me.FormIndex = 0
         End If
@@ -1851,7 +1852,7 @@ Public Class PokedexViewScreen
             End If
         End If
 
-        If Controls.ShiftPressed = True Then
+        If Controls.ShiftPressed = True Or ControllerHandler.ButtonPressed(Buttons.Back) Then
             Me.FormIndex += 1
             If Me.FormIndex > Me.Forms.Count - 1 Then
                 Me.FormIndex = 0