diff --git a/P3D/Content/Data/Scripts/trainer/ceruleancave/Proton.trainer b/P3D/Content/Data/Scripts/trainer/ceruleancave/Proton.trainer index 694b5525d..543b32e17 100644 Binary files a/P3D/Content/Data/Scripts/trainer/ceruleancave/Proton.trainer and b/P3D/Content/Data/Scripts/trainer/ceruleancave/Proton.trainer differ diff --git a/P3D/Content/Data/Scripts/trainer/ceruleancave/promew2.trainer b/P3D/Content/Data/Scripts/trainer/ceruleancave/promew2.trainer index 961cb5910..872f4eb46 100644 Binary files a/P3D/Content/Data/Scripts/trainer/ceruleancave/promew2.trainer and b/P3D/Content/Data/Scripts/trainer/ceruleancave/promew2.trainer differ diff --git a/P3D/Content/Data/Scripts/trainer/chrono/grunts/Proton.trainer b/P3D/Content/Data/Scripts/trainer/chrono/grunts/Proton.trainer index d6aa9ddde..025899f33 100644 Binary files a/P3D/Content/Data/Scripts/trainer/chrono/grunts/Proton.trainer and b/P3D/Content/Data/Scripts/trainer/chrono/grunts/Proton.trainer differ diff --git a/P3D/Content/Data/Scripts/trainer/floe/lorelei1.trainer b/P3D/Content/Data/Scripts/trainer/floe/lorelei1.trainer index dc3c0887f..a9135c220 100644 Binary files a/P3D/Content/Data/Scripts/trainer/floe/lorelei1.trainer and b/P3D/Content/Data/Scripts/trainer/floe/lorelei1.trainer differ diff --git a/P3D/Content/Data/Scripts/trainer/floe/lorelei2.trainer b/P3D/Content/Data/Scripts/trainer/floe/lorelei2.trainer index f5bbcde95..3fcb2c359 100644 Binary files a/P3D/Content/Data/Scripts/trainer/floe/lorelei2.trainer and b/P3D/Content/Data/Scripts/trainer/floe/lorelei2.trainer differ diff --git a/P3D/Content/Data/Scripts/trainer/ilex/001.trainer b/P3D/Content/Data/Scripts/trainer/ilex/001.trainer index fa4f89087..65b5ec9b2 100644 --- a/P3D/Content/Data/Scripts/trainer/ilex/001.trainer +++ b/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| diff --git a/P3D/Content/Data/Scripts/trainer/tohjo/Giovanni.trainer b/P3D/Content/Data/Scripts/trainer/tohjo/Giovanni.trainer index a45465d8a..d8765a640 100644 Binary files a/P3D/Content/Data/Scripts/trainer/tohjo/Giovanni.trainer and b/P3D/Content/Data/Scripts/trainer/tohjo/Giovanni.trainer differ diff --git a/P3D/Content/Textures/Battle/Other/Star.png b/P3D/Content/Textures/Battle/Other/Star.png new file mode 100644 index 000000000..b0407cefe Binary files /dev/null and b/P3D/Content/Textures/Battle/Other/Star.png differ diff --git a/P3D/Screens/Battle/BattleCatchScreen.vb b/P3D/Screens/Battle/BattleCatchScreen.vb index c1e2c6d72..b7e4bf3ba 100644 --- a/P3D/Screens/Battle/BattleCatchScreen.vb +++ b/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