item access uses reflection instead of lookup table

2.5DHero/2.5DHero/2.5DHero.vbproj

@@ -1036,6 +1036,7 @@
     <Compile Include="Pokemon\Items\Berry.vb" />
     <Compile Include="Pokemon\Items\FileItem.vb" />
     <Compile Include="Pokemon\Items\Item.vb" />
+    <Compile Include="Pokemon\Items\ItemAttribute.vb" />
     <Compile Include="Pokemon\Items\KeyItems\BasementKey.vb" />
     <Compile Include="Pokemon\Items\KeyItems\Bicycle.vb" />
     <Compile Include="Pokemon\Items\KeyItems\BlueCard.vb" />

2.5DHero/2.5DHero/Pokemon/Attacks/Dark/Fling.vb

@@ -139,7 +139,7 @@
                         End If
                 End Select
 
-                p.OriginalItem = CType(p.Item.Copy(), Item)
+                p.OriginalItem = Item.GetItemByID(p.Item.ID)
                 p.Item = Nothing
             End If
         End Sub

2.5DHero/2.5DHero/Pokemon/Items/Apricorns/BlkApricorn.vb

@@ -1,5 +1,6 @@
-Namespace Items.Apricorns
+Namespace Items.Apricorns
 
+    <Item(99, "Black Apricorn")>
     Public Class BlkApricorn
 
         Inherits Item

2.5DHero/2.5DHero/Pokemon/Items/Apricorns/BluApricorn.vb

@@ -1,5 +1,6 @@
-Namespace Items.Apricorns
+Namespace Items.Apricorns
 
+    <Item(89, "Blue Apricorn")>
     Public Class BluApricorn
 
         Inherits Item

2.5DHero/2.5DHero/Pokemon/Items/Apricorns/GrnApricorn.vb

@@ -1,5 +1,6 @@
-Namespace Items.Apricorns
+Namespace Items.Apricorns
 
+    <Item(93, "Green Apricorn")>
     Public Class GrnApricorn
 
         Inherits Item

2.5DHero/2.5DHero/Pokemon/Items/Apricorns/PnkApricorn.vb

@@ -1,5 +1,6 @@
-Namespace Items.Apricorns
+Namespace Items.Apricorns
 
+    <Item(101, "Pink Apricorn")>
     Public Class PnkApricorn
 
         Inherits Item

2.5DHero/2.5DHero/Pokemon/Items/Apricorns/RedApricorn.vb

@@ -1,5 +1,6 @@
-Namespace Items.Apricorns
+Namespace Items.Apricorns
 
+    <Item(85, "Red Apricorn")>
     Public Class RedApricorn
 
         Inherits Item

2.5DHero/2.5DHero/Pokemon/Items/Apricorns/WhtApricorn.vb

@@ -1,5 +1,6 @@
-Namespace Items.Apricorns
+Namespace Items.Apricorns
 
+    <Item(97, "White Apricorn")>
     Public Class WhtApricorn
 
         Inherits Item

2.5DHero/2.5DHero/Pokemon/Items/Apricorns/YlwApricorn.vb

@@ -1,5 +1,6 @@
-Namespace Items.Apricorns
+Namespace Items.Apricorns
 
+    <Item(92, "Yellow Apricorn")>
     Public Class YlwApricorn
 
         Inherits Item

2.5DHero/2.5DHero/Pokemon/Items/Balls/CherishBall.vb

@@ -1,5 +1,6 @@
-Namespace Items.Balls
+Namespace Items.Balls
 
+    <Item(45, "Cherish Ball")>
     Public Class CherishBall
 
         Inherits Item

2.5DHero/2.5DHero/Pokemon/Items/Balls/DiveBall.vb

@@ -1,5 +1,6 @@
-Namespace Items.Balls
+Namespace Items.Balls
 
+    <Item(79, "Dive Ball")>
     Public Class DiveBall
 
         Inherits Item

2.5DHero/2.5DHero/Pokemon/Items/Balls/DuskBall.vb

@@ -1,5 +1,6 @@
-Namespace Items.Balls
+Namespace Items.Balls
 
+    <Item(158, "Dusk Ball")>
     Public Class DuskBall
 
         Inherits Item

2.5DHero/2.5DHero/Pokemon/Items/Balls/FastBall.vb

@@ -1,5 +1,6 @@
-Namespace Items.Balls
+Namespace Items.Balls
 
+    <Item(161, "Fast Ball")>
     Public Class FastBall
 
         Inherits Item

2.5DHero/2.5DHero/Pokemon/Items/Balls/FriendBall.vb

@@ -1,5 +1,6 @@
-Namespace Items.Balls
+Namespace Items.Balls
 
+    <Item(164, "Friend Ball")>
     Public Class FriendBall
 
         Inherits Item

2.5DHero/2.5DHero/Pokemon/Items/Balls/GreatBall.vb

@@ -1,5 +1,6 @@
-Namespace Items.Balls
+Namespace Items.Balls
 
+    <Item(4, "Great Ball")>
     Public Class GreatBall
 
         Inherits Item

2.5DHero/2.5DHero/Pokemon/Items/Balls/HealBall.vb

@@ -1,5 +1,6 @@
-Namespace Items.Balls
+Namespace Items.Balls
 
+    <Item(186, "Heal Ball")>
     Public Class HealBall
 
         Inherits Item

2.5DHero/2.5DHero/Pokemon/Items/Balls/HeavyBall.vb

@@ -1,5 +1,6 @@
-Namespace Items.Balls
+Namespace Items.Balls
 
+    <Item(157, "Heavy Ball")>
     Public Class HeavyBall
 
         Inherits Item

2.5DHero/2.5DHero/Pokemon/Items/Balls/LevelBall.vb

@@ -1,5 +1,6 @@
-Namespace Items.Balls
+Namespace Items.Balls
 
+    <Item(159, "Level Ball")>
     Public Class LevelBall
 
         Inherits Item

2.5DHero/2.5DHero/Pokemon/Items/Balls/LoveBall.vb

@@ -1,5 +1,6 @@
-Namespace Items.Balls
+Namespace Items.Balls
 
+    <Item(166, "Love Ball")>
     Public Class LoveBall
 
         Inherits Item

2.5DHero/2.5DHero/Pokemon/Items/Balls/LureBall.vb

@@ -1,5 +1,6 @@
-Namespace Items.Balls
+Namespace Items.Balls
 
+    <Item(160, "Lure Ball")>
     Public Class LureBall
 
         Inherits Item

2.5DHero/2.5DHero/Pokemon/Items/Balls/LuxuryBall.vb

@@ -1,5 +1,6 @@
-Namespace Items.Balls
+Namespace Items.Balls
 
+    <Item(174, "Luxury Ball")>
     Public Class LuxuryBall
 
         Inherits Item

2.5DHero/2.5DHero/Pokemon/Items/Balls/Masterball.vb

@@ -1,5 +1,6 @@
-Namespace Items.Balls
+Namespace Items.Balls
 
+    <Item(1, "Masterball")>
     Public Class Masterball
 
         Inherits Item

2.5DHero/2.5DHero/Pokemon/Items/Balls/MoonBall.vb

@@ -1,5 +1,6 @@
-Namespace Items.Balls
+Namespace Items.Balls
 
+    <Item(165, "Moon Ball")>
     Public Class MoonBall
 
         Inherits Item

2.5DHero/2.5DHero/Pokemon/Items/Balls/NestBall.vb

@@ -1,5 +1,6 @@
-Namespace Items.Balls
+Namespace Items.Balls
 
+    <Item(188, "Nest Ball")>
     Public Class NestBall
 
         Inherits Item

2.5DHero/2.5DHero/Pokemon/Items/Balls/NetBall.vb

@@ -1,5 +1,6 @@
-Namespace Items.Balls
+Namespace Items.Balls
 
+    <Item(80, "Net Ball")>
     Public Class NetBall
 
         Inherits Item

2.5DHero/2.5DHero/Pokemon/Items/Balls/Pokeball.vb

@@ -1,5 +1,6 @@
-Namespace Items.Balls
+Namespace Items.Balls
 
+    <Item(5, "Pokéball")>
     Public Class Pokeball
 
         Inherits Item

2.5DHero/2.5DHero/Pokemon/Items/Balls/PremierBall.vb

@@ -1,5 +1,6 @@
-Namespace Items.Balls
+Namespace Items.Balls
 
+    <Item(3, "Premier Ball")>
     Public Class PremierBall
 
         Inherits Item

2.5DHero/2.5DHero/Pokemon/Items/Balls/QuickBall.vb

@@ -1,5 +1,6 @@
-Namespace Items.Balls
+Namespace Items.Balls
 
+    <Item(129, "Quick Ball")>
     Public Class QuickBall
 
         Inherits Item

2.5DHero/2.5DHero/Pokemon/Items/Balls/RepeatBall.vb

@@ -1,5 +1,6 @@
-Namespace Items.Balls
+Namespace Items.Balls
 
+    <Item(168, "Repeat Ball")>
     Public Class RepeatBall
 
         Inherits Item

2.5DHero/2.5DHero/Pokemon/Items/Balls/SafariBall.vb

@@ -1,5 +1,6 @@
-Namespace Items.Balls
+Namespace Items.Balls
 
+    <Item(181, "Safari Ball")>
     Public Class SafariBall
 
         Inherits Item

2.5DHero/2.5DHero/Pokemon/Items/Balls/SportBall.vb

@@ -1,5 +1,6 @@
-Namespace Items.Balls
+Namespace Items.Balls
 
+    <Item(177, "Sport Ball")>
     Public Class SportBall
 
         Inherits Item

2.5DHero/2.5DHero/Pokemon/Items/Balls/TimerBall.vb

@@ -1,5 +1,6 @@
-Namespace Items.Balls
+Namespace Items.Balls
 
+    <Item(150, "Timer Ball")>
     Public Class TimerBall
 
         Inherits Item

2.5DHero/2.5DHero/Pokemon/Items/Balls/UltraBall.vb

@@ -1,5 +1,6 @@
-Namespace Items.Balls
+Namespace Items.Balls
 
+    <Item(2, "Ultra Ball")>
     Public Class UltraBall
 
         Inherits Item

2.5DHero/2.5DHero/Pokemon/Items/Berries/AguavBerry.vb

@@ -1,11 +1,12 @@
 Namespace Items.Berries
 
+    <Item(2013, "Aguav")>
     Public Class AguavBerry
 
         Inherits Berry
 
         Public Sub New()
-            MyBase.New(2013, "Aguav", 21600, "If held by a Pokémon, it restores the user's HP in a pinch, but it will cause confusion if the user hates the taste.", "6.4cm", "Super Hard", 2, 3)
+            MyBase.New(2013, "Aguav", 21600, "If held by a Pok<EFBFBD>mon, it restores the user's HP in a pinch, but it will cause confusion if the user hates the taste.", "6.4cm", "Super Hard", 2, 3)
 
             Me.Spicy = 0
             Me.Dry = 0

2.5DHero/2.5DHero/Pokemon/Items/Berries/ApicotBerry.vb

@@ -1,11 +1,12 @@
 Namespace Items.Berries
 
+    <Item(2056, "Apicot")>
     Public Class ApicotBerry
 
         Inherits Berry
 
         Public Sub New()
-            MyBase.New(2056, "Apicot", 86400, "A Berry to be consumed by Pokémon. If a Pokémon holds one, its Sp. Def stat will increase when it's in a pinch.", "7.6cm", "Very Hard", 1, 2)
+            MyBase.New(2056, "Apicot", 86400, "A Berry to be consumed by Pok<EFBFBD>mon. If a Pok<6F>mon holds one, its Sp. Def stat will increase when it's in a pinch.", "7.6cm", "Very Hard", 1, 2)
 
             Me.Spicy = 10
             Me.Dry = 30

2.5DHero/2.5DHero/Pokemon/Items/Berries/AspearBerry.vb

@@ -1,5 +1,6 @@
 Namespace Items.Berries
 
+    <Item(2004, "Aspear")>
     Public Class AspearBerry
 
         Inherits Berry

2.5DHero/2.5DHero/Pokemon/Items/Berries/BabiriBerry.vb

@@ -1,5 +1,6 @@
 Namespace Items.Berries
 
+    <Item(2050, "Babiri")>
     Public Class BabiriBerry
 
         Inherits Berry

2.5DHero/2.5DHero/Pokemon/Items/Berries/BelueBerry.vb

@@ -1,5 +1,6 @@
 Namespace Items.Berries
 
+    <Item(2034, "Belue")>
     Public Class BelueBerry
 
         Inherits Berry

2.5DHero/2.5DHero/Pokemon/Items/Berries/BlukBerry.vb

@@ -1,5 +1,6 @@
 Namespace Items.Berries
 
+    <Item(2016, "Bluk")>
     Public Class BlukBerry
 
         Inherits Berry

2.5DHero/2.5DHero/Pokemon/Items/Berries/ChartiBerry.vb

@@ -1,5 +1,6 @@
 Namespace Items.Berries
 
+    <Item(2046, "Charti")>
     Public Class ChartiBerry
 
         Inherits Berry

2.5DHero/2.5DHero/Pokemon/Items/Berries/CheriBerry.vb

@@ -1,11 +1,12 @@
 Namespace Items.Berries
 
+    <Item(2000, "Cheri")>
     Public Class CheriBerry
 
         Inherits Berry
 
         Public Sub New()
-            MyBase.New(2000, "Cheri", 10800, "A Berry to be consumed by Pokémon. If a Pokémon holds one, it can recover from paralysis on its own in battle.", "2.0cm", "Soft", 2, 3)
+            MyBase.New(2000, "Cheri", 10800, "A Berry to be consumed by Pok<EFBFBD>mon. If a Pok<6F>mon holds one, it can recover from paralysis on its own in battle.", "2.0cm", "Soft", 2, 3)
 
             Me.Spicy = 10
             Me.Dry = 0

2.5DHero/2.5DHero/Pokemon/Items/Berries/ChestoBerry.vb

@@ -1,5 +1,6 @@
 Namespace Items.Berries
 
+    <Item(2001, "Chesto")>
     Public Class ChestoBerry
 
         Inherits Berry

2.5DHero/2.5DHero/Pokemon/Items/Berries/ChilanBerry.vb

@@ -1,5 +1,6 @@
 Namespace Items.Berries
 
+    <Item(2051, "Chilian")>
     Public Class ChilanBerry
 
         Inherits Berry

2.5DHero/2.5DHero/Pokemon/Items/Berries/ChopleBerry.vb

@@ -1,5 +1,6 @@
 Namespace Items.Berries
 
+    <Item(2040, "Chople")>
     Public Class ChopleBerry
 
         Inherits Berry

2.5DHero/2.5DHero/Pokemon/Items/Berries/CobaBerry.vb

@@ -1,5 +1,6 @@
 Namespace Items.Berries
 
+    <Item(2043, "Coba")>
     Public Class CobaBerry
 
         Inherits Berry

2.5DHero/2.5DHero/Pokemon/Items/Berries/ColburBerry.vb

@@ -1,5 +1,6 @@
 Namespace Items.Berries
 
+    <Item(2049, "Colbur")>
     Public Class ColburBerry
 
         Inherits Berry

2.5DHero/2.5DHero/Pokemon/Items/Berries/CornnBerry.vb

@@ -1,5 +1,6 @@
 Namespace Items.Berries
 
+    <Item(2026, "Cornn")>
     Public Class CornnBerry
 
         Inherits Berry

2.5DHero/2.5DHero/Pokemon/Items/Berries/CustapBerry.vb

@@ -1,5 +1,6 @@
 Namespace Items.Berries
 
+    <Item(2061, "Custap")>
     Public Class CustapBerry
 
         Inherits Berry

2.5DHero/2.5DHero/Pokemon/Items/Berries/DurinBerry.vb

@@ -1,5 +1,6 @@
 Namespace Items.Berries
 
+    <Item(2033, "Durin")>
     Public Class DurinBerry
 
         Inherits Berry

2.5DHero/2.5DHero/Pokemon/Items/Berries/EnigmaBerry.vb

@@ -1,5 +1,6 @@
 Namespace Items.Berries
 
+    <Item(2059, "Enigma")>
     Public Class EnigmaBerry
 
         Inherits Berry

2.5DHero/2.5DHero/Pokemon/Items/Berries/FigyBerry.vb

@@ -1,11 +1,12 @@
 Namespace Items.Berries
 
+    <Item(2010, "Figy")>
     Public Class FigyBerry
 
         Inherits Berry
 
         Public Sub New()
-            MyBase.New(2010, "Figy", 18000, "If held by a Pokémon, it restores the user's HP in a pinch, but it will cause confusion if the user hates the taste.", "10.0cm", "Soft", 2, 3)
+            MyBase.New(2010, "Figy", 18000, "If held by a Pok<EFBFBD>mon, it restores the user's HP in a pinch, but it will cause confusion if the user hates the taste.", "10.0cm", "Soft", 2, 3)
 
             Me.Spicy = 15
             Me.Dry = 0

2.5DHero/2.5DHero/Pokemon/Items/Berries/GanlonBerry.vb

@@ -1,11 +1,12 @@
 Namespace Items.Berries
 
+    <Item(2053, "Ganlon")>
     Public Class GanlonBerry
 
         Inherits Berry
 
         Public Sub New()
-            MyBase.New(2053, "Ganlon", 86400, "A Berry to be consumed by Pokémon. If a Pokémon holds one, its Defense stat will increase when it's in a pinch.", "3.3cm", "Very Hard", 1, 2)
+            MyBase.New(2053, "Ganlon", 86400, "A Berry to be consumed by Pok<EFBFBD>mon. If a Pok<6F>mon holds one, its Defense stat will increase when it's in a pinch.", "3.3cm", "Very Hard", 1, 2)
 
             Me.Spicy = 0
             Me.Dry = 30

2.5DHero/2.5DHero/Pokemon/Items/Berries/GrepaBerry.vb

@@ -1,5 +1,6 @@
 Namespace Items.Berries
 
+    <Item(2024, "Grepa")>
     Public Class GrepaBerry
 
         Inherits Berry

2.5DHero/2.5DHero/Pokemon/Items/Berries/HabanBerry.vb

@@ -1,5 +1,6 @@
 Namespace Items.Berries
 
+    <Item(2048, "Haban")>
     Public Class HabanBerry
 
         Inherits Berry

2.5DHero/2.5DHero/Pokemon/Items/Berries/HondewBerry.vb

@@ -1,5 +1,6 @@
 Namespace Items.Berries
 
+    <Item(2023, "Hondew")>
     Public Class HondewBerry
 
         Inherits Berry

2.5DHero/2.5DHero/Pokemon/Items/Berries/IapapaBerry.vb

@@ -1,11 +1,12 @@
 Namespace Items.Berries
 
+    <Item(2014, "Iapapa")>
     Public Class IapapaBerry
 
         Inherits Berry
 
         Public Sub New()
-            MyBase.New(2014, "Iapapa", 21600, "If held by a Pokémon, it restores the user's HP in a pinch, but it will cause confusion if the user hates the taste.", "22.3cm", "Soft", 2, 3)
+            MyBase.New(2014, "Iapapa", 21600, "If held by a Pok<EFBFBD>mon, it restores the user's HP in a pinch, but it will cause confusion if the user hates the taste.", "22.3cm", "Soft", 2, 3)
 
             Me.Spicy = 0
             Me.Dry = 0

2.5DHero/2.5DHero/Pokemon/Items/Berries/JabocaBerry.vb

@@ -1,5 +1,6 @@
 Namespace Items.Berries
 
+    <Item(2062, "Jaboca")>
     Public Class JabocaBerry
 
         Inherits Berry

2.5DHero/2.5DHero/Pokemon/Items/Berries/KasibBerry.vb

@@ -1,5 +1,6 @@
 Namespace Items.Berries
 
+    <Item(2047, "Kasib")>
     Public Class KasibBerry
 
         Inherits Berry

2.5DHero/2.5DHero/Pokemon/Items/Berries/KebiaBerry.vb

@@ -1,5 +1,6 @@
 Namespace Items.Berries
 
+    <Item(2041, "Kebia")>
     Public Class KebiaBerry
 
         Inherits Berry

2.5DHero/2.5DHero/Pokemon/Items/Berries/KelpsyBerry.vb

@@ -1,5 +1,6 @@
 Namespace Items.Berries
 
+    <Item(2021, "Kelpsy")>
     Public Class KelpsyBerry
 
         Inherits Berry

2.5DHero/2.5DHero/Pokemon/Items/Berries/LansatBerry.vb

@@ -1,11 +1,12 @@
 Namespace Items.Berries
 
+    <Item(2057, "Lansat")>
     Public Class LansatBerry
 
         Inherits Berry
 
         Public Sub New()
-            MyBase.New(2057, "Lansat", 86400, "A Berry to be consumed by Pokémon. If a Pokémon holds one, its critical-hit ratio will increase when it's in a pinch.", "9.7cm", "Soft", 1, 2)
+            MyBase.New(2057, "Lansat", 86400, "A Berry to be consumed by Pok<EFBFBD>mon. If a Pok<6F>mon holds one, its critical-hit ratio will increase when it's in a pinch.", "9.7cm", "Soft", 1, 2)
 
             Me.Spicy = 30
             Me.Dry = 10

2.5DHero/2.5DHero/Pokemon/Items/Berries/LeppaBerry.vb

@@ -1,11 +1,12 @@
 Namespace Items.Berries
 
+    <Item(2005, "Leppa")>
     Public Class LeppaBerry
 
         Inherits Berry
 
         Public Sub New()
-            MyBase.New(2005, "Leppa", 14400, "A Berry to be consumed by a Pokémon. If a Pokémon holds one, it can restore 10 PP to a depleted move during battle.", "2.8cm", "Very Hard", 2, 3)
+            MyBase.New(2005, "Leppa", 14400, "A Berry to be consumed by a Pok<EFBFBD>mon. If a Pok<6F>mon holds one, it can restore 10 PP to a depleted move during battle.", "2.8cm", "Very Hard", 2, 3)
 
             Me.Spicy = 10
             Me.Dry = 0

2.5DHero/2.5DHero/Pokemon/Items/Berries/LiechiBerry.vb

@@ -1,11 +1,12 @@
 Namespace Items.Berries
 
+    <Item(2052, "Liechi")>
     Public Class LiechiBerry
 
         Inherits Berry
 
         Public Sub New()
-            MyBase.New(2052, "Liechi", 86400, "A Berry to be consumed by Pokémon. If a Pokémon holds one, its Attack stat will increase when it's in a pinch.", "11.1cm", "Very Hard", 1, 2)
+            MyBase.New(2052, "Liechi", 86400, "A Berry to be consumed by Pok<EFBFBD>mon. If a Pok<6F>mon holds one, its Attack stat will increase when it's in a pinch.", "11.1cm", "Very Hard", 1, 2)
 
             Me.Spicy = 30
             Me.Dry = 10

2.5DHero/2.5DHero/Pokemon/Items/Berries/LumBerry.vb

@@ -1,11 +1,12 @@
 Namespace Items.Berries
 
+    <Item(2008, "Lum")>
     Public Class LumBerry
 
         Inherits Berry
 
         Public Sub New()
-            MyBase.New(2008, "Lum", 43200, "A berry to be consumed by a Pokémon. If a Pokémon holds one, it can recover from any status condition during battle.", "3.4cm", "Super Hard", 1, 2)
+            MyBase.New(2008, "Lum", 43200, "A berry to be consumed by a Pok<EFBFBD>mon. If a Pok<6F>mon holds one, it can recover from any status condition during battle.", "3.4cm", "Super Hard", 1, 2)
 
             Me.Spicy = 10
             Me.Dry = 10

2.5DHero/2.5DHero/Pokemon/Items/Berries/MagoBerry.vb

@@ -1,11 +1,12 @@
 Namespace Items.Berries
 
+    <Item(2012, "Mago")>
     Public Class MagoBerry
 
         Inherits Berry
 
         Public Sub New()
-            MyBase.New(2012, "Mago", 21600, "If held by a Pokémon, it restores the user's HP in a pinch, but it will cause confusion if the user hates the taste.", "12.6cm", "Hard", 2, 3)
+            MyBase.New(2012, "Mago", 21600, "If held by a Pok<EFBFBD>mon, it restores the user's HP in a pinch, but it will cause confusion if the user hates the taste.", "12.6cm", "Hard", 2, 3)
 
             Me.Spicy = 0
             Me.Dry = 0

2.5DHero/2.5DHero/Pokemon/Items/Berries/MagostBerry.vb

@@ -1,5 +1,6 @@
 Namespace Items.Berries
 
+    <Item(2027, "Magost")>
     Public Class MagostBerry
 
         Inherits Berry

2.5DHero/2.5DHero/Pokemon/Items/Berries/MicleBerry.vb

@@ -1,11 +1,12 @@
 Namespace Items.Berries
 
+    <Item(2060, "Micle")>
     Public Class MicleBerry
 
         Inherits Berry
 
         Public Sub New()
-            MyBase.New(2060, "Micle", 86400, "If held by a Pokémon, it raises the accuracy of a move just once in a pinch.", "4.1cm", "Soft", 1, 5)
+            MyBase.New(2060, "Micle", 86400, "If held by a Pok<EFBFBD>mon, it raises the accuracy of a move just once in a pinch.", "4.1cm", "Soft", 1, 5)
 
             Me.Spicy = 0
             Me.Dry = 40

2.5DHero/2.5DHero/Pokemon/Items/Berries/NanabBerry.vb

@@ -1,5 +1,6 @@
 Namespace Items.Berries
 
+    <Item(2017, "Nanab")>
     Public Class NanabBerry
 
         Inherits Berry

2.5DHero/2.5DHero/Pokemon/Items/Berries/NomelBerry.vb

@@ -1,5 +1,6 @@
 Namespace Items.Berries
 
+    <Item(2029, "Nomel")>
     Public Class NomelBerry
 
         Inherits Berry

2.5DHero/2.5DHero/Pokemon/Items/Berries/OccaBerry.vb

@@ -1,5 +1,6 @@
 Namespace Items.Berries
 
+    <Item(2035, "Occa")>
     Public Class OccaBerry
 
         Inherits Berry

2.5DHero/2.5DHero/Pokemon/Items/Berries/OranBerry.vb

@@ -1,11 +1,12 @@
 Namespace Items.Berries
 
+    <Item(2006, "Oran")>
     Public Class OranBerry
 
         Inherits Berry
 
         Public Sub New()
-            MyBase.New(2006, "Oran", 10800, "A Berry to be consumed by Pokémon. If a Pokémon holds one, it can restore its own HP by 10 points during battle.", "3.5cm", "Super Hard", 2, 3)
+            MyBase.New(2006, "Oran", 10800, "A Berry to be consumed by Pok<EFBFBD>mon. If a Pok<6F>mon holds one, it can restore its own HP by 10 points during battle.", "3.5cm", "Super Hard", 2, 3)
 
             Me.Spicy = 10
             Me.Dry = 10

2.5DHero/2.5DHero/Pokemon/Items/Berries/PamtreBerry.vb

@@ -1,5 +1,6 @@
 Namespace Items.Berries
 
+    <Item(2031, "Pamtre")>
     Public Class PamtreBerry
 
         Inherits Berry

2.5DHero/2.5DHero/Pokemon/Items/Berries/PasshoBerry.vb

@@ -1,5 +1,6 @@
 Namespace Items.Berries
 
+    <Item(2036, "Passho")>
     Public Class PasshoBerry
 
         Inherits Berry

2.5DHero/2.5DHero/Pokemon/Items/Berries/PayapaBerry.vb

@@ -1,5 +1,6 @@
 Namespace Items.Berries
 
+    <Item(2044, "Payapa")>
     Public Class PayapaBerry
 
         Inherits Berry

2.5DHero/2.5DHero/Pokemon/Items/Berries/PechaBerry.vb

@@ -1,11 +1,12 @@
 Namespace Items.Berries
 
+    <Item(2002, "Pecha")>
     Public Class PechaBerry
 
         Inherits Berry
 
         Public Sub New()
-            MyBase.New(2002, "Pecha", 10800, "A Berry to be consumed by Pokémon. If a Pokémon holds one, it can recover from poisoning on its own in battle.", "4.0cm", "Very Soft", 2, 3)
+            MyBase.New(2002, "Pecha", 10800, "A Berry to be consumed by Pok<EFBFBD>mon. If a Pok<6F>mon holds one, it can recover from poisoning on its own in battle.", "4.0cm", "Very Soft", 2, 3)
 
             Me.Spicy = 0
             Me.Dry = 0

2.5DHero/2.5DHero/Pokemon/Items/Berries/PersimBerry.vb

@@ -1,11 +1,12 @@
 Namespace Items.Berries
 
+    <Item(2007, "Persim")>
     Public Class PersimBerry
 
         Inherits Berry
 
         Public Sub New()
-            MyBase.New(2007, "Persim", 14400, "A Berry to be consumed by Pokémon. If a Pokémon holds one, it can recover from confusion on its own in battle.", "4.7cm", "Hard", 2, 3)
+            MyBase.New(2007, "Persim", 14400, "A Berry to be consumed by Pok<EFBFBD>mon. If a Pok<6F>mon holds one, it can recover from confusion on its own in battle.", "4.7cm", "Hard", 2, 3)
 
             Me.Spicy = 10
             Me.Dry = 10

2.5DHero/2.5DHero/Pokemon/Items/Berries/PetayaBerry.vb

@@ -1,11 +1,12 @@
 Namespace Items.Berries
 
+    <Item(2055, "Petaya")>
     Public Class PetayaBerry
 
         Inherits Berry
 
         Public Sub New()
-            MyBase.New(2055, "Petaya", 86400, "A Berry to be consumed by Pokémon. If a Pokémon holds one, its Sp. Atk stat will increase when it's in a pinch.", "23.7cm", "Very Hard", 1, 2)
+            MyBase.New(2055, "Petaya", 86400, "A Berry to be consumed by Pok<EFBFBD>mon. If a Pok<6F>mon holds one, its Sp. Atk stat will increase when it's in a pinch.", "23.7cm", "Very Hard", 1, 2)
 
             Me.Spicy = 30
             Me.Dry = 0

2.5DHero/2.5DHero/Pokemon/Items/Berries/PinapBerry.vb

@@ -1,5 +1,6 @@
 Namespace Items.Berries
 
+    <Item(2019, "Pinap")>
     Public Class PinapBerry
 
         Inherits Berry

2.5DHero/2.5DHero/Pokemon/Items/Berries/PomegBerry.vb

@@ -1,5 +1,6 @@
 Namespace Items.Berries
 
+    <Item(2020, "Pomeg")>
     Public Class PomegBerry
 
         Inherits Berry

2.5DHero/2.5DHero/Pokemon/Items/Berries/QualotBerry.vb

@@ -1,5 +1,6 @@
 Namespace Items.Berries
 
+    <Item(2022, "Qualot")>
     Public Class QualotBerry
 
         Inherits Berry

2.5DHero/2.5DHero/Pokemon/Items/Berries/RabutaBerry.vb

@@ -1,5 +1,6 @@
 Namespace Items.Berries
 
+    <Item(2028, "Rabuta")>
     Public Class RabutaBerry
 
         Inherits Berry

2.5DHero/2.5DHero/Pokemon/Items/Berries/RawstBerry.vb

@@ -1,11 +1,12 @@
 Namespace Items.Berries
 
+    <Item(2003, "Rawst")>
     Public Class RawstBerry
 
         Inherits Berry
 
         Public Sub New()
-            MyBase.New(2003, "Rawst", 10800, "A Berry to be consumed by Pokémon. If a Pokémon holds one, it can recover from a burn on its own in battle.", "3.2cm", "Hard", 2, 3)
+            MyBase.New(2003, "Rawst", 10800, "A Berry to be consumed by Pok<EFBFBD>mon. If a Pok<6F>mon holds one, it can recover from a burn on its own in battle.", "3.2cm", "Hard", 2, 3)
 
             Me.Spicy = 0
             Me.Dry = 0

2.5DHero/2.5DHero/Pokemon/Items/Berries/RazzBerry.vb

@@ -1,5 +1,6 @@
 Namespace Items.Berries
 
+    <Item(2015, "Razz")>
     Public Class RazzBerry
 
         Inherits Berry

2.5DHero/2.5DHero/Pokemon/Items/Berries/RindoBerry.vb

@@ -1,5 +1,6 @@
 Namespace Items.Berries
 
+    <Item(2038, "Rindo")>
     Public Class RindoBerry
 
         Inherits Berry

2.5DHero/2.5DHero/Pokemon/Items/Berries/RowapBerry.vb

@@ -1,5 +1,6 @@
 Namespace Items.Berries
 
+    <Item(2063, "Rowap")>
     Public Class RowapBerry
 
         Inherits Berry

2.5DHero/2.5DHero/Pokemon/Items/Berries/SalacBerry.vb

@@ -1,11 +1,12 @@
 Namespace Items.Berries
 
+    <Item(2054, "Salac")>
     Public Class SalacBerry
 
         Inherits Berry
 
         Public Sub New()
-            MyBase.New(2054, "Salac", 86400, "A Berry to be held by Pokémon. If a Pokémon holds one, its Speed stat will increase when it's in a pinch. ", "9.4cm", "Very Hard", 1, 2)
+            MyBase.New(2054, "Salac", 86400, "A Berry to be held by Pok<EFBFBD>mon. If a Pok<6F>mon holds one, its Speed stat will increase when it's in a pinch. ", "9.4cm", "Very Hard", 1, 2)
 
             Me.Spicy = 0
             Me.Dry = 0

2.5DHero/2.5DHero/Pokemon/Items/Berries/ShucaBerry.vb

@@ -1,5 +1,6 @@
 Namespace Items.Berries
 
+    <Item(2042, "Shuca")>
     Public Class ShucaBerry
 
         Inherits Berry

2.5DHero/2.5DHero/Pokemon/Items/Berries/SitrusBerry.vb

@@ -1,11 +1,12 @@
 Namespace Items.Berries
 
+    <Item(2009, "Sitrus")>
     Public Class SitrusBerry
 
         Inherits Berry
 
         Public Sub New()
-            MyBase.New(2009, "Sitrus", 21600, "A Berry to be consumed by Pokémon. If a Pokémon holds one, it can restore its own HP by a small amount during battle.", "9.5cm", "Very Hard", 2, 3)
+            MyBase.New(2009, "Sitrus", 21600, "A Berry to be consumed by Pok<EFBFBD>mon. If a Pok<6F>mon holds one, it can restore its own HP by a small amount during battle.", "9.5cm", "Very Hard", 2, 3)
 
             Me.Spicy = 0
             Me.Dry = 10

2.5DHero/2.5DHero/Pokemon/Items/Berries/SpelonBerry.vb

@@ -1,5 +1,6 @@
 Namespace Items.Berries
 
+    <Item(2030, "Spelon")>
     Public Class SpelonBerry
 
         Inherits Berry

2.5DHero/2.5DHero/Pokemon/Items/Berries/StarfBerry.vb

@@ -1,11 +1,12 @@
 Namespace Items.Berries
 
+    <Item(2058, "Starf")>
     Public Class StarfBerry
 
         Inherits Berry
 
         Public Sub New()
-            MyBase.New(2058, "Starf", 86400, "A Berry to be consumed by Pokémon. If a Pokémon holds one, one of its stats will sharply increase when it's in a pinch.", "15.2cm", "Super Hard", 1, 2)
+            MyBase.New(2058, "Starf", 86400, "A Berry to be consumed by Pok<EFBFBD>mon. If a Pok<6F>mon holds one, one of its stats will sharply increase when it's in a pinch.", "15.2cm", "Super Hard", 1, 2)
 
             Me.Spicy = 30
             Me.Dry = 10

2.5DHero/2.5DHero/Pokemon/Items/Berries/TamatoBerry.vb

@@ -1,5 +1,6 @@
 Namespace Items.Berries
 
+    <Item(2025, "Tamato")>
     Public Class TamatoBerry
 
         Inherits Berry

2.5DHero/2.5DHero/Pokemon/Items/Berries/TangaBerry.vb

@@ -1,5 +1,6 @@
 Namespace Items.Berries
 
+    <Item(2045, "Tanga")>
     Public Class TangaBerry
 
         Inherits Berry

2.5DHero/2.5DHero/Pokemon/Items/Berries/WacanBerry.vb

@@ -1,5 +1,6 @@
 Namespace Items.Berries
 
+    <Item(2037, "Wacan")>
     Public Class WacanBerry
 
         Inherits Berry

2.5DHero/2.5DHero/Pokemon/Items/Berries/WatmelBerry.vb

@@ -1,5 +1,6 @@
 Namespace Items.Berries
 
+    <Item(2032, "Watmel")>
 Public Class WatmelBerry
 
     Inherits Berry

2.5DHero/2.5DHero/Pokemon/Items/Berries/WepearBerry.vb

@@ -1,11 +1,12 @@
 Namespace Items.Berries
 
+    <Item(2018, "Wepear")>
     Public Class WepearBerry
 
         Inherits Berry
 
         Public Sub New()
-            MyBase.New(2018, "Wepear", 3600, "Pokéblock ingredient. Plant in loamy soil to grow Wepear.", "7.4cm", "Super Hard", 3, 6)
+            MyBase.New(2018, "Wepear", 3600, "Pok<EFBFBD>block ingredient. Plant in loamy soil to grow Wepear.", "7.4cm", "Super Hard", 3, 6)
 
             Me.Spicy = 0
             Me.Dry = 0

2.5DHero/2.5DHero/Pokemon/Items/Berries/WikiBerry.vb

@@ -1,11 +1,12 @@
 Namespace Items.Berries
 
+    <Item(2011, "Wiki")>
     Public Class WikiBerry
 
         Inherits Berry
 
         Public Sub New()
-            MyBase.New(2011, "Wiki", 21600, "If held by a Pokémon, it restores the user's HP in a pinch, but it will cause confusion if the user hates the taste.", "11.5cm", "Hard", 2, 3)
+            MyBase.New(2011, "Wiki", 21600, "If held by a Pok<EFBFBD>mon, it restores the user's HP in a pinch, but it will cause confusion if the user hates the taste.", "11.5cm", "Hard", 2, 3)
 
             Me.Spicy = 0
             Me.Dry = 15

2.5DHero/2.5DHero/Pokemon/Items/Berries/YacheBerry.vb

@@ -1,5 +1,6 @@
 Namespace Items.Berries
 
+    <Item(2039, "Yache")>
     Public Class YacheBerry
 
         Inherits Berry

2.5DHero/2.5DHero/Pokemon/Items/Berry.vb

@@ -1,6 +1,6 @@
 Namespace Items
 
-    Public Class Berry
+    Public MustInherit Class Berry
 
         Inherits MedicineItem
 

2.5DHero/2.5DHero/Pokemon/Items/ItemAttribute.vb

@@ -0,0 +1,23 @@
+Namespace Items
+
+    <AttributeUsage(AttributeTargets.Class)>
+    Friend Class ItemAttribute
+
+        Inherits Attribute
+
+        Public ReadOnly Property Id As Integer
+        Public ReadOnly Property Name As String
+
+        Public Sub New(id As Integer, name As String)
+            Me.Id = id
+            Me.Name = name
+        End Sub
+
+    End Class
+
+    Friend Structure ItemIdentifier
+        Public Name As String
+        Public Id As Integer
+    End Structure
+
+End Namespace