diff --git a/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Abomasite.vb b/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Abomasite.vb
index eebafbf5d..a261305d1 100644
--- a/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Abomasite.vb
+++ b/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Abomasite.vb
@@ -9,7 +9,8 @@ Namespace Items.MegaStones
         Inherits MegaStone
 
         Public Sub New()
-            MyBase.New("Abomasite", 507, New Rectangle(0, 0, 24, 24), "Abomasnow", 460)
+            MyBase.New("Abomasnow", 460)
+            _textureRectangle = New Rectangle(0, 0, 24, 24)
         End Sub
 
     End Class
diff --git a/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Absolite.vb b/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Absolite.vb
index 156f9178d..1f9f1de62 100644
--- a/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Absolite.vb
+++ b/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Absolite.vb
@@ -9,7 +9,8 @@ Namespace Items.MegaStones
         Inherits MegaStone
 
         Public Sub New()
-            MyBase.New("Absolite", 508, New Rectangle(24, 0, 24, 24), "Absol", 359)
+            MyBase.New("Absol", 359)
+            _textureRectangle = New Rectangle(24, 0, 24, 24)
         End Sub
 
     End Class
diff --git a/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Aerodactylite.vb b/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Aerodactylite.vb
index 81da84ede..c08d4ce7f 100644
--- a/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Aerodactylite.vb
+++ b/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Aerodactylite.vb
@@ -9,7 +9,8 @@ Namespace Items.MegaStones
         Inherits MegaStone
 
         Public Sub New()
-            MyBase.New("Aerodactylite", 509, New Rectangle(48, 0, 24, 24), "Aerodactyl", 142)
+            MyBase.New("Aerodactyl", 142)
+            _textureRectangle = New Rectangle(48, 0, 24, 24)
         End Sub
 
     End Class
diff --git a/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Aggronite.vb b/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Aggronite.vb
index f6090f8e2..9f843c28c 100644
--- a/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Aggronite.vb
+++ b/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Aggronite.vb
@@ -9,7 +9,8 @@ Namespace Items.MegaStones
         Inherits MegaStone
 
         Public Sub New()
-            MyBase.New("Aggronite", 510, New Rectangle(72, 0, 24, 24), "Aggron", 306)
+            MyBase.New("Aggron", 306)
+            _textureRectangle = New Rectangle(72, 0, 24, 24)
         End Sub
 
     End Class
diff --git a/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Alakazite.vb b/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Alakazite.vb
index 8dfe460af..961991412 100644
--- a/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Alakazite.vb
+++ b/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Alakazite.vb
@@ -9,7 +9,8 @@ Namespace Items.MegaStones
         Inherits MegaStone
 
         Public Sub New()
-            MyBase.New("Alakazite", 511, New Rectangle(96, 0, 24, 24), "Alakazam", 65)
+            MyBase.New("Alakazam", 65)
+            _textureRectangle = New Rectangle(96, 0, 24, 24)
         End Sub
 
     End Class
diff --git a/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Altarianite.vb b/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Altarianite.vb
index bdb70292c..486f211bd 100644
--- a/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Altarianite.vb
+++ b/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Altarianite.vb
@@ -9,7 +9,8 @@ Namespace Items.MegaStones
         Inherits MegaStone
 
         Public Sub New()
-            MyBase.New("Altarianite", 535, New Rectangle(0, 72, 24, 24), "Altaria", 334)
+            MyBase.New("Altaria", 334)
+            _textureRectangle = New Rectangle(0, 72, 24, 24)
         End Sub
 
     End Class
diff --git a/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Ampharosite.vb b/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Ampharosite.vb
index ef097928e..f6704148b 100644
--- a/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Ampharosite.vb
+++ b/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Ampharosite.vb
@@ -9,7 +9,8 @@ Namespace Items.MegaStones
         Inherits MegaStone
 
         Public Sub New()
-            MyBase.New("Ampharosite", 512, New Rectangle(120, 0, 24, 24), "Ampharos", 181)
+            MyBase.New("Ampharos", 181)
+            _textureRectangle = New Rectangle(120, 0, 24, 24)
         End Sub
 
     End Class
diff --git a/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Audinite.vb b/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Audinite.vb
index 13f027186..39dbe45d1 100644
--- a/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Audinite.vb
+++ b/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Audinite.vb
@@ -9,7 +9,8 @@ Namespace Items.MegaStones
         Inherits MegaStone
 
         Public Sub New()
-            MyBase.New("Audinite", 536, New Rectangle(24, 72, 24, 24), "Audino", 531)
+            MyBase.New("Audino", 531)
+            _textureRectangle = New Rectangle(24, 72, 24, 24)
         End Sub
 
     End Class
diff --git a/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Banettite.vb b/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Banettite.vb
index 35485d89a..50e9acd8d 100644
--- a/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Banettite.vb
+++ b/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Banettite.vb
@@ -9,7 +9,8 @@ Namespace Items.MegaStones
         Inherits MegaStone
 
         Public Sub New()
-            MyBase.New("Banettite", 513, New Rectangle(144, 0, 24, 24), "Banette", 354)
+            MyBase.New("Banette", 354)
+            _textureRectangle = New Rectangle(144, 0, 24, 24)
         End Sub
 
     End Class
diff --git a/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Beedrillite.vb b/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Beedrillite.vb
index 4787e8a06..4f772397e 100644
--- a/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Beedrillite.vb
+++ b/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Beedrillite.vb
@@ -9,7 +9,8 @@ Namespace Items.MegaStones
         Inherits MegaStone
 
         Public Sub New()
-            MyBase.New("Beedrillite", 537, New Rectangle(48, 72, 24, 24), "Beedrill", 15)
+            MyBase.New("Beedrill", 15)
+            _textureRectangle = New Rectangle(48, 72, 24, 24)
         End Sub
 
     End Class
diff --git a/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Blastoisinite.vb b/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Blastoisinite.vb
index c8754c8c8..8f94084c3 100644
--- a/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Blastoisinite.vb
+++ b/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Blastoisinite.vb
@@ -9,7 +9,8 @@ Namespace Items.MegaStones
         Inherits MegaStone
 
         Public Sub New()
-            MyBase.New("Blastoisinite", 514, New Rectangle(168, 0, 24, 24), "Blastoise", 9)
+            MyBase.New("Blastoise", 9)
+            _textureRectangle = New Rectangle(168, 0, 24, 24)
         End Sub
 
     End Class
diff --git a/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Blazikenite.vb b/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Blazikenite.vb
index 768cc4af6..f15fdb847 100644
--- a/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Blazikenite.vb
+++ b/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Blazikenite.vb
@@ -9,7 +9,8 @@ Namespace Items.MegaStones
         Inherits MegaStone
 
         Public Sub New()
-            MyBase.New("Blazikenite", 515, New Rectangle(192, 0, 24, 24), "Blaziken", 257)
+            MyBase.New("Blaziken", 257)
+            _textureRectangle = New Rectangle(192, 0, 24, 24)
         End Sub
 
     End Class
diff --git a/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Cameruptite.vb b/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Cameruptite.vb
index f5c8fdef5..e8a2e20f0 100644
--- a/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Cameruptite.vb
+++ b/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Cameruptite.vb
@@ -9,7 +9,8 @@ Namespace Items.MegaStones
         Inherits MegaStone
 
         Public Sub New()
-            MyBase.New("Cameruptite", 538, New Rectangle(72, 72, 24, 24), "Camerupt", 323)
+            MyBase.New("Camerupt", 323)
+            _textureRectangle = New Rectangle(72, 72, 24, 24)
         End Sub
 
     End Class
diff --git a/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/CharizarditeX.vb b/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/CharizarditeX.vb
index 826394d01..ab6b5e423 100644
--- a/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/CharizarditeX.vb
+++ b/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/CharizarditeX.vb
@@ -9,7 +9,8 @@ Namespace Items.MegaStones
         Inherits MegaStone
 
         Public Sub New()
-            MyBase.New("Charizardite X", 516, New Rectangle(216, 0, 24, 24), "Charizard", 6)
+            MyBase.New("Charizard", 6)
+            _textureRectangle = New Rectangle(216, 0, 24, 24)
         End Sub
 
     End Class
diff --git a/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/CharizarditeY.vb b/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/CharizarditeY.vb
index 333735a09..bbb2fe637 100644
--- a/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/CharizarditeY.vb
+++ b/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/CharizarditeY.vb
@@ -9,7 +9,8 @@ Namespace Items.MegaStones
         Inherits MegaStone
 
         Public Sub New()
-            MyBase.New("Charizardite Y", 517, New Rectangle(0, 24, 24, 24), "Charizard", 6)
+            MyBase.New("Charizard", 6)
+            _textureRectangle = New Rectangle(0, 24, 24, 24)
         End Sub
 
     End Class
diff --git a/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Diancite.vb b/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Diancite.vb
index d783fc158..16d7c17b4 100644
--- a/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Diancite.vb
+++ b/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Diancite.vb
@@ -9,7 +9,8 @@ Namespace Items.MegaStones
         Inherits MegaStone
 
         Public Sub New()
-            MyBase.New("Diancite", 539, New Rectangle(96, 72, 24, 24), "Diancie", 719)
+            MyBase.New("Diancie", 719)
+            _textureRectangle = New Rectangle(96, 72, 24, 24)
         End Sub
 
     End Class
diff --git a/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Galladite.vb b/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Galladite.vb
index ba41652ec..ff468c4e3 100644
--- a/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Galladite.vb
+++ b/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Galladite.vb
@@ -9,7 +9,8 @@ Namespace Items.MegaStones
         Inherits MegaStone
 
         Public Sub New()
-            MyBase.New("Galladite", 540, New Rectangle(120, 72, 24, 24), "Gallade", 475)
+            MyBase.New("Gallade", 475)
+            _textureRectangle = New Rectangle(120, 72, 24, 24)
         End Sub
 
     End Class
diff --git a/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Garchompite.vb b/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Garchompite.vb
index 85bc39678..2f028f145 100644
--- a/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Garchompite.vb
+++ b/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Garchompite.vb
@@ -9,7 +9,8 @@ Namespace Items.MegaStones
         Inherits MegaStone
 
         Public Sub New()
-            MyBase.New("Garchompite", 518, New Rectangle(24, 24, 24, 24), "Garchompite", 445)
+            MyBase.New("Garchompite", 445)
+            _textureRectangle = New Rectangle(24, 24, 24, 24)
         End Sub
 
     End Class
diff --git a/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Gardevoirite.vb b/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Gardevoirite.vb
index e51a319fc..d90d504bd 100644
--- a/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Gardevoirite.vb
+++ b/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Gardevoirite.vb
@@ -9,7 +9,8 @@ Namespace Items.MegaStones
         Inherits MegaStone
 
         Public Sub New()
-            MyBase.New("Gardevoirite", 519, New Rectangle(48, 24, 24, 24), "Gardevoir", 282)
+            MyBase.New("Gardevoir", 282)
+            _textureRectangle = New Rectangle(48, 24, 24, 24)
         End Sub
 
     End Class
diff --git a/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Gengarite.vb b/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Gengarite.vb
index dc05b12a6..59c1c1ca7 100644
--- a/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Gengarite.vb
+++ b/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Gengarite.vb
@@ -9,7 +9,8 @@ Namespace Items.MegaStones
         Inherits MegaStone
 
         Public Sub New()
-            MyBase.New("Gengarite", 520, New Rectangle(72, 24, 24, 24), "Gengar", 94)
+            MyBase.New("Gengar", 94)
+            _textureRectangle = New Rectangle(72, 24, 24, 24)
         End Sub
 
     End Class
diff --git a/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Glalitite.vb b/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Glalitite.vb
index 53b41f398..951899e55 100644
--- a/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Glalitite.vb
+++ b/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Glalitite.vb
@@ -9,7 +9,8 @@ Namespace Items.MegaStones
         Inherits MegaStone
 
         Public Sub New()
-            MyBase.New("Glalitite", 541, New Rectangle(144, 72, 24, 24), "Glalie", 362)
+            MyBase.New("Glalie", 362)
+            _textureRectangle = New Rectangle(144, 72, 24, 24)
         End Sub
 
     End Class
diff --git a/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Gyaradosite.vb b/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Gyaradosite.vb
index c58dbfd99..6efbd4bbf 100644
--- a/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Gyaradosite.vb
+++ b/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Gyaradosite.vb
@@ -9,7 +9,8 @@ Namespace Items.MegaStones
         Inherits MegaStone
 
         Public Sub New()
-            MyBase.New("Gyaradosite", 521, New Rectangle(96, 24, 24, 24), "Gyarados", 130)
+            MyBase.New("Gyarados", 130)
+            _textureRectangle = New Rectangle(96, 24, 24, 24)
         End Sub
 
     End Class
diff --git a/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Heracronite.vb b/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Heracronite.vb
index 02c44971f..5656942d2 100644
--- a/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Heracronite.vb
+++ b/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Heracronite.vb
@@ -9,7 +9,8 @@ Namespace Items.MegaStones
         Inherits MegaStone
 
         Public Sub New()
-            MyBase.New("Heracronite", 522, New Rectangle(120, 24, 24, 24), "Heracross", 214)
+            MyBase.New("Heracross", 214)
+            _textureRectangle = New Rectangle(120, 24, 24, 24)
         End Sub
 
     End Class
diff --git a/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Houndoominite.vb b/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Houndoominite.vb
index e624170b9..56407f0e6 100644
--- a/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Houndoominite.vb
+++ b/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Houndoominite.vb
@@ -9,7 +9,8 @@ Namespace Items.MegaStones
         Inherits MegaStone
 
         Public Sub New()
-            MyBase.New("Houndoominite", 523, New Rectangle(144, 24, 24, 24), "Houndoom", 229)
+            MyBase.New("Houndoom", 229)
+            _textureRectangle = New Rectangle(144, 24, 24, 24)
         End Sub
 
     End Class
diff --git a/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Kangaskhanite.vb b/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Kangaskhanite.vb
index b7cb8431a..a50348171 100644
--- a/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Kangaskhanite.vb
+++ b/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Kangaskhanite.vb
@@ -9,7 +9,8 @@ Namespace Items.MegaStones
         Inherits MegaStone
 
         Public Sub New()
-            MyBase.New("Kangaskhanite", 524, New Rectangle(168, 24, 24, 24), "Kangaskhan", 115)
+            MyBase.New("Kangaskhan", 115)
+            _textureRectangle = New Rectangle(168, 24, 24, 24)
         End Sub
 
     End Class
diff --git a/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Latiasite.vb b/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Latiasite.vb
index 96bcf21cf..a14304d62 100644
--- a/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Latiasite.vb
+++ b/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Latiasite.vb
@@ -9,7 +9,8 @@ Namespace Items.MegaStones
         Inherits MegaStone
 
         Public Sub New()
-            MyBase.New("Latiasite", 542, New Rectangle(168, 72, 24, 24), "Latias", 380)
+            MyBase.New("Latias", 380)
+            _textureRectangle = New Rectangle(168, 72, 24, 24)
         End Sub
 
     End Class
diff --git a/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Latiosite.vb b/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Latiosite.vb
index a03232d58..7b3121dcc 100644
--- a/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Latiosite.vb
+++ b/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Latiosite.vb
@@ -9,7 +9,8 @@ Namespace Items.MegaStones
         Inherits MegaStone
 
         Public Sub New()
-            MyBase.New("Latiosite", 543, New Rectangle(192, 72, 24, 24), "Latios", 381)
+            MyBase.New("Latios", 381)
+            _textureRectangle = New Rectangle(192, 72, 24, 24)
         End Sub
 
     End Class
diff --git a/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Lopunnite.vb b/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Lopunnite.vb
index a3be2a2ca..041f7c7db 100644
--- a/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Lopunnite.vb
+++ b/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Lopunnite.vb
@@ -9,7 +9,8 @@ Namespace Items.MegaStones
         Inherits MegaStone
 
         Public Sub New()
-            MyBase.New("Lopunnite", 544, New Rectangle(216, 72, 24, 24), "Lopunny", 428)
+            MyBase.New("Lopunny", 428)
+            _textureRectangle = New Rectangle(216, 72, 24, 24)
         End Sub
 
     End Class
diff --git a/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Lucarionite.vb b/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Lucarionite.vb
index d29103e73..040e1b084 100644
--- a/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Lucarionite.vb
+++ b/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Lucarionite.vb
@@ -9,7 +9,8 @@ Namespace Items.MegaStones
         Inherits MegaStone
 
         Public Sub New()
-            MyBase.New("Lucarionite", 525, New Rectangle(192, 24, 24, 24), "Lucario", 448)
+            MyBase.New("Lucario", 448)
+            _textureRectangle = New Rectangle(192, 24, 24, 24)
         End Sub
 
     End Class
diff --git a/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Manectite.vb b/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Manectite.vb
index 20defed86..26d3d81af 100644
--- a/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Manectite.vb
+++ b/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Manectite.vb
@@ -9,7 +9,8 @@ Namespace Items.MegaStones
         Inherits MegaStone
 
         Public Sub New()
-            MyBase.New("Manectite", 526, New Rectangle(216, 24, 24, 24), "Manectric", 310)
+            MyBase.New("Manectric", 310)
+            _textureRectangle = New Rectangle(216, 24, 24, 24)
         End Sub
 
     End Class
diff --git a/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Mawilite.vb b/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Mawilite.vb
index 0eeed9d60..3dc7b3ef9 100644
--- a/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Mawilite.vb
+++ b/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Mawilite.vb
@@ -9,7 +9,8 @@ Namespace Items.MegaStones
         Inherits MegaStone
 
         Public Sub New()
-            MyBase.New("Mawilite", 527, New Rectangle(0, 48, 24, 24), "Mawile", 303)
+            MyBase.New("Mawile", 303)
+            _textureRectangle = New Rectangle(0, 48, 24, 24)
         End Sub
 
     End Class
diff --git a/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Medichamite.vb b/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Medichamite.vb
index fa6e85d9f..288a28802 100644
--- a/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Medichamite.vb
+++ b/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Medichamite.vb
@@ -9,7 +9,8 @@ Namespace Items.MegaStones
         Inherits MegaStone
 
         Public Sub New()
-            MyBase.New("Medichamite", 528, New Rectangle(24, 48, 24, 24), "Medicham", 308)
+            MyBase.New("Medicham", 308)
+            _textureRectangle = New Rectangle(24, 48, 24, 24)
         End Sub
 
     End Class
diff --git a/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Metagrossite.vb b/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Metagrossite.vb
index af6867f16..3d55f20a8 100644
--- a/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Metagrossite.vb
+++ b/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Metagrossite.vb
@@ -9,7 +9,8 @@ Namespace Items.MegaStones
         Inherits MegaStone
 
         Public Sub New()
-            MyBase.New("Metagrossite", 545, New Rectangle(0, 96, 24, 24), "Metagross", 376)
+            MyBase.New("Metagross", 376)
+            _textureRectangle = New Rectangle(0, 96, 24, 24)
         End Sub
 
     End Class
diff --git a/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/MewtwoniteX.vb b/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/MewtwoniteX.vb
index fe890bf1e..5c43d3015 100644
--- a/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/MewtwoniteX.vb
+++ b/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/MewtwoniteX.vb
@@ -9,7 +9,8 @@ Namespace Items.MegaStones
         Inherits MegaStone
 
         Public Sub New()
-            MyBase.New("Mewtwonite X", 529, New Rectangle(48, 48, 24, 24), "Mewtwo", 150)
+            MyBase.New("Mewtwo", 150)
+            _textureRectangle = New Rectangle(48, 48, 24, 24)
         End Sub
 
     End Class
diff --git a/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/MewtwoniteY.vb b/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/MewtwoniteY.vb
index 199740661..773bb1bc8 100644
--- a/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/MewtwoniteY.vb
+++ b/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/MewtwoniteY.vb
@@ -9,7 +9,8 @@ Namespace Items.MegaStones
         Inherits MegaStone
 
         Public Sub New()
-            MyBase.New("Mewtwonite Y", 530, New Rectangle(72, 48, 24, 24), "Mewtwo", 150)
+            MyBase.New("Mewtwo", 150)
+            _textureRectangle = New Rectangle(72, 48, 24, 24)
         End Sub
 
     End Class
diff --git a/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Pidgeotite.vb b/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Pidgeotite.vb
index 7e260a442..b3d5aff32 100644
--- a/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Pidgeotite.vb
+++ b/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Pidgeotite.vb
@@ -9,7 +9,8 @@ Namespace Items.MegaStones
         Inherits MegaStone
 
         Public Sub New()
-            MyBase.New("Pidgeotite", 546, New Rectangle(24, 96, 24, 24), "Pidgeot", 18)
+            MyBase.New("Pidgeot", 18)
+            _textureRectangle = New Rectangle(24, 96, 24, 24)
         End Sub
 
     End Class
diff --git a/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Pinsirite.vb b/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Pinsirite.vb
index 4b2eac658..e0865b3a6 100644
--- a/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Pinsirite.vb
+++ b/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Pinsirite.vb
@@ -9,7 +9,8 @@ Namespace Items.MegaStones
         Inherits MegaStone
 
         Public Sub New()
-            MyBase.New("Pinsirite", 531, New Rectangle(96, 48, 24, 24), "Pinsir", 127)
+            MyBase.New("Pinsir", 127)
+            _textureRectangle = New Rectangle(96, 48, 24, 24)
         End Sub
 
     End Class
diff --git a/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Sablenite.vb b/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Sablenite.vb
index 0c5d7ed5e..335d2ae46 100644
--- a/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Sablenite.vb
+++ b/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Sablenite.vb
@@ -9,7 +9,8 @@ Namespace Items.MegaStones
         Inherits MegaStone
 
         Public Sub New()
-            MyBase.New("Sablenite", 547, New Rectangle(48, 96, 24, 24), "Sableye", 302)
+            MyBase.New("Sableye", 302)
+            _textureRectangle = New Rectangle(48, 96, 24, 24)
         End Sub
 
     End Class
diff --git a/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Salamencite.vb b/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Salamencite.vb
index d76ef4bf1..e343994c0 100644
--- a/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Salamencite.vb
+++ b/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Salamencite.vb
@@ -9,7 +9,8 @@ Namespace Items.MegaStones
         Inherits MegaStone
 
         Public Sub New()
-            MyBase.New("Salamencite", 548, New Rectangle(72, 96, 24, 24), "Salamence", 373)
+            MyBase.New("Salamence", 373)
+            _textureRectangle = New Rectangle(72, 96, 24, 24)
         End Sub
 
     End Class
diff --git a/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Sceptilite.vb b/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Sceptilite.vb
index edb2afc09..b07577266 100644
--- a/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Sceptilite.vb
+++ b/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Sceptilite.vb
@@ -9,7 +9,8 @@ Namespace Items.MegaStones
         Inherits MegaStone
 
         Public Sub New()
-            MyBase.New("Sceptilite", 549, New Rectangle(96, 96, 24, 24), "Sceptile", 254)
+            MyBase.New("Sceptile", 254)
+            _textureRectangle = New Rectangle(96, 96, 24, 24)
         End Sub
 
     End Class
diff --git a/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Scizorite.vb b/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Scizorite.vb
index 64ebf1aa8..761ef4d1d 100644
--- a/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Scizorite.vb
+++ b/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Scizorite.vb
@@ -9,7 +9,8 @@ Namespace Items.MegaStones
         Inherits MegaStone
 
         Public Sub New()
-            MyBase.New("Scizorite", 532, New Rectangle(120, 48, 24, 24), "Scizor", 212)
+            MyBase.New("Scizor", 212)
+            _textureRectangle = New Rectangle(120, 48, 24, 24)
         End Sub
 
     End Class
diff --git a/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Sharpedonite.vb b/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Sharpedonite.vb
index 7dcd34735..7a9c45b09 100644
--- a/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Sharpedonite.vb
+++ b/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Sharpedonite.vb
@@ -9,7 +9,8 @@ Namespace Items.MegaStones
         Inherits MegaStone
 
         Public Sub New()
-            MyBase.New("Sharpedonite", 550, New Rectangle(120, 96, 24, 24), "Sharpedo", 319)
+            MyBase.New("Sharpedo", 319)
+            _textureRectangle = New Rectangle(120, 96, 24, 24)
         End Sub
 
     End Class
diff --git a/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Slowbronite.vb b/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Slowbronite.vb
index 52b76d79d..c6802d99b 100644
--- a/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Slowbronite.vb
+++ b/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Slowbronite.vb
@@ -9,7 +9,8 @@ Namespace Items.MegaStones
         Inherits MegaStone
 
         Public Sub New()
-            MyBase.New("Slowbronite", 551, New Rectangle(144, 96, 24, 24), "Slowbro", 80)
+            MyBase.New("Slowbro", 80)
+            _textureRectangle = New Rectangle(144, 96, 24, 24)
         End Sub
 
     End Class
diff --git a/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Steelixite.vb b/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Steelixite.vb
index 4aeb99772..b8b83f054 100644
--- a/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Steelixite.vb
+++ b/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Steelixite.vb
@@ -9,7 +9,8 @@ Namespace Items.MegaStones
         Inherits MegaStone
 
         Public Sub New()
-            MyBase.New("Steelixite", 552, New Rectangle(168, 96, 24, 24), "Steelix", 208)
+            MyBase.New("Steelix", 208)
+            _textureRectangle = New Rectangle(168, 96, 24, 24)
         End Sub
 
     End Class
diff --git a/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Swampertite.vb b/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Swampertite.vb
index a713900fd..ebf722849 100644
--- a/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Swampertite.vb
+++ b/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Swampertite.vb
@@ -9,7 +9,8 @@ Namespace Items.MegaStones
         Inherits MegaStone
 
         Public Sub New()
-            MyBase.New("Swampertite", 553, New Rectangle(192, 96, 24, 24), "Swampert", 260)
+            MyBase.New("Swampert", 260)
+            _textureRectangle = New Rectangle(192, 96, 24, 24)
         End Sub
 
     End Class
diff --git a/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Tyranitarite.vb b/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Tyranitarite.vb
index 91992672e..8628bf961 100644
--- a/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Tyranitarite.vb
+++ b/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Tyranitarite.vb
@@ -9,7 +9,8 @@ Namespace Items.MegaStones
         Inherits MegaStone
 
         Public Sub New()
-            MyBase.New("Tyranitarite", 533, New Rectangle(144, 48, 24, 24), "Tyranitar", 248)
+            MyBase.New("Tyranitar", 248)
+            _textureRectangle = New Rectangle(144, 48, 24, 24)
         End Sub
 
     End Class
diff --git a/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Venusaurite.vb b/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Venusaurite.vb
index 6967913d3..a733fc9ea 100644
--- a/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Venusaurite.vb
+++ b/2.5DHero/2.5DHero/Pokemon/Items/MegaStones/Venusaurite.vb
@@ -9,7 +9,8 @@ Namespace Items.MegaStones
         Inherits MegaStone
 
         Public Sub New()
-            MyBase.New("Venusaurite", 534, New Rectangle(168, 48, 24, 24), "Venusaur", 3)
+            MyBase.New("Venusaur", 3)
+            _textureRectangle = New Rectangle(168, 48, 24, 24)
         End Sub
 
     End Class