Merge branch 'master' of https://github.com/P3D-Legacy/P3D-Legacy

P3D/Content/Data/Scripts/trainer/ilex/001.trainer

@@ -10,9 +10,9 @@ Region|Johto
 IniMusic|Johto_trainer_intro
 DefeatMusic|trainer_defeat
 BattleMusic|johto_trainer
-Pokemon1|470,55
-Pokemon2|471,55
-Pokemon3|700,55
+Pokemon1|{"Pokemon"[470]}{"Gender"[1]}{"Item"[]}{"ItemData"[]}{"Level"[55]}{"OT"[00000]}{"Ability"[34]}{"Nature"[3]}{"CatchLocation"[Somewhere]}{"CatchTrainer"[Akemi]}{"CatchBall"[5]}{"CatchMethod"[]}{"Friendship"[255]}{"isShiny"[0]}{"Attack1"[14,20,20]}{"Attack2"[348,15,15]}{"Attack3"[241,15,15]}{"Attack4"[216,20,20]}
+Pokemon2|{"Pokemon"[471]}{"Gender"[1]}{"Item"[]}{"ItemData"[]}{"Level"[55]}{"OT"[00000]}{"Ability"[81]}{"Nature"[10]}{"CatchLocation"[Somewhere]}{"CatchTrainer"[Akemi]}{"CatchBall"[5]}{"CatchMethod"[]}{"Friendship"[255]}{"isShiny"[0]}{"Attack1"[258,10,10]}{"Attack2"[243,20,20]}{"Attack3"[59,5,5]}{"Attack4"[247,15,15]}
+Pokemon3|{"Pokemon"[700]}{"Gender"[1]}{"Item"[2009]}{"ItemData"[]}{"Level"[55]}{"OT"[00000]}{"Ability"[182]}{"Nature"[15]}{"CatchLocation"[Somewhere]}{"CatchTrainer"[Akemi]}{"CatchBall"[5]}{"CatchMethod"[]}{"Friendship"[255]}{"isShiny"[0]}{"Attack1"[304,10,10]}{"Attack2"[473,10,10]}{"Attack3"[247,15,15]}{"Attack4"[113,30,30]}
 Pokemon4|
 Pokemon5|
 Pokemon6|

P3D/Screens/Battle/BattleCatchScreen.vb

@@ -286,7 +286,7 @@
                 For i = 0 To 2
                     Dim v As Vector3 = New Vector3(BattleScreen.OppPokemonNPC.Position.X - 0.05F, -0.35F, BattleScreen.OppPokemonNPC.Position.Z)
 
-                    Animations.Add(New BAMove(v, TextureManager.GetTexture("Textures\Battle\Other\YellowCloud"), New Vector3(0.1F), New Vector3(v.X, v.Y + 0.4F, v.Z - ((1 - i) * 0.4F)), 0.01F, 0.0F, 0.0F))
+                    Animations.Add(New BAMove(v, TextureManager.GetTexture("Textures\Battle\Other\Star"), New Vector3(0.1F), New Vector3(v.X, v.Y + 0.4F, v.Z - ((1 - i) * 0.4F)), 0.01F, 0.0F, 0.0F))
                 Next
                 Animations.Add(New BAMove(New Vector3(BattleScreen.OppPokemonNPC.Position.X - 0.05F, -0.35F, BattleScreen.OppPokemonNPC.Position.Z), Ball.Texture, New Vector3(0.3F), New Vector3(BattleScreen.OppPokemonNPC.Position.X - 0.05F, -0.35F, BattleScreen.OppPokemonNPC.Position.Z), 0.02F, 0.0F, 6.0F))
             Case 8