From 6a70b06240b8432c474608af5525ed80246012d7 Mon Sep 17 00:00:00 2001
From: Eduardo Quezada <eduardo602002@gmail.com>
Date: Sun, 10 Sep 2023 19:42:33 -0300
Subject: [PATCH] Removed unused itemId field

---
 include/item.h   |   1 -
 src/data/items.h | 799 -----------------------------------------------
 2 files changed, 800 deletions(-)

diff --git a/include/item.h b/include/item.h
index d6df347eb..eac8fead9 100644
--- a/include/item.h
+++ b/include/item.h
@@ -10,7 +10,6 @@ typedef void (*ItemUseFunc)(u8);
 struct Item
 {
     u8 name[ITEM_NAME_LENGTH];
-    u16 itemId;
     u16 price;
     u8 holdEffect;
     u8 holdEffectParam;
diff --git a/src/data/items.h b/src/data/items.h
index 3154671cf..f0e5c0ff7 100644
--- a/src/data/items.h
+++ b/src/data/items.h
@@ -19,7 +19,6 @@ const struct Item gItems[] =
     [ITEM_NONE] =
     {
         .name = _("????????"),
-        .itemId = ITEM_NONE,
         .price = 0,
         .description = sDummyDesc,
         .pocket = POCKET_ITEMS,
@@ -32,7 +31,6 @@ const struct Item gItems[] =
     [ITEM_POKE_BALL] =
     {
         .name = _("Poké Ball"),
-        .itemId = ITEM_POKE_BALL,
         .price = 200,
         .description = sPokeBallDesc,
         .pocket = POCKET_POKE_BALLS,
@@ -44,7 +42,6 @@ const struct Item gItems[] =
     [ITEM_GREAT_BALL] =
     {
         .name = _("Great Ball"),
-        .itemId = ITEM_GREAT_BALL,
         .price = 600,
         .description = sGreatBallDesc,
         .pocket = POCKET_POKE_BALLS,
@@ -56,7 +53,6 @@ const struct Item gItems[] =
     [ITEM_ULTRA_BALL] =
     {
         .name = _("Ultra Ball"),
-        .itemId = ITEM_ULTRA_BALL,
         .price = 800,
         .description = sUltraBallDesc,
         .pocket = POCKET_POKE_BALLS,
@@ -68,7 +64,6 @@ const struct Item gItems[] =
     [ITEM_MASTER_BALL] =
     {
         .name = _("Master Ball"),
-        .itemId = ITEM_MASTER_BALL,
         .price = 0,
         .description = sMasterBallDesc,
         .pocket = POCKET_POKE_BALLS,
@@ -80,7 +75,6 @@ const struct Item gItems[] =
     [ITEM_PREMIER_BALL] =
     {
         .name = _("Premier Ball"),
-        .itemId = ITEM_PREMIER_BALL,
         .price = 20,
         .description = sPremierBallDesc,
         .pocket = POCKET_POKE_BALLS,
@@ -92,7 +86,6 @@ const struct Item gItems[] =
     [ITEM_HEAL_BALL] =
     {
         .name = _("Heal Ball"),
-        .itemId = ITEM_HEAL_BALL,
         .price = 300,
         .description = sHealBallDesc,
         .pocket = POCKET_POKE_BALLS,
@@ -104,7 +97,6 @@ const struct Item gItems[] =
     [ITEM_NET_BALL] =
     {
         .name = _("Net Ball"),
-        .itemId = ITEM_NET_BALL,
         .price = 1000,
         .description = sNetBallDesc,
         .pocket = POCKET_POKE_BALLS,
@@ -116,7 +108,6 @@ const struct Item gItems[] =
     [ITEM_NEST_BALL] =
     {
         .name = _("Nest Ball"),
-        .itemId = ITEM_NEST_BALL,
         .price = 1000,
         .description = sNestBallDesc,
         .pocket = POCKET_POKE_BALLS,
@@ -128,7 +119,6 @@ const struct Item gItems[] =
     [ITEM_DIVE_BALL] =
     {
         .name = _("Dive Ball"),
-        .itemId = ITEM_DIVE_BALL,
         .price = 1000,
         .description = sDiveBallDesc,
         .pocket = POCKET_POKE_BALLS,
@@ -140,7 +130,6 @@ const struct Item gItems[] =
     [ITEM_DUSK_BALL] =
     {
         .name = _("Dusk Ball"),
-        .itemId = ITEM_DUSK_BALL,
         .price = 1000,
         .description = sDuskBallDesc,
         .pocket = POCKET_POKE_BALLS,
@@ -152,7 +141,6 @@ const struct Item gItems[] =
     [ITEM_TIMER_BALL] =
     {
         .name = _("Timer Ball"),
-        .itemId = ITEM_TIMER_BALL,
         .price = 1000,
         .description = sTimerBallDesc,
         .pocket = POCKET_POKE_BALLS,
@@ -164,7 +152,6 @@ const struct Item gItems[] =
     [ITEM_QUICK_BALL] =
     {
         .name = _("Quick Ball"),
-        .itemId = ITEM_QUICK_BALL,
         .price = 1000,
         .description = sQuickBallDesc,
         .pocket = POCKET_POKE_BALLS,
@@ -176,7 +163,6 @@ const struct Item gItems[] =
     [ITEM_REPEAT_BALL] =
     {
         .name = _("Repeat Ball"),
-        .itemId = ITEM_REPEAT_BALL,
         .price = 1000,
         .description = sRepeatBallDesc,
         .pocket = POCKET_POKE_BALLS,
@@ -188,7 +174,6 @@ const struct Item gItems[] =
     [ITEM_LUXURY_BALL] =
     {
         .name = _("Luxury Ball"),
-        .itemId = ITEM_LUXURY_BALL,
         .price = 1000,
         .description = sLuxuryBallDesc,
         .pocket = POCKET_POKE_BALLS,
@@ -200,7 +185,6 @@ const struct Item gItems[] =
     [ITEM_LEVEL_BALL] =
     {
         .name = _("Level Ball"),
-        .itemId = ITEM_LEVEL_BALL,
         .price = 0,
         .description = sLevelBallDesc,
         .pocket = POCKET_POKE_BALLS,
@@ -212,7 +196,6 @@ const struct Item gItems[] =
     [ITEM_LURE_BALL] =
     {
         .name = _("Lure Ball"),
-        .itemId = ITEM_LURE_BALL,
         .price = 0,
         .description = sLureBallDesc,
         .pocket = POCKET_POKE_BALLS,
@@ -224,7 +207,6 @@ const struct Item gItems[] =
     [ITEM_MOON_BALL] =
     {
         .name = _("Moon Ball"),
-        .itemId = ITEM_MOON_BALL,
         .price = 0,
         .description = sMoonBallDesc,
         .pocket = POCKET_POKE_BALLS,
@@ -236,7 +218,6 @@ const struct Item gItems[] =
     [ITEM_FRIEND_BALL] =
     {
         .name = _("Friend Ball"),
-        .itemId = ITEM_FRIEND_BALL,
         .price = 0,
         .description = sFriendBallDesc,
         .pocket = POCKET_POKE_BALLS,
@@ -248,7 +229,6 @@ const struct Item gItems[] =
     [ITEM_LOVE_BALL] =
     {
         .name = _("Love Ball"),
-        .itemId = ITEM_LOVE_BALL,
         .price = 0,
         .description = sLoveBallDesc,
         .pocket = POCKET_POKE_BALLS,
@@ -260,7 +240,6 @@ const struct Item gItems[] =
     [ITEM_FAST_BALL] =
     {
         .name = _("Fast Ball"),
-        .itemId = ITEM_FAST_BALL,
         .price = 0,
         .description = sFastBallDesc,
         .pocket = POCKET_POKE_BALLS,
@@ -272,7 +251,6 @@ const struct Item gItems[] =
     [ITEM_HEAVY_BALL] =
     {
         .name = _("Heavy Ball"),
-        .itemId = ITEM_HEAVY_BALL,
         .price = 0,
         .description = sHeavyBallDesc,
         .pocket = POCKET_POKE_BALLS,
@@ -284,7 +262,6 @@ const struct Item gItems[] =
     [ITEM_DREAM_BALL] =
     {
         .name = _("Dream Ball"),
-        .itemId = ITEM_DREAM_BALL,
         .price = 0,
         .description = sDreamBallDesc,
         .pocket = POCKET_POKE_BALLS,
@@ -296,7 +273,6 @@ const struct Item gItems[] =
     [ITEM_SAFARI_BALL] =
     {
         .name = _("Safari Ball"),
-        .itemId = ITEM_SAFARI_BALL,
         .price = 0,
         .description = sSafariBallDesc,
         .pocket = POCKET_POKE_BALLS,
@@ -308,7 +284,6 @@ const struct Item gItems[] =
     [ITEM_SPORT_BALL] =
     {
         .name = _("Sport Ball"),
-        .itemId = ITEM_SPORT_BALL,
         .price = 0,
         .description = sSportBallDesc,
         .pocket = POCKET_POKE_BALLS,
@@ -320,7 +295,6 @@ const struct Item gItems[] =
     [ITEM_PARK_BALL] =
     {
         .name = _("Park Ball"),
-        .itemId = ITEM_PARK_BALL,
         .price = 0,
         .description = sParkBallDesc,
         .pocket = POCKET_POKE_BALLS,
@@ -332,7 +306,6 @@ const struct Item gItems[] =
     [ITEM_BEAST_BALL] =
     {
         .name = _("Beast Ball"),
-        .itemId = ITEM_BEAST_BALL,
         .price = 0,
         .description = sBeastBallDesc,
         .pocket = POCKET_POKE_BALLS,
@@ -344,7 +317,6 @@ const struct Item gItems[] =
     [ITEM_CHERISH_BALL] =
     {
         .name = _("Cherish Ball"),
-        .itemId = ITEM_CHERISH_BALL,
         .price = 0,
         .description = sCherishBallDesc,
         .pocket = POCKET_POKE_BALLS,
@@ -358,7 +330,6 @@ const struct Item gItems[] =
     [ITEM_POTION] =
     {
         .name = _("Potion"),
-        .itemId = ITEM_POTION,
         .price = 200,
         .holdEffectParam = 20,
         .description = sPotionDesc,
@@ -372,7 +343,6 @@ const struct Item gItems[] =
     [ITEM_SUPER_POTION] =
     {
         .name = _("Super Potion"),
-        .itemId = ITEM_SUPER_POTION,
         .price = 700,
         .holdEffectParam = 60,
         .description = sSuperPotionDesc,
@@ -386,7 +356,6 @@ const struct Item gItems[] =
     [ITEM_HYPER_POTION] =
     {
         .name = _("Hyper Potion"),
-        .itemId = ITEM_HYPER_POTION,
         .price = 1500,
         .holdEffectParam = 120,
         .description = sHyperPotionDesc,
@@ -400,7 +369,6 @@ const struct Item gItems[] =
     [ITEM_MAX_POTION] =
     {
         .name = _("Max Potion"),
-        .itemId = ITEM_MAX_POTION,
         .price = 2500,
         .holdEffectParam = 255,
         .description = sMaxPotionDesc,
@@ -414,7 +382,6 @@ const struct Item gItems[] =
     [ITEM_FULL_RESTORE] =
     {
         .name = _("Full Restore"),
-        .itemId = ITEM_FULL_RESTORE,
         .price = 3000,
         .holdEffectParam = 255,
         .description = sFullRestoreDesc,
@@ -428,7 +395,6 @@ const struct Item gItems[] =
     [ITEM_REVIVE] =
     {
         .name = _("Revive"),
-        .itemId = ITEM_REVIVE,
         .price = 2000,
         .description = sReviveDesc,
         .pocket = POCKET_ITEMS,
@@ -441,7 +407,6 @@ const struct Item gItems[] =
     [ITEM_MAX_REVIVE] =
     {
         .name = _("Max Revive"),
-        .itemId = ITEM_MAX_REVIVE,
         .price = 4000,
         .description = sMaxReviveDesc,
         .pocket = POCKET_ITEMS,
@@ -454,7 +419,6 @@ const struct Item gItems[] =
     [ITEM_FRESH_WATER] =
     {
         .name = _("Fresh Water"),
-        .itemId = ITEM_FRESH_WATER,
         .price = 200,
         .holdEffectParam = 30,
         .description = sFreshWaterDesc,
@@ -468,7 +432,6 @@ const struct Item gItems[] =
     [ITEM_SODA_POP] =
     {
         .name = _("Soda Pop"),
-        .itemId = ITEM_SODA_POP,
         .price = 300,
         .holdEffectParam = 50,
         .description = sSodaPopDesc,
@@ -482,7 +445,6 @@ const struct Item gItems[] =
     [ITEM_LEMONADE] =
     {
         .name = _("Lemonade"),
-        .itemId = ITEM_LEMONADE,
         .price = 400,
         .holdEffectParam = 70,
         .description = sLemonadeDesc,
@@ -496,7 +458,6 @@ const struct Item gItems[] =
     [ITEM_MOOMOO_MILK] =
     {
         .name = _("Moomoo Milk"),
-        .itemId = ITEM_MOOMOO_MILK,
         .price = 600,
         .holdEffectParam = 100,
         .description = sMoomooMilkDesc,
@@ -510,7 +471,6 @@ const struct Item gItems[] =
     [ITEM_ENERGY_POWDER] =
     {
         .name = _("Energy Powder"),
-        .itemId = ITEM_ENERGY_POWDER,
         .price = 500,
         .description = sEnergyPowderDesc,
         .pocket = POCKET_ITEMS,
@@ -523,7 +483,6 @@ const struct Item gItems[] =
     [ITEM_ENERGY_ROOT] =
     {
         .name = _("Energy Root"),
-        .itemId = ITEM_ENERGY_ROOT,
         .price = 1200,
         .description = sEnergyRootDesc,
         .pocket = POCKET_ITEMS,
@@ -536,7 +495,6 @@ const struct Item gItems[] =
     [ITEM_HEAL_POWDER] =
     {
         .name = _("Heal Powder"),
-        .itemId = ITEM_HEAL_POWDER,
         .price = 300,
         .description = sHealPowderDesc,
         .pocket = POCKET_ITEMS,
@@ -549,7 +507,6 @@ const struct Item gItems[] =
     [ITEM_REVIVAL_HERB] =
     {
         .name = _("Revival Herb"),
-        .itemId = ITEM_REVIVAL_HERB,
         .price = 2800,
         .description = sRevivalHerbDesc,
         .pocket = POCKET_ITEMS,
@@ -562,7 +519,6 @@ const struct Item gItems[] =
     [ITEM_ANTIDOTE] =
     {
         .name = _("Antidote"),
-        .itemId = ITEM_ANTIDOTE,
         .price = 200,
         .description = sAntidoteDesc,
         .pocket = POCKET_ITEMS,
@@ -575,7 +531,6 @@ const struct Item gItems[] =
     [ITEM_PARALYZE_HEAL] =
     {
         .name = _("Paralyze Heal"),
-        .itemId = ITEM_PARALYZE_HEAL,
         .price = 300,
         .description = sParalyzeHealDesc,
         .pocket = POCKET_ITEMS,
@@ -588,7 +543,6 @@ const struct Item gItems[] =
     [ITEM_BURN_HEAL] =
     {
         .name = _("Burn Heal"),
-        .itemId = ITEM_BURN_HEAL,
         .price = 300,
         .description = sBurnHealDesc,
         .pocket = POCKET_ITEMS,
@@ -601,7 +555,6 @@ const struct Item gItems[] =
     [ITEM_ICE_HEAL] =
     {
         .name = _("Ice Heal"),
-        .itemId = ITEM_ICE_HEAL,
         .price = 100,
         .description = sIceHealDesc,
         .pocket = POCKET_ITEMS,
@@ -614,7 +567,6 @@ const struct Item gItems[] =
     [ITEM_AWAKENING] =
     {
         .name = _("Awakening"),
-        .itemId = ITEM_AWAKENING,
         .price = 100,
         .description = sAwakeningDesc,
         .pocket = POCKET_ITEMS,
@@ -627,7 +579,6 @@ const struct Item gItems[] =
     [ITEM_FULL_HEAL] =
     {
         .name = _("Full Heal"),
-        .itemId = ITEM_FULL_HEAL,
         .price = 400,
         .description = sFullHealDesc,
         .pocket = POCKET_ITEMS,
@@ -640,7 +591,6 @@ const struct Item gItems[] =
     [ITEM_ETHER] =
     {
         .name = _("Ether"),
-        .itemId = ITEM_ETHER,
         .price = 1200,
         .holdEffectParam = 10,
         .description = sEtherDesc,
@@ -654,7 +604,6 @@ const struct Item gItems[] =
     [ITEM_MAX_ETHER] =
     {
         .name = _("Max Ether"),
-        .itemId = ITEM_MAX_ETHER,
         .price = 2000,
         .holdEffectParam = 255,
         .description = sMaxEtherDesc,
@@ -668,7 +617,6 @@ const struct Item gItems[] =
     [ITEM_ELIXIR] =
     {
         .name = _("Elixir"),
-        .itemId = ITEM_ELIXIR,
         .price = 3000,
         .holdEffectParam = 10,
         .description = sElixirDesc,
@@ -682,7 +630,6 @@ const struct Item gItems[] =
     [ITEM_MAX_ELIXIR] =
     {
         .name = _("Max Elixir"),
-        .itemId = ITEM_MAX_ELIXIR,
         .price = 4500,
         .holdEffectParam = 255,
         .description = sMaxElixirDesc,
@@ -696,7 +643,6 @@ const struct Item gItems[] =
     [ITEM_BERRY_JUICE] =
     {
         .name = _("Berry Juice"),
-        .itemId = ITEM_BERRY_JUICE,
         .price = 200,
         .holdEffect = HOLD_EFFECT_RESTORE_HP,
         .holdEffectParam = 20,
@@ -711,7 +657,6 @@ const struct Item gItems[] =
     [ITEM_SACRED_ASH] =
     {
         .name = _("Sacred Ash"),
-        .itemId = ITEM_SACRED_ASH,
         .price = 50000,
         .description = sSacredAshDesc,
         .pocket = POCKET_ITEMS,
@@ -723,7 +668,6 @@ const struct Item gItems[] =
     [ITEM_SWEET_HEART] =
     {
         .name = _("Sweet Heart"),
-        .itemId = ITEM_SWEET_HEART,
         .price = 3000,
         .holdEffectParam = 20,
         .description = sSweetHeartDesc,
@@ -737,7 +681,6 @@ const struct Item gItems[] =
     [ITEM_MAX_HONEY] =
     {
         .name = _("Max Honey"),
-        .itemId = ITEM_MAX_HONEY,
         .price = 8000,
         .description = sMaxHoneyDesc,
         .pocket = POCKET_ITEMS,
@@ -752,7 +695,6 @@ const struct Item gItems[] =
     [ITEM_PEWTER_CRUNCHIES] =
     {
         .name = _("PewtrCrnches"),
-        .itemId = ITEM_PEWTER_CRUNCHIES,
         .price = 250,
         .description = sPewterCrunchiesDesc,
         .pocket = POCKET_ITEMS,
@@ -765,7 +707,6 @@ const struct Item gItems[] =
     [ITEM_RAGE_CANDY_BAR] =
     {
         .name = _("RageCandyBar"),
-        .itemId = ITEM_RAGE_CANDY_BAR,
         .price = 350,
         .description = sRageCandyBarDesc,
         .pocket = POCKET_ITEMS,
@@ -778,7 +719,6 @@ const struct Item gItems[] =
     [ITEM_LAVA_COOKIE] =
     {
         .name = _("Lava Cookie"),
-        .itemId = ITEM_LAVA_COOKIE,
         .price = 350,
         .description = sLavaCookieDesc,
         .pocket = POCKET_ITEMS,
@@ -791,7 +731,6 @@ const struct Item gItems[] =
     [ITEM_OLD_GATEAU] =
     {
         .name = _("Old Gateau"),
-        .itemId = ITEM_OLD_GATEAU,
         .price = 350,
         .description = sOldGateauDesc,
         .pocket = POCKET_ITEMS,
@@ -804,7 +743,6 @@ const struct Item gItems[] =
     [ITEM_CASTELIACONE] =
     {
         .name = _("Casteliacone"),
-        .itemId = ITEM_CASTELIACONE,
         .price = 350,
         .description = sCasteliaconeDesc,
         .pocket = POCKET_ITEMS,
@@ -817,7 +755,6 @@ const struct Item gItems[] =
     [ITEM_LUMIOSE_GALETTE] =
     {
         .name = _("LumioseGlete"),
-        .itemId = ITEM_LUMIOSE_GALETTE,
         .price = 350,
         .description = sLumioseGaletteDesc,
         .pocket = POCKET_ITEMS,
@@ -830,7 +767,6 @@ const struct Item gItems[] =
     [ITEM_SHALOUR_SABLE] =
     {
         .name = _("ShalourSable"),
-        .itemId = ITEM_SHALOUR_SABLE,
         .price = 350,
         .description = sShalourSableDesc,
         .pocket = POCKET_ITEMS,
@@ -843,7 +779,6 @@ const struct Item gItems[] =
     [ITEM_BIG_MALASADA] =
     {
         .name = _("Big Malasada"),
-        .itemId = ITEM_BIG_MALASADA,
         .price = 350,
         .description = sBigMalasadaDesc,
         .pocket = POCKET_ITEMS,
@@ -858,7 +793,6 @@ const struct Item gItems[] =
     [ITEM_HP_UP] =
     {
         .name = _("HP Up"),
-        .itemId = ITEM_HP_UP,
         .price = 10000,
         .description = sHPUpDesc,
         .pocket = POCKET_ITEMS,
@@ -870,7 +804,6 @@ const struct Item gItems[] =
     [ITEM_PROTEIN] =
     {
         .name = _("Protein"),
-        .itemId = ITEM_PROTEIN,
         .price = 10000,
         .description = sProteinDesc,
         .pocket = POCKET_ITEMS,
@@ -882,7 +815,6 @@ const struct Item gItems[] =
     [ITEM_IRON] =
     {
         .name = _("Iron"),
-        .itemId = ITEM_IRON,
         .price = 10000,
         .description = sIronDesc,
         .pocket = POCKET_ITEMS,
@@ -894,7 +826,6 @@ const struct Item gItems[] =
     [ITEM_CALCIUM] =
     {
         .name = _("Calcium"),
-        .itemId = ITEM_CALCIUM,
         .price = 10000,
         .description = sCalciumDesc,
         .pocket = POCKET_ITEMS,
@@ -906,7 +837,6 @@ const struct Item gItems[] =
     [ITEM_ZINC] =
     {
         .name = _("Zinc"),
-        .itemId = ITEM_ZINC,
         .price = 10000,
         .description = sZincDesc,
         .pocket = POCKET_ITEMS,
@@ -918,7 +848,6 @@ const struct Item gItems[] =
     [ITEM_CARBOS] =
     {
         .name = _("Carbos"),
-        .itemId = ITEM_CARBOS,
         .price = 10000,
         .description = sCarbosDesc,
         .pocket = POCKET_ITEMS,
@@ -930,7 +859,6 @@ const struct Item gItems[] =
     [ITEM_PP_UP] =
     {
         .name = _("PP Up"),
-        .itemId = ITEM_PP_UP,
         .price = 10000,
         .description = sPPUpDesc,
         .pocket = POCKET_ITEMS,
@@ -942,7 +870,6 @@ const struct Item gItems[] =
     [ITEM_PP_MAX] =
     {
         .name = _("PP Max"),
-        .itemId = ITEM_PP_MAX,
         .price = 10000,
         .description = sPPMaxDesc,
         .pocket = POCKET_ITEMS,
@@ -956,7 +883,6 @@ const struct Item gItems[] =
     [ITEM_HEALTH_FEATHER] =
     {
         .name = _("HealthFeather"),
-        .itemId = ITEM_HEALTH_FEATHER,
         .price = 300,
         .description = sHealthFeatherDesc,
         .pocket = POCKET_ITEMS,
@@ -968,7 +894,6 @@ const struct Item gItems[] =
     [ITEM_MUSCLE_FEATHER] =
     {
         .name = _("MuscleFeather"),
-        .itemId = ITEM_MUSCLE_FEATHER,
         .price = 300,
         .description = sMuscleFeatherDesc,
         .pocket = POCKET_ITEMS,
@@ -980,7 +905,6 @@ const struct Item gItems[] =
     [ITEM_RESIST_FEATHER] =
     {
         .name = _("ResistFeather"),
-        .itemId = ITEM_RESIST_FEATHER,
         .price = 300,
         .description = sResistFeatherDesc,
         .pocket = POCKET_ITEMS,
@@ -992,7 +916,6 @@ const struct Item gItems[] =
     [ITEM_GENIUS_FEATHER] =
     {
         .name = _("GeniusFeather"),
-        .itemId = ITEM_GENIUS_FEATHER,
         .price = 300,
         .description = sGeniusFeatherDesc,
         .pocket = POCKET_ITEMS,
@@ -1004,7 +927,6 @@ const struct Item gItems[] =
     [ITEM_CLEVER_FEATHER] =
     {
         .name = _("CleverFeather"),
-        .itemId = ITEM_CLEVER_FEATHER,
         .price = 300,
         .description = sCleverFeatherDesc,
         .pocket = POCKET_ITEMS,
@@ -1016,7 +938,6 @@ const struct Item gItems[] =
     [ITEM_SWIFT_FEATHER] =
     {
         .name = _("SwiftFeather"),
-        .itemId = ITEM_SWIFT_FEATHER,
         .price = 300,
         .description = sSwiftFeatherDesc,
         .pocket = POCKET_ITEMS,
@@ -1030,7 +951,6 @@ const struct Item gItems[] =
     [ITEM_ABILITY_CAPSULE] =
     {
         .name = _("AbilityCapsle"),
-        .itemId = ITEM_ABILITY_CAPSULE,
         .price = 10000,
         .holdEffectParam = 0,
         .description = sAbilityCapsuleDesc,
@@ -1042,7 +962,6 @@ const struct Item gItems[] =
     [ITEM_ABILITY_PATCH] =
     {
         .name = _("AbilityPatch"),
-        .itemId = ITEM_ABILITY_PATCH,
         .price = 0,
         .holdEffectParam = 0,
         .description = sAbilityPatchDesc,
@@ -1056,7 +975,6 @@ const struct Item gItems[] =
     [ITEM_LONELY_MINT] =
     {
         .name = _("Lonely Mint"),
-        .itemId = ITEM_LONELY_MINT,
         .price = 20,
         .description = sLonelyMintDesc,
         .pocket = POCKET_ITEMS,
@@ -1068,7 +986,6 @@ const struct Item gItems[] =
     [ITEM_ADAMANT_MINT] =
     {
         .name = _("Adamant Mint"),
-        .itemId = ITEM_ADAMANT_MINT,
         .price = 20,
         .description = sAdamantMintDesc,
         .pocket = POCKET_ITEMS,
@@ -1080,7 +997,6 @@ const struct Item gItems[] =
     [ITEM_NAUGHTY_MINT] =
     {
         .name = _("Naughty Mint"),
-        .itemId = ITEM_NAUGHTY_MINT,
         .price = 20,
         .description = sNaughtyMintDesc,
         .pocket = POCKET_ITEMS,
@@ -1092,7 +1008,6 @@ const struct Item gItems[] =
     [ITEM_BRAVE_MINT] =
     {
         .name = _("Brave Mint"),
-        .itemId = ITEM_BRAVE_MINT,
         .price = 20,
         .description = sBraveMintDesc,
         .pocket = POCKET_ITEMS,
@@ -1104,7 +1019,6 @@ const struct Item gItems[] =
     [ITEM_BOLD_MINT] =
     {
         .name = _("Bold Mint"),
-        .itemId = ITEM_BOLD_MINT,
         .price = 20,
         .description = sBoldMintDesc,
         .pocket = POCKET_ITEMS,
@@ -1116,7 +1030,6 @@ const struct Item gItems[] =
     [ITEM_IMPISH_MINT] =
     {
         .name = _("Impish Mint"),
-        .itemId = ITEM_IMPISH_MINT,
         .price = 20,
         .description = sImpishMintDesc,
         .pocket = POCKET_ITEMS,
@@ -1128,7 +1041,6 @@ const struct Item gItems[] =
     [ITEM_LAX_MINT] =
     {
         .name = _("Lax Mint"),
-        .itemId = ITEM_LAX_MINT,
         .price = 20,
         .description = sLaxMintDesc,
         .pocket = POCKET_ITEMS,
@@ -1140,7 +1052,6 @@ const struct Item gItems[] =
     [ITEM_RELAXED_MINT] =
     {
         .name = _("Relaxed Mint"),
-        .itemId = ITEM_RELAXED_MINT,
         .price = 20,
         .description = sRelaxedMintDesc,
         .pocket = POCKET_ITEMS,
@@ -1152,7 +1063,6 @@ const struct Item gItems[] =
     [ITEM_MODEST_MINT] =
     {
         .name = _("Modest Mint"),
-        .itemId = ITEM_MODEST_MINT,
         .price = 20,
         .description = sModestMintDesc,
         .pocket = POCKET_ITEMS,
@@ -1164,7 +1074,6 @@ const struct Item gItems[] =
     [ITEM_MILD_MINT] =
     {
         .name = _("Mild Mint"),
-        .itemId = ITEM_MILD_MINT,
         .price = 20,
         .description = sMildMintDesc,
         .pocket = POCKET_ITEMS,
@@ -1176,7 +1085,6 @@ const struct Item gItems[] =
     [ITEM_RASH_MINT] =
     {
         .name = _("Rash Mint"),
-        .itemId = ITEM_RASH_MINT,
         .price = 20,
         .description = sRashMintDesc,
         .pocket = POCKET_ITEMS,
@@ -1188,7 +1096,6 @@ const struct Item gItems[] =
     [ITEM_QUIET_MINT] =
     {
         .name = _("Quiet Mint"),
-        .itemId = ITEM_QUIET_MINT,
         .price = 20,
         .description = sQuietMintDesc,
         .pocket = POCKET_ITEMS,
@@ -1200,7 +1107,6 @@ const struct Item gItems[] =
     [ITEM_CALM_MINT] =
     {
         .name = _("Calm Mint"),
-        .itemId = ITEM_CALM_MINT,
         .price = 20,
         .description = sCalmMintDesc,
         .pocket = POCKET_ITEMS,
@@ -1212,7 +1118,6 @@ const struct Item gItems[] =
     [ITEM_GENTLE_MINT] =
     {
         .name = _("Gentle Mint"),
-        .itemId = ITEM_GENTLE_MINT,
         .price = 20,
         .description = sGentleMintDesc,
         .pocket = POCKET_ITEMS,
@@ -1224,7 +1129,6 @@ const struct Item gItems[] =
     [ITEM_CAREFUL_MINT] =
     {
         .name = _("Careful Mint"),
-        .itemId = ITEM_CAREFUL_MINT,
         .price = 20,
         .description = sCarefulMintDesc,
         .pocket = POCKET_ITEMS,
@@ -1236,7 +1140,6 @@ const struct Item gItems[] =
     [ITEM_SASSY_MINT] =
     {
         .name = _("Sassy Mint"),
-        .itemId = ITEM_SASSY_MINT,
         .price = 20,
         .description = sSassyMintDesc,
         .pocket = POCKET_ITEMS,
@@ -1248,7 +1151,6 @@ const struct Item gItems[] =
     [ITEM_TIMID_MINT] =
     {
         .name = _("Timid Mint"),
-        .itemId = ITEM_TIMID_MINT,
         .price = 20,
         .description = sTimidMintDesc,
         .pocket = POCKET_ITEMS,
@@ -1260,7 +1162,6 @@ const struct Item gItems[] =
     [ITEM_HASTY_MINT] =
     {
         .name = _("Hasty Mint"),
-        .itemId = ITEM_HASTY_MINT,
         .price = 20,
         .description = sHastyMintDesc,
         .pocket = POCKET_ITEMS,
@@ -1272,7 +1173,6 @@ const struct Item gItems[] =
     [ITEM_JOLLY_MINT] =
     {
         .name = _("Jolly Mint"),
-        .itemId = ITEM_JOLLY_MINT,
         .price = 20,
         .description = sJollyMintDesc,
         .pocket = POCKET_ITEMS,
@@ -1284,7 +1184,6 @@ const struct Item gItems[] =
     [ITEM_NAIVE_MINT] =
     {
         .name = _("Naive Mint"),
-        .itemId = ITEM_NAIVE_MINT,
         .price = 20,
         .description = sNaiveMintDesc,
         .pocket = POCKET_ITEMS,
@@ -1296,7 +1195,6 @@ const struct Item gItems[] =
     [ITEM_SERIOUS_MINT] =
     {
         .name = _("Serious Mint"),
-        .itemId = ITEM_SERIOUS_MINT,
         .price = 20,
         .description = sSeriousMintDesc,
         .pocket = POCKET_ITEMS,
@@ -1310,7 +1208,6 @@ const struct Item gItems[] =
     [ITEM_RARE_CANDY] =
     {
         .name = _("Rare Candy"),
-        .itemId = ITEM_RARE_CANDY,
         .price = 10000,
         .description = sRareCandyDesc,
         .pocket = POCKET_ITEMS,
@@ -1322,7 +1219,6 @@ const struct Item gItems[] =
     [ITEM_EXP_CANDY_XS] =
     {
         .name = _("Exp.Candy XS"),
-        .itemId = ITEM_EXP_CANDY_XS,
         .price = 20,
         .holdEffectParam = EXP_100,
         .description = sExpCandyXSDesc,
@@ -1335,7 +1231,6 @@ const struct Item gItems[] =
     [ITEM_EXP_CANDY_S] =
     {
         .name = _("Exp.Candy S"),
-        .itemId = ITEM_EXP_CANDY_S,
         .price = 240,
         .holdEffectParam = EXP_800,
         .description = sExpCandySDesc,
@@ -1348,7 +1243,6 @@ const struct Item gItems[] =
     [ITEM_EXP_CANDY_M] =
     {
         .name = _("Exp.Candy M"),
-        .itemId = ITEM_EXP_CANDY_M,
         .price = 1000,
         .holdEffectParam = EXP_3000,
         .description = sExpCandyMDesc,
@@ -1361,7 +1255,6 @@ const struct Item gItems[] =
     [ITEM_EXP_CANDY_L] =
     {
         .name = _("Exp.Candy L"),
-        .itemId = ITEM_EXP_CANDY_L,
         .price = 3000,
         .holdEffectParam = EXP_10000,
         .description = sExpCandyLDesc,
@@ -1374,7 +1267,6 @@ const struct Item gItems[] =
     [ITEM_EXP_CANDY_XL] =
     {
         .name = _("Exp.Candy XL"),
-        .itemId = ITEM_EXP_CANDY_XL,
         .price = 10000,
         .holdEffectParam = EXP_30000,
         .description = sExpCandyXLDesc,
@@ -1387,7 +1279,6 @@ const struct Item gItems[] =
     [ITEM_DYNAMAX_CANDY] =
     {
         .name = _("DynamaxCandy"),
-        .itemId = ITEM_DYNAMAX_CANDY,
         .price = 0,
         .description = sDynamaxCandyDesc,
         .pocket = POCKET_ITEMS,
@@ -1401,7 +1292,6 @@ const struct Item gItems[] =
     [ITEM_BLUE_FLUTE] =
     {
         .name = _("Blue Flute"),
-        .itemId = ITEM_BLUE_FLUTE,
         .price = 20,
         .description = sBlueFluteDesc,
         .pocket = POCKET_ITEMS,
@@ -1414,7 +1304,6 @@ const struct Item gItems[] =
     [ITEM_YELLOW_FLUTE] =
     {
         .name = _("Yellow Flute"),
-        .itemId = ITEM_YELLOW_FLUTE,
         .price = 20,
         .description = sYellowFluteDesc,
         .pocket = POCKET_ITEMS,
@@ -1427,7 +1316,6 @@ const struct Item gItems[] =
     [ITEM_RED_FLUTE] =
     {
         .name = _("Red Flute"),
-        .itemId = ITEM_RED_FLUTE,
         .price = 20,
         .description = sRedFluteDesc,
         .pocket = POCKET_ITEMS,
@@ -1442,7 +1330,6 @@ const struct Item gItems[] =
     [ITEM_BLACK_FLUTE] =
     {
         .name = _("Black Flute"),
-        .itemId = ITEM_BLACK_FLUTE,
         .price = 20,
         .holdEffectParam = 50,
         .description = sBlackFluteDesc,
@@ -1455,7 +1342,6 @@ const struct Item gItems[] =
     [ITEM_WHITE_FLUTE] =
     {
         .name = _("White Flute"),
-        .itemId = ITEM_WHITE_FLUTE,
         .price = 20,
         .holdEffectParam = 150,
         .description = sWhiteFluteDesc,
@@ -1470,7 +1356,6 @@ const struct Item gItems[] =
     [ITEM_REPEL] =
     {
         .name = _("Repel"),
-        .itemId = ITEM_REPEL,
         .price = 400,
         .holdEffectParam = 100,
         .description = sRepelDesc,
@@ -1483,7 +1368,6 @@ const struct Item gItems[] =
     [ITEM_SUPER_REPEL] =
     {
         .name = _("Super Repel"),
-        .itemId = ITEM_SUPER_REPEL,
         .price = 700,
         .holdEffectParam = 200,
         .description = sSuperRepelDesc,
@@ -1496,7 +1380,6 @@ const struct Item gItems[] =
     [ITEM_MAX_REPEL] =
     {
         .name = _("Max Repel"),
-        .itemId = ITEM_MAX_REPEL,
         .price = 900,
         .holdEffectParam = 250,
         .description = sMaxRepelDesc,
@@ -1509,7 +1392,6 @@ const struct Item gItems[] =
     [ITEM_LURE] =
     {
         .name = _("Lure"),
-        .itemId = ITEM_LURE,
         .price = 400,
         .holdEffectParam = 100,
         .description = sLureDesc,
@@ -1523,7 +1405,6 @@ const struct Item gItems[] =
     [ITEM_SUPER_LURE] =
     {
         .name = _("Super Lure"),
-        .itemId = ITEM_SUPER_LURE,
         .price = 700,
         .holdEffectParam = 200,
         .description = sSuperLureDesc,
@@ -1537,7 +1418,6 @@ const struct Item gItems[] =
     [ITEM_MAX_LURE] =
     {
         .name = _("Max Lure"),
-        .itemId = ITEM_MAX_LURE,
         .price = 900,
         .holdEffectParam = 250,
         .description = sMaxLureDesc,
@@ -1551,7 +1431,6 @@ const struct Item gItems[] =
     [ITEM_ESCAPE_ROPE] =
     {
         .name = _("Escape Rope"),
-        .itemId = ITEM_ESCAPE_ROPE,
         .description = sEscapeRopeDesc,
         #if I_KEY_ESCAPE_ROPE >= GEN_8
             .price = 0,
@@ -1573,7 +1452,6 @@ const struct Item gItems[] =
     [ITEM_X_ATTACK] =
     {
         .name = _("X Attack"),
-        .itemId = ITEM_X_ATTACK,
         .price = 1000,
         .holdEffectParam = X_ITEM_STAGES,
         .description = sXAttackDesc,
@@ -1587,7 +1465,6 @@ const struct Item gItems[] =
     [ITEM_X_DEFENSE] =
     {
         .name = _("X Defense"),
-        .itemId = ITEM_X_DEFENSE,
         .price = 2000,
         .holdEffectParam = X_ITEM_STAGES,
         .description = sXDefenseDesc,
@@ -1601,7 +1478,6 @@ const struct Item gItems[] =
     [ITEM_X_SP_ATK] =
     {
         .name = _("X Sp. Atk"),
-        .itemId = ITEM_X_SP_ATK,
         .price = 1000,
         .holdEffectParam = X_ITEM_STAGES,
         .description = sXSpAtkDesc,
@@ -1615,7 +1491,6 @@ const struct Item gItems[] =
     [ITEM_X_SP_DEF] =
     {
         .name = _("X Sp. Def"),
-        .itemId = ITEM_X_SP_DEF,
         .price = 2000,
         .holdEffectParam = X_ITEM_STAGES,
         .description = sXSpDefDesc,
@@ -1629,7 +1504,6 @@ const struct Item gItems[] =
     [ITEM_X_SPEED] =
     {
         .name = _("X Speed"),
-        .itemId = ITEM_X_SPEED,
         .price = 1000,
         .holdEffectParam = X_ITEM_STAGES,
         .description = sXSpeedDesc,
@@ -1643,7 +1517,6 @@ const struct Item gItems[] =
     [ITEM_X_ACCURACY] =
     {
         .name = _("X Accuracy"),
-        .itemId = ITEM_X_ACCURACY,
         .price = 1000,
         .holdEffectParam = X_ITEM_STAGES,
         .description = sXAccuracyDesc,
@@ -1657,7 +1530,6 @@ const struct Item gItems[] =
     [ITEM_DIRE_HIT] =
     {
         .name = _("Dire Hit"),
-        .itemId = ITEM_DIRE_HIT,
         .price = 1000,
         .description = sDireHitDesc,
         .pocket = POCKET_ITEMS,
@@ -1670,7 +1542,6 @@ const struct Item gItems[] =
     [ITEM_GUARD_SPEC] =
     {
         .name = _("Guard Spec."),
-        .itemId = ITEM_GUARD_SPEC,
         .price = 1500,
         .description = sGuardSpecDesc,
         .pocket = POCKET_ITEMS,
@@ -1683,7 +1554,6 @@ const struct Item gItems[] =
     [ITEM_POKE_DOLL] =
     {
         .name = _("Poké Doll"),
-        .itemId = ITEM_POKE_DOLL,
         .price = 100,
         .description = sPokeDollDesc,
         .pocket = POCKET_ITEMS,
@@ -1696,7 +1566,6 @@ const struct Item gItems[] =
     [ITEM_FLUFFY_TAIL] =
     {
         .name = _("Fluffy Tail"),
-        .itemId = ITEM_FLUFFY_TAIL,
         .price = 100,
         .description = sFluffyTailDesc,
         .pocket = POCKET_ITEMS,
@@ -1709,7 +1578,6 @@ const struct Item gItems[] =
     [ITEM_POKE_TOY] =
     {
         .name = _("Poké Toy"),
-        .itemId = ITEM_POKE_TOY,
         .price = 100,
         .description = sPokeToyDesc,
         .pocket = POCKET_ITEMS,
@@ -1722,7 +1590,6 @@ const struct Item gItems[] =
     [ITEM_MAX_MUSHROOMS] =
     {
         .name = _("MaxMushrooms"),
-        .itemId = ITEM_MAX_MUSHROOMS,
         .price = 8000,
         .description = sMaxMushroomsDesc,
         .pocket = POCKET_ITEMS,
@@ -1739,7 +1606,6 @@ const struct Item gItems[] =
     [ITEM_BOTTLE_CAP] =
     {
         .name = _("Bottle Cap"),
-        .itemId = ITEM_BOTTLE_CAP,
         .price = 5000,
         .description = sBottleCapDesc,
         .pocket = POCKET_ITEMS,
@@ -1751,7 +1617,6 @@ const struct Item gItems[] =
     [ITEM_GOLD_BOTTLE_CAP] =
     {
         .name = _("GoldBottlCap"),
-        .itemId = ITEM_GOLD_BOTTLE_CAP,
         .price = 10000,
         .description = sGoldBottleCapDesc,
         .pocket = POCKET_ITEMS,
@@ -1763,7 +1628,6 @@ const struct Item gItems[] =
     [ITEM_NUGGET] =
     {
         .name = _("Nugget"),
-        .itemId = ITEM_NUGGET,
         .price = 10000,
         .description = sNuggetDesc,
         .pocket = POCKET_ITEMS,
@@ -1775,7 +1639,6 @@ const struct Item gItems[] =
     [ITEM_BIG_NUGGET] =
     {
         .name = _("Big Nugget"),
-        .itemId = ITEM_BIG_NUGGET,
         .price = 40000,
         .description = sBigNuggetDesc,
         .pocket = POCKET_ITEMS,
@@ -1787,7 +1650,6 @@ const struct Item gItems[] =
     [ITEM_TINY_MUSHROOM] =
     {
         .name = _("Tiny Mushroom"),
-        .itemId = ITEM_TINY_MUSHROOM,
         .price = 500,
         .description = sTinyMushroomDesc,
         .pocket = POCKET_ITEMS,
@@ -1799,7 +1661,6 @@ const struct Item gItems[] =
     [ITEM_BIG_MUSHROOM] =
     {
         .name = _("Big Mushroom"),
-        .itemId = ITEM_BIG_MUSHROOM,
         .price = 5000,
         .description = sBigMushroomDesc,
         .pocket = POCKET_ITEMS,
@@ -1811,7 +1672,6 @@ const struct Item gItems[] =
     [ITEM_BALM_MUSHROOM] =
     {
         .name = _("Balm Mushroom"),
-        .itemId = ITEM_BALM_MUSHROOM,
         .price = 15000,
         .description = sBalmMushroomDesc,
         .pocket = POCKET_ITEMS,
@@ -1823,7 +1683,6 @@ const struct Item gItems[] =
     [ITEM_PEARL] =
     {
         .name = _("Pearl"),
-        .itemId = ITEM_PEARL,
         .price = 2000,
         .description = sPearlDesc,
         .pocket = POCKET_ITEMS,
@@ -1835,7 +1694,6 @@ const struct Item gItems[] =
     [ITEM_BIG_PEARL] =
     {
         .name = _("Big Pearl"),
-        .itemId = ITEM_BIG_PEARL,
         .price = 8000,
         .description = sBigPearlDesc,
         .pocket = POCKET_ITEMS,
@@ -1847,7 +1705,6 @@ const struct Item gItems[] =
     [ITEM_PEARL_STRING] =
     {
         .name = _("Pearl String"),
-        .itemId = ITEM_PEARL_STRING,
         .price = 20000,
         .description = sPearlStringDesc,
         .pocket = POCKET_ITEMS,
@@ -1859,7 +1716,6 @@ const struct Item gItems[] =
     [ITEM_STARDUST] =
     {
         .name = _("Stardust"),
-        .itemId = ITEM_STARDUST,
         .price = 3000,
         .description = sStardustDesc,
         .pocket = POCKET_ITEMS,
@@ -1871,7 +1727,6 @@ const struct Item gItems[] =
     [ITEM_STAR_PIECE] =
     {
         .name = _("Star Piece"),
-        .itemId = ITEM_STAR_PIECE,
         .price = 12000,
         .description = sStarPieceDesc,
         .pocket = POCKET_ITEMS,
@@ -1883,7 +1738,6 @@ const struct Item gItems[] =
     [ITEM_COMET_SHARD] =
     {
         .name = _("Comet Shard"),
-        .itemId = ITEM_COMET_SHARD,
         .price = 25000,
         .description = sCometShardDesc,
         .pocket = POCKET_ITEMS,
@@ -1895,7 +1749,6 @@ const struct Item gItems[] =
     [ITEM_SHOAL_SALT] =
     {
         .name = _("Shoal Salt"),
-        .itemId = ITEM_SHOAL_SALT,
         .price = 20,
         .description = sShoalSaltDesc,
         .pocket = POCKET_ITEMS,
@@ -1907,7 +1760,6 @@ const struct Item gItems[] =
     [ITEM_SHOAL_SHELL] =
     {
         .name = _("Shoal Shell"),
-        .itemId = ITEM_SHOAL_SHELL,
         .price = 20,
         .description = sShoalShellDesc,
         .pocket = POCKET_ITEMS,
@@ -1919,7 +1771,6 @@ const struct Item gItems[] =
     [ITEM_RED_SHARD] =
     {
         .name = _("Red Shard"),
-        .itemId = ITEM_RED_SHARD,
         .price = 1000,
         .description = sRedShardDesc,
         .pocket = POCKET_ITEMS,
@@ -1931,7 +1782,6 @@ const struct Item gItems[] =
     [ITEM_BLUE_SHARD] =
     {
         .name = _("Blue Shard"),
-        .itemId = ITEM_BLUE_SHARD,
         .price = 1000,
         .description = sBlueShardDesc,
         .pocket = POCKET_ITEMS,
@@ -1943,7 +1793,6 @@ const struct Item gItems[] =
     [ITEM_YELLOW_SHARD] =
     {
         .name = _("Yellow Shard"),
-        .itemId = ITEM_YELLOW_SHARD,
         .price = 1000,
         .description = sYellowShardDesc,
         .pocket = POCKET_ITEMS,
@@ -1955,7 +1804,6 @@ const struct Item gItems[] =
     [ITEM_GREEN_SHARD] =
     {
         .name = _("Green Shard"),
-        .itemId = ITEM_GREEN_SHARD,
         .price = 1000,
         .description = sGreenShardDesc,
         .pocket = POCKET_ITEMS,
@@ -1967,7 +1815,6 @@ const struct Item gItems[] =
     [ITEM_HEART_SCALE] =
     {
         .name = _("Heart Scale"),
-        .itemId = ITEM_HEART_SCALE,
         .price = 100,
         .description = sHeartScaleDesc,
         .pocket = POCKET_ITEMS,
@@ -1979,7 +1826,6 @@ const struct Item gItems[] =
     [ITEM_HONEY] =
     {
         .name = _("Honey"),
-        .itemId = ITEM_HONEY,
         .price = 300,
         .description = sHoneyDesc,
         .pocket = POCKET_ITEMS,
@@ -1991,7 +1837,6 @@ const struct Item gItems[] =
     [ITEM_RARE_BONE] =
     {
         .name = _("Rare Bone"),
-        .itemId = ITEM_RARE_BONE,
         .price = 5000,
         .description = sRareBoneDesc,
         .pocket = POCKET_ITEMS,
@@ -2003,7 +1848,6 @@ const struct Item gItems[] =
     [ITEM_ODD_KEYSTONE] =
     {
         .name = _("Odd Keystone"),
-        .itemId = ITEM_ODD_KEYSTONE,
         .price = 2100,
         .description = sOddKeystoneDesc,
         .pocket = POCKET_ITEMS,
@@ -2015,7 +1859,6 @@ const struct Item gItems[] =
     [ITEM_PRETTY_FEATHER] =
     {
         .name = _("PrettyFeather"),
-        .itemId = ITEM_PRETTY_FEATHER,
         .price = 1000,
         .description = sPrettyFeatherDesc,
         .pocket = POCKET_ITEMS,
@@ -2027,7 +1870,6 @@ const struct Item gItems[] =
     [ITEM_RELIC_COPPER] =
     {
         .name = _("Relic Copper"),
-        .itemId = ITEM_RELIC_COPPER,
         .price = 0,
         .description = sRelicCopperDesc,
         .pocket = POCKET_ITEMS,
@@ -2039,7 +1881,6 @@ const struct Item gItems[] =
     [ITEM_RELIC_SILVER] =
     {
         .name = _("Relic Silver"),
-        .itemId = ITEM_RELIC_SILVER,
         .price = 0,
         .description = sRelicSilverDesc,
         .pocket = POCKET_ITEMS,
@@ -2051,7 +1892,6 @@ const struct Item gItems[] =
     [ITEM_RELIC_GOLD] =
     {
         .name = _("Relic Gold"),
-        .itemId = ITEM_RELIC_GOLD,
         .price = 0,
         .description = sRelicGoldDesc,
         .pocket = POCKET_ITEMS,
@@ -2063,7 +1903,6 @@ const struct Item gItems[] =
     [ITEM_RELIC_VASE] =
     {
         .name = _("Relic Vase"),
-        .itemId = ITEM_RELIC_VASE,
         .price = 0,
         .description = sRelicVaseDesc,
         .pocket = POCKET_ITEMS,
@@ -2075,7 +1914,6 @@ const struct Item gItems[] =
     [ITEM_RELIC_BAND] =
     {
         .name = _("Relic Band"),
-        .itemId = ITEM_RELIC_BAND,
         .price = 0,
         .description = sRelicBandDesc,
         .pocket = POCKET_ITEMS,
@@ -2087,7 +1925,6 @@ const struct Item gItems[] =
     [ITEM_RELIC_STATUE] =
     {
         .name = _("Relic Statue"),
-        .itemId = ITEM_RELIC_STATUE,
         .price = 0,
         .description = sRelicStatueDesc,
         .pocket = POCKET_ITEMS,
@@ -2099,7 +1936,6 @@ const struct Item gItems[] =
     [ITEM_RELIC_CROWN] =
     {
         .name = _("Relic Crown"),
-        .itemId = ITEM_RELIC_CROWN,
         .price = 0,
         .description = sRelicCrownDesc,
         .pocket = POCKET_ITEMS,
@@ -2111,7 +1947,6 @@ const struct Item gItems[] =
     [ITEM_STRANGE_SOUVENIR] =
     {
         .name = _("StrngeSouvnr"),
-        .itemId = ITEM_STRANGE_SOUVENIR,
         .price = 3000,
         .description = sStrangeSouvenirDesc,
         .pocket = POCKET_ITEMS,
@@ -2125,7 +1960,6 @@ const struct Item gItems[] =
     [ITEM_HELIX_FOSSIL] =
     {
         .name = _("Helix Fossil"),
-        .itemId = ITEM_HELIX_FOSSIL,
         .description = sHelixFossilDesc,
         #if I_KEY_FOSSILS >= GEN_4
             .price = 7000,
@@ -2143,7 +1977,6 @@ const struct Item gItems[] =
     [ITEM_DOME_FOSSIL] =
     {
         .name = _("Dome Fossil"),
-        .itemId = ITEM_DOME_FOSSIL,
         .description = sDomeFossilDesc,
         #if I_KEY_FOSSILS >= GEN_4
             .price = 7000,
@@ -2161,7 +1994,6 @@ const struct Item gItems[] =
     [ITEM_OLD_AMBER] =
     {
         .name = _("Old Amber"),
-        .itemId = ITEM_OLD_AMBER,
         .description = sOldAmberDesc,
         #if I_KEY_FOSSILS >= GEN_4
             .price = 10000,
@@ -2179,7 +2011,6 @@ const struct Item gItems[] =
     [ITEM_ROOT_FOSSIL] =
     {
         .name = _("Root Fossil"),
-        .itemId = ITEM_ROOT_FOSSIL,
         .description = sRootFossilDesc,
         #if I_KEY_FOSSILS >= GEN_4
             .price = 7000,
@@ -2197,7 +2028,6 @@ const struct Item gItems[] =
     [ITEM_CLAW_FOSSIL] =
     {
         .name = _("Claw Fossil"),
-        .itemId = ITEM_CLAW_FOSSIL,
         .description = sClawFossilDesc,
         #if I_KEY_FOSSILS >= GEN_4
             .price = 7000,
@@ -2215,7 +2045,6 @@ const struct Item gItems[] =
     [ITEM_ARMOR_FOSSIL] =
     {
         .name = _("Armor Fossil"),
-        .itemId = ITEM_ARMOR_FOSSIL,
         .price = 7000,
         .description = sArmorFossilDesc,
         .pocket = POCKET_ITEMS,
@@ -2227,7 +2056,6 @@ const struct Item gItems[] =
     [ITEM_SKULL_FOSSIL] =
     {
         .name = _("Skull Fossil"),
-        .itemId = ITEM_SKULL_FOSSIL,
         .price = 7000,
         .description = sSkullFossilDesc,
         .pocket = POCKET_ITEMS,
@@ -2239,7 +2067,6 @@ const struct Item gItems[] =
     [ITEM_COVER_FOSSIL] =
     {
         .name = _("Cover Fossil"),
-        .itemId = ITEM_COVER_FOSSIL,
         .price = 7000,
         .description = sCoverFossilDesc,
         .pocket = POCKET_ITEMS,
@@ -2251,7 +2078,6 @@ const struct Item gItems[] =
     [ITEM_PLUME_FOSSIL] =
     {
         .name = _("Plume Fossil"),
-        .itemId = ITEM_PLUME_FOSSIL,
         .price = 7000,
         .description = sPlumeFossilDesc,
         .pocket = POCKET_ITEMS,
@@ -2263,7 +2089,6 @@ const struct Item gItems[] =
     [ITEM_JAW_FOSSIL] =
     {
         .name = _("Jaw Fossil"),
-        .itemId = ITEM_JAW_FOSSIL,
         .price = 7000,
         .description = sJawFossilDesc,
         .pocket = POCKET_ITEMS,
@@ -2275,7 +2100,6 @@ const struct Item gItems[] =
     [ITEM_SAIL_FOSSIL] =
     {
         .name = _("Sail Fossil"),
-        .itemId = ITEM_SAIL_FOSSIL,
         .price = 7000,
         .description = sSailFossilDesc,
         .pocket = POCKET_ITEMS,
@@ -2287,7 +2111,6 @@ const struct Item gItems[] =
     [ITEM_FOSSILIZED_BIRD] =
     {
         .name = _("FosslzedBird"),
-        .itemId = ITEM_FOSSILIZED_BIRD,
         .price = 5000,
         .description = sFossilizedBirdDesc,
         .pocket = POCKET_ITEMS,
@@ -2299,7 +2122,6 @@ const struct Item gItems[] =
     [ITEM_FOSSILIZED_FISH] =
     {
         .name = _("FosslzedFish"),
-        .itemId = ITEM_FOSSILIZED_FISH,
         .price = 5000,
         .description = sFossilizedFishDesc,
         .pocket = POCKET_ITEMS,
@@ -2311,7 +2133,6 @@ const struct Item gItems[] =
     [ITEM_FOSSILIZED_DRAKE] =
     {
         .name = _("FosslzedDrke"),
-        .itemId = ITEM_FOSSILIZED_DRAKE,
         .price = 5000,
         .description = sFossilizedDrakeDesc,
         .pocket = POCKET_ITEMS,
@@ -2323,7 +2144,6 @@ const struct Item gItems[] =
     [ITEM_FOSSILIZED_DINO] =
     {
         .name = _("FosslzedDino"),
-        .itemId = ITEM_FOSSILIZED_DINO,
         .price = 5000,
         .description = sFossilizedDinoDesc,
         .pocket = POCKET_ITEMS,
@@ -2337,7 +2157,6 @@ const struct Item gItems[] =
     [ITEM_GROWTH_MULCH] =
     {
         .name = _("Growth Mulch"),
-        .itemId = ITEM_GROWTH_MULCH,
         .price = 200,
         .description = sGrowthMulchDesc,
         .pocket = POCKET_ITEMS,
@@ -2349,7 +2168,6 @@ const struct Item gItems[] =
     [ITEM_DAMP_MULCH] =
     {
         .name = _("Damp Mulch"),
-        .itemId = ITEM_DAMP_MULCH,
         .price = 200,
         .description = sDampMulchDesc,
         .pocket = POCKET_ITEMS,
@@ -2361,7 +2179,6 @@ const struct Item gItems[] =
     [ITEM_STABLE_MULCH] =
     {
         .name = _("Stable Mulch"),
-        .itemId = ITEM_STABLE_MULCH,
         .price = 200,
         .description = sStableMulchDesc,
         .pocket = POCKET_ITEMS,
@@ -2373,7 +2190,6 @@ const struct Item gItems[] =
     [ITEM_GOOEY_MULCH] =
     {
         .name = _("Gooey Mulch"),
-        .itemId = ITEM_GOOEY_MULCH,
         .price = 200,
         .description = sGooeyMulchDesc,
         .pocket = POCKET_ITEMS,
@@ -2385,7 +2201,6 @@ const struct Item gItems[] =
     [ITEM_RICH_MULCH] =
     {
         .name = _("Rich Mulch"),
-        .itemId = ITEM_RICH_MULCH,
         .price = 200,
         .description = sRichMulchDesc,
         .pocket = POCKET_ITEMS,
@@ -2397,7 +2212,6 @@ const struct Item gItems[] =
     [ITEM_SURPRISE_MULCH] =
     {
         .name = _("SurprseMulch"),
-        .itemId = ITEM_SURPRISE_MULCH,
         .price = 200,
         .description = sSurpriseMulchDesc,
         .pocket = POCKET_ITEMS,
@@ -2409,7 +2223,6 @@ const struct Item gItems[] =
     [ITEM_BOOST_MULCH] =
     {
         .name = _("Boost Mulch"),
-        .itemId = ITEM_BOOST_MULCH,
         .price = 200,
         .description = sBoostMulchDesc,
         .pocket = POCKET_ITEMS,
@@ -2421,7 +2234,6 @@ const struct Item gItems[] =
     [ITEM_AMAZE_MULCH] =
     {
         .name = _("Amaze Mulch"),
-        .itemId = ITEM_AMAZE_MULCH,
         .price = 200,
         .description = sAmazeMulchDesc,
         .pocket = POCKET_ITEMS,
@@ -2435,7 +2247,6 @@ const struct Item gItems[] =
     [ITEM_RED_APRICORN] =
     {
         .name = _("Red Apricorn"),
-        .itemId = ITEM_RED_APRICORN,
         .price = 200,
         .description = sRedApricornDesc,
         .pocket = POCKET_ITEMS,
@@ -2446,7 +2257,6 @@ const struct Item gItems[] =
     [ITEM_BLUE_APRICORN] =
     {
         .name = _("Blue Apricorn"),
-        .itemId = ITEM_BLUE_APRICORN,
         .price = 200,
         .description = sBlueApricornDesc,
         .pocket = POCKET_ITEMS,
@@ -2457,7 +2267,6 @@ const struct Item gItems[] =
     [ITEM_YELLOW_APRICORN] =
     {
         .name = _("YellwApricorn"),
-        .itemId = ITEM_YELLOW_APRICORN,
         .price = 200,
         .description = sYellowApricornDesc,
         .pocket = POCKET_ITEMS,
@@ -2468,7 +2277,6 @@ const struct Item gItems[] =
     [ITEM_GREEN_APRICORN] =
     {
         .name = _("GreenApricorn"),
-        .itemId = ITEM_GREEN_APRICORN,
         .price = 200,
         .description = sGreenApricornDesc,
         .pocket = POCKET_ITEMS,
@@ -2479,7 +2287,6 @@ const struct Item gItems[] =
     [ITEM_PINK_APRICORN] =
     {
         .name = _("Pink Apricorn"),
-        .itemId = ITEM_PINK_APRICORN,
         .price = 200,
         .description = sPinkApricornDesc,
         .pocket = POCKET_ITEMS,
@@ -2490,7 +2297,6 @@ const struct Item gItems[] =
     [ITEM_WHITE_APRICORN] =
     {
         .name = _("WhiteApricorn"),
-        .itemId = ITEM_WHITE_APRICORN,
         .price = 200,
         .description = sWhiteApricornDesc,
         .pocket = POCKET_ITEMS,
@@ -2501,7 +2307,6 @@ const struct Item gItems[] =
     [ITEM_BLACK_APRICORN] =
     {
         .name = _("BlackApricorn"),
-        .itemId = ITEM_BLACK_APRICORN,
         .price = 200,
         .description = sBlackApricornDesc,
         .pocket = POCKET_ITEMS,
@@ -2512,7 +2317,6 @@ const struct Item gItems[] =
     [ITEM_WISHING_PIECE] =
     {
         .name = _("WishingPiece"),
-        .itemId = ITEM_WISHING_PIECE,
         .price = 20,
         .description = sWishingPieceDesc,
         .pocket = POCKET_ITEMS,
@@ -2524,7 +2328,6 @@ const struct Item gItems[] =
     [ITEM_GALARICA_TWIG] =
     {
         .name = _("GalaricaTwig"),
-        .itemId = ITEM_GALARICA_TWIG,
         .price = 40,
         .description = sGalaricaTwigDesc,
         .pocket = POCKET_ITEMS,
@@ -2536,7 +2339,6 @@ const struct Item gItems[] =
     [ITEM_ARMORITE_ORE] =
     {
         .name = _("Armorite Ore"),
-        .itemId = ITEM_ARMORITE_ORE,
         .price = 40,
         .description = sArmoriteOreDesc,
         .pocket = POCKET_ITEMS,
@@ -2548,7 +2350,6 @@ const struct Item gItems[] =
     [ITEM_DYNITE_ORE] =
     {
         .name = _("Dynite Ore"),
-        .itemId = ITEM_DYNITE_ORE,
         .price = 20,
         .description = sDyniteOreDesc,
         .pocket = POCKET_ITEMS,
@@ -2562,7 +2363,6 @@ const struct Item gItems[] =
     [ITEM_ORANGE_MAIL] =
     {
         .name = _("Orange Mail"),
-        .itemId = ITEM_ORANGE_MAIL,
         .price = 50,
         .description = sOrangeMailDesc,
         .pocket = POCKET_ITEMS,
@@ -2574,7 +2374,6 @@ const struct Item gItems[] =
     [ITEM_HARBOR_MAIL] =
     {
         .name = _("Harbor Mail"),
-        .itemId = ITEM_HARBOR_MAIL,
         .price = 50,
         .description = sHarborMailDesc,
         .pocket = POCKET_ITEMS,
@@ -2586,7 +2385,6 @@ const struct Item gItems[] =
     [ITEM_GLITTER_MAIL] =
     {
         .name = _("Glitter Mail"),
-        .itemId = ITEM_GLITTER_MAIL,
         .price = 50,
         .description = sGlitterMailDesc,
         .pocket = POCKET_ITEMS,
@@ -2598,7 +2396,6 @@ const struct Item gItems[] =
     [ITEM_MECH_MAIL] =
     {
         .name = _("Mech Mail"),
-        .itemId = ITEM_MECH_MAIL,
         .price = 50,
         .description = sMechMailDesc,
         .pocket = POCKET_ITEMS,
@@ -2610,7 +2407,6 @@ const struct Item gItems[] =
     [ITEM_WOOD_MAIL] =
     {
         .name = _("Wood Mail"),
-        .itemId = ITEM_WOOD_MAIL,
         .price = 50,
         .description = sWoodMailDesc,
         .pocket = POCKET_ITEMS,
@@ -2622,7 +2418,6 @@ const struct Item gItems[] =
     [ITEM_WAVE_MAIL] =
     {
         .name = _("Wave Mail"),
-        .itemId = ITEM_WAVE_MAIL,
         .price = 50,
         .description = sWaveMailDesc,
         .pocket = POCKET_ITEMS,
@@ -2634,7 +2429,6 @@ const struct Item gItems[] =
     [ITEM_BEAD_MAIL] =
     {
         .name = _("Bead Mail"),
-        .itemId = ITEM_BEAD_MAIL,
         .price = 50,
         .description = sBeadMailDesc,
         .pocket = POCKET_ITEMS,
@@ -2646,7 +2440,6 @@ const struct Item gItems[] =
     [ITEM_SHADOW_MAIL] =
     {
         .name = _("Shadow Mail"),
-        .itemId = ITEM_SHADOW_MAIL,
         .price = 50,
         .description = sShadowMailDesc,
         .pocket = POCKET_ITEMS,
@@ -2658,7 +2451,6 @@ const struct Item gItems[] =
     [ITEM_TROPIC_MAIL] =
     {
         .name = _("Tropic Mail"),
-        .itemId = ITEM_TROPIC_MAIL,
         .price = 50,
         .description = sTropicMailDesc,
         .pocket = POCKET_ITEMS,
@@ -2670,7 +2462,6 @@ const struct Item gItems[] =
     [ITEM_DREAM_MAIL] =
     {
         .name = _("Dream Mail"),
-        .itemId = ITEM_DREAM_MAIL,
         .price = 50,
         .description = sDreamMailDesc,
         .pocket = POCKET_ITEMS,
@@ -2682,7 +2473,6 @@ const struct Item gItems[] =
     [ITEM_FAB_MAIL] =
     {
         .name = _("Fab Mail"),
-        .itemId = ITEM_FAB_MAIL,
         .price = 50,
         .description = sFabMailDesc,
         .pocket = POCKET_ITEMS,
@@ -2694,7 +2484,6 @@ const struct Item gItems[] =
     [ITEM_RETRO_MAIL] =
     {
         .name = _("Retro Mail"),
-        .itemId = ITEM_RETRO_MAIL,
         .price = 50,
         .description = sRetroMailDesc,
         .pocket = POCKET_ITEMS,
@@ -2708,7 +2497,6 @@ const struct Item gItems[] =
     [ITEM_FIRE_STONE] =
     {
         .name = _("Fire Stone"),
-        .itemId = ITEM_FIRE_STONE,
         .price = 3000,
         .description = sFireStoneDesc,
         .pocket = POCKET_ITEMS,
@@ -2720,7 +2508,6 @@ const struct Item gItems[] =
     [ITEM_WATER_STONE] =
     {
         .name = _("Water Stone"),
-        .itemId = ITEM_WATER_STONE,
         .price = 3000,
         .description = sWaterStoneDesc,
         .pocket = POCKET_ITEMS,
@@ -2732,7 +2519,6 @@ const struct Item gItems[] =
     [ITEM_THUNDER_STONE] =
     {
         .name = _("Thunder Stone"),
-        .itemId = ITEM_THUNDER_STONE,
         .price = 3000,
         .description = sThunderStoneDesc,
         .pocket = POCKET_ITEMS,
@@ -2744,7 +2530,6 @@ const struct Item gItems[] =
     [ITEM_LEAF_STONE] =
     {
         .name = _("Leaf Stone"),
-        .itemId = ITEM_LEAF_STONE,
         .price = 3000,
         .description = sLeafStoneDesc,
         .pocket = POCKET_ITEMS,
@@ -2756,7 +2541,6 @@ const struct Item gItems[] =
     [ITEM_ICE_STONE] =
     {
         .name = _("Ice Stone"),
-        .itemId = ITEM_ICE_STONE,
         .price = 3000,
         .description = sIceStoneDesc,
         .pocket = POCKET_ITEMS,
@@ -2768,7 +2552,6 @@ const struct Item gItems[] =
     [ITEM_SUN_STONE] =
     {
         .name = _("Sun Stone"),
-        .itemId = ITEM_SUN_STONE,
         .price = 3000,
         .description = sSunStoneDesc,
         .pocket = POCKET_ITEMS,
@@ -2780,7 +2563,6 @@ const struct Item gItems[] =
     [ITEM_MOON_STONE] =
     {
         .name = _("Moon Stone"),
-        .itemId = ITEM_MOON_STONE,
         .price = 3000,
         .description = sMoonStoneDesc,
         .pocket = POCKET_ITEMS,
@@ -2792,7 +2574,6 @@ const struct Item gItems[] =
     [ITEM_SHINY_STONE] =
     {
         .name = _("Shiny Stone"),
-        .itemId = ITEM_SHINY_STONE,
         .price = 3000,
         .description = sShinyStoneDesc,
         .pocket = POCKET_ITEMS,
@@ -2804,7 +2585,6 @@ const struct Item gItems[] =
     [ITEM_DUSK_STONE] =
     {
         .name = _("Dusk Stone"),
-        .itemId = ITEM_DUSK_STONE,
         .price = 3000,
         .description = sDuskStoneDesc,
         .pocket = POCKET_ITEMS,
@@ -2816,7 +2596,6 @@ const struct Item gItems[] =
     [ITEM_DAWN_STONE] =
     {
         .name = _("Dawn Stone"),
-        .itemId = ITEM_DAWN_STONE,
         .price = 3000,
         .description = sDawnStoneDesc,
         .pocket = POCKET_ITEMS,
@@ -2828,7 +2607,6 @@ const struct Item gItems[] =
     [ITEM_SWEET_APPLE] =
     {
         .name = _("Sweet Apple"),
-        .itemId = ITEM_SWEET_APPLE,
         .price = 2200,
         .description = sSweetAppleDesc,
         .pocket = POCKET_ITEMS,
@@ -2840,7 +2618,6 @@ const struct Item gItems[] =
     [ITEM_TART_APPLE] =
     {
         .name = _("Tart Apple"),
-        .itemId = ITEM_TART_APPLE,
         .price = 2200,
         .description = sTartAppleDesc,
         .pocket = POCKET_ITEMS,
@@ -2852,7 +2629,6 @@ const struct Item gItems[] =
     [ITEM_CRACKED_POT] =
     {
         .name = _("Cracked Pot"),
-        .itemId = ITEM_CRACKED_POT,
         .price = 1600,
         .description = sCrackedPotDesc,
         .pocket = POCKET_ITEMS,
@@ -2864,7 +2640,6 @@ const struct Item gItems[] =
     [ITEM_CHIPPED_POT] =
     {
         .name = _("Chipped Pot"),
-        .itemId = ITEM_CHIPPED_POT,
         .price = 38000,
         .description = sChippedPotDesc,
         .pocket = POCKET_ITEMS,
@@ -2876,7 +2651,6 @@ const struct Item gItems[] =
     [ITEM_GALARICA_CUFF] =
     {
         .name = _("GalaricaCuff"),
-        .itemId = ITEM_GALARICA_CUFF,
         .price = 6000,
         .description = sGalaricaCuffDesc,
         .pocket = POCKET_ITEMS,
@@ -2888,7 +2662,6 @@ const struct Item gItems[] =
     [ITEM_GALARICA_WREATH] =
     {
         .name = _("GalrcaWreath"),
-        .itemId = ITEM_GALARICA_WREATH,
         .price = 6000,
         .description = sGalaricaWreathDesc,
         .pocket = POCKET_ITEMS,
@@ -2900,7 +2673,6 @@ const struct Item gItems[] =
     [ITEM_DRAGON_SCALE] =
     {
         .name = _("Dragon Scale"),
-        .itemId = ITEM_DRAGON_SCALE,
         .price = 2000,
         .holdEffect = HOLD_EFFECT_DRAGON_SCALE,
         .holdEffectParam = 10,
@@ -2914,7 +2686,6 @@ const struct Item gItems[] =
     [ITEM_UPGRADE] =
     {
         .name = _("Upgrade"),
-        .itemId = ITEM_UPGRADE,
         .price = 2000,
         .holdEffect = HOLD_EFFECT_UPGRADE,
         .description = sUpgradeDesc,
@@ -2927,7 +2698,6 @@ const struct Item gItems[] =
     [ITEM_PROTECTOR] =
     {
         .name = _("Protector"),
-        .itemId = ITEM_PROTECTOR,
         .price = 2000,
         .description = sProtectorDesc,
         .pocket = POCKET_ITEMS,
@@ -2939,7 +2709,6 @@ const struct Item gItems[] =
     [ITEM_ELECTIRIZER] =
     {
         .name = _("Electirizer"),
-        .itemId = ITEM_ELECTIRIZER,
         .price = 2000,
         .description = sElectirizerDesc,
         .pocket = POCKET_ITEMS,
@@ -2951,7 +2720,6 @@ const struct Item gItems[] =
     [ITEM_MAGMARIZER] =
     {
         .name = _("Magmarizer"),
-        .itemId = ITEM_MAGMARIZER,
         .price = 2000,
         .description = sMagmarizerDesc,
         .pocket = POCKET_ITEMS,
@@ -2963,7 +2731,6 @@ const struct Item gItems[] =
     [ITEM_DUBIOUS_DISC] =
     {
         .name = _("Dubious Disc"),
-        .itemId = ITEM_DUBIOUS_DISC,
         .price = 2000,
         .description = sDubiousDiscDesc,
         .pocket = POCKET_ITEMS,
@@ -2975,7 +2742,6 @@ const struct Item gItems[] =
     [ITEM_REAPER_CLOTH] =
     {
         .name = _("Reaper Cloth"),
-        .itemId = ITEM_REAPER_CLOTH,
         .price = 2000,
         .description = sReaperClothDesc,
         .pocket = POCKET_ITEMS,
@@ -2987,7 +2753,6 @@ const struct Item gItems[] =
     [ITEM_PRISM_SCALE] =
     {
         .name = _("Prism Scale"),
-        .itemId = ITEM_PRISM_SCALE,
         .price = 2000,
         .description = sPrismScaleDesc,
         .pocket = POCKET_ITEMS,
@@ -2999,7 +2764,6 @@ const struct Item gItems[] =
     [ITEM_WHIPPED_DREAM] =
     {
         .name = _("Whipped Dream"),
-        .itemId = ITEM_WHIPPED_DREAM,
         .price = 2000,
         .description = sWhippedDreamDesc,
         .pocket = POCKET_ITEMS,
@@ -3011,7 +2775,6 @@ const struct Item gItems[] =
     [ITEM_SACHET] =
     {
         .name = _("Sachet"),
-        .itemId = ITEM_SACHET,
         .price = 2000,
         .description = sSachetDesc,
         .pocket = POCKET_ITEMS,
@@ -3023,7 +2786,6 @@ const struct Item gItems[] =
     [ITEM_OVAL_STONE] =
     {
         .name = _("Oval Stone"),
-        .itemId = ITEM_OVAL_STONE,
         .price = 2000,
         .description = sOvalStoneDesc,
         .pocket = POCKET_ITEMS,
@@ -3035,7 +2797,6 @@ const struct Item gItems[] =
     [ITEM_STRAWBERRY_SWEET] =
     {
         .name = _("StrwbrySweet"),
-        .itemId = ITEM_STRAWBERRY_SWEET,
         .price = 500,
         .description = sStrawberrySweetDesc,
         .pocket = POCKET_ITEMS,
@@ -3047,7 +2808,6 @@ const struct Item gItems[] =
     [ITEM_LOVE_SWEET] =
     {
         .name = _("Love Sweet"),
-        .itemId = ITEM_LOVE_SWEET,
         .price = 500,
         .description = sLoveSweetDesc,
         .pocket = POCKET_ITEMS,
@@ -3059,7 +2819,6 @@ const struct Item gItems[] =
     [ITEM_BERRY_SWEET] =
     {
         .name = _("Berry Sweet"),
-        .itemId = ITEM_BERRY_SWEET,
         .price = 500,
         .description = sBerrySweetDesc,
         .pocket = POCKET_ITEMS,
@@ -3071,7 +2830,6 @@ const struct Item gItems[] =
     [ITEM_CLOVER_SWEET] =
     {
         .name = _("Clover Sweet"),
-        .itemId = ITEM_CLOVER_SWEET,
         .price = 500,
         .description = sCloverSweetDesc,
         .pocket = POCKET_ITEMS,
@@ -3083,7 +2841,6 @@ const struct Item gItems[] =
     [ITEM_FLOWER_SWEET] =
     {
         .name = _("Flower Sweet"),
-        .itemId = ITEM_FLOWER_SWEET,
         .price = 500,
         .description = sFlowerSweetDesc,
         .pocket = POCKET_ITEMS,
@@ -3095,7 +2852,6 @@ const struct Item gItems[] =
     [ITEM_STAR_SWEET] =
     {
         .name = _("Star Sweet"),
-        .itemId = ITEM_STAR_SWEET,
         .price = 500,
         .description = sStarSweetDesc,
         .pocket = POCKET_ITEMS,
@@ -3107,7 +2863,6 @@ const struct Item gItems[] =
     [ITEM_RIBBON_SWEET] =
     {
         .name = _("Ribbon Sweet"),
-        .itemId = ITEM_RIBBON_SWEET,
         .price = 500,
         .description = sRibbonSweetDesc,
         .pocket = POCKET_ITEMS,
@@ -3119,7 +2874,6 @@ const struct Item gItems[] =
     [ITEM_EVERSTONE] =
     {
         .name = _("Everstone"),
-        .itemId = ITEM_EVERSTONE,
         .price = 3000,
         .holdEffect = HOLD_EFFECT_PREVENT_EVOLVE,
         .description = sEverstoneDesc,
@@ -3134,7 +2888,6 @@ const struct Item gItems[] =
     [ITEM_RED_NECTAR] =
     {
         .name = _("Red Nectar"),
-        .itemId = ITEM_RED_NECTAR,
         .price = 300,
         .holdEffectParam = 0,
         .description = sRedNectarDesc,
@@ -3147,7 +2900,6 @@ const struct Item gItems[] =
     [ITEM_YELLOW_NECTAR] =
     {
         .name = _("Yellow Nectar"),
-        .itemId = ITEM_YELLOW_NECTAR,
         .price = 300,
         .holdEffectParam = 0,
         .description = sYellowNectarDesc,
@@ -3160,7 +2912,6 @@ const struct Item gItems[] =
     [ITEM_PINK_NECTAR] =
     {
         .name = _("Pink Nectar"),
-        .itemId = ITEM_PINK_NECTAR,
         .price = 300,
         .holdEffectParam = 0,
         .description = sPinkNectarDesc,
@@ -3173,7 +2924,6 @@ const struct Item gItems[] =
     [ITEM_PURPLE_NECTAR] =
     {
         .name = _("Purple Nectar"),
-        .itemId = ITEM_PURPLE_NECTAR,
         .price = 300,
         .holdEffectParam = 0,
         .description = sPurpleNectarDesc,
@@ -3188,7 +2938,6 @@ const struct Item gItems[] =
     [ITEM_FLAME_PLATE] =
     {
         .name = _("Flame Plate"),
-        .itemId = ITEM_FLAME_PLATE,
         .price = 1000,
         .holdEffect = HOLD_EFFECT_PLATE,
         .holdEffectParam = 20,
@@ -3203,7 +2952,6 @@ const struct Item gItems[] =
     [ITEM_SPLASH_PLATE] =
     {
         .name = _("Splash Plate"),
-        .itemId = ITEM_SPLASH_PLATE,
         .price = 1000,
         .holdEffect = HOLD_EFFECT_PLATE,
         .holdEffectParam = 20,
@@ -3218,7 +2966,6 @@ const struct Item gItems[] =
     [ITEM_ZAP_PLATE] =
     {
         .name = _("Zap Plate"),
-        .itemId = ITEM_ZAP_PLATE,
         .price = 1000,
         .holdEffect = HOLD_EFFECT_PLATE,
         .holdEffectParam = 20,
@@ -3233,7 +2980,6 @@ const struct Item gItems[] =
     [ITEM_MEADOW_PLATE] =
     {
         .name = _("Meadow Plate"),
-        .itemId = ITEM_MEADOW_PLATE,
         .price = 1000,
         .holdEffect = HOLD_EFFECT_PLATE,
         .holdEffectParam = 20,
@@ -3248,7 +2994,6 @@ const struct Item gItems[] =
     [ITEM_ICICLE_PLATE] =
     {
         .name = _("Icicle Plate"),
-        .itemId = ITEM_ICICLE_PLATE,
         .price = 1000,
         .holdEffect = HOLD_EFFECT_PLATE,
         .holdEffectParam = 20,
@@ -3263,7 +3008,6 @@ const struct Item gItems[] =
     [ITEM_FIST_PLATE] =
     {
         .name = _("Fist Plate"),
-        .itemId = ITEM_FIST_PLATE,
         .price = 1000,
         .holdEffect = HOLD_EFFECT_PLATE,
         .holdEffectParam = 20,
@@ -3278,7 +3022,6 @@ const struct Item gItems[] =
     [ITEM_TOXIC_PLATE] =
     {
         .name = _("Toxic Plate"),
-        .itemId = ITEM_TOXIC_PLATE,
         .price = 1000,
         .holdEffect = HOLD_EFFECT_PLATE,
         .holdEffectParam = 20,
@@ -3293,7 +3036,6 @@ const struct Item gItems[] =
     [ITEM_EARTH_PLATE] =
     {
         .name = _("Earth Plate"),
-        .itemId = ITEM_EARTH_PLATE,
         .price = 1000,
         .holdEffect = HOLD_EFFECT_PLATE,
         .holdEffectParam = 20,
@@ -3308,7 +3050,6 @@ const struct Item gItems[] =
     [ITEM_SKY_PLATE] =
     {
         .name = _("Sky Plate"),
-        .itemId = ITEM_SKY_PLATE,
         .price = 1000,
         .holdEffect = HOLD_EFFECT_PLATE,
         .holdEffectParam = 20,
@@ -3323,7 +3064,6 @@ const struct Item gItems[] =
     [ITEM_MIND_PLATE] =
     {
         .name = _("Mind Plate"),
-        .itemId = ITEM_MIND_PLATE,
         .price = 1000,
         .holdEffect = HOLD_EFFECT_PLATE,
         .holdEffectParam = 20,
@@ -3338,7 +3078,6 @@ const struct Item gItems[] =
     [ITEM_INSECT_PLATE] =
     {
         .name = _("Insect Plate"),
-        .itemId = ITEM_INSECT_PLATE,
         .price = 1000,
         .holdEffect = HOLD_EFFECT_PLATE,
         .holdEffectParam = 20,
@@ -3353,7 +3092,6 @@ const struct Item gItems[] =
     [ITEM_STONE_PLATE] =
     {
         .name = _("Stone Plate"),
-        .itemId = ITEM_STONE_PLATE,
         .price = 1000,
         .holdEffect = HOLD_EFFECT_PLATE,
         .holdEffectParam = 20,
@@ -3368,7 +3106,6 @@ const struct Item gItems[] =
     [ITEM_SPOOKY_PLATE] =
     {
         .name = _("Spooky Plate"),
-        .itemId = ITEM_SPOOKY_PLATE,
         .price = 1000,
         .holdEffect = HOLD_EFFECT_PLATE,
         .holdEffectParam = 20,
@@ -3383,7 +3120,6 @@ const struct Item gItems[] =
     [ITEM_DRACO_PLATE] =
     {
         .name = _("Draco Plate"),
-        .itemId = ITEM_DRACO_PLATE,
         .price = 1000,
         .holdEffect = HOLD_EFFECT_PLATE,
         .holdEffectParam = 20,
@@ -3398,7 +3134,6 @@ const struct Item gItems[] =
     [ITEM_DREAD_PLATE] =
     {
         .name = _("Dread Plate"),
-        .itemId = ITEM_DREAD_PLATE,
         .price = 1000,
         .holdEffect = HOLD_EFFECT_PLATE,
         .holdEffectParam = 20,
@@ -3413,7 +3148,6 @@ const struct Item gItems[] =
     [ITEM_IRON_PLATE] =
     {
         .name = _("Iron Plate"),
-        .itemId = ITEM_IRON_PLATE,
         .price = 1000,
         .holdEffect = HOLD_EFFECT_PLATE,
         .holdEffectParam = 20,
@@ -3428,7 +3162,6 @@ const struct Item gItems[] =
     [ITEM_PIXIE_PLATE] =
     {
         .name = _("Pixie Plate"),
-        .itemId = ITEM_PIXIE_PLATE,
         .price = 1000,
         .holdEffect = HOLD_EFFECT_PLATE,
         .holdEffectParam = 20,
@@ -3445,7 +3178,6 @@ const struct Item gItems[] =
     [ITEM_DOUSE_DRIVE] =
     {
         .name = _("Douse Drive"),
-        .itemId = ITEM_DOUSE_DRIVE,
         .price = 0,
         .holdEffect = HOLD_EFFECT_DRIVE,
         .description = sDouseDriveDesc,
@@ -3459,7 +3191,6 @@ const struct Item gItems[] =
     [ITEM_SHOCK_DRIVE] =
     {
         .name = _("Shock Drive"),
-        .itemId = ITEM_SHOCK_DRIVE,
         .price = 0,
         .holdEffect = HOLD_EFFECT_DRIVE,
         .description = sShockDriveDesc,
@@ -3473,7 +3204,6 @@ const struct Item gItems[] =
     [ITEM_BURN_DRIVE] =
     {
         .name = _("Burn Drive"),
-        .itemId = ITEM_BURN_DRIVE,
         .price = 0,
         .holdEffect = HOLD_EFFECT_DRIVE,
         .description = sBurnDriveDesc,
@@ -3487,7 +3217,6 @@ const struct Item gItems[] =
     [ITEM_CHILL_DRIVE] =
     {
         .name = _("Chill Drive"),
-        .itemId = ITEM_CHILL_DRIVE,
         .price = 0,
         .holdEffect = HOLD_EFFECT_DRIVE,
         .description = sChillDriveDesc,
@@ -3503,7 +3232,6 @@ const struct Item gItems[] =
     [ITEM_FIRE_MEMORY] =
     {
         .name = _("Fire Memory"),
-        .itemId = ITEM_FIRE_MEMORY,
         .price = 1000,
         .holdEffect = HOLD_EFFECT_MEMORY,
         .holdEffectParam = 0,
@@ -3518,7 +3246,6 @@ const struct Item gItems[] =
     [ITEM_WATER_MEMORY] =
     {
         .name = _("Water Memory"),
-        .itemId = ITEM_WATER_MEMORY,
         .price = 1000,
         .holdEffect = HOLD_EFFECT_MEMORY,
         .holdEffectParam = 0,
@@ -3533,7 +3260,6 @@ const struct Item gItems[] =
     [ITEM_ELECTRIC_MEMORY] =
     {
         .name = _("ElectrcMemory"),
-        .itemId = ITEM_ELECTRIC_MEMORY,
         .price = 1000,
         .holdEffect = HOLD_EFFECT_MEMORY,
         .holdEffectParam = 0,
@@ -3548,7 +3274,6 @@ const struct Item gItems[] =
     [ITEM_GRASS_MEMORY] =
     {
         .name = _("Grass Memory"),
-        .itemId = ITEM_GRASS_MEMORY,
         .price = 1000,
         .holdEffect = HOLD_EFFECT_MEMORY,
         .holdEffectParam = 0,
@@ -3563,7 +3288,6 @@ const struct Item gItems[] =
     [ITEM_ICE_MEMORY] =
     {
         .name = _("Ice Memory"),
-        .itemId = ITEM_ICE_MEMORY,
         .price = 1000,
         .holdEffect = HOLD_EFFECT_MEMORY,
         .holdEffectParam = 0,
@@ -3578,7 +3302,6 @@ const struct Item gItems[] =
     [ITEM_FIGHTING_MEMORY] =
     {
         .name = _("FightngMemory"),
-        .itemId = ITEM_FIGHTING_MEMORY,
         .price = 1000,
         .holdEffect = HOLD_EFFECT_MEMORY,
         .holdEffectParam = 0,
@@ -3593,7 +3316,6 @@ const struct Item gItems[] =
     [ITEM_POISON_MEMORY] =
     {
         .name = _("Poison Memory"),
-        .itemId = ITEM_POISON_MEMORY,
         .price = 1000,
         .holdEffect = HOLD_EFFECT_MEMORY,
         .holdEffectParam = 0,
@@ -3608,7 +3330,6 @@ const struct Item gItems[] =
     [ITEM_GROUND_MEMORY] =
     {
         .name = _("Ground Memory"),
-        .itemId = ITEM_GROUND_MEMORY,
         .price = 1000,
         .holdEffect = HOLD_EFFECT_MEMORY,
         .holdEffectParam = 0,
@@ -3623,7 +3344,6 @@ const struct Item gItems[] =
     [ITEM_FLYING_MEMORY] =
     {
         .name = _("Flying Memory"),
-        .itemId = ITEM_FLYING_MEMORY,
         .price = 1000,
         .holdEffect = HOLD_EFFECT_MEMORY,
         .holdEffectParam = 0,
@@ -3638,7 +3358,6 @@ const struct Item gItems[] =
     [ITEM_PSYCHIC_MEMORY] =
     {
         .name = _("PsychicMemory"),
-        .itemId = ITEM_PSYCHIC_MEMORY,
         .price = 1000,
         .holdEffect = HOLD_EFFECT_MEMORY,
         .holdEffectParam = 0,
@@ -3653,7 +3372,6 @@ const struct Item gItems[] =
     [ITEM_BUG_MEMORY] =
     {
         .name = _("Bug Memory"),
-        .itemId = ITEM_BUG_MEMORY,
         .price = 1000,
         .holdEffect = HOLD_EFFECT_MEMORY,
         .holdEffectParam = 0,
@@ -3668,7 +3386,6 @@ const struct Item gItems[] =
     [ITEM_ROCK_MEMORY] =
     {
         .name = _("Rock Memory"),
-        .itemId = ITEM_ROCK_MEMORY,
         .price = 1000,
         .holdEffect = HOLD_EFFECT_MEMORY,
         .holdEffectParam = 0,
@@ -3683,7 +3400,6 @@ const struct Item gItems[] =
     [ITEM_GHOST_MEMORY] =
     {
         .name = _("Ghost Memory"),
-        .itemId = ITEM_GHOST_MEMORY,
         .price = 1000,
         .holdEffect = HOLD_EFFECT_MEMORY,
         .holdEffectParam = 0,
@@ -3698,7 +3414,6 @@ const struct Item gItems[] =
     [ITEM_DRAGON_MEMORY] =
     {
         .name = _("Dragon Memory"),
-        .itemId = ITEM_DRAGON_MEMORY,
         .price = 1000,
         .holdEffect = HOLD_EFFECT_MEMORY,
         .holdEffectParam = 0,
@@ -3713,7 +3428,6 @@ const struct Item gItems[] =
     [ITEM_DARK_MEMORY] =
     {
         .name = _("Dark Memory"),
-        .itemId = ITEM_DARK_MEMORY,
         .price = 1000,
         .holdEffect = HOLD_EFFECT_MEMORY,
         .holdEffectParam = 0,
@@ -3728,7 +3442,6 @@ const struct Item gItems[] =
     [ITEM_STEEL_MEMORY] =
     {
         .name = _("Steel Memory"),
-        .itemId = ITEM_STEEL_MEMORY,
         .price = 1000,
         .holdEffect = HOLD_EFFECT_MEMORY,
         .holdEffectParam = 0,
@@ -3743,7 +3456,6 @@ const struct Item gItems[] =
     [ITEM_FAIRY_MEMORY] =
     {
         .name = _("Fairy Memory"),
-        .itemId = ITEM_FAIRY_MEMORY,
         .price = 1000,
         .holdEffect = HOLD_EFFECT_MEMORY,
         .holdEffectParam = 0,
@@ -3758,7 +3470,6 @@ const struct Item gItems[] =
     [ITEM_RUSTED_SWORD] =
     {
         .name = _("RustedSword"),
-        .itemId = ITEM_RUSTED_SWORD,
         .price = 0,
         .description = sRustedSwordDesc,
         .pocket = POCKET_ITEMS,
@@ -3769,7 +3480,6 @@ const struct Item gItems[] =
     [ITEM_RUSTED_SHIELD] =
     {
         .name = _("RustedShield"),
-        .itemId = ITEM_RUSTED_SHIELD,
         .price = 0,
         .description = sRustedShieldDesc,
         .pocket = POCKET_ITEMS,
@@ -3782,7 +3492,6 @@ const struct Item gItems[] =
     [ITEM_RED_ORB] =
     {
         .name = _("Red Orb"),
-        .itemId = ITEM_RED_ORB,
         .price = 0,
         .holdEffect = HOLD_EFFECT_PRIMAL_ORB,
         .description = sRedOrbDesc,
@@ -3794,7 +3503,6 @@ const struct Item gItems[] =
     [ITEM_BLUE_ORB] =
     {
         .name = _("Blue Orb"),
-        .itemId = ITEM_BLUE_ORB,
         .price = 0,
         .holdEffect = HOLD_EFFECT_PRIMAL_ORB,
         .description = sBlueOrbDesc,
@@ -3808,7 +3516,6 @@ const struct Item gItems[] =
     [ITEM_VENUSAURITE] =
     {
         .name = _("Venusaurite"),
-        .itemId = ITEM_VENUSAURITE,
         .price = 0,
         .holdEffect = HOLD_EFFECT_MEGA_STONE,
         .description = sVenusauriteDesc,
@@ -3821,7 +3528,6 @@ const struct Item gItems[] =
     [ITEM_CHARIZARDITE_X] =
     {
         .name = _("CharizarditeX"),
-        .itemId = ITEM_CHARIZARDITE_X,
         .price = 0,
         .holdEffect = HOLD_EFFECT_MEGA_STONE,
         .description = sCharizarditeDesc,
@@ -3834,7 +3540,6 @@ const struct Item gItems[] =
     [ITEM_CHARIZARDITE_Y] =
     {
         .name = _("CharizarditeY"),
-        .itemId = ITEM_CHARIZARDITE_Y,
         .price = 0,
         .holdEffect = HOLD_EFFECT_MEGA_STONE,
         .description = sCharizarditeDesc,
@@ -3847,7 +3552,6 @@ const struct Item gItems[] =
     [ITEM_BLASTOISINITE] =
     {
         .name = _("Blastoisinite"),
-        .itemId = ITEM_BLASTOISINITE,
         .price = 0,
         .holdEffect = HOLD_EFFECT_MEGA_STONE,
         .description = sBlastoisiniteDesc,
@@ -3860,7 +3564,6 @@ const struct Item gItems[] =
     [ITEM_BEEDRILLITE] =
     {
         .name = _("Beedrillite"),
-        .itemId = ITEM_BEEDRILLITE,
         .price = 0,
         .holdEffect = HOLD_EFFECT_MEGA_STONE,
         .description = sBeedrilliteDesc,
@@ -3873,7 +3576,6 @@ const struct Item gItems[] =
     [ITEM_PIDGEOTITE] =
     {
         .name = _("Pidgeotite"),
-        .itemId = ITEM_PIDGEOTITE,
         .price = 0,
         .holdEffect = HOLD_EFFECT_MEGA_STONE,
         .description = sPidgeotiteDesc,
@@ -3886,7 +3588,6 @@ const struct Item gItems[] =
     [ITEM_ALAKAZITE] =
     {
         .name = _("Alakazite"),
-        .itemId = ITEM_ALAKAZITE,
         .price = 0,
         .holdEffect = HOLD_EFFECT_MEGA_STONE,
         .description = sAlakaziteDesc,
@@ -3899,7 +3600,6 @@ const struct Item gItems[] =
     [ITEM_SLOWBRONITE] =
     {
         .name = _("Slowbronite"),
-        .itemId = ITEM_SLOWBRONITE,
         .price = 0,
         .holdEffect = HOLD_EFFECT_MEGA_STONE,
         .description = sSlowbroniteDesc,
@@ -3912,7 +3612,6 @@ const struct Item gItems[] =
     [ITEM_GENGARITE] =
     {
         .name = _("Gengarite"),
-        .itemId = ITEM_GENGARITE,
         .price = 0,
         .holdEffect = HOLD_EFFECT_MEGA_STONE,
         .description = sGengariteDesc,
@@ -3925,7 +3624,6 @@ const struct Item gItems[] =
     [ITEM_KANGASKHANITE] =
     {
         .name = _("Kangaskhanite"),
-        .itemId = ITEM_KANGASKHANITE,
         .price = 0,
         .holdEffect = HOLD_EFFECT_MEGA_STONE,
         .description = sKangaskhaniteDesc,
@@ -3938,7 +3636,6 @@ const struct Item gItems[] =
     [ITEM_PINSIRITE] =
     {
         .name = _("Pinsirite"),
-        .itemId = ITEM_PINSIRITE,
         .price = 0,
         .holdEffect = HOLD_EFFECT_MEGA_STONE,
         .description = sPinsiriteDesc,
@@ -3951,7 +3648,6 @@ const struct Item gItems[] =
     [ITEM_GYARADOSITE] =
     {
         .name = _("Gyaradosite"),
-        .itemId = ITEM_GYARADOSITE,
         .price = 0,
         .holdEffect = HOLD_EFFECT_MEGA_STONE,
         .description = sGyaradositeDesc,
@@ -3964,7 +3660,6 @@ const struct Item gItems[] =
     [ITEM_AERODACTYLITE] =
     {
         .name = _("Aerodactylite"),
-        .itemId = ITEM_AERODACTYLITE,
         .price = 0,
         .holdEffect = HOLD_EFFECT_MEGA_STONE,
         .description = sAerodactyliteDesc,
@@ -3977,7 +3672,6 @@ const struct Item gItems[] =
     [ITEM_MEWTWONITE_X] =
     {
         .name = _("Mewtwonite X"),
-        .itemId = ITEM_MEWTWONITE_X,
         .price = 0,
         .holdEffect = HOLD_EFFECT_MEGA_STONE,
         .description = sMewtwoniteDesc,
@@ -3990,7 +3684,6 @@ const struct Item gItems[] =
     [ITEM_MEWTWONITE_Y] =
     {
         .name = _("Mewtwonite Y"),
-        .itemId = ITEM_MEWTWONITE_Y,
         .price = 0,
         .holdEffect = HOLD_EFFECT_MEGA_STONE,
         .description = sMewtwoniteDesc,
@@ -4003,7 +3696,6 @@ const struct Item gItems[] =
     [ITEM_AMPHAROSITE] =
     {
         .name = _("Ampharosite"),
-        .itemId = ITEM_AMPHAROSITE,
         .price = 0,
         .holdEffect = HOLD_EFFECT_MEGA_STONE,
         .description = sAmpharositeDesc,
@@ -4016,7 +3708,6 @@ const struct Item gItems[] =
     [ITEM_STEELIXITE] =
     {
         .name = _("Steelixite"),
-        .itemId = ITEM_STEELIXITE,
         .price = 0,
         .holdEffect = HOLD_EFFECT_MEGA_STONE,
         .description = sSteelixiteDesc,
@@ -4029,7 +3720,6 @@ const struct Item gItems[] =
     [ITEM_SCIZORITE] =
     {
         .name = _("Scizorite"),
-        .itemId = ITEM_SCIZORITE,
         .price = 0,
         .holdEffect = HOLD_EFFECT_MEGA_STONE,
         .description = sScizoriteDesc,
@@ -4042,7 +3732,6 @@ const struct Item gItems[] =
     [ITEM_HERACRONITE] =
     {
         .name = _("Heracronite"),
-        .itemId = ITEM_HERACRONITE,
         .price = 0,
         .holdEffect = HOLD_EFFECT_MEGA_STONE,
         .description = sHeracroniteDesc,
@@ -4055,7 +3744,6 @@ const struct Item gItems[] =
     [ITEM_HOUNDOOMINITE] =
     {
         .name = _("Houndoominite"),
-        .itemId = ITEM_HOUNDOOMINITE,
         .price = 0,
         .holdEffect = HOLD_EFFECT_MEGA_STONE,
         .description = sHoundoominiteDesc,
@@ -4068,7 +3756,6 @@ const struct Item gItems[] =
     [ITEM_TYRANITARITE] =
     {
         .name = _("Tyranitarite"),
-        .itemId = ITEM_TYRANITARITE,
         .price = 0,
         .holdEffect = HOLD_EFFECT_MEGA_STONE,
         .description = sTyranitariteDesc,
@@ -4081,7 +3768,6 @@ const struct Item gItems[] =
     [ITEM_SCEPTILITE] =
     {
         .name = _("Sceptilite"),
-        .itemId = ITEM_SCEPTILITE,
         .price = 0,
         .holdEffect = HOLD_EFFECT_MEGA_STONE,
         .description = sSceptiliteDesc,
@@ -4094,7 +3780,6 @@ const struct Item gItems[] =
     [ITEM_BLAZIKENITE] =
     {
         .name = _("Blazikenite"),
-        .itemId = ITEM_BLAZIKENITE,
         .price = 0,
         .holdEffect = HOLD_EFFECT_MEGA_STONE,
         .description = sBlazikeniteDesc,
@@ -4107,7 +3792,6 @@ const struct Item gItems[] =
     [ITEM_SWAMPERTITE] =
     {
         .name = _("Swampertite"),
-        .itemId = ITEM_SWAMPERTITE,
         .price = 0,
         .holdEffect = HOLD_EFFECT_MEGA_STONE,
         .description = sSwampertiteDesc,
@@ -4120,7 +3804,6 @@ const struct Item gItems[] =
     [ITEM_GARDEVOIRITE] =
     {
         .name = _("Gardevoirite"),
-        .itemId = ITEM_GARDEVOIRITE,
         .price = 0,
         .holdEffect = HOLD_EFFECT_MEGA_STONE,
         .description = sGardevoiriteDesc,
@@ -4133,7 +3816,6 @@ const struct Item gItems[] =
     [ITEM_SABLENITE] =
     {
         .name = _("Sablenite"),
-        .itemId = ITEM_SABLENITE,
         .price = 0,
         .holdEffect = HOLD_EFFECT_MEGA_STONE,
         .description = sSableniteDesc,
@@ -4146,7 +3828,6 @@ const struct Item gItems[] =
     [ITEM_MAWILITE] =
     {
         .name = _("Mawilite"),
-        .itemId = ITEM_MAWILITE,
         .price = 0,
         .holdEffect = HOLD_EFFECT_MEGA_STONE,
         .description = sMawiliteDesc,
@@ -4159,7 +3840,6 @@ const struct Item gItems[] =
     [ITEM_AGGRONITE] =
     {
         .name = _("Aggronite"),
-        .itemId = ITEM_AGGRONITE,
         .price = 0,
         .holdEffect = HOLD_EFFECT_MEGA_STONE,
         .description = sAggroniteDesc,
@@ -4172,7 +3852,6 @@ const struct Item gItems[] =
     [ITEM_MEDICHAMITE] =
     {
         .name = _("Medichamite"),
-        .itemId = ITEM_MEDICHAMITE,
         .price = 0,
         .holdEffect = HOLD_EFFECT_MEGA_STONE,
         .description = sMedichamiteDesc,
@@ -4185,7 +3864,6 @@ const struct Item gItems[] =
     [ITEM_MANECTITE] =
     {
         .name = _("Manectite"),
-        .itemId = ITEM_MANECTITE,
         .price = 0,
         .holdEffect = HOLD_EFFECT_MEGA_STONE,
         .description = sManectiteDesc,
@@ -4198,7 +3876,6 @@ const struct Item gItems[] =
     [ITEM_SHARPEDONITE] =
     {
         .name = _("Sharpedonite"),
-        .itemId = ITEM_SHARPEDONITE,
         .price = 0,
         .holdEffect = HOLD_EFFECT_MEGA_STONE,
         .description = sSharpedoniteDesc,
@@ -4211,7 +3888,6 @@ const struct Item gItems[] =
     [ITEM_CAMERUPTITE] =
     {
         .name = _("Cameruptite"),
-        .itemId = ITEM_CAMERUPTITE,
         .price = 0,
         .holdEffect = HOLD_EFFECT_MEGA_STONE,
         .description = sCameruptiteDesc,
@@ -4224,7 +3900,6 @@ const struct Item gItems[] =
     [ITEM_ALTARIANITE] =
     {
         .name = _("Altarianite"),
-        .itemId = ITEM_ALTARIANITE,
         .price = 0,
         .holdEffect = HOLD_EFFECT_MEGA_STONE,
         .description = sAltarianiteDesc,
@@ -4237,7 +3912,6 @@ const struct Item gItems[] =
     [ITEM_BANETTITE] =
     {
         .name = _("Banettite"),
-        .itemId = ITEM_BANETTITE,
         .price = 0,
         .holdEffect = HOLD_EFFECT_MEGA_STONE,
         .description = sBanettiteDesc,
@@ -4250,7 +3924,6 @@ const struct Item gItems[] =
     [ITEM_ABSOLITE] =
     {
         .name = _("Absolite"),
-        .itemId = ITEM_ABSOLITE,
         .price = 0,
         .holdEffect = HOLD_EFFECT_MEGA_STONE,
         .description = sAbsoliteDesc,
@@ -4263,7 +3936,6 @@ const struct Item gItems[] =
     [ITEM_GLALITITE] =
     {
         .name = _("Glalitite"),
-        .itemId = ITEM_GLALITITE,
         .price = 0,
         .holdEffect = HOLD_EFFECT_MEGA_STONE,
         .description = sGlalititeDesc,
@@ -4276,7 +3948,6 @@ const struct Item gItems[] =
     [ITEM_SALAMENCITE] =
     {
         .name = _("Salamencite"),
-        .itemId = ITEM_SALAMENCITE,
         .price = 0,
         .holdEffect = HOLD_EFFECT_MEGA_STONE,
         .description = sSalamenciteDesc,
@@ -4289,7 +3960,6 @@ const struct Item gItems[] =
     [ITEM_METAGROSSITE] =
     {
         .name = _("Metagrossite"),
-        .itemId = ITEM_METAGROSSITE,
         .price = 0,
         .holdEffect = HOLD_EFFECT_MEGA_STONE,
         .description = sMetagrossiteDesc,
@@ -4302,7 +3972,6 @@ const struct Item gItems[] =
     [ITEM_LATIASITE] =
     {
         .name = _("Latiasite"),
-        .itemId = ITEM_LATIASITE,
         .price = 0,
         .holdEffect = HOLD_EFFECT_MEGA_STONE,
         .description = sLatiasiteDesc,
@@ -4315,7 +3984,6 @@ const struct Item gItems[] =
     [ITEM_LATIOSITE] =
     {
         .name = _("Latiosite"),
-        .itemId = ITEM_LATIOSITE,
         .price = 0,
         .holdEffect = HOLD_EFFECT_MEGA_STONE,
         .description = sLatiositeDesc,
@@ -4328,7 +3996,6 @@ const struct Item gItems[] =
     [ITEM_LOPUNNITE] =
     {
         .name = _("Lopunnite"),
-        .itemId = ITEM_LOPUNNITE,
         .price = 0,
         .holdEffect = HOLD_EFFECT_MEGA_STONE,
         .description = sLopunniteDesc,
@@ -4341,7 +4008,6 @@ const struct Item gItems[] =
     [ITEM_GARCHOMPITE] =
     {
         .name = _("Garchompite"),
-        .itemId = ITEM_GARCHOMPITE,
         .price = 0,
         .holdEffect = HOLD_EFFECT_MEGA_STONE,
         .description = sGarchompiteDesc,
@@ -4354,7 +4020,6 @@ const struct Item gItems[] =
     [ITEM_LUCARIONITE] =
     {
         .name = _("Lucarionite"),
-        .itemId = ITEM_LUCARIONITE,
         .price = 0,
         .holdEffect = HOLD_EFFECT_MEGA_STONE,
         .description = sLucarioniteDesc,
@@ -4367,7 +4032,6 @@ const struct Item gItems[] =
     [ITEM_ABOMASITE] =
     {
         .name = _("Abomasite"),
-        .itemId = ITEM_ABOMASITE,
         .price = 0,
         .holdEffect = HOLD_EFFECT_MEGA_STONE,
         .description = sAbomasiteDesc,
@@ -4380,7 +4044,6 @@ const struct Item gItems[] =
     [ITEM_GALLADITE] =
     {
         .name = _("Galladite"),
-        .itemId = ITEM_GALLADITE,
         .price = 0,
         .holdEffect = HOLD_EFFECT_MEGA_STONE,
         .description = sGalladiteDesc,
@@ -4393,7 +4056,6 @@ const struct Item gItems[] =
     [ITEM_AUDINITE] =
     {
         .name = _("Audinite"),
-        .itemId = ITEM_AUDINITE,
         .price = 0,
         .holdEffect = HOLD_EFFECT_MEGA_STONE,
         .description = sAudiniteDesc,
@@ -4406,7 +4068,6 @@ const struct Item gItems[] =
     [ITEM_DIANCITE] =
     {
         .name = _("Diancite"),
-        .itemId = ITEM_DIANCITE,
         .price = 0,
         .holdEffect = HOLD_EFFECT_MEGA_STONE,
         .description = sDianciteDesc,
@@ -4421,7 +4082,6 @@ const struct Item gItems[] =
     [ITEM_NORMAL_GEM] =
     {
         .name = _("Normal Gem"),
-        .itemId = ITEM_NORMAL_GEM,
         .price = 4000,
         .holdEffect = HOLD_EFFECT_GEMS,
         .holdEffectParam = GEM_BOOST_PARAM,
@@ -4435,7 +4095,6 @@ const struct Item gItems[] =
     [ITEM_FIRE_GEM] =
     {
         .name = _("Fire Gem"),
-        .itemId = ITEM_FIRE_GEM,
         .price = 4000,
         .holdEffect = HOLD_EFFECT_GEMS,
         .holdEffectParam = GEM_BOOST_PARAM,
@@ -4449,7 +4108,6 @@ const struct Item gItems[] =
     [ITEM_WATER_GEM] =
     {
         .name = _("Water Gem"),
-        .itemId = ITEM_WATER_GEM,
         .price = 4000,
         .holdEffect = HOLD_EFFECT_GEMS,
         .holdEffectParam = GEM_BOOST_PARAM,
@@ -4463,7 +4121,6 @@ const struct Item gItems[] =
     [ITEM_ELECTRIC_GEM] =
     {
         .name = _("Electric Gem"),
-        .itemId = ITEM_ELECTRIC_GEM,
         .price = 4000,
         .holdEffect = HOLD_EFFECT_GEMS,
         .holdEffectParam = GEM_BOOST_PARAM,
@@ -4477,7 +4134,6 @@ const struct Item gItems[] =
     [ITEM_GRASS_GEM] =
     {
         .name = _("Grass Gem"),
-        .itemId = ITEM_GRASS_GEM,
         .price = 4000,
         .holdEffect = HOLD_EFFECT_GEMS,
         .holdEffectParam = GEM_BOOST_PARAM,
@@ -4491,7 +4147,6 @@ const struct Item gItems[] =
     [ITEM_ICE_GEM] =
     {
         .name = _("Ice Gem"),
-        .itemId = ITEM_ICE_GEM,
         .price = 4000,
         .holdEffect = HOLD_EFFECT_GEMS,
         .holdEffectParam = GEM_BOOST_PARAM,
@@ -4505,7 +4160,6 @@ const struct Item gItems[] =
     [ITEM_FIGHTING_GEM] =
     {
         .name = _("Fighting Gem"),
-        .itemId = ITEM_FIGHTING_GEM,
         .price = 4000,
         .holdEffect = HOLD_EFFECT_GEMS,
         .holdEffectParam = GEM_BOOST_PARAM,
@@ -4519,7 +4173,6 @@ const struct Item gItems[] =
     [ITEM_POISON_GEM] =
     {
         .name = _("Poison Gem"),
-        .itemId = ITEM_POISON_GEM,
         .price = 4000,
         .holdEffect = HOLD_EFFECT_GEMS,
         .holdEffectParam = GEM_BOOST_PARAM,
@@ -4533,7 +4186,6 @@ const struct Item gItems[] =
     [ITEM_GROUND_GEM] =
     {
         .name = _("Ground Gem"),
-        .itemId = ITEM_GROUND_GEM,
         .price = 4000,
         .holdEffect = HOLD_EFFECT_GEMS,
         .holdEffectParam = GEM_BOOST_PARAM,
@@ -4547,7 +4199,6 @@ const struct Item gItems[] =
     [ITEM_FLYING_GEM] =
     {
         .name = _("Flying Gem"),
-        .itemId = ITEM_FLYING_GEM,
         .price = 4000,
         .holdEffect = HOLD_EFFECT_GEMS,
         .holdEffectParam = GEM_BOOST_PARAM,
@@ -4561,7 +4212,6 @@ const struct Item gItems[] =
     [ITEM_PSYCHIC_GEM] =
     {
         .name = _("Psychic Gem"),
-        .itemId = ITEM_PSYCHIC_GEM,
         .price = 4000,
         .holdEffect = HOLD_EFFECT_GEMS,
         .holdEffectParam = GEM_BOOST_PARAM,
@@ -4575,7 +4225,6 @@ const struct Item gItems[] =
     [ITEM_BUG_GEM] =
     {
         .name = _("Bug Gem"),
-        .itemId = ITEM_BUG_GEM,
         .price = 4000,
         .holdEffect = HOLD_EFFECT_GEMS,
         .holdEffectParam = GEM_BOOST_PARAM,
@@ -4589,7 +4238,6 @@ const struct Item gItems[] =
     [ITEM_ROCK_GEM] =
     {
         .name = _("Rock Gem"),
-        .itemId = ITEM_ROCK_GEM,
         .price = 4000,
         .holdEffect = HOLD_EFFECT_GEMS,
         .holdEffectParam = GEM_BOOST_PARAM,
@@ -4603,7 +4251,6 @@ const struct Item gItems[] =
     [ITEM_GHOST_GEM] =
     {
         .name = _("Ghost Gem"),
-        .itemId = ITEM_GHOST_GEM,
         .price = 4000,
         .holdEffect = HOLD_EFFECT_GEMS,
         .holdEffectParam = GEM_BOOST_PARAM,
@@ -4617,7 +4264,6 @@ const struct Item gItems[] =
     [ITEM_DRAGON_GEM] =
     {
         .name = _("Dragon Gem"),
-        .itemId = ITEM_DRAGON_GEM,
         .price = 4000,
         .holdEffect = HOLD_EFFECT_GEMS,
         .holdEffectParam = GEM_BOOST_PARAM,
@@ -4631,7 +4277,6 @@ const struct Item gItems[] =
     [ITEM_DARK_GEM] =
     {
         .name = _("Dark Gem"),
-        .itemId = ITEM_DARK_GEM,
         .price = 4000,
         .holdEffect = HOLD_EFFECT_GEMS,
         .holdEffectParam = GEM_BOOST_PARAM,
@@ -4645,7 +4290,6 @@ const struct Item gItems[] =
     [ITEM_STEEL_GEM] =
     {
         .name = _("Steel Gem"),
-        .itemId = ITEM_STEEL_GEM,
         .price = 4000,
         .holdEffect = HOLD_EFFECT_GEMS,
         .holdEffectParam = GEM_BOOST_PARAM,
@@ -4659,7 +4303,6 @@ const struct Item gItems[] =
     [ITEM_FAIRY_GEM] =
     {
         .name = _("Fairy Gem"),
-        .itemId = ITEM_FAIRY_GEM,
         .price = 4000,
         .holdEffect = HOLD_EFFECT_GEMS,
         .holdEffectParam = GEM_BOOST_PARAM,
@@ -4675,7 +4318,6 @@ const struct Item gItems[] =
     [ITEM_NORMALIUM_Z] =
     {
         .name = _("Normalium Z"),
-        .itemId = ITEM_NORMALIUM_Z,
         .price = 0,
         .holdEffect = HOLD_EFFECT_Z_CRYSTAL,
         .description = sNormaliumZDesc,
@@ -4688,7 +4330,6 @@ const struct Item gItems[] =
     [ITEM_FIRIUM_Z] =
     {
         .name = _("Firium Z"),
-        .itemId = ITEM_FIRIUM_Z,
         .price = 0,
         .holdEffect = HOLD_EFFECT_Z_CRYSTAL,
         .description = sFiriumZDesc,
@@ -4701,7 +4342,6 @@ const struct Item gItems[] =
     [ITEM_WATERIUM_Z] =
     {
         .name = _("Waterium Z"),
-        .itemId = ITEM_WATERIUM_Z,
         .price = 0,
         .holdEffect = HOLD_EFFECT_Z_CRYSTAL,
         .description = sWateriumZDesc,
@@ -4714,7 +4354,6 @@ const struct Item gItems[] =
     [ITEM_ELECTRIUM_Z] =
     {
         .name = _("Electrium Z"),
-        .itemId = ITEM_ELECTRIUM_Z,
         .price = 0,
         .holdEffect = HOLD_EFFECT_Z_CRYSTAL,
         .description = sElectriumZDesc,
@@ -4727,7 +4366,6 @@ const struct Item gItems[] =
     [ITEM_GRASSIUM_Z] =
     {
         .name = _("Grassium Z"),
-        .itemId = ITEM_GRASSIUM_Z,
         .price = 0,
         .holdEffect = HOLD_EFFECT_Z_CRYSTAL,
         .description = sGrassiumZDesc,
@@ -4740,7 +4378,6 @@ const struct Item gItems[] =
     [ITEM_ICIUM_Z] =
     {
         .name = _("Icium Z"),
-        .itemId = ITEM_ICIUM_Z,
         .price = 0,
         .holdEffect = HOLD_EFFECT_Z_CRYSTAL,
         .description = sIciumZDesc,
@@ -4753,7 +4390,6 @@ const struct Item gItems[] =
     [ITEM_FIGHTINIUM_Z] =
     {
         .name = _("Fightinium Z"),
-        .itemId = ITEM_FIGHTINIUM_Z,
         .price = 0,
         .holdEffect = HOLD_EFFECT_Z_CRYSTAL,
         .description = sFightiniumZDesc,
@@ -4766,7 +4402,6 @@ const struct Item gItems[] =
     [ITEM_POISONIUM_Z] =
     {
         .name = _("Poisonium Z"),
-        .itemId = ITEM_POISONIUM_Z,
         .price = 0,
         .holdEffect = HOLD_EFFECT_Z_CRYSTAL,
         .description = sPoisoniumZDesc,
@@ -4779,7 +4414,6 @@ const struct Item gItems[] =
     [ITEM_GROUNDIUM_Z] =
     {
         .name = _("Groundium Z"),
-        .itemId = ITEM_GROUNDIUM_Z,
         .price = 0,
         .holdEffect = HOLD_EFFECT_Z_CRYSTAL,
         .description = sGroundiumZDesc,
@@ -4792,7 +4426,6 @@ const struct Item gItems[] =
     [ITEM_FLYINIUM_Z] =
     {
         .name = _("Flyinium Z"),
-        .itemId = ITEM_FLYINIUM_Z,
         .price = 0,
         .holdEffect = HOLD_EFFECT_Z_CRYSTAL,
         .description = sFlyiniumZDesc,
@@ -4805,7 +4438,6 @@ const struct Item gItems[] =
     [ITEM_PSYCHIUM_Z] =
     {
         .name = _("Psychium Z"),
-        .itemId = ITEM_PSYCHIUM_Z,
         .price = 0,
         .holdEffect = HOLD_EFFECT_Z_CRYSTAL,
         .description = sPsychiumZDesc,
@@ -4818,7 +4450,6 @@ const struct Item gItems[] =
     [ITEM_BUGINIUM_Z] =
     {
         .name = _("Buginium Z"),
-        .itemId = ITEM_BUGINIUM_Z,
         .price = 0,
         .holdEffect = HOLD_EFFECT_Z_CRYSTAL,
         .description = sBuginiumZDesc,
@@ -4831,7 +4462,6 @@ const struct Item gItems[] =
     [ITEM_ROCKIUM_Z] =
     {
         .name = _("Rockium Z"),
-        .itemId = ITEM_ROCKIUM_Z,
         .price = 0,
         .holdEffect = HOLD_EFFECT_Z_CRYSTAL,
         .description = sRockiumZDesc,
@@ -4844,7 +4474,6 @@ const struct Item gItems[] =
     [ITEM_GHOSTIUM_Z] =
     {
         .name = _("Ghostium Z"),
-        .itemId = ITEM_GHOSTIUM_Z,
         .price = 0,
         .holdEffect = HOLD_EFFECT_Z_CRYSTAL,
         .description = sGhostiumZDesc,
@@ -4857,7 +4486,6 @@ const struct Item gItems[] =
     [ITEM_DRAGONIUM_Z] =
     {
         .name = _("Dragonium Z"),
-        .itemId = ITEM_DRAGONIUM_Z,
         .price = 0,
         .holdEffect = HOLD_EFFECT_Z_CRYSTAL,
         .description = sDragoniumZDesc,
@@ -4870,7 +4498,6 @@ const struct Item gItems[] =
     [ITEM_DARKINIUM_Z] =
     {
         .name = _("Darkinium Z"),
-        .itemId = ITEM_DARKINIUM_Z,
         .price = 0,
         .holdEffect = HOLD_EFFECT_Z_CRYSTAL,
         .description = sDarkiniumZDesc,
@@ -4883,7 +4510,6 @@ const struct Item gItems[] =
     [ITEM_STEELIUM_Z] =
     {
         .name = _("Steelium Z"),
-        .itemId = ITEM_STEELIUM_Z,
         .price = 0,
         .holdEffect = HOLD_EFFECT_Z_CRYSTAL,
         .description = sSteeliumZDesc,
@@ -4896,7 +4522,6 @@ const struct Item gItems[] =
     [ITEM_FAIRIUM_Z] =
     {
         .name = _("Fairium Z"),
-        .itemId = ITEM_FAIRIUM_Z,
         .price = 0,
         .holdEffect = HOLD_EFFECT_Z_CRYSTAL,
         .description = sFairiumZDesc,
@@ -4909,7 +4534,6 @@ const struct Item gItems[] =
     [ITEM_PIKANIUM_Z] =
     {
         .name = _("Pikanium Z"),
-        .itemId = ITEM_PIKANIUM_Z,
         .price = 0,
         .holdEffect = HOLD_EFFECT_Z_CRYSTAL,
         .description = sPikaniumZDesc,
@@ -4922,7 +4546,6 @@ const struct Item gItems[] =
     [ITEM_EEVIUM_Z] =
     {
         .name = _("Eevium Z"),
-        .itemId = ITEM_EEVIUM_Z,
         .price = 0,
         .holdEffect = HOLD_EFFECT_Z_CRYSTAL,
         .description = sEeviumZDesc,
@@ -4935,7 +4558,6 @@ const struct Item gItems[] =
     [ITEM_SNORLIUM_Z] =
     {
         .name = _("Snorlium Z"),
-        .itemId = ITEM_SNORLIUM_Z,
         .price = 0,
         .holdEffect = HOLD_EFFECT_Z_CRYSTAL,
         .description = sSnorliumZDesc,
@@ -4948,7 +4570,6 @@ const struct Item gItems[] =
     [ITEM_MEWNIUM_Z] =
     {
         .name = _("Mewnium Z"),
-        .itemId = ITEM_MEWNIUM_Z,
         .price = 0,
         .holdEffect = HOLD_EFFECT_Z_CRYSTAL,
         .description = sMewniumZDesc,
@@ -4961,7 +4582,6 @@ const struct Item gItems[] =
     [ITEM_DECIDIUM_Z] =
     {
         .name = _("Decidium Z"),
-        .itemId = ITEM_DECIDIUM_Z,
         .price = 0,
         .holdEffect = HOLD_EFFECT_Z_CRYSTAL,
         .description = sDecidiumZDesc,
@@ -4974,7 +4594,6 @@ const struct Item gItems[] =
     [ITEM_INCINIUM_Z] =
     {
         .name = _("Incinium Z"),
-        .itemId = ITEM_INCINIUM_Z,
         .price = 0,
         .holdEffect = HOLD_EFFECT_Z_CRYSTAL,
         .description = sInciniumZDesc,
@@ -4987,7 +4606,6 @@ const struct Item gItems[] =
     [ITEM_PRIMARIUM_Z] =
     {
         .name = _("Primarium Z"),
-        .itemId = ITEM_PRIMARIUM_Z,
         .price = 0,
         .holdEffect = HOLD_EFFECT_Z_CRYSTAL,
         .description = sPrimariumZDesc,
@@ -5000,7 +4618,6 @@ const struct Item gItems[] =
     [ITEM_LYCANIUM_Z] =
     {
         .name = _("Lycanium Z"),
-        .itemId = ITEM_LYCANIUM_Z,
         .price = 0,
         .holdEffect = HOLD_EFFECT_Z_CRYSTAL,
         .description = sLycaniumZDesc,
@@ -5013,7 +4630,6 @@ const struct Item gItems[] =
     [ITEM_MIMIKIUM_Z] =
     {
         .name = _("Mimikium Z"),
-        .itemId = ITEM_MIMIKIUM_Z,
         .price = 0,
         .holdEffect = HOLD_EFFECT_Z_CRYSTAL,
         .description = sMimikiumZDesc,
@@ -5026,7 +4642,6 @@ const struct Item gItems[] =
     [ITEM_KOMMONIUM_Z] =
     {
         .name = _("Kommonium Z"),
-        .itemId = ITEM_KOMMONIUM_Z,
         .price = 0,
         .holdEffect = HOLD_EFFECT_Z_CRYSTAL,
         .description = sKommoniumZDesc,
@@ -5039,7 +4654,6 @@ const struct Item gItems[] =
     [ITEM_TAPUNIUM_Z] =
     {
         .name = _("Tapunium Z"),
-        .itemId = ITEM_TAPUNIUM_Z,
         .price = 0,
         .holdEffect = HOLD_EFFECT_Z_CRYSTAL,
         .description = sTapuniumZDesc,
@@ -5052,7 +4666,6 @@ const struct Item gItems[] =
     [ITEM_SOLGANIUM_Z] =
     {
         .name = _("Solganium Z"),
-        .itemId = ITEM_SOLGANIUM_Z,
         .price = 0,
         .holdEffect = HOLD_EFFECT_Z_CRYSTAL,
         .description = sSolganiumZDesc,
@@ -5065,7 +4678,6 @@ const struct Item gItems[] =
     [ITEM_LUNALIUM_Z] =
     {
         .name = _("Lunalium Z"),
-        .itemId = ITEM_LUNALIUM_Z,
         .price = 0,
         .holdEffect = HOLD_EFFECT_Z_CRYSTAL,
         .description = sLunaliumZDesc,
@@ -5078,7 +4690,6 @@ const struct Item gItems[] =
     [ITEM_MARSHADIUM_Z] =
     {
         .name = _("Marshadium Z"),
-        .itemId = ITEM_MARSHADIUM_Z,
         .price = 0,
         .holdEffect = HOLD_EFFECT_Z_CRYSTAL,
         .description = sMarshadiumZDesc,
@@ -5091,7 +4702,6 @@ const struct Item gItems[] =
     [ITEM_ALORAICHIUM_Z] =
     {
         .name = _("Aloraichium Z"),
-        .itemId = ITEM_ALORAICHIUM_Z,
         .price = 0,
         .holdEffect = HOLD_EFFECT_Z_CRYSTAL,
         .description = sAloraichiumZDesc,
@@ -5104,7 +4714,6 @@ const struct Item gItems[] =
     [ITEM_PIKASHUNIUM_Z] =
     {
         .name = _("Pikashunium Z"),
-        .itemId = ITEM_PIKASHUNIUM_Z,
         .price = 0,
         .holdEffect = HOLD_EFFECT_Z_CRYSTAL,
         .description = sPikashuniumZDesc,
@@ -5117,7 +4726,6 @@ const struct Item gItems[] =
     [ITEM_ULTRANECROZIUM_Z] =
     {
         .name = _("U-Necrozium Z"),
-        .itemId = ITEM_ULTRANECROZIUM_Z,
         .price = 0,
         .holdEffect = HOLD_EFFECT_Z_CRYSTAL,
         .description = sUltranecroziumZDesc,
@@ -5132,7 +4740,6 @@ const struct Item gItems[] =
     [ITEM_LIGHT_BALL] =
     {
         .name = _("Light Ball"),
-        .itemId = ITEM_LIGHT_BALL,
         .price = 1000,
         .holdEffect = HOLD_EFFECT_LIGHT_BALL,
         .description = sLightBallDesc,
@@ -5145,7 +4752,6 @@ const struct Item gItems[] =
     [ITEM_LEEK] =
     {
         .name = _("Leek"),
-        .itemId = ITEM_LEEK,
         .price = 1000,
         .holdEffect = HOLD_EFFECT_LEEK,
         .description = sLeekDesc,
@@ -5158,7 +4764,6 @@ const struct Item gItems[] =
     [ITEM_THICK_CLUB] =
     {
         .name = _("Thick Club"),
-        .itemId = ITEM_THICK_CLUB,
         .price = 1000,
         .holdEffect = HOLD_EFFECT_THICK_CLUB,
         .description = sThickClubDesc,
@@ -5171,7 +4776,6 @@ const struct Item gItems[] =
     [ITEM_LUCKY_PUNCH] =
     {
         .name = _("Lucky Punch"),
-        .itemId = ITEM_LUCKY_PUNCH,
         .price = 1000,
         .holdEffect = HOLD_EFFECT_LUCKY_PUNCH,
         .description = sLuckyPunchDesc,
@@ -5184,7 +4788,6 @@ const struct Item gItems[] =
     [ITEM_METAL_POWDER] =
     {
         .name = _("Metal Powder"),
-        .itemId = ITEM_METAL_POWDER,
         .price = 1000,
         .holdEffect = HOLD_EFFECT_METAL_POWDER,
         .description = sMetalPowderDesc,
@@ -5197,7 +4800,6 @@ const struct Item gItems[] =
     [ITEM_QUICK_POWDER] =
     {
         .name = _("Quick Powder"),
-        .itemId = ITEM_QUICK_POWDER,
         .price = 1000,
         .holdEffect = HOLD_EFFECT_QUICK_POWDER,
         .description = sQuickPowderDesc,
@@ -5210,7 +4812,6 @@ const struct Item gItems[] =
     [ITEM_DEEP_SEA_SCALE] =
     {
         .name = _("DeepSeaScale"),
-        .itemId = ITEM_DEEP_SEA_SCALE,
         .price = 2000,
         .holdEffect = HOLD_EFFECT_DEEP_SEA_SCALE,
         .description = sDeepSeaScaleDesc,
@@ -5223,7 +4824,6 @@ const struct Item gItems[] =
     [ITEM_DEEP_SEA_TOOTH] =
     {
         .name = _("DeepSeaTooth"),
-        .itemId = ITEM_DEEP_SEA_TOOTH,
         .price = 2000,
         .holdEffect = HOLD_EFFECT_DEEP_SEA_TOOTH,
         .description = sDeepSeaToothDesc,
@@ -5236,7 +4836,6 @@ const struct Item gItems[] =
     [ITEM_SOUL_DEW] =
     {
         .name = _("Soul Dew"),
-        .itemId = ITEM_SOUL_DEW,
         .price = 0,
         .holdEffect = HOLD_EFFECT_SOUL_DEW,
         #if B_SOUL_DEW_BOOST >= GEN_7
@@ -5254,7 +4853,6 @@ const struct Item gItems[] =
     [ITEM_ADAMANT_ORB] =
     {
         .name = _("Adamant Orb"),
-        .itemId = ITEM_ADAMANT_ORB,
         .price = 0,
         .holdEffect = HOLD_EFFECT_ADAMANT_ORB,
         .holdEffectParam = 20,
@@ -5268,7 +4866,6 @@ const struct Item gItems[] =
     [ITEM_LUSTROUS_ORB] =
     {
         .name = _("Lustrous Orb"),
-        .itemId = ITEM_LUSTROUS_ORB,
         .price = 0,
         .holdEffect = HOLD_EFFECT_LUSTROUS_ORB,
         .holdEffectParam = 20,
@@ -5282,7 +4879,6 @@ const struct Item gItems[] =
     [ITEM_GRISEOUS_ORB] =
     {
         .name = _("Griseous Orb"),
-        .itemId = ITEM_GRISEOUS_ORB,
         .price = 0,
         .holdEffect = HOLD_EFFECT_GRISEOUS_ORB,
         .holdEffectParam = 20,
@@ -5298,7 +4894,6 @@ const struct Item gItems[] =
     [ITEM_SEA_INCENSE] =
     {
         .name = _("Sea Incense"),
-        .itemId = ITEM_SEA_INCENSE,
         .price = 2000,
         .holdEffect = HOLD_EFFECT_WATER_POWER,
         .holdEffectParam = 20,
@@ -5312,7 +4907,6 @@ const struct Item gItems[] =
     [ITEM_LAX_INCENSE] =
     {
         .name = _("Lax Incense"),
-        .itemId = ITEM_LAX_INCENSE,
         .price = 5000,
         .holdEffect = HOLD_EFFECT_EVASION_UP,
         .holdEffectParam = 10,
@@ -5326,7 +4920,6 @@ const struct Item gItems[] =
     [ITEM_ODD_INCENSE] =
     {
         .name = _("Odd Incense"),
-        .itemId = ITEM_ODD_INCENSE,
         .price = 2000,
         .holdEffect = HOLD_EFFECT_PSYCHIC_POWER,
         .holdEffectParam = 20,
@@ -5340,7 +4933,6 @@ const struct Item gItems[] =
     [ITEM_ROCK_INCENSE] =
     {
         .name = _("Rock Incense"),
-        .itemId = ITEM_ROCK_INCENSE,
         .price = 2000,
         .holdEffect = HOLD_EFFECT_ROCK_POWER,
         .holdEffectParam = 20,
@@ -5354,7 +4946,6 @@ const struct Item gItems[] =
     [ITEM_FULL_INCENSE] =
     {
         .name = _("Full Incense"),
-        .itemId = ITEM_FULL_INCENSE,
         .price = 5000,
         .holdEffect = HOLD_EFFECT_LAGGING_TAIL,
         .holdEffectParam = 5,
@@ -5368,7 +4959,6 @@ const struct Item gItems[] =
     [ITEM_WAVE_INCENSE] =
     {
         .name = _("Wave Incense"),
-        .itemId = ITEM_WAVE_INCENSE,
         .price = 2000,
         .holdEffect = HOLD_EFFECT_WATER_POWER,
         .holdEffectParam = 20,
@@ -5382,7 +4972,6 @@ const struct Item gItems[] =
     [ITEM_ROSE_INCENSE] =
     {
         .name = _("Rose Incense"),
-        .itemId = ITEM_ROSE_INCENSE,
         .price = 2000,
         .holdEffect = HOLD_EFFECT_GRASS_POWER,
         .holdEffectParam = 20,
@@ -5396,7 +4985,6 @@ const struct Item gItems[] =
     [ITEM_LUCK_INCENSE] =
     {
         .name = _("Luck Incense"),
-        .itemId = ITEM_LUCK_INCENSE,
         .price = 11000,
         .holdEffect = HOLD_EFFECT_DOUBLE_PRIZE,
         .holdEffectParam = 10,
@@ -5410,7 +4998,6 @@ const struct Item gItems[] =
     [ITEM_PURE_INCENSE] =
     {
         .name = _("Pure Incense"),
-        .itemId = ITEM_PURE_INCENSE,
         .price = 6000,
         .holdEffect = HOLD_EFFECT_REPEL,
         .description = sPureIncenseDesc,
@@ -5425,7 +5012,6 @@ const struct Item gItems[] =
     [ITEM_RED_SCARF] =
     {
         .name = _("Red Scarf"),
-        .itemId = ITEM_RED_SCARF,
         .price = 100,
         .description = sRedScarfDesc,
         .pocket = POCKET_ITEMS,
@@ -5437,7 +5023,6 @@ const struct Item gItems[] =
     [ITEM_BLUE_SCARF] =
     {
         .name = _("Blue Scarf"),
-        .itemId = ITEM_BLUE_SCARF,
         .price = 100,
         .description = sBlueScarfDesc,
         .pocket = POCKET_ITEMS,
@@ -5449,7 +5034,6 @@ const struct Item gItems[] =
     [ITEM_PINK_SCARF] =
     {
         .name = _("Pink Scarf"),
-        .itemId = ITEM_PINK_SCARF,
         .price = 100,
         .description = sPinkScarfDesc,
         .pocket = POCKET_ITEMS,
@@ -5461,7 +5045,6 @@ const struct Item gItems[] =
     [ITEM_GREEN_SCARF] =
     {
         .name = _("Green Scarf"),
-        .itemId = ITEM_GREEN_SCARF,
         .price = 100,
         .description = sGreenScarfDesc,
         .pocket = POCKET_ITEMS,
@@ -5473,7 +5056,6 @@ const struct Item gItems[] =
     [ITEM_YELLOW_SCARF] =
     {
         .name = _("Yellow Scarf"),
-        .itemId = ITEM_YELLOW_SCARF,
         .price = 100,
         .description = sYellowScarfDesc,
         .pocket = POCKET_ITEMS,
@@ -5487,7 +5069,6 @@ const struct Item gItems[] =
     [ITEM_MACHO_BRACE] =
     {
         .name = _("Macho Brace"),
-        .itemId = ITEM_MACHO_BRACE,
         .price = 3000,
         .holdEffect = HOLD_EFFECT_MACHO_BRACE,
         .description = sMachoBraceDesc,
@@ -5500,7 +5081,6 @@ const struct Item gItems[] =
     [ITEM_POWER_WEIGHT] =
     {
         .name = _("Power Weight"),
-        .itemId = ITEM_POWER_WEIGHT,
         .price = 3000,
         .holdEffect = HOLD_EFFECT_POWER_ITEM,
         .holdEffectParam = 8,
@@ -5515,7 +5095,6 @@ const struct Item gItems[] =
     [ITEM_POWER_BRACER] =
     {
         .name = _("Power Bracer"),
-        .itemId = ITEM_POWER_BRACER,
         .price = 3000,
         .holdEffect = HOLD_EFFECT_POWER_ITEM,
         .holdEffectParam = 8,
@@ -5530,7 +5109,6 @@ const struct Item gItems[] =
     [ITEM_POWER_BELT] =
     {
         .name = _("Power Belt"),
-        .itemId = ITEM_POWER_BELT,
         .price = 3000,
         .holdEffect = HOLD_EFFECT_POWER_ITEM,
         .holdEffectParam = 8,
@@ -5545,7 +5123,6 @@ const struct Item gItems[] =
     [ITEM_POWER_LENS] =
     {
         .name = _("Power Lens"),
-        .itemId = ITEM_POWER_LENS,
         .price = 3000,
         .holdEffect = HOLD_EFFECT_POWER_ITEM,
         .holdEffectParam = 8,
@@ -5560,7 +5137,6 @@ const struct Item gItems[] =
     [ITEM_POWER_BAND] =
     {
         .name = _("Power Band"),
-        .itemId = ITEM_POWER_BAND,
         .price = 3000,
         .holdEffect = HOLD_EFFECT_POWER_ITEM,
         .holdEffectParam = 8,
@@ -5575,7 +5151,6 @@ const struct Item gItems[] =
     [ITEM_POWER_ANKLET] =
     {
         .name = _("Power Anklet"),
-        .itemId = ITEM_POWER_ANKLET,
         .price = 3000,
         .holdEffect = HOLD_EFFECT_POWER_ITEM,
         .holdEffectParam = 8,
@@ -5592,7 +5167,6 @@ const struct Item gItems[] =
     [ITEM_SILK_SCARF] =
     {
         .name = _("Silk Scarf"),
-        .itemId = ITEM_SILK_SCARF,
         .price = 1000,
         .holdEffect = HOLD_EFFECT_NORMAL_POWER,
         .holdEffectParam = 20,
@@ -5606,7 +5180,6 @@ const struct Item gItems[] =
     [ITEM_CHARCOAL] =
     {
         .name = _("Charcoal"),
-        .itemId = ITEM_CHARCOAL,
         .price = 1000,
         .holdEffect = HOLD_EFFECT_FIRE_POWER,
         .holdEffectParam = 20,
@@ -5620,7 +5193,6 @@ const struct Item gItems[] =
     [ITEM_MYSTIC_WATER] =
     {
         .name = _("Mystic Water"),
-        .itemId = ITEM_MYSTIC_WATER,
         .price = 1000,
         .holdEffect = HOLD_EFFECT_WATER_POWER,
         .holdEffectParam = 20,
@@ -5634,7 +5206,6 @@ const struct Item gItems[] =
     [ITEM_MAGNET] =
     {
         .name = _("Magnet"),
-        .itemId = ITEM_MAGNET,
         .price = 1000,
         .holdEffect = HOLD_EFFECT_ELECTRIC_POWER,
         .holdEffectParam = 20,
@@ -5648,7 +5219,6 @@ const struct Item gItems[] =
     [ITEM_MIRACLE_SEED] =
     {
         .name = _("Miracle Seed"),
-        .itemId = ITEM_MIRACLE_SEED,
         .price = 1000,
         .holdEffect = HOLD_EFFECT_GRASS_POWER,
         .holdEffectParam = 20,
@@ -5662,7 +5232,6 @@ const struct Item gItems[] =
     [ITEM_NEVER_MELT_ICE] =
     {
         .name = _("Never-MeltIce"),
-        .itemId = ITEM_NEVER_MELT_ICE,
         .price = 1000,
         .holdEffect = HOLD_EFFECT_ICE_POWER,
         .holdEffectParam = 20,
@@ -5676,7 +5245,6 @@ const struct Item gItems[] =
     [ITEM_BLACK_BELT] =
     {
         .name = _("Black Belt"),
-        .itemId = ITEM_BLACK_BELT,
         .price = 1000,
         .holdEffect = HOLD_EFFECT_FIGHTING_POWER,
         .holdEffectParam = 20,
@@ -5690,7 +5258,6 @@ const struct Item gItems[] =
     [ITEM_POISON_BARB] =
     {
         .name = _("Poison Barb"),
-        .itemId = ITEM_POISON_BARB,
         .price = 1000,
         .holdEffect = HOLD_EFFECT_POISON_POWER,
         .holdEffectParam = 20,
@@ -5704,7 +5271,6 @@ const struct Item gItems[] =
     [ITEM_SOFT_SAND] =
     {
         .name = _("Soft Sand"),
-        .itemId = ITEM_SOFT_SAND,
         .price = 1000,
         .holdEffect = HOLD_EFFECT_GROUND_POWER,
         .holdEffectParam = 20,
@@ -5718,7 +5284,6 @@ const struct Item gItems[] =
     [ITEM_SHARP_BEAK] =
     {
         .name = _("Sharp Beak"),
-        .itemId = ITEM_SHARP_BEAK,
         .price = 1000,
         .holdEffect = HOLD_EFFECT_FLYING_POWER,
         .holdEffectParam = 20,
@@ -5732,7 +5297,6 @@ const struct Item gItems[] =
     [ITEM_TWISTED_SPOON] =
     {
         .name = _("Twisted Spoon"),
-        .itemId = ITEM_TWISTED_SPOON,
         .price = 1000,
         .holdEffect = HOLD_EFFECT_PSYCHIC_POWER,
         .holdEffectParam = 20,
@@ -5746,7 +5310,6 @@ const struct Item gItems[] =
     [ITEM_SILVER_POWDER] =
     {
         .name = _("Silver Powder"),
-        .itemId = ITEM_SILVER_POWDER,
         .price = 1000,
         .holdEffect = HOLD_EFFECT_BUG_POWER,
         .holdEffectParam = 20,
@@ -5760,7 +5323,6 @@ const struct Item gItems[] =
     [ITEM_HARD_STONE] =
     {
         .name = _("Hard Stone"),
-        .itemId = ITEM_HARD_STONE,
         .price = 1000,
         .holdEffect = HOLD_EFFECT_ROCK_POWER,
         .holdEffectParam = 20,
@@ -5774,7 +5336,6 @@ const struct Item gItems[] =
     [ITEM_SPELL_TAG] =
     {
         .name = _("Spell Tag"),
-        .itemId = ITEM_SPELL_TAG,
         .price = 1000,
         .holdEffect = HOLD_EFFECT_GHOST_POWER,
         .holdEffectParam = 20,
@@ -5788,7 +5349,6 @@ const struct Item gItems[] =
     [ITEM_DRAGON_FANG] =
     {
         .name = _("Dragon Fang"),
-        .itemId = ITEM_DRAGON_FANG,
         .price = 1000,
         .holdEffect = HOLD_EFFECT_DRAGON_POWER,
         .holdEffectParam = 20,
@@ -5802,7 +5362,6 @@ const struct Item gItems[] =
     [ITEM_BLACK_GLASSES] =
     {
         .name = _("Black Glasses"),
-        .itemId = ITEM_BLACK_GLASSES,
         .price = 1000,
         .holdEffect = HOLD_EFFECT_DARK_POWER,
         .holdEffectParam = 20,
@@ -5816,7 +5375,6 @@ const struct Item gItems[] =
     [ITEM_METAL_COAT] =
     {
         .name = _("Metal Coat"),
-        .itemId = ITEM_METAL_COAT,
         .price = 2000,
         .holdEffect = HOLD_EFFECT_STEEL_POWER,
         .holdEffectParam = 20,
@@ -5832,7 +5390,6 @@ const struct Item gItems[] =
     [ITEM_CHOICE_BAND] =
     {
         .name = _("Choice Band"),
-        .itemId = ITEM_CHOICE_BAND,
         .price = 4000,
         .holdEffect = HOLD_EFFECT_CHOICE_BAND,
         .description = sChoiceBandDesc,
@@ -5845,7 +5402,6 @@ const struct Item gItems[] =
     [ITEM_CHOICE_SPECS] =
     {
         .name = _("Choice Specs"),
-        .itemId = ITEM_CHOICE_SPECS,
         .price = 4000,
         .holdEffect = HOLD_EFFECT_CHOICE_SPECS,
         .description = sChoiceSpecsDesc,
@@ -5858,7 +5414,6 @@ const struct Item gItems[] =
     [ITEM_CHOICE_SCARF] =
     {
         .name = _("Choice Scarf"),
-        .itemId = ITEM_CHOICE_SCARF,
         .price = 4000,
         .holdEffect = HOLD_EFFECT_CHOICE_SCARF,
         .description = sChoiceScarfDesc,
@@ -5873,7 +5428,6 @@ const struct Item gItems[] =
     [ITEM_FLAME_ORB] =
     {
         .name = _("Flame Orb"),
-        .itemId = ITEM_FLAME_ORB,
         .price = 4000,
         .holdEffect = HOLD_EFFECT_FLAME_ORB,
         .description = sFlameOrbDesc,
@@ -5886,7 +5440,6 @@ const struct Item gItems[] =
     [ITEM_TOXIC_ORB] =
     {
         .name = _("Toxic Orb"),
-        .itemId = ITEM_TOXIC_ORB,
         .price = 4000,
         .holdEffect = HOLD_EFFECT_TOXIC_ORB,
         .description = sToxicOrbDesc,
@@ -5901,7 +5454,6 @@ const struct Item gItems[] =
     [ITEM_DAMP_ROCK] =
     {
         .name = _("Damp Rock"),
-        .itemId = ITEM_DAMP_ROCK,
         .price = 4000,
         .holdEffect = HOLD_EFFECT_DAMP_ROCK,
         .description = sDampRockDesc,
@@ -5914,7 +5466,6 @@ const struct Item gItems[] =
     [ITEM_HEAT_ROCK] =
     {
         .name = _("Heat Rock"),
-        .itemId = ITEM_HEAT_ROCK,
         .price = 4000,
         .holdEffect = HOLD_EFFECT_HEAT_ROCK,
         .description = sHeatRockDesc,
@@ -5927,7 +5478,6 @@ const struct Item gItems[] =
     [ITEM_SMOOTH_ROCK] =
     {
         .name = _("Smooth Rock"),
-        .itemId = ITEM_SMOOTH_ROCK,
         .price = 4000,
         .holdEffect = HOLD_EFFECT_SMOOTH_ROCK,
         .description = sSmoothRockDesc,
@@ -5940,7 +5490,6 @@ const struct Item gItems[] =
     [ITEM_ICY_ROCK] =
     {
         .name = _("Icy Rock"),
-        .itemId = ITEM_ICY_ROCK,
         .price = 4000,
         .holdEffect = HOLD_EFFECT_ICY_ROCK,
         .description = sIcyRockDesc,
@@ -5955,7 +5504,6 @@ const struct Item gItems[] =
     [ITEM_ELECTRIC_SEED] =
     {
         .name = _("Electric Seed"),
-        .itemId = ITEM_ELECTRIC_SEED,
         .price = 4000,
         .holdEffect = HOLD_EFFECT_SEEDS,
         .holdEffectParam = HOLD_EFFECT_PARAM_ELECTRIC_TERRAIN,
@@ -5969,7 +5517,6 @@ const struct Item gItems[] =
     [ITEM_PSYCHIC_SEED] =
     {
         .name = _("Psychic Seed"),
-        .itemId = ITEM_PSYCHIC_SEED,
         .price = 4000,
         .holdEffect = HOLD_EFFECT_SEEDS,
         .holdEffectParam = HOLD_EFFECT_PARAM_PSYCHIC_TERRAIN,
@@ -5983,7 +5530,6 @@ const struct Item gItems[] =
     [ITEM_MISTY_SEED] =
     {
         .name = _("Misty Seed"),
-        .itemId = ITEM_MISTY_SEED,
         .price = 4000,
         .holdEffect = HOLD_EFFECT_SEEDS,
         .holdEffectParam = HOLD_EFFECT_PARAM_MISTY_TERRAIN,
@@ -5997,7 +5543,6 @@ const struct Item gItems[] =
     [ITEM_GRASSY_SEED] =
     {
         .name = _("Grassy Seed"),
-        .itemId = ITEM_GRASSY_SEED,
         .price = 4000,
         .holdEffect = HOLD_EFFECT_SEEDS,
         .holdEffectParam = HOLD_EFFECT_PARAM_GRASSY_TERRAIN,
@@ -6013,7 +5558,6 @@ const struct Item gItems[] =
     [ITEM_ABSORB_BULB] =
     {
         .name = _("Absorb Bulb"),
-        .itemId = ITEM_ABSORB_BULB,
         .price = 4000,
         .holdEffect = HOLD_EFFECT_ABSORB_BULB,
         .holdEffectParam = 0,
@@ -6027,7 +5571,6 @@ const struct Item gItems[] =
     [ITEM_CELL_BATTERY] =
     {
         .name = _("Cell Battery"),
-        .itemId = ITEM_CELL_BATTERY,
         .price = 4000,
         .holdEffect = HOLD_EFFECT_CELL_BATTERY,
         .holdEffectParam = 0,
@@ -6041,7 +5584,6 @@ const struct Item gItems[] =
     [ITEM_LUMINOUS_MOSS] =
     {
         .name = _("Luminous Moss"),
-        .itemId = ITEM_LUMINOUS_MOSS,
         .price = 4000,
         .holdEffect = HOLD_EFFECT_LUMINOUS_MOSS,
         .holdEffectParam = 0,
@@ -6055,7 +5597,6 @@ const struct Item gItems[] =
     [ITEM_SNOWBALL] =
     {
         .name = _("Snowball"),
-        .itemId = ITEM_SNOWBALL,
         .price = 4000,
         .holdEffect = HOLD_EFFECT_SNOWBALL,
         .holdEffectParam = 0,
@@ -6071,7 +5612,6 @@ const struct Item gItems[] =
     [ITEM_BRIGHT_POWDER] =
     {
         .name = _("Bright Powder"),
-        .itemId = ITEM_BRIGHT_POWDER,
         .price = 4000,
         .holdEffect = HOLD_EFFECT_EVASION_UP,
         .holdEffectParam = 10,
@@ -6085,7 +5625,6 @@ const struct Item gItems[] =
     [ITEM_WHITE_HERB] =
     {
         .name = _("White Herb"),
-        .itemId = ITEM_WHITE_HERB,
         .price = 4000,
         .holdEffect = HOLD_EFFECT_RESTORE_STATS,
         .description = sWhiteHerbDesc,
@@ -6098,7 +5637,6 @@ const struct Item gItems[] =
     [ITEM_EXP_SHARE] =
     {
         .name = _("Exp. Share"),
-        .itemId = ITEM_EXP_SHARE,
         .price = 3000,
         .holdEffect = HOLD_EFFECT_EXP_SHARE,
         .description = sExpShareDesc,
@@ -6111,7 +5649,6 @@ const struct Item gItems[] =
     [ITEM_QUICK_CLAW] =
     {
         .name = _("Quick Claw"),
-        .itemId = ITEM_QUICK_CLAW,
         .price = 4000,
         .holdEffect = HOLD_EFFECT_QUICK_CLAW,
         .holdEffectParam = 20,
@@ -6125,7 +5662,6 @@ const struct Item gItems[] =
     [ITEM_SOOTHE_BELL] =
     {
         .name = _("Soothe Bell"),
-        .itemId = ITEM_SOOTHE_BELL,
         .price = 4000,
         .holdEffect = HOLD_EFFECT_FRIENDSHIP_UP,
         .description = sSootheBellDesc,
@@ -6138,7 +5674,6 @@ const struct Item gItems[] =
     [ITEM_MENTAL_HERB] =
     {
         .name = _("Mental Herb"),
-        .itemId = ITEM_MENTAL_HERB,
         .price = 4000,
         .holdEffect = HOLD_EFFECT_MENTAL_HERB,
         .description = sMentalHerbDesc,
@@ -6151,7 +5686,6 @@ const struct Item gItems[] =
     [ITEM_KINGS_ROCK] =
     {
         .name = _("King's Rock"),
-        .itemId = ITEM_KINGS_ROCK,
         .price = 5000,
         .holdEffect = HOLD_EFFECT_FLINCH,
         .holdEffectParam = 10,
@@ -6165,7 +5699,6 @@ const struct Item gItems[] =
     [ITEM_AMULET_COIN] =
     {
         .name = _("Amulet Coin"),
-        .itemId = ITEM_AMULET_COIN,
         .price = 10000,
         .holdEffect = HOLD_EFFECT_DOUBLE_PRIZE,
         .holdEffectParam = 10,
@@ -6179,7 +5712,6 @@ const struct Item gItems[] =
     [ITEM_CLEANSE_TAG] =
     {
         .name = _("Cleanse Tag"),
-        .itemId = ITEM_CLEANSE_TAG,
         .price = 5000,
         .holdEffect = HOLD_EFFECT_REPEL,
         .description = sCleanseTagDesc,
@@ -6192,7 +5724,6 @@ const struct Item gItems[] =
     [ITEM_SMOKE_BALL] =
     {
         .name = _("Smoke Ball"),
-        .itemId = ITEM_SMOKE_BALL,
         .price = 4000,
         .holdEffect = HOLD_EFFECT_CAN_ALWAYS_RUN,
         .description = sSmokeBallDesc,
@@ -6205,7 +5736,6 @@ const struct Item gItems[] =
     [ITEM_FOCUS_BAND] =
     {
         .name = _("Focus Band"),
-        .itemId = ITEM_FOCUS_BAND,
         .price = 4000,
         .holdEffect = HOLD_EFFECT_FOCUS_BAND,
         .holdEffectParam = 10,
@@ -6219,7 +5749,6 @@ const struct Item gItems[] =
     [ITEM_LUCKY_EGG] =
     {
         .name = _("Lucky Egg"),
-        .itemId = ITEM_LUCKY_EGG,
         .price = 10000,
         .holdEffect = HOLD_EFFECT_LUCKY_EGG,
         .description = sLuckyEggDesc,
@@ -6232,7 +5761,6 @@ const struct Item gItems[] =
     [ITEM_SCOPE_LENS] =
     {
         .name = _("Scope Lens"),
-        .itemId = ITEM_SCOPE_LENS,
         .price = 4000,
         .holdEffect = HOLD_EFFECT_SCOPE_LENS,
         .description = sScopeLensDesc,
@@ -6245,7 +5773,6 @@ const struct Item gItems[] =
     [ITEM_LEFTOVERS] =
     {
         .name = _("Leftovers"),
-        .itemId = ITEM_LEFTOVERS,
         .price = 4000,
         .holdEffect = HOLD_EFFECT_LEFTOVERS,
         .holdEffectParam = 10,
@@ -6259,7 +5786,6 @@ const struct Item gItems[] =
     [ITEM_SHELL_BELL] =
     {
         .name = _("Shell Bell"),
-        .itemId = ITEM_SHELL_BELL,
         .price = 4000,
         .holdEffect = HOLD_EFFECT_SHELL_BELL,
         .holdEffectParam = 8,
@@ -6273,7 +5799,6 @@ const struct Item gItems[] =
     [ITEM_WIDE_LENS] =
     {
         .name = _("Wide Lens"),
-        .itemId = ITEM_WIDE_LENS,
         .price = 4000,
         .holdEffect = HOLD_EFFECT_WIDE_LENS,
         .holdEffectParam = 10,
@@ -6287,7 +5812,6 @@ const struct Item gItems[] =
     [ITEM_MUSCLE_BAND] =
     {
         .name = _("Muscle Band"),
-        .itemId = ITEM_MUSCLE_BAND,
         .price = 4000,
         .holdEffect = HOLD_EFFECT_MUSCLE_BAND,
         .holdEffectParam = 10,
@@ -6301,7 +5825,6 @@ const struct Item gItems[] =
     [ITEM_WISE_GLASSES] =
     {
         .name = _("Wise Glasses"),
-        .itemId = ITEM_WISE_GLASSES,
         .price = 4000,
         .holdEffect = HOLD_EFFECT_WISE_GLASSES,
         .holdEffectParam = 10,
@@ -6315,7 +5838,6 @@ const struct Item gItems[] =
     [ITEM_EXPERT_BELT] =
     {
         .name = _("Expert Belt"),
-        .itemId = ITEM_EXPERT_BELT,
         .price = 4000,
         .holdEffect = HOLD_EFFECT_EXPERT_BELT,
         .holdEffectParam = 20,
@@ -6329,7 +5851,6 @@ const struct Item gItems[] =
     [ITEM_LIGHT_CLAY] =
     {
         .name = _("Light Clay"),
-        .itemId = ITEM_LIGHT_CLAY,
         .price = 4000,
         .holdEffect = HOLD_EFFECT_LIGHT_CLAY,
         .description = sLightClayDesc,
@@ -6342,7 +5863,6 @@ const struct Item gItems[] =
     [ITEM_LIFE_ORB] =
     {
         .name = _("Life Orb"),
-        .itemId = ITEM_LIFE_ORB,
         .price = 4000,
         .holdEffect = HOLD_EFFECT_LIFE_ORB,
         .description = sLifeOrbDesc,
@@ -6355,7 +5875,6 @@ const struct Item gItems[] =
     [ITEM_POWER_HERB] =
     {
         .name = _("Power Herb"),
-        .itemId = ITEM_POWER_HERB,
         .price = 4000,
         .holdEffect = HOLD_EFFECT_POWER_HERB,
         .description = sPowerHerbDesc,
@@ -6368,7 +5887,6 @@ const struct Item gItems[] =
     [ITEM_FOCUS_SASH] =
     {
         .name = _("Focus Sash"),
-        .itemId = ITEM_FOCUS_SASH,
         .price = 4000,
         .holdEffect = HOLD_EFFECT_FOCUS_SASH,
         .description = sFocusSashDesc,
@@ -6381,7 +5899,6 @@ const struct Item gItems[] =
     [ITEM_ZOOM_LENS] =
     {
         .name = _("Zoom Lens"),
-        .itemId = ITEM_ZOOM_LENS,
         .price = 4000,
         .holdEffect = HOLD_EFFECT_ZOOM_LENS,
         .holdEffectParam = 20,
@@ -6395,7 +5912,6 @@ const struct Item gItems[] =
     [ITEM_METRONOME] =
     {
         .name = _("Metronome"),
-        .itemId = ITEM_METRONOME,
         .price = 4000,
         .holdEffect = HOLD_EFFECT_METRONOME,
         .holdEffectParam = 20,
@@ -6409,7 +5925,6 @@ const struct Item gItems[] =
     [ITEM_IRON_BALL] =
     {
         .name = _("Iron Ball"),
-        .itemId = ITEM_IRON_BALL,
         .price = 4000,
         .holdEffect = HOLD_EFFECT_IRON_BALL,
         .description = sIronBallDesc,
@@ -6422,7 +5937,6 @@ const struct Item gItems[] =
     [ITEM_LAGGING_TAIL] =
     {
         .name = _("Lagging Tail"),
-        .itemId = ITEM_LAGGING_TAIL,
         .price = 4000,
         .holdEffect = HOLD_EFFECT_LAGGING_TAIL,
         .description = sLaggingTailDesc,
@@ -6435,7 +5949,6 @@ const struct Item gItems[] =
     [ITEM_DESTINY_KNOT] =
     {
         .name = _("Destiny Knot"),
-        .itemId = ITEM_DESTINY_KNOT,
         .price = 4000,
         .holdEffect = HOLD_EFFECT_DESTINY_KNOT,
         .description = sDestinyKnotDesc,
@@ -6448,7 +5961,6 @@ const struct Item gItems[] =
     [ITEM_BLACK_SLUDGE] =
     {
         .name = _("Black Sludge"),
-        .itemId = ITEM_BLACK_SLUDGE,
         .price = 4000,
         .holdEffect = HOLD_EFFECT_BLACK_SLUDGE,
         .description = sBlackSludgeDesc,
@@ -6461,7 +5973,6 @@ const struct Item gItems[] =
     [ITEM_GRIP_CLAW] =
     {
         .name = _("Grip Claw"),
-        .itemId = ITEM_GRIP_CLAW,
         .price = 4000,
         .holdEffect = HOLD_EFFECT_GRIP_CLAW,
         .description = sGripClawDesc,
@@ -6474,7 +5985,6 @@ const struct Item gItems[] =
     [ITEM_STICKY_BARB] =
     {
         .name = _("Sticky Barb"),
-        .itemId = ITEM_STICKY_BARB,
         .price = 4000,
         .holdEffect = HOLD_EFFECT_STICKY_BARB,
         .description = sStickyBarbDesc,
@@ -6487,7 +5997,6 @@ const struct Item gItems[] =
     [ITEM_SHED_SHELL] =
     {
         .name = _("Shed Shell"),
-        .itemId = ITEM_SHED_SHELL,
         .price = 4000,
         .holdEffect = HOLD_EFFECT_SHED_SHELL,
         .description = sShedShellDesc,
@@ -6500,7 +6009,6 @@ const struct Item gItems[] =
     [ITEM_BIG_ROOT] =
     {
         .name = _("Big Root"),
-        .itemId = ITEM_BIG_ROOT,
         .price = 4000,
         .holdEffect = HOLD_EFFECT_BIG_ROOT,
         .holdEffectParam = 30,
@@ -6514,7 +6022,6 @@ const struct Item gItems[] =
     [ITEM_RAZOR_CLAW] =
     {
         .name = _("Razor Claw"),
-        .itemId = ITEM_RAZOR_CLAW,
         .price = 5000,
         .holdEffect = HOLD_EFFECT_SCOPE_LENS,
         .description = sRazorClawDesc,
@@ -6527,7 +6034,6 @@ const struct Item gItems[] =
     [ITEM_RAZOR_FANG] =
     {
         .name = _("Razor Fang"),
-        .itemId = ITEM_RAZOR_FANG,
         .price = 5000,
         .holdEffect = HOLD_EFFECT_FLINCH,
         .holdEffectParam = 10,
@@ -6541,7 +6047,6 @@ const struct Item gItems[] =
     [ITEM_EVIOLITE] =
     {
         .name = _("Eviolite"),
-        .itemId = ITEM_EVIOLITE,
         .price = 4000,
         .holdEffect = HOLD_EFFECT_EVIOLITE,
         .holdEffectParam = 50,
@@ -6555,7 +6060,6 @@ const struct Item gItems[] =
     [ITEM_FLOAT_STONE] =
     {
         .name = _("Float Stone"),
-        .itemId = ITEM_FLOAT_STONE,
         .price = 4000,
         .holdEffect = HOLD_EFFECT_FLOAT_STONE,
         .description = sFloatStoneDesc,
@@ -6568,7 +6072,6 @@ const struct Item gItems[] =
     [ITEM_ROCKY_HELMET] =
     {
         .name = _("Rocky Helmet"),
-        .itemId = ITEM_ROCKY_HELMET,
         .price = 4000,
         .holdEffect = HOLD_EFFECT_ROCKY_HELMET,
         .holdEffectParam = 0,
@@ -6582,7 +6085,6 @@ const struct Item gItems[] =
     [ITEM_AIR_BALLOON] =
     {
         .name = _("Air Balloon"),
-        .itemId = ITEM_AIR_BALLOON,
         .price = 4000,
         .holdEffect = HOLD_EFFECT_AIR_BALLOON,
         .holdEffectParam = 0,
@@ -6596,7 +6098,6 @@ const struct Item gItems[] =
     [ITEM_RED_CARD] =
     {
         .name = _("Red Card"),
-        .itemId = ITEM_RED_CARD,
         .price = 4000,
         .holdEffect = HOLD_EFFECT_RED_CARD,
         .holdEffectParam = 0,
@@ -6610,7 +6111,6 @@ const struct Item gItems[] =
     [ITEM_RING_TARGET] =
     {
         .name = _("Ring Target"),
-        .itemId = ITEM_RING_TARGET,
         .price = 4000,
         .holdEffect = HOLD_EFFECT_RING_TARGET,
         .holdEffectParam = 0,
@@ -6624,7 +6124,6 @@ const struct Item gItems[] =
     [ITEM_BINDING_BAND] =
     {
         .name = _("Binding Band"),
-        .itemId = ITEM_BINDING_BAND,
         .price = 4000,
         .holdEffect = HOLD_EFFECT_BINDING_BAND,
         .description = sBindingBandDesc,
@@ -6637,7 +6136,6 @@ const struct Item gItems[] =
     [ITEM_EJECT_BUTTON] =
     {
         .name = _("Eject Button"),
-        .itemId = ITEM_EJECT_BUTTON,
         .price = 4000,
         .holdEffect = HOLD_EFFECT_EJECT_BUTTON,
         .holdEffectParam = 0,
@@ -6651,7 +6149,6 @@ const struct Item gItems[] =
     [ITEM_WEAKNESS_POLICY] =
     {
         .name = _("WeaknssPolicy"),
-        .itemId = ITEM_WEAKNESS_POLICY,
         .price = 1000,
         .holdEffect = HOLD_EFFECT_WEAKNESS_POLICY,
         .holdEffectParam = 0,
@@ -6665,7 +6162,6 @@ const struct Item gItems[] =
     [ITEM_ASSAULT_VEST] =
     {
         .name = _("Assault Vest"),
-        .itemId = ITEM_ASSAULT_VEST,
         .price = 1000,
         .holdEffect = HOLD_EFFECT_ASSAULT_VEST,
         .holdEffectParam = 50,
@@ -6679,7 +6175,6 @@ const struct Item gItems[] =
     [ITEM_SAFETY_GOGGLES] =
     {
         .name = _("SafetyGoggles"),
-        .itemId = ITEM_SAFETY_GOGGLES,
         .price = 4000,
         .holdEffect = HOLD_EFFECT_SAFETY_GOGGLES,
         .description = sSafetyGogglesDesc,
@@ -6692,7 +6187,6 @@ const struct Item gItems[] =
     [ITEM_ADRENALINE_ORB] =
     {
         .name = _("AdrenalineOrb"),
-        .itemId = ITEM_ADRENALINE_ORB,
         .price = 300,
         .holdEffect = HOLD_EFFECT_ADRENALINE_ORB,
         .description = sAdrenalineOrbDesc,
@@ -6705,7 +6199,6 @@ const struct Item gItems[] =
     [ITEM_TERRAIN_EXTENDER] =
     {
         .name = _("TerainExtendr"),
-        .itemId = ITEM_TERRAIN_EXTENDER,
         .price = 4000,
         .holdEffect = HOLD_EFFECT_TERRAIN_EXTENDER,
         .description = sTerrainExtenderDesc,
@@ -6718,7 +6211,6 @@ const struct Item gItems[] =
     [ITEM_PROTECTIVE_PADS] =
     {
         .name = _("ProtectvePads"),
-        .itemId = ITEM_PROTECTIVE_PADS,
         .price = 4000,
         .holdEffect = HOLD_EFFECT_PROTECTIVE_PADS,
         .description = sProtectivePadsDesc,
@@ -6731,7 +6223,6 @@ const struct Item gItems[] =
     [ITEM_THROAT_SPRAY] =
     {
         .name = _("Throat Spray"),
-        .itemId = ITEM_THROAT_SPRAY,
         .price = 4000,
         .holdEffect = HOLD_EFFECT_THROAT_SPRAY,
         .description = sThroatSprayDesc,
@@ -6744,7 +6235,6 @@ const struct Item gItems[] =
     [ITEM_EJECT_PACK] =
     {
         .name = _("Eject Pack"),
-        .itemId = ITEM_EJECT_PACK,
         .price = 4000,
         .holdEffect = HOLD_EFFECT_EJECT_PACK,
         .description = sEjectPackDesc,
@@ -6757,7 +6247,6 @@ const struct Item gItems[] =
     [ITEM_HEAVY_DUTY_BOOTS] =
     {
         .name = _("Heavy-DtyBts"),
-        .itemId = ITEM_HEAVY_DUTY_BOOTS,
         .price = 4000,
         .holdEffect = HOLD_EFFECT_HEAVY_DUTY_BOOTS,
         .description = sHeavyDutyBootsDesc,
@@ -6770,7 +6259,6 @@ const struct Item gItems[] =
     [ITEM_BLUNDER_POLICY] =
     {
         .name = _("BlundrPolicy"),
-        .itemId = ITEM_BLUNDER_POLICY,
         .price = 4000,
         .holdEffect = HOLD_EFFECT_BLUNDER_POLICY,
         .description = sBlunderPolicyDesc,
@@ -6783,7 +6271,6 @@ const struct Item gItems[] =
     [ITEM_ROOM_SERVICE] =
     {
         .name = _("Room Service"),
-        .itemId = ITEM_ROOM_SERVICE,
         .price = 4000,
         .holdEffect = HOLD_EFFECT_ROOM_SERVICE,
         .description = sRoomServiceDesc,
@@ -6796,7 +6283,6 @@ const struct Item gItems[] =
     [ITEM_UTILITY_UMBRELLA] =
     {
         .name = _("UtltyUmbrlla"),
-        .itemId = ITEM_UTILITY_UMBRELLA,
         .price = 4000,
         .holdEffect = HOLD_EFFECT_UTILITY_UMBRELLA,
         .description = sUtilityUmbrellaDesc,
@@ -6811,7 +6297,6 @@ const struct Item gItems[] =
     [ITEM_CHERI_BERRY] =
     {
         .name = _("Cheri Berry"),
-        .itemId = ITEM_CHERI_BERRY,
         .price = 20,
         .holdEffect = HOLD_EFFECT_CURE_PAR,
         .description = sCheriBerryDesc,
@@ -6825,7 +6310,6 @@ const struct Item gItems[] =
     [ITEM_CHESTO_BERRY] =
     {
         .name = _("Chesto Berry"),
-        .itemId = ITEM_CHESTO_BERRY,
         .price = 20,
         .holdEffect = HOLD_EFFECT_CURE_SLP,
         .description = sChestoBerryDesc,
@@ -6839,7 +6323,6 @@ const struct Item gItems[] =
     [ITEM_PECHA_BERRY] =
     {
         .name = _("Pecha Berry"),
-        .itemId = ITEM_PECHA_BERRY,
         .price = 20,
         .holdEffect = HOLD_EFFECT_CURE_PSN,
         .description = sPechaBerryDesc,
@@ -6853,7 +6336,6 @@ const struct Item gItems[] =
     [ITEM_RAWST_BERRY] =
     {
         .name = _("Rawst Berry"),
-        .itemId = ITEM_RAWST_BERRY,
         .price = 20,
         .holdEffect = HOLD_EFFECT_CURE_BRN,
         .description = sRawstBerryDesc,
@@ -6867,7 +6349,6 @@ const struct Item gItems[] =
     [ITEM_ASPEAR_BERRY] =
     {
         .name = _("Aspear Berry"),
-        .itemId = ITEM_ASPEAR_BERRY,
         .price = 20,
         .holdEffect = HOLD_EFFECT_CURE_FRZ,
         .description = sAspearBerryDesc,
@@ -6881,7 +6362,6 @@ const struct Item gItems[] =
     [ITEM_LEPPA_BERRY] =
     {
         .name = _("Leppa Berry"),
-        .itemId = ITEM_LEPPA_BERRY,
         .price = 20,
         .holdEffect = HOLD_EFFECT_RESTORE_PP,
         .holdEffectParam = 10,
@@ -6896,7 +6376,6 @@ const struct Item gItems[] =
     [ITEM_ORAN_BERRY] =
     {
         .name = _("Oran Berry"),
-        .itemId = ITEM_ORAN_BERRY,
         .price = 20,
         .holdEffect = HOLD_EFFECT_RESTORE_HP,
         .holdEffectParam = 10,
@@ -6911,7 +6390,6 @@ const struct Item gItems[] =
     [ITEM_PERSIM_BERRY] =
     {
         .name = _("Persim Berry"),
-        .itemId = ITEM_PERSIM_BERRY,
         .price = 20,
         .holdEffect = HOLD_EFFECT_CURE_CONFUSION,
         .description = sPersimBerryDesc,
@@ -6925,7 +6403,6 @@ const struct Item gItems[] =
     [ITEM_LUM_BERRY] =
     {
         .name = _("Lum Berry"),
-        .itemId = ITEM_LUM_BERRY,
         .price = 20,
         .holdEffect = HOLD_EFFECT_CURE_STATUS,
         .description = sLumBerryDesc,
@@ -6939,7 +6416,6 @@ const struct Item gItems[] =
     [ITEM_SITRUS_BERRY] =
     {
         .name = _("Sitrus Berry"),
-        .itemId = ITEM_SITRUS_BERRY,
         .price = 20,
         #if I_SITRUS_BERRY_HEAL >= GEN_4
             .holdEffect = HOLD_EFFECT_RESTORE_PCT_HP,
@@ -6967,7 +6443,6 @@ const struct Item gItems[] =
     [ITEM_FIGY_BERRY] =
     {
         .name = _("Figy Berry"),
-        .itemId = ITEM_FIGY_BERRY,
         .price = 20,
         .holdEffect = HOLD_EFFECT_CONFUSE_SPICY,
         .holdEffectParam = CONFUSE_BERRY_HEAL_FRACTION,
@@ -6981,7 +6456,6 @@ const struct Item gItems[] =
     [ITEM_WIKI_BERRY] =
     {
         .name = _("Wiki Berry"),
-        .itemId = ITEM_WIKI_BERRY,
         .price = 20,
         .holdEffect = HOLD_EFFECT_CONFUSE_DRY,
         .holdEffectParam = CONFUSE_BERRY_HEAL_FRACTION,
@@ -6995,7 +6469,6 @@ const struct Item gItems[] =
     [ITEM_MAGO_BERRY] =
     {
         .name = _("Mago Berry"),
-        .itemId = ITEM_MAGO_BERRY,
         .price = 20,
         .holdEffect = HOLD_EFFECT_CONFUSE_SWEET,
         .holdEffectParam = CONFUSE_BERRY_HEAL_FRACTION,
@@ -7009,7 +6482,6 @@ const struct Item gItems[] =
     [ITEM_AGUAV_BERRY] =
     {
         .name = _("Aguav Berry"),
-        .itemId = ITEM_AGUAV_BERRY,
         .price = 20,
         .holdEffect = HOLD_EFFECT_CONFUSE_BITTER,
         .holdEffectParam = CONFUSE_BERRY_HEAL_FRACTION,
@@ -7023,7 +6495,6 @@ const struct Item gItems[] =
     [ITEM_IAPAPA_BERRY] =
     {
         .name = _("Iapapa Berry"),
-        .itemId = ITEM_IAPAPA_BERRY,
         .price = 20,
         .holdEffect = HOLD_EFFECT_CONFUSE_SOUR,
         .holdEffectParam = CONFUSE_BERRY_HEAL_FRACTION,
@@ -7039,7 +6510,6 @@ const struct Item gItems[] =
     [ITEM_RAZZ_BERRY] =
     {
         .name = _("Razz Berry"),
-        .itemId = ITEM_RAZZ_BERRY,
         .price = 20,
         .description = sRazzBerryDesc,
         .pocket = POCKET_BERRIES,
@@ -7051,7 +6521,6 @@ const struct Item gItems[] =
     [ITEM_BLUK_BERRY] =
     {
         .name = _("Bluk Berry"),
-        .itemId = ITEM_BLUK_BERRY,
         .price = 20,
         .description = sBlukBerryDesc,
         .pocket = POCKET_BERRIES,
@@ -7063,7 +6532,6 @@ const struct Item gItems[] =
     [ITEM_NANAB_BERRY] =
     {
         .name = _("Nanab Berry"),
-        .itemId = ITEM_NANAB_BERRY,
         .price = 20,
         .description = sNanabBerryDesc,
         .pocket = POCKET_BERRIES,
@@ -7075,7 +6543,6 @@ const struct Item gItems[] =
     [ITEM_WEPEAR_BERRY] =
     {
         .name = _("Wepear Berry"),
-        .itemId = ITEM_WEPEAR_BERRY,
         .price = 20,
         .description = sWepearBerryDesc,
         .pocket = POCKET_BERRIES,
@@ -7087,7 +6554,6 @@ const struct Item gItems[] =
     [ITEM_PINAP_BERRY] =
     {
         .name = _("Pinap Berry"),
-        .itemId = ITEM_PINAP_BERRY,
         .price = 20,
         .description = sPinapBerryDesc,
         .pocket = POCKET_BERRIES,
@@ -7099,7 +6565,6 @@ const struct Item gItems[] =
     [ITEM_POMEG_BERRY] =
     {
         .name = _("Pomeg Berry"),
-        .itemId = ITEM_POMEG_BERRY,
         .price = 20,
         .description = sPomegBerryDesc,
         .pocket = POCKET_BERRIES,
@@ -7111,7 +6576,6 @@ const struct Item gItems[] =
     [ITEM_KELPSY_BERRY] =
     {
         .name = _("Kelpsy Berry"),
-        .itemId = ITEM_KELPSY_BERRY,
         .price = 20,
         .description = sKelpsyBerryDesc,
         .pocket = POCKET_BERRIES,
@@ -7123,7 +6587,6 @@ const struct Item gItems[] =
     [ITEM_QUALOT_BERRY] =
     {
         .name = _("Qualot Berry"),
-        .itemId = ITEM_QUALOT_BERRY,
         .price = 20,
         .description = sQualotBerryDesc,
         .pocket = POCKET_BERRIES,
@@ -7135,7 +6598,6 @@ const struct Item gItems[] =
     [ITEM_HONDEW_BERRY] =
     {
         .name = _("Hondew Berry"),
-        .itemId = ITEM_HONDEW_BERRY,
         .price = 20,
         .description = sHondewBerryDesc,
         .pocket = POCKET_BERRIES,
@@ -7147,7 +6609,6 @@ const struct Item gItems[] =
     [ITEM_GREPA_BERRY] =
     {
         .name = _("Grepa Berry"),
-        .itemId = ITEM_GREPA_BERRY,
         .price = 20,
         .description = sGrepaBerryDesc,
         .pocket = POCKET_BERRIES,
@@ -7159,7 +6620,6 @@ const struct Item gItems[] =
     [ITEM_TAMATO_BERRY] =
     {
         .name = _("Tamato Berry"),
-        .itemId = ITEM_TAMATO_BERRY,
         .price = 20,
         .description = sTamatoBerryDesc,
         .pocket = POCKET_BERRIES,
@@ -7171,7 +6631,6 @@ const struct Item gItems[] =
     [ITEM_CORNN_BERRY] =
     {
         .name = _("Cornn Berry"),
-        .itemId = ITEM_CORNN_BERRY,
         .price = 20,
         .description = sCornnBerryDesc,
         .pocket = POCKET_BERRIES,
@@ -7183,7 +6642,6 @@ const struct Item gItems[] =
     [ITEM_MAGOST_BERRY] =
     {
         .name = _("Magost Berry"),
-        .itemId = ITEM_MAGOST_BERRY,
         .price = 20,
         .description = sMagostBerryDesc,
         .pocket = POCKET_BERRIES,
@@ -7195,7 +6653,6 @@ const struct Item gItems[] =
     [ITEM_RABUTA_BERRY] =
     {
         .name = _("Rabuta Berry"),
-        .itemId = ITEM_RABUTA_BERRY,
         .price = 20,
         .description = sRabutaBerryDesc,
         .pocket = POCKET_BERRIES,
@@ -7207,7 +6664,6 @@ const struct Item gItems[] =
     [ITEM_NOMEL_BERRY] =
     {
         .name = _("Nomel Berry"),
-        .itemId = ITEM_NOMEL_BERRY,
         .price = 20,
         .description = sNomelBerryDesc,
         .pocket = POCKET_BERRIES,
@@ -7219,7 +6675,6 @@ const struct Item gItems[] =
     [ITEM_SPELON_BERRY] =
     {
         .name = _("Spelon Berry"),
-        .itemId = ITEM_SPELON_BERRY,
         .price = 20,
         .description = sSpelonBerryDesc,
         .pocket = POCKET_BERRIES,
@@ -7231,7 +6686,6 @@ const struct Item gItems[] =
     [ITEM_PAMTRE_BERRY] =
     {
         .name = _("Pamtre Berry"),
-        .itemId = ITEM_PAMTRE_BERRY,
         .price = 20,
         .description = sPamtreBerryDesc,
         .pocket = POCKET_BERRIES,
@@ -7243,7 +6697,6 @@ const struct Item gItems[] =
     [ITEM_WATMEL_BERRY] =
     {
         .name = _("Watmel Berry"),
-        .itemId = ITEM_WATMEL_BERRY,
         .price = 20,
         .description = sWatmelBerryDesc,
         .pocket = POCKET_BERRIES,
@@ -7255,7 +6708,6 @@ const struct Item gItems[] =
     [ITEM_DURIN_BERRY] =
     {
         .name = _("Durin Berry"),
-        .itemId = ITEM_DURIN_BERRY,
         .price = 20,
         .description = sDurinBerryDesc,
         .pocket = POCKET_BERRIES,
@@ -7267,7 +6719,6 @@ const struct Item gItems[] =
     [ITEM_BELUE_BERRY] =
     {
         .name = _("Belue Berry"),
-        .itemId = ITEM_BELUE_BERRY,
         .price = 20,
         .description = sBelueBerryDesc,
         .pocket = POCKET_BERRIES,
@@ -7279,7 +6730,6 @@ const struct Item gItems[] =
     [ITEM_CHILAN_BERRY] =
     {
         .name = _("Chilan Berry"),
-        .itemId = ITEM_CHILAN_BERRY,
         .price = 20,
         .holdEffect = HOLD_EFFECT_RESIST_BERRY,
         .holdEffectParam = TYPE_NORMAL,
@@ -7293,7 +6743,6 @@ const struct Item gItems[] =
     [ITEM_OCCA_BERRY] =
     {
         .name = _("Occa Berry"),
-        .itemId = ITEM_OCCA_BERRY,
         .price = 20,
         .holdEffect = HOLD_EFFECT_RESIST_BERRY,
         .holdEffectParam = TYPE_FIRE,
@@ -7307,7 +6756,6 @@ const struct Item gItems[] =
     [ITEM_PASSHO_BERRY] =
     {
         .name = _("Passho Berry"),
-        .itemId = ITEM_PASSHO_BERRY,
         .price = 20,
         .holdEffect = HOLD_EFFECT_RESIST_BERRY,
         .holdEffectParam = TYPE_WATER,
@@ -7321,7 +6769,6 @@ const struct Item gItems[] =
     [ITEM_WACAN_BERRY] =
     {
         .name = _("Wacan Berry"),
-        .itemId = ITEM_WACAN_BERRY,
         .price = 20,
         .holdEffect = HOLD_EFFECT_RESIST_BERRY,
         .holdEffectParam = TYPE_ELECTRIC,
@@ -7335,7 +6782,6 @@ const struct Item gItems[] =
     [ITEM_RINDO_BERRY] =
     {
         .name = _("Rindo Berry"),
-        .itemId = ITEM_RINDO_BERRY,
         .price = 20,
         .holdEffect = HOLD_EFFECT_RESIST_BERRY,
         .holdEffectParam = TYPE_GRASS,
@@ -7349,7 +6795,6 @@ const struct Item gItems[] =
     [ITEM_YACHE_BERRY] =
     {
         .name = _("Yache Berry"),
-        .itemId = ITEM_YACHE_BERRY,
         .price = 20,
         .holdEffect = HOLD_EFFECT_RESIST_BERRY,
         .holdEffectParam = TYPE_ICE,
@@ -7363,7 +6808,6 @@ const struct Item gItems[] =
     [ITEM_CHOPLE_BERRY] =
     {
         .name = _("Chople Berry"),
-        .itemId = ITEM_CHOPLE_BERRY,
         .price = 20,
         .holdEffect = HOLD_EFFECT_RESIST_BERRY,
         .holdEffectParam = TYPE_FIGHTING,
@@ -7377,7 +6821,6 @@ const struct Item gItems[] =
     [ITEM_KEBIA_BERRY] =
     {
         .name = _("Kebia Berry"),
-        .itemId = ITEM_KEBIA_BERRY,
         .price = 20,
         .holdEffect = HOLD_EFFECT_RESIST_BERRY,
         .holdEffectParam = TYPE_POISON,
@@ -7391,7 +6834,6 @@ const struct Item gItems[] =
     [ITEM_SHUCA_BERRY] =
     {
         .name = _("Shuca Berry"),
-        .itemId = ITEM_SHUCA_BERRY,
         .price = 20,
         .holdEffect = HOLD_EFFECT_RESIST_BERRY,
         .holdEffectParam = TYPE_GROUND,
@@ -7405,7 +6847,6 @@ const struct Item gItems[] =
     [ITEM_COBA_BERRY] =
     {
         .name = _("Coba Berry"),
-        .itemId = ITEM_COBA_BERRY,
         .price = 20,
         .holdEffect = HOLD_EFFECT_RESIST_BERRY,
         .holdEffectParam = TYPE_FLYING,
@@ -7419,7 +6860,6 @@ const struct Item gItems[] =
     [ITEM_PAYAPA_BERRY] =
     {
         .name = _("Payapa Berry"),
-        .itemId = ITEM_PAYAPA_BERRY,
         .price = 20,
         .holdEffect = HOLD_EFFECT_RESIST_BERRY,
         .holdEffectParam = TYPE_PSYCHIC,
@@ -7433,7 +6873,6 @@ const struct Item gItems[] =
     [ITEM_TANGA_BERRY] =
     {
         .name = _("Tanga Berry"),
-        .itemId = ITEM_TANGA_BERRY,
         .price = 20,
         .holdEffect = HOLD_EFFECT_RESIST_BERRY,
         .holdEffectParam = TYPE_BUG,
@@ -7447,7 +6886,6 @@ const struct Item gItems[] =
     [ITEM_CHARTI_BERRY] =
     {
         .name = _("Charti Berry"),
-        .itemId = ITEM_CHARTI_BERRY,
         .price = 20,
         .holdEffect = HOLD_EFFECT_RESIST_BERRY,
         .holdEffectParam = TYPE_ROCK,
@@ -7461,7 +6899,6 @@ const struct Item gItems[] =
     [ITEM_KASIB_BERRY] =
     {
         .name = _("Kasib Berry"),
-        .itemId = ITEM_KASIB_BERRY,
         .price = 20,
         .holdEffect = HOLD_EFFECT_RESIST_BERRY,
         .holdEffectParam = TYPE_GHOST,
@@ -7475,7 +6912,6 @@ const struct Item gItems[] =
     [ITEM_HABAN_BERRY] =
     {
         .name = _("Haban Berry"),
-        .itemId = ITEM_HABAN_BERRY,
         .price = 20,
         .holdEffect = HOLD_EFFECT_RESIST_BERRY,
         .holdEffectParam = TYPE_DRAGON,
@@ -7489,7 +6925,6 @@ const struct Item gItems[] =
     [ITEM_COLBUR_BERRY] =
     {
         .name = _("Colbur Berry"),
-        .itemId = ITEM_COLBUR_BERRY,
         .price = 20,
         .holdEffect = HOLD_EFFECT_RESIST_BERRY,
         .holdEffectParam = TYPE_DARK,
@@ -7503,7 +6938,6 @@ const struct Item gItems[] =
     [ITEM_BABIRI_BERRY] =
     {
         .name = _("Babiri Berry"),
-        .itemId = ITEM_BABIRI_BERRY,
         .price = 20,
         .holdEffect = HOLD_EFFECT_RESIST_BERRY,
         .holdEffectParam = TYPE_STEEL,
@@ -7517,7 +6951,6 @@ const struct Item gItems[] =
     [ITEM_ROSELI_BERRY] =
     {
         .name = _("Roseli Berry"),
-        .itemId = ITEM_ROSELI_BERRY,
         .price = 20,
         .holdEffect = HOLD_EFFECT_RESIST_BERRY,
         .holdEffectParam = TYPE_FAIRY,
@@ -7531,7 +6964,6 @@ const struct Item gItems[] =
     [ITEM_LIECHI_BERRY] =
     {
         .name = _("Liechi Berry"),
-        .itemId = ITEM_LIECHI_BERRY,
         .price = 20,
         .holdEffect = HOLD_EFFECT_ATTACK_UP,
         .holdEffectParam = 4,
@@ -7545,7 +6977,6 @@ const struct Item gItems[] =
     [ITEM_GANLON_BERRY] =
     {
         .name = _("Ganlon Berry"),
-        .itemId = ITEM_GANLON_BERRY,
         .price = 20,
         .holdEffect = HOLD_EFFECT_DEFENSE_UP,
         .holdEffectParam = 4,
@@ -7559,7 +6990,6 @@ const struct Item gItems[] =
     [ITEM_SALAC_BERRY] =
     {
         .name = _("Salac Berry"),
-        .itemId = ITEM_SALAC_BERRY,
         .price = 20,
         .holdEffect = HOLD_EFFECT_SPEED_UP,
         .holdEffectParam = 4,
@@ -7573,7 +7003,6 @@ const struct Item gItems[] =
     [ITEM_PETAYA_BERRY] =
     {
         .name = _("Petaya Berry"),
-        .itemId = ITEM_PETAYA_BERRY,
         .price = 20,
         .holdEffect = HOLD_EFFECT_SP_ATTACK_UP,
         .holdEffectParam = 4,
@@ -7587,7 +7016,6 @@ const struct Item gItems[] =
     [ITEM_APICOT_BERRY] =
     {
         .name = _("Apicot Berry"),
-        .itemId = ITEM_APICOT_BERRY,
         .price = 20,
         .holdEffect = HOLD_EFFECT_SP_DEFENSE_UP,
         .holdEffectParam = 4,
@@ -7601,7 +7029,6 @@ const struct Item gItems[] =
     [ITEM_LANSAT_BERRY] =
     {
         .name = _("Lansat Berry"),
-        .itemId = ITEM_LANSAT_BERRY,
         .price = 20,
         .holdEffect = HOLD_EFFECT_CRITICAL_UP,
         .holdEffectParam = 4,
@@ -7615,7 +7042,6 @@ const struct Item gItems[] =
     [ITEM_STARF_BERRY] =
     {
         .name = _("Starf Berry"),
-        .itemId = ITEM_STARF_BERRY,
         .price = 20,
         .holdEffect = HOLD_EFFECT_RANDOM_STAT_UP,
         .holdEffectParam = 4,
@@ -7629,7 +7055,6 @@ const struct Item gItems[] =
     [ITEM_ENIGMA_BERRY] =
     {
         .name = _("Enigma Berry"),
-        .itemId = ITEM_ENIGMA_BERRY,
         .price = 20,
         .holdEffect = HOLD_EFFECT_ENIGMA_BERRY,
         .description = sEnigmaBerryDesc,
@@ -7642,7 +7067,6 @@ const struct Item gItems[] =
     [ITEM_MICLE_BERRY] =
     {
         .name = _("Micle Berry"),
-        .itemId = ITEM_MICLE_BERRY,
         .price = 20,
         .holdEffect = HOLD_EFFECT_MICLE_BERRY,
         .holdEffectParam = 4,
@@ -7656,7 +7080,6 @@ const struct Item gItems[] =
     [ITEM_CUSTAP_BERRY] =
     {
         .name = _("Custap Berry"),
-        .itemId = ITEM_CUSTAP_BERRY,
         .price = 20,
         .holdEffect = HOLD_EFFECT_CUSTAP_BERRY,
         .holdEffectParam = 4,
@@ -7670,7 +7093,6 @@ const struct Item gItems[] =
     [ITEM_JABOCA_BERRY] =
     {
         .name = _("Jaboca Berry"),
-        .itemId = ITEM_JABOCA_BERRY,
         .price = 20,
         .holdEffect = HOLD_EFFECT_JABOCA_BERRY,
         .description = sJabocaBerryDesc,
@@ -7683,7 +7105,6 @@ const struct Item gItems[] =
     [ITEM_ROWAP_BERRY] =
     {
         .name = _("Rowap Berry"),
-        .itemId = ITEM_ROWAP_BERRY,
         .price = 20,
         .holdEffect = HOLD_EFFECT_ROWAP_BERRY,
         .description = sRowapBerryDesc,
@@ -7696,7 +7117,6 @@ const struct Item gItems[] =
     [ITEM_KEE_BERRY] =
     {
         .name = _("Kee Berry"),
-        .itemId = ITEM_KEE_BERRY,
         .price = 20,
         .holdEffect = HOLD_EFFECT_KEE_BERRY,
         .description = sKeeBerryDesc,
@@ -7709,7 +7129,6 @@ const struct Item gItems[] =
     [ITEM_MARANGA_BERRY] =
     {
         .name = _("Maranga Berry"),
-        .itemId = ITEM_MARANGA_BERRY,
         .price = 20,
         .holdEffect = HOLD_EFFECT_MARANGA_BERRY,
         .description = sMarangaBerryDesc,
@@ -7722,7 +7141,6 @@ const struct Item gItems[] =
     [ITEM_ENIGMA_BERRY_E_READER] =
     {
         .name = _("Enigma Berry"),
-        .itemId = ITEM_ENIGMA_BERRY,
         .price = 20,
         .description = sEnigmaBerryEReaderDesc,
         .pocket = POCKET_BERRIES,
@@ -7737,7 +7155,6 @@ const struct Item gItems[] =
     [ITEM_TM_FOCUS_PUNCH] =
     {
         .name = _("TM01"),
-        .itemId = ITEM_TM01,
         .price = 3000,
         .description = sTM01Desc,
         .importance = I_REUSABLE_TMS,
@@ -7750,7 +7167,6 @@ const struct Item gItems[] =
     [ITEM_TM_DRAGON_CLAW] =
     {
         .name = _("TM02"),
-        .itemId = ITEM_TM02,
         .price = 3000,
         .description = sTM02Desc,
         .importance = I_REUSABLE_TMS,
@@ -7763,7 +7179,6 @@ const struct Item gItems[] =
     [ITEM_TM_WATER_PULSE] =
     {
         .name = _("TM03"),
-        .itemId = ITEM_TM03,
         .price = 3000,
         .description = sTM03Desc,
         .importance = I_REUSABLE_TMS,
@@ -7776,7 +7191,6 @@ const struct Item gItems[] =
     [ITEM_TM_CALM_MIND] =
     {
         .name = _("TM04"),
-        .itemId = ITEM_TM04,
         .price = 3000,
         .description = sTM04Desc,
         .importance = I_REUSABLE_TMS,
@@ -7789,7 +7203,6 @@ const struct Item gItems[] =
     [ITEM_TM_ROAR] =
     {
         .name = _("TM05"),
-        .itemId = ITEM_TM05,
         .price = 1000,
         .description = sTM05Desc,
         .importance = I_REUSABLE_TMS,
@@ -7802,7 +7215,6 @@ const struct Item gItems[] =
     [ITEM_TM_TOXIC] =
     {
         .name = _("TM06"),
-        .itemId = ITEM_TM06,
         .price = 3000,
         .description = sTM06Desc,
         .importance = I_REUSABLE_TMS,
@@ -7815,7 +7227,6 @@ const struct Item gItems[] =
     [ITEM_TM_HAIL] =
     {
         .name = _("TM07"),
-        .itemId = ITEM_TM07,
         .price = 3000,
         .description = sTM07Desc,
         .importance = I_REUSABLE_TMS,
@@ -7828,7 +7239,6 @@ const struct Item gItems[] =
     [ITEM_TM_BULK_UP] =
     {
         .name = _("TM08"),
-        .itemId = ITEM_TM08,
         .price = 3000,
         .description = sTM08Desc,
         .importance = I_REUSABLE_TMS,
@@ -7841,7 +7251,6 @@ const struct Item gItems[] =
     [ITEM_TM_BULLET_SEED] =
     {
         .name = _("TM09"),
-        .itemId = ITEM_TM09,
         .price = 3000,
         .description = sTM09Desc,
         .importance = I_REUSABLE_TMS,
@@ -7854,7 +7263,6 @@ const struct Item gItems[] =
     [ITEM_TM_HIDDEN_POWER] =
     {
         .name = _("TM10"),
-        .itemId = ITEM_TM10,
         .price = 3000,
         .description = sTM10Desc,
         .importance = I_REUSABLE_TMS,
@@ -7867,7 +7275,6 @@ const struct Item gItems[] =
     [ITEM_TM_SUNNY_DAY] =
     {
         .name = _("TM11"),
-        .itemId = ITEM_TM11,
         .price = 2000,
         .description = sTM11Desc,
         .importance = I_REUSABLE_TMS,
@@ -7880,7 +7287,6 @@ const struct Item gItems[] =
     [ITEM_TM_TAUNT] =
     {
         .name = _("TM12"),
-        .itemId = ITEM_TM12,
         .price = 3000,
         .description = sTM12Desc,
         .importance = I_REUSABLE_TMS,
@@ -7893,7 +7299,6 @@ const struct Item gItems[] =
     [ITEM_TM_ICE_BEAM] =
     {
         .name = _("TM13"),
-        .itemId = ITEM_TM13,
         .price = 3000,
         .description = sTM13Desc,
         .importance = I_REUSABLE_TMS,
@@ -7906,7 +7311,6 @@ const struct Item gItems[] =
     [ITEM_TM_BLIZZARD] =
     {
         .name = _("TM14"),
-        .itemId = ITEM_TM14,
         .price = 5500,
         .description = sTM14Desc,
         .importance = I_REUSABLE_TMS,
@@ -7919,7 +7323,6 @@ const struct Item gItems[] =
     [ITEM_TM_HYPER_BEAM] =
     {
         .name = _("TM15"),
-        .itemId = ITEM_TM15,
         .price = 7500,
         .description = sTM15Desc,
         .importance = I_REUSABLE_TMS,
@@ -7932,7 +7335,6 @@ const struct Item gItems[] =
     [ITEM_TM_LIGHT_SCREEN] =
     {
         .name = _("TM16"),
-        .itemId = ITEM_TM16,
         .price = 3000,
         .description = sTM16Desc,
         .importance = I_REUSABLE_TMS,
@@ -7945,7 +7347,6 @@ const struct Item gItems[] =
     [ITEM_TM_PROTECT] =
     {
         .name = _("TM17"),
-        .itemId = ITEM_TM17,
         .price = 3000,
         .description = sTM17Desc,
         .importance = I_REUSABLE_TMS,
@@ -7958,7 +7359,6 @@ const struct Item gItems[] =
     [ITEM_TM_RAIN_DANCE] =
     {
         .name = _("TM18"),
-        .itemId = ITEM_TM18,
         .price = 2000,
         .description = sTM18Desc,
         .importance = I_REUSABLE_TMS,
@@ -7971,7 +7371,6 @@ const struct Item gItems[] =
     [ITEM_TM_GIGA_DRAIN] =
     {
         .name = _("TM19"),
-        .itemId = ITEM_TM19,
         .price = 3000,
         .description = sTM19Desc,
         .importance = I_REUSABLE_TMS,
@@ -7984,7 +7383,6 @@ const struct Item gItems[] =
     [ITEM_TM_SAFEGUARD] =
     {
         .name = _("TM20"),
-        .itemId = ITEM_TM20,
         .price = 3000,
         .description = sTM20Desc,
         .importance = I_REUSABLE_TMS,
@@ -7997,7 +7395,6 @@ const struct Item gItems[] =
     [ITEM_TM_FRUSTRATION] =
     {
         .name = _("TM21"),
-        .itemId = ITEM_TM21,
         .price = 1000,
         .description = sTM21Desc,
         .importance = I_REUSABLE_TMS,
@@ -8010,7 +7407,6 @@ const struct Item gItems[] =
     [ITEM_TM_SOLAR_BEAM] =
     {
         .name = _("TM22"),
-        .itemId = ITEM_TM22,
         .price = 3000,
         .description = sTM22Desc,
         .importance = I_REUSABLE_TMS,
@@ -8023,7 +7419,6 @@ const struct Item gItems[] =
     [ITEM_TM_IRON_TAIL] =
     {
         .name = _("TM23"),
-        .itemId = ITEM_TM23,
         .price = 3000,
         .description = sTM23Desc,
         .importance = I_REUSABLE_TMS,
@@ -8036,7 +7431,6 @@ const struct Item gItems[] =
     [ITEM_TM_THUNDERBOLT] =
     {
         .name = _("TM24"),
-        .itemId = ITEM_TM24,
         .price = 3000,
         .description = sTM24Desc,
         .importance = I_REUSABLE_TMS,
@@ -8049,7 +7443,6 @@ const struct Item gItems[] =
     [ITEM_TM_THUNDER] =
     {
         .name = _("TM25"),
-        .itemId = ITEM_TM25,
         .price = 5500,
         .description = sTM25Desc,
         .importance = I_REUSABLE_TMS,
@@ -8062,7 +7455,6 @@ const struct Item gItems[] =
     [ITEM_TM_EARTHQUAKE] =
     {
         .name = _("TM26"),
-        .itemId = ITEM_TM26,
         .price = 3000,
         .description = sTM26Desc,
         .importance = I_REUSABLE_TMS,
@@ -8075,7 +7467,6 @@ const struct Item gItems[] =
     [ITEM_TM_RETURN] =
     {
         .name = _("TM27"),
-        .itemId = ITEM_TM27,
         .price = 1000,
         .description = sTM27Desc,
         .importance = I_REUSABLE_TMS,
@@ -8088,7 +7479,6 @@ const struct Item gItems[] =
     [ITEM_TM_DIG] =
     {
         .name = _("TM28"),
-        .itemId = ITEM_TM28,
         .price = 2000,
         .description = sTM28Desc,
         .importance = I_REUSABLE_TMS,
@@ -8101,7 +7491,6 @@ const struct Item gItems[] =
     [ITEM_TM_PSYCHIC] =
     {
         .name = _("TM29"),
-        .itemId = ITEM_TM29,
         .price = 2000,
         .description = sTM29Desc,
         .importance = I_REUSABLE_TMS,
@@ -8114,7 +7503,6 @@ const struct Item gItems[] =
     [ITEM_TM_SHADOW_BALL] =
     {
         .name = _("TM30"),
-        .itemId = ITEM_TM30,
         .price = 3000,
         .description = sTM30Desc,
         .importance = I_REUSABLE_TMS,
@@ -8127,7 +7515,6 @@ const struct Item gItems[] =
     [ITEM_TM_BRICK_BREAK] =
     {
         .name = _("TM31"),
-        .itemId = ITEM_TM31,
         .price = 3000,
         .description = sTM31Desc,
         .importance = I_REUSABLE_TMS,
@@ -8140,7 +7527,6 @@ const struct Item gItems[] =
     [ITEM_TM_DOUBLE_TEAM] =
     {
         .name = _("TM32"),
-        .itemId = ITEM_TM32,
         .price = 2000,
         .description = sTM32Desc,
         .importance = I_REUSABLE_TMS,
@@ -8153,7 +7539,6 @@ const struct Item gItems[] =
     [ITEM_TM_REFLECT] =
     {
         .name = _("TM33"),
-        .itemId = ITEM_TM33,
         .price = 3000,
         .description = sTM33Desc,
         .importance = I_REUSABLE_TMS,
@@ -8166,7 +7551,6 @@ const struct Item gItems[] =
     [ITEM_TM_SHOCK_WAVE] =
     {
         .name = _("TM34"),
-        .itemId = ITEM_TM34,
         .price = 3000,
         .description = sTM34Desc,
         .importance = I_REUSABLE_TMS,
@@ -8179,7 +7563,6 @@ const struct Item gItems[] =
     [ITEM_TM_FLAMETHROWER] =
     {
         .name = _("TM35"),
-        .itemId = ITEM_TM35,
         .price = 3000,
         .description = sTM35Desc,
         .importance = I_REUSABLE_TMS,
@@ -8192,7 +7575,6 @@ const struct Item gItems[] =
     [ITEM_TM_SLUDGE_BOMB] =
     {
         .name = _("TM36"),
-        .itemId = ITEM_TM36,
         .price = 1000,
         .description = sTM36Desc,
         .importance = I_REUSABLE_TMS,
@@ -8205,7 +7587,6 @@ const struct Item gItems[] =
     [ITEM_TM_SANDSTORM] =
     {
         .name = _("TM37"),
-        .itemId = ITEM_TM37,
         .price = 2000,
         .description = sTM37Desc,
         .importance = I_REUSABLE_TMS,
@@ -8218,7 +7599,6 @@ const struct Item gItems[] =
     [ITEM_TM_FIRE_BLAST] =
     {
         .name = _("TM38"),
-        .itemId = ITEM_TM38,
         .price = 5500,
         .description = sTM38Desc,
         .importance = I_REUSABLE_TMS,
@@ -8231,7 +7611,6 @@ const struct Item gItems[] =
     [ITEM_TM_ROCK_TOMB] =
     {
         .name = _("TM39"),
-        .itemId = ITEM_TM39,
         .price = 3000,
         .description = sTM39Desc,
         .importance = I_REUSABLE_TMS,
@@ -8244,7 +7623,6 @@ const struct Item gItems[] =
     [ITEM_TM_AERIAL_ACE] =
     {
         .name = _("TM40"),
-        .itemId = ITEM_TM40,
         .price = 3000,
         .description = sTM40Desc,
         .importance = I_REUSABLE_TMS,
@@ -8257,7 +7635,6 @@ const struct Item gItems[] =
     [ITEM_TM_TORMENT] =
     {
         .name = _("TM41"),
-        .itemId = ITEM_TM41,
         .price = 3000,
         .description = sTM41Desc,
         .importance = I_REUSABLE_TMS,
@@ -8270,7 +7647,6 @@ const struct Item gItems[] =
     [ITEM_TM_FACADE] =
     {
         .name = _("TM42"),
-        .itemId = ITEM_TM42,
         .price = 3000,
         .description = sTM42Desc,
         .importance = I_REUSABLE_TMS,
@@ -8283,7 +7659,6 @@ const struct Item gItems[] =
     [ITEM_TM_SECRET_POWER] =
     {
         .name = _("TM43"),
-        .itemId = ITEM_TM43,
         .price = 3000,
         .description = sTM43Desc,
         .importance = I_REUSABLE_TMS,
@@ -8296,7 +7671,6 @@ const struct Item gItems[] =
     [ITEM_TM_REST] =
     {
         .name = _("TM44"),
-        .itemId = ITEM_TM44,
         .price = 3000,
         .description = sTM44Desc,
         .importance = I_REUSABLE_TMS,
@@ -8309,7 +7683,6 @@ const struct Item gItems[] =
     [ITEM_TM_ATTRACT] =
     {
         .name = _("TM45"),
-        .itemId = ITEM_TM45,
         .price = 3000,
         .description = sTM45Desc,
         .importance = I_REUSABLE_TMS,
@@ -8322,7 +7695,6 @@ const struct Item gItems[] =
     [ITEM_TM_THIEF] =
     {
         .name = _("TM46"),
-        .itemId = ITEM_TM46,
         .price = 3000,
         .description = sTM46Desc,
         .importance = I_REUSABLE_TMS,
@@ -8335,7 +7707,6 @@ const struct Item gItems[] =
     [ITEM_TM_STEEL_WING] =
     {
         .name = _("TM47"),
-        .itemId = ITEM_TM47,
         .price = 3000,
         .description = sTM47Desc,
         .importance = I_REUSABLE_TMS,
@@ -8348,7 +7719,6 @@ const struct Item gItems[] =
     [ITEM_TM_SKILL_SWAP] =
     {
         .name = _("TM48"),
-        .itemId = ITEM_TM48,
         .price = 3000,
         .description = sTM48Desc,
         .importance = I_REUSABLE_TMS,
@@ -8361,7 +7731,6 @@ const struct Item gItems[] =
     [ITEM_TM_SNATCH] =
     {
         .name = _("TM49"),
-        .itemId = ITEM_TM49,
         .price = 3000,
         .description = sTM49Desc,
         .importance = I_REUSABLE_TMS,
@@ -8374,7 +7743,6 @@ const struct Item gItems[] =
     [ITEM_TM_OVERHEAT] =
     {
         .name = _("TM50"),
-        .itemId = ITEM_TM50,
         .price = 3000,
         .description = sTM50Desc,
         .importance = I_REUSABLE_TMS,
@@ -8387,7 +7755,6 @@ const struct Item gItems[] =
     [ITEM_TM51] =
     {
         .name = _("TM51"),
-        .itemId = ITEM_TM51,
         .price = 3000,
         .description = sTM51Desc,
         .importance = I_REUSABLE_TMS,
@@ -8400,7 +7767,6 @@ const struct Item gItems[] =
     [ITEM_TM52] =
     {
         .name = _("TM52"),
-        .itemId = ITEM_TM52,
         .price = 3000,
         .description = sTM52Desc,
         .importance = I_REUSABLE_TMS,
@@ -8413,7 +7779,6 @@ const struct Item gItems[] =
     [ITEM_TM53] =
     {
         .name = _("TM53"),
-        .itemId = ITEM_TM53,
         .price = 3000,
         .description = sTM53Desc,
         .importance = I_REUSABLE_TMS,
@@ -8426,7 +7791,6 @@ const struct Item gItems[] =
     [ITEM_TM54] =
     {
         .name = _("TM54"),
-        .itemId = ITEM_TM54,
         .price = 3000,
         .description = sTM54Desc,
         .importance = I_REUSABLE_TMS,
@@ -8439,7 +7803,6 @@ const struct Item gItems[] =
     [ITEM_TM55] =
     {
         .name = _("TM55"),
-        .itemId = ITEM_TM55,
         .price = 3000,
         .description = sTM55Desc,
         .importance = I_REUSABLE_TMS,
@@ -8452,7 +7815,6 @@ const struct Item gItems[] =
     [ITEM_TM56] =
     {
         .name = _("TM56"),
-        .itemId = ITEM_TM56,
         .price = 3000,
         .description = sTM56Desc,
         .importance = I_REUSABLE_TMS,
@@ -8465,7 +7827,6 @@ const struct Item gItems[] =
     [ITEM_TM57] =
     {
         .name = _("TM57"),
-        .itemId = ITEM_TM57,
         .price = 3000,
         .description = sTM57Desc,
         .importance = I_REUSABLE_TMS,
@@ -8478,7 +7839,6 @@ const struct Item gItems[] =
     [ITEM_TM58] =
     {
         .name = _("TM58"),
-        .itemId = ITEM_TM58,
         .price = 3000,
         .description = sTM58Desc,
         .importance = I_REUSABLE_TMS,
@@ -8491,7 +7851,6 @@ const struct Item gItems[] =
     [ITEM_TM59] =
     {
         .name = _("TM59"),
-        .itemId = ITEM_TM59,
         .price = 3000,
         .description = sTM59Desc,
         .importance = I_REUSABLE_TMS,
@@ -8504,7 +7863,6 @@ const struct Item gItems[] =
     [ITEM_TM60] =
     {
         .name = _("TM60"),
-        .itemId = ITEM_TM60,
         .price = 3000,
         .description = sTM60Desc,
         .importance = I_REUSABLE_TMS,
@@ -8517,7 +7875,6 @@ const struct Item gItems[] =
     [ITEM_TM61] =
     {
         .name = _("TM61"),
-        .itemId = ITEM_TM61,
         .price = 3000,
         .description = sTM61Desc,
         .importance = I_REUSABLE_TMS,
@@ -8530,7 +7887,6 @@ const struct Item gItems[] =
     [ITEM_TM62] =
     {
         .name = _("TM62"),
-        .itemId = ITEM_TM62,
         .price = 3000,
         .description = sTM62Desc,
         .importance = I_REUSABLE_TMS,
@@ -8543,7 +7899,6 @@ const struct Item gItems[] =
     [ITEM_TM63] =
     {
         .name = _("TM63"),
-        .itemId = ITEM_TM63,
         .price = 3000,
         .description = sTM63Desc,
         .importance = I_REUSABLE_TMS,
@@ -8556,7 +7911,6 @@ const struct Item gItems[] =
     [ITEM_TM64] =
     {
         .name = _("TM64"),
-        .itemId = ITEM_TM64,
         .price = 3000,
         .description = sTM64Desc,
         .importance = I_REUSABLE_TMS,
@@ -8569,7 +7923,6 @@ const struct Item gItems[] =
     [ITEM_TM65] =
     {
         .name = _("TM65"),
-        .itemId = ITEM_TM65,
         .price = 3000,
         .description = sTM65Desc,
         .importance = I_REUSABLE_TMS,
@@ -8582,7 +7935,6 @@ const struct Item gItems[] =
     [ITEM_TM66] =
     {
         .name = _("TM66"),
-        .itemId = ITEM_TM66,
         .price = 3000,
         .description = sTM66Desc,
         .importance = I_REUSABLE_TMS,
@@ -8595,7 +7947,6 @@ const struct Item gItems[] =
     [ITEM_TM67] =
     {
         .name = _("TM67"),
-        .itemId = ITEM_TM67,
         .price = 3000,
         .description = sTM67Desc,
         .importance = I_REUSABLE_TMS,
@@ -8608,7 +7959,6 @@ const struct Item gItems[] =
     [ITEM_TM68] =
     {
         .name = _("TM68"),
-        .itemId = ITEM_TM68,
         .price = 3000,
         .description = sTM68Desc,
         .importance = I_REUSABLE_TMS,
@@ -8621,7 +7971,6 @@ const struct Item gItems[] =
     [ITEM_TM69] =
     {
         .name = _("TM69"),
-        .itemId = ITEM_TM69,
         .price = 3000,
         .description = sTM69Desc,
         .importance = I_REUSABLE_TMS,
@@ -8634,7 +7983,6 @@ const struct Item gItems[] =
     [ITEM_TM70] =
     {
         .name = _("TM70"),
-        .itemId = ITEM_TM70,
         .price = 3000,
         .description = sTM70Desc,
         .importance = I_REUSABLE_TMS,
@@ -8647,7 +7995,6 @@ const struct Item gItems[] =
     [ITEM_TM71] =
     {
         .name = _("TM71"),
-        .itemId = ITEM_TM71,
         .price = 3000,
         .description = sTM71Desc,
         .importance = I_REUSABLE_TMS,
@@ -8660,7 +8007,6 @@ const struct Item gItems[] =
     [ITEM_TM72] =
     {
         .name = _("TM72"),
-        .itemId = ITEM_TM72,
         .price = 3000,
         .description = sTM72Desc,
         .importance = I_REUSABLE_TMS,
@@ -8673,7 +8019,6 @@ const struct Item gItems[] =
     [ITEM_TM73] =
     {
         .name = _("TM73"),
-        .itemId = ITEM_TM73,
         .price = 3000,
         .description = sTM73Desc,
         .importance = I_REUSABLE_TMS,
@@ -8686,7 +8031,6 @@ const struct Item gItems[] =
     [ITEM_TM74] =
     {
         .name = _("TM74"),
-        .itemId = ITEM_TM74,
         .price = 3000,
         .description = sTM74Desc,
         .importance = I_REUSABLE_TMS,
@@ -8699,7 +8043,6 @@ const struct Item gItems[] =
     [ITEM_TM75] =
     {
         .name = _("TM75"),
-        .itemId = ITEM_TM75,
         .price = 3000,
         .description = sTM75Desc,
         .importance = I_REUSABLE_TMS,
@@ -8712,7 +8055,6 @@ const struct Item gItems[] =
     [ITEM_TM76] =
     {
         .name = _("TM76"),
-        .itemId = ITEM_TM76,
         .price = 3000,
         .description = sTM76Desc,
         .importance = I_REUSABLE_TMS,
@@ -8725,7 +8067,6 @@ const struct Item gItems[] =
     [ITEM_TM77] =
     {
         .name = _("TM77"),
-        .itemId = ITEM_TM77,
         .price = 3000,
         .description = sTM77Desc,
         .importance = I_REUSABLE_TMS,
@@ -8738,7 +8079,6 @@ const struct Item gItems[] =
     [ITEM_TM78] =
     {
         .name = _("TM78"),
-        .itemId = ITEM_TM78,
         .price = 3000,
         .description = sTM78Desc,
         .importance = I_REUSABLE_TMS,
@@ -8751,7 +8091,6 @@ const struct Item gItems[] =
     [ITEM_TM79] =
     {
         .name = _("TM79"),
-        .itemId = ITEM_TM79,
         .price = 3000,
         .description = sTM79Desc,
         .importance = I_REUSABLE_TMS,
@@ -8764,7 +8103,6 @@ const struct Item gItems[] =
     [ITEM_TM80] =
     {
         .name = _("TM80"),
-        .itemId = ITEM_TM80,
         .price = 3000,
         .description = sTM80Desc,
         .importance = I_REUSABLE_TMS,
@@ -8777,7 +8115,6 @@ const struct Item gItems[] =
     [ITEM_TM81] =
     {
         .name = _("TM81"),
-        .itemId = ITEM_TM81,
         .price = 3000,
         .description = sTM81Desc,
         .importance = I_REUSABLE_TMS,
@@ -8790,7 +8127,6 @@ const struct Item gItems[] =
     [ITEM_TM82] =
     {
         .name = _("TM82"),
-        .itemId = ITEM_TM82,
         .price = 3000,
         .description = sTM82Desc,
         .importance = I_REUSABLE_TMS,
@@ -8803,7 +8139,6 @@ const struct Item gItems[] =
     [ITEM_TM83] =
     {
         .name = _("TM83"),
-        .itemId = ITEM_TM83,
         .price = 3000,
         .description = sTM83Desc,
         .importance = I_REUSABLE_TMS,
@@ -8816,7 +8151,6 @@ const struct Item gItems[] =
     [ITEM_TM84] =
     {
         .name = _("TM84"),
-        .itemId = ITEM_TM84,
         .price = 3000,
         .description = sTM84Desc,
         .importance = I_REUSABLE_TMS,
@@ -8829,7 +8163,6 @@ const struct Item gItems[] =
     [ITEM_TM85] =
     {
         .name = _("TM85"),
-        .itemId = ITEM_TM85,
         .price = 3000,
         .description = sTM85Desc,
         .importance = I_REUSABLE_TMS,
@@ -8842,7 +8175,6 @@ const struct Item gItems[] =
     [ITEM_TM86] =
     {
         .name = _("TM86"),
-        .itemId = ITEM_TM86,
         .price = 3000,
         .description = sTM86Desc,
         .importance = I_REUSABLE_TMS,
@@ -8855,7 +8187,6 @@ const struct Item gItems[] =
     [ITEM_TM87] =
     {
         .name = _("TM87"),
-        .itemId = ITEM_TM87,
         .price = 3000,
         .description = sTM87Desc,
         .importance = I_REUSABLE_TMS,
@@ -8868,7 +8199,6 @@ const struct Item gItems[] =
     [ITEM_TM88] =
     {
         .name = _("TM88"),
-        .itemId = ITEM_TM88,
         .price = 3000,
         .description = sTM88Desc,
         .importance = I_REUSABLE_TMS,
@@ -8881,7 +8211,6 @@ const struct Item gItems[] =
     [ITEM_TM89] =
     {
         .name = _("TM89"),
-        .itemId = ITEM_TM89,
         .price = 3000,
         .description = sTM89Desc,
         .importance = I_REUSABLE_TMS,
@@ -8894,7 +8223,6 @@ const struct Item gItems[] =
     [ITEM_TM90] =
     {
         .name = _("TM90"),
-        .itemId = ITEM_TM90,
         .price = 3000,
         .description = sTM90Desc,
         .importance = I_REUSABLE_TMS,
@@ -8907,7 +8235,6 @@ const struct Item gItems[] =
     [ITEM_TM91] =
     {
         .name = _("TM91"),
-        .itemId = ITEM_TM91,
         .price = 3000,
         .description = sTM91Desc,
         .importance = I_REUSABLE_TMS,
@@ -8920,7 +8247,6 @@ const struct Item gItems[] =
     [ITEM_TM92] =
     {
         .name = _("TM92"),
-        .itemId = ITEM_TM92,
         .price = 3000,
         .description = sTM92Desc,
         .importance = I_REUSABLE_TMS,
@@ -8933,7 +8259,6 @@ const struct Item gItems[] =
     [ITEM_TM93] =
     {
         .name = _("TM93"),
-        .itemId = ITEM_TM93,
         .price = 3000,
         .description = sTM93Desc,
         .importance = I_REUSABLE_TMS,
@@ -8946,7 +8271,6 @@ const struct Item gItems[] =
     [ITEM_TM94] =
     {
         .name = _("TM94"),
-        .itemId = ITEM_TM94,
         .price = 3000,
         .description = sTM94Desc,
         .importance = I_REUSABLE_TMS,
@@ -8959,7 +8283,6 @@ const struct Item gItems[] =
     [ITEM_TM95] =
     {
         .name = _("TM95"),
-        .itemId = ITEM_TM95,
         .price = 3000,
         .description = sTM95Desc,
         .importance = I_REUSABLE_TMS,
@@ -8972,7 +8295,6 @@ const struct Item gItems[] =
     [ITEM_TM96] =
     {
         .name = _("TM96"),
-        .itemId = ITEM_TM96,
         .price = 3000,
         .description = sTM96Desc,
         .importance = I_REUSABLE_TMS,
@@ -8985,7 +8307,6 @@ const struct Item gItems[] =
     [ITEM_TM97] =
     {
         .name = _("TM97"),
-        .itemId = ITEM_TM97,
         .price = 3000,
         .description = sTM97Desc,
         .importance = I_REUSABLE_TMS,
@@ -8998,7 +8319,6 @@ const struct Item gItems[] =
     [ITEM_TM98] =
     {
         .name = _("TM98"),
-        .itemId = ITEM_TM98,
         .price = 3000,
         .description = sTM98Desc,
         .importance = I_REUSABLE_TMS,
@@ -9011,7 +8331,6 @@ const struct Item gItems[] =
     [ITEM_TM99] =
     {
         .name = _("TM99"),
-        .itemId = ITEM_TM99,
         .price = 3000,
         .description = sTM99Desc,
         .importance = I_REUSABLE_TMS,
@@ -9024,7 +8343,6 @@ const struct Item gItems[] =
     [ITEM_TM100] =
     {
         .name = _("TM100"),
-        .itemId = ITEM_TM100,
         .price = 3000,
         .description = sTM100Desc,
         .importance = I_REUSABLE_TMS,
@@ -9037,7 +8355,6 @@ const struct Item gItems[] =
     [ITEM_HM_CUT] =
     {
         .name = _("HM01"),
-        .itemId = ITEM_HM01,
         .price = 0,
         .description = sHM01Desc,
         .importance = 1,
@@ -9050,7 +8367,6 @@ const struct Item gItems[] =
     [ITEM_HM_FLY] =
     {
         .name = _("HM02"),
-        .itemId = ITEM_HM02,
         .price = 0,
         .description = sHM02Desc,
         .importance = 1,
@@ -9063,7 +8379,6 @@ const struct Item gItems[] =
     [ITEM_HM_SURF] =
     {
         .name = _("HM03"),
-        .itemId = ITEM_HM03,
         .price = 0,
         .description = sHM03Desc,
         .importance = 1,
@@ -9076,7 +8391,6 @@ const struct Item gItems[] =
     [ITEM_HM_STRENGTH] =
     {
         .name = _("HM04"),
-        .itemId = ITEM_HM04,
         .price = 0,
         .description = sHM04Desc,
         .importance = 1,
@@ -9089,7 +8403,6 @@ const struct Item gItems[] =
     [ITEM_HM_FLASH] =
     {
         .name = _("HM05"),
-        .itemId = ITEM_HM05,
         .price = 0,
         .description = sHM05Desc,
         .importance = 1,
@@ -9102,7 +8415,6 @@ const struct Item gItems[] =
     [ITEM_HM_ROCK_SMASH] =
     {
         .name = _("HM06"),
-        .itemId = ITEM_HM06,
         .price = 0,
         .description = sHM06Desc,
         .importance = 1,
@@ -9115,7 +8427,6 @@ const struct Item gItems[] =
     [ITEM_HM_WATERFALL] =
     {
         .name = _("HM07"),
-        .itemId = ITEM_HM07,
         .price = 0,
         .description = sHM07Desc,
         .importance = 1,
@@ -9128,7 +8439,6 @@ const struct Item gItems[] =
     [ITEM_HM_DIVE] =
     {
         .name = _("HM08"),
-        .itemId = ITEM_HM08,
         .price = 0,
         .description = sHM08Desc,
         .importance = 1,
@@ -9144,7 +8454,6 @@ const struct Item gItems[] =
     [ITEM_OVAL_CHARM] =
     {
         .name = _("Oval Charm"),
-        .itemId = ITEM_OVAL_CHARM,
         .price = 0,
         .importance = 1,
         .description = sOvalCharmDesc,
@@ -9156,7 +8465,6 @@ const struct Item gItems[] =
     [ITEM_SHINY_CHARM] =
     {
         .name = _("Shiny Charm"),
-        .itemId = ITEM_SHINY_CHARM,
         .price = 0,
         .importance = 1,
         .description = sShinyCharmDesc,
@@ -9168,7 +8476,6 @@ const struct Item gItems[] =
     [ITEM_CATCHING_CHARM] =
     {
         .name = _("CatchngCharm"),
-        .itemId = ITEM_CATCHING_CHARM,
         .price = 0,
         .importance = 1,
         .description = sCatchingCharmDesc,
@@ -9180,7 +8487,6 @@ const struct Item gItems[] =
     [ITEM_EXP_CHARM] =
     {
         .name = _("Exp. Charm"),
-        .itemId = ITEM_EXP_CHARM,
         .price = 0,
         .importance = 1,
         .description = sExpCharmDesc,
@@ -9194,7 +8500,6 @@ const struct Item gItems[] =
     [ITEM_ROTOM_CATALOG] =
     {
         .name = _("RotomCatalog"),
-        .itemId = ITEM_ROTOM_CATALOG,
         .price = 0,
         .importance = 1,
         .description = sRotomCatalogDesc,
@@ -9206,7 +8511,6 @@ const struct Item gItems[] =
     [ITEM_GRACIDEA] =
     {
         .name = _("Gracidea"),
-        .itemId = ITEM_GRACIDEA,
         .price = 0,
         .description = sGracideaDesc,
         .pocket = POCKET_KEY_ITEMS,
@@ -9217,7 +8521,6 @@ const struct Item gItems[] =
     [ITEM_REVEAL_GLASS] =
     {
         .name = _("Reveal Glass"),
-        .itemId = ITEM_REVEAL_GLASS,
         .price = 0,
         .description = sRevealGlassDesc,
         .pocket = POCKET_KEY_ITEMS,
@@ -9228,7 +8531,6 @@ const struct Item gItems[] =
     [ITEM_DNA_SPLICERS] =
     {
         .name = _("DNA Splicers"),
-        .itemId = ITEM_DNA_SPLICERS,
         .price = 0,
         .description = sDNASplicersDesc,
         .pocket = POCKET_KEY_ITEMS,
@@ -9239,7 +8541,6 @@ const struct Item gItems[] =
     [ITEM_ZYGARDE_CUBE] =
     {
         .name = _("Zygarde Cube"),
-        .itemId = ITEM_ZYGARDE_CUBE,
         .price = 0,
         .importance = 1,
         .description = sZygardeCubeDesc,
@@ -9251,7 +8552,6 @@ const struct Item gItems[] =
     [ITEM_PRISON_BOTTLE] =
     {
         .name = _("Prison Bottle"),
-        .itemId = ITEM_PRISON_BOTTLE,
         .price = 0,
         .description = sPrisonBottleDesc,
         .pocket = POCKET_KEY_ITEMS,
@@ -9262,7 +8562,6 @@ const struct Item gItems[] =
     [ITEM_N_SOLARIZER] =
     {
         .name = _("N-Solarizer"),
-        .itemId = ITEM_N_SOLARIZER,
         .price = 0,
         .description = sNSolarizerDesc,
         .pocket = POCKET_KEY_ITEMS,
@@ -9273,7 +8572,6 @@ const struct Item gItems[] =
     [ITEM_N_LUNARIZER] =
     {
         .name = _("N-Lunarizer"),
-        .itemId = ITEM_N_LUNARIZER,
         .price = 0,
         .description = sNLunarizerDesc,
         .pocket = POCKET_KEY_ITEMS,
@@ -9284,7 +8582,6 @@ const struct Item gItems[] =
     [ITEM_REINS_OF_UNITY] =
     {
         .name = _("ReinsOfUnity"),
-        .itemId = ITEM_REINS_OF_UNITY,
         .price = 0,
         .description = sReinsOfUnityDesc,
         .pocket = POCKET_KEY_ITEMS,
@@ -9297,7 +8594,6 @@ const struct Item gItems[] =
     [ITEM_MEGA_RING] =
     {
         .name = _("Mega Ring"),
-        .itemId = ITEM_MEGA_RING,
         .price = 0,
         .importance = 1,
         .description = sMegaRingDesc,
@@ -9309,7 +8605,6 @@ const struct Item gItems[] =
     [ITEM_Z_POWER_RING] =
     {
         .name = _("Z-Power Ring"),
-        .itemId = ITEM_Z_POWER_RING,
         .price = 0,
         .importance = 1,
         .description = sZPowerRingDesc,
@@ -9321,7 +8616,6 @@ const struct Item gItems[] =
     [ITEM_DYNAMAX_BAND] =
     {
         .name = _("Dynamax Band"),
-        .itemId = ITEM_DYNAMAX_BAND,
         .price = 0,
         .description = sDynamaxBandDesc,
         .pocket = POCKET_KEY_ITEMS,
@@ -9334,7 +8628,6 @@ const struct Item gItems[] =
     [ITEM_BICYCLE] =
     {
         .name = _("Bicycle"),
-        .itemId = ITEM_BICYCLE,
         .price = 0,
         .description = sBicycleDesc,
         .importance = 1,
@@ -9346,7 +8639,6 @@ const struct Item gItems[] =
     [ITEM_MACH_BIKE] =
     {
         .name = _("Mach Bike"),
-        .itemId = ITEM_MACH_BIKE,
         .price = 0,
         .description = sMachBikeDesc,
         .importance = 1,
@@ -9359,7 +8651,6 @@ const struct Item gItems[] =
     [ITEM_ACRO_BIKE] =
     {
         .name = _("Acro Bike"),
-        .itemId = ITEM_ACRO_BIKE,
         .price = 0,
         .description = sAcroBikeDesc,
         .importance = 1,
@@ -9372,7 +8663,6 @@ const struct Item gItems[] =
     [ITEM_OLD_ROD] =
     {
         .name = _("Old Rod"),
-        .itemId = ITEM_OLD_ROD,
         .price = 0,
         .description = sOldRodDesc,
         .importance = 1,
@@ -9385,7 +8675,6 @@ const struct Item gItems[] =
     [ITEM_GOOD_ROD] =
     {
         .name = _("Good Rod"),
-        .itemId = ITEM_GOOD_ROD,
         .price = 0,
         .description = sGoodRodDesc,
         .importance = 1,
@@ -9398,7 +8687,6 @@ const struct Item gItems[] =
     [ITEM_SUPER_ROD] =
     {
         .name = _("Super Rod"),
-        .itemId = ITEM_SUPER_ROD,
         .price = 0,
         .description = sSuperRodDesc,
         .importance = 1,
@@ -9411,7 +8699,6 @@ const struct Item gItems[] =
     [ITEM_DOWSING_MACHINE] =
     {
         .name = _("Dowsing MCHN"),
-        .itemId = ITEM_DOWSING_MACHINE,
         .price = 0,
         .description = sDowsingMachineDesc,
         .importance = 1,
@@ -9423,7 +8710,6 @@ const struct Item gItems[] =
     [ITEM_TOWN_MAP] =
     {
         .name = _("Town Map"),
-        .itemId = ITEM_TOWN_MAP,
         .price = 0,
         .description = sTownMapDesc,
         .importance = 1,
@@ -9435,7 +8721,6 @@ const struct Item gItems[] =
     [ITEM_VS_SEEKER] =
     {
         .name = _("Vs. Seeker"),
-        .itemId = ITEM_VS_SEEKER,
         .price = 0,
         .description = sVsSeekerDesc,
         .importance = 1,
@@ -9447,7 +8732,6 @@ const struct Item gItems[] =
     [ITEM_TM_CASE] =
     {
         .name = _("TM Case"),
-        .itemId = ITEM_TM_CASE,
         .price = 0,
         .description = sTMCaseDesc,
         .importance = 1,
@@ -9459,7 +8743,6 @@ const struct Item gItems[] =
     [ITEM_BERRY_POUCH] =
     {
         .name = _("Berry Pouch"),
-        .itemId = ITEM_BERRY_POUCH,
         .price = 0,
         .description = sBerryPouchDesc,
         .importance = 1,
@@ -9471,7 +8754,6 @@ const struct Item gItems[] =
     [ITEM_POKEMON_BOX_LINK] =
     {
         .name = _("{PKMN} Box Link"),
-        .itemId = ITEM_POKEMON_BOX_LINK,
         .price = 0,
         .description = sPokemonBoxLinkDesc,
         .importance = 1,
@@ -9483,7 +8765,6 @@ const struct Item gItems[] =
     [ITEM_COIN_CASE] =
     {
         .name = _("Coin Case"),
-        .itemId = ITEM_COIN_CASE,
         .price = 0,
         .description = sCoinCaseDesc,
         .importance = 1,
@@ -9495,7 +8776,6 @@ const struct Item gItems[] =
     [ITEM_POWDER_JAR] =
     {
         .name = _("Powder Jar"),
-        .itemId = ITEM_POWDER_JAR,
         .price = 0,
         .description = sPowderJarDesc,
         .importance = 1,
@@ -9507,7 +8787,6 @@ const struct Item gItems[] =
     [ITEM_WAILMER_PAIL] =
     {
         .name = _("Wailmer Pail"),
-        .itemId = ITEM_WAILMER_PAIL,
         .price = 0,
         .description = sWailmerPailDesc,
         .importance = 1,
@@ -9519,7 +8798,6 @@ const struct Item gItems[] =
     [ITEM_POKE_RADAR] =
     {
         .name = _("Poké Radar"),
-        .itemId = ITEM_POKE_RADAR,
         .price = 0,
         .description = sPokeRadarDesc,
         .importance = 1,
@@ -9531,7 +8809,6 @@ const struct Item gItems[] =
     [ITEM_POKEBLOCK_CASE] =
     {
         .name = _("{POKEBLOCK} Case"),
-        .itemId = ITEM_POKEBLOCK_CASE,
         .price = 0,
         .description = sPokeblockCaseDesc,
         .importance = 1,
@@ -9543,7 +8820,6 @@ const struct Item gItems[] =
     [ITEM_SOOT_SACK] =
     {
         .name = _("Soot Sack"),
-        .itemId = ITEM_SOOT_SACK,
         .price = 0,
         .description = sSootSackDesc,
         .importance = 1,
@@ -9555,7 +8831,6 @@ const struct Item gItems[] =
     [ITEM_POKE_FLUTE] =
     {
         .name = _("Poké Flute"),
-        .itemId = ITEM_POKE_FLUTE,
         .price = 0,
         .description = sPokeFluteDesc,
         .importance = 1,
@@ -9567,7 +8842,6 @@ const struct Item gItems[] =
     [ITEM_FAME_CHECKER] =
     {
         .name = _("Fame Checker"),
-        .itemId = ITEM_FAME_CHECKER,
         .price = 0,
         .description = sFameCheckerDesc,
         .importance = 1,
@@ -9579,7 +8853,6 @@ const struct Item gItems[] =
     [ITEM_TEACHY_TV] =
     {
         .name = _("Teachy TV"),
-        .itemId = ITEM_TEACHY_TV,
         .price = 0,
         .description = sTeachyTVDesc,
         .importance = 1,
@@ -9593,7 +8866,6 @@ const struct Item gItems[] =
     [ITEM_SS_TICKET] =
     {
         .name = _("S.S. Ticket"),
-        .itemId = ITEM_SS_TICKET,
         .price = 0,
         .description = sSSTicketDesc,
         .importance = 1,
@@ -9605,7 +8877,6 @@ const struct Item gItems[] =
     [ITEM_EON_TICKET] =
     {
         .name = _("Eon Ticket"),
-        .itemId = ITEM_EON_TICKET,
         .price = 0,
         .description = sEonTicketDesc,
         .importance = 1,
@@ -9618,7 +8889,6 @@ const struct Item gItems[] =
     [ITEM_MYSTIC_TICKET] =
     {
         .name = _("Mystic Ticket"),
-        .itemId = ITEM_MYSTIC_TICKET,
         .price = 0,
         .description = sMysticTicketDesc,
         .importance = 1,
@@ -9630,7 +8900,6 @@ const struct Item gItems[] =
     [ITEM_AURORA_TICKET] =
     {
         .name = _("Aurora Ticket"),
-        .itemId = ITEM_AURORA_TICKET,
         .price = 0,
         .description = sAuroraTicketDesc,
         .importance = 1,
@@ -9642,7 +8911,6 @@ const struct Item gItems[] =
     [ITEM_OLD_SEA_MAP] =
     {
         .name = _("Old Sea Map"),
-        .itemId = ITEM_OLD_SEA_MAP,
         .price = 0,
         .description = sOldSeaMapDesc,
         .importance = 1,
@@ -9654,7 +8922,6 @@ const struct Item gItems[] =
     [ITEM_LETTER] =
     {
         .name = _("Letter"),
-        .itemId = ITEM_LETTER,
         .price = 0,
         .description = sLetterDesc,
         .importance = 2,
@@ -9666,7 +8933,6 @@ const struct Item gItems[] =
     [ITEM_DEVON_PARTS] =
     {
         .name = _("Devon Parts"),
-        .itemId = ITEM_DEVON_PARTS,
         .price = 0,
         .description = sDevonPartsDesc,
         .importance = 2,
@@ -9678,7 +8944,6 @@ const struct Item gItems[] =
     [ITEM_GO_GOGGLES] =
     {
         .name = _("Go-Goggles"),
-        .itemId = ITEM_GO_GOGGLES,
         .price = 0,
         .description = sGoGogglesDesc,
         .importance = 1,
@@ -9690,7 +8955,6 @@ const struct Item gItems[] =
     [ITEM_DEVON_SCOPE] =
     {
         .name = _("Devon Scope"),
-        .itemId = ITEM_DEVON_SCOPE,
         .price = 0,
         .description = sDevonScopeDesc,
         .importance = 1,
@@ -9702,7 +8966,6 @@ const struct Item gItems[] =
     [ITEM_BASEMENT_KEY] =
     {
         .name = _("Basement Key"),
-        .itemId = ITEM_BASEMENT_KEY,
         .price = 0,
         .description = sBasementKeyDesc,
         .importance = 1,
@@ -9714,7 +8977,6 @@ const struct Item gItems[] =
     [ITEM_SCANNER] =
     {
         .name = _("Scanner"),
-        .itemId = ITEM_SCANNER,
         .price = 0,
         .description = sScannerDesc,
         .importance = 1,
@@ -9726,7 +8988,6 @@ const struct Item gItems[] =
     [ITEM_STORAGE_KEY] =
     {
         .name = _("Storage Key"),
-        .itemId = ITEM_STORAGE_KEY,
         .price = 0,
         .description = sStorageKeyDesc,
         .importance = 1,
@@ -9738,7 +8999,6 @@ const struct Item gItems[] =
     [ITEM_KEY_TO_ROOM_1] =
     {
         .name = _("Key to Room 1"),
-        .itemId = ITEM_KEY_TO_ROOM_1,
         .price = 0,
         .description = sKeyToRoom1Desc,
         .importance = 1,
@@ -9750,7 +9010,6 @@ const struct Item gItems[] =
     [ITEM_KEY_TO_ROOM_2] =
     {
         .name = _("Key to Room 2"),
-        .itemId = ITEM_KEY_TO_ROOM_2,
         .price = 0,
         .description = sKeyToRoom2Desc,
         .importance = 1,
@@ -9762,7 +9021,6 @@ const struct Item gItems[] =
     [ITEM_KEY_TO_ROOM_4] =
     {
         .name = _("Key to Room 4"),
-        .itemId = ITEM_KEY_TO_ROOM_4,
         .price = 0,
         .description = sKeyToRoom4Desc,
         .importance = 1,
@@ -9774,7 +9032,6 @@ const struct Item gItems[] =
     [ITEM_KEY_TO_ROOM_6] =
     {
         .name = _("Key to Room 6"),
-        .itemId = ITEM_KEY_TO_ROOM_6,
         .price = 0,
         .description = sKeyToRoom6Desc,
         .importance = 1,
@@ -9786,7 +9043,6 @@ const struct Item gItems[] =
     [ITEM_METEORITE] =
     {
         .name = _("Meteorite"),
-        .itemId = ITEM_METEORITE,
         .price = 0,
         .description = sMeteoriteDesc,
         .importance = 1,
@@ -9798,7 +9054,6 @@ const struct Item gItems[] =
     [ITEM_MAGMA_EMBLEM] =
     {
         .name = _("Magma Emblem"),
-        .itemId = ITEM_MAGMA_EMBLEM,
         .price = 0,
         .description = sMagmaEmblemDesc,
         .importance = 1,
@@ -9810,7 +9065,6 @@ const struct Item gItems[] =
     [ITEM_CONTEST_PASS] =
     {
         .name = _("Contest Pass"),
-        .itemId = ITEM_CONTEST_PASS,
         .price = 0,
         .description = sContestPassDesc,
         .importance = 1,
@@ -9822,7 +9076,6 @@ const struct Item gItems[] =
     [ITEM_OAKS_PARCEL] =
     {
         .name = _("Oak's Parcel"),
-        .itemId = ITEM_OAKS_PARCEL,
         .price = 0,
         .description = sOaksParcelDesc,
         .importance = 2,
@@ -9834,7 +9087,6 @@ const struct Item gItems[] =
     [ITEM_SECRET_KEY] =
     {
         .name = _("Secret Key"),
-        .itemId = ITEM_SECRET_KEY,
         .price = 0,
         .description = sSecretKeyDesc,
         .importance = 1,
@@ -9846,7 +9098,6 @@ const struct Item gItems[] =
     [ITEM_BIKE_VOUCHER] =
     {
         .name = _("Bike Voucher"),
-        .itemId = ITEM_BIKE_VOUCHER,
         .price = 0,
         .description = sBikeVoucherDesc,
         .importance = 1,
@@ -9858,7 +9109,6 @@ const struct Item gItems[] =
     [ITEM_GOLD_TEETH] =
     {
         .name = _("Gold Teeth"),
-        .itemId = ITEM_GOLD_TEETH,
         .price = 0,
         .description = sGoldTeethDesc,
         .importance = 1,
@@ -9870,7 +9120,6 @@ const struct Item gItems[] =
     [ITEM_CARD_KEY] =
     {
         .name = _("Card Key"),
-        .itemId = ITEM_CARD_KEY,
         .price = 0,
         .description = sCardKeyDesc,
         .importance = 1,
@@ -9882,7 +9131,6 @@ const struct Item gItems[] =
     [ITEM_LIFT_KEY] =
     {
         .name = _("Lift Key"),
-        .itemId = ITEM_LIFT_KEY,
         .price = 0,
         .description = sLiftKeyDesc,
         .importance = 1,
@@ -9894,7 +9142,6 @@ const struct Item gItems[] =
     [ITEM_SILPH_SCOPE] =
     {
         .name = _("Silph Scope"),
-        .itemId = ITEM_SILPH_SCOPE,
         .price = 0,
         .description = sSilphScopeDesc,
         .importance = 1,
@@ -9906,7 +9153,6 @@ const struct Item gItems[] =
     [ITEM_TRI_PASS] =
     {
         .name = _("Tri-Pass"),
-        .itemId = ITEM_TRI_PASS,
         .price = 0,
         .description = sTriPassDesc,
         .importance = 1,
@@ -9918,7 +9164,6 @@ const struct Item gItems[] =
     [ITEM_RAINBOW_PASS] =
     {
         .name = _("Rainbow Pass"),
-        .itemId = ITEM_RAINBOW_PASS,
         .price = 0,
         .description = sRainbowPassDesc,
         .importance = 1,
@@ -9930,7 +9175,6 @@ const struct Item gItems[] =
     [ITEM_TEA] =
     {
         .name = _("Tea"),
-        .itemId = ITEM_TEA,
         .price = 0,
         .description = sTeaDesc,
         .importance = 1,
@@ -9942,7 +9186,6 @@ const struct Item gItems[] =
     [ITEM_RUBY] =
     {
         .name = _("Ruby"),
-        .itemId = ITEM_RUBY,
         .price = 0,
         .description = sRubyDesc,
         .importance = 1,
@@ -9954,7 +9197,6 @@ const struct Item gItems[] =
     [ITEM_SAPPHIRE] =
     {
         .name = _("Sapphire"),
-        .itemId = ITEM_SAPPHIRE,
         .price = 0,
         .description = sSapphireDesc,
         .importance = 1,
@@ -9966,7 +9208,6 @@ const struct Item gItems[] =
     [ITEM_ABILITY_SHIELD] =
     {
         .name = _("AbilityShield"),
-        .itemId = ITEM_ABILITY_SHIELD,
         .price = 20000,
         .holdEffect = HOLD_EFFECT_ABILITY_SHIELD,
         .description = sAbilityShieldDesc,
@@ -9979,7 +9220,6 @@ const struct Item gItems[] =
     [ITEM_CLEAR_AMULET] =
     {
         .name = _("Clear Amulet"),
-        .itemId = ITEM_CLEAR_AMULET,
         .price = 30000,
         .holdEffect = HOLD_EFFECT_CLEAR_AMULET,
         .description = sClearAmuletDesc,
@@ -9992,7 +9232,6 @@ const struct Item gItems[] =
     [ITEM_PUNCHING_GLOVE] =
     {
         .name = _("PunchingGlove"),
-        .itemId = ITEM_PUNCHING_GLOVE,
         .price = 15000,
         .holdEffect = HOLD_EFFECT_PUNCHING_GLOVE,
         .description = sPunchingGloveDesc,
@@ -10005,7 +9244,6 @@ const struct Item gItems[] =
     [ITEM_COVERT_CLOAK] =
     {
         .name = _("Covert Cloak"),
-        .itemId = ITEM_COVERT_CLOAK,
         .price = 20000,
         .holdEffect = HOLD_EFFECT_COVERT_CLOAK,
         .description = sCovertCloakDesc,
@@ -10018,7 +9256,6 @@ const struct Item gItems[] =
     [ITEM_LOADED_DICE] =
     {
         .name = _("Loaded Dice"),
-        .itemId = ITEM_LOADED_DICE,
         .price = 20000,
         .holdEffect = HOLD_EFFECT_LOADED_DICE,
         .description = sLoadedDiceDesc,
@@ -10031,7 +9268,6 @@ const struct Item gItems[] =
     [ITEM_AUSPICIOUS_ARMOR] =
     {
         .name = _("AuspciousArmr"),
-        .itemId = ITEM_AUSPICIOUS_ARMOR,
         .price = 3000,
         .description = sAuspiciousArmorDesc,
         .pocket = POCKET_ITEMS,
@@ -10043,7 +9279,6 @@ const struct Item gItems[] =
     [ITEM_BOOSTER_ENERGY] =
     {
         .name = _("BoosterEnergy"),
-        .itemId = ITEM_BOOSTER_ENERGY,
         .price = 0,
         .holdEffect = HOLD_EFFECT_BOOSTER_ENERGY,
         .description = sBoosterEnergyDesc,
@@ -10056,7 +9291,6 @@ const struct Item gItems[] =
     [ITEM_BIG_BAMBOO_SHOOT] =
     {
         .name = _("BigBmbooShoot"),
-        .itemId = ITEM_BIG_BAMBOO_SHOOT,
         .price = 3000,
         .description = sBigBambooShootDesc,
         .pocket = POCKET_ITEMS,
@@ -10068,7 +9302,6 @@ const struct Item gItems[] =
     [ITEM_GIMMIGHOUL_COIN] =
     {
         .name = _("GimighoulCoin"),
-        .itemId = ITEM_GIMMIGHOUL_COIN,
         .price = 400,
         .description = sGimmighoulCoinDesc,
         .pocket = POCKET_ITEMS,
@@ -10079,7 +9312,6 @@ const struct Item gItems[] =
     [ITEM_LEADERS_CREST] =
     {
         .name = _("Leader'sCrest"),
-        .itemId = ITEM_LEADERS_CREST,
         .price = 3000,
         .description = sLeadersCrestDesc,
         .pocket = POCKET_ITEMS,
@@ -10090,7 +9322,6 @@ const struct Item gItems[] =
     [ITEM_MALICIOUS_ARMOR] =
     {
         .name = _("MaliciousArmr"),
-        .itemId = ITEM_MALICIOUS_ARMOR,
         .price = 3000,
         .description = sMaliciousArmorDesc,
         .pocket = POCKET_ITEMS,
@@ -10102,7 +9333,6 @@ const struct Item gItems[] =
     [ITEM_MIRROR_HERB] =
     {
         .name = _("Mirror Herb"),
-        .itemId = ITEM_MIRROR_HERB,
         .price = 30000,
         .holdEffect = HOLD_EFFECT_MIRROR_HERB,
         .description = sMirrorHerbDesc,
@@ -10115,7 +9345,6 @@ const struct Item gItems[] =
     [ITEM_SCROLL_OF_DARKNESS] =
     {
         .name = _("ScrllOfDrknss"),
-        .itemId = ITEM_SCROLL_OF_DARKNESS,
         .price = 0,
         .description = sScrollOfDarknessDesc,
         .importance = 1,
@@ -10127,7 +9356,6 @@ const struct Item gItems[] =
     [ITEM_SCROLL_OF_WATERS] =
     {
         .name = _("ScrollOfWatrs"),
-        .itemId = ITEM_SCROLL_OF_WATERS,
         .price = 0,
         .description = sScrollOfWatersDesc,
         .importance = 1,
@@ -10139,7 +9367,6 @@ const struct Item gItems[] =
     [ITEM_TERA_ORB] =
     {
         .name = _("Tera Orb"),
-        .itemId = ITEM_TERA_ORB,
         .price = 0,
         .description = sTeraOrbDesc,
         .importance = 1,
@@ -10151,7 +9378,6 @@ const struct Item gItems[] =
     [ITEM_TINY_BAMBOO_SHOOT] =
     {
         .name = _("TinyBmbooShot"),
-        .itemId = ITEM_TINY_BAMBOO_SHOOT,
         .price = 750,
         .description = sTinyBambooShootDesc,
         .pocket = POCKET_ITEMS,
@@ -10163,7 +9389,6 @@ const struct Item gItems[] =
     [ITEM_BUG_TERA_SHARD] =
     {
         .name = _("Bug TeraShard"),
-        .itemId = ITEM_BUG_TERA_SHARD,
         .price = 0,
         .description = sTeraShardDesc,
         .pocket = POCKET_ITEMS,
@@ -10174,7 +9399,6 @@ const struct Item gItems[] =
     [ITEM_DARK_TERA_SHARD] =
     {
         .name = _("DarkTeraShard"),
-        .itemId = ITEM_DARK_TERA_SHARD,
         .price = 0,
         .description = sTeraShardDesc,
         .pocket = POCKET_ITEMS,
@@ -10185,7 +9409,6 @@ const struct Item gItems[] =
     [ITEM_DRAGON_TERA_SHARD] =
     {
         .name = _("DragnTeraShrd"),
-        .itemId = ITEM_DRAGON_TERA_SHARD,
         .price = 0,
         .description = sTeraShardDesc,
         .pocket = POCKET_ITEMS,
@@ -10196,7 +9419,6 @@ const struct Item gItems[] =
     [ITEM_ELECTRIC_TERA_SHARD] =
     {
         .name = _("EltrcTeraShrd"),
-        .itemId = ITEM_ELECTRIC_TERA_SHARD,
         .price = 0,
         .description = sTeraShardDesc,
         .pocket = POCKET_ITEMS,
@@ -10207,7 +9429,6 @@ const struct Item gItems[] =
     [ITEM_FAIRY_TERA_SHARD] =
     {
         .name = _("FairyTeraShrd"),
-        .itemId = ITEM_FAIRY_TERA_SHARD,
         .price = 0,
         .description = sTeraShardDesc,
         .pocket = POCKET_ITEMS,
@@ -10218,7 +9439,6 @@ const struct Item gItems[] =
     [ITEM_FIGHTING_TERA_SHARD] =
     {
         .name = _("FghtngTerShrd"),
-        .itemId = ITEM_FIGHTING_TERA_SHARD,
         .price = 0,
         .description = sTeraShardDesc,
         .pocket = POCKET_ITEMS,
@@ -10229,7 +9449,6 @@ const struct Item gItems[] =
     [ITEM_FIRE_TERA_SHARD] =
     {
         .name = _("FireTeraShard"),
-        .itemId = ITEM_FIRE_TERA_SHARD,
         .price = 0,
         .description = sTeraShardDesc,
         .pocket = POCKET_ITEMS,
@@ -10240,7 +9459,6 @@ const struct Item gItems[] =
     [ITEM_FLYING_TERA_SHARD] =
     {
         .name = _("FlyngTeraShrd"),
-        .itemId = ITEM_FLYING_TERA_SHARD,
         .price = 0,
         .description = sTeraShardDesc,
         .pocket = POCKET_ITEMS,
@@ -10251,7 +9469,6 @@ const struct Item gItems[] =
     [ITEM_GHOST_TERA_SHARD] =
     {
         .name = _("GhostTeraShrd"),
-        .itemId = ITEM_GHOST_TERA_SHARD,
         .price = 0,
         .description = sTeraShardDesc,
         .pocket = POCKET_ITEMS,
@@ -10262,7 +9479,6 @@ const struct Item gItems[] =
     [ITEM_GRASS_TERA_SHARD] =
     {
         .name = _("GrassTeraShrd"),
-        .itemId = ITEM_GRASS_TERA_SHARD,
         .price = 0,
         .description = sTeraShardDesc,
         .pocket = POCKET_ITEMS,
@@ -10273,7 +9489,6 @@ const struct Item gItems[] =
     [ITEM_GROUND_TERA_SHARD] =
     {
         .name = _("GrondTeraShrd"),
-        .itemId = ITEM_GROUND_TERA_SHARD,
         .price = 0,
         .description = sTeraShardDesc,
         .pocket = POCKET_ITEMS,
@@ -10284,7 +9499,6 @@ const struct Item gItems[] =
     [ITEM_ICE_TERA_SHARD] =
     {
         .name = _("Ice TeraShard"),
-        .itemId = ITEM_ICE_TERA_SHARD,
         .price = 0,
         .description = sTeraShardDesc,
         .pocket = POCKET_ITEMS,
@@ -10295,7 +9509,6 @@ const struct Item gItems[] =
     [ITEM_NORMAL_TERA_SHARD] =
     {
         .name = _("NormlTeraShrd"),
-        .itemId = ITEM_NORMAL_TERA_SHARD,
         .price = 0,
         .description = sTeraShardDesc,
         .pocket = POCKET_ITEMS,
@@ -10306,7 +9519,6 @@ const struct Item gItems[] =
     [ITEM_POISON_TERA_SHARD] =
     {
         .name = _("PoisnTeraShrd"),
-        .itemId = ITEM_POISON_TERA_SHARD,
         .price = 0,
         .description = sTeraShardDesc,
         .pocket = POCKET_ITEMS,
@@ -10317,7 +9529,6 @@ const struct Item gItems[] =
     [ITEM_PSYCHIC_TERA_SHARD] =
     {
         .name = _("PschcTeraShrd"),
-        .itemId = ITEM_PSYCHIC_TERA_SHARD,
         .price = 0,
         .description = sTeraShardDesc,
         .pocket = POCKET_ITEMS,
@@ -10328,7 +9539,6 @@ const struct Item gItems[] =
     [ITEM_ROCK_TERA_SHARD] =
     {
         .name = _("RockTeraShard"),
-        .itemId = ITEM_ROCK_TERA_SHARD,
         .price = 0,
         .description = sTeraShardDesc,
         .pocket = POCKET_ITEMS,
@@ -10339,7 +9549,6 @@ const struct Item gItems[] =
     [ITEM_STEEL_TERA_SHARD] =
     {
         .name = _("SteelTeraShrd"),
-        .itemId = ITEM_STEEL_TERA_SHARD,
         .price = 0,
         .description = sTeraShardDesc,
         .pocket = POCKET_ITEMS,
@@ -10350,7 +9559,6 @@ const struct Item gItems[] =
     [ITEM_WATER_TERA_SHARD] =
     {
         .name = _("WaterTeraShrd"),
-        .itemId = ITEM_WATER_TERA_SHARD,
         .price = 0,
         .description = sTeraShardDesc,
         .pocket = POCKET_ITEMS,
@@ -10361,7 +9569,6 @@ const struct Item gItems[] =
     [ITEM_ADAMANT_CRYSTAL] =
     {
         .name = _("AdamantCrystl"),
-        .itemId = ITEM_ADAMANT_CRYSTAL,
         .price = 0,
         .description = sAdamantCrystalDesc,
         .pocket = POCKET_ITEMS,
@@ -10373,7 +9580,6 @@ const struct Item gItems[] =
     [ITEM_GRISEOUS_CORE] =
     {
         .name = _("Griseous Core"),
-        .itemId = ITEM_GRISEOUS_CORE,
         .price = 0,
         .description = sGriseousCoreDesc,
         .pocket = POCKET_ITEMS,
@@ -10385,7 +9591,6 @@ const struct Item gItems[] =
     [ITEM_LUSTROUS_GLOBE] =
     {
         .name = _("LustrousGlobe"),
-        .itemId = ITEM_LUSTROUS_GLOBE,
         .price = 0,
         .description = sLustrousGlobeDesc,
         .pocket = POCKET_ITEMS,
@@ -10397,7 +9602,6 @@ const struct Item gItems[] =
     [ITEM_BLACK_AUGURITE] =
     {
         .name = _("BlackAugurite"),
-        .itemId = ITEM_BLACK_AUGURITE,
         .price = 8000,
         .description = sBlackAuguriteDesc,
         .pocket = POCKET_ITEMS,
@@ -10409,7 +9613,6 @@ const struct Item gItems[] =
     [ITEM_LINKING_CORD] =
     {
         .name = _("Linking Cord"),
-        .itemId = ITEM_LINKING_CORD,
         .price = 8000,
         .description = sLinkingCordDesc,
         .pocket = POCKET_ITEMS,
@@ -10421,7 +9624,6 @@ const struct Item gItems[] =
     [ITEM_PEAT_BLOCK] =
     {
         .name = _("Peat Block"),
-        .itemId = ITEM_PEAT_BLOCK,
         .price = 10000,
         .description = sPeatBlockDesc,
         .pocket = POCKET_ITEMS,
@@ -10433,7 +9635,6 @@ const struct Item gItems[] =
     [ITEM_BERSERK_GENE] =
     {
         .name = _("Berserk Gene"),
-        .itemId = ITEM_BERSERK_GENE,
         .price = 20,
         .holdEffect = HOLD_EFFECT_BERSERK_GENE,
         .description = sBerserkGene,