From d39eb53bbd08abfcd22aad5d3987e9906d697008 Mon Sep 17 00:00:00 2001 From: CaptainSegis Date: Wed, 22 Mar 2017 11:42:16 -0500 Subject: [PATCH] =?UTF-8?q?Index=20now=20can=C2=B4t=20return=20to=200=20wh?= =?UTF-8?q?en=20it=20goes=20beyond=20the=20pokemon=20list=20count=20in=20S?= =?UTF-8?q?ummaryScreen?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../2.5DHero/Screens/Pokemon/SummaryScreen.vb | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/2.5DHero/2.5DHero/Screens/Pokemon/SummaryScreen.vb b/2.5DHero/2.5DHero/Screens/Pokemon/SummaryScreen.vb index 48016ca34..9e14f279f 100644 --- a/2.5DHero/2.5DHero/Screens/Pokemon/SummaryScreen.vb +++ b/2.5DHero/2.5DHero/Screens/Pokemon/SummaryScreen.vb @@ -597,20 +597,20 @@ If _pageOpening = False And _pageClosing = False And _partyIndex > -1 And _moveSelected = False Then If _party.Length > 1 Then If Controls.Left(True, True, False, True, False, True) Or ControllerHandler.ButtonPressed(Buttons.LeftShoulder) Then - _partyIndex -= 1 - If _partyIndex = -1 Then - _partyIndex = _party.Count - 1 + If _partyIndex > 0 Then + _partyIndex -= 1 + GetYOffset() + SetPointerDest(_partyIndex) End If - GetYOffset() - SetPointerDest(_partyIndex) + End If If Controls.Right(True, True, False, True, False, True) Or ControllerHandler.ButtonPressed(Buttons.RightShoulder) Then - _partyIndex += 1 - If _partyIndex = _party.Count Then - _partyIndex = 0 + If _partyIndex < _party.Count - 1 Then + _partyIndex += 1 + GetYOffset() + SetPointerDest(_partyIndex) End If - GetYOffset() - SetPointerDest(_partyIndex) + End If End If End If