From 72e7f76753fb6b250d9f522615212e6795de27af Mon Sep 17 00:00:00 2001
From: Capt_Segis <F20121237@outlook.com>
Date: Sat, 17 Sep 2016 22:42:33 -0500
Subject: [PATCH] Fixed switch-in bug

---
 2.5DHero/2.5DHero/Battle/BattleSystemV2/BattleScreen.vb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/2.5DHero/2.5DHero/Battle/BattleSystemV2/BattleScreen.vb b/2.5DHero/2.5DHero/Battle/BattleSystemV2/BattleScreen.vb
index 2702726dc..cf8a3ea6d 100644
--- a/2.5DHero/2.5DHero/Battle/BattleSystemV2/BattleScreen.vb
+++ b/2.5DHero/2.5DHero/Battle/BattleSystemV2/BattleScreen.vb
@@ -1078,6 +1078,7 @@ nextIndex:
             
             If i = -1 Then
                 If IsPvPBattle Then
+                    i = 0
                     While Trainer.Pokemons(i).Status = Pokemon.StatusProblems.Fainted OrElse OppPokemonIndex = i OrElse Trainer.Pokemons(i).HP <= 0
                         i += 1
                     End While