From bf887b0e3a1ef2e7d70c489ec7dd60fb3e0bc90d Mon Sep 17 00:00:00 2001
From: JappaWakkaP3D <31563291+JappaWakka@users.noreply.github.com>
Date: Tue, 14 Dec 2021 22:11:11 +0100
Subject: [PATCH] =?UTF-8?q?Fixed=20Bug:=20When=20the=20lead=20Pok=C3=A9mon?=
 =?UTF-8?q?=20faints=20and=20you=20switch=20to=20a=20different=20Pok=C3=A9?=
 =?UTF-8?q?mon,=20when=20the=20battle=20ends,=20your=20current=20Pok=C3=A9?=
 =?UTF-8?q?mon=20disappears?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 P3D/Battle/BattleSystemV2/Battle.vb | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/P3D/Battle/BattleSystemV2/Battle.vb b/P3D/Battle/BattleSystemV2/Battle.vb
index f2fa41fc3..9a19a130b 100644
--- a/P3D/Battle/BattleSystemV2/Battle.vb
+++ b/P3D/Battle/BattleSystemV2/Battle.vb
@@ -2674,7 +2674,7 @@
 
             If BattleScreen.IsTrainerBattle = False AndAlso Core.Player.ShowBattleAnimations <> 0 Then
                 If own = False Then
-                    Dim FaintAnimation As AnimationQueryObject = New AnimationQueryObject(BattleScreen.OwnPokemonNPC, True, BattleScreen.OppPokemonModel)
+                    Dim FaintAnimation As AnimationQueryObject = New AnimationQueryObject(BattleScreen.OppPokemonNPC, True, BattleScreen.OppPokemonModel)
                     FaintAnimation.AnimationPlaySound(CStr(BattleScreen.OppPokemon.Number), 0, 2, False, True)
                     FaintAnimation.AnimationMove(Nothing, False, 0, -1, 0, 0.05, False, False, 2, 0,,, 3)
                     BattleScreen.BattleQuery.Add(FaintAnimation)
@@ -7121,17 +7121,17 @@
                     Loop While SmokeReturned <= 38
                 End If
 
+                ' Pokemon disappears
+                BallReturn.AnimationFade(Nothing, False, 1, False, 0, 1, 0)
                 If Core.Player.ShowBattleAnimations <> 0 Then
-                    ' Pokemon disappears
-                    BallReturn.AnimationFade(Nothing, False, 1, False, 0, 1, 0)
                     BallReturn.AnimationMove(Nothing, False, 0, 0.5, 0, 0.5, False, False, 2, 0,,, 3)
 
                     ' Ball returns
                     BallReturn.AnimationPlaySound("Battle\Pokeball\Throw", 1, 0)
                     Dim BallReturnEntity As Entity = BallReturn.SpawnEntity(Nothing, BattleScreen.OwnPokemon.CatchBall.Texture, New Vector3(0.3F), 1.0F)
                     BallReturn.AnimationMove(BallReturnEntity, True, -2, 0, 0, 0.1, False, True, 1, 0,, 0.3)
-                    BattleScreen.AddToQuery(InsertIndex, BallReturn)
                 End If
+                BattleScreen.AddToQuery(InsertIndex, BallReturn)
 
                 Dim index As Integer = NewPokemonIndex
                 If index <= -1 Then