Added engine support for all of the remaining Mega Evolutions.

2017-02-14 00:42:01 -05:00 · 2017-02-14 00:42:01 -05:00 · cb99faa0ff
parent 87709056d7
commit cb99faa0ff
50 changed files with 1994 additions and 37 deletions
--- a/2.5DHero/2.5DHero/Pokemon/Monster/Resource/PokemonForms.vb
+++ b/2.5DHero/2.5DHero/Pokemon/Monster/Resource/PokemonForms.vb
@ -4,9 +4,9 @@ Public Class PokemonForms

    Public Shared Sub Initialize()
        _pokemonList.Clear()
-        _pokemonList.AddRange({New Charizard(), New Beedrill(), New Pidgeot(), New Nidoran(), New Alakazam(), New Slowbro(), New Gengar(),
-                               New Pichu(), New Unown(), New Ampharos(), New Steelix(), New Scizor(), New Heracross(), New Tyranitar(),
-                               New Sceptile(), New Blaziken(), New Swampert(), New Gardevoir(), New Aggron(), New Medicham(), New Camerupt(), New Altaria(), New Banette(), New Absol(), New Metagross(), New Kyogre(), New Groudon(), New Deoxys(),
+        _pokemonList.AddRange({New Venusaur(), New Charizard(), New Blastoise(), New Beedrill(), New Pidgeot(), New Nidoran(), New Alakazam(), New Slowbro(), New Gengar(), New Kangaskhan(), New Pinsir(), New Gyarados(), New Aerodactyl(), New Mewtwo(),
+                               New Pichu(), New Unown(), New Ampharos(), New Steelix(), New Scizor(), New Heracross(), New Houndoom(), New Tyranitar(),
+                               New Sceptile(), New Blaziken(), New Swampert(), New Gardevoir(), New Sableye(), New Mawile(), New Aggron(), New Medicham(), New Manectric(), New Sharpedo(), New Camerupt(), New Altaria(), New Banette(), New Absol(), New Glalie(), New Salamence(), New Metagross(), New Latias(), New Latios(), New Kyogre(), New Groudon(), New Rayquaza(), New Deoxys(),
                               New Burmy(), New Shellos(), New Gastrodon(), New Lopunny(), New Garchomp(), New Lucario(), New Abomasnow(), New Gallade(), New Rotom(), New Dialga(), New Arceus(),
                               New Audino(), New Basculin(), New Deerling(), New Sawsbuck(), New Frillish(), New Jellicent(), New Tornadus(), New Thundurus(), New Landorus(), New Kyurem(),
                               New Vivillon(), New Pyroar(), New Aegislash(), New Diancie()})
@ -194,6 +194,47 @@ Public Class PokemonForms
        End Function

    End Class
+
+    Private Class Venusaur
+        Inherits PokemonForm
+        Public Sub New()
+            MyBase.New(3)
+        End Sub
+        Public Overrides Function GetMenuImagePosition(ByVal P As Pokemon) As Vector2
+            Select Case P.AdditionalData
+                Case "mega"
+                    Return New Vector2(24, 29)
+                Case Else
+                    Return New Vector2(2, 0)
+            End Select
+        End Function
+        Public Overrides Function GetDataFileAddition(ByVal AdditionalData As String) As String
+            Select Case AdditionalData.ToLower()
+                Case "mega"
+                    Return "_mega"
+                Case Else
+                    Return ""
+            End Select
+        End Function
+        Public Overrides Function GetAnimationName(ByVal P As Pokemon) As String
+            Select Case P.AdditionalData
+                Case "mega"
+                    Return P.OriginalName & "_mega"
+                Case Else
+                    Return P.OriginalName
+            End Select
+        End Function
+
+        Public Overrides Function GetOverworldAddition(ByVal P As Pokemon) As String
+            Select Case P.AdditionalData
+                Case "mega"
+                    Return "_mega"
+                Case Else
+                    Return ""
+            End Select
+        End Function
+    End Class
+
    Private Class Charizard
        Inherits PokemonForm
        Public Sub New()
@ -216,7 +257,7 @@ Public Class PokemonForms
                Case "mega_y"
                    Return New Size(38, 32)
                Case Else
-                    Return New Size(35, 32)
+                    Return New Size(32, 32)
            End Select
        End Function
        Public Overrides Function GetDataFileAddition(ByVal AdditionalData As String) As String
@ -252,6 +293,46 @@ Public Class PokemonForms
        End Function
    End Class

+    Private Class Blastoise
+        Inherits PokemonForm
+        Public Sub New()
+            MyBase.New(9)
+        End Sub
+        Public Overrides Function GetMenuImagePosition(ByVal P As Pokemon) As Vector2
+            Select Case P.AdditionalData
+                Case "mega"
+                    Return New Vector2(29, 29)
+                Case Else
+                    Return New Vector2(8, 0)
+            End Select
+        End Function
+        Public Overrides Function GetDataFileAddition(ByVal AdditionalData As String) As String
+            Select Case AdditionalData.ToLower()
+                Case "mega"
+                    Return "_mega"
+                Case Else
+                    Return ""
+            End Select
+        End Function
+        Public Overrides Function GetAnimationName(ByVal P As Pokemon) As String
+            Select Case P.AdditionalData
+                Case "mega"
+                    Return P.OriginalName & "_mega"
+                Case Else
+                    Return P.OriginalName
+            End Select
+        End Function
+
+        Public Overrides Function GetOverworldAddition(ByVal P As Pokemon) As String
+            Select Case P.AdditionalData
+                Case "mega"
+                    Return "_mega"
+                Case Else
+                    Return ""
+            End Select
+        End Function
+    End Class
+
    Private Class Beedrill
        Inherits PokemonForm
        Public Sub New()
@ -470,6 +551,214 @@ Public Class PokemonForms
        End Function
    End Class

+    Private Class Kangaskhan
+        Inherits PokemonForm
+        Public Sub New()
+            MyBase.New(115)
+        End Sub
+        Public Overrides Function GetMenuImagePosition(ByVal P As Pokemon) As Vector2
+            Select Case P.AdditionalData
+                Case "mega"
+                    Return New Vector2(26, 29)
+                Case Else
+                    Return New Vector2(18, 3)
+            End Select
+        End Function
+        Public Overrides Function GetDataFileAddition(ByVal AdditionalData As String) As String
+            Select Case AdditionalData.ToLower()
+                Case "mega"
+                    Return "_mega"
+                Case Else
+                    Return ""
+            End Select
+        End Function
+        Public Overrides Function GetAnimationName(ByVal P As Pokemon) As String
+            Select Case P.AdditionalData
+                Case "mega"
+                    Return P.OriginalName & "_mega"
+                Case Else
+                    Return P.OriginalName
+            End Select
+        End Function
+
+        Public Overrides Function GetOverworldAddition(ByVal P As Pokemon) As String
+            Select Case P.AdditionalData
+                Case "mega"
+                    Return "_mega"
+                Case Else
+                    Return ""
+            End Select
+        End Function
+    End Class
+
+    Private Class Pinsir
+        Inherits PokemonForm
+        Public Sub New()
+            MyBase.New(127)
+        End Sub
+        Public Overrides Function GetMenuImagePosition(ByVal P As Pokemon) As Vector2
+            Select Case P.AdditionalData
+                Case "mega"
+                    Return New Vector2(0, 29)
+                Case Else
+                    Return New Vector2(30, 3)
+            End Select
+        End Function
+        Public Overrides Function GetDataFileAddition(ByVal AdditionalData As String) As String
+            Select Case AdditionalData.ToLower()
+                Case "mega"
+                    Return "_mega"
+                Case Else
+                    Return ""
+            End Select
+        End Function
+        Public Overrides Function GetAnimationName(ByVal P As Pokemon) As String
+            Select Case P.AdditionalData
+                Case "mega"
+                    Return P.OriginalName & "_mega"
+                Case Else
+                    Return P.OriginalName
+            End Select
+        End Function
+
+        Public Overrides Function GetOverworldAddition(ByVal P As Pokemon) As String
+            Select Case P.AdditionalData
+                Case "mega"
+                    Return "_mega"
+                Case Else
+                    Return ""
+            End Select
+        End Function
+    End Class
+
+    Private Class Gyarados
+        Inherits PokemonForm
+        Public Sub New()
+            MyBase.New(130)
+        End Sub
+        Public Overrides Function GetMenuImagePosition(ByVal P As Pokemon) As Vector2
+            Select Case P.AdditionalData
+                Case "mega"
+                    Return New Vector2(31, 27)
+                Case Else
+                    Return New Vector2(1, 4)
+            End Select
+        End Function
+        Public Overrides Function GetDataFileAddition(ByVal AdditionalData As String) As String
+            Select Case AdditionalData.ToLower()
+                Case "mega"
+                    Return "_mega"
+                Case Else
+                    Return ""
+            End Select
+        End Function
+        Public Overrides Function GetAnimationName(ByVal P As Pokemon) As String
+            Select Case P.AdditionalData
+                Case "mega"
+                    Return P.OriginalName & "_mega"
+                Case Else
+                    Return P.OriginalName
+            End Select
+        End Function
+
+        Public Overrides Function GetOverworldAddition(ByVal P As Pokemon) As String
+            Select Case P.AdditionalData
+                Case "mega"
+                    Return "_mega"
+                Case Else
+                    Return ""
+            End Select
+        End Function
+    End Class
+
+    Private Class Aerodactyl
+        Inherits PokemonForm
+        Public Sub New()
+            MyBase.New(142)
+        End Sub
+        Public Overrides Function GetMenuImagePosition(ByVal P As Pokemon) As Vector2
+            Select Case P.AdditionalData
+                Case "mega"
+                    Return New Vector2(20, 29)
+                Case Else
+                    Return New Vector2(13, 4)
+            End Select
+        End Function
+        Public Overrides Function GetDataFileAddition(ByVal AdditionalData As String) As String
+            Select Case AdditionalData.ToLower()
+                Case "mega"
+                    Return "_mega"
+                Case Else
+                    Return ""
+            End Select
+        End Function
+        Public Overrides Function GetAnimationName(ByVal P As Pokemon) As String
+            Select Case P.AdditionalData
+                Case "mega"
+                    Return P.OriginalName & "_mega"
+                Case Else
+                    Return P.OriginalName
+            End Select
+        End Function
+
+        Public Overrides Function GetOverworldAddition(ByVal P As Pokemon) As String
+            Select Case P.AdditionalData
+                Case "mega"
+                    Return "_mega"
+                Case Else
+                    Return ""
+            End Select
+        End Function
+    End Class
+
+    Private Class Mewtwo
+        Inherits PokemonForm
+        Public Sub New()
+            MyBase.New(150)
+        End Sub
+        Public Overrides Function GetMenuImagePosition(ByVal P As Pokemon) As Vector2
+            Select Case P.AdditionalData
+                Case "mega_x"
+                    Return New Vector2(14, 29)
+                Case "mega_y"
+                    Return New Vector2(28, 29)
+                Case Else
+                    Return New Vector2(21, 4)
+            End Select
+        End Function
+        Public Overrides Function GetDataFileAddition(ByVal AdditionalData As String) As String
+            Select Case AdditionalData.ToLower()
+                Case "mega_x"
+                    Return "_mega_x"
+                Case "mega_y"
+                    Return "_mega_y"
+                Case Else
+                    Return ""
+            End Select
+        End Function
+        Public Overrides Function GetAnimationName(ByVal P As Pokemon) As String
+            Select Case P.AdditionalData
+                Case "mega_x"
+                    Return P.OriginalName & "_mega_x"
+                Case "mega_y"
+                    Return P.OriginalName & "_mega_y"
+                Case Else
+                    Return P.OriginalName
+            End Select
+        End Function
+
+        Public Overrides Function GetOverworldAddition(ByVal P As Pokemon) As String
+            Select Case P.AdditionalData
+                Case "mega_x"
+                    Return "_mega_x"
+                Case "mega_y"
+                    Return "_mega_y"
+                Case Else
+                    Return ""
+            End Select
+        End Function
+    End Class
+
    Private Class Pichu

        Inherits PokemonForm
@ -709,6 +998,46 @@ Public Class PokemonForms
        End Function
    End Class

+    Private Class Houndoom
+        Inherits PokemonForm
+        Public Sub New()
+            MyBase.New(229)
+        End Sub
+        Public Overrides Function GetMenuImagePosition(ByVal P As Pokemon) As Vector2
+            Select Case P.AdditionalData
+                Case "mega"
+                    Return New Vector2(4, 29)
+                Case Else
+                    Return New Vector2(4, 7)
+            End Select
+        End Function
+        Public Overrides Function GetDataFileAddition(ByVal AdditionalData As String) As String
+            Select Case AdditionalData.ToLower()
+                Case "mega"
+                    Return "_mega"
+                Case Else
+                    Return ""
+            End Select
+        End Function
+        Public Overrides Function GetAnimationName(ByVal P As Pokemon) As String
+            Select Case P.AdditionalData
+                Case "mega"
+                    Return P.OriginalName & "_mega"
+                Case Else
+                    Return P.OriginalName
+            End Select
+        End Function
+
+        Public Overrides Function GetOverworldAddition(ByVal P As Pokemon) As String
+            Select Case P.AdditionalData
+                Case "mega"
+                    Return "_mega"
+                Case Else
+                    Return ""
+            End Select
+        End Function
+    End Class
+
    Private Class Tyranitar
        Inherits PokemonForm
        Public Sub New()
@ -917,6 +1246,86 @@ Public Class PokemonForms
        End Function
    End Class

+    Private Class Sableye
+        Inherits PokemonForm
+        Public Sub New()
+            MyBase.New(302)
+        End Sub
+        Public Overrides Function GetMenuImagePosition(ByVal P As Pokemon) As Vector2
+            Select Case P.AdditionalData
+                Case "mega"
+                    Return New Vector2(19, 26)
+                Case Else
+                    Return New Vector2(13, 9)
+            End Select
+        End Function
+        Public Overrides Function GetDataFileAddition(ByVal AdditionalData As String) As String
+            Select Case AdditionalData.ToLower()
+                Case "mega"
+                    Return "_mega"
+                Case Else
+                    Return ""
+            End Select
+        End Function
+        Public Overrides Function GetAnimationName(ByVal P As Pokemon) As String
+            Select Case P.AdditionalData
+                Case "mega"
+                    Return P.OriginalName & "_mega"
+                Case Else
+                    Return P.OriginalName
+            End Select
+        End Function
+
+        Public Overrides Function GetOverworldAddition(ByVal P As Pokemon) As String
+            Select Case P.AdditionalData
+                Case "mega"
+                    Return "_mega"
+                Case Else
+                    Return ""
+            End Select
+        End Function
+    End Class
+
+    Private Class Mawile
+        Inherits PokemonForm
+        Public Sub New()
+            MyBase.New(303)
+        End Sub
+        Public Overrides Function GetMenuImagePosition(ByVal P As Pokemon) As Vector2
+            Select Case P.AdditionalData
+                Case "mega"
+                    Return New Vector2(13, 29)
+                Case Else
+                    Return New Vector2(14, 9)
+            End Select
+        End Function
+        Public Overrides Function GetDataFileAddition(ByVal AdditionalData As String) As String
+            Select Case AdditionalData.ToLower()
+                Case "mega"
+                    Return "_mega"
+                Case Else
+                    Return ""
+            End Select
+        End Function
+        Public Overrides Function GetAnimationName(ByVal P As Pokemon) As String
+            Select Case P.AdditionalData
+                Case "mega"
+                    Return P.OriginalName & "_mega"
+                Case Else
+                    Return P.OriginalName
+            End Select
+        End Function
+
+        Public Overrides Function GetOverworldAddition(ByVal P As Pokemon) As String
+            Select Case P.AdditionalData
+                Case "mega"
+                    Return "_mega"
+                Case Else
+                    Return ""
+            End Select
+        End Function
+    End Class
+
    Private Class Aggron
        Inherits PokemonForm
        Public Sub New()
@ -997,6 +1406,86 @@ Public Class PokemonForms
        End Function
    End Class

+    Private Class Manectric
+        Inherits PokemonForm
+        Public Sub New()
+            MyBase.New(310)
+        End Sub
+        Public Overrides Function GetMenuImagePosition(ByVal P As Pokemon) As Vector2
+            Select Case P.AdditionalData
+                Case "mega"
+                    Return New Vector2(11, 29)
+                Case Else
+                    Return New Vector2(21, 9)
+            End Select
+        End Function
+        Public Overrides Function GetDataFileAddition(ByVal AdditionalData As String) As String
+            Select Case AdditionalData.ToLower()
+                Case "mega"
+                    Return "_mega"
+                Case Else
+                    Return ""
+            End Select
+        End Function
+        Public Overrides Function GetAnimationName(ByVal P As Pokemon) As String
+            Select Case P.AdditionalData
+                Case "mega"
+                    Return P.OriginalName & "_mega"
+                Case Else
+                    Return P.OriginalName
+            End Select
+        End Function
+
+        Public Overrides Function GetOverworldAddition(ByVal P As Pokemon) As String
+            Select Case P.AdditionalData
+                Case "mega"
+                    Return "_mega"
+                Case Else
+                    Return ""
+            End Select
+        End Function
+    End Class
+
+    Private Class Sharpedo
+        Inherits PokemonForm
+        Public Sub New()
+            MyBase.New(319)
+        End Sub
+        Public Overrides Function GetMenuImagePosition(ByVal P As Pokemon) As Vector2
+            Select Case P.AdditionalData
+                Case "mega"
+                    Return New Vector2(20, 26)
+                Case Else
+                    Return New Vector2(30, 9)
+            End Select
+        End Function
+        Public Overrides Function GetDataFileAddition(ByVal AdditionalData As String) As String
+            Select Case AdditionalData.ToLower()
+                Case "mega"
+                    Return "_mega"
+                Case Else
+                    Return ""
+            End Select
+        End Function
+        Public Overrides Function GetAnimationName(ByVal P As Pokemon) As String
+            Select Case P.AdditionalData
+                Case "mega"
+                    Return P.OriginalName & "_mega"
+                Case Else
+                    Return P.OriginalName
+            End Select
+        End Function
+
+        Public Overrides Function GetOverworldAddition(ByVal P As Pokemon) As String
+            Select Case P.AdditionalData
+                Case "mega"
+                    Return "_mega"
+                Case Else
+                    Return ""
+            End Select
+        End Function
+    End Class
+
    Private Class Camerupt
        Inherits PokemonForm
        Public Sub New()
@ -1157,6 +1646,94 @@ Public Class PokemonForms
        End Function
    End Class

+    Private Class Glalie
+        Inherits PokemonForm
+        Public Sub New()
+            MyBase.New(362)
+        End Sub
+        Public Overrides Function GetMenuImagePosition(ByVal P As Pokemon) As Vector2
+            Select Case P.AdditionalData
+                Case "mega"
+                    Return New Vector2(29, 27)
+                Case Else
+                    Return New Vector2(9, 11)
+            End Select
+        End Function
+        Public Overrides Function GetDataFileAddition(ByVal AdditionalData As String) As String
+            Select Case AdditionalData.ToLower()
+                Case "mega"
+                    Return "_mega"
+                Case Else
+                    Return ""
+            End Select
+        End Function
+        Public Overrides Function GetAnimationName(ByVal P As Pokemon) As String
+            Select Case P.AdditionalData
+                Case "mega"
+                    Return P.OriginalName & "_mega"
+                Case Else
+                    Return P.OriginalName
+            End Select
+        End Function
+
+        Public Overrides Function GetOverworldAddition(ByVal P As Pokemon) As String
+            Select Case P.AdditionalData
+                Case "mega"
+                    Return "_mega"
+                Case Else
+                    Return ""
+            End Select
+        End Function
+    End Class
+
+    Private Class Salamence
+        Inherits PokemonForm
+        Public Sub New()
+            MyBase.New(373)
+        End Sub
+        Public Overrides Function GetMenuImagePosition(ByVal P As Pokemon) As Vector2
+            Select Case P.AdditionalData
+                Case "mega"
+                    Return New Vector2(23, 26)
+                Case Else
+                    Return New Vector2(20, 11)
+            End Select
+        End Function
+        Public Overrides Function GetMenuImageSize(ByVal P As Pokemon) As Size
+            Select Case P.AdditionalData
+                Case "mega"
+                    Return New Size(35, 32)
+                Case Else
+                    Return New Size(32, 32)
+            End Select
+        End Function
+        Public Overrides Function GetDataFileAddition(ByVal AdditionalData As String) As String
+            Select Case AdditionalData.ToLower()
+                Case "mega"
+                    Return "_mega"
+                Case Else
+                    Return ""
+            End Select
+        End Function
+        Public Overrides Function GetAnimationName(ByVal P As Pokemon) As String
+            Select Case P.AdditionalData
+                Case "mega"
+                    Return P.OriginalName & "_mega"
+                Case Else
+                    Return P.OriginalName
+            End Select
+        End Function
+
+        Public Overrides Function GetOverworldAddition(ByVal P As Pokemon) As String
+            Select Case P.AdditionalData
+                Case "mega"
+                    Return "_mega"
+                Case Else
+                    Return ""
+            End Select
+        End Function
+    End Class
+
    Private Class Metagross
        Inherits PokemonForm
        Public Sub New()
@ -1197,6 +1774,100 @@ Public Class PokemonForms
        End Function
    End Class

+    Private Class Latias
+        Inherits PokemonForm
+        Public Sub New()
+            MyBase.New(380)
+        End Sub
+        Public Overrides Function GetMenuImagePosition(ByVal P As Pokemon) As Vector2
+            Select Case P.AdditionalData
+                Case "mega"
+                    Return New Vector2(28, 26)
+                Case Else
+                    Return New Vector2(27, 11)
+            End Select
+        End Function
+        Public Overrides Function GetMenuImageSize(ByVal P As Pokemon) As Size
+            Select Case P.AdditionalData
+                Case "mega"
+                    Return New Size(35, 32)
+                Case Else
+                    Return New Size(32, 32)
+            End Select
+        End Function
+        Public Overrides Function GetDataFileAddition(ByVal AdditionalData As String) As String
+            Select Case AdditionalData.ToLower()
+                Case "mega"
+                    Return "_mega"
+                Case Else
+                    Return ""
+            End Select
+        End Function
+        Public Overrides Function GetAnimationName(ByVal P As Pokemon) As String
+            Select Case P.AdditionalData
+                Case "mega"
+                    Return P.OriginalName & "_mega"
+                Case Else
+                    Return P.OriginalName
+            End Select
+        End Function
+        Public Overrides Function GetOverworldAddition(ByVal P As Pokemon) As String
+            Select Case P.AdditionalData
+                Case "mega"
+                    Return "_mega"
+                Case Else
+                    Return ""
+            End Select
+        End Function
+    End Class
+
+    Private Class Latios
+        Inherits PokemonForm
+        Public Sub New()
+            MyBase.New(381)
+        End Sub
+        Public Overrides Function GetMenuImagePosition(ByVal P As Pokemon) As Vector2
+            Select Case P.AdditionalData
+                Case "mega"
+                    Return New Vector2(30, 26)
+                Case Else
+                    Return New Vector2(28, 11)
+            End Select
+        End Function
+        Public Overrides Function GetMenuImageSize(ByVal P As Pokemon) As Size
+            Select Case P.AdditionalData
+                Case "mega"
+                    Return New Size(35, 32)
+                Case Else
+                    Return New Size(32, 32)
+            End Select
+        End Function
+        Public Overrides Function GetDataFileAddition(ByVal AdditionalData As String) As String
+            Select Case AdditionalData.ToLower()
+                Case "mega"
+                    Return "_mega"
+                Case Else
+                    Return ""
+            End Select
+        End Function
+        Public Overrides Function GetAnimationName(ByVal P As Pokemon) As String
+            Select Case P.AdditionalData
+                Case "mega"
+                    Return P.OriginalName & "_mega"
+                Case Else
+                    Return P.OriginalName
+            End Select
+        End Function
+        Public Overrides Function GetOverworldAddition(ByVal P As Pokemon) As String
+            Select Case P.AdditionalData
+                Case "mega"
+                    Return "_mega"
+                Case Else
+                    Return ""
+            End Select
+        End Function
+    End Class
+
    Private Class Kyogre
        Inherits PokemonForm
        Public Sub New()
@ -1293,6 +1964,53 @@ Public Class PokemonForms
        End Function
    End Class

+    Private Class Rayquaza
+        Inherits PokemonForm
+        Public Sub New()
+            MyBase.New(384)
+        End Sub
+        Public Overrides Function GetMenuImagePosition(ByVal P As Pokemon) As Vector2
+            Select Case P.AdditionalData
+                Case "mega"
+                    Return New Vector2(26, 25)
+                Case Else
+                    Return New Vector2(31, 11)
+            End Select
+        End Function
+        Public Overrides Function GetMenuImageSize(ByVal P As Pokemon) As Size
+            Select Case P.AdditionalData
+                Case "mega"
+                    Return New Size(38, 32)
+                Case Else
+                    Return New Size(32, 32)
+            End Select
+        End Function
+        Public Overrides Function GetDataFileAddition(ByVal AdditionalData As String) As String
+            Select Case AdditionalData.ToLower()
+                Case "mega"
+                    Return "_mega"
+                Case Else
+                    Return ""
+            End Select
+        End Function
+        Public Overrides Function GetAnimationName(ByVal P As Pokemon) As String
+            Select Case P.AdditionalData
+                Case "mega"
+                    Return P.OriginalName & "_mega"
+                Case Else
+                    Return P.OriginalName
+            End Select
+        End Function
+        Public Overrides Function GetOverworldAddition(ByVal P As Pokemon) As String
+            Select Case P.AdditionalData
+                Case "mega"
+                    Return "_mega"
+                Case Else
+                    Return ""
+            End Select
+        End Function
+    End Class
+
    Private Class Deoxys

        Inherits PokemonForm
@ -1720,7 +2438,14 @@ Public Class PokemonForms
                Return MyBase.GetOverworldAddition(P)
            End If
        End Function
-
+        Public Overrides Function GetDataFileAddition(ByVal AdditionalData As String) As String
+            Select Case AdditionalData.ToLower()
+                Case "primal"
+                    Return "_primal"
+                Case Else
+                    Return ""
+            End Select
+        End Function
    End Class

    Private Class Arceus
--- a/2.5DHero/2.5DHeroContent/Content.mgcb
+++ b/2.5DHero/2.5DHeroContent/Content.mgcb
@ -1,4 +1,4 @@
-
+
 #----------------------------- Global Properties ----------------------------#

 /outputDir:bin
@ -55791,3 +55791,103 @@
 #begin Scripts/worldmap/sevii islands.dat
 /copy:Scripts/worldmap/sevii islands.dat

+#begin Content/Pokemon/Data/3_mega.dat
+/importer:
+/processor:
+/build:Content/Pokemon/Data/3_mega.dat
+
+#begin Content/Pokemon/Data/9_mega.dat
+/importer:
+/processor:
+/build:Content/Pokemon/Data/9_mega.dat
+
+#begin Content/Pokemon/Data/115_mega.dat
+/importer:
+/processor:
+/build:Content/Pokemon/Data/115_mega.dat
+
+#begin Content/Pokemon/Data/127_mega.dat
+/importer:
+/processor:
+/build:Content/Pokemon/Data/127_mega.dat
+
+#begin Content/Pokemon/Data/130_mega.dat
+/importer:
+/processor:
+/build:Content/Pokemon/Data/130_mega.dat
+
+#begin Content/Pokemon/Data/142_mega.dat
+/importer:
+/processor:
+/build:Content/Pokemon/Data/142_mega.dat
+
+#begin Content/Pokemon/Data/150_mega_x.dat
+/importer:
+/processor:
+/build:Content/Pokemon/Data/150_mega_x.dat
+
+#begin Content/Pokemon/Data/150_mega_y.dat
+/importer:
+/processor:
+/build:Content/Pokemon/Data/150_mega_y.dat
+
+#begin Content/Pokemon/Data/208_mega.dat
+/importer:
+/processor:
+/build:Content/Pokemon/Data/208_mega.dat
+
+#begin Content/Pokemon/Data/229_mega.dat
+/importer:
+/processor:
+/build:Content/Pokemon/Data/229_mega.dat
+
+#begin Content/Pokemon/Data/302_mega.dat
+/importer:
+/processor:
+/build:Content/Pokemon/Data/302_mega.dat
+
+#begin Content/Pokemon/Data/303_mega.dat
+/importer:
+/processor:
+/build:Content/Pokemon/Data/303_mega.dat
+
+#begin Content/Pokemon/Data/310_mega.dat
+/importer:
+/processor:
+/build:Content/Pokemon/Data/310_mega.dat
+
+#begin Content/Pokemon/Data/319_mega.dat
+/importer:
+/processor:
+/build:Content/Pokemon/Data/319_mega.dat
+
+#begin Content/Pokemon/Data/362_mega.dat
+/importer:
+/processor:
+/build:Content/Pokemon/Data/362_mega.dat
+
+#begin Content/Pokemon/Data/373_mega.dat
+/importer:
+/processor:
+/build:Content/Pokemon/Data/373_mega.dat
+
+#begin Content/Pokemon/Data/380_mega.dat
+/importer:
+/processor:
+/build:Content/Pokemon/Data/380_mega.dat
+
+#begin Content/Pokemon/Data/381_mega.dat
+/importer:
+/processor:
+/build:Content/Pokemon/Data/381_mega.dat
+
+#begin Content/Pokemon/Data/384_mega.dat
+/importer:
+/processor:
+/build:Content/Pokemon/Data/384_mega.dat
+
+#begin Content/Pokemon/Data/483_primal.dat
+/importer:
+/processor:
+/build:Content/Pokemon/Data/483_primal.dat
+
--- a/2.5DHero/2.5DHeroContent/Content/Pokemon/Data/115_mega.dat
+++ b/2.5DHero/2.5DHeroContent/Content/Pokemon/Data/115_mega.dat
@ -0,0 +1,53 @@
+Name|Mega Kangaskhan
+Number|115
+ExperienceType|1
+BaseExperience|172
+Type1|Normal
+Type2|
+CatchRate|45
+BaseFriendship|70
+EggGroup1|Monster
+EggGroup2|None
+BaseEggSteps|5355
+EggPokemon|115
+IsGenderLess|0
+CanBreed|1
+Devolution|0
+IsMale|0
+Ability1|185
+Ability2|Nothing
+HiddenAbility|185
+EggMoves|509,68,306,50,38,283,116,264,193,359,23,376,219,164
+Machines|223,29,174,46,92,192,249,237,241,173,59,63,196,182,240,203,218,76,231,87,89,216,91,247,189,104,8,207,214,201,126,9,197,156,213,168,7,210,5,25,34,36,38,61,55,58,66,68,69,99,85,90,102,117,130,157,164,264,352,258,219,280,351,53,317,332,263,290,411,374,409,421,416,419,445,363,496,510,514,523,526,612,590,15,57,70,250,431,560
+BaseHP|105
+BaseAttack|125
+BaseDefense|100
+BaseSpAttack|60
+BaseSpDefense|100
+BaseSpeed|100
+FPHP|2
+FPAttack|0
+FPDefense|0
+FPSpAttack|0
+FPSpDefense|0
+FPSpeed|0
+CanFly|0
+CanSwim|0
+Pokedex|If it is safe the belly pouch to play. The adult keeps a close eye on the youngster.\Parent Pokémon\100\2.2\0,148,0
+Scale|1.48
+Move|1,4
+Move|1,43
+Move|7,252
+Move|10,39
+Move|13,44
+Move|19,458
+Move|22,99
+Move|25,5
+Move|31,498
+Move|34,146
+Move|37,242
+Move|43,203
+Move|46,200
+Move|49,389
+Move|50,179
+TradeValue|85
--- a/2.5DHero/2.5DHeroContent/Content/Pokemon/Data/127_mega.dat
+++ b/2.5DHero/2.5DHeroContent/Content/Pokemon/Data/127_mega.dat
@ -0,0 +1,53 @@
+Name|Mega Pinsir
+Number|127
+ExperienceType|3
+BaseExperience|175
+Type1|Bug
+Type2|Flying
+CatchRate|45
+BaseFriendship|70
+EggGroup1|Bug
+EggGroup2|None
+BaseEggSteps|6630
+EggPokemon|127
+IsGenderLess|0
+CanBreed|1
+Devolution|0
+IsMale|50
+Ability1|184
+Ability2|Nothing
+HiddenAbility|184
+EggMoves|450,370,185,364,175,31,382,98,276,206
+Machines|29,174,92,249,237,241,173,63,182,240,203,218,89,216,91,104,207,214,197,156,213,168,210,14,34,36,38,66,69,99,102,117,157,164,264,339,280,317,263,290,411,206,374,416,444,446,445,404,363,479,496,522,523,590,15,70,431
+BaseHP|65
+BaseAttack|155
+BaseDefense|120
+BaseSpAttack|65
+BaseSpDefense|90
+BaseSpeed|105
+FPHP|0
+FPAttack|2
+FPDefense|0
+FPSpAttack|0
+FPSpDefense|0
+FPSpeed|0
+CanFly|0
+CanSwim|0
+Pokedex|With its horns, it digs burrows to sleep in at night. In the morning, damp soil clings to its body.\Stag Beetle Pokémon\59\1.7\0,148,0
+Scale|1.2
+Move|1,11
+Move|1,116
+Move|4,20
+Move|8,69
+Move|11,106
+Move|15,279
+Move|18,280
+Move|22,233
+Move|26,66
+Move|29,404
+Move|33,480
+Move|36,37
+Move|40,14
+Move|43,276
+Move|47,12
+TradeValue|80
--- a/2.5DHero/2.5DHeroContent/Content/Pokemon/Data/130_mega.dat
+++ b/2.5DHero/2.5DHeroContent/Content/Pokemon/Data/130_mega.dat
@ -0,0 +1,49 @@
+Name|Mega Gyarados
+Number|130
+ExperienceType|3
+BaseExperience|189
+Type1|Water
+Type2|Dark
+CatchRate|45
+BaseFriendship|70
+EggGroup1|Water2
+EggGroup2|Dragon
+BaseEggSteps|1530
+EggPokemon|129
+IsGenderLess|0
+CanBreed|1
+Devolution|0
+IsMale|50
+Ability1|104
+Ability2|Nothing
+HiddenAbility|104
+Machines|29,174,46,92,192,249,237,173,59,63,196,182,240,203,218,225,87,89,216,104,207,214,201,197,156,213,34,36,38,61,55,58,99,82,85,102,117,130,86,164,352,258,269,53,259,263,290,362,406,371,416,444,419,445,399,363,496,503,510,523,525,590,57,70,250,127,291
+TutorMoves|340
+BaseHP|95
+BaseAttack|155
+BaseDefense|109
+BaseSpAttack|70
+BaseSpDefense|130
+BaseSpeed|81
+FPHP|0
+FPAttack|2
+FPDefense|0
+FPSpAttack|0
+FPSpDefense|0
+FPSpeed|0
+CanFly|0
+CanSwim|0
+Pokedex|They say that during past strife GYARADOS would appear and leave blazing ruins in its wake.\Atrocious Pokémon\305\6.5\0,148,0
+Scale|2
+Move|1,37
+Move|20,44
+Move|23,82
+Move|26,43
+Move|29,239
+Move|32,423
+Move|35,401
+Move|38,240
+Move|41,56
+Move|44,349
+Move|47,63
+TradeValue|35
--- a/2.5DHero/2.5DHeroContent/Content/Pokemon/Data/142_mega.dat
+++ b/2.5DHero/2.5DHeroContent/Content/Pokemon/Data/142_mega.dat
@ -0,0 +1,56 @@
+Name|Mega Aerodactyl
+Number|142
+ExperienceType|3
+BaseExperience|180
+Type1|Rock
+Type2|Flying
+CatchRate|45
+BaseFriendship|70
+EggGroup1|Flying
+EggGroup2|None
+BaseEggSteps|9180
+EggPokemon|142
+IsGenderLess|0
+CanBreed|1
+Devolution|0
+IsMale|87.5
+Ability1|181
+Ability2|Nothing
+HiddenAbility|181
+EggMoves|372,174,225,193,228,355,211,366,18,469
+Machines|29,174,46,92,249,237,241,173,63,182,203,218,231,225,89,216,104,207,214,201,126,129,197,156,213,168,211,13,18,36,38,99,82,102,117,143,157,164,337,269,53,317,332,259,263,290,355,406,371,416,397,432,444,446,445,363,468,479,496,507,510,523,590,19,70
+BaseHP|80
+BaseAttack|135
+BaseDefense|85
+BaseSpAttack|70
+BaseSpDefense|95
+BaseSpeed|150
+FPHP|0
+FPAttack|0
+FPDefense|0
+FPSpAttack|0
+FPSpDefense|0
+FPSpeed|2
+CanFly|1
+CanSwim|0
+Pokedex|A vicious Pokémon from the distant past, it appears to have flown by spreading its wings and gliding.\Fossil Pokémon\79\2.1\0,148,0
+Scale|1.32
+Move|1,442
+Move|1,423
+Move|1,424
+Move|1,422
+Move|1,17
+Move|1,48
+Move|1,44
+Move|1,184
+Move|9,46
+Move|17,97
+Move|25,246
+Move|33,242
+Move|41,36
+Move|49,507
+Move|57,442
+Move|65,63
+Move|73,157
+Move|81,416
+TradeValue|80
--- a/2.5DHero/2.5DHeroContent/Content/Pokemon/Data/150_mega_x.dat
+++ b/2.5DHero/2.5DHeroContent/Content/Pokemon/Data/150_mega_x.dat
@ -0,0 +1,55 @@
+Name|Mega Mewtwo X
+Number|150
+ExperienceType|3
+BaseExperience|306
+Type1|Psychic
+Type2|Fighting
+CatchRate|3
+BaseFriendship|0
+EggGroup1|None
+EggGroup2|None
+BaseEggSteps|30855
+EggPokemon|150
+IsGenderLess|1
+CanBreed|0
+Devolution|0
+IsMale|0.0
+Ability1|80
+Ability2|Nothing
+HiddenAbility|80
+Machines|223,29,174,92,192,249,244,237,241,173,59,63,196,182,240,203,218,76,231,87,89,216,94,247,189,104,8,207,214,126,9,138,197,156,213,7,171,5,25,34,36,38,61,55,58,6,66,68,69,99,85,100,102,115,117,118,120,130,86,149,157,161,164,264,352,347,258,339,269,113,219,280,351,53,317,332,259,263,290,285,289,411,412,374,451,409,261,373,278,416,444,419,445,363,398,447,433,473,477,490,496,510,523,612,590,15,70,148,431
+BaseHP|106
+BaseAttack|190
+BaseDefense|100
+BaseSpAttack|154
+BaseSpDefense|100
+BaseSpeed|130
+FPHP|0
+FPAttack|0
+FPDefense|0
+FPSpAttack|3
+FPSpDefense|0
+FPSpeed|0
+CanFly|0
+CanSwim|0
+Pokedex|Because its battle abilities were raised to the ultimate level, it thinks only of defeating its foes.\Genetic Pokémon\127\2.3\0,148,0
+Scale|1.4
+Move|1,93
+Move|1,50
+Move|1,219
+Move|8,129
+Move|15,248
+Move|22,244
+Move|29,357
+Move|36,427
+Move|43,384
+Move|43,385
+Move|50,105
+Move|57,94
+Move|64,112
+Move|70,396
+Move|79,133
+Move|86,54
+Move|93,382
+Move|100,540
+TradeValue|100
--- a/2.5DHero/2.5DHeroContent/Content/Pokemon/Data/150_mega_y.dat
+++ b/2.5DHero/2.5DHeroContent/Content/Pokemon/Data/150_mega_y.dat
@ -0,0 +1,55 @@
+Name|Mega Mewtwo Y
+Number|150
+ExperienceType|3
+BaseExperience|306
+Type1|Psychic
+Type2|
+CatchRate|3
+BaseFriendship|0
+EggGroup1|None
+EggGroup2|None
+BaseEggSteps|30855
+EggPokemon|150
+IsGenderLess|1
+CanBreed|0
+Devolution|0
+IsMale|0.0
+Ability1|15
+Ability2|Nothing
+HiddenAbility|15
+Machines|223,29,174,92,192,249,244,237,241,173,59,63,196,182,240,203,218,76,231,87,89,216,94,247,189,104,8,207,214,126,9,138,197,156,213,7,171,5,25,34,36,38,61,55,58,6,66,68,69,99,85,100,102,115,117,118,120,130,86,149,157,161,164,264,352,347,258,339,269,113,219,280,351,53,317,332,259,263,290,285,289,411,412,374,451,409,261,373,278,416,444,419,445,363,398,447,433,473,477,490,496,510,523,612,590,15,70,148,431
+BaseHP|106
+BaseAttack|150
+BaseDefense|70
+BaseSpAttack|194
+BaseSpDefense|120
+BaseSpeed|140
+FPHP|0
+FPAttack|0
+FPDefense|0
+FPSpAttack|3
+FPSpDefense|0
+FPSpeed|0
+CanFly|0
+CanSwim|0
+Pokedex|Because its battle abilities were raised to the ultimate level, it thinks only of defeating its foes.\Genetic Pokémon\33\1.5\0,148,0
+Scale|1.4
+Move|1,93
+Move|1,50
+Move|1,219
+Move|8,129
+Move|15,248
+Move|22,244
+Move|29,357
+Move|36,427
+Move|43,384
+Move|43,385
+Move|50,105
+Move|57,94
+Move|64,112
+Move|70,396
+Move|79,133
+Move|86,54
+Move|93,382
+Move|100,540
+TradeValue|100
--- a/2.5DHero/2.5DHeroContent/Content/Pokemon/Data/15_mega.dat
+++ b/2.5DHero/2.5DHeroContent/Content/Pokemon/Data/15_mega.dat
@ -30,7 +30,7 @@ FPSpDefense|1
 FPSpeed|0
 CanFly|1
 CanSwim|0
-Pokedex|It can take down any opponent with its powerful poison stingers. It sometimes attacks in swarms.\Poison Bee Pokémon\29.5\1\0,148,0
+Pokedex|It can take down any opponent with its powerful poison stingers. It sometimes attacks in swarms.\Poison Bee Pokémon\40.5\1.4\0,148,0
 Scale|1
 Move|1,31
 Move|10,31
--- a/2.5DHero/2.5DHeroContent/Content/Pokemon/Data/18_mega.dat
+++ b/2.5DHero/2.5DHeroContent/Content/Pokemon/Data/18_mega.dat
@ -31,8 +31,8 @@ FPSpDefense|0
 FPSpeed|3
 CanFly|0
 CanSwim|0
-Pokedex|Its well-developed chest muscles make it strong enough to whip up a gusty windstorm with just a few flaps.\Bird Pokémon\39.5\1.5\0,148,0
-Scale|1.2
+Pokedex|Its well-developed chest muscles make it strong enough to whip up a gusty windstorm with just a few flaps.\Bird Pokémon\50.5\2.2\0,148,0
+Scale|1.3
 Move|1,16
 Move|1,28
 Move|1,33
--- a/2.5DHero/2.5DHeroContent/Content/Pokemon/Data/208_mega.dat
+++ b/2.5DHero/2.5DHeroContent/Content/Pokemon/Data/208_mega.dat
@ -0,0 +1,64 @@
+Name|Mega Steelix
+Number|208
+ExperienceType|1
+BaseExperience|179
+Type1|Steel
+Type2|Ground
+CatchRate|25
+BaseFriendship|70
+EggGroup1|Mineral
+EggGroup2|None
+BaseEggSteps|6630
+EggPokemon|95
+IsGenderLess|0
+CanBreed|1
+Devolution|95
+IsMale|50
+Ability1|159
+Ability2|Nothing
+HiddenAbility|159
+EggMoves|335,111,175,484,350,431,205,563,446,153,157
+Machines|29,174,205,46,92,249,244,237,241,173,63,182,203,218,231,225,89,216,91,189,104,207,214,201,111,197,156,213,34,36,38,99,82,90,102,117,120,130,153,157,164,269,317,259,263,290,406,371,416,397,444,360,446,445,399,363,430,479,496,523,525,267,590,15,70,431,560
+BaseHP|75
+BaseAttack|125
+BaseDefense|230
+BaseSpAttack|55
+BaseSpDefense|95
+BaseSpeed|30
+FPHP|0
+FPAttack|0
+FPDefense|2
+FPSpAttack|0
+FPSpDefense|0
+FPSpeed|0
+CanFly|0
+CanSwim|0
+Pokedex|Its body has been compressed deep under the ground. As a result, it is even harder than a diamond.\Iron Snake Pokémon\740\10.5\0,148,0
+Scale|2
+Move|1,422
+Move|1,423
+Move|1,424
+Move|1,300
+Move|1,33
+Move|1,106
+Move|1,20
+Move|4,174
+Move|7,88
+Move|10,317
+Move|13,99
+Move|16,446
+Move|19,475
+Move|20,360
+Move|22,479
+Move|25,225
+Move|28,21
+Move|31,103
+Move|34,157
+Move|37,242
+Move|40,231
+Move|43,91
+Move|46,444
+Move|49,38
+Move|52,201
+TradeValue|60
+Item|5,143
--- a/2.5DHero/2.5DHeroContent/Content/Pokemon/Data/212_mega.dat
+++ b/2.5DHero/2.5DHeroContent/Content/Pokemon/Data/212_mega.dat
@ -33,8 +33,8 @@ FPSpDefense|0
 FPSpeed|0
 CanFly|0
 CanSwim|0
-Pokedex|It swings its eye-patterned pincers up to scare its foes. This makes it look like it has three heads.\Pincer Pokémon\118\1.8\0,148,0
-Scale|1.32
+Pokedex|It swings its eye-patterned pincers up to scare its foes. This makes it look like it has three heads.\Pincer Pokémon\125\2\0,148,0
+Scale|1.4
 Move|1,364
 Move|1,418
 Move|1,98
--- a/2.5DHero/2.5DHeroContent/Content/Pokemon/Data/214_mega.dat
+++ b/2.5DHero/2.5DHeroContent/Content/Pokemon/Data/214_mega.dat
@ -33,7 +33,7 @@ FPSpDefense|0
 FPSpeed|0
 CanFly|0
 CanSwim|0
-Pokedex|This powerful Pokémon thrusts its prized horn under its enemies' bellies, then lifts and throws them.\Single Horn Pokémon\54\1.5\0,148,0
+Pokedex|This powerful Pokémon thrusts its prized horn under its enemies' bellies, then lifts and throws them.\Single Horn Pokémon\65\1.7\0,148,0
 Scale|1.2
 Move|1,292
 Move|1,331
--- a/2.5DHero/2.5DHeroContent/Content/Pokemon/Data/229_mega.dat
+++ b/2.5DHero/2.5DHeroContent/Content/Pokemon/Data/229_mega.dat
@ -0,0 +1,59 @@
+Name|Mega Houndoom
+Number|229
+ExperienceType|3
+BaseExperience|175
+Type1|Dark
+Type2|Fire
+CatchRate|45
+BaseFriendship|35
+EggGroup1|Field
+EggGroup2|None
+BaseEggSteps|5355
+EggPokemon|228
+IsGenderLess|0
+CanBreed|1
+Devolution|228
+IsMale|50
+Ability1|94
+Ability2|Nothing
+HiddenAbility|Nothing
+EggMoves|251,68,194,364,424,83,417,386,228,99,179,180,389,422,261
+Machines|29,174,46,92,249,237,241,173,63,182,203,218,76,231,216,247,189,104,207,214,188,126,129,138,197,156,213,168,171,25,32,34,36,38,68,99,82,102,117,130,164,269,53,259,263,290,289,315,261,373,371,416,445,399,363,488,496,510,514,555,590,70,560
+BaseHP|75
+BaseAttack|90
+BaseDefense|90
+BaseSpAttack|140
+BaseSpDefense|90
+BaseSpeed|115
+FPHP|0
+FPAttack|0
+FPDefense|0
+FPSpAttack|2
+FPSpDefense|0
+FPSpeed|0
+CanFly|0
+CanSwim|0
+Pokedex|If you are burned by the flames it shoots from its mouth, the pain will never go away.\Dark Pokémon\49.5\1.9\0,148,0
+Scale|1.16
+Move|1,517
+Move|1,417
+Move|1,422
+Move|1,43
+Move|1,52
+Move|1,336
+Move|1,123
+Move|4,336
+Move|8,123
+Move|13,46
+Move|16,44
+Move|20,316
+Move|26,251
+Move|30,424
+Move|35,185
+Move|41,373
+Move|45,492
+Move|50,53
+Move|56,242
+Move|60,417
+Move|65,517
+TradeValue|30
--- a/2.5DHero/2.5DHeroContent/Content/Pokemon/Data/248_mega.dat
+++ b/2.5DHero/2.5DHeroContent/Content/Pokemon/Data/248_mega.dat
@ -33,7 +33,7 @@ FPSpDefense|0
 FPSpeed|0
 CanFly|0
 CanSwim|0
-Pokedex|Its body can't be harmed by any sort of attack, so it is very eager to make challenges against enemies.\Armor Pokémon\202\2\0,148,0
+Pokedex|Its body can't be harmed by any sort of attack, so it is very eager to make challenges against enemies.\Armor Pokémon\255\2.5\0,148,0
 Scale|1.4
 Move|1,422
 Move|1,423
--- a/2.5DHero/2.5DHeroContent/Content/Pokemon/Data/254_mega.dat
+++ b/2.5DHero/2.5DHeroContent/Content/Pokemon/Data/254_mega.dat
@ -33,7 +33,7 @@ FPSpDefense|0
 FPSpeed|3
 CanFly|0
 CanSwim|0
-Pokedex|It agilely leaps about the jungle and uses the sharp leaves on its arms to strike its prey.\Forest Pokémon\52.2\1.7\0,148,0
+Pokedex|It agilely leaps about the jungle and uses the sharp leaves on its arms to strike its prey.\Forest Pokémon\55.2\1.9\0,148,0
 Scale|1.28
 Move|1,437
 Move|1,400
--- a/2.5DHero/2.5DHeroContent/Content/Pokemon/Data/260_mega.dat
+++ b/2.5DHero/2.5DHeroContent/Content/Pokemon/Data/260_mega.dat
@ -33,7 +33,7 @@ FPSpDefense|0
 FPSpeed|0
 CanFly|0
 CanSwim|0
-Pokedex|Its arms are hard as rock. With one swing, it can break a boulder into pieces.\Mud Fish Pokémon\81.9\1.5\0,148,0
+Pokedex|Its arms are hard as rock. With one swing, it can break a boulder into pieces.\Mud Fish Pokémon\102\1.9\0,148,0
 Scale|1.2
 Move|1,359
 Move|1,33
--- a/2.5DHero/2.5DHeroContent/Content/Pokemon/Data/302_mega.dat
+++ b/2.5DHero/2.5DHeroContent/Content/Pokemon/Data/302_mega.dat
@ -0,0 +1,59 @@
+Name|Mega Sableye
+Number|302
+ExperienceType|2
+BaseExperience|133
+Type1|Dark
+Type2|Ghost
+CatchRate|45
+BaseFriendship|35
+EggGroup1|HumanLike
+EggGroup2|None
+BaseEggSteps|6630
+EggPokemon|302
+IsGenderLess|0
+CanBreed|1
+Devolution|0
+IsMale|50
+Ability1|156
+Ability2|Nothing
+HiddenAbility|Nothing
+EggMoves|445,364,260,286,212,368,236,417,105,389,271,244
+Machines|223,174,92,249,244,237,241,173,63,196,182,240,203,218,216,91,94,247,189,104,8,207,214,9,138,197,156,213,168,7,210,171,5,25,34,36,6,66,68,69,99,102,117,118,149,164,264,352,269,280,351,317,332,259,263,290,289,374,261,373,421,371,416,445,399,363,398,468,477,490,496,510,514,555,612,605,590,148
+BaseHP|50
+BaseAttack|85
+BaseDefense|125
+BaseSpAttack|85
+BaseSpDefense|115
+BaseSpeed|20
+FPHP|0
+FPAttack|1
+FPDefense|1
+FPSpAttack|0
+FPSpDefense|0
+FPSpeed|0
+CanFly|0
+CanSwim|0
+Pokedex|It dwells in the darkness of caves. It uses its sharp claws to dig up gems to nourish itself.\Darkness Pokémon\161\0.5\0,148,0
+Scale|0.7
+Move|1,212
+Move|1,428
+Move|1,43
+Move|1,10
+Move|4,193
+Move|8,101
+Move|11,310
+Move|15,154
+Move|18,252
+Move|22,197
+Move|25,425
+Move|29,282
+Move|32,185
+Move|36,386
+Move|39,421
+Move|43,408
+Move|46,109
+Move|50,492
+Move|53,428
+Move|57,247
+Move|60,212
+TradeValue|50
--- a/2.5DHero/2.5DHeroContent/Content/Pokemon/Data/303.dat
+++ b/2.5DHero/2.5DHeroContent/Content/Pokemon/Data/303.dat
@ -3,7 +3,7 @@ Number|303
 ExperienceType|0
 BaseExperience|133
 Type1|Steel
-Type2|
+Type2|Fairy
 CatchRate|45
 BaseFriendship|70
 EggGroup1|Field
--- a/2.5DHero/2.5DHeroContent/Content/Pokemon/Data/303_mega.dat
+++ b/2.5DHero/2.5DHeroContent/Content/Pokemon/Data/303_mega.dat
@ -0,0 +1,59 @@
+Name|Mega Mawile
+Number|303
+ExperienceType|0
+BaseExperience|133
+Type1|Steel
+Type2|Fairy
+CatchRate|45
+BaseFriendship|70
+EggGroup1|Field
+EggGroup2|Fairy
+BaseEggSteps|5355
+EggPokemon|303
+IsGenderLess|0
+CanBreed|1
+Devolution|0
+IsMale|50
+Ability1|37
+Ability2|Nothing
+HiddenAbility|Nothing
+EggMoves|246,445,424,385,423,368,581,305,386,69,21,389,422,206,244,14,321
+Machines|223,174,92,249,244,237,241,173,63,196,182,240,203,218,76,216,247,189,104,8,207,214,188,201,126,9,197,156,213,5,14,25,34,36,58,6,66,68,69,99,102,117,130,157,164,264,269,280,53,317,259,263,290,411,206,374,451,373,371,416,444,445,399,363,447,430,496,510,612,590,15,70
+BaseHP|50
+BaseAttack|105
+BaseDefense|125
+BaseSpAttack|55
+BaseSpDefense|95
+BaseSpeed|50
+FPHP|0
+FPAttack|1
+FPDefense|1
+FPSpAttack|0
+FPSpDefense|0
+FPSpeed|0
+CanFly|0
+CanSwim|0
+Pokedex|It chomps with its gaping mouth. Its huge jaws are actually steel horns that have been transformed.\Deceiver Pokémon\23.5\1\0,148,0
+Scale|0.84
+Move|1,583
+Move|1,442
+Move|1,269
+Move|1,45
+Move|1,584
+Move|1,310
+Move|6,313
+Move|11,44
+Move|16,230
+Move|21,11
+Move|26,185
+Move|31,226
+Move|36,242
+Move|41,334
+Move|46,389
+Move|50,254
+Move|50,256
+Move|50,255
+Move|56,442
+Move|60,583
+TradeValue|40
+Item|5,2035
--- a/2.5DHero/2.5DHeroContent/Content/Pokemon/Data/306_mega.dat
+++ b/2.5DHero/2.5DHeroContent/Content/Pokemon/Data/306_mega.dat
@ -33,7 +33,7 @@ FPSpDefense|0
 FPSpeed|0
 CanFly|0
 CanSwim|0
-Pokedex|You can tell its age by the length of its iron horns. It claims an entire mountain as its territory.\Iron Armor Pokémon\360\2.1\0,148,0
+Pokedex|You can tell its age by the length of its iron horns. It claims an entire mountain as its territory.\Iron Armor Pokémon\395\2.2\0,148,0
 Scale|1.44
 Move|1,33
 Move|1,106
--- a/2.5DHero/2.5DHeroContent/Content/Pokemon/Data/310_mega.dat
+++ b/2.5DHero/2.5DHeroContent/Content/Pokemon/Data/310_mega.dat
@ -0,0 +1,58 @@
+Name|Mega Manectric
+Number|310
+ExperienceType|3
+BaseExperience|166
+Type1|Electric
+Type2|
+CatchRate|45
+BaseFriendship|70
+EggGroup1|Field
+EggGroup2|None
+BaseEggSteps|5355
+EggPokemon|309
+IsGenderLess|0
+CanBreed|1
+Devolution|309
+IsMale|50
+Ability1|22
+Ability2|Nothing
+HiddenAbility|Nothing
+EggMoves|242,174,435,598,486,424,481,29,423,351,129,415,422,253
+Machines|174,46,92,192,237,173,63,182,240,203,218,231,87,216,189,104,207,214,129,197,156,213,168,25,34,36,38,99,85,102,117,130,86,164,113,351,53,263,290,315,451,416,445,363,496,521,528,555,590,70,148,560
+BaseHP|70
+BaseAttack|75
+BaseDefense|80
+BaseSpAttack|135
+BaseSpDefense|80
+BaseSpeed|135
+FPHP|0
+FPAttack|0
+FPDefense|0
+FPSpAttack|0
+FPSpDefense|0
+FPSpeed|2
+CanFly|0
+CanSwim|0
+Pokedex|Its nest can be found where a thunderbolt hits. It is discharging electricity from its mane.\Discharge Pokémon\44\1.8\0,148,0
+Scale|1.2
+Move|1,604
+Move|1,424
+Move|1,33
+Move|1,86
+Move|1,43
+Move|1,336
+Move|4,86
+Move|9,43
+Move|12,336
+Move|17,98
+Move|20,209
+Move|25,316
+Move|30,44
+Move|37,422
+Move|42,46
+Move|49,435
+Move|54,268
+Move|61,528
+Move|66,87
+Move|70,604
+TradeValue|45
--- a/2.5DHero/2.5DHeroContent/Content/Pokemon/Data/319_mega.dat
+++ b/2.5DHero/2.5DHeroContent/Content/Pokemon/Data/319_mega.dat
@ -0,0 +1,59 @@
+Name|Mega Sharpedo
+Number|319
+ExperienceType|3
+BaseExperience|161
+Type1|Water
+Type2|Dark
+CatchRate|60
+BaseFriendship|35
+EggGroup1|Water2
+EggGroup2|None
+BaseEggSteps|5355
+EggPokemon|318
+IsGenderLess|0
+CanBreed|1
+Devolution|318
+IsMale|50
+Ability1|173
+Ability2|Nothing
+HiddenAbility|Nothing
+EggMoves|246,362,194,56,129,37,38
+Machines|174,46,92,249,237,173,59,63,196,182,240,203,218,89,216,189,104,207,214,129,197,156,213,168,210,36,38,61,55,58,99,102,117,130,164,352,258,269,317,259,263,290,362,371,416,419,445,399,363,398,496,503,514,523,555,590,57,70,250,127,291
+BaseHP|70
+BaseAttack|140
+BaseDefense|70
+BaseSpAttack|110
+BaseSpDefense|65
+BaseSpeed|105
+FPHP|0
+FPAttack|2
+FPDefense|0
+FPSpAttack|0
+FPSpDefense|0
+FPSpeed|0
+CanFly|0
+CanSwim|0
+Pokedex|It can swim at speeds of 75 mph by jetting seawater through its body. It is the bandit of the sea.\Brutal Pokémon\130.3\2.5\0,148,0
+Scale|1.32
+Move|1,400
+Move|1,364
+Move|1,43
+Move|1,44
+Move|1,99
+Move|1,116
+Move|6,99
+Move|8,116
+Move|11,184
+Move|16,423
+Move|18,103
+Move|21,207
+Move|26,372
+Move|28,242
+Move|30,163
+Move|34,453
+Move|40,269
+Move|45,97
+Move|50,130
+Move|56,400
+TradeValue|50
+Item|5,167
--- a/2.5DHero/2.5DHeroContent/Content/Pokemon/Data/323_mega.dat
+++ b/2.5DHero/2.5DHeroContent/Content/Pokemon/Data/323_mega.dat
@ -33,7 +33,7 @@ FPSpDefense|0
 FPSpeed|0
 CanFly|0
 CanSwim|0
-Pokedex|It lives in the crater of a volcano. It is well known that the humps on its back erupt every 10 years.\Eruption Pokémon\220\1.9\0,148,0
+Pokedex|It lives in the crater of a volcano. It is well known that the humps on its back erupt every 10 years.\Eruption Pokémon\320.5\2.5\0,148,0
 Scale|1.36
 Move|1,90
 Move|1,284
--- a/2.5DHero/2.5DHeroContent/Content/Pokemon/Data/334_mega.dat
+++ b/2.5DHero/2.5DHeroContent/Content/Pokemon/Data/334_mega.dat
@ -34,7 +34,7 @@ FPSpDefense|2
 FPSpeed|0
 CanFly|0
 CanSwim|0
-Pokedex|It flies gracefully through the sky. Its melodic humming makes you feel like you're in a dream.\Humming Pokémon\20.6\1.1\0,148,0
+Pokedex|It flies gracefully through the sky. Its melodic humming makes you feel like you're in a dream.\Humming Pokémon\20.6\1.5\0,148,0
 Scale|1.04
 Move|1,143
 Move|1,365
--- a/2.5DHero/2.5DHeroContent/Content/Pokemon/Data/354_mega.dat
+++ b/2.5DHero/2.5DHeroContent/Content/Pokemon/Data/354_mega.dat
@ -33,7 +33,7 @@ FPSpDefense|0
 FPSpeed|0
 CanFly|0
 CanSwim|0
-Pokedex|This Pokémon developed from an abandoned doll that amassed a grudge. It is seen in dark alleys.\Marionette Pokémon\12.5\1.1\0,148,0
+Pokedex|This Pokémon developed from an abandoned doll that amassed a grudge. It is seen in dark alleys.\Marionette Pokémon\13\1.2\0,148,0
 Scale|1.04
 Move|1,282
 Move|1,103
--- a/2.5DHero/2.5DHeroContent/Content/Pokemon/Data/359_mega.dat
+++ b/2.5DHero/2.5DHeroContent/Content/Pokemon/Data/359_mega.dat
@ -33,7 +33,7 @@ FPSpDefense|0
 FPSpeed|0
 CanFly|0
 CanSwim|0
-Pokedex|It has the ability to foretell natural disasters. Its life span is over a hundred years.\Disaster Pokémon\47\1.2\0,148,0
+Pokedex|It has the ability to foretell natural disasters. Its life span is over a hundred years.\Disaster Pokémon\49\1.2\0,148,0
 Scale|1.08
 Move|1,195
 Move|1,382
--- a/2.5DHero/2.5DHeroContent/Content/Pokemon/Data/362_mega.dat
+++ b/2.5DHero/2.5DHeroContent/Content/Pokemon/Data/362_mega.dat
@ -0,0 +1,55 @@
+Name|Mega Glalie
+Number|362
+ExperienceType|1
+BaseExperience|168
+Type1|Ice
+Type2|
+CatchRate|75
+BaseFriendship|70
+EggGroup1|Fairy
+EggGroup2|Mineral
+BaseEggSteps|5355
+EggPokemon|361
+IsGenderLess|0
+CanBreed|1
+Devolution|361
+IsMale|50
+Ability1|174
+Ability2|Nothing
+HiddenAbility|Nothing
+EggMoves|419,117,335,50,506,313,205,191,415,311
+Machines|29,174,205,92,237,173,59,63,196,182,203,218,216,104,207,214,111,197,156,213,34,36,38,58,99,102,117,120,130,164,352,258,263,290,416,419,445,399,363,496,497,524,590,148
+BaseHP|80
+BaseAttack|120
+BaseDefense|80
+BaseSpAttack|120
+BaseSpDefense|80
+BaseSpeed|100
+FPHP|2
+FPAttack|0
+FPDefense|0
+FPSpAttack|0
+FPSpDefense|0
+FPSpeed|0
+CanFly|0
+CanSwim|0
+Pokedex|It can instantly freeze moisture in the atmosphere. It uses this power to freeze its foes.\Face Pokémon\350.2\2.1\0,148,0
+Scale|1.2
+Move|1,329
+Move|1,181
+Move|1,43
+Move|1,104
+Move|1,44
+Move|4,104
+Move|10,44
+Move|13,196
+Move|19,29
+Move|22,182
+Move|28,423
+Move|31,242
+Move|37,58
+Move|40,258
+Move|51,59
+Move|59,329
+TradeValue|70
+Item|5,2050
--- a/2.5DHero/2.5DHeroContent/Content/Pokemon/Data/373_mega.dat
+++ b/2.5DHero/2.5DHeroContent/Content/Pokemon/Data/373_mega.dat
@ -0,0 +1,61 @@
+Name|Mega Salamence
+Number|373
+ExperienceType|3
+BaseExperience|270
+Type1|Dragon
+Type2|Flying
+CatchRate|45
+BaseFriendship|35
+EggGroup1|Dragon
+EggGroup2|None
+BaseEggSteps|10455
+EggPokemon|371
+IsGenderLess|0
+CanBreed|1
+Devolution|372
+IsMale|50
+Ability1|184
+Ability2|Nothing
+HiddenAbility|Nothing
+EggMoves|111,349,406,82,407,203,424,56,37,239,421
+Machines|29,174,205,46,92,192,249,237,241,173,63,182,240,203,218,231,225,89,216,189,104,207,214,126,129,111,197,156,213,211,210,13,18,25,34,36,38,99,82,102,117,130,157,164,337,280,53,317,332,263,290,355,406,421,416,432,444,445,363,468,496,510,523,525,590,15,19,70,560
+TutorMoves|434
+BaseHP|95
+BaseAttack|145
+BaseDefense|130
+BaseSpAttack|120
+BaseSpDefense|90
+BaseSpeed|120
+FPHP|0
+FPAttack|3
+FPDefense|0
+FPSpAttack|0
+FPSpDefense|0
+FPSpeed|0
+CanFly|0
+CanSwim|0
+Pokedex|It's uncontrollable if enraged. It flies around spouting flames and scorching fields and mountains.\Dragon Pokémon\112.6\1.8\0,148,0
+Scale|1.2
+Move|1,38
+Move|1,424
+Move|1,422
+Move|1,99
+Move|1,44
+Move|1,43
+Move|1,29
+Move|5,44
+Move|10,43
+Move|16,29
+Move|20,116
+Move|25,52
+Move|30,182
+Move|32,225
+Move|37,428
+Move|43,184
+Move|50,19
+Move|53,242
+Move|61,337
+Move|70,38
+Move|80,525
+TradeValue|75
+Item|5,144
--- a/2.5DHero/2.5DHeroContent/Content/Pokemon/Data/376_mega.dat
+++ b/2.5DHero/2.5DHeroContent/Content/Pokemon/Data/376_mega.dat
@ -32,7 +32,7 @@ FPSpDefense|0
 FPSpeed|0
 CanFly|0
 CanSwim|0
-Pokedex|It folds its four legs when flying. Its four brains are said to be superior to a supercomputer.\Iron Leg Pokémon\550\1.6\0,148,0
+Pokedex|It folds its four legs when flying. Its four brains are said to be superior to a supercomputer.\Iron Leg Pokémon\942.9\2.5\0,148,0
 Scale|1.24
 Move|1,393
 Move|1,36
--- a/2.5DHero/2.5DHeroContent/Content/Pokemon/Data/380_mega.dat
+++ b/2.5DHero/2.5DHeroContent/Content/Pokemon/Data/380_mega.dat
@ -0,0 +1,62 @@
+Name|Mega Latias
+Number|380
+ExperienceType|3
+BaseExperience|270
+Type1|Dragon
+Type2|Psychic
+CatchRate|3
+BaseFriendship|90
+EggGroup1|None
+EggGroup2|None
+BaseEggSteps|30855
+EggPokemon|380
+IsGenderLess|0
+CanBreed|0
+Devolution|0
+IsMale|0
+Ability1|26
+Ability2|Nothing
+HiddenAbility|Nothing
+Machines|174,46,92,192,244,237,241,173,63,196,182,203,218,225,216,94,189,104,207,214,129,197,156,213,211,210,13,18,34,36,38,58,99,82,102,117,143,149,161,164,337,352,351,263,290,355,412,406,416,432,445,363,468,473,477,496,590,15,19,57,250,127,431,560,291
+TutorMoves|434
+BaseHP|80
+BaseAttack|100
+BaseDefense|120
+BaseSpAttack|140
+BaseSpDefense|150
+BaseSpeed|110
+FPHP|0
+FPAttack|0
+FPDefense|0
+FPSpAttack|0
+FPSpDefense|3
+FPSpeed|0
+CanFly|0
+CanSwim|0
+Pokedex|It communicates using telepathy. Its body is covered in down that refracts light to make it invisible.\Eon Pokémon\52\1.8\0,148,0
+Scale|1.16
+Move|1,361
+Move|1,406
+Move|1,470
+Move|1,513
+Move|1,505
+Move|1,204
+Move|1,149
+Move|5,273
+Move|10,270
+Move|15,219
+Move|20,225
+Move|25,346
+Move|30,287
+Move|35,296
+Move|40,428
+Move|45,105
+Move|50,375
+Move|55,204
+Move|60,94
+Move|65,505
+Move|70,513
+Move|75,470
+Move|80,406
+Move|85,361
+TradeValue|90
--- a/2.5DHero/2.5DHeroContent/Content/Pokemon/Data/381_mega.dat
+++ b/2.5DHero/2.5DHeroContent/Content/Pokemon/Data/381_mega.dat
@ -0,0 +1,62 @@
+Name|Mega Latios
+Number|381
+ExperienceType|3
+BaseExperience|270
+Type1|Dragon
+Type2|Psychic
+CatchRate|3
+BaseFriendship|90
+EggGroup1|None
+EggGroup2|None
+BaseEggSteps|30855
+EggPokemon|381
+IsGenderLess|0
+CanBreed|0
+Devolution|0
+IsMale|100
+Ability1|26
+Ability2|Nothing
+HiddenAbility|Nothing
+Machines|174,46,92,192,244,237,241,173,63,196,182,203,218,225,216,94,189,104,207,214,129,197,156,213,211,210,13,18,34,36,38,58,99,82,102,117,143,149,161,164,337,352,351,263,290,355,412,406,416,432,445,363,468,473,477,496,590,15,19,57,250,127,560,291
+TutorMoves|434
+BaseHP|80
+BaseAttack|130
+BaseDefense|100
+BaseSpAttack|160
+BaseSpDefense|120
+BaseSpeed|110
+FPHP|0
+FPAttack|0
+FPDefense|0
+FPSpAttack|3
+FPSpDefense|0
+FPSpeed|0
+CanFly|0
+CanSwim|0
+Pokedex|It understands human speech and is highly intelligent. It is a tender Pokémon that dislikes fighting.\Eon Pokémon\70\2.3\0,148,0
+Scale|1.4
+Move|1,262
+Move|1,406
+Move|1,471
+Move|1,477
+Move|1,505
+Move|1,349
+Move|1,149
+Move|5,377
+Move|10,270
+Move|15,219
+Move|20,225
+Move|25,182
+Move|30,287
+Move|35,295
+Move|40,428
+Move|45,105
+Move|50,375
+Move|55,349
+Move|60,94
+Move|65,505
+Move|70,477
+Move|75,471
+Move|80,406
+Move|85,262
+TradeValue|90
--- a/2.5DHero/2.5DHeroContent/Content/Pokemon/Data/382_primal.dat
+++ b/2.5DHero/2.5DHeroContent/Content/Pokemon/Data/382_primal.dat
@ -32,7 +32,7 @@ FPSpDefense|0
 FPSpeed|0
 CanFly|0
 CanSwim|0
-Pokedex|A mythical Pokémon said to have swelled the seas with rain and tidal waves. It battled with GROUDON.\Sea Basin Pokémon\352\4.5\0,148,0
+Pokedex|A mythical Pokémon said to have swelled the seas with rain and tidal waves. It battled with GROUDON.\Sea Basin Pokémon\430\9.8\0,148,0
 Scale|2
 Move|1,352
 Move|5,184
--- a/2.5DHero/2.5DHeroContent/Content/Pokemon/Data/383_primal.dat
+++ b/2.5DHero/2.5DHeroContent/Content/Pokemon/Data/383_primal.dat
@ -32,7 +32,7 @@ FPSpDefense|0
 FPSpeed|0
 CanFly|0
 CanSwim|0
-Pokedex|Said to have expanded the lands by evaporating water with raging heat. It battled titanically with KYOGRE.\Continent Pokémon\950\3.5\0,148,0
+Pokedex|Said to have expanded the lands by evaporating water with raging heat. It battled titanically with KYOGRE.\Continent Pokémon\999.7\5\0,148,0
 Scale|2
 Move|1,341
 Move|5,184
--- a/2.5DHero/2.5DHeroContent/Content/Pokemon/Data/384_mega.dat
+++ b/2.5DHero/2.5DHeroContent/Content/Pokemon/Data/384_mega.dat
@ -0,0 +1,51 @@
+Name|Mega Rayquaza
+Number|384
+ExperienceType|3
+BaseExperience|306
+Type1|Dragon
+Type2|Flying
+CatchRate|3
+BaseFriendship|0
+EggGroup1|None
+EggGroup2|None
+BaseEggSteps|30855
+EggPokemon|384
+IsGenderLess|1
+CanBreed|0
+Devolution|0
+IsMale|0.0
+Ability1|76
+Ability2|Nothing
+HiddenAbility|Nothing
+Machines|174,46,92,192,249,244,237,241,173,59,63,196,182,240,203,218,76,231,225,87,89,216,189,104,207,214,201,126,129,197,156,213,210,13,14,18,34,36,38,58,99,82,85,102,117,130,86,157,164,337,352,339,351,53,317,332,263,290,315,411,412,374,406,421,416,444,419,360,445,363,468,496,497,507,510,523,525,590,19,57,70,250,127,560,291
+TutorMoves|434
+BaseHP|105
+BaseAttack|180
+BaseDefense|100
+BaseSpAttack|180
+BaseSpDefense|100
+BaseSpeed|115
+FPHP|0
+FPAttack|2
+FPDefense|0
+FPSpAttack|1
+FPSpDefense|0
+FPSpeed|0
+CanFly|0
+CanSwim|0
+Pokedex|It flies in the ozone layer high in the sky. Until recently, no one had ever seen it.\Sky High Pokémon\392\10.8\0,148,0
+Scale|2
+Move|1,239
+Move|5,184
+Move|15,242
+Move|20,304
+Move|30,156
+Move|35,403
+Move|45,246
+Move|50,200
+Move|60,349
+Move|65,19
+Move|75,245
+Move|80,63
+Move|90,406
+TradeValue|110
--- a/2.5DHero/2.5DHeroContent/Content/Pokemon/Data/3_mega.dat
+++ b/2.5DHero/2.5DHeroContent/Content/Pokemon/Data/3_mega.dat
@ -0,0 +1,56 @@
+Name|Mega Venusaur
+Number|3
+ExperienceType|2
+BaseExperience|236
+Type1|Grass
+Type2|Poison
+CatchRate|45
+BaseFriendship|70
+EggGroup1|Monster
+EggGroup2|Grass
+BaseEggSteps|5355
+EggPokemon|1
+IsGenderLess|0
+IsMale|87.5
+Ability1|47
+Ability2|Nothing
+HiddenAbility|47
+EggMoves|133,204,174,203,202,320,275,437,345,267,80,438,130,124,580
+Machines|29,174,46,92,249,237,241,230,173,63,182,202,203,218,76,89,216,189,104,207,214,188,111,197,156,213,210,14,34,36,38,99,72,90,102,117,164,331,113,219,263,290,412,416,445,363,447,474,496,497,523,267,590,15,70,148,431,560
+TutorMoves|338
+BaseHP|80
+BaseAttack|100
+BaseDefense|123
+BaseSpAttack|122
+BaseSpDefense|120
+BaseSpeed|80
+FPHP|0
+FPAttack|0
+FPDefense|0
+FPSpAttack|2
+FPSpDefense|1
+FPSpeed|0
+CanFly|0
+CanSwim|0
+Pokedex|By spreading the broad petals of its flower and catching the sun's rays, it fills its body with power.\Seed Pokémon\155.5\2.4\0,148,0
+Scale|1.4
+Move|1,22
+Move|1,33
+Move|1,45
+Move|1,73
+Move|3,45
+Move|7,73
+Move|9,22
+Move|13,77
+Move|13,79
+Move|15,36
+Move|20,75
+Move|23,230
+Move|28,74
+Move|31,38
+Move|32,80
+Move|39,388
+Move|45,235
+Move|50,572
+Move|53,76
+TradeValue|70
--- a/2.5DHero/2.5DHeroContent/Content/Pokemon/Data/428_mega.dat
+++ b/2.5DHero/2.5DHeroContent/Content/Pokemon/Data/428_mega.dat
@ -33,7 +33,7 @@ FPSpDefense|0
 FPSpeed|2
 CanFly|0
 CanSwim|0
-Pokedex|It sheds its fur twice a year. Its winter fur is soft and fluffy.\Rabbit Pokémon\33.3\1.2\0,148,0
+Pokedex|It sheds its fur twice a year. Its winter fur is soft and fluffy.\Rabbit Pokémon\28.3\1.3\0,148,0
 Scale|1.08
 Move|1,361
 Move|1,340
--- a/2.5DHero/2.5DHeroContent/Content/Pokemon/Data/448_mega.dat
+++ b/2.5DHero/2.5DHeroContent/Content/Pokemon/Data/448_mega.dat
@ -33,7 +33,7 @@ FPSpDefense|0
 FPSpeed|0
 CanFly|0
 CanSwim|0
-Pokedex|It's said that no foe can remain invisible to LUCARIO, since it can detect auras. Even foes it could not otherwise see.\Aura Pokémon\54\1.2\0,148,0
+Pokedex|It's said that no foe can remain invisible to LUCARIO, since it can detect auras. Even foes it could not otherwise see.\Aura Pokémon\57.5\1.3\0,148,0
 Scale|1.08
 Move|1,245
 Move|1,406
--- a/2.5DHero/2.5DHeroContent/Content/Pokemon/Data/460_mega.dat
+++ b/2.5DHero/2.5DHeroContent/Content/Pokemon/Data/460_mega.dat
@ -30,7 +30,7 @@ FPSpDefense|0
 FPSpeed|0
 CanFly|0
 CanSwim|0
-Pokedex|It lives a quiet life on mountains that are perpetually covered in snow. It hides itself by whipping up blizzards.\Frost Tree Pokémon\135.5\2.2\0,148,0
+Pokedex|It lives a quiet life on mountains that are perpetually covered in snow. It hides itself by whipping up blizzards.\Frost Tree Pokémon\185\2.7\0,148,0
 Scale|1.48
 Move|1,8
 Move|1,43
--- a/2.5DHero/2.5DHeroContent/Content/Pokemon/Data/475_mega.dat
+++ b/2.5DHero/2.5DHeroContent/Content/Pokemon/Data/475_mega.dat
@ -33,7 +33,7 @@ FPSpDefense|0
 FPSpeed|0
 CanFly|0
 CanSwim|0
-Pokedex|Because it can sense what its foe is thinking, its attacks burst out first, fast, and fierce.\Blade Pokémon\52\1.6\0,148,0
+Pokedex|Because it can sense what its foe is thinking, its attacks burst out first, fast, and fierce.\Blade Pokémon\56.4\1.6\0,148,0
 Scale|1.24
 Move|1,500
 Move|1,370
--- a/2.5DHero/2.5DHeroContent/Content/Pokemon/Data/483_primal.dat
+++ b/2.5DHero/2.5DHeroContent/Content/Pokemon/Data/483_primal.dat
@ -0,0 +1,51 @@
+Name|Primal Dialga
+Number|483
+ExperienceType|3
+BaseExperience|306
+Type1|Steel
+Type2|Dragon
+CatchRate|30
+BaseFriendship|0
+EggGroup1|None
+EggGroup2|None
+BaseEggSteps|30855
+EggPokemon|483
+IsGenderLess|1
+CanBreed|0
+Devolution|0
+IsMale|0.0
+Ability1|46
+Ability2|Nothing
+HiddenAbility|140
+Machines|174,46,92,192,249,244,237,241,173,59,63,182,240,203,218,231,225,87,89,216,189,104,207,214,201,126,129,197,156,213,210,25,32,34,36,38,58,99,82,85,90,102,117,130,86,157,161,164,337,339,280,351,53,317,332,263,290,315,406,421,416,444,446,445,363,430,433,468,496,497,510,523,525,590,15,70,148,560
+TutorMoves|434
+BaseHP|100
+BaseAttack|120
+BaseDefense|120
+BaseSpAttack|150
+BaseSpDefense|100
+BaseSpeed|90
+FPHP|0
+FPAttack|0
+FPDefense|0
+FPSpAttack|3
+FPSpDefense|0
+FPSpeed|0
+CanFly|0
+CanSwim|0
+Pokedex|This Pokémon completely controls the flow of time. It uses its power to travel at will through the past and future.\Temporal Pokémon\683\5.4\0,148,0
+Scale|2
+Move|1,225
+Move|1,184
+Move|6,232
+Move|10,246
+Move|15,163
+Move|19,408
+Move|24,368
+Move|28,337
+Move|33,414
+Move|37,396
+Move|42,231
+Move|46,459
+Move|50,430
+TradeValue|100
--- a/2.5DHero/2.5DHeroContent/Content/Pokemon/Data/531_mega.dat
+++ b/2.5DHero/2.5DHeroContent/Content/Pokemon/Data/531_mega.dat
@ -33,7 +33,7 @@ FPSpDefense|0
 FPSpeed|0
 CanFly|0
 CanSwim|0
-Pokedex|Forming a drill with its steel claws and head, it can bore through a steel plate, no matter how thick it is.\Hearing Pokémon\31\1.1\0,148,0
+Pokedex|Forming a drill with its steel claws and head, it can bore through a steel plate, no matter how thick it is.\Hearing Pokémon\32\1.5\0,148,0
 Scale|1.04
 Move|1,387
 Move|1,589
--- a/2.5DHero/2.5DHeroContent/Content/Pokemon/Data/65_mega.dat
+++ b/2.5DHero/2.5DHeroContent/Content/Pokemon/Data/65_mega.dat
@ -33,7 +33,7 @@ FPSpDefense|0
 FPSpeed|0
 CanFly|0
 CanSwim|0
-Pokedex|Closing both its eyes heightens all its other senses. This enables it to use its abilities to their extremes.\Psi Pokémon\48\1.5\0,148,0
+Pokedex|Closing both its eyes heightens all its other senses. This enables it to use its abilities to their extremes.\Psi Pokémon\48\1.2\0,148,0
 Scale|1.2
 Move|1,100
 Move|1,134
--- a/2.5DHero/2.5DHeroContent/Content/Pokemon/Data/6_mega_x.dat
+++ b/2.5DHero/2.5DHeroContent/Content/Pokemon/Data/6_mega_x.dat
@ -31,7 +31,7 @@ FPSpDefense|0
 FPSpeed|0
 CanFly|0
 CanSwim|0
-Pokedex|If Charizard becomes furious the flame at the tip of its tail flares up in a light blue shade.\Flame Pokémon\90.5\1.7\0,148,0
+Pokedex|If Charizard becomes furious the flame at the tip of its tail flares up in a light blue shade.\Flame Pokémon\110.5\1.7\0,148,0
 Scale|1.28
 Move|1,10
 Move|1,45
--- a/2.5DHero/2.5DHeroContent/Content/Pokemon/Data/6_mega_y.dat
+++ b/2.5DHero/2.5DHeroContent/Content/Pokemon/Data/6_mega_y.dat
@ -31,7 +31,7 @@ FPSpDefense|0
 FPSpeed|0
 CanFly|0
 CanSwim|0
-Pokedex|If Charizard becomes furious the flame at the tip of its tail flares up in a light blue shade.\Flame Pokémon\90.5\1.7\0,148,0
+Pokedex|If Charizard becomes furious the flame at the tip of its tail flares up in a light blue shade.\Flame Pokémon\100.5\1.7\0,148,0
 Scale|1.28
 Move|1,10
 Move|1,45
--- a/2.5DHero/2.5DHeroContent/Content/Pokemon/Data/719.dat
+++ b/2.5DHero/2.5DHeroContent/Content/Pokemon/Data/719.dat
@ -33,7 +33,7 @@ FPSpDefense|2
 FPSpeed|0
 CanFly|0
 CanSwim|0
-Pokedex|A sudden transformation of Carbink, its pink, glimmering body is said to be the loveliest sight in the whole world. \Jewel Pokémon\19.4\0.7\0,148,0
+Pokedex|A sudden transformation of Carbink, its pink, glimmering body is said to be the loveliest sight in the whole world. \Jewel Pokémon\8.8\0.7\0,148,0
 Scale|1.2
 Move|1,33
 Move|1,106
--- a/2.5DHero/2.5DHeroContent/Content/Pokemon/Data/719_mega.dat
+++ b/2.5DHero/2.5DHeroContent/Content/Pokemon/Data/719_mega.dat
@ -33,7 +33,7 @@ FPSpDefense|2
 FPSpeed|0
 CanFly|0
 CanSwim|0
-Pokedex|A sudden transformation of Carbink, its pink, glimmering body is said to be the loveliest sight in the whole world. \Jewel Pokémon\19.4\0.7\0,148,0
+Pokedex|A sudden transformation of Carbink, its pink, glimmering body is said to be the loveliest sight in the whole world. \Jewel Pokémon\27.8\1.1\0,148,0
 Scale|1.2
 Move|1,33
 Move|1,106
--- a/2.5DHero/2.5DHeroContent/Content/Pokemon/Data/80_mega.dat
+++ b/2.5DHero/2.5DHeroContent/Content/Pokemon/Data/80_mega.dat
@ -33,8 +33,8 @@ FPSpDefense|0
 FPSpeed|0
 CanFly|0
 CanSwim|0
-Pokedex|If the tail-biting SHELLDER is thrown off in a harsh battle, it reverts to being an ordinary SLOWPOKE.\Hermit Crab Pokémon\78.5\1.6\0,148,0
-Scale|1.24
+Pokedex|If the tail-biting SHELLDER is thrown off in a harsh battle, it reverts to being an ordinary SLOWPOKE.\Hermit Crab Pokémon\120\2\0,148,0
+Scale|1.4
 Move|1,505
 Move|1,174
 Move|1,281
--- a/2.5DHero/2.5DHeroContent/Content/Pokemon/Data/94_mega.dat
+++ b/2.5DHero/2.5DHeroContent/Content/Pokemon/Data/94_mega.dat
@ -33,7 +33,7 @@ FPSpDefense|0
 FPSpeed|0
 CanFly|0
 CanSwim|0
-Pokedex|It steals heat from its surroundings. If you feel a sudden chill, it is certain that a GENGAR appeared.\Shadow Pokémon\40.5\1.5\0,148,0
+Pokedex|It steals heat from its surroundings. If you feel a sudden chill, it is certain that a GENGAR appeared.\Shadow Pokémon\40.5\1.4\0,148,0
 Scale|1.2
 Move|1,95
 Move|1,122
--- a/2.5DHero/2.5DHeroContent/Content/Pokemon/Data/9_mega.dat
+++ b/2.5DHero/2.5DHeroContent/Content/Pokemon/Data/9_mega.dat
@ -0,0 +1,55 @@
+Name|Mega Blastoise
+Number|9
+ExperienceType|2
+BaseExperience|239
+Type1|Water
+Type2|
+CatchRate|45
+BaseFriendship|70
+EggGroup1|Monster
+EggGroup2|Water1
+BaseEggSteps|5355
+EggPokemon|7
+IsGenderLess|0
+IsMale|87.5
+Ability1|178
+Ability2|Nothing
+HiddenAbility|178
+EggMoves|453,392,396,362,406,252,175,193,114,243,54,300,330,287,323,281
+Machines|223,29,174,205,46,92,249,237,173,59,63,196,182,240,203,218,231,89,216,91,189,104,8,207,214,111,197,156,213,5,25,34,36,38,61,55,58,66,68,69,99,90,102,117,130,157,164,264,352,258,280,317,263,290,411,362,374,416,419,360,445,399,363,430,479,496,503,523,525,612,590,57,70,250,127,431,560,291
+TutorMoves|308
+BaseHP|79
+BaseAttack|103
+BaseDefense|120
+BaseSpAttack|135
+BaseSpDefense|115
+BaseSpeed|78
+FPHP|0
+FPAttack|0
+FPDefense|0
+FPSpAttack|0
+FPSpDefense|3
+FPSpeed|0
+CanFly|0
+CanSwim|0
+Pokedex|It deliberately makes itself heavy so it can withstand the recoil of the water jets it fires.\Shellfish Pokémon\101.1\1.6\0,148,0
+Scale|1.24
+Move|1,33
+Move|1,39
+Move|1,55
+Move|1,110
+Move|1,430
+Move|4,39
+Move|7,55
+Move|10,110
+Move|13,145
+Move|16,44
+Move|20,229
+Move|24,182
+Move|28,352
+Move|32,401
+Move|39,130
+Move|46,334
+Move|53,240
+Move|60,56
+TradeValue|70