From 5459ed2ac6aeb65cdde514a861ec16a3de52e29c Mon Sep 17 00:00:00 2001 From: CaptainSegis Date: Wed, 2 Nov 2016 20:56:04 -0500 Subject: [PATCH] After faint switch, revision 2: Fixed case when both pokemon faint. --- 2.5DHero/2.5DHero/Battle/BattleSystemV2/Battle.vb | 7 +++---- 2.5DHero/2.5DHero/Battle/BattleSystemV2/BattleMenu.vb | 1 + 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/2.5DHero/2.5DHero/Battle/BattleSystemV2/Battle.vb b/2.5DHero/2.5DHero/Battle/BattleSystemV2/Battle.vb index de1270516..f7c1fb384 100644 --- a/2.5DHero/2.5DHero/Battle/BattleSystemV2/Battle.vb +++ b/2.5DHero/2.5DHero/Battle/BattleSystemV2/Battle.vb @@ -463,13 +463,12 @@ Public Sub InitializeRound(ByVal BattleScreen As BattleScreen, ByVal OwnStep As RoundConst) - If BattleScreen.OwnFaint OrElse BattleScreen.OppFaint Then - BattleScreen.IsAfterFaint = True - End If 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 diff --git a/2.5DHero/2.5DHero/Battle/BattleSystemV2/BattleMenu.vb b/2.5DHero/2.5DHero/Battle/BattleSystemV2/BattleMenu.vb index bed528cd5..a20a8cb11 100644 --- a/2.5DHero/2.5DHero/Battle/BattleSystemV2/BattleMenu.vb +++ b/2.5DHero/2.5DHero/Battle/BattleSystemV2/BattleMenu.vb @@ -924,6 +924,7 @@ Else If TempBattleScreen.OwnPokemonIndex <> PokeIndex Then If TempBattleScreen.IsRemoteBattle = True And TempBattleScreen.IsHost = False Then + BattleScreen.OppFaint = False TempBattleScreen.OwnStatistics.Switches += 1 TempBattleScreen.BattleQuery.Clear() TempBattleScreen.BattleQuery.Add(TempBattleScreen.FocusBattle())