From 89944271daf4098bff19c6cc048b61dc27fbd8d7 Mon Sep 17 00:00:00 2001
From: CaptainSegis <F20121237@outlook.com>
Date: Thu, 31 Aug 2017 00:03:25 -0500
Subject: [PATCH] Slight fix about shake animation in PartyScreen. Enabled back
 sprite view in SummaryScreen.

---
 2.5DHero/2.5DHero/Screens/Pokemon/PartyScreen.vb   |  4 ++++
 2.5DHero/2.5DHero/Screens/Pokemon/SummaryScreen.vb | 14 +++++++++++---
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/2.5DHero/2.5DHero/Screens/Pokemon/PartyScreen.vb b/2.5DHero/2.5DHero/Screens/Pokemon/PartyScreen.vb
index 4a7943705..6f7ef0c2c 100644
--- a/2.5DHero/2.5DHero/Screens/Pokemon/PartyScreen.vb
+++ b/2.5DHero/2.5DHero/Screens/Pokemon/PartyScreen.vb
@@ -457,18 +457,22 @@ Public Class PartyScreen
                 _menu.Update()
             Else
                 If Controls.Down(True, True, False, True, True, True) And _index < PokemonList.Count - 2 Then
+                    _pokemonAnimations(_index)._shakeV = 0
                     _index += 2
                     _cursorDest = GetBoxPosition(_index)
                 End If
                 If Controls.Up(True, True, False, True, True, True) And _index > 1 Then
+                    _pokemonAnimations(_index)._shakeV = 0
                     _index -= 2
                     _cursorDest = GetBoxPosition(_index)
                 End If
                 If Controls.Left(True) And _index > 0 Then
+                    _pokemonAnimations(_index)._shakeV = 0
                     _index -= 1
                     _cursorDest = GetBoxPosition(_index)
                 End If
                 If Controls.Right(True) And _index < PokemonList.Count - 1 Then
+                    _pokemonAnimations(_index)._shakeV = 0
                     _index += 1
                     _cursorDest = GetBoxPosition(_index)
                 End If
diff --git a/2.5DHero/2.5DHero/Screens/Pokemon/SummaryScreen.vb b/2.5DHero/2.5DHero/Screens/Pokemon/SummaryScreen.vb
index 5193eb4ce..2b0179661 100644
--- a/2.5DHero/2.5DHero/Screens/Pokemon/SummaryScreen.vb
+++ b/2.5DHero/2.5DHero/Screens/Pokemon/SummaryScreen.vb
@@ -10,6 +10,8 @@
 
     Private _texture As Texture2D
 
+    Private _isFront As Boolean = True
+
     'Pointer
     Private _pointerDest As Integer = 0
     Private _pointerPos As Single = 0F
@@ -194,7 +196,7 @@
         'Draw Pokémon preview:
         If _enrollY >= 160 Then
             Dim height As Integer = CInt(_enrollY - 160).Clamp(0, 256)
-            Dim pokemonTexture = GetPokemon().GetTexture(True)
+            Dim pokemonTexture = GetPokemon().GetTexture(_isFront)
             Dim textureHeight As Integer = CInt(pokemonTexture.Height * (height / 256))
 
             Dim pokemonTextureOffset As Integer = 32
@@ -607,6 +609,7 @@
                             _partyIndex -= 1
                             GetYOffset()
                             SetDest(_partyIndex)
+                            _isFront = True
                         End If
 
                     End If
@@ -615,6 +618,7 @@
                             _partyIndex += 1
                             GetYOffset()
                             SetDest(_partyIndex)
+                            _isFront = True
                         End If
 
                     End If
@@ -634,8 +638,12 @@
                             _pageOpening = False
                         End If
                     End If
-                    If Controls.Accept() = True And _pageIndex = 1 Then
-                        _moveSelected = True
+                    If Controls.Accept() = True Then
+                        If _pageIndex = 0 Then
+                            _isFront = Not _isFront
+                        ElseIf _pageIndex = 1 Then
+                            _moveSelected = True
+                        End If
                     End If
                 End If
                 If Controls.Dismiss() = True Then