Loamy Soil should not have snow on it

it didn't do so before

NuGet.config

@@ -1,11 +1,10 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
   <packageRestore>
     <add key="enabled" value="True" />
     <add key="automatic" value="True" />
   </packageRestore>
   <packageSources>
-    <add key="monogame-dev" value="http://teamcity.monogame.net/guestAuth/app/nuget/v1/FeedService.svc/" />
-    <add key="nuget.org" value="https://www.nuget.org/api/v2/" />
+    <add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
   </packageSources>
 </configuration>

P3D/Battle/BattleAnimations/BABackground.vb

@@ -2,59 +2,108 @@
 
     Inherits BattleAnimation3D
 
-    Public TransitionSpeed As Single = 0.01F
-    Public FadeIn As Boolean = False
-    Public FadeOut As Boolean = False
-    Public BackgroundOpacity As Single = 1.0F
-    Public EndState As Single = 0.0F
-    Public Texture As Texture2D
+    Dim FadeInSpeed As Single = 0.01F
+    Dim FadeOutSpeed As Single = 0.01F
+    Dim BackgroundOpacity As Single = 0.0F
+    Dim Texture As Texture2D
+    Dim DoTile As Boolean = False
+    Dim AnimationWidth As Integer = -1
+    Dim AfterFadeInOpacity As Single = 1.0F
+    Dim FadeProgress As FadeSteps = FadeSteps.FadeIn
+    Dim DurationDate As Date
+    Dim DurationWhole As Single
+    Dim DurationFraction As Single
+    Dim BackgroundAnimation As Animation
+    Dim CurrentRectangle As New Rectangle(0, 0, 0, 0)
+    Dim TextureScale As Integer = 4
 
-    Public Sub New(ByVal Texture As Texture2D, ByVal TransitionSpeed As Single, ByVal FadeIn As Boolean, FadeOut As Boolean, ByVal EndState As Single, ByVal startDelay As Single, ByVal endDelay As Single, Optional ByVal StartState As Single = 0.0F)
+    Public Enum FadeSteps As Integer
+        FadeIn
+        Duration
+        FadeOut
+    End Enum
+
+    Public Sub New(ByVal Texture As Texture2D, ByVal startDelay As Single, ByVal endDelay As Single, ByVal Duration As Single, Optional ByVal AfterFadeInOpacity As Single = 1.0F, Optional ByVal FadeInSpeed As Single = 0.125F, Optional ByVal FadeOutSpeed As Single = 0.125F, Optional ByVal DoTile As Boolean = False, Optional ByVal AnimationLength As Integer = 1, Optional ByVal AnimationSpeed As Integer = 2, Optional TextureScale As Integer = 4)
         MyBase.New(New Vector3(0.0F), TextureManager.DefaultTexture, New Vector3(1.0F), startDelay, endDelay)
         Me.Texture = Texture
-        Me.EndState = EndState
-        Me.FadeIn = FadeIn
-        Me.FadeOut = FadeOut
-        Me.TransitionSpeed = TransitionSpeed
+        Me.AfterFadeInOpacity = AfterFadeInOpacity
+        Me.FadeInSpeed = FadeInSpeed
+        Me.FadeOutSpeed = FadeOutSpeed
+        Me.DoTile = DoTile
+        Me.AnimationWidth = CInt(Texture.Width / AnimationLength)
+        DurationWhole = CSng(Math.Truncate(CDbl(Duration / 6.0F)))
+        DurationFraction = CSng((Duration / 6.0F - DurationWhole) * 1000)
+        Me.TextureScale = TextureScale
 
-        Me.BackgroundOpacity = StartState
+        If Me.AnimationWidth <> -1 OrElse Me.AnimationWidth <> Nothing Then
+            BackgroundAnimation = New Animation(Me.Texture, 1, AnimationLength, Me.AnimationWidth, Me.Texture.Height, AnimationSpeed * 24, 0, 0)
+            CurrentRectangle = BackgroundAnimation.TextureRectangle
+        Else
+            Me.AnimationWidth = Texture.Width
+        End If
         Me.Visible = False
 
         Me.AnimationType = AnimationTypes.Background
     End Sub
 
     Public Overrides Sub Render()
+        Dim BackgroundTarget As New RenderTarget2D(Core.GraphicsDevice, Core.windowSize.Width, Core.windowSize.Height, False, SurfaceFormat.Color, DepthFormat.Depth24Stencil8)
+        Core.GraphicsDevice.SetRenderTarget(BackgroundTarget)
+        GraphicsDevice.Clear(Microsoft.Xna.Framework.Color.Transparent)
+
         If Date.Now >= startDelay AndAlso Me.BackgroundOpacity > 0.0F Then
-            Core.SpriteBatch.Draw(Me.Texture, New Rectangle(0, 0, windowSize.Width, windowSize.Height), New Color(255, 255, 255, CInt(255 * Me.BackgroundOpacity)))
+            If DoTile = False Then
+                Core.SpriteBatch.Draw(Texture, New Rectangle(0, 0, windowSize.Width, windowSize.Height), CurrentRectangle, New Color(255, 255, 255, CInt(255 * Me.BackgroundOpacity)))
+            Else
+                For Dx = 0 To Core.windowSize.Width Step AnimationWidth
+                    For Dy = 0 To Core.windowSize.Height Step Texture.Height
+                        Core.SpriteBatch.Draw(Texture, New Rectangle(Dx * TextureScale, Dy * TextureScale, AnimationWidth * TextureScale, Texture.Height * TextureScale), CurrentRectangle, New Color(255, 255, 255, CInt(255 * Me.BackgroundOpacity)))
+                    Next
+                Next
+            End If
         End If
+        Core.GraphicsDevice.SetRenderTarget(Nothing)
+        Core.SpriteBatch.Draw(BackgroundTarget, windowSize, New Color(255, 255, 255, CInt(255 * Me.BackgroundOpacity)))
     End Sub
 
     Public Overrides Sub DoActionActive()
-        If Me.FadeIn = True Then
-            If Me.EndState > Me.BackgroundOpacity Then
-                Me.BackgroundOpacity += Me.TransitionSpeed
-                If Me.BackgroundOpacity >= Me.EndState Then
-                    Me.BackgroundOpacity = Me.EndState
-                    Me.FadeIn = False
-                    Me.EndState = 0
-                End If
-            End If
-        Else
-            If Me.FadeOut = True Then
-                If Me.EndState < Me.BackgroundOpacity Then
-                    Me.BackgroundOpacity -= Me.TransitionSpeed
-                    If Me.BackgroundOpacity <= Me.EndState Then
-                        Me.BackgroundOpacity = Me.EndState
-                    End If
-                End If
-                If Me.BackgroundOpacity = Me.EndState Then
-                    Me.Ready = True
-                End If
-            Else
-                Me.BackgroundOpacity = Me.EndState
-                Me.Ready = True
+        If BackgroundAnimation IsNot Nothing Then
+            BackgroundAnimation.Update(0.005)
+            If CurrentRectangle <> BackgroundAnimation.TextureRectangle Then
+                CurrentRectangle = BackgroundAnimation.TextureRectangle
             End If
         End If
+        Select Case Me.FadeProgress
+            Case FadeSteps.FadeIn
+                If Me.AfterFadeInOpacity > Me.BackgroundOpacity Then
+                    Me.BackgroundOpacity += Me.FadeInSpeed
+                    If Me.BackgroundOpacity >= Me.AfterFadeInOpacity Then
+                        DurationDate = Date.Now + New TimeSpan(0, 0, 0, CInt(DurationWhole), CInt(DurationFraction))
+                        FadeProgress = FadeSteps.Duration
+                        Me.BackgroundOpacity = Me.AfterFadeInOpacity
+                    End If
+                Else
+                    FadeProgress = FadeSteps.Duration
+                    Me.BackgroundOpacity = Me.AfterFadeInOpacity
+                End If
+            Case FadeSteps.Duration
+                If Date.Now >= DurationDate Then
+                    FadeProgress = FadeSteps.FadeOut
+                End If
+            Case FadeSteps.FadeOut
+                If Me.BackgroundOpacity > 0.0F Then
+                    Me.BackgroundOpacity -= Me.FadeOutSpeed
+                    If Me.BackgroundOpacity <= 0.0F Then
+                        Me.BackgroundOpacity = 0.0F
+                        Me.Ready = True
+                    End If
+                Else
+                    Me.BackgroundOpacity = 0.0F
+                    Me.Ready = True
+                End If
+
+        End Select
+
     End Sub
 
 End Class

P3D/Battle/BattleAnimations/BACameraChangeAngle.vb

@@ -0,0 +1,34 @@
+Imports P3D.Screen
+
+Public Class BACameraChangeAngle
+
+	Inherits BattleAnimation3D
+
+	Dim CameraAngleID As Integer
+	Dim BV2Screen As BattleSystem.BattleScreen
+
+	Public Sub New(ByRef Battlescreen As BattleSystem.BattleScreen, ByVal CameraAngleID As Integer, ByVal startDelay As Single, ByVal endDelay As Single)
+		MyBase.New(New Vector3(0.0F), TextureManager.DefaultTexture, New Vector3(1.0F), startDelay, endDelay)
+		Me.BV2Screen = Battlescreen
+		Me.CameraAngleID = CameraAngleID
+
+		Me.Visible = False
+
+		Me.AnimationType = AnimationTypes.Camera
+	End Sub
+
+	Public Overrides Sub DoActionActive()
+		Select Case CameraAngleID
+			Case 0
+				Me.BV2Screen.Battle.ChangeCameraAngle(0, True, Me.BV2Screen)
+			Case 1
+				Me.BV2Screen.Battle.ChangeCameraAngle(1, True, Me.BV2Screen)
+			Case 2
+				Me.BV2Screen.Battle.ChangeCameraAngle(2, True, Me.BV2Screen)
+		End Select
+		Me.Ready = True
+
+	End Sub
+
+
+End Class

P3D/Battle/BattleAnimations/BACameraOscillateMove.vb

@@ -0,0 +1,313 @@
+Public Class BACameraOscillateMove
+
+	Inherits BattleAnimation3D
+
+	Dim StartPosition As Vector3
+	Dim ReturnToStart As Vector3
+	Dim HalfDistance As New Vector3(0.0F)
+	Dim DestinationDistance As New Vector3(0.0F)
+	Dim CurrentDistance As New Vector3(0.0F)
+	Dim MoveSpeed As Single
+	Dim MoveBothWays As Boolean = True
+	Dim MovementCurve As Integer = 0
+	Dim Duration As TimeSpan
+	Dim ReadyTime As Date
+	Dim ReadyAxis As New Vector3(0)
+	Dim InterpolationSpeed As Vector3
+	Dim InterpolationDirection As Boolean = True
+	Public Enum Curves As Integer
+		Linear
+		Smooth
+	End Enum
+
+	Public Sub New(ByVal Distance As Vector3, ByVal Speed As Single, ByVal BothWays As Boolean, ByVal Duration As TimeSpan, ByVal startDelay As Single, ByVal endDelay As Single, Optional MovementCurve As Integer = 0, Optional ReturnToStart As Vector3 = Nothing)
+		MyBase.New(New Vector3(0.0F), TextureManager.DefaultTexture, New Vector3(1.0F), startDelay, endDelay)
+		Me.HalfDistance = Distance
+		Me.DestinationDistance = Me.HalfDistance
+		Me.MoveSpeed = Speed
+		Me.MoveBothWays = BothWays
+		Me.Duration = Duration
+		Me.MovementCurve = CType(MovementCurve, Curves)
+
+		Me.Visible = False
+		Select Case MovementCurve
+			Case Curves.Linear
+				InterpolationSpeed = New Vector3(MoveSpeed)
+			Case Curves.Smooth
+				InterpolationSpeed = New Vector3(0.0F)
+		End Select
+		If ReturnToStart <> Nothing Then
+			Me.ReturnToStart = ReturnToStart
+		End If
+		Me.AnimationType = AnimationTypes.Move
+	End Sub
+
+	Public Overrides Sub DoActionActive()
+		Move()
+	End Sub
+
+	Private Sub Move()
+		If StartPosition = Nothing Then
+			StartPosition = Screen.Camera.Position
+		End If
+		If ReadyTime = Nothing Then
+			ReadyTime = Date.Now + Duration
+		End If
+		If MovementCurve = Curves.Smooth Then
+			If InterpolationDirection = True Then
+				If InterpolationSpeed.X < MoveSpeed Then
+					InterpolationSpeed.X += MoveSpeed / 10
+				Else
+					InterpolationSpeed.X = MoveSpeed
+				End If
+				If InterpolationSpeed.Y < MoveSpeed Then
+					InterpolationSpeed.Y += MoveSpeed / 10
+				Else
+					InterpolationSpeed.Y = MoveSpeed
+				End If
+				If InterpolationSpeed.Z < MoveSpeed Then
+					InterpolationSpeed.Z += MoveSpeed / 10
+				Else
+					InterpolationSpeed.Z = MoveSpeed
+				End If
+			Else
+				If Date.Now < ReadyTime Then
+					If InterpolationSpeed.X > 0 Then
+						InterpolationSpeed.X -= MoveSpeed / 10
+					Else
+						InterpolationSpeed.X = 0
+					End If
+					If InterpolationSpeed.Y > 0 Then
+						InterpolationSpeed.Y -= MoveSpeed / 10
+					Else
+						InterpolationSpeed.Y = 0
+					End If
+					If InterpolationSpeed.Z > 0 Then
+						InterpolationSpeed.Z -= MoveSpeed / 10
+					Else
+						InterpolationSpeed.Z = 0
+					End If
+				Else
+					If InterpolationSpeed.X > MoveSpeed / 10 * 3 Then
+						InterpolationSpeed.X -= MoveSpeed / 10
+					Else
+						InterpolationSpeed.X = MoveSpeed / 10 * 3
+					End If
+					If InterpolationSpeed.Y > MoveSpeed / 10 * 3 Then
+						InterpolationSpeed.Y -= MoveSpeed / 10
+					Else
+						InterpolationSpeed.Y = MoveSpeed / 10 * 3
+					End If
+					If InterpolationSpeed.Z > MoveSpeed / 10 * 3 Then
+						InterpolationSpeed.Z -= MoveSpeed / 10
+					Else
+						InterpolationSpeed.Z = MoveSpeed / 10 * 3
+					End If
+				End If
+			End If
+		End If
+
+		If CurrentDistance.X <> DestinationDistance.X Then
+			If CurrentDistance.X < DestinationDistance.X Then
+				CurrentDistance.X += InterpolationSpeed.X
+			Else
+				CurrentDistance.X -= InterpolationSpeed.X
+			End If
+
+			If Math.Abs(CurrentDistance.X) / Math.Abs(HalfDistance.X) > 0.75F Then
+				InterpolationDirection = False
+			End If
+
+			If DestinationDistance.X > 0.0F Then
+				If CurrentDistance.X >= DestinationDistance.X Then
+					CurrentDistance.X = DestinationDistance.X
+				End If
+			ElseIf DestinationDistance.X < 0.0F Then
+				If CurrentDistance.X <= DestinationDistance.X Then
+					CurrentDistance.X = DestinationDistance.X
+				End If
+			Else
+				If CurrentDistance.X > DestinationDistance.X Then
+					If CurrentDistance.X - InterpolationSpeed.X <= DestinationDistance.X Then
+						CurrentDistance.X = DestinationDistance.X
+					End If
+				Else
+					If CurrentDistance.X + InterpolationSpeed.X >= DestinationDistance.X Then
+						CurrentDistance.X = DestinationDistance.X
+					End If
+				End If
+			End If
+		Else
+			If Date.Now < ReadyTime Then
+				If MoveBothWays = True Then
+					If DestinationDistance.X > 0.0F Then
+						DestinationDistance.X = 0.0F - Math.Abs(HalfDistance.X) * 2
+					Else
+						DestinationDistance.X = 0.0F + Math.Abs(HalfDistance.X) * 2
+					End If
+				Else
+					If DestinationDistance.X > 0.0F Then
+						DestinationDistance.X = 0.0F
+					Else
+						DestinationDistance.X = HalfDistance.X
+					End If
+				End If
+				InterpolationDirection = True
+			Else
+				If ReturnToStart.X = 0.0F Then
+					ReadyAxis.X = 1.0F
+				Else
+					If DestinationDistance.X <> 0.0F Then
+						DestinationDistance.X = 0.0F
+						InterpolationDirection = True
+					End If
+					If CurrentDistance.X = 0.0F Then
+						ReadyAxis.X = 1.0F
+					End If
+				End If
+			End If
+		End If
+
+		If CurrentDistance.Y <> DestinationDistance.Y Then
+			If CurrentDistance.Y < DestinationDistance.Y Then
+				CurrentDistance.Y += InterpolationSpeed.Y
+			Else
+				CurrentDistance.Y -= InterpolationSpeed.Y
+			End If
+
+			If Math.Abs(CurrentDistance.Y) / Math.Abs(HalfDistance.Y) > 0.75F Then
+				InterpolationDirection = False
+			End If
+
+			If DestinationDistance.Y > 0.0F Then
+				If CurrentDistance.Y >= DestinationDistance.Y Then
+					CurrentDistance.Y = DestinationDistance.Y
+				End If
+			ElseIf DestinationDistance.Y < 0.0F Then
+				If CurrentDistance.Y <= DestinationDistance.Y Then
+					CurrentDistance.Y = DestinationDistance.Y
+				End If
+			Else
+				If CurrentDistance.Y > DestinationDistance.Y Then
+					If CurrentDistance.Y - InterpolationSpeed.Y <= DestinationDistance.Y Then
+						CurrentDistance.Y = DestinationDistance.Y
+					End If
+				Else
+					If CurrentDistance.Y + InterpolationSpeed.Y >= DestinationDistance.Y Then
+						CurrentDistance.Y = DestinationDistance.Y
+					End If
+				End If
+			End If
+		Else
+			If Date.Now < ReadyTime Then
+				If MoveBothWays = True Then
+					If DestinationDistance.Y > 0.0F Then
+						DestinationDistance.Y = 0.0F - Math.Abs(HalfDistance.Y) * 2
+					Else
+						DestinationDistance.Y = 0.0F + Math.Abs(HalfDistance.Y) * 2
+					End If
+				Else
+					If DestinationDistance.Y > 0.0F Then
+						DestinationDistance.Y = 0.0F
+					Else
+						DestinationDistance.Y = HalfDistance.Y
+					End If
+				End If
+				InterpolationDirection = True
+			Else
+				If ReturnToStart.Y = 0.0F Then
+					ReadyAxis.Y = 1.0F
+				Else
+					If DestinationDistance.Y <> 0.0F Then
+						DestinationDistance.Y = 0.0F
+						InterpolationDirection = True
+					End If
+					If CurrentDistance.Y = 0.0F Then
+						ReadyAxis.Y = 1.0F
+					End If
+				End If
+			End If
+		End If
+
+		If CurrentDistance.Z <> DestinationDistance.Z Then
+			If CurrentDistance.Z < DestinationDistance.Z Then
+				CurrentDistance.Z += InterpolationSpeed.Z
+			Else
+				CurrentDistance.Z -= InterpolationSpeed.Z
+			End If
+
+			If Math.Abs(CurrentDistance.Y) / Math.Abs(HalfDistance.Y) > 0.75F Then
+				InterpolationDirection = False
+			End If
+
+			If DestinationDistance.Z > 0.0F Then
+				If CurrentDistance.Z >= DestinationDistance.Z Then
+					CurrentDistance.Z = DestinationDistance.Z
+				End If
+			ElseIf DestinationDistance.Z < 0.0F Then
+				If CurrentDistance.Z <= DestinationDistance.Z Then
+					CurrentDistance.Z = DestinationDistance.Z
+				End If
+			Else
+				If CurrentDistance.Z > DestinationDistance.Z Then
+					If CurrentDistance.Z - InterpolationSpeed.Z <= DestinationDistance.Z Then
+						CurrentDistance.Z = DestinationDistance.Z
+					End If
+				Else
+					If CurrentDistance.Z + InterpolationSpeed.Z >= DestinationDistance.Z Then
+						CurrentDistance.Z = DestinationDistance.Z
+					End If
+				End If
+			End If
+		Else
+			If Date.Now < ReadyTime Then
+				If MoveBothWays = True Then
+					If DestinationDistance.Z > 0.0F Then
+						DestinationDistance.Z = 0.0F - Math.Abs(HalfDistance.Z) * 2
+					Else
+						DestinationDistance.Z = 0.0F + Math.Abs(HalfDistance.Z) * 2
+					End If
+				Else
+					If DestinationDistance.Z > 0.0F Then
+						DestinationDistance.Z = 0.0F
+					Else
+						DestinationDistance.Z = HalfDistance.Z
+					End If
+				End If
+				InterpolationDirection = True
+			Else
+				If ReturnToStart.Z = 0.0F Then
+					ReadyAxis.Z = 1.0F
+				Else
+					If DestinationDistance.Z <> 0.0F Then
+						DestinationDistance.Z = 0.0F
+						InterpolationDirection = True
+					End If
+					If CurrentDistance.Z = 0.0F Then
+						ReadyAxis.Z = 1.0F
+					End If
+				End If
+			End If
+		End If
+
+		If HalfDistance.X <> 0.0F Then
+			Screen.Camera.Position.X = StartPosition.X + Me.CurrentDistance.X
+		Else
+			ReadyAxis.X = 1.0F
+		End If
+		If HalfDistance.Y <> 0.0F Then
+			Screen.Camera.Position.Y = StartPosition.Y + Me.CurrentDistance.Y
+		Else
+			ReadyAxis.Y = 1.0F
+		End If
+		If HalfDistance.Z <> 0.0F Then
+			Screen.Camera.Position.Z = StartPosition.Z + Me.CurrentDistance.Z
+		Else
+			ReadyAxis.Z = 1.0F
+		End If
+
+		If Date.Now > ReadyTime AndAlso ReadyAxis.X = 1.0F AndAlso ReadyAxis.Y = 1.0F AndAlso ReadyAxis.Z = 1.0F Then
+			Me.Ready = True
+		End If
+	End Sub
+End Class

P3D/Battle/BattleAnimations/BAEntityColor.vb

@@ -2,21 +2,34 @@
 
     Inherits BattleAnimation3D
 
-    Public TargetEntity As Entity
-    Public TransitionSpeed As Single = 0.01F
-    Public FadeIn As Boolean = False
-    Public ColorTo As Vector3 = New Vector3(1.0F, 1.0F, 1.0F)
+    Dim TargetEntity As Entity
+    Dim TransitionSpeed As Single = 0.01F
+    Dim TransitionSpeedOut As Single = 0.01F
+    Dim ReturnToFromWhenDone As Boolean = False
+    Dim RemoveEntityAfter As Boolean = False
+    Dim InitialColorSet As Boolean = False
+    Dim IsReturning As Boolean = False
+    Dim ColorTo As Vector3 = New Vector3(1.0F, 1.0F, 1.0F)
+    Dim ColorFrom As Vector3 = New Vector3(1.0F, 1.0F, 1.0F)
 
-    Public Sub New(ByVal Entity As Entity, ByVal TransitionSpeed As Single, ByVal startDelay As Single, ByVal endDelay As Single, ByVal ColorTo As Color, Optional ByVal ColorFrom As Color = Nothing)
+    Public Sub New(ByRef Entity As Entity, ByVal RemoveEntityAfter As Boolean, ByVal TransitionSpeedIn As Single, ByVal ReturnToFromWhenDone As Boolean, ByVal startDelay As Single, ByVal endDelay As Single, ByVal ColorTo As Vector3, Optional ByVal ColorFrom As Vector3 = Nothing, Optional TransitionSpeedOut As Single = -1)
         MyBase.New(New Vector3(0.0F), TextureManager.DefaultTexture, New Vector3(1.0F), startDelay, endDelay)
-
-        Me.TransitionSpeed = TransitionSpeed
+        Me.RemoveEntityAfter = RemoveEntityAfter
+        If TransitionSpeedOut = -1 Then
+            Me.TransitionSpeedOut = TransitionSpeedIn
+        Else
+            Me.TransitionSpeedOut = TransitionSpeedOut
+        End If
+        Me.TransitionSpeed = TransitionSpeedIn
         Me.TargetEntity = Entity
+        Me.ReturnToFromWhenDone = ReturnToFromWhenDone
 
         If Not ColorFrom = Nothing Then
-            TargetEntity.Color = ColorFrom.ToVector3
+            Me.ColorFrom = ColorFrom
+        Else
+            Me.ColorFrom = TargetEntity.Color
         End If
-        Me.ColorTo = ColorTo.ToVector3
+        Me.ColorTo = ColorTo
 
         Me.Visible = False
 
@@ -24,44 +37,62 @@
     End Sub
 
     Public Overrides Sub DoActionActive()
+        If InitialColorSet = False Then
+            TargetEntity.Color = ColorFrom
+            InitialColorSet = True
+        End If
 
         If TargetEntity.Color.X > ColorTo.X Then
-            TargetEntity.Color.X -= CByte(Me.TransitionSpeed)
+            TargetEntity.Color.X -= Me.TransitionSpeed
             If TargetEntity.Color.X <= ColorTo.X Then
                 TargetEntity.Color.X = ColorTo.X
             End If
         ElseIf TargetEntity.Color.X < ColorTo.X Then
-            TargetEntity.Color.X += CByte(Me.TransitionSpeed)
+            TargetEntity.Color.X += Me.TransitionSpeed
             If TargetEntity.Color.X >= ColorTo.X Then
                 TargetEntity.Color.X = ColorTo.X
             End If
         End If
         If TargetEntity.Color.Y > ColorTo.Y Then
-            TargetEntity.Color.Y -= CByte(Me.TransitionSpeed)
+            TargetEntity.Color.Y -= Me.TransitionSpeed
             If TargetEntity.Color.Y <= ColorTo.Y Then
                 TargetEntity.Color.Y = ColorTo.Y
             End If
         ElseIf TargetEntity.Color.Y < ColorTo.Y Then
-            TargetEntity.Color.Y += CByte(Me.TransitionSpeed)
+            TargetEntity.Color.Y += Me.TransitionSpeed
             If TargetEntity.Color.Y >= ColorTo.Y Then
                 TargetEntity.Color.Y = ColorTo.Y
             End If
         End If
         If TargetEntity.Color.Z > ColorTo.Z Then
-            TargetEntity.Color.Z -= CByte(Me.TransitionSpeed)
+            TargetEntity.Color.Z -= Me.TransitionSpeed
             If TargetEntity.Color.Z <= ColorTo.Z Then
                 TargetEntity.Color.Z = ColorTo.Z
             End If
         ElseIf TargetEntity.Color.Z < ColorTo.Z Then
-            TargetEntity.Color.Z += CByte(Me.TransitionSpeed)
+            TargetEntity.Color.Z += Me.TransitionSpeed
             If TargetEntity.Color.Z >= ColorTo.Z Then
                 TargetEntity.Color.Z = ColorTo.Z
             End If
         End If
 
         If TargetEntity.Color = ColorTo Then
-            Me.Ready = True
+            If ReturnToFromWhenDone = False Then
+                Me.Ready = True
+            Else
+                If IsReturning = False Then
+                    ColorTo = ColorFrom
+                    TransitionSpeed = TransitionSpeedOut
+                    IsReturning = True
+                Else
+                    Me.Ready = True
+                End If
+            End If
+        End If
+    End Sub
+    Public Overrides Sub DoRemoveEntity()
+        If Me.RemoveEntityAfter = True Then
+            TargetEntity.CanBeRemoved = True
         End If
     End Sub
-
 End Class

P3D/Battle/BattleAnimations/BAEntityFaceRotate.vb

@@ -3,25 +3,25 @@
     Inherits BattleAnimation3D
 
     Dim TargetEntity As NPC
-    Dim TargetModel As Entity = Nothing
     Dim EndFaceRotation As Integer
     Dim TurnSteps As Integer = 0
     Dim TurnSpeed As Integer = 1
     Dim TurnTime As Single = 0.0F
     Dim TurnDelay As Single = 0.0F
 
-    Public Sub New(ByVal TargetEntity As NPC, ByVal TurnSteps As Integer, ByVal startDelay As Single, ByVal endDelay As Single, Optional ByVal EndFaceRotation As Integer = -1, Optional ByVal TurnSpeed As Integer = 1, Optional ByVal TurnDelay As Single = 0.25F, Optional TargetModel As Entity = Nothing)
+    Public Sub New(ByRef TargetEntity As NPC, ByVal TurnSteps As Integer, ByVal startDelay As Single, ByVal endDelay As Single, Optional ByVal EndFaceRotation As Integer = -1, Optional ByVal TurnSpeed As Integer = 1, Optional ByVal TurnDelay As Single = 0.25F)
         MyBase.New(New Vector3(0.0F), TextureManager.DefaultTexture, New Vector3(1.0F), startDelay, endDelay)
         If EndFaceRotation = -1 Then
             Me.EndFaceRotation = TargetEntity.faceRotation
         Else
             Me.EndFaceRotation = EndFaceRotation
         End If
-        Me.TargetModel = TargetModel
         Me.TurnSteps = TurnSteps
         Me.TargetEntity = TargetEntity
         Me.TurnSpeed = TurnSpeed
         Me.TurnDelay = TurnDelay
+
+        Me.AnimationType = AnimationTypes.Rotation
     End Sub
 
     Public Overrides Sub DoActionActive()
@@ -34,9 +34,6 @@
                 If Me.TargetEntity.faceRotation < 0 Then
                     Me.TargetEntity.faceRotation += 4
                 End If
-                If Me.TargetModel IsNot Nothing Then
-                    Me.TargetModel.Rotation = Entity.GetRotationFromInteger(Me.TargetEntity.faceRotation)
-                End If
                 Me.TurnSteps -= TurnSpeed.ToPositive()
                 Me.TurnTime = TurnDelay
             Else
@@ -45,9 +42,6 @@
         Else
             If Me.TargetEntity.faceRotation <> Me.EndFaceRotation Then
                 Me.TargetEntity.faceRotation = Me.EndFaceRotation
-                If Me.TargetModel IsNot Nothing Then
-                    Me.TargetModel.Rotation = Entity.GetRotationFromInteger(Me.EndFaceRotation)
-                End If
             End If
             Me.Ready = True
         End If

P3D/Battle/BattleAnimations/BAEntityMove.vb

@@ -2,19 +2,23 @@
 
 	Inherits BattleAnimation3D
 
-	Public TargetEntity As Entity
-	Public Destination As Vector3
-	Public MoveSpeed As Single
-	Public MoveYSpeed As Single
-	Public InterpolationSpeed As Single
-	Public SpinX As Boolean = False
-	Public SpinZ As Boolean = False
-	Public SpinSpeedX As Single = 0.1F
-	Public SpinSpeedZ As Single = 0.1F
-	Public MovementCurve As Integer = 3
-	Private EasedIn As Boolean = False
-	Private EasedOut As Boolean = False
+	Dim StartPosition As Vector3
+	Dim TargetEntity As Entity
+	Dim Destination As Vector3
+	Dim MoveDistance As New Vector3(0.0F)
+	Dim MoveSpeed As Single
+	Dim MoveYSpeed As Single
+	Dim InterpolationSpeed As Single
+	Dim InterpolationYSpeed As Single
+	Dim SpinX As Boolean = False
+	Dim SpinZ As Boolean = False
+	Dim SpinSpeedX As Single = 0.1F
+	Dim SpinSpeedZ As Single = 0.1F
+	Dim MovementCurve As Integer = 3
+	Dim EasedIn As Boolean = False
+	Dim EasedOut As Boolean = False
 	Public RemoveEntityAfter As Boolean
+	Dim ReadyAxis As Vector3 = New Vector3(0.0F)
 	Public Enum Curves As Integer
 		EaseIn
 		EaseOut
@@ -24,7 +28,6 @@
 
 	Public Sub New(ByRef Entity As Entity, ByVal RemoveEntityAfter As Boolean, ByVal Destination As Vector3, ByVal Speed As Single, ByVal SpinX As Boolean, ByVal SpinZ As Boolean, ByVal startDelay As Single, ByVal endDelay As Single, Optional ByVal SpinXSpeed As Single = 0.1F, Optional ByVal SpinZSpeed As Single = 0.1F, Optional MovementCurve As Integer = 3, Optional MoveYSpeed As Single = 0.0F)
 		MyBase.New(New Vector3(0.0F), TextureManager.DefaultTexture, New Vector3(1.0F), startDelay, endDelay)
-
 		Me.RemoveEntityAfter = RemoveEntityAfter
 		Me.Destination = Destination
 		Me.MoveSpeed = Speed
@@ -43,15 +46,29 @@
 		Me.Visible = False
 		Me.TargetEntity = Entity
 
+		Me.StartPosition = TargetEntity.Position
+		Me.MoveDistance.X = Math.Abs(Me.StartPosition.X - Me.Destination.X)
+
+		If TargetEntity.Model IsNot Nothing Then
+			Me.MoveDistance.Y = Math.Abs(Me.StartPosition.Y - Me.Destination.Y - 0.5F)
+		Else
+			Me.MoveDistance.Y = Math.Abs(Me.StartPosition.Y - Me.Destination.Y)
+		End If
+		Me.MoveDistance.Z = Math.Abs(Me.StartPosition.Z - Me.Destination.Z)
+
 		Select Case MovementCurve
 			Case Curves.EaseIn
 				InterpolationSpeed = 0.0F
+				InterpolationYSpeed = 0.0F
 			Case Curves.EaseOut
 				InterpolationSpeed = MoveSpeed
+				InterpolationYSpeed = MoveYSpeed
 			Case Curves.EaseInAndOut
 				InterpolationSpeed = 0.0F
+				InterpolationYSpeed = 0.0F
 			Case Curves.Linear
 				InterpolationSpeed = MoveSpeed
+				InterpolationYSpeed = MoveYSpeed
 		End Select
 
 		Me.AnimationType = AnimationTypes.Move
@@ -75,121 +92,142 @@
 	End Sub
 
 	Private Sub Move()
+
 		Select Case MovementCurve
 			Case Curves.EaseIn
 				If EasedIn = False Then
-					If InterpolationSpeed < MoveSpeed Then
-						InterpolationSpeed += MoveSpeed / 10
+					If InterpolationSpeed < MoveSpeed - 0.05F OrElse InterpolationYSpeed < MoveYSpeed - 0.05F Then
+						If InterpolationSpeed < MoveSpeed - 0.05F Then
+							InterpolationSpeed = MathHelper.Lerp(InterpolationSpeed, MoveSpeed, 0.9F)
+						End If
+						If InterpolationYSpeed < MoveYSpeed - 0.05F Then
+							InterpolationYSpeed = MathHelper.Lerp(InterpolationYSpeed, MoveYSpeed, 0.9F)
+						End If
 					Else
-						EasedIn = True
 						InterpolationSpeed = MoveSpeed
+						InterpolationYSpeed = MoveYSpeed
+						EasedIn = True
 					End If
 				End If
 			Case Curves.EaseOut
 				If EasedOut = False Then
-					If InterpolationSpeed > 0 Then
-						InterpolationSpeed -= MoveSpeed / 10
+					If InterpolationSpeed > 0.05F OrElse InterpolationYSpeed > 0.05F Then
+						If InterpolationSpeed > 0.05F Then
+							InterpolationSpeed = MathHelper.Lerp(InterpolationSpeed, 0.0F, 0.9F)
+						End If
+						If InterpolationYSpeed > 0.05F Then
+							InterpolationYSpeed = MathHelper.Lerp(InterpolationYSpeed, 0.0F, 0.9F)
+						End If
 					Else
-						EasedOut = True
+						InterpolationYSpeed = 0
 						InterpolationSpeed = 0
+						EasedOut = True
 					End If
 				End If
 			Case Curves.EaseInAndOut
 				If EasedIn = False Then
-					If InterpolationSpeed < MoveSpeed Then
-						InterpolationSpeed += MoveSpeed / 10
+					If InterpolationSpeed < MoveSpeed - 0.05F OrElse InterpolationYSpeed < MoveYSpeed - 0.05F Then
+						If InterpolationSpeed < MoveSpeed - 0.05F Then
+							InterpolationSpeed = MathHelper.Lerp(InterpolationSpeed, MoveSpeed, 0.9F)
+						End If
+						If InterpolationYSpeed < MoveYSpeed - 0.05F Then
+							InterpolationYSpeed = MathHelper.Lerp(InterpolationYSpeed, MoveYSpeed, 0.9F)
+						End If
 					Else
-						EasedIn = True
 						InterpolationSpeed = MoveSpeed
+						InterpolationYSpeed = MoveYSpeed
+						EasedIn = True
 					End If
 				Else
 					If EasedOut = False Then
-						If InterpolationSpeed > 0 Then
-							InterpolationSpeed -= MoveSpeed / 10
+						If MoveDistance.X <= 0.05F AndAlso MoveDistance.Y <= 0.05F AndAlso MoveDistance.Z <= 0.05F Then
+							If InterpolationSpeed > 0.05F OrElse InterpolationYSpeed > 0.05F Then
+								If InterpolationSpeed > 0.05F Then
+									InterpolationSpeed = MathHelper.Lerp(InterpolationSpeed, 0.0F, 0.9F)
+								End If
+								If InterpolationYSpeed > 0.05F Then
+									InterpolationYSpeed = MathHelper.Lerp(InterpolationYSpeed, 0.0F, 0.9F)
+								End If
+							Else
+								InterpolationYSpeed = 0
+								InterpolationSpeed = 0
+								EasedOut = True
+							End If
 						Else
-							EasedOut = True
-							InterpolationSpeed = 0
+							If InterpolationSpeed > 0.05F + MoveSpeed / 10 * 3 OrElse InterpolationYSpeed > 0.05F + MoveYSpeed / 10 * 3 Then
+								If InterpolationSpeed > 0.05F + MoveSpeed / 10 * 3 Then
+									InterpolationSpeed = MathHelper.Lerp(InterpolationSpeed, 0.0F, 0.9F)
+								End If
+								If InterpolationYSpeed > 0.05F + MoveYSpeed / 10 * 3 Then
+									InterpolationYSpeed = MathHelper.Lerp(InterpolationYSpeed, 0.0F, 0.9F)
+								End If
+							Else
+								InterpolationYSpeed = MoveSpeed / 10 * 3
+								InterpolationSpeed = MoveSpeed / 10 * 3
+							End If
 						End If
 					End If
 				End If
 		End Select
 
-		If MovementCurve = Curves.Linear Then
-			If TargetEntity.Position.X < Me.Destination.X Then
-				TargetEntity.Position.X += Me.MoveSpeed
+		If MoveDistance.X > 0.05F Then
+			If StartPosition.X < Me.Destination.X Then
+				TargetEntity.Position.X += Me.InterpolationSpeed
 
-				If TargetEntity.Position.X >= Me.Destination.X - 0.05 Then
+				If TargetEntity.Position.X >= Me.Destination.X + 0.05 Then
 					TargetEntity.Position.X = Me.Destination.X
 				End If
-			ElseIf TargetEntity.Position.X > Me.Destination.X Then
-				TargetEntity.Position.X -= Me.MoveSpeed
+			ElseIf StartPosition.X > Me.Destination.X Then
+				TargetEntity.Position.X -= Me.InterpolationSpeed
 
 				If TargetEntity.Position.X <= Me.Destination.X + 0.05 Then
 					TargetEntity.Position.X = Me.Destination.X
 				End If
 			End If
-			If TargetEntity.Position.Y < Me.Destination.Y Then
+			MoveDistance.X -= Me.InterpolationSpeed
+		Else
+			ReadyAxis.X = 1.0F
+		End If
+
+		If MoveDistance.Y > 0.05F Then
+			If StartPosition.Y < Me.Destination.Y Then
 				TargetEntity.Position.Y += Me.MoveYSpeed
 
 				If TargetEntity.Position.Y >= Me.Destination.Y - 0.05 Then
 					TargetEntity.Position.Y = Me.Destination.Y
 				End If
-			ElseIf TargetEntity.Position.Y > Me.Destination.Y Then
+			ElseIf StartPosition.Y > Me.Destination.Y Then
 				TargetEntity.Position.Y -= Me.MoveYSpeed
 
 				If TargetEntity.Position.Y <= Me.Destination.Y + 0.05 Then
 					TargetEntity.Position.Y = Me.Destination.Y
 				End If
 			End If
-			If TargetEntity.Position.Z < Me.Destination.Z Then
-				TargetEntity.Position.Z += Me.MoveSpeed
+			MoveDistance.Y -= Me.MoveYSpeed
+		Else
+			ReadyAxis.Y = 1.0F
+		End If
+
+		If MoveDistance.Z > 0.05F Then
+			If StartPosition.Z < Me.Destination.Z Then
+				TargetEntity.Position.Z += Me.InterpolationSpeed
 
 				If TargetEntity.Position.Z >= Me.Destination.Z - 0.05 Then
 					TargetEntity.Position.Z = Me.Destination.Z
 				End If
-			ElseIf TargetEntity.Position.Z > Me.Destination.Z Then
-				TargetEntity.Position.Z -= Me.MoveSpeed
+			ElseIf StartPosition.Z > Me.Destination.Z Then
+				TargetEntity.Position.Z -= Me.InterpolationSpeed
 
 				If TargetEntity.Position.Z <= Me.Destination.Z + 0.05 Then
 					TargetEntity.Position.Z = Me.Destination.Z
 				End If
 			End If
+			MoveDistance.Z -= Me.MoveYSpeed
 		Else
-			If TargetEntity.Position.X < Me.Destination.X Then
-				TargetEntity.Position.X = MathHelper.Lerp(TargetEntity.Position.X, Me.Destination.X, Me.InterpolationSpeed)
-				If TargetEntity.Position.X > Me.Destination.X - 0.05 Then
-					TargetEntity.Position.X = Me.Destination.X
-				End If
-			ElseIf TargetEntity.Position.X > Me.Destination.X Then
-				TargetEntity.Position.X = MathHelper.Lerp(TargetEntity.Position.X, Me.Destination.X, Me.InterpolationSpeed)
-				If TargetEntity.Position.X < Me.Destination.X + 0.05 Then
-					TargetEntity.Position.X = Me.Destination.X
-				End If
-			End If
-			If TargetEntity.Position.Y < Me.Destination.Y Then
-				TargetEntity.Position.Y = MathHelper.Lerp(TargetEntity.Position.Y, Me.Destination.Y, Me.InterpolationSpeed)
-				If TargetEntity.Position.Y > Me.Destination.Y - 0.05 Then
-					TargetEntity.Position.Y = Me.Destination.Y
-				End If
-			ElseIf TargetEntity.Position.Y > Me.Destination.Y Then
-				TargetEntity.Position.Y = MathHelper.Lerp(TargetEntity.Position.Y, Me.Destination.Y, Me.InterpolationSpeed)
-				If TargetEntity.Position.Y < Me.Destination.Y + 0.05 Then
-					TargetEntity.Position.Y = Me.Destination.Y
-				End If
-			End If
-			If TargetEntity.Position.Z < Me.Destination.Z Then
-				TargetEntity.Position.Z = MathHelper.Lerp(TargetEntity.Position.Z, Me.Destination.Z, Me.InterpolationSpeed)
-				If TargetEntity.Position.Z > Me.Destination.Z - 0.05 Then
-					TargetEntity.Position.Z = Me.Destination.Z
-				End If
-			ElseIf TargetEntity.Position.Z > Me.Destination.Z Then
-				TargetEntity.Position.Z = MathHelper.Lerp(TargetEntity.Position.Z, Me.Destination.Z, Me.InterpolationSpeed)
-				If TargetEntity.Position.Z < Me.Destination.Z + 0.05 Then
-					TargetEntity.Position.Z = Me.Destination.Z
-				End If
-			End If
+			ReadyAxis.Z = 1.0F
 		End If
-		If TargetEntity.Position = Destination Then
+
+		If ReadyAxis.X = 1.0F AndAlso ReadyAxis.Y = 1.0F AndAlso ReadyAxis.Z = 1.0F Then
 			Me.Ready = True
 		End If
 	End Sub

P3D/Battle/BattleAnimations/BAEntityOpacity.vb

@@ -2,20 +2,19 @@
 
     Inherits BattleAnimation3D
 
-    Public TargetEntity As Entity
-    Public TransitionSpeed As Single = 0.01F
-    Public FadeIn As Boolean = False
-    Public EndState As Single = 0.0F
-    Public RemoveEntityAfter As Boolean
+    Dim TargetEntity As Entity
+    Dim TransitionSpeed As Single = 0.01F
+    Dim FadeIn As Boolean = False
+    Dim EndState As Single = 0.0F
+    Dim RemoveEntityAfter As Boolean
 
-    Public Sub New(ByVal entity As Entity, ByVal RemoveEntityAfter As Boolean, ByVal TransitionSpeed As Single, ByVal FadeIn As Boolean, ByVal EndState As Single, ByVal startDelay As Single, ByVal endDelay As Single, Optional ByVal StartState As Single = 1.0F)
+    Public Sub New(ByRef entity As Entity, ByVal RemoveEntityAfter As Boolean, ByVal TransitionSpeed As Single, ByVal FadeIn As Boolean, ByVal EndState As Single, ByVal startDelay As Single, ByVal endDelay As Single, Optional ByVal StartState As Single = 1.0F)
         MyBase.New(New Vector3(0.0F), TextureManager.DefaultTexture, New Vector3(1.0F), startDelay, endDelay)
         Me.RemoveEntityAfter = RemoveEntityAfter
         Me.EndState = EndState
         Me.FadeIn = FadeIn
         Me.TransitionSpeed = TransitionSpeed
         Me.TargetEntity = entity
-
         Me.TargetEntity.NormalOpacity = StartState
         Me.Visible = False
 

P3D/Battle/BattleAnimations/BAEntityOscillateMove.vb

@@ -0,0 +1,323 @@
+Public Class BAEntityOscillateMove
+
+	Inherits BattleAnimation3D
+
+	Dim StartPosition As Vector3
+	Dim ReturnToStart As Vector3
+	Dim TargetEntity As Entity
+	Dim HalfDistance As New Vector3(0.0F)
+	Dim DestinationDistance As New Vector3(0.0F)
+	Dim CurrentDistance As New Vector3(0.0F)
+	Dim MoveSpeed As Single
+	Dim MoveBothWays As Boolean = True
+	Dim MovementCurve As Integer = 0
+	Dim RemoveEntityAfter As Boolean
+	Dim Duration As TimeSpan
+	Dim ReadyTime As Date
+	Dim ReadyAxis As New Vector3(0)
+	Dim InterpolationSpeed As Vector3
+	Dim InterpolationDirection As Boolean = True
+	Public Enum Curves As Integer
+		Linear
+		Smooth
+	End Enum
+
+	Public Sub New(ByRef Entity As Entity, ByVal RemoveEntityAfter As Boolean, ByVal Distance As Vector3, ByVal Speed As Single, ByVal BothWays As Boolean, ByVal Duration As TimeSpan, ByVal startDelay As Single, ByVal endDelay As Single, Optional MovementCurve As Integer = 0, Optional ReturnToStart As Vector3 = Nothing)
+		MyBase.New(New Vector3(0.0F), TextureManager.DefaultTexture, New Vector3(1.0F), startDelay, endDelay)
+		Me.RemoveEntityAfter = RemoveEntityAfter
+		Me.HalfDistance = Distance
+		Me.DestinationDistance = Me.HalfDistance
+		Me.MoveSpeed = Speed
+		Me.MoveBothWays = BothWays
+		Me.Duration = Duration
+		Me.MovementCurve = CType(MovementCurve, Curves)
+
+		Me.Visible = False
+		Me.TargetEntity = Entity
+		Select Case MovementCurve
+			Case Curves.Linear
+				InterpolationSpeed = New Vector3(MoveSpeed)
+			Case Curves.Smooth
+				InterpolationSpeed = New Vector3(0.0F)
+		End Select
+		If ReturnToStart <> Nothing Then
+			Me.ReturnToStart = ReturnToStart
+		End If
+		Me.AnimationType = AnimationTypes.Move
+	End Sub
+
+	Public Overrides Sub DoActionActive()
+		Move()
+	End Sub
+
+	Private Sub Move()
+		If StartPosition = Nothing Then
+			StartPosition = TargetEntity.Position
+		End If
+		If ReadyTime = Nothing Then
+			ReadyTime = Date.Now + Duration
+		End If
+		If MovementCurve = Curves.Smooth Then
+			If InterpolationDirection = True Then
+				If InterpolationSpeed.X < MoveSpeed Then
+					InterpolationSpeed.X += MoveSpeed / 10
+				Else
+					InterpolationSpeed.X = MoveSpeed
+				End If
+				If InterpolationSpeed.Y < MoveSpeed Then
+					InterpolationSpeed.Y += MoveSpeed / 10
+				Else
+					InterpolationSpeed.Y = MoveSpeed
+				End If
+				If InterpolationSpeed.Z < MoveSpeed Then
+					InterpolationSpeed.Z += MoveSpeed / 10
+				Else
+					InterpolationSpeed.Z = MoveSpeed
+				End If
+			Else
+				If Date.Now < ReadyTime Then
+					If InterpolationSpeed.X > 0 Then
+						InterpolationSpeed.X -= MoveSpeed / 10
+					Else
+						InterpolationSpeed.X = 0
+					End If
+					If InterpolationSpeed.Y > 0 Then
+						InterpolationSpeed.Y -= MoveSpeed / 10
+					Else
+						InterpolationSpeed.Y = 0
+					End If
+					If InterpolationSpeed.Z > 0 Then
+						InterpolationSpeed.Z -= MoveSpeed / 10
+					Else
+						InterpolationSpeed.Z = 0
+					End If
+				Else
+					If InterpolationSpeed.X > MoveSpeed / 10 * 3 Then
+						InterpolationSpeed.X -= MoveSpeed / 10
+					Else
+						InterpolationSpeed.X = MoveSpeed / 10 * 3
+					End If
+					If InterpolationSpeed.Y > MoveSpeed / 10 * 3 Then
+						InterpolationSpeed.Y -= MoveSpeed / 10
+					Else
+						InterpolationSpeed.Y = MoveSpeed / 10 * 3
+					End If
+					If InterpolationSpeed.Z > MoveSpeed / 10 * 3 Then
+						InterpolationSpeed.Z -= MoveSpeed / 10
+					Else
+						InterpolationSpeed.Z = MoveSpeed / 10 * 3
+					End If
+				End If
+			End If
+		End If
+
+		If CurrentDistance.X <> DestinationDistance.X Then
+			If CurrentDistance.X < DestinationDistance.X Then
+				CurrentDistance.X += InterpolationSpeed.X
+			Else
+				CurrentDistance.X -= InterpolationSpeed.X
+			End If
+
+			If Math.Abs(CurrentDistance.X) / Math.Abs(HalfDistance.X) > 0.75F Then
+				InterpolationDirection = False
+			End If
+
+			If DestinationDistance.X > 0.0F Then
+				If CurrentDistance.X >= DestinationDistance.X Then
+					CurrentDistance.X = DestinationDistance.X
+				End If
+			ElseIf DestinationDistance.x < 0.0F Then
+				If CurrentDistance.X <= DestinationDistance.X Then
+					CurrentDistance.X = DestinationDistance.X
+				End If
+			Else
+				If CurrentDistance.X > DestinationDistance.X Then
+					If CurrentDistance.X - InterpolationSpeed.X <= DestinationDistance.X Then
+						CurrentDistance.X = DestinationDistance.X
+					End If
+				Else
+					If CurrentDistance.X + InterpolationSpeed.X >= DestinationDistance.X Then
+						CurrentDistance.X = DestinationDistance.X
+					End If
+				End If
+			End If
+		Else
+			If Date.Now < ReadyTime Then
+				If MoveBothWays = True Then
+					If DestinationDistance.X > 0.0F Then
+						DestinationDistance.X = 0.0F - Math.Abs(HalfDistance.X) * 2
+					Else
+						DestinationDistance.X = 0.0F + Math.Abs(HalfDistance.X) * 2
+					End If
+				Else
+					If DestinationDistance.X > 0.0F Then
+						DestinationDistance.X = 0.0F
+					Else
+						DestinationDistance.X = HalfDistance.X
+					End If
+				End If
+				InterpolationDirection = True
+			Else
+				If ReturnToStart.X = 0.0F Then
+					ReadyAxis.X = 1.0F
+				Else
+					If DestinationDistance.X <> 0.0F Then
+						DestinationDistance.X = 0.0F
+						InterpolationDirection = True
+					End If
+					If CurrentDistance.X = 0.0F Then
+						ReadyAxis.X = 1.0F
+					End If
+				End If
+			End If
+		End If
+
+		If CurrentDistance.Y <> DestinationDistance.Y Then
+			If CurrentDistance.Y < DestinationDistance.Y Then
+				CurrentDistance.Y += InterpolationSpeed.Y
+			Else
+				CurrentDistance.Y -= InterpolationSpeed.Y
+			End If
+
+			If Math.Abs(CurrentDistance.Y) / Math.Abs(HalfDistance.Y) > 0.75F Then
+				InterpolationDirection = False
+			End If
+
+			If DestinationDistance.Y > 0.0F Then
+				If CurrentDistance.Y >= DestinationDistance.Y Then
+					CurrentDistance.Y = DestinationDistance.Y
+				End If
+			ElseIf DestinationDistance.Y < 0.0F Then
+				If CurrentDistance.Y <= DestinationDistance.Y Then
+					CurrentDistance.Y = DestinationDistance.Y
+				End If
+			Else
+				If CurrentDistance.Y > DestinationDistance.Y Then
+					If CurrentDistance.Y - InterpolationSpeed.Y <= DestinationDistance.Y Then
+						CurrentDistance.Y = DestinationDistance.Y
+					End If
+				Else
+					If CurrentDistance.Y + InterpolationSpeed.Y >= DestinationDistance.Y Then
+						CurrentDistance.Y = DestinationDistance.Y
+					End If
+				End If
+			End If
+		Else
+			If Date.Now < ReadyTime Then
+				If MoveBothWays = True Then
+					If DestinationDistance.Y > 0.0F Then
+						DestinationDistance.Y = 0.0F - Math.Abs(HalfDistance.Y) * 2
+					Else
+						DestinationDistance.Y = 0.0F + Math.Abs(HalfDistance.Y) * 2
+					End If
+				Else
+					If DestinationDistance.Y > 0.0F Then
+						DestinationDistance.Y = 0.0F
+					Else
+						DestinationDistance.Y = HalfDistance.Y
+					End If
+				End If
+				InterpolationDirection = True
+			Else
+				If ReturnToStart.Y = 0.0F Then
+					ReadyAxis.Y = 1.0F
+				Else
+					If DestinationDistance.Y <> 0.0F Then
+						DestinationDistance.Y = 0.0F
+						InterpolationDirection = True
+					End If
+					If CurrentDistance.Y = 0.0F Then
+						ReadyAxis.Y = 1.0F
+					End If
+				End If
+			End If
+		End If
+
+		If CurrentDistance.Z <> DestinationDistance.Z Then
+			If CurrentDistance.Z < DestinationDistance.Z Then
+				CurrentDistance.Z += InterpolationSpeed.Z
+			Else
+				CurrentDistance.Z -= InterpolationSpeed.Z
+			End If
+
+			If Math.Abs(CurrentDistance.Y) / Math.Abs(HalfDistance.Y) > 0.75F Then
+				InterpolationDirection = False
+			End If
+
+			If DestinationDistance.Z > 0.0F Then
+				If CurrentDistance.Z >= DestinationDistance.Z Then
+					CurrentDistance.Z = DestinationDistance.Z
+				End If
+			ElseIf DestinationDistance.z < 0.0F Then
+				If CurrentDistance.Z <= DestinationDistance.Z Then
+					CurrentDistance.Z = DestinationDistance.Z
+				End If
+			Else
+				If CurrentDistance.Z > DestinationDistance.Z Then
+					If CurrentDistance.Z - InterpolationSpeed.Z <= DestinationDistance.Z Then
+						CurrentDistance.Z = DestinationDistance.Z
+					End If
+				Else
+					If CurrentDistance.Z + InterpolationSpeed.Z >= DestinationDistance.Z Then
+						CurrentDistance.Z = DestinationDistance.Z
+					End If
+				End If
+			End If
+		Else
+			If Date.Now < ReadyTime Then
+				If MoveBothWays = True Then
+					If DestinationDistance.Z > 0.0F Then
+						DestinationDistance.Z = 0.0F - Math.Abs(HalfDistance.Z) * 2
+					Else
+						DestinationDistance.Z = 0.0F + Math.Abs(HalfDistance.Z) * 2
+					End If
+				Else
+					If DestinationDistance.Z > 0.0F Then
+						DestinationDistance.Z = 0.0F
+					Else
+						DestinationDistance.Z = HalfDistance.Z
+					End If
+				End If
+				InterpolationDirection = True
+			Else
+				If ReturnToStart.Z = 0.0F Then
+					ReadyAxis.Z = 1.0F
+				Else
+					If DestinationDistance.Z <> 0.0F Then
+						DestinationDistance.Z = 0.0F
+						InterpolationDirection = True
+					End If
+					If CurrentDistance.Z = 0.0F Then
+						ReadyAxis.Z = 1.0F
+					End If
+				End If
+			End If
+		End If
+
+		If HalfDistance.X <> 0.0F Then
+			TargetEntity.Position.X = StartPosition.X + Me.CurrentDistance.X
+		Else
+			ReadyAxis.X = 1.0F
+		End If
+		If HalfDistance.Y <> 0.0F Then
+			TargetEntity.Position.Y = StartPosition.Y + Me.CurrentDistance.Y
+		Else
+			ReadyAxis.Y = 1.0F
+		End If
+		If HalfDistance.Z <> 0.0F Then
+			TargetEntity.Position.Z = StartPosition.Z + Me.CurrentDistance.Z
+		Else
+			ReadyAxis.Z = 1.0F
+		End If
+
+		If Date.Now > ReadyTime AndAlso ReadyAxis.X = 1.0F AndAlso ReadyAxis.Y = 1.0F AndAlso ReadyAxis.Z = 1.0F Then
+			Me.Ready = True
+		End If
+	End Sub
+	Public Overrides Sub DoRemoveEntity()
+		If Me.RemoveEntityAfter = True Then
+			TargetEntity.CanBeRemoved = True
+		End If
+	End Sub
+
+End Class

P3D/Battle/BattleAnimations/BAEntityRotate.vb

@@ -9,41 +9,47 @@
     Dim ReturnVector As Vector3
     Dim hasReturned As Boolean = False
     Dim DoRotation As Vector3 = New Vector3(1.0F)
-    Public RemoveEntityAfter As Boolean = False
+    Dim AmountRotated As Vector3 = New Vector3(0.0F)
+    Dim ReadyAxis As Vector3 = New Vector3(0.0F)
+    Dim RemoveEntityAfter As Boolean = False
 
-    Public Sub New(ByVal Entity As Entity, ByVal RemoveEntityAfter As Boolean, ByVal RotationSpeedVector As Vector3, ByVal EndRotation As Vector3, ByVal startDelay As Single, ByVal endDelay As Single)
+    Public Sub New(ByRef Entity As Entity, ByVal RemoveEntityAfter As Boolean, ByVal RotationSpeedVector As Vector3, ByVal EndRotation As Vector3, ByVal startDelay As Single, ByVal endDelay As Single)
         MyBase.New(New Vector3(0.0F), TextureManager.DefaultTexture, New Vector3(1.0F), startDelay, endDelay)
         Me.RemoveEntityAfter = RemoveEntityAfter
         Me.RotationSpeedVector = RotationSpeedVector
         Me.EndRotation = EndRotation
         Me.TargetEntity = Entity
         Me.ReturnVector = TargetEntity.Rotation
+
+        Me.AnimationType = AnimationTypes.Rotation
     End Sub
 
-    Public Sub New(ByVal Entity As Entity, ByVal RemoveEntityAfter As Boolean, ByVal RotationSpeedVector As Vector3, ByVal EndRotation As Vector3, ByVal startDelay As Single, ByVal endDelay As Single, ByVal DoXRotation As Boolean, ByVal DoYRotation As Boolean, ByVal DoZRotation As Boolean)
+    Public Sub New(ByRef Entity As Entity, ByVal RemoveEntityAfter As Boolean, ByVal RotationSpeedVector As Vector3, ByVal EndRotation As Vector3, ByVal startDelay As Single, ByVal endDelay As Single, ByVal DoXRotation As Boolean, ByVal DoYRotation As Boolean, ByVal DoZRotation As Boolean)
         Me.New(Entity, RemoveEntityAfter, RotationSpeedVector, EndRotation, startDelay, endDelay)
 
         If DoXRotation = False Then
             DoRotation.X = 0.0F
+            ReadyAxis.X = 1.0F
         End If
         If DoYRotation = False Then
             DoRotation.Y = 0.0F
+            ReadyAxis.Y = 1.0F
         End If
         If DoZRotation = False Then
             DoRotation.Z = 0.0F
+            ReadyAxis.Z = 1.0F
         End If
     End Sub
 
-    Public Sub New(ByVal Entity As Entity, ByVal RemoveEntityAfter As Boolean, ByVal RotationSpeedVector As Vector3, ByVal EndRotation As Vector3, ByVal startDelay As Single, ByVal endDelay As Single, ByVal DoXRotation As Boolean, ByVal DoYRotation As Boolean, ByVal DoZRotation As Boolean, ByVal DoReturn As Boolean)
+    Public Sub New(ByRef Entity As Entity, ByVal RemoveEntityAfter As Boolean, ByVal RotationSpeedVector As Vector3, ByVal EndRotation As Vector3, ByVal startDelay As Single, ByVal endDelay As Single, ByVal DoXRotation As Boolean, ByVal DoYRotation As Boolean, ByVal DoZRotation As Boolean, ByVal DoReturn As Boolean)
         Me.New(Entity, RemoveEntityAfter, RotationSpeedVector, EndRotation, startDelay, endDelay, DoXRotation, DoYRotation, DoZRotation)
 
         Me.DoReturn = DoReturn
     End Sub
 
     Public Overrides Sub DoActionActive()
-        If VectorReached() = False Then
-
-            If DoRotation.X = 1.0F Then
+        If DoRotation.X = 1.0F Then
+            If AmountRotated.X < Math.Abs(EndRotation.X) Then
                 If TargetEntity.Rotation.X > Me.EndRotation.X Then
                     TargetEntity.Rotation.X += Me.RotationSpeedVector.X
 
@@ -57,9 +63,13 @@
                         TargetEntity.Rotation.X = Me.EndRotation.X
                     End If
                 End If
+                AmountRotated.X += Math.Abs(Me.RotationSpeedVector.X)
+            Else
+                ReadyAxis.X = 1.0F
             End If
-
-            If DoRotation.Y = 1.0F Then
+        End If
+        If DoRotation.Y = 1.0F Then
+            If AmountRotated.Y < Math.Abs(EndRotation.Y) Then
                 If TargetEntity.Rotation.Y > Me.EndRotation.Y Then
                     TargetEntity.Rotation.Y += Me.RotationSpeedVector.Y
 
@@ -73,9 +83,15 @@
                         TargetEntity.Rotation.Y = Me.EndRotation.Y
                     End If
                 End If
+                AmountRotated.Y += Math.Abs(Me.RotationSpeedVector.Y)
+            Else
+                ReadyAxis.y = 1.0F
             End If
+        End If
+
+        If DoRotation.Z = 1.0F Then
+            If AmountRotated.Z < Math.Abs(EndRotation.Z) Then
 
-            If DoRotation.Z = 1.0F Then
                 If TargetEntity.Rotation.Z > Me.EndRotation.Z Then
                     TargetEntity.Rotation.Z += Me.RotationSpeedVector.Z
 
@@ -89,42 +105,40 @@
                         TargetEntity.Rotation.Z = Me.EndRotation.Z
                     End If
                 End If
+                AmountRotated.Z += Math.Abs(Me.RotationSpeedVector.Z)
+            Else
+                ReadyAxis.Z = 1.0F
             End If
-        Else
+        End If
+
+        If ReadyAxis.X = 1.0F AndAlso ReadyAxis.Y = 1.0F AndAlso ReadyAxis.Z = 1.0F Then
             RotationReady()
         End If
     End Sub
 
     Private Sub RotationReady()
+
         If Me.DoReturn = True And Me.hasReturned = False Then
             Me.hasReturned = True
             Me.EndRotation = Me.ReturnVector
             Me.RotationSpeedVector = New Vector3(Me.RotationSpeedVector.X * -1, Me.RotationSpeedVector.Y * -1, Me.RotationSpeedVector.Z * -1)
+            If DoRotation.X = 1.0F Then
+                ReadyAxis.X = 0.0F
+                AmountRotated.X -= AmountRotated.X * 2
+            End If
+            If DoRotation.Y = 1.0F Then
+                ReadyAxis.Y = 0.0F
+                AmountRotated.Y -= AmountRotated.Y * 2
+            End If
+            If DoRotation.Z = 1.0F Then
+                ReadyAxis.Z = 0.0F
+                AmountRotated.Z -= AmountRotated.Z * 2
+            End If
         Else
             Me.Ready = True
         End If
     End Sub
 
-    Private Function VectorReached() As Boolean
-        If DoRotation.X = 1.0F Then
-            If EndRotation.X <> TargetEntity.Rotation.X Then
-                Return False
-            End If
-        End If
-        If DoRotation.Y = 1.0F Then
-            If EndRotation.Y <> TargetEntity.Rotation.Y Then
-                Return False
-            End If
-        End If
-        If DoRotation.Z = 1.0F Then
-            If EndRotation.Z <> TargetEntity.Rotation.Z Then
-                Return False
-            End If
-        End If
-
-        Return True
-    End Function
-
     Public Overrides Sub DoRemoveEntity()
         If Me.RemoveEntityAfter = True Then
             TargetEntity.CanBeRemoved = True

P3D/Battle/BattleAnimations/BAEntityScale.vb

@@ -2,16 +2,16 @@
 
     Inherits BattleAnimation3D
 
-    Public Grow As Boolean = False
-    Public EndSize As Vector3
-    Public SizeSpeed As Single = 0.01F
-    Public TargetEntity As Entity
-    Public Anchors As String '1 = Bottom, 2 = Top, 3 = Left, 4 = Right. Combinations are possible.
+    Dim Grow As Boolean = False
+    Dim EndSize As Vector3
+    Dim SizeSpeed As Single = 0.01F
+    Dim TargetEntity As Entity
+    Dim Anchors As String '1 = Bottom, 2 = Top, 3 = Left, 4 = Right. Combinations are possible.
 
-    Public Change As New Vector3(1)
-    Public RemoveEntityAfter As Boolean
+    Dim SpeedMultiplier As Vector3
+    Dim RemoveEntityAfter As Boolean
 
-    Public Sub New(ByVal Entity As Entity, ByVal RemoveEntityAfter As Boolean, ByVal Scale As Vector3, ByVal Grow As Boolean, ByVal EndSize As Vector3, ByVal SizeSpeed As Single, ByVal startDelay As Single, ByVal endDelay As Single, ByVal Anchors As String)
+    Public Sub New(ByRef Entity As Entity, ByVal RemoveEntityAfter As Boolean, ByVal Scale As Vector3, ByVal Grow As Boolean, ByVal EndSize As Vector3, ByVal SizeSpeed As Single, ByVal startDelay As Single, ByVal endDelay As Single, ByVal Anchors As String, Optional SpeedMultiplier As Vector3 = Nothing)
         MyBase.New(New Vector3(0.0F), TextureManager.DefaultTexture, Scale, startDelay, endDelay)
         Me.RemoveEntityAfter = RemoveEntityAfter
         Me.Anchors = Anchors
@@ -19,6 +19,11 @@
         Me.EndSize = EndSize
         Me.SizeSpeed = SizeSpeed
         Me.TargetEntity = Entity
+        If SpeedMultiplier <> Nothing Then
+            Me.SpeedMultiplier = SpeedMultiplier
+        Else
+            Me.SpeedMultiplier = New Vector3(1)
+        End If
 
         Me.AnimationType = AnimationTypes.Size
     End Sub
@@ -26,9 +31,9 @@
     Public Overrides Sub DoActionActive()
         Dim saveScale As Vector3 = TargetEntity.Scale
 
-        Dim changeX As Single = SizeSpeed * Change.X
-        Dim changeY As Single = SizeSpeed * Change.Y
-        Dim changeZ As Single = SizeSpeed * Change.Z
+        Dim changeX As Single = SizeSpeed * SpeedMultiplier.X
+        Dim changeY As Single = SizeSpeed * SpeedMultiplier.Y
+        Dim changeZ As Single = SizeSpeed * SpeedMultiplier.Z
 
         If Grow = True Then
             If TargetEntity.Scale.X < Me.EndSize.X Then
@@ -102,9 +107,6 @@
         End If
     End Sub
 
-    Public Sub SetChange(ByVal changeX As Single, ByVal changeY As Single, ByVal changeZ As Single)
-        Me.Change = New Vector3(changeX, changeY, changeZ)
-    End Sub
     Public Overrides Sub DoRemoveEntity()
         If Me.RemoveEntityAfter = True Then
             TargetEntity.CanBeRemoved = True

P3D/Battle/BattleAnimations/BAEntitySetPosition.vb

@@ -0,0 +1,36 @@
+Public Class BAEntitySetPosition
+
+	Inherits BattleAnimation3D
+
+	Dim TargetEntity As Entity
+	Dim SetPosition As Vector3
+	Dim RemoveEntityAfter As Boolean
+
+	Public Sub New(ByRef Entity As Entity, ByVal RemoveEntityAfter As Boolean, ByVal SetPosition As Vector3, ByVal startDelay As Single, ByVal endDelay As Single)
+		MyBase.New(New Vector3(0.0F), TextureManager.DefaultTexture, New Vector3(1.0F), startDelay, endDelay)
+
+		Me.RemoveEntityAfter = RemoveEntityAfter
+		Me.SetPosition = SetPosition
+
+		Me.Visible = False
+		Me.TargetEntity = Entity
+
+		Me.AnimationType = AnimationTypes.Move
+	End Sub
+
+	Public Overrides Sub DoActionActive()
+		Dim SetPositionOffset As Vector3 = New Vector3(0)
+		If TargetEntity.Model IsNot Nothing Then
+			SetPositionOffset = New Vector3(0, -0.5, 0)
+		End If
+		TargetEntity.Position = Me.SetPosition + SetPositionOffset
+		Me.Ready = True
+	End Sub
+
+	Public Overrides Sub DoRemoveEntity()
+		If Me.RemoveEntityAfter = True Then
+			TargetEntity.CanBeRemoved = True
+		End If
+	End Sub
+
+End Class

P3D/Battle/BattleAnimations/BAEntityTextureChange.vb

@@ -2,15 +2,16 @@
 
     Inherits BattleAnimation3D
 
-    Public Texture As Texture2D
-    Public TargetEntity As Entity
-    Public RemoveEntityAfter As Boolean
+    Dim Texture As Texture2D
+    Dim TargetEntity As Entity
+    Dim RemoveEntityAfter As Boolean
 
-    Public Sub New(ByVal Entity As Entity, ByVal RemoveEntityAfter As Boolean, Texture As Texture2D, ByVal startDelay As Single, ByVal endDelay As Single)
+    Public Sub New(ByRef Entity As Entity, ByVal RemoveEntityAfter As Boolean, Texture As Texture2D, ByVal startDelay As Single, ByVal endDelay As Single)
         MyBase.New(New Vector3(0.0F), TextureManager.DefaultTexture, New Vector3(1.0F), startDelay, endDelay)
         Me.RemoveEntityAfter = RemoveEntityAfter
         Me.TargetEntity = Entity
         Me.Texture = Texture
+
         Me.AnimationType = AnimationTypes.Texture
     End Sub
 

P3D/Battle/BattleAnimations/BAPlaySound.vb

@@ -2,24 +2,27 @@
 
     Inherits BattleAnimation3D
 
-    Private soundfile As String
-    Private stopMusic As Boolean
-    Private IsPokemon As Boolean
+    Dim soundfile As String
+    Dim stopMusic As Boolean
+    Dim IsPokemon As Boolean
+    Dim CrySuffix As String = ""
 
 
-    Public Sub New(ByVal sound As String, ByVal startDelay As Single, ByVal endDelay As Single, Optional ByVal stopMusic As Boolean = False, Optional ByVal IsPokemon As Boolean = False)
+    Public Sub New(ByVal sound As String, ByVal startDelay As Single, ByVal endDelay As Single, Optional ByVal stopMusic As Boolean = False, Optional ByVal IsPokemon As Boolean = False, Optional ByVal CrySuffix As String = "")
         MyBase.New(New Vector3(0.0F), TextureManager.DefaultTexture, New Vector3(1.0F), startDelay, endDelay)
         Me.Scale = New Vector3(1.0F)
         soundfile = sound
         Me.Visible = False
         Me.stopMusic = stopMusic
         Me.IsPokemon = IsPokemon
+        Me.CrySuffix = CrySuffix
+
         AnimationType = AnimationTypes.Sound
     End Sub
 
     Public Overrides Sub DoActionActive()
         If IsPokemon = True Then
-            SoundManager.PlayPokemonCry(CInt(soundfile))
+            SoundManager.PlayPokemonCry(CInt(soundfile), Me.CrySuffix)
         Else
             SoundManager.PlaySound(soundfile, stopMusic)
         End If

P3D/Battle/BattleAnimations/BattleAnimation3D.vb

@@ -14,10 +14,9 @@
         Size
         Rotation
         Texture
-        Wait
-        ViewPokeBill
         Sound
         Background
+        Camera
     End Enum
 
     Public AnimationType As AnimationTypes = AnimationTypes.Nothing
@@ -25,13 +24,14 @@
     Public Ready As Boolean = False
     Public startDelay As Date
     Public endDelay As Date
-    Public SpawnedEntity As Boolean = False
-    Public Started As Boolean = False
-    Private DelayDivide As Single = 6.0F
-    Private StartDelayWhole As Single
-    Private StartDelayFraction As Single
-    Private EndDelayWhole As Single
-    Private EndDelayFraction As Single
+    Dim SpawnedEntity As Boolean = False
+    Dim Started As Boolean = False
+    Dim DelayDivide As Single = 6.0F
+    Dim StartDelayWhole As Single
+    Dim StartDelayFraction As Single
+    Dim EndDelayWhole As Single
+    Dim EndDelayFraction As Single
+    Dim hasStartedEndDelay As Boolean = False
 
     Public Sub New(ByVal Position As Vector3, ByVal Texture As Texture2D, ByVal Scale As Vector3, ByVal startDelay As Single, ByVal endDelay As Single, Optional SpawnedEntity As Boolean = False)
         MyBase.New(Position.X, Position.Y, Position.Z, "BattleAnimation", {Texture}, {0, 0}, False, 0, Scale, BaseModel.BillModel, 0, "", New Vector3(1.0F))
@@ -48,16 +48,21 @@
     End Sub
 
     Public Overrides Sub Update()
+
         If Started = False Then
             Me.startDelay = Date.Now + New TimeSpan(0, 0, 0, CInt(StartDelayWhole), CInt(StartDelayFraction * 1000))
-            Me.endDelay = Date.Now + New TimeSpan(0, 0, 0, CInt(EndDelayWhole), CInt(EndDelayFraction * 1000))
+            hasStartedEndDelay = False
             Started = True
         End If
         If CanRemove = False Then
             If Ready = True Then
+                If hasStartedEndDelay = False Then
+                    Me.endDelay = Date.Now + New TimeSpan(0, 0, 0, CInt(EndDelayWhole), CInt(EndDelayFraction * 1000))
+                    hasStartedEndDelay = True
+                End If
                 If Date.Now >= endDelay Then
-                    CanRemove = True
                     DoRemoveEntity()
+                    CanRemove = True
                 End If
             Else
                 If Date.Now >= startDelay Then

P3D/Battle/BattleStats.vb

@@ -20,7 +20,7 @@
                 Return Nothing
         End Select
 
-        Return TextureManager.GetTexture("GUI\Menus\Types", r, "")
+        Return TextureManager.GetTexture(Element.GetElementTexturePath(), r, "")
     End Function
 
     Public Shared Function GetStatColor(ByVal Status As Pokemon.StatusProblems) As Color

P3D/Battle/BattleSystemV2/BattleCalculation.vb

@@ -12,7 +12,7 @@
             End If
             Dim ability As String = p.Ability.Name.ToLower()
             If p.Item IsNot Nothing AndAlso BattleScreen.FieldEffects.CanUseItem(own) = True Then
-                Select Case p.Item.Name.ToLower()
+                Select Case p.Item.OriginalName.ToLower()
                     Case "damp rock"
                         If ability = "drizzle" Or moveName = "rain dance" Then
                             turns = 8
@@ -242,7 +242,7 @@
                 End If
 
                 Dim SlowDownItems As List(Of String) = {"iron ball", "macho brace", "power bracer", "power belt", "power lens", "power band", "power anklet", "power weight"}.ToList()
-                If SlowDownItems.Contains(p.Item.Name.ToLower()) = True And BattleScreen.FieldEffects.CanUseItem(own) = True Then
+                If SlowDownItems.Contains(p.Item.OriginalName.ToLower()) = True And BattleScreen.FieldEffects.CanUseItem(own) = True Then
                     speed = CInt(speed / 2)
                 End If
 
@@ -505,13 +505,13 @@
             result = INIT * ACCM
 
             If Not op.Item Is Nothing And BattleScreen.FieldEffects.CanUseItem(Not own) = True Then
-                If op.Item.Name.ToLower() = "bright powder" Or op.Item.Name.ToLower() = "lax incense" Then
+                If op.Item.OriginalName.ToLower() = "bright powder" Or op.Item.OriginalName.ToLower() = "lax incense" Then
                     result *= 0.9F
                 End If
             End If
 
             If Not p.Item Is Nothing And BattleScreen.FieldEffects.CanUseItem(own) = True Then
-                Select Case p.Item.Name.ToLower()
+                Select Case p.Item.OriginalName.ToLower()
                     Case "wide lens"
                         result *= 1.1F
                     Case "zoom lens"
@@ -633,7 +633,7 @@
             End If
 
             If Not p.Item Is Nothing And BattleScreen.FieldEffects.CanUseItem(own) = True Then
-                Select Case p.Item.Name.ToLower()
+                Select Case p.Item.OriginalName.ToLower()
                     Case "lucky punch"
                         If p.Number = 113 Then
                             C += 2
@@ -676,7 +676,7 @@
             Return False
         End Function
 
-        Public Shared Function CanRun(ByVal own As Boolean, ByVal BattleScreen As BattleScreen) As Boolean
+        Public Shared Function CanRun(ByVal own As Boolean, ByVal BattleScreen As BattleScreen, Optional ByVal IsEscapeMove As Boolean = False) As Boolean
             If BattleScreen.BattleMode = BattleScreen.BattleModes.Safari Then
                 Return True
             End If
@@ -697,7 +697,7 @@
             End If
 
             If Not p.Item Is Nothing Then
-                If p.Item.Name.ToLower() = "smoke ball" And BattleScreen.FieldEffects.CanUseItem(own) = True And BattleScreen.FieldEffects.CanUseOwnItem(own, BattleScreen) = True Then
+                If p.Item.OriginalName.ToLower() = "smoke ball" And BattleScreen.FieldEffects.CanUseItem(own) = True And BattleScreen.FieldEffects.CanUseOwnItem(own, BattleScreen) = True Then
                     Return True
                 End If
             End If
@@ -736,6 +736,10 @@
                 Return False
             End If
 
+            If IsEscapeMove = True Then
+                Return True
+            End If
+
             If p.Speed > op.Speed Then
                 Return True
             Else
@@ -876,7 +880,7 @@
             End If
 
             If Not op.Item Is Nothing Then
-                If op.Item.Name.ToLower() = "ring target" And BattleScreen.FieldEffects.CanUseItem(Not own) = True And BattleScreen.FieldEffects.CanUseOwnItem(Not own, BattleScreen) = True Then
+                If op.Item.OriginalName.ToLower() = "ring target" And BattleScreen.FieldEffects.CanUseItem(Not own) = True And BattleScreen.FieldEffects.CanUseOwnItem(Not own, BattleScreen) = True Then
                     If Type1 = 0 Then
                         effectiveness = Type2
                     End If
@@ -987,7 +991,7 @@
             Return CalculateEffectiveness(move, BattleScreen, p, op, own)
         End Function
 
-        Public Shared Function GainExp(ByVal p As Pokemon, ByVal BattleScreen As BattleScreen, ByVal PokemonList As List(Of Integer)) As Integer
+        Public Shared Function GainExp(ByVal p As Pokemon, ByVal BattleScreen As BattleScreen, ByVal PokemonList As List(Of Integer), ByVal PokeIndex As Integer) As Integer
             Dim op As Pokemon = BattleScreen.OppPokemon
 
             Dim a As Double = 1D
@@ -998,13 +1002,30 @@
             Dim b As Double = op.BaseExperience
 
             Dim t As Double = 1D
-            If p.OT <> Core.Player.OT Then
-                t = 1.5D
+            If Not p.Item Is Nothing AndAlso p.Item.IsGameModeItem = True Then
+                If CType(p.Item, GameModeItem).gmExpMultiplier <> -1D AndAlso CType(p.Item, GameModeItem).gmOverrideTradeExp = True Then
+                    t = CType(p.Item, GameModeItem).gmExpMultiplier
+                Else
+                    If p.OT <> Core.Player.OT Then
+                        t = 1.5D
+                    End If
+                End If
+            Else
+                If p.OT <> Core.Player.OT Then
+                    t = 1.5D
+                End If
+            End If
+
+            Dim gm As Double = 1D
+            If Not p.Item Is Nothing AndAlso p.Item.IsGameModeItem = True Then
+                If CType(p.Item, GameModeItem).gmExpMultiplier <> -1D AndAlso CType(p.Item, GameModeItem).gmOverrideTradeExp = False Then
+                    gm = CType(p.Item, GameModeItem).gmExpMultiplier
+                End If
             End If
 
             Dim e As Double = 1D
             If Not p.Item Is Nothing Then
-                If p.Item.Name.ToLower() = "lucky egg" Then
+                If p.Item.OriginalName.ToLower() = "lucky egg" Then
                     e = 1.5D
                 End If
             End If
@@ -1015,25 +1036,33 @@
             Dim s As Double = PokemonList.Count
 
             Dim expShares As Integer = 0
-            For Each po As Pokemon In Core.Player.Pokemons
-                If Not po.Item Is Nothing Then
-                    If po.Item.Name.ToLower() = "exp share" Then
-                        expShares += 1
-                    End If
+            Dim expAllMultiplier As Single = 1
+            If Core.Player.Inventory.GetItemAmount(658.ToString) > 0 And Core.Player.EnableExpAll = True Then
+                s = 1D
+                If BattleScreen.ParticipatedPokemon.Contains(PokeIndex) = False Then
+                    expAllMultiplier = 0.5F
                 End If
-            Next
+            Else
+                For Each po As Pokemon In Core.Player.Pokemons
+                    If Not po.Item Is Nothing Then
+                        If po.Item.OriginalName.ToLower() = "exp. share" Then
+                            expShares += 1
+                        End If
+                    End If
+                Next
 
-            If expShares > 0 Then
-                If Not p.Item Is Nothing Then
-                    If p.Item.Name.ToLower() = "exp share" Then
-                        s = 2D
-                    Else
-                        s = (PokemonList.Count * 2D) * expShares
+                If expShares > 0 Then
+                    If Not p.Item Is Nothing Then
+                        If p.Item.OriginalName.ToLower() = "exp. share" Then
+                            s = 2D
+                        Else
+                            s = (PokemonList.Count * 2D) * expShares
+                        End If
                     End If
                 End If
             End If
 
-            Dim EXP As Integer = CInt((((a * b * L) / (5 * s)) * (((2 * L + 10) ^ 2.5D) / ((L + Lp + 10) ^ 2.5D)) + 1) * t * e * 1)
+            Dim EXP As Integer = CInt((((a * b * L) / (5 * s)) * (((2 * L + 10) ^ 2.5D) / ((L + Lp + 10) ^ 2.5D)) + 1) * t * e * gm * expAllMultiplier)
 
             If EXP < 2 Then
                 EXP = 2
@@ -1045,6 +1074,10 @@
                 End If
             Next
 
+            If Core.Player.Inventory.GetItemAmount(656.ToString) > 0 Then 'Exp. Charm
+                EXP = CInt(EXP * 1.5F)
+            End If
+
             Return EXP
         End Function
 
@@ -1106,7 +1139,7 @@
 
                 With BattleScreen
                     If Not .OwnPokemon.Item Is Nothing Then
-                        If .OwnPokemon.Item.Name.ToLower() = "shed shell" And .FieldEffects.CanUseItem(True) = True And .FieldEffects.CanUseOwnItem(True, BattleScreen) = True Then
+                        If .OwnPokemon.Item.OriginalName.ToLower() = "shed shell" And .FieldEffects.CanUseItem(True) = True And .FieldEffects.CanUseOwnItem(True, BattleScreen) = True Then
                             Return True
                         End If
                     End If
@@ -1154,7 +1187,7 @@
 
                 With BattleScreen
                     If Not .OppPokemon.Item Is Nothing Then
-                        If .OppPokemon.Item.Name.ToLower() = "shed shell" And .FieldEffects.CanUseItem(False) = True And .FieldEffects.CanUseOwnItem(False, BattleScreen) = True Then
+                        If .OppPokemon.Item.OriginalName.ToLower() = "shed shell" And .FieldEffects.CanUseItem(False) = True And .FieldEffects.CanUseOwnItem(False, BattleScreen) = True Then
                             Return True
                         End If
                     End If
@@ -1222,7 +1255,7 @@
 
             'IT (Item attack power modifier)
             If Not p.Item Is Nothing And BattleScreen.FieldEffects.CanUseItem(Own) = True And BattleScreen.FieldEffects.CanUseOwnItem(Own, BattleScreen) = True Then
-                Select Case p.Item.Name.ToLower()
+                Select Case p.Item.OriginalName.ToLower()
                     Case "muscle band"
                         If Attack.Category = Attack.Categories.Physical Then
                             IT = 1.1F
@@ -1686,7 +1719,7 @@
                 End Select
 
                 If Not p.Item Is Nothing And BattleScreen.FieldEffects.CanUseItem(Own) = True And BattleScreen.FieldEffects.CanUseOwnItem(Own, BattleScreen) = True Then
-                    Select Case p.Item.Name.ToLower()
+                    Select Case p.Item.OriginalName.ToLower()
                         Case "choice band"
                             IM = 1.5F
                         Case "light ball"
@@ -1731,7 +1764,7 @@
                 End Select
 
                 If Not p.Item Is Nothing And BattleScreen.FieldEffects.CanUseItem(Own) = True And BattleScreen.FieldEffects.CanUseOwnItem(Own, BattleScreen) = True Then
-                    Select Case p.Item.Name.ToLower()
+                    Select Case p.Item.OriginalName.ToLower()
                         Case "choice specs"
                             IM = 1.5F
                         Case "light ball"
@@ -1814,7 +1847,7 @@
                 End If
 
                 If Not Op.Item Is Nothing And BattleScreen.FieldEffects.CanUseItem(Not Own) = True And BattleScreen.FieldEffects.CanUseOwnItem(Not Own, BattleScreen) = True Then
-                    Select Case Op.Item.Name.ToLower()
+                    Select Case Op.Item.OriginalName.ToLower()
                         Case "metal powder"
                             If Op.Number = 132 Then
                                 DMod = 1.5F
@@ -1857,7 +1890,7 @@
                 End If
 
                 If Not Op.Item Is Nothing And BattleScreen.FieldEffects.CanUseItem(Not Own) = True And BattleScreen.FieldEffects.CanUseOwnItem(Not Own, BattleScreen) = True Then
-                    Select Case Op.Item.Name.ToLower()
+                    Select Case Op.Item.OriginalName.ToLower()
                         Case "metal powder"
                             If Op.Number = 132 Then
                                 DMod = 1.5F
@@ -1963,15 +1996,15 @@
                     End If
                 Case Element.Types.Electric
                     If BattleScreen.FieldEffects.ElectricTerrain > 0 And BattleScreen.FieldEffects.IsGrounded(Own, BattleScreen) = True Then
-                        SR = 1.5F
+                        SR = 1.3F
                     End If
                 Case Element.Types.Grass
                     If BattleScreen.FieldEffects.GrassyTerrain > 0 And BattleScreen.FieldEffects.IsGrounded(Own, BattleScreen) = True Then
-                        SR = 1.5F
+                        SR = 1.3F
                     End If
                 Case Element.Types.Psychic
                     If BattleScreen.FieldEffects.PsychicTerrain > 0 And BattleScreen.FieldEffects.IsGrounded(Own, BattleScreen) = True Then
-                        SR = 1.5F
+                        SR = 1.3F
                     End If
             End Select
 
@@ -2022,7 +2055,7 @@
             Dim Mod2 As Single = 1.0F
 
             If Not p.Item Is Nothing And BattleScreen.FieldEffects.CanUseItem(Own) = True And BattleScreen.FieldEffects.CanUseOwnItem(Own, BattleScreen) = True Then
-                If p.Item.Name.ToLower() = "life orb" Then
+                If p.Item.OriginalName.ToLower() = "life orb" Then
                     Mod2 = 1.3F
                 End If
             End If
@@ -2066,14 +2099,14 @@
                 End If
 
                 If Not p.Item Is Nothing And BattleScreen.FieldEffects.CanUseItem(Own) = True And BattleScreen.FieldEffects.CanUseOwnItem(Own, BattleScreen) = True Then
-                    If p.Item.Name.ToLower() = "expert belt" Then
+                    If p.Item.OriginalName.ToLower() = "expert belt" Then
                         EB = 1.2F
                     End If
                 End If
 
                 If Not Op.Item Is Nothing Then
                     If BattleScreen.FieldEffects.CanUseItem(Not Own) = True And BattleScreen.FieldEffects.CanUseOwnItem(Not Own, BattleScreen) = True Then
-                        Select Case Op.Item.Name.ToLower()
+                        Select Case Op.Item.OriginalName.ToLower()
                             Case "occa"
                                 If Attack.Type.Type = Element.Types.Fire Then
                                     If BattleScreen.Battle.RemoveHeldItem(Not Own, Not Own, BattleScreen, "The Occa Berry weakened the effect of " & Attack.Name & " on " & Op.GetDisplayName() & "!", "berry:occa") = True Then
@@ -2183,7 +2216,7 @@
 
             If Not Op.Item Is Nothing Then
                 If BattleScreen.FieldEffects.CanUseItem(Not Own) = True And BattleScreen.FieldEffects.CanUseOwnItem(Not Own, BattleScreen) = True Then
-                    If Op.Item.Name.ToLower() = "chilan" Then
+                    If Op.Item.OriginalName.ToLower() = "chilan" Then
                         If Attack.Type.Type = Element.Types.Normal Then
                             If BattleScreen.Battle.RemoveHeldItem(Not Own, Not Own, BattleScreen, "The Chilan Berry weakened the effect of " & Attack.Name & " on " & Op.GetDisplayName() & "!", "berry:chilan") = True Then
                                 TRB = 0.5F

P3D/Battle/BattleSystemV2/BattleCameraV2.vb

@@ -214,15 +214,7 @@
         End Function
 
         Private Function GetBattleMapOffset() As Vector3
-            Dim v As New Vector3(0)
-            Dim s As Screen = Core.CurrentScreen
-            While s.Identification <> Screen.Identifications.BattleScreen And Not s.PreScreen Is Nothing
-                s = s.PreScreen
-            End While
-            If s.Identification = Screen.Identifications.BattleScreen Then
-                v = CType(s, BattleScreen).BattleMapOffset
-            End If
-            Return v
+            Return BattleScreen.BattleMapOffset
         End Function
 
         Public Overrides ReadOnly Property CPosition() As Vector3

P3D/Battle/BattleSystemV2/BattleMenu.vb

@@ -7,11 +7,18 @@
             Moves
         End Enum
 
+        Public CanInteract As Boolean = True
         Public MenuState As MenuStates = MenuStates.Main
         Public Visible As Boolean = False
 
         Public Sub New()
             Me.Reset()
+            Dim blockinteractscreen() As Screen.Identifications = {Screen.Identifications.PartyScreen, Screen.Identifications.SummaryScreen, Screen.Identifications.PauseScreen, Screen.Identifications.ChatScreen}
+            If blockinteractscreen.Contains(Core.CurrentScreen.Identification) = True Then
+                CanInteract = False
+            Else
+                CanInteract = True
+            End If
         End Sub
 
         Public Sub Reset()
@@ -50,7 +57,7 @@
 
             If y > -1 Then
                 Core.SpriteBatch.Draw(TextureManager.GetTexture("GUI\Battle\WeatherIcons"), New Rectangle(22, Core.windowSize.Height - 90, 176, 68), New Rectangle(x, y, 88, 34), Color.White)
-                Core.SpriteBatch.DrawString(FontManager.MiniFont, t, New Vector2(110 - FontManager.MiniFont.MeasureString(t).X / 2, Core.windowSize.Height - 44), Color.Black)
+                Core.SpriteBatch.DrawString(FontManager.MainFont, t, New Vector2(110 - FontManager.MainFont.MeasureString(t).X / 2, Core.windowSize.Height - 44), Color.Black)
             End If
         End Sub
 
@@ -84,7 +91,7 @@
 
             If y > -1 Then
                 Core.SpriteBatch.Draw(TextureManager.GetTexture("GUI\Battle\WeatherIcons"), New Rectangle(222, Core.windowSize.Height - 90, 176, 68), New Rectangle(x, y, 88, 34), Color.White)
-                Core.SpriteBatch.DrawString(FontManager.MiniFont, t, New Vector2(310 - FontManager.MiniFont.MeasureString(t).X / 2, Core.windowSize.Height - 44), Color.Black)
+                Core.SpriteBatch.DrawString(FontManager.MainFont, t, New Vector2(310 - FontManager.MainFont.MeasureString(t).X / 2, Core.windowSize.Height - 44), Color.Black)
             End If
         End Sub
 
@@ -104,21 +111,21 @@
                 Core.SpriteBatch.Draw(TextureManager.GetTexture("GUI\Battle\Interface"), New Rectangle(CInt(pos.X) + 14, CInt(pos.Y) + 14, 182, 42), New Rectangle(0, 0, 91, 21), shinyHue)
 
                 'Name:
-                Dim nameInformation As String = p.GetDisplayName() & " Lv. " & p.Level.ToString()
+                Dim nameInformation As String = p.GetDisplayName() & " " & Localization.GetString("property_Lv.", "Lv.") & " " & p.Level.ToString()
 
-                Core.SpriteBatch.DrawString(FontManager.MiniFont, nameInformation, New Vector2(pos.X + 2, pos.Y + 2), New Color(0, 0, 0, _moveMenuAlpha))
-                Core.SpriteBatch.DrawString(FontManager.MiniFont, nameInformation, New Vector2(pos.X, pos.Y), shinyHue)
+                Core.SpriteBatch.DrawString(FontManager.MainFont, nameInformation, New Vector2(pos.X + 2, pos.Y + 2), New Color(0, 0, 0, _moveMenuAlpha))
+                Core.SpriteBatch.DrawString(FontManager.MainFont, nameInformation, New Vector2(pos.X, pos.Y), shinyHue)
 
                 'Gender:
                 If p.Gender = Pokemon.Genders.Male Then
-                    Core.SpriteBatch.Draw(TextureManager.GetTexture("GUI\Battle\Interface"), New Rectangle(CInt(pos.X + 6 + FontManager.MiniFont.MeasureString(nameInformation).X), CInt(pos.Y), 12, 20), New Rectangle(0, 104, 6, 10), New Color(255, 255, 255, _moveMenuAlpha))
+                    Core.SpriteBatch.Draw(TextureManager.GetTexture("GUI\Battle\Interface"), New Rectangle(CInt(pos.X + 6 + FontManager.MainFont.MeasureString(nameInformation).X), CInt(pos.Y), 12, 20), New Rectangle(0, 104, 6, 10), New Color(255, 255, 255, _moveMenuAlpha))
                 ElseIf p.Gender = Pokemon.Genders.Female Then
-                    Core.SpriteBatch.Draw(TextureManager.GetTexture("GUI\Battle\Interface"), New Rectangle(CInt(pos.X + 6 + FontManager.MiniFont.MeasureString(nameInformation).X), CInt(pos.Y), 12, 20), New Rectangle(6, 104, 6, 10), New Color(255, 255, 255, _moveMenuAlpha))
+                    Core.SpriteBatch.Draw(TextureManager.GetTexture("GUI\Battle\Interface"), New Rectangle(CInt(pos.X + 6 + FontManager.MainFont.MeasureString(nameInformation).X), CInt(pos.Y), 12, 20), New Rectangle(6, 104, 6, 10), New Color(255, 255, 255, _moveMenuAlpha))
                 End If
 
                 'HP indicator:
-                Core.SpriteBatch.DrawString(FontManager.MiniFont, p.HP & "/" & p.MaxHP, New Vector2(pos.X + 102, pos.Y + 37 + 3), New Color(0, 0, 0, _moveMenuAlpha))
-                Core.SpriteBatch.DrawString(FontManager.MiniFont, p.HP & "/" & p.MaxHP, New Vector2(pos.X + 100, pos.Y + 35 + 3), shinyHue)
+                Core.SpriteBatch.DrawString(FontManager.MainFont, p.HP & "/" & p.MaxHP, New Vector2(pos.X + 102, pos.Y + 37 + 3), New Color(0, 0, 0, _moveMenuAlpha))
+                Core.SpriteBatch.DrawString(FontManager.MainFont, p.HP & "/" & p.MaxHP, New Vector2(pos.X + 100, pos.Y + 35 + 3), shinyHue)
 
                 'EXP Bar:
                 If BattleScreen.CanReceiveEXP = True Then
@@ -151,7 +158,7 @@
 
                             Dim t = TextureManager.GetTexture("GUI\Battle\Interface")
                             For dX As Integer = 0 To EXPlength Step 4
-                                Core.SpriteBatch.Draw(t, New Rectangle(CInt(pos.X) + 50 + dX, CInt(pos.Y) + 54, 4, 6), New Rectangle(0, 43, 2, 3), New Color(255, 255, 255, _moveMenuAlpha))
+                                Core.SpriteBatch.Draw(t, New Rectangle(CInt(pos.X) + 50 + dX, CInt(pos.Y) + 64, 4, 6), New Rectangle(0, 43, 2, 3), New Color(255, 255, 255, _moveMenuAlpha))
                             Next
                         End If
                     End If
@@ -161,16 +168,16 @@
                 Core.SpriteBatch.Draw(TextureManager.GetTexture("GUI\Battle\Interface"), New Rectangle(CInt(pos.X) + 14, CInt(pos.Y) + 14, 182, 32), New Rectangle(0, 21, 91, 16), shinyHue)
 
                 'Name:
-                Dim nameInformation As String = p.GetDisplayName() & " Lv. " & p.Level.ToString()
+                Dim nameInformation As String = p.GetDisplayName() & " " & Localization.GetString("property_Lv.", "Lv.") & " " & p.Level.ToString()
 
-                Core.SpriteBatch.DrawString(FontManager.MiniFont, nameInformation, New Vector2(pos.X + 2, pos.Y + 2), New Color(0, 0, 0, _moveMenuAlpha))
-                Core.SpriteBatch.DrawString(FontManager.MiniFont, nameInformation, New Vector2(pos.X, pos.Y), shinyHue)
+                Core.SpriteBatch.DrawString(FontManager.MainFont, nameInformation, New Vector2(pos.X + 2, pos.Y + 2), New Color(0, 0, 0, _moveMenuAlpha))
+                Core.SpriteBatch.DrawString(FontManager.MainFont, nameInformation, New Vector2(pos.X, pos.Y), shinyHue)
 
                 'Gender:
                 If p.Gender = Pokemon.Genders.Male Then
-                    Core.SpriteBatch.Draw(TextureManager.GetTexture("GUI\Battle\Interface"), New Rectangle(CInt(pos.X + 6 + FontManager.MiniFont.MeasureString(nameInformation).X), CInt(pos.Y), 12, 20), New Rectangle(0, 104, 6, 10), New Color(255, 255, 255, _moveMenuAlpha))
+                    Core.SpriteBatch.Draw(TextureManager.GetTexture("GUI\Battle\Interface"), New Rectangle(CInt(pos.X + 6 + FontManager.MainFont.MeasureString(nameInformation).X), CInt(pos.Y), 12, 20), New Rectangle(0, 104, 6, 10), New Color(255, 255, 255, _moveMenuAlpha))
                 ElseIf p.Gender = Pokemon.Genders.Female Then
-                    Core.SpriteBatch.Draw(TextureManager.GetTexture("GUI\Battle\Interface"), New Rectangle(CInt(pos.X + 6 + FontManager.MiniFont.MeasureString(nameInformation).X), CInt(pos.Y), 12, 20), New Rectangle(6, 104, 6, 10), New Color(255, 255, 255, _moveMenuAlpha))
+                    Core.SpriteBatch.Draw(TextureManager.GetTexture("GUI\Battle\Interface"), New Rectangle(CInt(pos.X + 6 + FontManager.MainFont.MeasureString(nameInformation).X), CInt(pos.Y), 12, 20), New Rectangle(6, 104, 6, 10), New Color(255, 255, 255, _moveMenuAlpha))
                 End If
             End If
 
@@ -193,9 +200,9 @@
             End If
 
             Dim cX As Integer = 0
-            If HPpercentage <= 50.0F And HPpercentage > 15.0F Then
+            If HPpercentage <= 75.0F And HPpercentage > 25.0F Then
                 cX = 2
-            ElseIf HPpercentage <= 15.0F Then
+            ElseIf HPpercentage <= 25.0F Then
                 cX = 4
             End If
 
@@ -213,7 +220,9 @@
             End If
 
             If DrawCaught = True Then
-                If Pokedex.GetEntryType(Core.Player.PokedexData, p.Number) > 1 Then
+                Dim dexID As String = PokemonForms.GetPokemonDataFileName(p.Number, p.AdditionalData, True)
+
+                If Pokedex.GetEntryType(Core.Player.PokedexData, dexID) > 1 Then
                     Core.SpriteBatch.Draw(TextureManager.GetTexture("GUI\Battle\Interface"), New Rectangle(CInt(pos.X) + caughtX, CInt(pos.Y) + 22, 20, 20), New Rectangle(0, 46, 10, 10), New Color(255, 255, 255, _moveMenuAlpha))
                 End If
             End If
@@ -307,12 +316,20 @@
         End Sub
 
         Public Sub Update(ByRef BattleScreen As BattleScreen)
-            Select Case MenuState
-                Case MenuStates.Main
-                    UpdateMainMenu(BattleScreen)
-                Case MenuStates.Moves
-                    UpdateMoveMenu(BattleScreen)
-            End Select
+            Dim blockinteractscreen() As Screen.Identifications = {Screen.Identifications.PartyScreen, Screen.Identifications.SummaryScreen, Screen.Identifications.PauseScreen, Screen.Identifications.ChatScreen}
+            If blockinteractscreen.Contains(Core.CurrentScreen.Identification) = True OrElse (BattleScreen.BattleQuery.Count > 0 AndAlso BattleScreen.BattleQuery(0).QueryType = QueryObject.QueryTypes.Textbox) Then
+                CanInteract = False
+            Else
+                CanInteract = True
+            End If
+            If CanInteract = True Then
+                Select Case MenuState
+                    Case MenuStates.Main
+                        UpdateMainMenu(BattleScreen)
+                    Case MenuStates.Moves
+                        UpdateMoveMenu(BattleScreen)
+                End Select
+            End If
         End Sub
 
         Private _allItemsExtended As Integer = 0
@@ -325,6 +342,7 @@
 
         Private _moveMenuIndex As Integer = 0
         Private _moveMenuNextIndex As Integer = 0
+        Private _moveMenuLastIndex As Integer = 0
         Private _moveMenuItemList As New List(Of MoveMenuItem)
         Private _moveMenuCreatedID As String = ""
         Private _moveMenuAlpha As Integer = 255
@@ -374,20 +392,20 @@
             Public Sub Draw(ByVal AllExtended As Integer, ByVal SelExtended As Integer, ByVal isSelected As Boolean)
                 Dim extraExtended As Integer = 0
                 If isSelected = True Then
-                    Canvas.DrawGradient(New Rectangle(Core.ScreenSize.Width - 255, 100 + Index * 96, 255, 112), New Color(42, 167, 198, 0), New Color(42, 167, 198, (SelExtended + AllExtended)), True, -1)
+                    Canvas.DrawGradient(New Rectangle(Core.windowSize.Width - 255, 100 + Index * 96, 255, 112), New Color(42, 167, 198, 0), New Color(42, 167, 198, (SelExtended + AllExtended)), True, -1)
 
                     extraExtended = SelExtended
                 End If
-                Core.SpriteBatch.Draw(Me.Texture, New Rectangle(Core.ScreenSize.Width - (AllExtended + extraExtended), 116 + Index * 96, 80, 80), New Rectangle(16, 16, 16, 16), Color.White)
-                Core.SpriteBatch.Draw(Me.Texture, New Rectangle(Core.ScreenSize.Width - (AllExtended + extraExtended) + 80, 116 + Index * 96, AllExtended + extraExtended - 80, 80), New Rectangle(32, 16, 16, 16), Color.White)
+                Core.SpriteBatch.Draw(Me.Texture, New Rectangle(Core.windowSize.Width - (AllExtended + extraExtended), 116 + Index * 96, 80, 80), New Rectangle(16, 16, 16, 16), Color.White)
+                Core.SpriteBatch.Draw(Me.Texture, New Rectangle(Core.windowSize.Width - (AllExtended + extraExtended) + 80, 116 + Index * 96, AllExtended + extraExtended - 80, 80), New Rectangle(32, 16, 16, 16), Color.White)
 
-                Core.SpriteBatch.Draw(Me.IconUnselected, New Rectangle(Core.ScreenSize.Width - (AllExtended + extraExtended) + 28, 132 + Index * 96, 48, 48), Color.White)
+                Core.SpriteBatch.Draw(Me.IconUnselected, New Rectangle(Core.windowSize.Width - (AllExtended + extraExtended) + 28, 132 + Index * 96, 48, 48), Color.White)
                 If isSelected = True Then
-                    Core.SpriteBatch.Draw(Me.IconSelected, New Rectangle(Core.ScreenSize.Width - (AllExtended + extraExtended) + 28, 132 + Index * 96, 48, 48), New Color(255, 255, 255, (SelExtended + AllExtended)))
-                    Core.SpriteBatch.DrawString(FontManager.MainFont, Me.Text, New Vector2(CInt(Core.ScreenSize.Width - (AllExtended + extraExtended) + 86), CInt(144 + Index * 96)), New Color(0, 0, 0, (SelExtended + AllExtended)))
+                    Core.SpriteBatch.Draw(Me.IconSelected, New Rectangle(Core.windowSize.Width - (AllExtended + extraExtended) + 28, 132 + Index * 96, 48, 48), New Color(255, 255, 255, (SelExtended + AllExtended)))
+                    Core.SpriteBatch.DrawString(FontManager.MainFont, Me.Text, New Vector2(CInt(Core.windowSize.Width - (AllExtended + extraExtended) + 86), CInt(144 + Index * 96)), New Color(0, 0, 0, (SelExtended + AllExtended)))
                 Else
                     If IconFading > 0 Then
-                        Core.SpriteBatch.Draw(Me.IconSelected, New Rectangle(Core.ScreenSize.Width - (AllExtended) + 28, 132 + Index * 96, 48, 48), New Color(255, 255, 255, IconFading))
+                        Core.SpriteBatch.Draw(Me.IconSelected, New Rectangle(Core.windowSize.Width - (AllExtended) + 28, 132 + Index * 96, 48, 48), New Color(255, 255, 255, IconFading))
                     End If
                 End If
             End Sub
@@ -395,7 +413,7 @@
             Public Sub Update(ByVal BattleScreen As BattleScreen, ByVal AllExtended As Integer, ByVal isSelected As Boolean)
                 Me.Activate(BattleScreen, AllExtended, isSelected)
                 If isSelected = False Then
-                    If MouseHandler.IsInRectangle(New Rectangle(Core.ScreenSize.Width - (AllExtended) + 28, 132 + Index * 96, 48, 48)) = True Then
+                    If MouseHandler.IsInRectangle(New Rectangle(Core.windowSize.Width - (AllExtended) + 28, 132 + Index * 96, 48, 48)) = True Then
                         If IconFading < 255 Then
                             IconFading += 15
                             If IconFading > 255 Then
@@ -422,7 +440,7 @@
                         Me.ClickAction(BattleScreen)
                     End If
                     If Controls.Accept(True, False, False) = True Then
-                        If MouseHandler.IsInRectangle(New Rectangle(Core.ScreenSize.Width - 255, 116 + Index * 96, 255, 80)) = True Then
+                        If MouseHandler.IsInRectangle(New Rectangle(Core.windowSize.Width - 255, 116 + Index * 96, 255, 80)) = True Then
                             If isSelected = True Then
                                 SoundManager.PlaySound("select")
                                 Me.ClickAction(BattleScreen)
@@ -458,23 +476,31 @@
 
                 Dim extraExtended As Integer = 0
                 If isSelected = True Then
-                    Canvas.DrawGradient(New Rectangle(Core.ScreenSize.Width - 255, 100 + Index * 96, 255, 112), New Color(42, 167, 198, 0), New Color(42, 167, 198, (SelExtended + AllExtended) - deductAlpha), True, -1)
+                    Canvas.DrawGradient(New Rectangle(Core.windowSize.Width - 255, 100 + Index * 96, 255, 112), New Color(42, 167, 198, 0), New Color(42, 167, 198, (SelExtended + AllExtended) - deductAlpha), True, -1)
 
                     extraExtended = SelExtended
                 End If
-                Core.SpriteBatch.Draw(Me.Texture, New Rectangle(Core.ScreenSize.Width - (AllExtended + extraExtended), 116 + Index * 96, 80, 80), New Rectangle(16, 16, 16, 16), New Color(255, 255, 255, 255 - deductAlpha))
-                Core.SpriteBatch.Draw(Me.Texture, New Rectangle(Core.ScreenSize.Width - (AllExtended + extraExtended) + 80, 116 + Index * 96, AllExtended + extraExtended - 80, 80), New Rectangle(32, 16, 16, 16), New Color(255, 255, 255, 255 - deductAlpha))
+                Dim BackgroundDrawColor As Color = Color.White
+                If Move.Disabled > 0 OrElse BattleScreen.FieldEffects.OwnEncore > 0 AndAlso BattleScreen.FieldEffects.OwnEncoreMove.ID <> Move.ID Then
+                    BackgroundDrawColor = New Color(210, 210, 210)
+                End If
+                Core.SpriteBatch.Draw(Me.Texture, New Rectangle(Core.windowSize.Width - (AllExtended + extraExtended), 116 + Index * 96, 80, 80), New Rectangle(16, 16, 16, 16), New Color(BackgroundDrawColor.R, BackgroundDrawColor.G, BackgroundDrawColor.B, 255 - deductAlpha))
+                Core.SpriteBatch.Draw(Me.Texture, New Rectangle(Core.windowSize.Width - (AllExtended + extraExtended) + 80, 116 + Index * 96, AllExtended + extraExtended - 80, 80), New Rectangle(32, 16, 16, 16), New Color(BackgroundDrawColor.R, BackgroundDrawColor.G, BackgroundDrawColor.B, 255 - deductAlpha))
 
-                Core.SpriteBatch.Draw(TextureManager.GetTexture("GUI\Menus\Types", Me.Move.Type.GetElementImage(), ""), New Rectangle(Core.ScreenSize.Width - (AllExtended + extraExtended) + 28, 132 + Index * 96, 48, 16), New Color(255, 255, 255, 255 - deductAlpha))
+                Core.SpriteBatch.Draw(TextureManager.GetTexture(Element.GetElementTexturePath(), Me.Move.Type.GetElementImage(), ""), New Rectangle(Core.windowSize.Width - (AllExtended + extraExtended) + 28, 132 + Index * 96, 48, 16), New Color(255, 255, 255, 255 - deductAlpha))
 
                 If isSelected = True Then
-                    Dim ppColor As Color = GetPPColor()
-                    ppColor.A = CByte((extraExtended + AllExtended - deductAlpha).Clamp(0, 255))
+                    If Move.Disabled > 0 OrElse BattleScreen.FieldEffects.OwnEncore > 0 AndAlso BattleScreen.FieldEffects.OwnEncoreMove.ID <> Move.ID Then
+                        Core.SpriteBatch.DrawString(FontManager.MainFont, Localization.GetString("battle_MoveDisabled", "Disabled!"), New Vector2(CInt(Core.windowSize.Width - (AllExtended + extraExtended) + 28), CInt(152 + Index * 96)), Color.Black)
+                    Else
+                        Dim ppColor As Color = GetPPColor()
+                        ppColor.A = CByte((extraExtended + AllExtended - deductAlpha).Clamp(0, 255))
 
-                    Core.SpriteBatch.DrawString(FontManager.MainFont, Me.Move.CurrentPP & "/" & Me.Move.MaxPP, New Vector2(CInt(Core.ScreenSize.Width - (AllExtended + extraExtended) + 28), CInt(152 + Index * 96)), ppColor)
-                    Core.SpriteBatch.DrawString(FontManager.MainFont, Me.Move.Name, New Vector2(CInt(Core.ScreenSize.Width - (AllExtended + extraExtended) + 86), CInt(132 + Index * 96)), New Color(0, 0, 0, (SelExtended + AllExtended) - deductAlpha))
+                        Core.SpriteBatch.DrawString(FontManager.MainFont, Me.Move.CurrentPP & "/" & Me.Move.MaxPP, New Vector2(CInt(Core.windowSize.Width - (AllExtended + extraExtended) + 28), CInt(152 + Index * 96)), ppColor)
+                    End If
+                    Core.SpriteBatch.DrawString(FontManager.MainFont, Me.Move.Name, New Vector2(CInt(Core.windowSize.Width - (AllExtended + extraExtended) + 86), CInt(132 + Index * 96)), New Color(0, 0, 0, (SelExtended + AllExtended) - deductAlpha))
                 Else
-                    Core.SpriteBatch.DrawString(FontManager.MainFont, Me.Move.Name, New Vector2(Core.ScreenSize.Width - (AllExtended + extraExtended) + 28, 152 + Index * 96), New Color(0, 0, 0, 255 - (extraExtended + AllExtended) - deductAlpha))
+                    Core.SpriteBatch.DrawString(FontManager.MainFont, Me.Move.Name, New Vector2(Core.windowSize.Width - (AllExtended + extraExtended) + 28, 152 + Index * 96), New Color(0, 0, 0, 255 - (extraExtended + AllExtended) - deductAlpha))
                 End If
             End Sub
 
@@ -498,21 +524,30 @@
             Public Sub Activate(ByVal BattleScreen As BattleScreen, ByVal AllExtended As Integer, ByVal isSelected As Boolean)
                 If BattleScreen.BattleMenu._isExtracting = False And BattleScreen.BattleMenu._isRetracting = False Then
                     If Me.Move.CurrentPP > 0 Or isSelected = False Then
+
                         If Controls.Accept(False, True, True) = True And isSelected = True Then
                             SoundManager.PlaySound("select")
-                            Me.ClickAction(BattleScreen)
+                            If Me.Move.Disabled = 0 AndAlso BattleScreen.FieldEffects.OwnEncore = 0 OrElse BattleScreen.FieldEffects.OwnEncoreMove.ID = Move.ID Then
+                                BattleScreen.BattleMenu._moveMenuLastIndex = Me.Index
+                                Me.ClickAction(BattleScreen)
+                            End If
                         End If
                         If Controls.Accept(True, False, False) = True Then
-                            If MouseHandler.IsInRectangle(New Rectangle(Core.ScreenSize.Width - 255, 116 + Index * 96, 255, 80)) = True Then
+                            If MouseHandler.IsInRectangle(New Rectangle(Core.windowSize.Width - 255, 116 + Index * 96, 255, 80)) = True Then
                                 If isSelected = True Then
                                     SoundManager.PlaySound("select")
-                                    Me.ClickAction(BattleScreen)
+                                    If Me.Move.Disabled = 0 AndAlso BattleScreen.FieldEffects.OwnEncore = 0 OrElse BattleScreen.FieldEffects.OwnEncoreMove IsNot Nothing AndAlso BattleScreen.FieldEffects.OwnEncoreMove.ID = Move.ID Then
+                                        BattleScreen.BattleMenu._moveMenuLastIndex = Me.Index
+                                        Me.ClickAction(BattleScreen)
+                                    End If
                                 Else
                                     BattleScreen.BattleMenu._moveMenuNextIndex = Me.Index
+                                    BattleScreen.BattleMenu._moveMenuLastIndex = Me.Index
                                     BattleScreen.BattleMenu._isRetracting = True
                                 End If
                             End If
                         End If
+
                     End If
                 End If
             End Sub
@@ -612,7 +647,7 @@
                     TempBattleScreen = BattleScreen
 
                     Player.Temp.PokemonScreenIndex = BattleScreen.OwnPokemonIndex
-                    Dim selScreen = New PartyScreen(Core.CurrentScreen, Item.GetItemByID(5), AddressOf ShowPokemonMenu, "Choose Pokémon", False) With {.Mode = Screens.UI.ISelectionScreen.ScreenMode.Selection, .CanExit = False}
+                    Dim selScreen = New PartyScreen(Core.CurrentScreen, Item.GetItemByID(5.ToString), AddressOf ShowPokemonMenu, Localization.GetString("party_screen_ChoosePokemon", "Choose Pokémon"), False) With {.Mode = Screens.UI.ISelectionScreen.ScreenMode.Selection, .CanExit = False}
                     AddHandler selScreen.SelectedObject, AddressOf ShowPokemonMenuHandler
 
                     Core.SetScreen(selScreen)
@@ -632,33 +667,33 @@
             _mainMenuItemList.Clear()
             Select Case BattleScreen.BattleMode
                 Case BattleSystem.BattleScreen.BattleModes.Safari
-                    Dim safariBallText As String = "Safari Ball x" & Core.Player.Inventory.GetItemAmount(181).ToString()
-                    If Core.Player.Inventory.GetItemAmount(181) = 0 Then
-                        safariBallText = "No Safari Balls."
+                    Dim safariBallText As String = Localization.GetString("item_name_181", "Safari Ball") & " x" & Core.Player.Inventory.GetItemAmount(181.ToString).ToString()
+                    If Core.Player.Inventory.GetItemAmount(181.ToString) = 0 Then
+                        safariBallText = Localization.GetString("battle_NoSafariBalls", "No Safari Balls.")
                     End If
                     _mainMenuItemList.Add(New MainMenuItem(4, safariBallText, 0, AddressOf MainMenuUseSafariBall))
-                    _mainMenuItemList.Add(New MainMenuItem(0, "Throw Mud", 1, AddressOf MainMenuThrowMud))
-                    _mainMenuItemList.Add(New MainMenuItem(0, "Throw Bait", 2, AddressOf MainMenuThrowBait))
+                    _mainMenuItemList.Add(New MainMenuItem(0, Localization.GetString("battle_action_ThrowMud", "Throw Mud"), 1, AddressOf MainMenuThrowMud))
+                    _mainMenuItemList.Add(New MainMenuItem(0, Localization.GetString("battle_action_ThrowBait", "Throw Bait"), 2, AddressOf MainMenuThrowBait))
 
-                    _mainMenuItemList.Add(New MainMenuItem(3, "Run", 3, AddressOf MainMenuRun))
+                    _mainMenuItemList.Add(New MainMenuItem(3, Localization.GetString("battle_action_Run", "Run"), 3, AddressOf MainMenuRun))
 
                 Case BattleSystem.BattleScreen.BattleModes.BugContest
-                    _mainMenuItemList.Add(New MainMenuItem(0, "Battle", 0, AddressOf MainMenuOpenBattleMenu))
+                    _mainMenuItemList.Add(New MainMenuItem(0, Localization.GetString("battle_action_Battle", "Battle"), 0, AddressOf MainMenuOpenBattleMenu))
 
-                    Dim sportBallText As String = "Sport Ball x" & Core.Player.Inventory.GetItemAmount(177).ToString()
-                    If Core.Player.Inventory.GetItemAmount(177) = 0 Then
-                        sportBallText = "No Sport Balls."
+                    Dim sportBallText As String = Localization.GetString("item_name_177", "Sport Ball") & " x" & Core.Player.Inventory.GetItemAmount(177.ToString).ToString()
+                    If Core.Player.Inventory.GetItemAmount(177.ToString) = 0 Then
+                        sportBallText = Localization.GetString("battle_NoSportBalls", "No Sport Balls.")
                     End If
                     _mainMenuItemList.Add(New MainMenuItem(4, sportBallText, 1, AddressOf MainMenuUseSportBall))
                     _mainMenuItemList.Add(New MainMenuItem(1, "Pokémon", 2, AddressOf MainMenuOpenPokemon))
-                    _mainMenuItemList.Add(New MainMenuItem(3, "Run", 3, AddressOf MainMenuRun))
+                    _mainMenuItemList.Add(New MainMenuItem(3, Localization.GetString("battle_action_Run", "Run"), 3, AddressOf MainMenuRun))
 
                 Case BattleSystem.BattleScreen.BattleModes.Standard
                     If BattleScreen.OwnFaint Then
                         _mainMenuIndex = 0
                         _mainMenuNextIndex = 0
-                        _mainMenuItemList.Add(New MainMenuItem(1, "Pokémon", 0, AddressOf MainMenuOpenPokemon))
                         If BattleScreen.IsRemoteBattle AndAlso Not BattleScreen.IsHost Then
+                            _mainMenuItemList.Add(New MainMenuItem(1, "Pokémon", 0, AddressOf MainMenuOpenPokemon))
                             BattleScreen.OwnFaint = False
                         End If
                     ElseIf BattleScreen.OppFaint And BattleScreen.IsRemoteBattle Then
@@ -674,12 +709,12 @@
                         End If
                         BattleScreen.OppFaint = False
                     Else
-                        _mainMenuItemList.Add(New MainMenuItem(0, "Battle", 0, AddressOf MainMenuOpenBattleMenu))
+                        _mainMenuItemList.Add(New MainMenuItem(0, Localization.GetString("battle_action_Battle", "Battle"), 0, AddressOf MainMenuOpenBattleMenu))
                         _mainMenuItemList.Add(New MainMenuItem(1, "Pokémon", 1, AddressOf MainMenuOpenPokemon))
-                        _mainMenuItemList.Add(New MainMenuItem(2, "Bag", 2, AddressOf MainMenuOpenBag))
+                        _mainMenuItemList.Add(New MainMenuItem(2, Localization.GetString("battle_action_Bag", "Bag"), 2, AddressOf MainMenuOpenBag))
 
                         If BattleScreen.IsTrainerBattle = False Then
-                            _mainMenuItemList.Add(New MainMenuItem(3, "Run", 3, AddressOf MainMenuRun))
+                            _mainMenuItemList.Add(New MainMenuItem(3, Localization.GetString("battle_action_Run", "Run"), 3, AddressOf MainMenuRun))
                             MainMenuAddMegaEvolution(BattleScreen, 4)
                         Else
                             MainMenuAddMegaEvolution(BattleScreen, 3)
@@ -687,16 +722,16 @@
                     End If
 
                 Case BattleSystem.BattleScreen.BattleModes.PVP
-                    _mainMenuItemList.Add(New MainMenuItem(0, "Battle", 0, AddressOf MainMenuOpenBattleMenu))
+                    _mainMenuItemList.Add(New MainMenuItem(0, Localization.GetString("battle_action_Battle", "Battle"), 0, AddressOf MainMenuOpenBattleMenu))
                     _mainMenuItemList.Add(New MainMenuItem(1, "Pokémon", 1, AddressOf MainMenuOpenPokemon))
-                    _mainMenuItemList.Add(New MainMenuItem(3, "Surrender", 2, AddressOf MainMenuOpenBag))
+                    _mainMenuItemList.Add(New MainMenuItem(3, Localization.GetString("battle_action_Surrender", "Surrender"), 2, AddressOf MainMenuOpenBag))
             End Select
         End Sub
 
         Private Sub MainMenuAddMegaEvolution(ByVal BattleScreen As BattleScreen, ByVal Index As Integer)
 
             'Checks if the player has the Mega Bracelet.
-            If Not (Core.Player.Inventory.GetItemAmount(576) > 0) Then
+            If Not (Core.Player.Inventory.GetItemAmount(576.ToString) > 0) Then
                 Exit Sub
             End If
 
@@ -719,12 +754,19 @@
             'Next
             Dim PokeIndex As Integer = BattleScreen.OwnPokemonIndex
             If BattleScreen.FieldEffects.OwnMegaEvolved = False Then
-                If Not Core.Player.Pokemons(PokeIndex).Item Is Nothing Then
-                    If Core.Player.Pokemons(PokeIndex).Item.IsMegaStone = True Then
-                        Dim megaStone = CType(Core.Player.Pokemons(PokeIndex).Item, Items.MegaStone)
-
-                        If megaStone.MegaPokemonNumber = Core.Player.Pokemons(PokeIndex).Number Then
-                            _mainMenuItemList.Add(New MainMenuItem(5, "Mega Evolve!", Index, AddressOf MainMenuMegaEvolve))
+                If Core.Player.Pokemons(PokeIndex).Item IsNot Nothing Then
+                    If Core.Player.Pokemons(PokeIndex).Item.IsGameModeItem = True Then
+                        If Core.Player.Pokemons(PokeIndex).Item.gmIsMegaStone = True Then
+                            If Core.Player.Pokemons(PokeIndex).Number = CType(Core.Player.Pokemons(PokeIndex).Item, GameModeItem).gmMegaPokemonNumber Then
+                                _mainMenuItemList.Add(New MainMenuItem(5, Localization.GetString("battle_action_MegaEvolve", "Mega Evolve!"), Index, AddressOf MainMenuMegaEvolve))
+                            End If
+                        End If
+                    Else
+                        If Core.Player.Pokemons(PokeIndex).Item.IsMegaStone = True Then
+                            Dim megaStone = CType(Core.Player.Pokemons(PokeIndex).Item, Items.MegaStone)
+                            If megaStone.MegaPokemonNumber = Core.Player.Pokemons(PokeIndex).Number Then
+                                _mainMenuItemList.Add(New MainMenuItem(5, Localization.GetString("battle_action_MegaEvolve", "Mega Evolve!"), Index, AddressOf MainMenuMegaEvolve))
+                            End If
                         End If
                     End If
                 End If
@@ -738,7 +780,11 @@
         Private Sub MainMenuOpenBattleMenu(ByVal BattleScreen As BattleScreen)
             _retractMenu = True
             _nextMenuState = MenuStates.Moves
-
+            PartyScreen.Selected = -1
+            If _moveMenuIndex <> _moveMenuLastIndex Then
+                _moveMenuNextIndex = _moveMenuLastIndex
+                _moveMenuIndex = _moveMenuLastIndex
+            End If
             BattleScreen.BattleQuery.Clear()
             Dim q As New CameraQueryObject(New Vector3(11, 0.5F, 14.0F), New Vector3(11, 0.5F, 14.0F), Screen.Camera.Speed, Screen.Camera.Speed, -(CSng(MathHelper.PiOver4) + 0.3F), -(CSng(MathHelper.PiOver4) + 0.3F), -0.3F, -0.3F, 0.04F, 0.04F)
             BattleScreen.BattleQuery.AddRange({q})
@@ -748,7 +794,7 @@
             TempBattleScreen = BattleScreen
 
             Player.Temp.PokemonScreenIndex = BattleScreen.OwnPokemonIndex
-            Dim selScreen = New PartyScreen(Core.CurrentScreen, Item.GetItemByID(5), AddressOf ShowPokemonMenu, "Choose Pokémon", True) With {.Mode = Screens.UI.ISelectionScreen.ScreenMode.Selection, .CanExit = True}
+            Dim selScreen = New PartyScreen(Core.CurrentScreen, Item.GetItemByID(5.ToString), AddressOf ShowPokemonMenu, Localization.GetString("party_screen_ChoosePokemon", "Choose Pokémon"), True) With {.Mode = Screens.UI.ISelectionScreen.ScreenMode.Selection, .CanExit = True}
             AddHandler selScreen.SelectedObject, AddressOf ShowPokemonMenuHandler
 
             Core.SetScreen(selScreen)
@@ -778,39 +824,63 @@
                 Battle.Won = True
                 Battle.Fled = True
             Else
-                BattleScreen.BattleQuery.Clear()
-                BattleScreen.BattleQuery.Add(BattleScreen.FocusBattle())
-                BattleScreen.BattleQuery.Insert(0, New ToggleMenuQueryObject(True))
-                BattleScreen.Battle.InitializeRound(BattleScreen, New Battle.RoundConst With {.StepType = Battle.RoundConst.StepTypes.Text, .Argument = "Failed to run away."})
+                Dim Trapped As Boolean = False
+                Dim p As Pokemon = BattleScreen.OwnPokemon
+                Dim op As Pokemon = BattleScreen.OppPokemon
+
+                If op.Ability.Name.ToLower() = "shadow tag" And p.Ability.Name.ToLower() <> "shadow tag" And op.HP > 0 Then
+                    Trapped = True
+                End If
+
+                If op.Ability.Name.ToLower() = "arena trap" And op.HP > 0 And BattleScreen.FieldEffects.IsGrounded(True, BattleScreen) = True Then
+                    Trapped = True
+                End If
+
+                If op.Ability.Name.ToLower() = "magnet pull" And op.HP > 0 Then
+                    If p.Type1.Type = Element.Types.Steel Or p.Type2.Type = Element.Types.Steel Then
+                        Trapped = True
+                    End If
+                End If
+
+                If Trapped = True Then
+                    Screen.TextBox.Show(Localization.GetString("battle_cannot_run_ability", "Failed to run away because of~") & Localization.GetString("ability_name_" & op.Ability.ID.ToString, op.Ability.Name) & ".", {}, True, True)
+                Else
+                    BattleScreen.BattleQuery.Clear()
+                    BattleScreen.BattleQuery.Add(BattleScreen.FocusBattle())
+                    BattleScreen.BattleQuery.Insert(0, New ToggleMenuQueryObject(True))
+                    BattleScreen.Battle.InitializeRound(BattleScreen, New Battle.RoundConst With {.StepType = Battle.RoundConst.StepTypes.Text, .Argument = Localization.GetString("battle_cannot_run", "Failed to run away.")})
+                End If
             End If
         End Sub
 
         Private Sub MainMenuUseSafariBall(ByVal BattleScreen As BattleScreen)
-            If Core.Player.Inventory.GetItemAmount(181) > 0 Then
-                Core.Player.Inventory.RemoveItem(181, 1)
+            If Core.Player.Inventory.GetItemAmount(181.ToString) > 0 Then
+                Core.Player.Inventory.RemoveItem(181.ToString, 1)
                 BattleScreen.BattleQuery.Clear()
                 BattleScreen.BattleQuery.Add(BattleScreen.FocusBattle())
                 BattleScreen.BattleQuery.Insert(0, New ToggleMenuQueryObject(True))
-                Core.SetScreen(New BattleCatchScreen(BattleScreen, Item.GetItemByID(181)))
+                Core.SetScreen(New BattleCatchScreen(BattleScreen, Item.GetItemByID(181.ToString)))
 
-                Dim safariBallText As String = "Safari Ball x" & Core.Player.Inventory.GetItemAmount(181).ToString()
-                If Core.Player.Inventory.GetItemAmount(181) = 0 Then
-                    safariBallText = "No Safari Balls."
+                Core.Player.UsedItemsToCheckScriptDelayFor.Add("181")
+
+                Dim safariBallText As String = Localization.GetString("item_name_181", "Safari Ball") & " x" & Core.Player.Inventory.GetItemAmount(181.ToString).ToString()
+                If Core.Player.Inventory.GetItemAmount(181.ToString) = 0 Then
+                    safariBallText = Localization.GetString("battle_NoSafariBalls", "No Safari Balls.")
                 End If
                 _mainMenuItemList(0).Text = safariBallText
             End If
         End Sub
 
         Private Sub MainMenuUseSportBall(ByVal BattleScreen As BattleScreen)
-            If Core.Player.Inventory.GetItemAmount(177) > 0 Then
-                Core.Player.Inventory.RemoveItem(177, 1)
+            If Core.Player.Inventory.GetItemAmount(177.ToString) > 0 Then
+                Core.Player.Inventory.RemoveItem(177.ToString, 1)
                 BattleScreen.BattleQuery.Clear()
                 BattleScreen.BattleQuery.Add(BattleScreen.FocusBattle())
                 BattleScreen.BattleQuery.Insert(0, New ToggleMenuQueryObject(True))
-                Core.SetScreen(New BattleCatchScreen(BattleScreen, Item.GetItemByID(177)))
+                Core.SetScreen(New BattleCatchScreen(BattleScreen, Item.GetItemByID(177.ToString)))
 
-                Dim sportBallText As String = "Sport Ball x" & Core.Player.Inventory.GetItemAmount(177).ToString()
-                If Core.Player.Inventory.GetItemAmount(177) = 0 Then
+                Dim sportBallText As String = "Sport Ball x" & Core.Player.Inventory.GetItemAmount(177.ToString).ToString()
+                If Core.Player.Inventory.GetItemAmount(177.ToString) = 0 Then
                     sportBallText = "No Sport Balls."
                 End If
                 _mainMenuItemList(0).Text = sportBallText
@@ -874,22 +944,55 @@
                 _moveMenuItemList.Clear()
                 BattleScreen.ClearMoveMenuTime = False
             End If
+            If _moveMenuIndex > _moveMenuItemList.Count - 1 Then
+                _moveMenuIndex = 0
+                _moveMenuNextIndex = 0
+            End If
 
             If _moveMenuChoseMove = True Then
                 _moveMenuAlpha -= 15
                 If _moveMenuAlpha <= 0 Then
                     _moveMenuAlpha = 0
-                    MoveMenuStartRound(BattleScreen)
-                    Visible = False
+                    If BattleScreen.OwnPokemon.Attacks(_moveMenuIndex).SwapsOutOwnPokemon = True Then
+                        If PartyScreen.Selected = -1 Then
+                            Dim selScreen = New PartyScreen(Core.CurrentScreen, Item.GetItemByID(5.ToString), Nothing, Localization.GetString("party_screen_ChoosePokemon", "Choose Pokémon"), False, False, False) With {.Mode = Screens.UI.ISelectionScreen.ScreenMode.Selection, .CanExit = False, .SelectButtonText = Localization.GetString("global_switch", "Switch")}
+                            AddHandler selScreen.SelectedObject, Nothing
+
+                            Core.SetScreen(selScreen)
+                        End If
+                        If CurrentScreen.Identification <> Screen.Identifications.PartyScreen AndAlso PartyScreen.Selected <> -1 Then
+                            If BattleScreen.OwnPokemon.Attacks(_moveMenuIndex).ID = 226 Then
+                                BattleScreen.FieldEffects.OwnBatonPassIndex = PartyScreen.Selected
+                            Else
+                                BattleScreen.FieldEffects.OwnSwapIndex = PartyScreen.Selected
+                            End If
+                            PartyScreen.Selected = -1
+                            MoveMenuStartRound(BattleScreen)
+                            Visible = False
+                        End If
+                    Else
+                        MoveMenuStartRound(BattleScreen)
+                        Visible = False
+                    End If
                 End If
             Else
                 UseStruggle(BattleScreen)
 
-                If _moveMenuItemList.Count = 0 Or _moveMenuCreatedID <> BattleScreen.OwnPokemon.IndividualValue Or BattleScreen.IsChoiced Then
+                If _moveMenuItemList.Count = 0 Or _moveMenuCreatedID <> BattleScreen.OwnPokemon.IndividualValue Then
                     If _moveMenuCreatedID <> BattleScreen.OwnPokemon.IndividualValue Then
                         _moveMenuIndex = 0
                     End If
                     CreateMoveMenuItems(BattleScreen)
+                    If _moveMenuIndex <> _moveMenuLastIndex Then
+                        _moveMenuNextIndex = _moveMenuLastIndex
+                        _moveMenuIndex = _moveMenuLastIndex
+
+                        If _moveMenuIndex > _moveMenuItemList.Count - 1 Then
+                            _moveMenuNextIndex = 0
+                            _moveMenuIndex = 0
+                            _moveMenuLastIndex = 0
+                        End If
+                    End If
                     _moveMenuCreatedID = BattleScreen.OwnPokemon.IndividualValue
                 End If
                 If _retractMenu = False Then
@@ -946,12 +1049,18 @@
                 BattleScreen.BattleQuery.Clear()
                 BattleScreen.BattleQuery.Add(BattleScreen.FocusBattle())
                 BattleScreen.BattleQuery.Insert(0, New ToggleMenuQueryObject(True))
+                Dim SwitchPokeSuffix As String = ""
+                If BattleScreen.FieldEffects.OwnBatonPassIndex <> -1 Then
+                    SwitchPokeSuffix = ";BATON;" & BattleScreen.FieldEffects.OwnBatonPassIndex
+                ElseIf BattleScreen.FieldEffects.OwnSwapIndex <> -1 Then
+                    SwitchPokeSuffix = ";SWAP;" & BattleScreen.FieldEffects.OwnSwapIndex
+                End If
                 If BattleScreen.IsMegaEvolvingOwn Then
-                    BattleScreen.SendClientCommand("MEGA|" & BattleScreen.OwnPokemon.Attacks(_moveMenuIndex).ID.ToString())
+                    BattleScreen.SendClientCommand("MEGA|" & BattleScreen.OwnPokemon.Attacks(_moveMenuIndex).ID.ToString() & SwitchPokeSuffix)
                     BattleScreen.IsMegaEvolvingOwn = False
                     BattleScreen.FieldEffects.OwnMegaEvolved = True
                 Else
-                    BattleScreen.SendClientCommand("MOVE|" & BattleScreen.OwnPokemon.Attacks(_moveMenuIndex).ID.ToString())
+                    BattleScreen.SendClientCommand("MOVE|" & BattleScreen.OwnPokemon.Attacks(_moveMenuIndex).ID.ToString() & SwitchPokeSuffix)
                 End If
             Else
                 If BattleScreen.IsMegaEvolvingOwn Then
@@ -994,34 +1103,36 @@
             Dim Pokemon As Pokemon = Core.Player.Pokemons(PokeIndex)
 
             If PokeIndex = TempBattleScreen.OwnPokemonIndex Then
-                Screen.TextBox.Show(Pokemon.GetDisplayName() & " is already~in battle!", {}, True, False)
+                If Pokemon.Status <> P3D.Pokemon.StatusProblems.Fainted Then
+                    Screen.TextBox.Show(Pokemon.GetDisplayName() & " " & Localization.GetString("battle_switch_already_in_battle", "is already~in battle!"), {}, True, False)
+                Else
+                    Screen.TextBox.Show(Pokemon.GetDisplayName() & " " & Localization.GetString("battle_switch_fainted", "is fainted!"), {}, True, False)
+                End If
             Else
                 If Pokemon.IsEgg() = False Then
                     If Pokemon.Status <> P3D.Pokemon.StatusProblems.Fainted Then
                         If BattleCalculation.CanSwitch(TempBattleScreen, True) = False Then
-                            Screen.TextBox.Show("Cannot switch out.", {}, True, False)
+                            Screen.TextBox.Show(Localization.GetString("battle_cannot_switch", "Cannot switch out."), {}, True, False)
                         Else
-                            If TempBattleScreen.OwnPokemonIndex <> PokeIndex Then
-                                If TempBattleScreen.IsRemoteBattle = True And TempBattleScreen.IsHost = False Then
-                                    TempBattleScreen.OppFaint = False
-                                    TempBattleScreen.OwnStatistics.Switches += 1
-                                    TempBattleScreen.BattleQuery.Clear()
-                                    TempBattleScreen.BattleQuery.Add(TempBattleScreen.FocusBattle())
-                                    TempBattleScreen.BattleQuery.Insert(0, New ToggleMenuQueryObject(True))
-                                    TempBattleScreen.SendClientCommand("SWITCH|" & PokeIndex.ToString())
-                                Else
-                                    TempBattleScreen.BattleQuery.Clear()
-                                    TempBattleScreen.BattleQuery.Add(TempBattleScreen.FocusBattle())
-                                    TempBattleScreen.BattleQuery.Insert(0, New ToggleMenuQueryObject(True))
-                                    TempBattleScreen.Battle.InitializeRound(TempBattleScreen, New Battle.RoundConst With {.StepType = Battle.RoundConst.StepTypes.Switch, .Argument = PokeIndex.ToString()})
-                                End If
+                            If TempBattleScreen.IsRemoteBattle = True And TempBattleScreen.IsHost = False Then
+                                TempBattleScreen.OppFaint = False
+                                TempBattleScreen.OwnStatistics.Switches += 1
+                                TempBattleScreen.BattleQuery.Clear()
+                                TempBattleScreen.BattleQuery.Add(TempBattleScreen.FocusBattle())
+                                TempBattleScreen.BattleQuery.Insert(0, New ToggleMenuQueryObject(True))
+                                TempBattleScreen.SendClientCommand("SWITCH|" & PokeIndex.ToString())
+                            Else
+                                TempBattleScreen.BattleQuery.Clear()
+                                TempBattleScreen.BattleQuery.Add(TempBattleScreen.FocusBattle())
+                                TempBattleScreen.BattleQuery.Insert(0, New ToggleMenuQueryObject(True))
+                                TempBattleScreen.Battle.InitializeRound(TempBattleScreen, New Battle.RoundConst With {.StepType = Battle.RoundConst.StepTypes.Switch, .Argument = PokeIndex.ToString()})
                             End If
                         End If
                     Else
-                        Screen.TextBox.Show(Pokemon.GetDisplayName() & " is fainted!", {}, True, False)
+                        Screen.TextBox.Show(Pokemon.GetDisplayName() & " " & Localization.GetString("battle_switch_fainted", "is fainted!"), {}, True, False)
                     End If
                 Else
-                    Screen.TextBox.Show("Cannot switch in~the egg!", {}, True, False)
+                    Screen.TextBox.Show(Localization.GetString("battle_switch_egg", "Cannot switch in~the egg!"), {}, True, False)
                 End If
             End If
         End Sub
@@ -1031,21 +1142,21 @@
 #Region "UseItem"
 
         Private Shared Sub SelectedItemHandler(ByVal params As Object())
-            SelectedItem(CInt(params(0)))
+            SelectedItem(CStr(params(0)))
         End Sub
 
-        Private Shared Sub SelectedItem(ByVal itemID As Integer)
-            Dim Item As Item = Item.GetItemByID(itemID)
+        Private Shared Sub SelectedItem(ByVal itemID As String)
+            Dim Item As Item = Item.GetItemByID(itemID.ToString)
 
             If Item.CanBeUsedInBattle = True Then
                 If Item.IsBall = True Then
-                    Core.Player.Inventory.RemoveItem(itemID, 1)
+                    Core.Player.Inventory.RemoveItem(itemID.ToString, 1)
                     If TempBattleScreen.IsTrainerBattle = False Then
-                        If BattleScreen.CanCatch = True Or CBool(GameModeManager.GetGameRuleValue("OnlyCaptureFirst", "0")) = True And Core.Player.PokeFiles.Contains(BattleScreen.TempPokeFile) = True Then
+                        If BattleScreen.CanCatch = True Or CBool(GameModeManager.GetGameRuleValue("OnlyCaptureFirst", "0")) = True And Core.Player.PokeFiles.Contains(BattleScreen.TempPokeFile) = False Then
                             TempBattleScreen.BattleQuery.Clear()
                             TempBattleScreen.BattleQuery.Add(TempBattleScreen.FocusBattle())
                             TempBattleScreen.BattleQuery.Insert(0, New ToggleMenuQueryObject(True))
-                            Core.SetScreen(New BattleCatchScreen(TempBattleScreen, Item.GetItemByID(itemID)))
+                            Core.SetScreen(New BattleCatchScreen(TempBattleScreen, Item.GetItemByID(itemID.ToString)))
                             PlayerStatistics.Track("[4]Poké Balls used", 1)
                         Else
                             TempBattleScreen.BattleQuery.Clear()
@@ -1064,7 +1175,7 @@
 
                     If Item.BattleSelectPokemon = True Then
                         'Core.SetScreen(New PartyScreen(Core.CurrentScreen, Item, AddressOf UseItem, "Use " & Item.Name, True))
-                        Dim selScreen = New PartyScreen(Core.CurrentScreen, Item, AddressOf Item.UseOnPokemon, "Use " & Item.Name, True) With {.Mode = Screens.UI.ISelectionScreen.ScreenMode.Selection, .CanExit = True}
+                        Dim selScreen = New PartyScreen(Core.CurrentScreen, Item, AddressOf Item.UseOnPokemon, Localization.GetString("global_use", "Use") & " " & Item.OneLineName(), True) With {.Mode = Screens.UI.ISelectionScreen.ScreenMode.Selection, .CanExit = True}
                         AddHandler selScreen.SelectedObject, AddressOf UseItemHandler
 
                         Core.SetScreen(selScreen)
@@ -1075,9 +1186,9 @@
             End If
         End Sub
 
-        Shared TempItemID As Integer = -1
+        Shared TempItemID As String = "-1"
 
-        Private Shared Sub UseItemhandler(ByVal params As Object())
+        Private Shared Sub UseItemHandler(ByVal params As Object())
             UseItem(CInt(params(0)))
         End Sub
 
@@ -1086,8 +1197,8 @@
 
             Dim Item As Item = Item.GetItemByID(TempItemID)
 
-            TempBattleScreen.BattleQuery.Clear()
             If Item.UseOnPokemon(PokeIndex) = True Then
+                TempBattleScreen.BattleQuery.Clear()
                 TempBattleScreen.BattleQuery.Add(TempBattleScreen.FocusBattle())
                 TempBattleScreen.BattleQuery.Insert(0, New ToggleMenuQueryObject(True))
                 TempBattleScreen.Battle.InitializeRound(TempBattleScreen, New Battle.RoundConst With {.StepType = Battle.RoundConst.StepTypes.Item, .Argument = TempItemID.ToString()})

P3D/Battle/BattleSystemV2/FieldEffects.vb

@@ -42,6 +42,7 @@
         Public OwnYawn As Integer = 0 'Yawn move counter
         Public OwnPerishSongCount As Integer = 0 'Perishsong move counter
         Public OwnConfusionTurns As Integer = 0 'Turns until confusion runs out
+        Public TempOwnConfusionTurns As Integer = 0 'For the functionality of Berserk Gene
         Public OwnTorment As Integer = 0 'Torment move counter
         Public OwnTormentMove As Attack = Nothing 'Torment move
         Public OwnMetronomeItemCount As Integer = 0 'The counter for the item Metronome
@@ -63,6 +64,7 @@
         Public OwnLockOn As Integer = 0 'Counter for the moves lock-on and mind reader
         Public OwnBideCounter As Integer = 0 'Counter for the Bide move
         Public OwnBideDamage As Integer = 0 'Half of the damage dealt by bide
+        Public OwnRageFistPower As Integer = 0 'how much the Power of the attack Rage Fist increases
         Public OwnLansatBerry As Integer = 0 'Raise critical hit ration when Lansat got eaten
         Public OwnCustapBerry As Integer = 0 'Raises the attack speed once when Custap got eaten
         Public OwnTrappedCounter As Integer = 0 'If the pokemon is trapped (for example by Spider Web), this is =1
@@ -127,6 +129,9 @@
         Public OwnFutureSightTurns As Integer = 0 'Turns until Futuresight hits
         Public OwnFutureSightID As Integer = 0 'Move ID for the Futuresight move
 
+        Public OwnUsedRandomMove As Boolean = False 'Metronome for example
+        Public OwnUsedMirrorMove As Boolean = False
+
         'Opp stuff
         Public OppSpikes As Integer = 0
         Public OppStealthRock As Integer = 0
@@ -181,6 +186,7 @@
         Public OppFutureSightID As Integer = 0
         Public OppPerishSongCount As Integer = 0
         Public OppConfusionTurns As Integer = 0
+        Public TempOppConfusionTurns As Integer = 0
         Public OppTorment As Integer = 0
         Public OppTormentMove As Attack = Nothing
         Public OppMetronomeItemCount As Integer = 0
@@ -201,6 +207,7 @@
         Public OppSolarBlade As Integer = 0
         Public OppLockOn As Integer = 0
         Public OppBideCounter As Integer = 0
+        Public OppRageFistPower As Integer = 0
         Public OppBideDamage As Integer = 0
         Public OppLansatBerry As Integer = 0
         Public OppCustapBerry As Integer = 0
@@ -249,6 +256,9 @@
         Public OppSandTomb As Integer = 0
         Public OppInfestation As Integer = 0
 
+        Public OppUsedRandomMove As Boolean = False
+        Public OppUsedMirrorMove As Boolean = False
+
         Public OppUsedMoves As New List(Of Integer)
 
         'Weather
@@ -281,18 +291,24 @@
         'Special stuff
         Public RunTries As Integer = 0
         Public UsedPokemon As New List(Of Integer)
-        Public StolenItemIDs As New List(Of Integer)
+        Public StolenItemIDs As New List(Of String)
         Public DefeatedTrainerPokemon As Boolean = False
         Public RoamingFled As Boolean = False
 
+        'Moves that swap out Pokémon
+        Public OwnSwapIndex As Integer = -1
+        Public OppSwapIndex As Integer = -1
+
         'BatonPassTemp:
         Public OwnUsedBatonPass As Boolean = False
         Public OwnBatonPassStats As List(Of Integer)
         Public OwnBatonPassConfusion As Boolean = False
+        Public OwnBatonPassIndex As Integer = -1
 
         Public OppUsedBatonPass As Boolean = False
         Public OppBatonPassStats As List(Of Integer)
         Public OppBatonPassConfusion As Boolean = False
+        Public OppBatonPassIndex As Integer = -1
 
         Public Function CanUseItem(ByVal own As Boolean) As Boolean
             Dim embargo As Integer = OwnEmbargo
@@ -364,10 +380,10 @@
                         grounded = False
                     End If
                     If Not p.Item Is Nothing Then
-                        If p.Item.Name.ToLower() = "air balloon" And BattleScreen.FieldEffects.CanUseItem(True) = True And BattleScreen.FieldEffects.CanUseOwnItem(True, BattleScreen) = True Then
+                        If p.Item.OriginalName.ToLower() = "air balloon" And BattleScreen.FieldEffects.CanUseItem(True) = True And BattleScreen.FieldEffects.CanUseOwnItem(True, BattleScreen) = True Then
                             grounded = False
                         End If
-                        If p.Item.Name.ToLower() = "iron ball" And BattleScreen.FieldEffects.CanUseItem(True) = True And BattleScreen.FieldEffects.CanUseOwnItem(True, BattleScreen) = True Then
+                        If p.Item.OriginalName.ToLower() = "iron ball" And BattleScreen.FieldEffects.CanUseItem(True) = True And BattleScreen.FieldEffects.CanUseOwnItem(True, BattleScreen) = True Then
                             grounded = True
                         End If
                     End If
@@ -377,7 +393,7 @@
                 End If
             Else
                 p = BattleScreen.OppPokemon
-                If p.Type1.Type = Element.Types.Flying Or p.Type2.Type = Element.Types.Flying Or p.Ability.Name.ToLower() = "levitate" And BattleScreen.FieldEffects.CanUseAbility(True, BattleScreen) = True Then
+                If p.Type1.Type = Element.Types.Flying Or (p.Type2 IsNot Nothing AndAlso p.Type2.Type = Element.Types.Flying) Or p.Ability.Name.ToLower() = "levitate" And BattleScreen.FieldEffects.CanUseAbility(False, BattleScreen) = True Then
                     grounded = False
                 End If
                 If BattleScreen.FieldEffects.Gravity > 0 Or BattleScreen.FieldEffects.OppSmacked > 0 Or BattleScreen.FieldEffects.OppIngrain > 0 Then
@@ -387,10 +403,10 @@
                         grounded = False
                     End If
                     If Not p.Item Is Nothing Then
-                        If p.Item.Name.ToLower() = "air balloon" And BattleScreen.FieldEffects.CanUseItem(False) = True And BattleScreen.FieldEffects.CanUseOwnItem(False, BattleScreen) = True Then
+                        If p.Item.OriginalName.ToLower() = "air balloon" And BattleScreen.FieldEffects.CanUseItem(False) = True And BattleScreen.FieldEffects.CanUseOwnItem(False, BattleScreen) = True Then
                             grounded = False
                         End If
-                        If p.Item.Name.ToLower() = "iron ball" And BattleScreen.FieldEffects.CanUseItem(False) = True And BattleScreen.FieldEffects.CanUseOwnItem(False, BattleScreen) = True Then
+                        If p.Item.OriginalName.ToLower() = "iron ball" And BattleScreen.FieldEffects.CanUseItem(False) = True And BattleScreen.FieldEffects.CanUseOwnItem(False, BattleScreen) = True Then
                             grounded = True
                         End If
                     End If

P3D/Battle/BattleSystemV2/QueryObjects/AnimationQueryObject.vb

@@ -1,48 +1,51 @@
-Namespace BattleSystem
+Imports System.Xml
+
+Namespace BattleSystem
 
 	Public Class AnimationQueryObject
 		Inherits QueryObject
 
-		Public AnimationStarted As Boolean = False
-		Public AnimationEnded As Boolean = False
-		Public BattleFlipped As Boolean = Nothing
-		Public AnimationSequence As List(Of BattleAnimation3D)
-		Public SpawnedEntities As List(Of Entity)
-		Public CurrentEntity As Entity
-		Public CurrentModel As Entity
+		Dim AnimationStarted As Boolean = False
+		Dim AnimationEnded As Boolean = False
+		Dim BattleFlipped As Boolean = Nothing
+		Dim AnimationSequence As List(Of BattleAnimation3D)
+		Dim SpawnedEntities As List(Of Entity)
+		Dim CurrentEntity As Entity
 		Public DrawBeforeEntities As Boolean
 
+		Dim Backgrounds As List(Of Entity)
+		Dim RenderObjects As List(Of Entity)
+
 		Public Overrides ReadOnly Property IsReady As Boolean
 			Get
 				Return AnimationEnded
 			End Get
 		End Property
 
-		Public Sub New(ByVal entity As Entity, ByVal BattleFlipped As Boolean, Optional ByVal model As Entity = Nothing, Optional DrawBeforeEntities As Boolean = False)
+		Public Sub New(ByVal Entity As Entity, ByVal BattleFlipped As Boolean, Optional DrawBeforeEntities As Boolean = False)
 			MyBase.New(QueryTypes.MoveAnimation)
 			Me.AnimationSequence = New List(Of BattleAnimation3D)
 			Me.SpawnedEntities = New List(Of Entity)
 			Me.DrawBeforeEntities = DrawBeforeEntities
 			Me.BattleFlipped = BattleFlipped
-			If entity IsNot Nothing Then
-				Me.CurrentEntity = entity
-			End If
-			If model IsNot Nothing Then
-				Me.CurrentModel = model
+			Me.Backgrounds = New List(Of Entity)
+			Me.RenderObjects = New List(Of Entity)
+
+			If Entity IsNot Nothing Then
+				Me.CurrentEntity = Entity
 			End If
 			AnimationSequenceBegin()
 		End Sub
 		Public Overrides Sub Draw(ByVal BV2Screen As BattleScreen)
-			Dim Backgrounds As New List(Of Entity)
-
-			Dim RenderObjects As New List(Of Entity)
 			For Each a As BattleAnimation3D In Me.AnimationSequence
-				If a.AnimationType = BattleAnimation3D.AnimationTypes.Background Then
+				If Backgrounds.Contains(a) = False AndAlso a.AnimationType = BattleAnimation3D.AnimationTypes.Background Then
 					Backgrounds.Add(a)
 				End If
 			Next
 			For Each entity As BattleAnimation3D In Me.SpawnedEntities
-				RenderObjects.Add(entity)
+				If RenderObjects.Contains(entity) = False Then
+					RenderObjects.Add(entity)
+				End If
 			Next
 			If RenderObjects.Count > 0 Then
 				RenderObjects = (From r In RenderObjects Order By r.CameraDistance Descending).ToList()
@@ -54,6 +57,8 @@
 				[Object].UpdateModel()
 				[Object].Render()
 			Next
+			RenderObjects.Clear()
+			Backgrounds.Clear()
 		End Sub
 
 		Public Overrides Sub Update(BV2Screen As BattleScreen)
@@ -98,23 +103,32 @@
 		End Sub
 
 		Public Sub AnimationSequenceEnd()
+			SpawnedEntities.Clear()
+			Backgrounds.Clear()
+			RenderObjects.Clear()
 			AnimationEnded = True
 		End Sub
 
-		Public Function SpawnEntity(ByVal Position As Vector3, ByVal Texture As Texture2D, ByVal Scale As Vector3, ByVal Opacity As Single, Optional ByVal startDelay As Single = 0.0F, Optional ByVal endDelay As Single = 0.0F) As Entity
+		Public Function SpawnEntity(ByVal Position As Vector3, ByVal Texture As Texture2D, ByVal Scale As Vector3, ByVal Opacity As Single, Optional ByVal startDelay As Single = 0.0F, Optional ByVal endDelay As Single = 0.0F, Optional ModelPath As String = "") As Entity
 			Dim NewPosition As Vector3
 			If Not Position = Nothing Then
-				If BattleFlipped = True Then
-					Position.X *= -1
-				End If
 				If CurrentEntity IsNot Nothing Then
+					If BattleFlipped = True Then
+						Position.X *= -1
+					End If
 					NewPosition = CurrentEntity.Position + Position
+					If CurrentEntity.Model IsNot Nothing Then
+						NewPosition.Y += 0.5F
+					End If
 				Else
 					NewPosition = Position
 				End If
 			Else
 				If CurrentEntity IsNot Nothing Then
 					NewPosition = CurrentEntity.Position
+					If CurrentEntity.Model IsNot Nothing Then
+						NewPosition.Y += 0.5F
+					End If
 				Else
 					NewPosition = New Vector3(0, 0, 0)
 				End If
@@ -123,6 +137,19 @@
 			SpawnedEntity.Opacity = Opacity
 			SpawnedEntity.Visible = False
 
+			If ModelPath <> "" Then
+				SpawnedEntity.ModelPath = ModelPath
+				SpawnedEntity.Model = ModelManager.GetModel(SpawnedEntity.ModelPath)
+				SpawnedEntity.Scale *= ModelManager.MODELSCALE
+				If BattleFlipped = True Then
+					Dim FlipRotation As Integer = Entity.GetRotationFromVector(SpawnedEntity.Rotation)
+					FlipRotation += 2
+					If FlipRotation > 3 Then
+						FlipRotation -= 4
+					End If
+					SpawnedEntity.Rotation.Y = Entity.GetRotationFromInteger(FlipRotation).Y
+				End If
+			End If
 			SpawnedEntities.Add(SpawnedEntity)
 
 			Return SpawnedEntity
@@ -144,16 +171,12 @@
 
 		End Sub
 
-		Public Sub AnimationMove(ByVal Entity As Entity, ByVal RemoveEntityAfter As Boolean, ByVal DestinationX As Single, ByVal DestinationY As Single, ByVal DestinationZ As Single, ByVal Speed As Single, ByVal SpinX As Boolean, ByVal SpinZ As Boolean, ByVal startDelay As Single, ByVal endDelay As Single, Optional ByVal SpinXSpeed As Single = 0.1F, Optional ByVal SpinZSpeed As Single = 0.1F, Optional MovementCurve As Integer = 3, Optional MoveYSpeed As Single = 0.0F)
+		Public Sub AnimationMove(ByVal Entity As Entity, ByVal RemoveEntityAfter As Boolean, ByVal DestinationX As Single, ByVal DestinationY As Single, ByVal DestinationZ As Single, ByVal Speed As Single, ByVal SpinX As Boolean, ByVal SpinZ As Boolean, ByVal startDelay As Single, ByVal endDelay As Single, Optional ByVal SpinXSpeed As Single = 0.1F, Optional ByVal SpinZSpeed As Single = 0.1F, Optional MoveYSpeed As Single = 0.0F, Optional MovementCurve As Integer = 3)
 			Dim MoveEntity As Entity
-			Dim ModelEntity As Entity = Nothing
 			Dim Destination As Vector3
 
 			If Entity Is Nothing Then
 				MoveEntity = CurrentEntity
-				If Me.CurrentModel IsNot Nothing Then
-					ModelEntity = Me.CurrentModel
-				End If
 			Else
 				MoveEntity = Entity
 			End If
@@ -161,13 +184,14 @@
 			If Not BattleFlipped = Nothing Then
 				If BattleFlipped = True Then
 					DestinationX *= -1.0F
-					DestinationZ *= -1.0F
+
 					If SpinZ = True Then
 						SpinXSpeed *= -1.0F
 						SpinZSpeed *= -1.0F
 					End If
 				End If
 			End If
+
 			If CurrentEntity Is Nothing Then
 				Destination = MoveEntity.Position + New Vector3(DestinationX, DestinationY, DestinationZ)
 			Else
@@ -177,21 +201,80 @@
 			Dim baEntityMove As BAEntityMove = New BAEntityMove(MoveEntity, RemoveEntityAfter, Destination, Speed, SpinX, SpinZ, startDelay, endDelay, SpinXSpeed, SpinZSpeed, MovementCurve, MoveYSpeed)
 			AnimationSequence.Add(baEntityMove)
 
-			If ModelEntity IsNot Nothing Then
-				Dim baModelMove As BAEntityMove = New BAEntityMove(CType(CurrentModel, Entity), False, Destination, Speed, SpinX, SpinZ, startDelay, endDelay, SpinXSpeed, SpinZSpeed, MovementCurve, MoveYSpeed)
-				AnimationSequence.Add(baModelMove)
+		End Sub
+		Public Sub AnimationOscillateMove(ByVal Entity As Entity, ByVal RemoveEntityAfter As Boolean, ByVal Distance As Vector3, ByVal Speed As Single, ByVal BothWays As Boolean, ByVal Duration As Single, ByVal startDelay As Single, ByVal endDelay As Single, Optional MovementCurve As Integer = 0, Optional ReturnToStart As Vector3 = Nothing)
+			Dim MoveEntity As Entity
+			Dim ReturnPosition As New Vector3(0)
+
+			If Entity Is Nothing Then
+				MoveEntity = CurrentEntity
+			Else
+				MoveEntity = Entity
 			End If
 
+			If Not BattleFlipped = Nothing Then
+				If BattleFlipped = True Then
+					Distance.Z *= -1.0F
+				End If
+			End If
+
+			Dim DurationWhole = CSng(Math.Truncate(CDbl(Duration / 6.0F)))
+			Dim DurationFraction = CSng((Duration / 6.0F - DurationWhole) * 1000)
+			Dim DurationTime As TimeSpan = New TimeSpan(0, 0, 0, CInt(DurationWhole), CInt(DurationFraction))
+			Dim baEntityOscillateMove As BAEntityOscillateMove = New BAEntityOscillateMove(MoveEntity, RemoveEntityAfter, Distance, Speed, BothWays, DurationTime, startDelay, endDelay, MovementCurve, ReturnToStart)
+			AnimationSequence.Add(baEntityOscillateMove)
+
+		End Sub
+
+		Public Sub AnimationSetPosition(ByVal Entity As Entity, ByVal RemoveEntityAfter As Boolean, ByVal PositionX As Single, ByVal PositionY As Single, ByVal PositionZ As Single, ByVal startDelay As Single, ByVal endDelay As Single)
+			Dim SetEntity As Entity
+			Dim SetPosition As Vector3
+
+			If Entity Is Nothing Then
+				SetEntity = CurrentEntity
+			Else
+				SetEntity = Entity
+			End If
+
+			SetPosition = New Vector3(PositionX, PositionY, PositionZ) + BattleScreen.BattleMapOffset
+
+			Dim baEntitySetPosition As BAEntitySetPosition = New BAEntitySetPosition(SetEntity, RemoveEntityAfter, SetPosition, startDelay, endDelay)
+			AnimationSequence.Add(baEntitySetPosition)
+
+		End Sub
+
+		Public Sub AnimationColor(ByVal Entity As Entity, ByVal RemoveEntityAfter As Boolean, ByVal TransitionSpeedIn As Single, ByVal ReturnToFromWhenDone As Boolean, ByVal startDelay As Single, ByVal endDelay As Single, ByVal VectorColorTo As Vector3, Optional ByVal VectorColorFrom As Vector3 = Nothing, Optional TransitionSpeedOut As Single = -1)
+			Dim ColorEntity As Entity
+			If Entity Is Nothing Then
+				ColorEntity = CurrentEntity
+			Else
+				ColorEntity = Entity
+			End If
+			Dim baEntityColor As BAEntityColor = New BAEntityColor(ColorEntity, RemoveEntityAfter, TransitionSpeedIn, ReturnToFromWhenDone, startDelay, endDelay, VectorColorTo, VectorColorFrom, TransitionSpeedOut)
+			AnimationSequence.Add(baEntityColor)
+		End Sub
+
+		Public Sub AnimationColor(ByVal Entity As Entity, ByVal RemoveEntityAfter As Boolean, ByVal TransitionSpeedIn As Single, ByVal ReturnToFromWhenDone As Boolean, ByVal startDelay As Single, ByVal endDelay As Single, ByVal ColorTo As Color, Optional ByVal ColorFrom As Color = Nothing, Optional TransitionSpeedOut As Single = -1)
+			Dim ColorEntity As Entity
+			If Entity Is Nothing Then
+				ColorEntity = CurrentEntity
+			Else
+				ColorEntity = Entity
+			End If
+			Dim VectorColorTo As Vector3 = ColorTo.ToVector3
+			Dim VectorColorFrom As Vector3 = Nothing
+			If ColorFrom <> Nothing Then
+				VectorColorFrom = ColorFrom.ToVector3
+			End If
+
+			Dim baEntityColor As BAEntityColor = New BAEntityColor(ColorEntity, RemoveEntityAfter, TransitionSpeedIn, ReturnToFromWhenDone, startDelay, endDelay, VectorColorTo, VectorColorFrom, TransitionSpeedOut)
+			AnimationSequence.Add(baEntityColor)
 		End Sub
 
 		Public Sub AnimationFade(ByVal Entity As Entity, ByVal RemoveEntityAfter As Boolean, ByVal TransitionSpeed As Single, ByVal FadeIn As Boolean, ByVal EndState As Single, ByVal startDelay As Single, ByVal endDelay As Single, Optional ByVal startState As Single = -1.0F)
 			Dim FadeEntity As Entity
-			Dim FadeModel As Entity = Nothing
 			If Entity Is Nothing Then
 				FadeEntity = CurrentEntity
-				If Me.CurrentModel IsNot Nothing Then
-					FadeModel = Me.CurrentModel
-				End If
 			Else
 				FadeEntity = Entity
 			End If
@@ -199,20 +282,12 @@
 			Dim baEntityOpacity As BAEntityOpacity = New BAEntityOpacity(FadeEntity, RemoveEntityAfter, TransitionSpeed, FadeIn, EndState, startDelay, endDelay, startState)
 			AnimationSequence.Add(baEntityOpacity)
 
-			If FadeModel IsNot Nothing Then
-				Dim baModelOpacity As BAEntityOpacity = New BAEntityOpacity(CType(FadeModel, Entity), False, TransitionSpeed, FadeIn, EndState, startDelay, endDelay, startState)
-				AnimationSequence.Add(baModelOpacity)
-			End If
-
 		End Sub
+
 		Public Sub AnimationRotate(Entity As Entity, ByVal RemoveEntityAfter As Boolean, ByVal RotationSpeedX As Single, ByVal RotationSpeedY As Single, ByVal RotationSpeedZ As Single, ByVal EndRotationX As Single, ByVal EndRotationY As Single, ByVal EndRotationZ As Single, ByVal startDelay As Single, ByVal endDelay As Single, ByVal DoXRotation As Boolean, ByVal DoYRotation As Boolean, ByVal DoZRotation As Boolean, ByVal DoReturn As Boolean)
 			Dim RotateEntity As Entity
-			Dim RotateModel As Entity = Nothing
 			If Entity Is Nothing Then
 				RotateEntity = CurrentEntity
-				If Me.CurrentModel IsNot Nothing Then
-					RotateModel = Me.CurrentModel
-				End If
 			Else
 				RotateEntity = Entity
 			End If
@@ -222,21 +297,12 @@
 			Dim baEntityRotate As BAEntityRotate = New BAEntityRotate(RotateEntity, RemoveEntityAfter, RotationSpeedVector, EndRotation, startDelay, endDelay, DoXRotation, DoYRotation, DoZRotation, DoReturn)
 			AnimationSequence.Add(baEntityRotate)
 
-			If RotateModel IsNot Nothing Then
-				Dim baModelRotate As BAEntityRotate = New BAEntityRotate(CType(RotateModel, Entity), False, RotationSpeedVector, EndRotation, startDelay, endDelay, DoXRotation, DoYRotation, DoZRotation, DoReturn)
-				AnimationSequence.Add(baModelRotate)
-			End If
-
 		End Sub
 
 		Public Sub AnimationTurnNPC(ByVal TurnSteps As Integer, ByVal startDelay As Single, ByVal endDelay As Single, Optional ByVal EndFaceRotation As Integer = -1, Optional ByVal TurnSpeed As Integer = 1, Optional ByVal TurnDelay As Single = 0.25F)
 			Dim TurnNPC As NPC = Nothing
-			Dim TurnModel As Entity = Nothing
 			If CurrentEntity IsNot Nothing Then
 				TurnNPC = CType(CurrentEntity, NPC)
-				If Me.CurrentModel IsNot Nothing Then
-					TurnModel = Me.CurrentModel
-				End If
 			End If
 
 			If Not BattleFlipped = Nothing AndAlso BattleFlipped = True Then
@@ -244,17 +310,19 @@
 				TurnSpeed *= -1
 			End If
 
-			Dim BAEntityFaceRotate As BAEntityFaceRotate = New BAEntityFaceRotate(TurnNPC, TurnSteps, startDelay, endDelay, EndFaceRotation, TurnSpeed, TurnDelay, TurnModel)
+			Dim BAEntityFaceRotate As BAEntityFaceRotate = New BAEntityFaceRotate(TurnNPC, TurnSteps, startDelay, endDelay, EndFaceRotation, TurnSpeed, TurnDelay)
 			AnimationSequence.Add(BAEntityFaceRotate)
 
 		End Sub
-		Public Sub AnimationScale(ByVal Entity As Entity, ByVal RemoveEntityAfter As Boolean, ByVal Grow As Boolean, ByVal EndSizeX As Single, ByVal EndSizeY As Single, ByVal EndSizeZ As Single, ByVal SizeSpeed As Single, ByVal startDelay As Single, ByVal endDelay As Single, Optional ByVal Anchors As String = "")
+		Public Sub AnimationScale(ByVal Entity As Entity, ByVal RemoveEntityAfter As Boolean, ByVal Grow As Boolean, ByVal EndSizeX As Single, ByVal EndSizeY As Single, ByVal EndSizeZ As Single, ByVal SizeSpeed As Single, ByVal startDelay As Single, ByVal endDelay As Single, Optional ByVal Anchors As String = "", Optional SpeedMultiplier As Vector3 = Nothing)
 			Dim ScaleEntity As Entity
-			Dim ScaleModel As Entity = Nothing
 			If Entity Is Nothing Then
 				ScaleEntity = CurrentEntity
-				If Me.CurrentModel IsNot Nothing Then
-					ScaleModel = Me.CurrentModel
+				If ScaleEntity.Model IsNot Nothing Then
+					EndSizeX *= ModelManager.MODELSCALE
+					EndSizeY *= ModelManager.MODELSCALE
+					EndSizeZ *= ModelManager.MODELSCALE
+					SizeSpeed *= ModelManager.MODELSCALE
 				End If
 			Else
 				ScaleEntity = Entity
@@ -262,23 +330,41 @@
 
 			Dim Scale As Vector3 = ScaleEntity.Scale
 			Dim EndSize As Vector3 = New Vector3(EndSizeX, EndSizeY, EndSizeZ)
-			Dim baEntityScale As BAEntityScale = New BAEntityScale(ScaleEntity, RemoveEntityAfter, Scale, Grow, EndSize, SizeSpeed, startDelay, endDelay, Anchors)
+			Dim baEntityScale As BAEntityScale = New BAEntityScale(ScaleEntity, RemoveEntityAfter, Scale, Grow, EndSize, SizeSpeed, startDelay, endDelay, Anchors, SpeedMultiplier)
 			AnimationSequence.Add(baEntityScale)
-
-			If ScaleModel IsNot Nothing Then
-				Dim baModelScale As BAEntityScale = New BAEntityScale(CType(ScaleModel, Entity), False, Scale, Grow, EndSize, SizeSpeed, startDelay, endDelay, Anchors)
-			End If
 		End Sub
 
-		Public Sub AnimationPlaySound(ByVal sound As String, ByVal startDelay As Single, ByVal endDelay As Single, Optional ByVal stopMusic As Boolean = False, Optional ByVal IsPokemon As Boolean = False)
-			Dim baSound As BAPlaySound = New BAPlaySound(sound, startDelay, endDelay, stopMusic, IsPokemon)
+		Public Sub AnimationPlaySound(ByVal sound As String, ByVal startDelay As Single, ByVal endDelay As Single, Optional ByVal stopMusic As Boolean = False, Optional ByVal IsPokemon As Boolean = False, Optional ByVal CrySuffix As String = "")
+			Dim baSound As BAPlaySound = New BAPlaySound(sound, startDelay, endDelay, stopMusic, IsPokemon, CrySuffix)
 			AnimationSequence.Add(baSound)
 		End Sub
 
-		Public Sub AnimationBackground(Texture As Texture2D, ByVal TransitionSpeed As Single, ByVal FadeIn As Boolean, ByVal FadeOut As Boolean, ByVal EndState As Single, ByVal startDelay As Single, ByVal endDelay As Single, Optional ByVal startState As Single = 0.0F)
-			Dim baBackground As BABackground = New BABackground(Texture, TransitionSpeed, FadeIn, FadeOut, EndState, startDelay, endDelay, startState)
+		Public Sub AnimationBackground(ByVal Texture As Texture2D, ByVal startDelay As Single, ByVal endDelay As Single, ByVal Duration As Single, Optional ByVal AfterFadeInOpacity As Single = 1.0F, Optional ByVal FadeInSpeed As Single = 0.125F, Optional ByVal FadeOutSpeed As Single = 0.125F, Optional ByVal DoTile As Boolean = False, Optional ByVal AnimationLength As Integer = 1, Optional ByVal AnimationSpeed As Integer = 4, Optional ByVal Scale As Integer = 4)
+			Dim baBackground As BABackground = New BABackground(Texture, startDelay, endDelay, Duration, AfterFadeInOpacity, FadeInSpeed, FadeOutSpeed, DoTile, AnimationLength, AnimationSpeed, Scale)
 			AnimationSequence.Add(baBackground)
 		End Sub
 
+		Public Sub AnimationCameraChangeAngle(ByRef Battlescreen As BattleScreen, ByVal CameraAngleID As Integer, ByVal startDelay As Single, ByVal endDelay As Single)
+			Dim baCameraChangeAngle As BACameraChangeAngle = New BACameraChangeAngle(Battlescreen, CameraAngleID, startDelay, endDelay)
+			AnimationSequence.Add(baCameraChangeAngle)
+		End Sub
+
+		Public Sub AnimationCameraOscillateMove(ByVal Distance As Vector3, ByVal Speed As Single, ByVal BothWays As Boolean, ByVal Duration As Single, ByVal startDelay As Single, ByVal endDelay As Single, Optional MovementCurve As Integer = 0, Optional ReturnToStart As Vector3 = Nothing)
+			Dim ReturnPosition As New Vector3(0)
+
+			If Not BattleFlipped = Nothing Then
+				If BattleFlipped = True Then
+					Distance.Z *= -1.0F
+				End If
+			End If
+
+			Dim DurationWhole = CSng(Math.Truncate(CDbl(Duration / 6.0F)))
+			Dim DurationFraction = CSng((Duration / 6.0F - DurationWhole) * 1000)
+			Dim DurationTime As TimeSpan = New TimeSpan(0, 0, 0, CInt(DurationWhole), CInt(DurationFraction))
+			Dim baCameraOscillateMove As BACameraOscillateMove = New BACameraOscillateMove(Distance, Speed, BothWays, DurationTime, startDelay, endDelay, MovementCurve, ReturnToStart)
+			AnimationSequence.Add(baCameraOscillateMove)
+
+		End Sub
+
 	End Class
 End Namespace

P3D/Battle/BattleSystemV2/QueryObjects/PlaySoundQueryObject.vb

@@ -6,17 +6,19 @@
 
         Dim _sound As String = ""
         Dim _isPokemonSound As Boolean = False
+        Dim _crySuffix As String = ""
         Dim _delay As Single = 0.0F
 
-        Public Sub New(ByVal sound As String, ByVal isPokemonSound As Boolean)
-            Me.New(sound, isPokemonSound, 0.0F)
+        Public Sub New(ByVal sound As String, ByVal isPokemonSound As Boolean, Optional ByVal CrySuffix As String = "")
+            Me.New(sound, isPokemonSound, 0.0F, CrySuffix)
         End Sub
 
-        Public Sub New(ByVal sound As String, ByVal isPokemonSound As Boolean, ByVal delay As Single)
+        Public Sub New(ByVal sound As String, ByVal isPokemonSound As Boolean, ByVal delay As Single, Optional ByVal CrySuffix As String = "")
             MyBase.New(QueryTypes.PlaySound)
 
             Me._sound = sound
             Me._isPokemonSound = isPokemonSound
+            Me._crySuffix = CrySuffix
             Me._delay = delay
             Me.PassThis = True
         End Sub
@@ -34,7 +36,7 @@
 
         Private Sub InternalPlaySound()
             If _isPokemonSound = True Then
-                SoundManager.PlayPokemonCry(CInt(_sound))
+                SoundManager.PlayPokemonCry(CInt(_sound), _crySuffix)
             Else
                 SoundManager.PlaySound(Me._sound, False)
             End If

P3D/Battle/BattleSystemV2/QueryObjects/SwitchPokemonQueryObject.vb

@@ -60,11 +60,11 @@
 
             If GamePad.GetState(PlayerIndex.One).IsConnected = True And Core.GameOptions.GamePadEnabled = True And BV2Screen.IsCurrentScreen() = True Then
                 Dim d As New Dictionary(Of Buttons, String)
-                d.Add(Buttons.A, "OK")
+                d.Add(Buttons.A, Localization.GetString("global_ok", "OK"))
                 BV2Screen.DrawGamePadControls(d, New Vector2(rec.X + rec.Width - 100, rec.Y + rec.Height - 40))
             Else
                 If TextReady = True Then
-                    Core.SpriteBatch.DrawString(FontManager.InGameFont, "OK", New Vector2(rec.X + rec.Width - FontManager.InGameFont.MeasureString("OK").X - 20, rec.Y + rec.Height - FontManager.InGameFont.MeasureString("OK").Y - 5), Color.White)
+                    Core.SpriteBatch.DrawString(FontManager.InGameFont, Localization.GetString("global_ok", "OK"), New Vector2(rec.X + rec.Width - FontManager.InGameFont.MeasureString(Localization.GetString("global_ok", "OK")).X - 20, rec.Y + rec.Height - FontManager.InGameFont.MeasureString(Localization.GetString("global_ok", "OK")).Y - 5), Color.White)
                 End If
             End If
         End Sub
@@ -89,31 +89,49 @@
             If rec.Contains(MouseHandler.MousePosition) = False Then
                 If Controls.Accept(True, True, True) = True Then
                     If _chooseIndex = 0 Then
-                        Dim selScreen = New PartyScreen(Core.CurrentScreen, Item.GetItemByID(5), AddressOf ChoosePokemon, Localization.GetString("battle_main_choose_pokemon"), False) With {.Mode = Screens.UI.ISelectionScreen.ScreenMode.Selection, .CanExit = True}
+                        Dim selScreen = New PartyScreen(Core.CurrentScreen, Item.GetItemByID(5.ToString), AddressOf ChoosePokemon, Localization.GetString("battle_choose_pokemon"), False) With {.Mode = Screens.UI.ISelectionScreen.ScreenMode.Selection, .CanExit = True}
                         AddHandler selScreen.SelectedObject, AddressOf ChoosePokemonHandler
                         SoundManager.PlaySound("select")
                         Core.SetScreen(selScreen)
                     Else
                         SoundManager.PlaySound("select")
+                        TempScreen.BattleQuery.Clear()
+                        FinishOppSwitchAnimation(TempScreen)
+                        FinishOppSwitchEffects(TempScreen)
+                        Dim cq1 As ScreenFadeQueryObject = New ScreenFadeQueryObject(ScreenFadeQueryObject.FadeTypes.Vertical, Color.Black, True, 16)
+                        Dim cq2 As ScreenFadeQueryObject = New ScreenFadeQueryObject(ScreenFadeQueryObject.FadeTypes.Vertical, Color.Black, False, 16)
+                        cq2.PassThis = True
+                        TempScreen.BattleQuery.AddRange({cq1, cq2})
+                        TempScreen.HasSwitchedOwn = False
+                        TempScreen.Battle.StartRound(TempScreen)
                         _ready = True
                     End If
                 End If
             Else
                 If Controls.Accept(False, True, True) = True Then
                     If _chooseIndex = 0 Then
-                        Dim selScreen = New PartyScreen(Core.CurrentScreen, Item.GetItemByID(5), AddressOf ChoosePokemon, Localization.GetString("battle_main_choose_pokemon"), False) With {.Mode = Screens.UI.ISelectionScreen.ScreenMode.Selection, .CanExit = True}
+                        Dim selScreen = New PartyScreen(Core.CurrentScreen, Item.GetItemByID(5.ToString), AddressOf ChoosePokemon, Localization.GetString("battle_choose_pokemon"), False) With {.Mode = Screens.UI.ISelectionScreen.ScreenMode.Selection, .CanExit = True}
                         AddHandler selScreen.SelectedObject, AddressOf ChoosePokemonHandler
                         SoundManager.PlaySound("select")
                         Core.SetScreen(selScreen)
                     Else
                         SoundManager.PlaySound("select")
+                        TempScreen.BattleQuery.Clear()
+                        FinishOppSwitchAnimation(TempScreen)
+                        FinishOppSwitchEffects(TempScreen)
+                        Dim cq1 As ScreenFadeQueryObject = New ScreenFadeQueryObject(ScreenFadeQueryObject.FadeTypes.Vertical, Color.Black, True, 16)
+                        Dim cq2 As ScreenFadeQueryObject = New ScreenFadeQueryObject(ScreenFadeQueryObject.FadeTypes.Vertical, Color.Black, False, 16)
+                        cq2.PassThis = True
+                        TempScreen.BattleQuery.AddRange({cq1, cq2})
+                        TempScreen.HasSwitchedOwn = False
+                        TempScreen.Battle.StartRound(TempScreen)
                         _ready = True
                     End If
                 End If
                 If Controls.Accept(True, False, False) Then
                     If New Rectangle(Core.windowSize.Width - 213, Core.windowSize.Height - 438, 80, 50).Contains(MouseHandler.MousePosition) Then
                         _chooseIndex = 0
-                        Dim selScreen = New PartyScreen(Core.CurrentScreen, Item.GetItemByID(5), AddressOf ChoosePokemon, Localization.GetString("battle_main_choose_pokemon"), False) With {.Mode = Screens.UI.ISelectionScreen.ScreenMode.Selection, .CanExit = True}
+                        Dim selScreen = New PartyScreen(Core.CurrentScreen, Item.GetItemByID(5.ToString), AddressOf ChoosePokemon, Localization.GetString("battle_choose_pokemon"), False) With {.Mode = Screens.UI.ISelectionScreen.ScreenMode.Selection, .CanExit = True}
                         AddHandler selScreen.SelectedObject, AddressOf ChoosePokemonHandler
                         SoundManager.PlaySound("select")
                         Core.SetScreen(selScreen)
@@ -121,12 +139,30 @@
                     If New Rectangle(Core.windowSize.Width - 213, Core.windowSize.Height - 378, 80, 50).Contains(MouseHandler.MousePosition) Then
                         _chooseIndex = 1
                         SoundManager.PlaySound("select")
+                        TempScreen.BattleQuery.Clear()
+                        FinishOppSwitchAnimation(TempScreen)
+                        FinishOppSwitchEffects(TempScreen)
+                        Dim cq1 As ScreenFadeQueryObject = New ScreenFadeQueryObject(ScreenFadeQueryObject.FadeTypes.Vertical, Color.Black, True, 16)
+                        Dim cq2 As ScreenFadeQueryObject = New ScreenFadeQueryObject(ScreenFadeQueryObject.FadeTypes.Vertical, Color.Black, False, 16)
+                        cq2.PassThis = True
+                        TempScreen.BattleQuery.AddRange({cq1, cq2})
+                        TempScreen.HasSwitchedOwn = False
+                        TempScreen.Battle.StartRound(TempScreen)
                         _ready = True
                     End If
                 End If
-                End If
+            End If
             If Controls.Dismiss(True, True, True) = True Then
                 SoundManager.PlaySound("select")
+                TempScreen.BattleQuery.Clear()
+                FinishOppSwitchAnimation(TempScreen)
+                FinishOppSwitchEffects(TempScreen)
+                Dim cq1 As ScreenFadeQueryObject = New ScreenFadeQueryObject(ScreenFadeQueryObject.FadeTypes.Vertical, Color.Black, True, 16)
+                Dim cq2 As ScreenFadeQueryObject = New ScreenFadeQueryObject(ScreenFadeQueryObject.FadeTypes.Vertical, Color.Black, False, 16)
+                cq2.PassThis = True
+                TempScreen.BattleQuery.AddRange({cq1, cq2})
+                TempScreen.HasSwitchedOwn = False
+                TempScreen.Battle.StartRound(TempScreen)
                 _ready = True
             End If
         End Sub
@@ -157,36 +193,50 @@
         Private Sub ChoosePokemon(ByVal PokeIndex As Integer)
             Dim Pokemon As Pokemon = Core.Player.Pokemons(PokeIndex)
             If PokeIndex = TempScreen.OwnPokemonIndex Then
-                Screen.TextBox.Show(Pokemon.GetDisplayName() & " is already~in battle!", {}, True, False)
+                Screen.TextBox.Show(Pokemon.GetDisplayName() & " " & Localization.GetString("battle_switch_already_in_battle", "is already~in battle!"), {}, True, False)
             Else
                 If Pokemon.IsEgg() = False Then
                     If Pokemon.Status <> P3D.Pokemon.StatusProblems.Fainted Then
                         If BattleCalculation.CanSwitch(TempScreen, True) = False Then
-                            Screen.TextBox.Show("Cannot switch out.", {}, True, False)
+                            Screen.TextBox.Show(Localization.GetString("battle_cannot_switch", "Cannot switch out."), {}, True, False)
                         Else
                             Dim TempQuery = TempScreen.BattleQuery.ToArray
                             If TempScreen.OwnPokemonIndex <> PokeIndex Then
+                                TempScreen.ParticipatedPokemon.Clear()
+                                TempScreen.ParticipatedPokemon.Add(PokeIndex)
                                 If TempScreen.IsRemoteBattle = True And TempScreen.IsHost = False Then
                                     TempScreen.OppFaint = False
                                     TempScreen.OwnStatistics.Switches += 1
                                     TempScreen.BattleQuery.Clear()
-                                    TempScreen.Battle.SwitchOutOwn(TempScreen, PokeIndex, TempScreen.BattleQuery.Count)
-                                    TempScreen.BattleQuery.Reverse()
-                                    TempScreen.BattleQuery.AddRange(TempQuery)
+                                    FinishOppSwitchAnimation(TempScreen)
+                                    TempScreen.Battle.SwitchOutOwn(TempScreen, PokeIndex, -1)
+                                    FinishOppSwitchEffects(TempScreen)
+                                    Dim cq1 As ScreenFadeQueryObject = New ScreenFadeQueryObject(ScreenFadeQueryObject.FadeTypes.Vertical, Color.Black, True, 16)
+                                    Dim cq2 As ScreenFadeQueryObject = New ScreenFadeQueryObject(ScreenFadeQueryObject.FadeTypes.Vertical, Color.Black, False, 16)
+                                    cq2.PassThis = True
+                                    TempScreen.BattleQuery.AddRange({cq1, cq2})
+                                    TempScreen.HasSwitchedOwn = True
+                                    TempScreen.Battle.StartRound(TempScreen)
                                 Else
                                     TempScreen.BattleQuery.Clear()
-                                    TempScreen.Battle.SwitchOutOwn(TempScreen, PokeIndex, TempScreen.BattleQuery.Count)
-                                    TempScreen.BattleQuery.Reverse()
-                                    TempScreen.BattleQuery.AddRange(TempQuery)
+                                    FinishOppSwitchAnimation(TempScreen)
+                                    TempScreen.Battle.SwitchOutOwn(TempScreen, PokeIndex, -1)
+                                    FinishOppSwitchEffects(TempScreen)
+                                    Dim cq1 As ScreenFadeQueryObject = New ScreenFadeQueryObject(ScreenFadeQueryObject.FadeTypes.Vertical, Color.Black, True, 16)
+                                    Dim cq2 As ScreenFadeQueryObject = New ScreenFadeQueryObject(ScreenFadeQueryObject.FadeTypes.Vertical, Color.Black, False, 16)
+                                    cq2.PassThis = True
+                                    TempScreen.BattleQuery.AddRange({cq1, cq2})
+                                    TempScreen.HasSwitchedOwn = True
+                                    TempScreen.Battle.StartRound(TempScreen)
                                 End If
                                 Me._ready = True
                             End If
                         End If
                     Else
-                        Screen.TextBox.Show(Pokemon.GetDisplayName() & " is fainted!", {}, True, False)
+                        Screen.TextBox.Show(Pokemon.GetDisplayName() & " " & Localization.GetString("battle_switch_fainted", "is fainted!"), {}, True, False)
                     End If
                 Else
-                    Screen.TextBox.Show("Cannot switch in~the egg!", {}, True, False)
+                    Screen.TextBox.Show(Localization.GetString("battle_switch_egg", "Cannot switch in~the egg!"), {}, True, False)
                 End If
             End If
         End Sub
@@ -197,11 +247,152 @@
             MyBase.New(QueryTypes.SwitchPokemon)
 
             Me.TempScreen = BattleScreen
-            TransformText(BattleScreen.Trainer.Name & " " & Localization.GetString("battle_main_trainer_sent_out_3") & " " & NewPokemon.GetDisplayName() & Localization.GetString("battle_main_trainer_sent_out_4"))
+            TransformText(BattleScreen.Trainer.Name & " " & Localization.GetString("battle_trainer_about_to_send_out_1") & " " & NewPokemon.GetDisplayName() & Localization.GetString("battle_trainer_about_to_send_out_2"))
         End Sub
 
         Dim delay As Single = 2.0F
 
+        Public Sub FinishOppSwitchAnimation(BattleScreen As BattleScreen)
+            BattleScreen.OppPokemonNPC.Position.Y = 0 + BattleScreen.BattleMapOffset.Y
+            BattleScreen.Battle.ChangeCameraAngle(1, False, BattleScreen)
+            Dim oppModel As String = BattleScreen.GetModelName(False)
+            If oppModel = "" Then
+                BattleScreen.BattleQuery.Add(New ToggleEntityQueryObject(True, ToggleEntityQueryObject.BattleEntities.OppPokemon, PokemonForms.GetOverworldSpriteName(BattleScreen.OppPokemon), -1, -1, 0, 1))
+            Else
+                BattleScreen.BattleQuery.Add(New ToggleEntityQueryObject(False, oppModel, -1, -1, 1, 0))
+            End If
+
+            BattleScreen.BattleQuery.Add(New ToggleEntityQueryObject(True, ToggleEntityQueryObject.BattleEntities.OppPokemon, 1, -1, -1, -1, -1))
+            BattleScreen.BattleQuery.Add(New TextQueryObject(BattleScreen.Trainer.Name & ": ""Go, " & BattleScreen.OppPokemon.GetDisplayName() & "!"""))
+
+            Dim BallThrow As AnimationQueryObject = New AnimationQueryObject(BattleScreen.OppPokemonNPC, False)
+            If Core.Player.ShowBattleAnimations <> 0 AndAlso BattleScreen.IsPVPBattle = False Then
+                ' Ball is thrown
+                BallThrow.AnimationMove(Nothing, False, 0, 0.5, 0, 0.5, False, False, 0, 0,,,, 3)
+
+                BallThrow.AnimationPlaySound("Battle\Pokeball\Throw", 0, 0)
+                Dim BallThrowEntity = BallThrow.SpawnEntity(New Vector3(2, -0.15, 0), BattleScreen.OppPokemon.CatchBall.Texture, New Vector3(0.3F), 1.0F)
+                BallThrow.AnimationMove(BallThrowEntity, True, 0, 0.35, 0, 0.1, False, True, 0F, 0.5F,, 0.3, 0.025F)
+
+                ' Ball opens
+                BallThrow.AnimationPlaySound("Battle\Pokeball\Open", 3, 0)
+                Dim SmokeSpawned As Integer = 0
+                Do
+                    Dim SmokePosition = New Vector3(0, 0.35, 0)
+                    Dim SmokeDestination = New Vector3(CSng(Random.Next(-10, 10) / 10), CSng(Random.Next(-10, 10) / 10), CSng(Random.Next(-10, 10) / 10))
+
+                    Dim SmokeTexture As Texture2D = TextureManager.GetTexture("Textures\Battle\Smoke")
+
+                    Dim SmokeScale = New Vector3(CSng(Random.Next(2, 6) / 10))
+                    Dim SmokeSpeed = CSng(Random.Next(1, 3) / 20.0F)
+                    Dim SmokeEntity = BallThrow.SpawnEntity(SmokePosition, SmokeTexture, SmokeScale, 1, 3)
+
+                    BallThrow.AnimationMove(SmokeEntity, True, SmokeDestination.X, SmokeDestination.Y, SmokeDestination.Z, SmokeSpeed, False, False, 3.0F, 0.0F)
+                    Threading.Interlocked.Increment(SmokeSpawned)
+                Loop While SmokeSpawned <= 38
+            End If
+
+            If Core.Player.ShowBattleAnimations <> 0 AndAlso BattleScreen.IsPVPBattle = False Then
+                ' Pokemon appears
+                BallThrow.AnimationFade(Nothing, False, 1, True, 1, 3, 0)
+                BallThrow.AnimationPlaySound(CStr(BattleScreen.OppPokemon.Number), 4, 0,, True)
+                '  Pokémon falls down
+                BallThrow.AnimationMove(Nothing, False, 0, -0.5F, 0, 0.05F, False, False, 5, 0)
+            Else
+                ' Pokemon appears
+                BallThrow.AnimationFade(Nothing, False, 1, True, 1, 0, 0)
+                BallThrow.AnimationPlaySound(CStr(BattleScreen.OppPokemon.Number), 0, 0,, True)
+            End If
+            BattleScreen.BattleQuery.Add(BallThrow)
+
+
+        End Sub
+        Public Sub FinishOppSwitchEffects(BattleScreen As BattleScreen)
+            With BattleScreen
+                Dim p As Pokemon = .OppPokemon
+                Dim op As Pokemon = .OwnPokemon
+
+                Dim spikeAffected As Boolean = True
+                Dim rockAffected As Boolean = True
+
+                spikeAffected = BattleScreen.FieldEffects.IsGrounded(False, BattleScreen)
+
+                If spikeAffected = True Then
+                    If .FieldEffects.OwnSpikes > 0 And p.Ability.Name.ToLower() <> "magic guard" Then
+                        Dim spikeDamage As Double = 1D
+                        Select Case .FieldEffects.OwnSpikes
+                            Case 1
+                                spikeDamage = (p.MaxHP / 100) * 12.5D
+                            Case 2
+                                spikeDamage = (p.MaxHP / 100) * 16.7D
+                            Case 3
+                                spikeDamage = (p.MaxHP / 100) * 25D
+                        End Select
+                        BattleScreen.Battle.ReduceHP(CInt(spikeDamage), False, True, BattleScreen, "The Spikes hurt " & p.GetDisplayName() & "!", "spikes")
+                    End If
+                End If
+                'Sticky Web
+                If spikeAffected = True Then
+                    If .FieldEffects.OwnStickyWeb > 0 Then
+                        BattleScreen.Battle.LowerStat(False, False, BattleScreen, "Speed", 1, "The opposing pokemon was caught in a Sticky Web!", "stickyweb")
+                    End If
+                End If
+                If spikeAffected = True Then
+                    If .FieldEffects.OwnToxicSpikes > 0 And p.Status = Pokemon.StatusProblems.None And p.Type1.Type <> Element.Types.Poison And p.Type2.Type <> Element.Types.Poison Then
+                        Select Case .FieldEffects.OwnToxicSpikes
+                            Case 1
+                                BattleScreen.Battle.InflictPoison(False, True, BattleScreen, False, "The Toxic Spikes hurt " & p.GetDisplayName() & "!", "toxicspikes")
+                            Case 2
+                                BattleScreen.Battle.InflictPoison(False, True, BattleScreen, True, "The Toxic Spikes hurt " & p.GetDisplayName() & "!", "toxicspikes")
+                        End Select
+                    End If
+                    If .FieldEffects.OwnToxicSpikes > 0 Then
+                        If p.Type1.Type = Element.Types.Poison Or p.Type2.Type = Element.Types.Poison Then
+                            .BattleQuery.Add(New TextQueryObject(p.GetDisplayName() & " removed the Toxic Spikes!"))
+                            .FieldEffects.OwnToxicSpikes = 0
+                        End If
+                    End If
+                End If
+
+                If rockAffected = True Then
+                    If .FieldEffects.OwnStealthRock > 0 And p.Ability.Name.ToLower() <> "magic guard" Then
+                        Dim rocksDamage As Double = 1D
+
+                        Dim effectiveness As Single = BattleCalculation.ReverseTypeEffectiveness(Element.GetElementMultiplier(New Element(Element.Types.Rock), p.Type1)) * BattleCalculation.ReverseTypeEffectiveness(Element.GetElementMultiplier(New Element(Element.Types.Rock), p.Type2))
+                        Select Case effectiveness
+                            Case 0.25F
+                                rocksDamage = (p.MaxHP / 100) * 3.125D
+                            Case 0.5F
+                                rocksDamage = (p.MaxHP / 100) * 6.25D
+                            Case 1.0F
+                                rocksDamage = (p.MaxHP / 100) * 12.5D
+                            Case 2.0F
+                                rocksDamage = (p.MaxHP / 100) * 25D
+                            Case 4.0F
+                                rocksDamage = (p.MaxHP / 100) * 50D
+                        End Select
+
+                        BattleScreen.Battle.ReduceHP(CInt(rocksDamage), False, True, BattleScreen, "The Stealth Rocks hurt " & p.GetDisplayName() & "!", "stealthrocks")
+                    End If
+                End If
+
+                BattleScreen.Battle.TriggerAbilityEffect(BattleScreen, False)
+                BattleScreen.Battle.TriggerItemEffect(BattleScreen, False)
+
+                If .OppPokemon.Status = Pokemon.StatusProblems.Sleep Then
+                    .FieldEffects.OppSleepTurns = Core.Random.Next(1, 4)
+                End If
+
+                If BattleScreen.FieldEffects.OppHealingWish = True Then
+                    BattleScreen.FieldEffects.OppHealingWish = False
+
+                    If .OppPokemon.HP < .OppPokemon.MaxHP Or .OppPokemon.Status <> Pokemon.StatusProblems.None Then
+                        BattleScreen.Battle.GainHP(.OppPokemon.MaxHP - .OppPokemon.HP, False, False, BattleScreen, "The Healing Wish came true for " & .OppPokemon.GetDisplayName() & "!", "move:healingwish")
+                        BattleScreen.Battle.CureStatusProblem(False, False, BattleScreen, "", "move:healingwish")
+                    End If
+                End If
+            End With
+        End Sub
         Public Overrides Sub Update(BV2Screen As BattleScreen)
             If TextReady = False Then
                 UpdateText()

P3D/Battle/BattleSystemV2/QueryObjects/TextQueryObject.vb

@@ -29,6 +29,7 @@
             Me._text = Me._text.Replace("~", " ")
             Me._text = Me._text.Replace("<player.name>", Core.Player.Name)
             Me._text = Me._text.Replace("<playername>", Core.Player.Name)
+            Me._text = Me._text.Replace("<rival.name>", Core.Player.RivalName)
             Me._text = Me._text.Replace("<rivalname>", Core.Player.RivalName)
             Me._text = Me._text.Replace("[POKE]", "Poké")
 
@@ -58,9 +59,11 @@
                     Me._textIndex = Me._text.Length
                 End If
             Else
-                If Controls.Accept(True, True) = True Then
-                    SoundManager.PlaySound("select")
-                    Me._ready = True
+                If CurrentScreen.Identification <> Screen.Identifications.PauseScreen AndAlso CurrentScreen.Identification <> Screen.Identifications.ChatScreen Then
+                    If Controls.Accept(True, True) = True Then
+                        SoundManager.PlaySound("select")
+                        Me._ready = True
+                    End If
                 End If
             End If
         End Sub
@@ -77,11 +80,11 @@
 
             If GamePad.GetState(PlayerIndex.One).IsConnected = True And Core.GameOptions.GamePadEnabled = True And BV2Screen.IsCurrentScreen() = True Then
                 Dim d As New Dictionary(Of Buttons, String)
-                d.Add(Buttons.A, "OK")
+                d.Add(Buttons.A, Localization.GetString("global_ok", "OK"))
                 BV2Screen.DrawGamePadControls(d, New Vector2(rec.X + rec.Width - 100, rec.Y + rec.Height - 40))
             Else
                 If TextReady = True Then
-                    Core.SpriteBatch.DrawString(FontManager.TextFont, "OK", New Vector2(rec.X + rec.Width - (FontManager.TextFont.MeasureString("OK").X * 2.0F) - 20, rec.Y + rec.Height - (FontManager.TextFont.MeasureString("OK").Y * 2.0F) - 5), Color.White, 0.0F, Vector2.Zero, 2.0F, SpriteEffects.None, 0.0F)
+                    Core.SpriteBatch.DrawString(FontManager.TextFont, Localization.GetString("global_ok", "OK"), New Vector2(rec.X + rec.Width - (FontManager.TextFont.MeasureString(Localization.GetString("global_ok", "OK")).X * 2.0F) - 20, rec.Y + rec.Height - (FontManager.TextFont.MeasureString(Localization.GetString("global_ok", "OK")).Y * 2.0F) - 5), Color.White, 0.0F, Vector2.Zero, 2.0F, SpriteEffects.None, 0.0F)
                 End If
             End If
         End Sub

P3D/Battle/BattleSystemV2/QueryObjects/ToggleEntityQueryObject.vb

@@ -79,16 +79,9 @@
         Public Overrides Sub Update(BV2Screen As BattleScreen)
             If changedIDs = False Then
                 changedIDs = True
-
-                If Me.ownModelID > -1 Then
-                    BV2Screen.OwnPokemonModel.ID = ownModelID
-                End If
                 If Me.ownNPCID > -1 Then
                     BV2Screen.OwnPokemonNPC.ID = ownNPCID
                 End If
-                If Me.oppModelID > -1 Then
-                    BV2Screen.OppPokemonModel.ID = oppModelID
-                End If
                 If Me.oppNPCID > -1 Then
                     BV2Screen.OppPokemonNPC.ID = oppNPCID
                 End If
@@ -98,37 +91,36 @@
                 Case 0
                     Select Case Me._entity
                         Case BattleEntities.OwnPokemon
-                            If BV2Screen.OwnPokemonNPC.ID = 1 Then
-                                BV2Screen.OwnPokemonNPC.Visible = GetVisible(BV2Screen.OwnPokemonNPC.Visible)
-                                BV2Screen.OwnPokemonModel.Visible = False
-                            Else
-                                BV2Screen.OwnPokemonModel.Visible = GetVisible(BV2Screen.OwnPokemonModel.Visible)
-                                BV2Screen.OwnPokemonNPC.Visible = False
-                            End If
+                            BV2Screen.OwnPokemonNPC.Visible = GetVisible(BV2Screen.OwnPokemonNPC.Visible)
                         Case BattleEntities.OppPokemon
-                            If BV2Screen.OppPokemonNPC.ID = 1 Then
-                                BV2Screen.OppPokemonNPC.Visible = GetVisible(BV2Screen.OppPokemonNPC.Visible)
-                                BV2Screen.OppPokemonModel.Visible = False
-                            Else
-                                BV2Screen.OppPokemonModel.Visible = GetVisible(BV2Screen.OppPokemonModel.Visible)
-                                BV2Screen.OppPokemonNPC.Visible = False
-                            End If
+                            BV2Screen.OppPokemonNPC.Visible = GetVisible(BV2Screen.OppPokemonNPC.Visible)
                     End Select
                 Case 1
                     Select Case Me._entity
                         Case BattleEntities.OwnPokemon
+                            BV2Screen.OwnPokemonNPC.ModelPath = ""
+                            BV2Screen.OwnPokemonNPC.Model = Nothing
+                            BV2Screen.OwnPokemonNPC.Scale = New Vector3(1)
                             BV2Screen.OwnPokemonNPC.SetupSprite(_newTexture, "", False)
+
                         Case BattleEntities.OppPokemon
+                            BV2Screen.OppPokemonNPC.ModelPath = ""
+                            BV2Screen.OppPokemonNPC.Model = Nothing
+                            BV2Screen.OppPokemonNPC.Scale = New Vector3(1)
                             BV2Screen.OppPokemonNPC.SetupSprite(_newTexture, "", False)
                     End Select
                 Case 2
                     Select Case Me._entity
                         Case BattleEntities.OwnPokemon
-                            BV2Screen.OwnPokemonModel.ModelPath = _newTexture
-                            BV2Screen.OwnPokemonModel.Model = ModelManager.GetModel(BV2Screen.OwnPokemonModel.ModelPath)
+                            BV2Screen.OwnPokemonNPC.Scale = New Vector3(BV2Screen.OwnPokemon.GetModelProperties().Item1) * ModelManager.MODELSCALE * GameModeManager.PokeModelScale
+                            BV2Screen.OwnPokemonNPC.Rotation = NPC.GetRotationFromInteger(BV2Screen.OwnPokemonNPC.faceRotation) + GameModeManager.PokeModelRotation
+                            BV2Screen.OwnPokemonNPC.ModelPath = _newTexture
+                            BV2Screen.OwnPokemonNPC.Model = ModelManager.GetModel(BV2Screen.OwnPokemonNPC.ModelPath)
                         Case BattleEntities.OppPokemon
-                            BV2Screen.OppPokemonModel.ModelPath = _newTexture
-                            BV2Screen.OppPokemonModel.Model = ModelManager.GetModel(BV2Screen.OppPokemonModel.ModelPath)
+                            BV2Screen.OppPokemonNPC.Scale = New Vector3(BV2Screen.OppPokemon.GetModelProperties().Item1) * ModelManager.MODELSCALE * GameModeManager.PokeModelScale
+                            BV2Screen.OppPokemonNPC.Rotation = NPC.GetRotationFromInteger(BV2Screen.OppPokemonNPC.faceRotation) + GameModeManager.PokeModelRotation
+                            BV2Screen.OppPokemonNPC.ModelPath = _newTexture
+                            BV2Screen.OppPokemonNPC.Model = ModelManager.GetModel(BV2Screen.OppPokemonNPC.ModelPath)
                     End Select
             End Select
             _done = True

P3D/Battle/BattleSystemV2/QueryObjects/TriggerNewRoundPVPQueryObject.vb

@@ -10,7 +10,9 @@
         End Sub
 
         Public Overrides Sub Update(BV2Screen As BattleScreen)
-            BattleScreen.ReceivedInput = ""
+            If BattleScreen.FirstRound = False Then
+                BattleScreen.ReceivedInput = ""
+            End If
             BV2Screen.SentHostData = False
             BattleScreen.ReceivedQuery = ""
             BV2Screen.SentInput = False

P3D/Battle/BattleSystemV2/TrainerAI.vb

@@ -1,17 +1,19 @@
-Namespace BattleSystem
+Imports P3D.BattleSystem.Battle
+
+Namespace BattleSystem
 
     Public Class TrainerAI
 
         'Trainer AI Levels:---------------------------------------------------------------------------------------------------------------------
-        'Normal Trainers: 0-20 (0 being not very smart trainers like Bugcatchers, 20 being Cooltrainers, get higher levels when rematches occur)
-        '(Johto) Gym Leaders: 10-40 (10 for Falkner, 40 for Clair)
-        '(Kanto) Gym Leaders: All 60
-        'Elite 4: 60
-        'Lance: 100
-        'Elder Li: 10
-        'Rival: 40
-        'Team Rocket Grunts: 5
-        'Team Rocket Admins: 20
+        'Normal Trainers: 0-1 (0 being not very smart trainers like Bugcatchers, 1 being Cooltrainers, get higher levels when rematches occur)
+        '(Johto) Gym Leaders: 0-2 (0 for Falkner, 2 for Clair)
+        '(Kanto) Gym Leaders: All 2
+        'Elite 4: 2
+        'Lance: 2
+        'Elder Li: 0
+        'Rival: 2
+        'Team Rocket Grunts: 0
+        'Team Rocket Admins: 1
 
         Public Shared Function GetAIMove(ByVal BattleScreen As BattleScreen, ByVal OwnStep As Battle.RoundConst) As Battle.RoundConst
             Dim p As Pokemon = BattleScreen.OppPokemon
@@ -101,28 +103,56 @@
             ' - use never-miss attack when own accuracy is low/opp evasion is high
 
             '-------------------------------------AI BEGIN------------------------------------------------------------------------------------'
+            '-------------------------------------Encore Move if an encore is in effect-------------------------------------------------------'
+
+            If BattleScreen.FieldEffects.OppEncore > 0 Then
+                Dim attackIndex As Integer = -1
+                For a = 0 To p.Attacks.Count - 1
+                    If p.Attacks(a).ID = BattleScreen.FieldEffects.OppEncoreMove.ID Then
+                        attackIndex = a
+                    End If
+                Next
+                If attackIndex <> -1 AndAlso p.Attacks(attackIndex).CurrentPP > 0 Then
+                    Return New RoundConst() With {.StepType = RoundConst.StepTypes.Move, .Argument = BattleScreen.FieldEffects.OppEncoreMove}
+                Else
+                    BattleScreen.FieldEffects.OppEncoreMove = Nothing
+                    BattleScreen.FieldEffects.OppEncore = 0
+                    BattleScreen.BattleQuery.Add(New TextQueryObject(p.GetDisplayName() & "'s encore stopped."))
+                End If
+            End If
 
             '-------------------------------------Random move depending on difficulty---------------------------------------------------------'
 
-            'Only applies if trainer has an AI level below 20:
-            If BattleScreen.Trainer.AILevel < 20 Then
-                If Core.Player.DifficultyMode = 0 Then
-                    'Chance of 35% that the trainer is using a random move:
-                    If Core.Random.Next(0, 100) < 35 Then
-                        Return ProduceOppStep(m, Core.Random.Next(0, m.Count))
-                    End If
-                ElseIf Core.Player.DifficultyMode = 1 Then
-                    'Chance of 18% that the trainer is using a random move:
-                    If Core.Random.Next(0, 100) < 18 Then
-                        Return ProduceOppStep(m, Core.Random.Next(0, m.Count))
+            'Only applies if trainer has an AI level of 0:
+            If BattleScreen.Trainer.AILevel <= 0 Then
+                Dim AvailableAttacks As List(Of Integer) = New List(Of Integer)
+                For i = 0 To m.Count - 1
+                    AvailableAttacks.Add(i)
+                Next
+                Dim OppAttackChoice As Integer = Core.Random.Next(0, AvailableAttacks.Count)
+                Dim Ready As Boolean = False
+                While Ready = False
+                    If m(OppAttackChoice) Is BattleScreen.FieldEffects.OppTormentMove OrElse m(OppAttackChoice).Disabled > 0 OrElse BattleScreen.FieldEffects.OppTaunt > 0 AndAlso BattleScreen.OppPokemon.Attacks(OppAttackChoice).Category = Attack.Categories.Status Then
+                        AvailableAttacks.Remove(OppAttackChoice)
+                        If AvailableAttacks.Count > 0 Then
+                            OppAttackChoice = AvailableAttacks(Core.Random.Next(0, AvailableAttacks.Count))
+                        Else
+                            Return New RoundConst() With {.StepType = RoundConst.StepTypes.Move, .Argument = Attack.GetAttackByID(165)}
+                        End If
+                    Else
+                        Ready = True
                     End If
+                End While
+                'Chance of 35% that the trainer is using a random move:
+                If Core.Random.Next(0, 100) < 35 Then
+                    Return ProduceOppStep(m, OppAttackChoice)
                 End If
             End If
 
             '-------------------------------------Switching-----------------------------------------------------------------------------------'
 
-            'Only applies if trainer has an AI level above or equal 40:
-            If BattleScreen.Trainer.AILevel >= 40 Then
+            'Only applies if trainer has an AI level above or equal to 2:
+            If BattleScreen.Trainer.AILevel >= 2 Then
                 If BattleCalculation.CanSwitch(BattleScreen, False) = True Then
                     If BattleScreen.Trainer.Pokemons.Count > 0 Then
                         Dim living As Integer = 0
@@ -347,13 +377,17 @@
             '-------------------------------------Moves---------------------------------------------------------------------------------------'
 
             'If own pokemon is asleep, try to use Sleep Talk (100%)
-            If p.Status = Pokemon.StatusProblems.Sleep And BattleScreen.FieldEffects.OppSleepTurns > 1 And HasMove(m, 214) = True Then
-                Return ProduceOppStep(m, IDtoMoveIndex(m, 214))
+            If p.Status = Pokemon.StatusProblems.Sleep And BattleScreen.FieldEffects.OppSleepTurns > 1 And HasMove(m, 214) = True AndAlso m(IDtoMoveIndex(m, 214)).Disabled = 0 AndAlso m(IDtoMoveIndex(m, 214)) IsNot BattleScreen.FieldEffects.OppTormentMove Then
+                If BattleScreen.FieldEffects.OppTaunt = 0 OrElse m(IDtoMoveIndex(m, 214)).Category <> Attack.Categories.Status Then
+                    Return ProduceOppStep(m, IDtoMoveIndex(m, 214))
+                End If
             End If
 
             'If own pokemon is asleep, try to use Snore (100%)
-            If p.Status = Pokemon.StatusProblems.Sleep And BattleScreen.FieldEffects.OppSleepTurns > 1 And HasMove(m, 173) = True Then
-                Return ProduceOppStep(m, IDtoMoveIndex(m, 173))
+            If p.Status = Pokemon.StatusProblems.Sleep And BattleScreen.FieldEffects.OppSleepTurns > 1 And HasMove(m, 173) = True AndAlso m(IDtoMoveIndex(m, 173)).Disabled = 0 AndAlso m(IDtoMoveIndex(m, 173)) IsNot BattleScreen.FieldEffects.OppTormentMove Then
+                If BattleScreen.FieldEffects.OppTaunt = 0 OrElse m(IDtoMoveIndex(m, 173)).Category <> Attack.Categories.Status Then
+                    Return ProduceOppStep(m, IDtoMoveIndex(m, 173))
+                End If
             End If
 
             'If own pokemon is frozen and has a move to thraw out -> use that move
@@ -365,7 +399,7 @@
             End If
 
             'Fake Out if first turn -> try to inflict flinch (100%)
-            If HasMove(m, 252) = True Then
+            If HasMove(m, 252) = True AndAlso m(IDtoMoveIndex(m, 252)).Disabled = 0 AndAlso m(IDtoMoveIndex(m, 252)) IsNot BattleScreen.FieldEffects.OppTormentMove Then
                 If op.Ability.Name.ToLower() <> "inner focus" Then
                     Dim turns As Integer = BattleScreen.FieldEffects.OppPokemonTurns
                     If turns = 0 Then
@@ -386,7 +420,7 @@
 
             'use attacking move if speed is higher than opp speed and opponent has low health (<= 30%) (75%)
             If p.Speed > op.Speed And op.HP <= CInt((op.MaxHP / 100) * 30) Then
-                Dim chosenMove As Integer = GetAttackingMove(BattleScreen, m)
+                Dim chosenMove As Integer = MoveAI(m, Attack.AIField.Damage)
                 If chosenMove > -1 Then
                     If CheckForTypeIneffectiveness(BattleScreen, m, chosenMove) = True Then
                         Return ProduceOppStep(m, chosenMove)
@@ -518,9 +552,11 @@
             'try to set up leech seed (75%)
             If op.IsType(Element.Types.Grass) = False Then
                 If BattleScreen.FieldEffects.OwnLeechSeed = 0 Then
-                    If HasMove(m, 73) = True Then
-                        If RPercent(75) = True Then
-                            Return ProduceOppStep(m, IDtoMoveIndex(m, 73))
+                    If HasMove(m, 73) = True AndAlso m(IDtoMoveIndex(m, 73)).Disabled = 0 AndAlso m(IDtoMoveIndex(m, 73)) IsNot BattleScreen.FieldEffects.OppTormentMove Then
+                        If BattleScreen.FieldEffects.OppTaunt = 0 OrElse m(IDtoMoveIndex(m, 75)).Category <> Attack.Categories.Status Then
+                            If RPercent(75) = True Then
+                                Return ProduceOppStep(m, IDtoMoveIndex(m, 73))
+                            End If
                         End If
                     End If
                 End If
@@ -528,9 +564,11 @@
 
             'try to use FocusEnergy (50%)
             If BattleScreen.FieldEffects.OppFocusEnergy = 0 Then
-                If HasMove(m, 116) = True Then
-                    If RPercent(50) = True Then
-                        Return ProduceOppStep(m, IDtoMoveIndex(m, 116))
+                If HasMove(m, 116) = True AndAlso m(IDtoMoveIndex(m, 116)).Disabled = 0 AndAlso m(IDtoMoveIndex(m, 116)) IsNot BattleScreen.FieldEffects.OppTormentMove Then
+                    If BattleScreen.FieldEffects.OppTaunt = 0 OrElse m(IDtoMoveIndex(m, 116)).Category <> Attack.Categories.Status Then
+                        If RPercent(50) = True Then
+                            Return ProduceOppStep(m, IDtoMoveIndex(m, 116))
+                        End If
                     End If
                 End If
             End If
@@ -622,21 +660,31 @@
 
             'Use LightScreen/Reflect (75%):
             If RPercent(75) = True Then
-                If HasMove(m, 113) = True And op.SpAttack > op.Attack And BattleScreen.FieldEffects.OppLightScreen = 0 Then
-                    Return ProduceOppStep(m, IDtoMoveIndex(m, 113))
+                If HasMove(m, 113) = True And op.SpAttack > op.Attack And BattleScreen.FieldEffects.OppLightScreen = 0 AndAlso m(IDtoMoveIndex(m, 113)).Disabled = 0 AndAlso m(IDtoMoveIndex(m, 113)) IsNot BattleScreen.FieldEffects.OppTormentMove Then
+                    If BattleScreen.FieldEffects.OppTaunt = 0 OrElse m(IDtoMoveIndex(m, 113)).Category <> Attack.Categories.Status Then
+                        Return ProduceOppStep(m, IDtoMoveIndex(m, 113))
+                    End If
                 End If
-                If HasMove(m, 115) = True And op.Attack > op.SpAttack And BattleScreen.FieldEffects.OppReflect = 0 Then
-                    Return ProduceOppStep(m, IDtoMoveIndex(m, 115))
+                If HasMove(m, 115) = True And op.Attack > op.SpAttack And BattleScreen.FieldEffects.OppReflect = 0 AndAlso m(IDtoMoveIndex(m, 115)).Disabled = 0 AndAlso m(IDtoMoveIndex(m, 115)) IsNot BattleScreen.FieldEffects.OppTormentMove Then
+                    If BattleScreen.FieldEffects.OppTaunt = 0 OrElse m(IDtoMoveIndex(m, 115)).Category <> Attack.Categories.Status Then
+                        Return ProduceOppStep(m, IDtoMoveIndex(m, 115))
+                    End If
                 End If
             End If
 
             'Special Moveset combos:
             ' - Defense Curl + Rollout
             If HasMove(m, 205) = True And HasMove(m, 111) = True Then
-                If BattleScreen.FieldEffects.OppDefenseCurl = 0 Then
-                    Return ProduceOppStep(m, IDtoMoveIndex(m, 111))
+                If BattleScreen.FieldEffects.OppDefenseCurl = 0 AndAlso m(IDtoMoveIndex(m, 111)).Disabled = 0 AndAlso m(IDtoMoveIndex(m, 111)) IsNot BattleScreen.FieldEffects.OppTormentMove Then
+                    If BattleScreen.FieldEffects.OppTaunt = 0 OrElse m(IDtoMoveIndex(m, 111)).Category <> Attack.Categories.Status Then
+                        Return ProduceOppStep(m, IDtoMoveIndex(m, 111))
+                    End If
                 Else
-                    Return ProduceOppStep(m, IDtoMoveIndex(m, 205))
+                    If BattleScreen.FieldEffects.OppTaunt = 0 OrElse m(IDtoMoveIndex(m, 205)).Category <> Attack.Categories.Status Then
+                        If m(IDtoMoveIndex(m, 205)).Disabled = 0 Then
+                            Return ProduceOppStep(m, IDtoMoveIndex(m, 205))
+                        End If
+                    End If
                 End If
             End If
 
@@ -644,8 +692,10 @@
 
             Dim attackDic As New Dictionary(Of Integer, Integer)
             For i = 0 To m.Count - 1
-                If MoveHasAIField(m(i), Attack.AIField.Damage) = True Then
-                    attackDic.Add(i, 0)
+                If MoveHasAIField(m(i), Attack.AIField.Damage) = True AndAlso m(i).Disabled = 0 AndAlso m(i) IsNot BattleScreen.FieldEffects.OppTormentMove Then
+                    If BattleScreen.FieldEffects.OppTaunt = 0 OrElse m(IDtoMoveIndex(m, 214)).Category <> Attack.Categories.Status Then
+                        attackDic.Add(i, 0)
+                    End If
                 End If
             Next
             'If has more than 0 attacking moves:
@@ -792,8 +842,31 @@
                 Return ProduceOppStep(m, chosenAttackMove)
             End If
 
-            'catch crash: return random move:
-            Return ProduceOppStep(m, Core.Random.Next(0, m.Count))
+            'if no attacking moves, return random move:
+            If BattleScreen.Trainer.AILevel >= 0 Then
+                Dim AvailableAttacks As List(Of Integer) = New List(Of Integer)
+                For i = 0 To m.Count - 1
+                    AvailableAttacks.Add(i)
+                Next
+                Dim OppAttackChoice As Integer = Core.Random.Next(0, AvailableAttacks.Count)
+                Dim Ready As Boolean = False
+                While Ready = False
+                    If m(OppAttackChoice) Is BattleScreen.FieldEffects.OppTormentMove OrElse m(OppAttackChoice).Disabled > 0 OrElse BattleScreen.FieldEffects.OppTaunt > 0 AndAlso BattleScreen.OppPokemon.Attacks(OppAttackChoice).Category = Attack.Categories.Status Then
+                        AvailableAttacks.Remove(OppAttackChoice)
+                        If AvailableAttacks.Count > 0 Then
+                            OppAttackChoice = AvailableAttacks(Core.Random.Next(0, AvailableAttacks.Count))
+                        Else
+                            Return New RoundConst() With {.StepType = RoundConst.StepTypes.Move, .Argument = Attack.GetAttackByID(165)}
+                        End If
+                    Else
+                        Ready = True
+                    End If
+                End While
+                Return ProduceOppStep(m, OppAttackChoice)
+            End If
+
+            'catch crash: return struggle
+            Return New RoundConst() With {.StepType = RoundConst.StepTypes.Move, .Argument = Attack.GetAttackByID(165)}
         End Function
 
         Private Shared Function HasOtherAttackingMoveThanExplosion(ByVal m As List(Of Attack), ByVal leaveOutIndex As Integer) As Boolean
@@ -835,9 +908,17 @@
 
         Private Shared Function MoveAI(ByVal m As List(Of Attack), ByVal AIType As Attack.AIField) As Integer
             Dim validMoves As New List(Of Integer)
+            Dim _battleScreen As Screen = Core.CurrentScreen
+            While _battleScreen.Identification <> Screen.Identifications.BattleScreen
+                _battleScreen = _battleScreen.PreScreen
+            End While
             For i = 0 To m.Count - 1
-                If m(i).AIField1 = AIType Or m(i).AIField2 = AIType Or m(i).AIField3 = AIType Then
-                    validMoves.Add(i)
+                If m(i).Disabled = 0 AndAlso m(i) IsNot CType(_battleScreen, BattleScreen).FieldEffects.OppTormentMove Then
+                    If CType(_battleScreen, BattleScreen).FieldEffects.OppTaunt = 0 OrElse m(i).Category <> Attack.Categories.Status Then
+                        If m(i).AIField1 = AIType Or m(i).AIField2 = AIType Or m(i).AIField3 = AIType Then
+                            validMoves.Add(i)
+                        End If
+                    End If
                 End If
             Next
 

P3D/Battle/Trainer.vb

@@ -23,7 +23,7 @@ Public Class Trainer
 
     Public VSImageOrigin As String = "VSIntro"
     Public VSImagePosition As Vector2 = New Vector2(0, 0)
-    Public VSImageSize As Size = New Size(61, 54)
+    Public VSImageSize As Size = New Size(64, 64)
     Public BarImagePosition As Vector2 = New Vector2(0, 0)
 
     Public OutroMessage As String = "TRAINER_DEFAULT_MESSAGE"
@@ -140,7 +140,7 @@ Public Class Trainer
                             isDoubleTrainerValid += 1
                         End If
                     Case "money"
-                        Me.Money = CInt(ScriptCommander.Parse(value).ToString())
+                        Me.Money = CInt(ScriptConversion.ToInteger(ScriptCommander.Parse(value).ToString()))
                     Case "intromessage"
                         Me.IntroMessage = ScriptCommander.Parse(value).ToString()
                     Case "outromessage"
@@ -179,7 +179,7 @@ Public Class Trainer
                         If value <> "" Then
                             Dim itemData() As String = ScriptCommander.Parse(value).ToString().Split(CChar(","))
                             For Each ItemID As String In itemData
-                                Items.Add(Item.GetItemByID(CInt(ItemID)))
+                                Items.Add(Item.GetItemByID(ItemID.ToString))
                             Next
                         End If
                     Case "gender"
@@ -212,23 +212,30 @@ Public Class Trainer
                 If PokeData.StartsWith("{") = True And PokeData.EndsWith("}") = True Then
                     Dim p As Pokemon = Pokemon.GetPokemonByData(PokeData)
 
-                    If Core.Player.DifficultyMode > 0 Then
-                        Dim level As Integer = p.Level
+                    Dim level As Integer = p.Level
 
-                        Dim addLevel As Integer = 0
-                        If Core.Player.DifficultyMode = 1 Then
-                            addLevel = CInt(Math.Ceiling(level / 10))
-                        ElseIf Core.Player.DifficultyMode = 2 Then
-                            addLevel = CInt(Math.Ceiling(level / 5))
-                        End If
-
-                        While level + addLevel > p.Level
-                            p.LevelUp(False)
-                            p.Experience = p.NeedExperience(p.Level)
-                        End While
-                        p.HP = p.MaxHP
+                    Dim addLevel As Integer = 0
+                    If Core.Player.DifficultyMode = 0 Then
+                        addLevel = CInt(Math.Ceiling(level * CSng(GameModeManager.GetGameRuleValue("LevelMultiplier", "1.0").InsertDecSeparator) - level))
+                    ElseIf Core.Player.DifficultyMode = 1 Then
+                        addLevel = CInt(Math.Ceiling(level * CSng(GameModeManager.GetGameRuleValue("LevelMultiplier", "1.1").InsertDecSeparator) - level))
+                    ElseIf Core.Player.DifficultyMode = 2 Then
+                        addLevel = CInt(Math.Ceiling(level * CSng(GameModeManager.GetGameRuleValue("LevelMultiplier", "1.2").InsertDecSeparator) - level))
                     End If
 
+                    If level + addLevel > CInt(GameModeManager.GetGameRuleValue("MaxLevel", "100")) Then
+                        addLevel = CInt(GameModeManager.GetGameRuleValue("MaxLevel", "100")) - level
+                    End If
+                    If addLevel <= 0 Then
+                        addLevel = 0
+                    End If
+
+                    While level + addLevel > p.Level
+                        p.LevelUp(False)
+                        p.Experience = p.NeedExperience(p.Level)
+                    End While
+                    p.HP = p.MaxHP
+
                     Pokemons.Add(p)
                 Else
                     Dim firstPart As String = ""
@@ -263,7 +270,7 @@ Public Class Trainer
                     Dim PK As String = ScriptCommander.Parse(firstPart).ToString()
                     Dim Level As Integer = ScriptConversion.ToInteger(ScriptCommander.Parse(secondPart))
 
-                    Dim ID As Integer = CInt(PK.Split(CChar("_"))(0))
+                    Dim ID As Integer = ScriptConversion.ToInteger(PK.Split(CChar("_"))(0))
                     Dim AD As String = ""
 
                     If PK.Contains(CChar("_")) Then
@@ -271,11 +278,20 @@ Public Class Trainer
                     End If
 
                     Dim addLevel As Integer = 0
-                    If Core.Player.DifficultyMode = 1 Then
-                        addLevel = CInt(Math.Ceiling(Level / 10))
+                    If Core.Player.DifficultyMode = 0 Then
+                        addLevel = CInt(Math.Ceiling(Level * CSng(GameModeManager.GetGameRuleValue("LevelMultiplier", "1.0").InsertDecSeparator) - Level))
+                    ElseIf Core.Player.DifficultyMode = 1 Then
+                        addLevel = CInt(Math.Ceiling(Level * CSng(GameModeManager.GetGameRuleValue("LevelMultiplier", "1.1").InsertDecSeparator) - Level))
                     ElseIf Core.Player.DifficultyMode = 2 Then
-                        addLevel = CInt(Math.Ceiling(Level / 5))
+                        addLevel = CInt(Math.Ceiling(Level * CSng(GameModeManager.GetGameRuleValue("LevelMultiplier", "1.2").InsertDecSeparator) - Level))
                     End If
+                    If Level + addLevel > CInt(GameModeManager.GetGameRuleValue("MaxLevel", "100")) Then
+                        addLevel = CInt(GameModeManager.GetGameRuleValue("MaxLevel", "100")) - Level
+                    End If
+                    If addLevel <= 0 Then
+                        addLevel = 0
+                    End If
+
                     Level += addLevel
 
                     Dim maxLevel As Integer = CInt(GameModeManager.GetGameRuleValue("MaxLevel", "100"))
@@ -332,25 +348,25 @@ Public Class Trainer
                 Me.VSImagePosition = New Vector2(0, 0)
             Case "orange", "1"
                 Me.VSImagePosition = New Vector2(1, 0)
-            Case "green", "2"
+            Case "lightgreen", "2"
                 Me.VSImagePosition = New Vector2(0, 1)
-            Case "3"
+            Case "gray", "3"
                 Me.VSImagePosition = New Vector2(1, 1)
-            Case "4"
+            Case "violet", "4"
                 Me.VSImagePosition = New Vector2(0, 2)
-            Case "5"
+            Case "green", "5"
                 Me.VSImagePosition = New Vector2(1, 2)
-            Case "6"
+            Case "yellow", "6"
                 Me.VSImagePosition = New Vector2(0, 3)
-            Case "7"
+            Case "brown", "7"
                 Me.VSImagePosition = New Vector2(1, 3)
-            Case "8"
+            Case "lightblue", "8"
                 Me.VSImagePosition = New Vector2(0, 4)
-            Case "9"
+            Case "lightgray", "9"
                 Me.VSImagePosition = New Vector2(1, 4)
             Case "red", "10"
                 Me.VSImagePosition = New Vector2(0, 5)
-            Case "11"
+            Case "empty", "11"
                 Me.VSImagePosition = New Vector2(1, 5)
             Case "battlefrontier"
                 Me.VSImagePosition = New Vector2(0, 0)
@@ -392,7 +408,7 @@ Public Class Trainer
                 Me.BarImagePosition = New Vector2(1, 4)
             Case "red", "10"
                 Me.BarImagePosition = New Vector2(0, 5)
-            Case "11"
+            Case "empty", "11"
                 Me.BarImagePosition = New Vector2(1, 5)
             Case Else
                 If StringHelper.IsNumeric(barType) = True Then
@@ -491,4 +507,4 @@ Public Class Trainer
         Return i
     End Function
 
-End Class
+End Class