From e9d4cacd3c41c50bc588898f0d8c1581154e93e4 Mon Sep 17 00:00:00 2001
From: "Jasper \"JappaWakka\" Speelman"
 <31563291+JappaWakka@users.noreply.github.com>
Date: Sun, 21 Nov 2021 15:00:39 +0100
Subject: [PATCH] Fix for faint animation

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

diff --git a/P3D/Battle/BattleSystemV2/Battle.vb b/P3D/Battle/BattleSystemV2/Battle.vb
index 6599327ce..b3c1bedc4 100644
--- a/P3D/Battle/BattleSystemV2/Battle.vb
+++ b/P3D/Battle/BattleSystemV2/Battle.vb
@@ -2585,10 +2585,12 @@
             BattleScreen.BattleQuery.Add(New TextQueryObject(message))
 
             If BattleScreen.IsTrainerBattle = False AndAlso Core.Player.ShowBattleAnimations <> 0 Then
-                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)
+                If own = False Then
+                    Dim FaintAnimation As AnimationQueryObject = New AnimationQueryObject(BattleScreen.OwnPokemonNPC, 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)
+                End If
             End If
 
             Dim str = p.AdditionalData.ToLower()