From b59d4c7f6cd1c4d2807e38398670e0918febbf44 Mon Sep 17 00:00:00 2001
From: CaptainSegis <F20121237@outlook.com>
Date: Sat, 5 Nov 2016 10:55:57 -0500
Subject: [PATCH] After Faint Switching, revision 3: Fixed major bug related to
 multi turn action

---
 .../2.5DHero/Battle/BattleSystemV2/Battle.vb  | 20 ++++++++++---------
 .../Battle/BattleSystemV2/BattleScreen.vb     |  8 ++++----
 2 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/2.5DHero/2.5DHero/Battle/BattleSystemV2/Battle.vb b/2.5DHero/2.5DHero/Battle/BattleSystemV2/Battle.vb
index f7c1fb384..9188c7055 100644
--- a/2.5DHero/2.5DHero/Battle/BattleSystemV2/Battle.vb
+++ b/2.5DHero/2.5DHero/Battle/BattleSystemV2/Battle.vb
@@ -5,6 +5,8 @@
         Public Shared Won As Boolean = False
         Public Shared Fled As Boolean = False
 
+
+        Public IsAfterFaint As Boolean = False
 #Region "StartRound"
 
         Public Structure RoundConst
@@ -197,6 +199,9 @@
         End Sub
 
         Public Sub StartRound(ByVal BattleScreen As BattleScreen)
+            If BattleScreen.OwnFaint OrElse BattleScreen.OppFaint Then
+                IsAfterFaint = True
+            End If
             BattleScreen.BattleMenu.MenuState = BattleMenu.MenuStates.Main
             SelectedMoveOwn = True
             SelectedMoveOpp = True
@@ -234,7 +239,7 @@
                 Return New RoundConst() With {.StepType = RoundConst.StepTypes.Text, .Argument = "You have sent your next Pokemon!"}
             End If
 
-            If Not BattleScreen.IsAfterFaint Then
+            If Not IsAfterFaint Then
                 If BattleScreen.FieldEffects.OppRecharge > 0 Then
                     SelectedMoveOpp = False
                     BattleScreen.FieldEffects.OppRecharge -= 1
@@ -466,9 +471,6 @@
             If BattleHasEnded(BattleScreen) Then
                 Exit Sub
             End If
-            If BattleScreen.OwnFaint OrElse BattleScreen.OppFaint Then
-                BattleScreen.IsAfterFaint = True
-            End If
             Dim OppStep = GetOppStep(BattleScreen, OwnStep)
             Me.OwnStep = OwnStep
             Me.OppStep = OppStep
@@ -4063,7 +4065,7 @@
                             EndRoundOpp(BattleScreen)
                             EndRoundOwn(BattleScreen)
                         End If
-                        If BattleScreen.IsAfterFaint = False Then
+                        If IsAfterFaint = False Then
                             .FieldEffects.Rounds += 1
                             If .FieldEffects.WeatherRounds > 0 Then
                                 .FieldEffects.WeatherRounds -= 1
@@ -4154,7 +4156,7 @@
                                 .FieldEffects.OppProtectMovesCount = 0
                             End If
                         End If
-                        BattleScreen.IsAfterFaint = False
+                        IsAfterFaint = False
                         If .OwnPokemon.Status = Pokemon.StatusProblems.Fainted Or .OwnPokemon.HP <= 0 Then
                             .OwnPokemon.Status = Pokemon.StatusProblems.Fainted
                             BattleScreen.OwnFaint = True
@@ -4306,7 +4308,7 @@
                 Exit Sub
             End If
             ChangeCameraAngel(0, True, BattleScreen)
-            If BattleScreen.IsAfterFaint = True Then
+            If IsAfterFaint = True Then
                 Exit Sub
             End If
             With BattleScreen
@@ -5033,7 +5035,7 @@
 
         Private Sub EndRoundOpp(ByVal BattleScreen As BattleScreen)
             ChangeCameraAngel(0, True, BattleScreen)
-            If BattleScreen.IsAfterFaint = True Then
+            If IsAfterFaint = True Then
                 Exit Sub
             End If
             With BattleScreen
@@ -6312,7 +6314,7 @@
         Public Sub EndBattle(ByVal reason As EndBattleReasons, ByVal BattleScreen As BattleScreen, ByVal AddPVP As Boolean)
             BattleSystem.BattleScreen.OwnFaint = False
             BattleSystem.BattleScreen.OppFaint = False
-            BattleSystem.BattleScreen.IsAfterFaint = False
+            IsAfterFaint = False
             If AddPVP = True Then
                 Select Case reason
                     Case EndBattleReasons.WinTrainer 'Lost
diff --git a/2.5DHero/2.5DHero/Battle/BattleSystemV2/BattleScreen.vb b/2.5DHero/2.5DHero/Battle/BattleSystemV2/BattleScreen.vb
index 3b50b893d..72037938c 100644
--- a/2.5DHero/2.5DHero/Battle/BattleSystemV2/BattleScreen.vb
+++ b/2.5DHero/2.5DHero/Battle/BattleSystemV2/BattleScreen.vb
@@ -8,7 +8,7 @@
         'Used for after fainting switching
         Public Shared OwnFaint As Boolean = False
         Public Shared OppFaint As Boolean = False
-        Public Shared IsAfterFaint As Boolean = False 'Is after faint switching round
+
 
 
         'Used for lead picking in PvP Battles
@@ -120,7 +120,7 @@
             Me.IsTrainerBattle = False
             Me.MouseVisible = False
             Me.PVPGameJoltID = ""
-            IsAfterFaint = False
+
             OppFaint = False
             OwnFaint = False
         End Sub
@@ -132,7 +132,7 @@
             Me.IsTrainerBattle = True
             Me.MouseVisible = False
             Me.PVPGameJoltID = ""
-            IsAfterFaint = False
+
             OppFaint = False
             OwnFaint = False
         End Sub
@@ -1468,7 +1468,7 @@ nextIndex:
 
         Public Sub SendEndRoundData()
             Dim lockData As String = "{}"
-            Dim oppStep As Battle.RoundConst = Battle.GetOppStep(Me, Nothing)
+            Dim oppStep As Battle.RoundConst = Battle.GetOppStep(Me, Battle.OwnStep)
             If Battle.SelectedMoveOpp = False Then
                 If oppStep.StepType = BattleSystem.Battle.RoundConst.StepTypes.Move Then
                     lockData = "{" & CType(oppStep.Argument, Attack).ID.ToString() & "}"