From e47581df691c55739c724fb862d69a8c2ccf9559 Mon Sep 17 00:00:00 2001
From: JappaWakka <jjlspeelman@outlook.com>
Date: Mon, 25 Apr 2022 18:44:36 +0200
Subject: [PATCH] =?UTF-8?q?Battle=20Pok=C3=A9mon=20models=20are=20now=20pl?=
 =?UTF-8?q?aced=20in=20subfolder?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/P3D/Battle/BattleSystemV2/BattleScreen.vb b/P3D/Battle/BattleSystemV2/BattleScreen.vb
index 83cf86fc1..d6f725c1b 100644
--- a/P3D/Battle/BattleSystemV2/BattleScreen.vb
+++ b/P3D/Battle/BattleSystemV2/BattleScreen.vb
@@ -1321,14 +1321,14 @@ nextIndex:
                 poke = OppPokemon
             End If
 
-            Dim n As String = poke.AnimationName
+            Dim n As String = PokemonForms.GetAnimationName(poke)
 
             Dim s As String = "Normal"
             If poke.IsShiny = True Then
                 s = "Shiny"
             End If
 
-            Dim p As String = "Models\" & n & "\" & s
+            Dim p As String = "Models\Pokemon\" & n & "\" & s
 
             If ModelManager.ModelExist(p) = True Then
                 Return p