From d2ac94f1e4cffa373db8edb0f6356052a5cc2888 Mon Sep 17 00:00:00 2001 From: Gamer2020 Date: Fri, 16 Aug 2019 18:38:41 -0400 Subject: [PATCH] Fixing commented out item names. --- src/data/pokemon/base_stats.h | 622 +++++++++++++++++----------------- 1 file changed, 311 insertions(+), 311 deletions(-) diff --git a/src/data/pokemon/base_stats.h b/src/data/pokemon/base_stats.h index 934110b78..ff699953d 100644 --- a/src/data/pokemon/base_stats.h +++ b/src/data/pokemon/base_stats.h @@ -293,7 +293,7 @@ const struct BaseStats gBaseStats[] = .expYield = 178, .evYield_SpAttack = 2, .evYield_SpDefense = 1, - .item2 = ITEM_NONE, // ITEMSILVER_POWDER, + .item2 = ITEM_NONE, // ITEM_SILVER_POWDER, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 15, .friendship = 70, @@ -369,7 +369,7 @@ const struct BaseStats gBaseStats[] = .evYield_Attack = 2, .evYield_SpAttack = 0, .evYield_SpDefense = 1, - .item2 = ITEM_NONE, // ITEMPOISON_BARB, + .item2 = ITEM_NONE, // ITEM_POISON_BARB, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 15, .friendship = 70, @@ -520,7 +520,7 @@ const struct BaseStats gBaseStats[] = .expYield = 52, .evYield_Speed = 1, .evYield_SpAttack = 0, - .item2 = ITEM_NONE, // ITEMSHARP_BEAK, + .item2 = ITEM_NONE, // ITEM_SHARP_BEAK, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 15, .friendship = 70, @@ -546,7 +546,7 @@ const struct BaseStats gBaseStats[] = .expYield = 155, .evYield_Speed = 2, .evYield_SpAttack = 0, - .item2 = ITEM_NONE, // ITEMSHARP_BEAK, + .item2 = ITEM_NONE, // ITEM_SHARP_BEAK, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 15, .friendship = 70, @@ -622,7 +622,7 @@ const struct BaseStats gBaseStats[] = .expYield = 112, .evYield_Speed = 2, .evYield_SpAttack = 0, - .item2 = ITEM_NONE, // ITEMLIGHT_BALL, + .item2 = ITEM_NONE, // ITEM_LIGHT_BALL, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 10, .friendship = 70, @@ -673,7 +673,7 @@ const struct BaseStats gBaseStats[] = .expYield = 60, .evYield_Defense = 1, .evYield_SpAttack = 0, - .item2 = ITEM_NONE, // ITEMGRIP_CLAW, + .item2 = ITEM_NONE, // ITEM_GRIP_CLAW, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, @@ -699,7 +699,7 @@ const struct BaseStats gBaseStats[] = .expYield = 158, .evYield_Defense = 2, .evYield_SpAttack = 0, - .item2 = ITEM_NONE, // ITEMGRIP_CLAW, + .item2 = ITEM_NONE, // ITEM_GRIP_CLAW, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, @@ -875,7 +875,7 @@ const struct BaseStats gBaseStats[] = .expYield = 113, .evYield_HP = 2, .evYield_SpAttack = 0, - .item2 = ITEM_NONE, // ITEMMOON_STONE, + .item2 = ITEM_NONE, // ITEM_MOON_STONE, .genderRatio = PERCENT_FEMALE(75), .eggCycles = 10, .friendship = 140, @@ -901,7 +901,7 @@ const struct BaseStats gBaseStats[] = .expYield = 217, .evYield_HP = 3, .evYield_SpAttack = 0, - .item2 = ITEM_NONE, // ITEMMOON_STONE, + .item2 = ITEM_NONE, // ITEM_MOON_STONE, .genderRatio = PERCENT_FEMALE(75), .eggCycles = 10, .friendship = 140, @@ -927,7 +927,7 @@ const struct BaseStats gBaseStats[] = .expYield = 60, .evYield_Speed = 1, .evYield_SpAttack = 0, - .item2 = ITEM_NONE, // ITEMCHARCOAL, + .item2 = ITEM_NONE, // ITEM_CHARCOAL, .genderRatio = PERCENT_FEMALE(75), .eggCycles = 20, .friendship = 70, @@ -954,7 +954,7 @@ const struct BaseStats gBaseStats[] = .evYield_Speed = 1, .evYield_SpAttack = 0, .evYield_SpDefense = 1, - .item2 = ITEM_NONE, // ITEMCHARCOAL, + .item2 = ITEM_NONE, // ITEM_CHARCOAL, .genderRatio = PERCENT_FEMALE(75), .eggCycles = 20, .friendship = 70, @@ -980,7 +980,7 @@ const struct BaseStats gBaseStats[] = .expYield = 95, .evYield_HP = 2, .evYield_SpAttack = 0, - .item2 = ITEM_NONE, // ITEMMOON_STONE, + .item2 = ITEM_NONE, // ITEM_MOON_STONE, .genderRatio = PERCENT_FEMALE(75), .eggCycles = 10, .friendship = 70, @@ -1006,7 +1006,7 @@ const struct BaseStats gBaseStats[] = .expYield = 196, .evYield_HP = 3, .evYield_SpAttack = 0, - .item2 = ITEM_NONE, // ITEMMOON_STONE, + .item2 = ITEM_NONE, // ITEM_MOON_STONE, .genderRatio = PERCENT_FEMALE(75), .eggCycles = 10, .friendship = 70, @@ -1081,7 +1081,7 @@ const struct BaseStats gBaseStats[] = .catchRate = 255, .expYield = 64, .evYield_SpAttack = 1, - .item2 = ITEM_NONE, // ITEMABSORB_BULB, + .item2 = ITEM_NONE, // ITEM_ABSORB_BULB, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, @@ -1106,7 +1106,7 @@ const struct BaseStats gBaseStats[] = .catchRate = 120, .expYield = 138, .evYield_SpAttack = 2, - .item2 = ITEM_NONE, // ITEMABSORB_BULB, + .item2 = ITEM_NONE, // ITEM_ABSORB_BULB, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, @@ -1131,7 +1131,7 @@ const struct BaseStats gBaseStats[] = .catchRate = 45, .expYield = 221, .evYield_SpAttack = 3, - .item2 = ITEM_NONE, // ITEMABSORB_BULB, + .item2 = ITEM_NONE, // ITEM_ABSORB_BULB, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, @@ -1157,8 +1157,8 @@ const struct BaseStats gBaseStats[] = .expYield = 57, .evYield_Attack = 1, .evYield_SpAttack = 0, - .item1 = ITEM_NONE, // ITEMTINY_MUSHROOM, - .item2 = ITEM_NONE, // ITEMBIG_MUSHROOM, + .item1 = ITEM_NONE, // ITEM_TINY_MUSHROOM, + .item2 = ITEM_NONE, // ITEM_BIG_MUSHROOM, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, @@ -1185,8 +1185,8 @@ const struct BaseStats gBaseStats[] = .evYield_Attack = 2, .evYield_Defense = 1, .evYield_SpAttack = 0, - .item1 = ITEM_NONE, // ITEMTINY_MUSHROOM, - .item2 = ITEM_NONE, // ITEMBIG_MUSHROOM, + .item1 = ITEM_NONE, // ITEM_TINY_MUSHROOM, + .item2 = ITEM_NONE, // ITEM_BIG_MUSHROOM, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, @@ -1237,7 +1237,7 @@ const struct BaseStats gBaseStats[] = .expYield = 158, .evYield_Speed = 1, .evYield_SpAttack = 1, - .item2 = ITEM_NONE, // ITEMSHED_SHELL, + .item2 = ITEM_NONE, // ITEM_SHED_SHELL, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, @@ -1263,7 +1263,7 @@ const struct BaseStats gBaseStats[] = .expYield = 53, .evYield_Speed = 1, .evYield_SpAttack = 0, - .item2 = ITEM_NONE, // ITEMSOFT_SAND, + .item2 = ITEM_NONE, // ITEM_SOFT_SAND, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, @@ -1289,7 +1289,7 @@ const struct BaseStats gBaseStats[] = .expYield = 149, .evYield_Speed = 2, .evYield_SpAttack = 0, - .item2 = ITEM_NONE, // ITEMSOFT_SAND, + .item2 = ITEM_NONE, // ITEM_SOFT_SAND, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, @@ -1315,7 +1315,7 @@ const struct BaseStats gBaseStats[] = .expYield = 58, .evYield_Speed = 1, .evYield_SpAttack = 0, - .item2 = ITEM_NONE, // ITEMQUICK_CLAW, + .item2 = ITEM_NONE, // ITEM_QUICK_CLAW, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, @@ -1341,7 +1341,7 @@ const struct BaseStats gBaseStats[] = .expYield = 154, .evYield_Speed = 2, .evYield_SpAttack = 0, - .item2 = ITEM_NONE, // ITEMQUICK_CLAW, + .item2 = ITEM_NONE, // ITEM_QUICK_CLAW, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, @@ -1540,7 +1540,7 @@ const struct BaseStats gBaseStats[] = .expYield = 135, .evYield_Speed = 2, .evYield_SpAttack = 0, - .item2 = ITEM_NONE, // ITEMKINGS_ROCK, + .item2 = ITEM_NONE, // ITEM_KINGS_ROCK, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, @@ -1566,7 +1566,7 @@ const struct BaseStats gBaseStats[] = .expYield = 230, .evYield_Defense = 3, .evYield_SpAttack = 0, - .item2 = ITEM_NONE, // ITEMKINGS_ROCK, + .item2 = ITEM_NONE, // ITEM_KINGS_ROCK, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, @@ -1591,7 +1591,7 @@ const struct BaseStats gBaseStats[] = .catchRate = 200, .expYield = 62, .evYield_SpAttack = 1, - .item2 = ITEM_NONE, // ITEMTWISTED_SPOON, + .item2 = ITEM_NONE, // ITEM_TWISTED_SPOON, .genderRatio = PERCENT_FEMALE(25), .eggCycles = 20, .friendship = 70, @@ -1616,7 +1616,7 @@ const struct BaseStats gBaseStats[] = .catchRate = 100, .expYield = 140, .evYield_SpAttack = 2, - .item2 = ITEM_NONE, // ITEMTWISTED_SPOON, + .item2 = ITEM_NONE, // ITEM_TWISTED_SPOON, .genderRatio = PERCENT_FEMALE(25), .eggCycles = 20, .friendship = 70, @@ -1641,7 +1641,7 @@ const struct BaseStats gBaseStats[] = .catchRate = 50, .expYield = 225, .evYield_SpAttack = 3, - .item2 = ITEM_NONE, // ITEMTWISTED_SPOON, + .item2 = ITEM_NONE, // ITEM_TWISTED_SPOON, .genderRatio = PERCENT_FEMALE(25), .eggCycles = 20, .friendship = 70, @@ -1667,7 +1667,7 @@ const struct BaseStats gBaseStats[] = .expYield = 61, .evYield_Attack = 1, .evYield_SpAttack = 0, - .item2 = ITEM_NONE, // ITEMFOCUS_BAND, + .item2 = ITEM_NONE, // ITEM_FOCUS_BAND, .genderRatio = PERCENT_FEMALE(25), .eggCycles = 20, .friendship = 70, @@ -1693,7 +1693,7 @@ const struct BaseStats gBaseStats[] = .expYield = 142, .evYield_Attack = 2, .evYield_SpAttack = 0, - .item2 = ITEM_NONE, // ITEMFOCUS_BAND, + .item2 = ITEM_NONE, // ITEM_FOCUS_BAND, .genderRatio = PERCENT_FEMALE(25), .eggCycles = 20, .friendship = 70, @@ -1719,7 +1719,7 @@ const struct BaseStats gBaseStats[] = .expYield = 227, .evYield_Attack = 3, .evYield_SpAttack = 0, - .item2 = ITEM_NONE, // ITEMFOCUS_BAND, + .item2 = ITEM_NONE, // ITEM_FOCUS_BAND, .genderRatio = PERCENT_FEMALE(25), .eggCycles = 20, .friendship = 70, @@ -1820,7 +1820,7 @@ const struct BaseStats gBaseStats[] = .expYield = 67, .evYield_SpAttack = 0, .evYield_SpDefense = 1, - .item2 = ITEM_NONE, // ITEMPOISON_BARB, + .item2 = ITEM_NONE, // ITEM_POISON_BARB, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, @@ -1846,7 +1846,7 @@ const struct BaseStats gBaseStats[] = .expYield = 180, .evYield_SpAttack = 0, .evYield_SpDefense = 2, - .item2 = ITEM_NONE, // ITEMPOISON_BARB, + .item2 = ITEM_NONE, // ITEM_POISON_BARB, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, @@ -1872,7 +1872,7 @@ const struct BaseStats gBaseStats[] = .expYield = 60, .evYield_Defense = 1, .evYield_SpAttack = 0, - .item2 = ITEM_NONE, // ITEMEVERSTONE, + .item2 = ITEM_NONE, // ITEM_EVERSTONE, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 15, .friendship = 70, @@ -1898,7 +1898,7 @@ const struct BaseStats gBaseStats[] = .expYield = 137, .evYield_Defense = 2, .evYield_SpAttack = 0, - .item2 = ITEM_NONE, // ITEMEVERSTONE, + .item2 = ITEM_NONE, // ITEM_EVERSTONE, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 15, .friendship = 70, @@ -1924,7 +1924,7 @@ const struct BaseStats gBaseStats[] = .expYield = 223, .evYield_Defense = 3, .evYield_SpAttack = 0, - .item2 = ITEM_NONE, // ITEMEVERSTONE, + .item2 = ITEM_NONE, // ITEM_EVERSTONE, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 15, .friendship = 70, @@ -2000,7 +2000,7 @@ const struct BaseStats gBaseStats[] = .expYield = 63, .evYield_HP = 1, .evYield_SpAttack = 0, - .item2 = ITEM_NONE, // ITEMLAGGING_TAIL, + .item2 = ITEM_NONE, // ITEM_LAGGING_TAIL, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, @@ -2026,7 +2026,7 @@ const struct BaseStats gBaseStats[] = .expYield = 172, .evYield_Defense = 2, .evYield_SpAttack = 0, - .item2 = ITEM_NONE, // ITEMKINGS_ROCK, + .item2 = ITEM_NONE, // ITEM_KINGS_ROCK, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, @@ -2051,7 +2051,7 @@ const struct BaseStats gBaseStats[] = .catchRate = 190, .expYield = 65, .evYield_SpAttack = 1, - .item2 = ITEM_NONE, // ITEMMETAL_COAT, + .item2 = ITEM_NONE, // ITEM_METAL_COAT, .genderRatio = MON_GENDERLESS, .eggCycles = 20, .friendship = 70, @@ -2076,7 +2076,7 @@ const struct BaseStats gBaseStats[] = .catchRate = 60, .expYield = 163, .evYield_SpAttack = 2, - .item2 = ITEM_NONE, // ITEMMETAL_COAT, + .item2 = ITEM_NONE, // ITEM_METAL_COAT, .genderRatio = MON_GENDERLESS, .eggCycles = 20, .friendship = 70, @@ -2102,7 +2102,7 @@ const struct BaseStats gBaseStats[] = .expYield = 132, .evYield_Attack = 1, .evYield_SpAttack = 0, - .item2 = ITEM_NONE, // ITEMSTICK, + .item2 = ITEM_NONE, // ITEM_STICK, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, @@ -2128,7 +2128,7 @@ const struct BaseStats gBaseStats[] = .expYield = 62, .evYield_Attack = 1, .evYield_SpAttack = 0, - .item2 = ITEM_NONE, // ITEMSHARP_BEAK, + .item2 = ITEM_NONE, // ITEM_SHARP_BEAK, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, @@ -2154,7 +2154,7 @@ const struct BaseStats gBaseStats[] = .expYield = 165, .evYield_Attack = 2, .evYield_SpAttack = 0, - .item2 = ITEM_NONE, // ITEMSHARP_BEAK, + .item2 = ITEM_NONE, // ITEM_SHARP_BEAK, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, @@ -2230,7 +2230,7 @@ const struct BaseStats gBaseStats[] = .expYield = 65, .evYield_HP = 1, .evYield_SpAttack = 0, - .item2 = ITEM_NONE, // ITEMBLACK_SLUDGE, + .item2 = ITEM_NONE, // ITEM_BLACK_SLUDGE, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, @@ -2257,7 +2257,7 @@ const struct BaseStats gBaseStats[] = .evYield_HP = 1, .evYield_Attack = 1, .evYield_SpAttack = 0, - .item1 = ITEM_NONE, // ITEMBLACK_SLUDGE, + .item1 = ITEM_NONE, // ITEM_BLACK_SLUDGE, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, @@ -2283,8 +2283,8 @@ const struct BaseStats gBaseStats[] = .expYield = 61, .evYield_Defense = 1, .evYield_SpAttack = 0, - .item1 = ITEM_NONE, // ITEMPEARL, - .item2 = ITEM_NONE, // ITEMBIG_PEARL, + .item1 = ITEM_NONE, // ITEM_PEARL, + .item2 = ITEM_NONE, // ITEM_BIG_PEARL, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, @@ -2310,8 +2310,8 @@ const struct BaseStats gBaseStats[] = .expYield = 184, .evYield_Defense = 2, .evYield_SpAttack = 0, - .item1 = ITEM_NONE, // ITEMPEARL, - .item2 = ITEM_NONE, // ITEMBIG_PEARL, + .item1 = ITEM_NONE, // ITEM_PEARL, + .item2 = ITEM_NONE, // ITEM_BIG_PEARL, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, @@ -2581,7 +2581,7 @@ const struct BaseStats gBaseStats[] = .expYield = 65, .evYield_Defense = 1, .evYield_SpAttack = 0, - .item2 = ITEM_NONE, // ITEMPSYCHIC_SEED, + .item2 = ITEM_NONE, // ITEM_PSYCHIC_SEED, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, @@ -2631,7 +2631,7 @@ const struct BaseStats gBaseStats[] = .expYield = 64, .evYield_Defense = 1, .evYield_SpAttack = 0, - .item2 = ITEM_NONE, // ITEMTHICK_CLUB, + .item2 = ITEM_NONE, // ITEM_THICK_CLUB, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, @@ -2657,7 +2657,7 @@ const struct BaseStats gBaseStats[] = .expYield = 149, .evYield_Defense = 2, .evYield_SpAttack = 0, - .item2 = ITEM_NONE, // ITEMTHICK_CLUB, + .item2 = ITEM_NONE, // ITEM_THICK_CLUB, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, @@ -2733,7 +2733,7 @@ const struct BaseStats gBaseStats[] = .expYield = 77, .evYield_HP = 2, .evYield_SpAttack = 0, - .item2 = ITEM_NONE, // ITEMLAGGING_TAIL, + .item2 = ITEM_NONE, // ITEM_LAGGING_TAIL, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, @@ -2759,7 +2759,7 @@ const struct BaseStats gBaseStats[] = .expYield = 68, .evYield_Defense = 1, .evYield_SpAttack = 0, - .item2 = ITEM_NONE, // ITEMSMOKE_BALL, + .item2 = ITEM_NONE, // ITEM_SMOKE_BALL, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, @@ -2784,7 +2784,7 @@ const struct BaseStats gBaseStats[] = .expYield = 172, .evYield_Defense = 2, .evYield_SpAttack = 0, - .item2 = ITEM_NONE, // ITEMSMOKE_BALL, + .item2 = ITEM_NONE, // ITEM_SMOKE_BALL, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, @@ -2859,7 +2859,7 @@ const struct BaseStats gBaseStats[] = .expYield = 395, .evYield_HP = 2, .evYield_SpAttack = 0, - .item1 = ITEM_NONE, // ITEMLUCKY_PUNCH, + .item1 = ITEM_NONE, // ITEM_LUCKY_PUNCH, .genderRatio = MON_FEMALE, .eggCycles = 40, .friendship = 140, @@ -2934,7 +2934,7 @@ const struct BaseStats gBaseStats[] = .catchRate = 225, .expYield = 59, .evYield_SpAttack = 1, - .item2 = ITEM_NONE, // ITEMDRAGON_SCALE, + .item2 = ITEM_NONE, // ITEM_DRAGON_SCALE, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, @@ -2960,7 +2960,7 @@ const struct BaseStats gBaseStats[] = .expYield = 154, .evYield_Defense = 1, .evYield_SpAttack = 1, - .item2 = ITEM_NONE, // ITEMDRAGON_SCALE, + .item2 = ITEM_NONE, // ITEM_DRAGON_SCALE, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, @@ -2986,7 +2986,7 @@ const struct BaseStats gBaseStats[] = .expYield = 64, .evYield_Attack = 1, .evYield_SpAttack = 0, - .item2 = ITEM_NONE, // ITEMMYSTIC_WATER, + .item2 = ITEM_NONE, // ITEM_MYSTIC_WATER, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, @@ -3012,7 +3012,7 @@ const struct BaseStats gBaseStats[] = .expYield = 158, .evYield_Attack = 2, .evYield_SpAttack = 0, - .item2 = ITEM_NONE, // ITEMMYSTIC_WATER, + .item2 = ITEM_NONE, // ITEM_MYSTIC_WATER, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, @@ -3038,8 +3038,8 @@ const struct BaseStats gBaseStats[] = .expYield = 68, .evYield_Speed = 1, .evYield_SpAttack = 0, - .item1 = ITEM_NONE, // ITEMSTARDUST, - .item2 = ITEM_NONE, // ITEMSTAR_PIECE, + .item1 = ITEM_NONE, // ITEM_STARDUST, + .item2 = ITEM_NONE, // ITEM_STAR_PIECE, .genderRatio = MON_GENDERLESS, .eggCycles = 20, .friendship = 70, @@ -3065,8 +3065,8 @@ const struct BaseStats gBaseStats[] = .expYield = 182, .evYield_Speed = 2, .evYield_SpAttack = 0, - .item1 = ITEM_NONE, // ITEMSTARDUST, - .item2 = ITEM_NONE, // ITEMSTAR_PIECE, + .item1 = ITEM_NONE, // ITEM_STARDUST, + .item2 = ITEM_NONE, // ITEM_STAR_PIECE, .genderRatio = MON_GENDERLESS, .eggCycles = 20, .friendship = 70, @@ -3166,7 +3166,7 @@ const struct BaseStats gBaseStats[] = .expYield = 172, .evYield_Speed = 2, .evYield_SpAttack = 0, - .item2 = ITEM_NONE, // ITEMELECTIRIZER, + .item2 = ITEM_NONE, // ITEM_ELECTIRIZER, .genderRatio = PERCENT_FEMALE(25), .eggCycles = 25, .friendship = 70, @@ -3191,7 +3191,7 @@ const struct BaseStats gBaseStats[] = .catchRate = 45, .expYield = 173, .evYield_SpAttack = 2, - .item2 = ITEM_NONE, // ITEMMAGMARIZER, + .item2 = ITEM_NONE, // ITEM_MAGMARIZER, .genderRatio = PERCENT_FEMALE(25), .eggCycles = 25, .friendship = 70, @@ -3318,8 +3318,8 @@ const struct BaseStats gBaseStats[] = .expYield = 187, .evYield_HP = 2, .evYield_SpAttack = 0, - .item1 = ITEM_NONE, // ITEMMYSTIC_WATER, - .item2 = ITEM_NONE, // ITEMMYSTIC_WATER, + .item1 = ITEM_NONE, // ITEM_MYSTIC_WATER, + .item2 = ITEM_NONE, // ITEM_MYSTIC_WATER, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 40, .friendship = 70, @@ -3345,8 +3345,8 @@ const struct BaseStats gBaseStats[] = .expYield = 101, .evYield_HP = 1, .evYield_SpAttack = 0, - .item1 = ITEM_NONE, // ITEMQUICK_POWDER, - .item2 = ITEM_NONE, // ITEMMETAL_POWDER, + .item1 = ITEM_NONE, // ITEM_QUICK_POWDER, + .item2 = ITEM_NONE, // ITEM_METAL_POWDER, .genderRatio = MON_GENDERLESS, .eggCycles = 20, .friendship = 70, @@ -3621,8 +3621,8 @@ const struct BaseStats gBaseStats[] = .expYield = 189, .evYield_HP = 2, .evYield_SpAttack = 0, - .item1 = ITEM_NONE, // ITEMLEFTOVERS, - .item2 = ITEM_NONE, // ITEMLEFTOVERS, + .item1 = ITEM_NONE, // ITEM_LEFTOVERS, + .item2 = ITEM_NONE, // ITEM_LEFTOVERS, .genderRatio = PERCENT_FEMALE(12.5), .eggCycles = 40, .friendship = 70, @@ -3721,7 +3721,7 @@ const struct BaseStats gBaseStats[] = .expYield = 60, .evYield_Attack = 1, .evYield_SpAttack = 0, - .item2 = ITEM_NONE, // ITEMDRAGON_SCALE, + .item2 = ITEM_NONE, // ITEM_DRAGON_SCALE, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 40, .friendship = 35, @@ -3747,7 +3747,7 @@ const struct BaseStats gBaseStats[] = .expYield = 147, .evYield_Attack = 2, .evYield_SpAttack = 0, - .item2 = ITEM_NONE, // ITEMDRAGON_SCALE, + .item2 = ITEM_NONE, // ITEM_DRAGON_SCALE, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 40, .friendship = 35, @@ -3773,7 +3773,7 @@ const struct BaseStats gBaseStats[] = .expYield = 270, .evYield_Attack = 3, .evYield_SpAttack = 0, - .item2 = ITEM_NONE, // ITEMDRAGON_SCALE, + .item2 = ITEM_NONE, // ITEM_DRAGON_SCALE, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 40, .friendship = 35, @@ -3823,8 +3823,8 @@ const struct BaseStats gBaseStats[] = .expYield = 270, .evYield_HP = 3, .evYield_SpAttack = 0, - .item1 = ITEM_NONE, // ITEMLUM_BERRY, - .item2 = ITEM_NONE, // ITEMLUM_BERRY, + .item1 = ITEM_NONE, // ITEM_LUM_BERRY, + .item2 = ITEM_NONE, // ITEM_LUM_BERRY, .genderRatio = MON_GENDERLESS, .eggCycles = 120, .friendship = 100, @@ -4302,7 +4302,7 @@ const struct BaseStats gBaseStats[] = .expYield = 66, .evYield_HP = 1, .evYield_SpAttack = 0, - .item2 = ITEM_NONE, // ITEMDEEP_SEA_SCALE, + .item2 = ITEM_NONE, // ITEM_DEEP_SEA_SCALE, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, @@ -4328,7 +4328,7 @@ const struct BaseStats gBaseStats[] = .expYield = 161, .evYield_HP = 2, .evYield_SpAttack = 0, - .item2 = ITEM_NONE, // ITEMDEEP_SEA_SCALE, + .item2 = ITEM_NONE, // ITEM_DEEP_SEA_SCALE, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, @@ -4379,7 +4379,7 @@ const struct BaseStats gBaseStats[] = .expYield = 44, .evYield_SpAttack = 0, .evYield_SpDefense = 1, - .item2 = ITEM_NONE, // ITEMMOON_STONE, + .item2 = ITEM_NONE, // ITEM_MOON_STONE, .genderRatio = PERCENT_FEMALE(75), .eggCycles = 10, .friendship = 140, @@ -4601,7 +4601,7 @@ const struct BaseStats gBaseStats[] = .expYield = 221, .evYield_SpAttack = 0, .evYield_SpDefense = 3, - .item2 = ITEM_NONE, // ITEMABSORB_BULB, + .item2 = ITEM_NONE, // ITEM_ABSORB_BULB, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, @@ -4702,7 +4702,7 @@ const struct BaseStats gBaseStats[] = .expYield = 225, .evYield_SpAttack = 0, .evYield_SpDefense = 3, - .item2 = ITEM_NONE, // ITEMKINGS_ROCK, + .item2 = ITEM_NONE, // ITEM_KINGS_ROCK, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, @@ -4876,7 +4876,7 @@ const struct BaseStats gBaseStats[] = .expYield = 78, .evYield_Speed = 1, .evYield_SpAttack = 0, - .item2 = ITEM_NONE, // ITEMWIDE_LENS, + .item2 = ITEM_NONE, // ITEM_WIDE_LENS, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, @@ -5026,7 +5026,7 @@ const struct BaseStats gBaseStats[] = .expYield = 172, .evYield_SpAttack = 0, .evYield_SpDefense = 3, - .item2 = ITEM_NONE, // ITEMKINGS_ROCK, + .item2 = ITEM_NONE, // ITEM_KINGS_ROCK, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, @@ -5249,7 +5249,7 @@ const struct BaseStats gBaseStats[] = .expYield = 179, .evYield_Defense = 2, .evYield_SpAttack = 0, - .item2 = ITEM_NONE, // ITEMMETAL_COAT, + .item2 = ITEM_NONE, // ITEM_METAL_COAT, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 25, .friendship = 70, @@ -5325,7 +5325,7 @@ const struct BaseStats gBaseStats[] = .expYield = 88, .evYield_Attack = 1, .evYield_SpAttack = 0, - .item2 = ITEM_NONE, // ITEMPOISON_BARB, + .item2 = ITEM_NONE, // ITEM_POISON_BARB, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, @@ -5377,8 +5377,8 @@ const struct BaseStats gBaseStats[] = .evYield_Defense = 1, .evYield_SpAttack = 0, .evYield_SpDefense = 1, - .item1 = ITEM_NONE, // ITEMBERRY_JUICE, - .item2 = ITEM_NONE, // ITEMBERRY_JUICE, + .item1 = ITEM_NONE, // ITEM_BERRY_JUICE, + .item2 = ITEM_NONE, // ITEM_BERRY_JUICE, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, @@ -5429,7 +5429,7 @@ const struct BaseStats gBaseStats[] = .expYield = 86, .evYield_Speed = 1, .evYield_SpAttack = 0, - .item2 = ITEM_NONE, // ITEMQUICK_CLAW, + .item2 = ITEM_NONE, // ITEM_QUICK_CLAW, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 35, @@ -5606,7 +5606,7 @@ const struct BaseStats gBaseStats[] = .evYield_Defense = 1, .evYield_SpAttack = 0, .evYield_SpDefense = 1, - .item2 = ITEM_NONE, // ITEMLUMINOUS_MOSS, + .item2 = ITEM_NONE, // ITEM_LUMINOUS_MOSS, .genderRatio = PERCENT_FEMALE(75), .eggCycles = 20, .friendship = 70, @@ -5731,7 +5731,7 @@ const struct BaseStats gBaseStats[] = .expYield = 163, .evYield_Defense = 2, .evYield_SpAttack = 0, - .item2 = ITEM_NONE, // ITEMMETAL_COAT, + .item2 = ITEM_NONE, // ITEM_METAL_COAT, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 25, .friendship = 70, @@ -5806,7 +5806,7 @@ const struct BaseStats gBaseStats[] = .evYield_Attack = 1, .evYield_SpAttack = 1, .evYield_SpDefense = 1, - .item2 = ITEM_NONE, // ITEMDRAGON_SCALE, + .item2 = ITEM_NONE, // ITEM_DRAGON_SCALE, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, @@ -6031,7 +6031,7 @@ const struct BaseStats gBaseStats[] = .expYield = 72, .evYield_Speed = 1, .evYield_SpAttack = 0, - .item2 = ITEM_NONE, // ITEMELECTIRIZER, + .item2 = ITEM_NONE, // ITEM_ELECTIRIZER, .genderRatio = PERCENT_FEMALE(25), .eggCycles = 25, .friendship = 70, @@ -6057,7 +6057,7 @@ const struct BaseStats gBaseStats[] = .expYield = 73, .evYield_Speed = 1, .evYield_SpAttack = 0, - .item2 = ITEM_NONE, // ITEMMAGMARIZER, + .item2 = ITEM_NONE, // ITEM_MAGMARIZER, .genderRatio = PERCENT_FEMALE(25), .eggCycles = 25, .friendship = 70, @@ -6083,8 +6083,8 @@ const struct BaseStats gBaseStats[] = .expYield = 172, .evYield_Defense = 2, .evYield_SpAttack = 0, - .item1 = ITEM_NONE, // ITEMMOOMOO_MILK, - .item2 = ITEM_NONE, // ITEMMOOMOO_MILK, + .item1 = ITEM_NONE, // ITEM_MOOMOO_MILK, + .item2 = ITEM_NONE, // ITEM_MOOMOO_MILK, .genderRatio = MON_FEMALE, .eggCycles = 20, .friendship = 70, @@ -6110,7 +6110,7 @@ const struct BaseStats gBaseStats[] = .expYield = 608, .evYield_HP = 3, .evYield_SpAttack = 0, - .item2 = ITEM_NONE, // ITEMLUCKY_EGG, + .item2 = ITEM_NONE, // ITEM_LUCKY_EGG, .genderRatio = MON_FEMALE, .eggCycles = 40, .friendship = 140, @@ -6312,8 +6312,8 @@ const struct BaseStats gBaseStats[] = .expYield = 306, .evYield_SpAttack = 0, .evYield_SpDefense = 3, - .item1 = ITEM_NONE, // ITEMSACRED_ASH, - .item2 = ITEM_NONE, // ITEMSACRED_ASH, + .item1 = ITEM_NONE, // ITEM_SACRED_ASH, + .item2 = ITEM_NONE, // ITEM_SACRED_ASH, .genderRatio = MON_GENDERLESS, .eggCycles = 120, .friendship = 0, @@ -6339,8 +6339,8 @@ const struct BaseStats gBaseStats[] = .expYield = 270, .evYield_HP = 3, .evYield_SpAttack = 0, - .item1 = ITEM_NONE, // ITEMLUM_BERRY, - .item2 = ITEM_NONE, // ITEMLUM_BERRY, + .item1 = ITEM_NONE, // ITEM_LUM_BERRY, + .item2 = ITEM_NONE, // ITEM_LUM_BERRY, .genderRatio = MON_GENDERLESS, .eggCycles = 120, .friendship = 100, @@ -6639,8 +6639,8 @@ const struct BaseStats gBaseStats[] = .expYield = 56, .evYield_Speed = 1, .evYield_SpAttack = 0, - .item1 = ITEM_NONE, // ITEMPOTION, - .item2 = ITEM_NONE, // ITEMREVIVE, + .item1 = ITEM_NONE, // ITEM_POTION, + .item2 = ITEM_NONE, // ITEM_REVIVE, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 15, .friendship = 70, @@ -6666,8 +6666,8 @@ const struct BaseStats gBaseStats[] = .expYield = 147, .evYield_Speed = 2, .evYield_SpAttack = 0, - .item1 = ITEM_NONE, // ITEMPOTION, - .item2 = ITEM_NONE, // ITEMMAX_REVIVE, + .item1 = ITEM_NONE, // ITEM_POTION, + .item2 = ITEM_NONE, // ITEM_MAX_REVIVE, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 15, .friendship = 70, @@ -6693,8 +6693,8 @@ const struct BaseStats gBaseStats[] = .expYield = 56, .evYield_HP = 1, .evYield_SpAttack = 0, - .item1 = ITEM_NONE, // ITEMPECHA_BERRY, - .item2 = ITEM_NONE, // ITEMBRIGHT_POWDER, + .item1 = ITEM_NONE, // ITEM_PECHA_BERRY, + .item2 = ITEM_NONE, // ITEM_BRIGHT_POWDER, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 15, .friendship = 70, @@ -6743,7 +6743,7 @@ const struct BaseStats gBaseStats[] = .catchRate = 45, .expYield = 178, .evYield_SpAttack = 3, - .item2 = ITEM_NONE, // ITEMSHED_SHELL, + .item2 = ITEM_NONE, // ITEM_SHED_SHELL, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 15, .friendship = 70, @@ -6793,7 +6793,7 @@ const struct BaseStats gBaseStats[] = .expYield = 173, .evYield_SpAttack = 0, .evYield_SpDefense = 3, - .item2 = ITEM_NONE, // ITEMSHED_SHELL, + .item2 = ITEM_NONE, // ITEM_SHED_SHELL, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 15, .friendship = 70, @@ -6819,7 +6819,7 @@ const struct BaseStats gBaseStats[] = .expYield = 44, .evYield_SpAttack = 0, .evYield_SpDefense = 1, - .item2 = ITEM_NONE, // ITEMMENTAL_HERB, + .item2 = ITEM_NONE, // ITEM_MENTAL_HERB, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 15, .friendship = 70, @@ -6845,7 +6845,7 @@ const struct BaseStats gBaseStats[] = .expYield = 119, .evYield_SpAttack = 0, .evYield_SpDefense = 2, - .item2 = ITEM_NONE, // ITEMMENTAL_HERB, + .item2 = ITEM_NONE, // ITEM_MENTAL_HERB, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 15, .friendship = 70, @@ -6871,7 +6871,7 @@ const struct BaseStats gBaseStats[] = .expYield = 216, .evYield_SpAttack = 0, .evYield_SpDefense = 3, - .item2 = ITEM_NONE, // ITEMMENTAL_HERB, + .item2 = ITEM_NONE, // ITEM_MENTAL_HERB, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 15, .friendship = 70, @@ -6897,7 +6897,7 @@ const struct BaseStats gBaseStats[] = .expYield = 44, .evYield_Defense = 1, .evYield_SpAttack = 0, - .item2 = ITEM_NONE, // ITEMPOWER_HERB, + .item2 = ITEM_NONE, // ITEM_POWER_HERB, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 15, .friendship = 70, @@ -6923,7 +6923,7 @@ const struct BaseStats gBaseStats[] = .expYield = 119, .evYield_Attack = 2, .evYield_SpAttack = 0, - .item2 = ITEM_NONE, // ITEMPOWER_HERB, + .item2 = ITEM_NONE, // ITEM_POWER_HERB, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 15, .friendship = 70, @@ -6949,7 +6949,7 @@ const struct BaseStats gBaseStats[] = .expYield = 216, .evYield_Attack = 3, .evYield_SpAttack = 0, - .item2 = ITEM_NONE, // ITEMPOWER_HERB, + .item2 = ITEM_NONE, // ITEM_POWER_HERB, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 15, .friendship = 70, @@ -7025,7 +7025,7 @@ const struct BaseStats gBaseStats[] = .expYield = 54, .evYield_Speed = 1, .evYield_SpAttack = 0, - .item1 = ITEM_NONE, // ITEMPRETTY_WING, + .item1 = ITEM_NONE, // ITEM_PRETTY_WING, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, @@ -7051,7 +7051,7 @@ const struct BaseStats gBaseStats[] = .expYield = 154, .evYield_Defense = 2, .evYield_SpAttack = 0, - .item1 = ITEM_NONE, // ITEMPRETTY_WING, + .item1 = ITEM_NONE, // ITEM_PRETTY_WING, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, @@ -7149,7 +7149,7 @@ const struct BaseStats gBaseStats[] = .expYield = 54, .evYield_Speed = 1, .evYield_SpAttack = 0, - .item1 = ITEM_NONE, // ITEMHONEY, + .item1 = ITEM_NONE, // ITEM_HONEY, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 15, .friendship = 70, @@ -7175,7 +7175,7 @@ const struct BaseStats gBaseStats[] = .expYield = 159, .evYield_SpAttack = 1, .evYield_SpDefense = 1, - .item2 = ITEM_NONE, // ITEMSILVER_POWDER, + .item2 = ITEM_NONE, // ITEM_SILVER_POWDER, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 15, .friendship = 70, @@ -7201,8 +7201,8 @@ const struct BaseStats gBaseStats[] = .expYield = 59, .evYield_HP = 1, .evYield_SpAttack = 0, - .item1 = ITEM_NONE, // ITEMTINY_MUSHROOM, - .item2 = ITEM_NONE, // ITEMBIG_MUSHROOM, + .item1 = ITEM_NONE, // ITEM_TINY_MUSHROOM, + .item2 = ITEM_NONE, // ITEM_BIG_MUSHROOM, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 15, .friendship = 70, @@ -7228,8 +7228,8 @@ const struct BaseStats gBaseStats[] = .expYield = 161, .evYield_Attack = 2, .evYield_SpAttack = 0, - .item1 = ITEM_NONE, // ITEMTINY_MUSHROOM, - .item2 = ITEM_NONE, // ITEMBIG_MUSHROOM, + .item1 = ITEM_NONE, // ITEM_TINY_MUSHROOM, + .item2 = ITEM_NONE, // ITEM_BIG_MUSHROOM, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 15, .friendship = 70, @@ -7327,7 +7327,7 @@ const struct BaseStats gBaseStats[] = .expYield = 53, .evYield_Defense = 1, .evYield_SpAttack = 0, - .item2 = ITEM_NONE, // ITEMSOFT_SAND, + .item2 = ITEM_NONE, // ITEM_SOFT_SAND, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 15, .friendship = 70, @@ -7477,7 +7477,7 @@ const struct BaseStats gBaseStats[] = .expYield = 47, .evYield_HP = 1, .evYield_SpAttack = 0, - .item2 = ITEM_NONE, // ITEMBLACK_BELT, + .item2 = ITEM_NONE, // ITEM_BLACK_BELT, .genderRatio = PERCENT_FEMALE(25), .eggCycles = 20, .friendship = 70, @@ -7503,7 +7503,7 @@ const struct BaseStats gBaseStats[] = .expYield = 166, .evYield_HP = 2, .evYield_SpAttack = 0, - .item2 = ITEM_NONE, // ITEMKINGS_ROCK, + .item2 = ITEM_NONE, // ITEM_KINGS_ROCK, .genderRatio = PERCENT_FEMALE(25), .eggCycles = 20, .friendship = 70, @@ -7554,7 +7554,7 @@ const struct BaseStats gBaseStats[] = .expYield = 75, .evYield_Defense = 1, .evYield_SpAttack = 0, - .item2 = ITEM_NONE, // ITEMMAGNET, + .item2 = ITEM_NONE, // ITEM_MAGNET, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, @@ -7632,7 +7632,7 @@ const struct BaseStats gBaseStats[] = .evYield_Attack = 1, .evYield_Defense = 1, .evYield_SpAttack = 0, - .item2 = ITEM_NONE, // ITEMWIDE_LENS, + .item2 = ITEM_NONE, // ITEM_WIDE_LENS, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 25, .friendship = 35, @@ -7659,7 +7659,7 @@ const struct BaseStats gBaseStats[] = .evYield_Attack = 1, .evYield_Defense = 1, .evYield_SpAttack = 0, - .item2 = ITEM_NONE, // ITEMIRON_BALL, + .item2 = ITEM_NONE, // ITEM_IRON_BALL, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, @@ -7685,7 +7685,7 @@ const struct BaseStats gBaseStats[] = .expYield = 66, .evYield_Defense = 1, .evYield_SpAttack = 0, - .item2 = ITEM_NONE, // ITEMHARD_STONE, + .item2 = ITEM_NONE, // ITEM_HARD_STONE, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 35, .friendship = 35, @@ -7711,7 +7711,7 @@ const struct BaseStats gBaseStats[] = .expYield = 151, .evYield_Defense = 2, .evYield_SpAttack = 0, - .item2 = ITEM_NONE, // ITEMHARD_STONE, + .item2 = ITEM_NONE, // ITEM_HARD_STONE, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 35, .friendship = 35, @@ -7737,7 +7737,7 @@ const struct BaseStats gBaseStats[] = .expYield = 239, .evYield_Defense = 3, .evYield_SpAttack = 0, - .item2 = ITEM_NONE, // ITEMHARD_STONE, + .item2 = ITEM_NONE, // ITEM_HARD_STONE, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 35, .friendship = 35, @@ -7863,7 +7863,7 @@ const struct BaseStats gBaseStats[] = .expYield = 142, .evYield_Speed = 1, .evYield_SpAttack = 0, - .item2 = ITEM_NONE, // ITEMCELL_BATTERY, + .item2 = ITEM_NONE, // ITEM_CELL_BATTERY, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, @@ -7889,7 +7889,7 @@ const struct BaseStats gBaseStats[] = .expYield = 142, .evYield_Speed = 1, .evYield_SpAttack = 0, - .item2 = ITEM_NONE, // ITEMCELL_BATTERY, + .item2 = ITEM_NONE, // ITEM_CELL_BATTERY, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, @@ -7915,7 +7915,7 @@ const struct BaseStats gBaseStats[] = .expYield = 151, .evYield_Speed = 1, .evYield_SpAttack = 0, - .item2 = ITEM_NONE, // ITEMBRIGHT_POWDER, + .item2 = ITEM_NONE, // ITEM_BRIGHT_POWDER, .genderRatio = MON_MALE, .eggCycles = 15, .friendship = 70, @@ -7941,7 +7941,7 @@ const struct BaseStats gBaseStats[] = .expYield = 151, .evYield_Speed = 1, .evYield_SpAttack = 0, - .item2 = ITEM_NONE, // ITEMBRIGHT_POWDER, + .item2 = ITEM_NONE, // ITEM_BRIGHT_POWDER, .genderRatio = MON_FEMALE, .eggCycles = 15, .friendship = 70, @@ -7966,7 +7966,7 @@ const struct BaseStats gBaseStats[] = .catchRate = 150, .expYield = 140, .evYield_SpAttack = 2, - .item2 = ITEM_NONE, // ITEMPOISON_BARB, + .item2 = ITEM_NONE, // ITEM_POISON_BARB, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, @@ -7992,8 +7992,8 @@ const struct BaseStats gBaseStats[] = .expYield = 60, .evYield_HP = 1, .evYield_SpAttack = 0, - .item1 = ITEM_NONE, // ITEMORAN_BERRY, - .item2 = ITEM_NONE, // ITEMSITRUS_BERRY, + .item1 = ITEM_NONE, // ITEM_ORAN_BERRY, + .item2 = ITEM_NONE, // ITEM_SITRUS_BERRY, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, @@ -8019,8 +8019,8 @@ const struct BaseStats gBaseStats[] = .expYield = 163, .evYield_HP = 2, .evYield_SpAttack = 0, - .item1 = ITEM_NONE, // ITEMORAN_BERRY, - .item2 = ITEM_NONE, // ITEMSITRUS_BERRY, + .item1 = ITEM_NONE, // ITEM_ORAN_BERRY, + .item2 = ITEM_NONE, // ITEM_SITRUS_BERRY, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, @@ -8046,7 +8046,7 @@ const struct BaseStats gBaseStats[] = .expYield = 61, .evYield_Attack = 1, .evYield_SpAttack = 0, - .item2 = ITEM_NONE, // ITEMDEEP_SEA_TOOTH, + .item2 = ITEM_NONE, // ITEM_DEEP_SEA_TOOTH, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 35, @@ -8072,7 +8072,7 @@ const struct BaseStats gBaseStats[] = .expYield = 161, .evYield_Attack = 2, .evYield_SpAttack = 0, - .item2 = ITEM_NONE, // ITEMDEEP_SEA_TOOTH, + .item2 = ITEM_NONE, // ITEM_DEEP_SEA_TOOTH, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 35, @@ -8197,7 +8197,7 @@ const struct BaseStats gBaseStats[] = .expYield = 165, .evYield_Defense = 2, .evYield_SpAttack = 0, - .item2 = ITEM_NONE, // ITEMCHARCOAL, + .item2 = ITEM_NONE, // ITEM_CHARCOAL, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, @@ -8297,7 +8297,7 @@ const struct BaseStats gBaseStats[] = .expYield = 58, .evYield_Attack = 1, .evYield_SpAttack = 0, - .item2 = ITEM_NONE, // ITEMSOFT_SAND, + .item2 = ITEM_NONE, // ITEM_SOFT_SAND, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, @@ -8372,7 +8372,7 @@ const struct BaseStats gBaseStats[] = .catchRate = 190, .expYield = 67, .evYield_SpAttack = 1, - .item2 = ITEM_NONE, // ITEMSTICKY_BARB, + .item2 = ITEM_NONE, // ITEM_STICKY_BARB, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 35, @@ -8398,7 +8398,7 @@ const struct BaseStats gBaseStats[] = .expYield = 166, .evYield_Attack = 1, .evYield_SpAttack = 1, - .item2 = ITEM_NONE, // ITEMSTICKY_BARB, + .item2 = ITEM_NONE, // ITEM_STICKY_BARB, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 35, @@ -8474,7 +8474,7 @@ const struct BaseStats gBaseStats[] = .expYield = 160, .evYield_Attack = 2, .evYield_SpAttack = 0, - .item2 = ITEM_NONE, // ITEMQUICK_CLAW, + .item2 = ITEM_NONE, // ITEM_QUICK_CLAW, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, @@ -8500,7 +8500,7 @@ const struct BaseStats gBaseStats[] = .expYield = 160, .evYield_Attack = 1, .evYield_SpAttack = 1, - .item2 = ITEM_NONE, // ITEMSHED_SHELL, + .item2 = ITEM_NONE, // ITEM_SHED_SHELL, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, @@ -8525,8 +8525,8 @@ const struct BaseStats gBaseStats[] = .catchRate = 45, .expYield = 161, .evYield_SpAttack = 2, - .item1 = ITEM_NONE, // ITEMSTARDUST, - .item2 = ITEM_NONE, // ITEMMOON_STONE, + .item1 = ITEM_NONE, // ITEM_STARDUST, + .item2 = ITEM_NONE, // ITEM_MOON_STONE, .genderRatio = MON_GENDERLESS, .eggCycles = 25, .friendship = 70, @@ -8551,8 +8551,8 @@ const struct BaseStats gBaseStats[] = .expYield = 161, .evYield_Attack = 2, .evYield_SpAttack = 0, - .item1 = ITEM_NONE, // ITEMSTARDUST, - .item2 = ITEM_NONE, // ITEMSUN_STONE, + .item1 = ITEM_NONE, // ITEM_STARDUST, + .item2 = ITEM_NONE, // ITEM_SUN_STONE, .genderRatio = MON_GENDERLESS, .eggCycles = 25, .friendship = 70, @@ -8677,7 +8677,7 @@ const struct BaseStats gBaseStats[] = .expYield = 60, .evYield_SpAttack = 0, .evYield_SpDefense = 1, - .item2 = ITEM_NONE, // ITEMLIGHT_CLAY, + .item2 = ITEM_NONE, // ITEM_LIGHT_CLAY, .genderRatio = MON_GENDERLESS, .eggCycles = 20, .friendship = 70, @@ -8702,7 +8702,7 @@ const struct BaseStats gBaseStats[] = .expYield = 175, .evYield_SpAttack = 0, .evYield_SpDefense = 2, - .item2 = ITEM_NONE, // ITEMLIGHT_CLAY, + .item2 = ITEM_NONE, // ITEM_LIGHT_CLAY, .genderRatio = MON_GENDERLESS, .eggCycles = 20, .friendship = 70, @@ -8727,7 +8727,7 @@ const struct BaseStats gBaseStats[] = .expYield = 71, .evYield_SpAttack = 0, .evYield_SpDefense = 1, - .item2 = ITEM_NONE, // ITEMBIG_ROOT, + .item2 = ITEM_NONE, // ITEM_BIG_ROOT, .genderRatio = PERCENT_FEMALE(12.5), .eggCycles = 30, .friendship = 70, @@ -8753,7 +8753,7 @@ const struct BaseStats gBaseStats[] = .expYield = 173, .evYield_SpAttack = 0, .evYield_SpDefense = 2, - .item2 = ITEM_NONE, // ITEMBIG_ROOT, + .item2 = ITEM_NONE, // ITEM_BIG_ROOT, .genderRatio = PERCENT_FEMALE(12.5), .eggCycles = 30, .friendship = 70, @@ -8879,8 +8879,8 @@ const struct BaseStats gBaseStats[] = .expYield = 147, .evYield_HP = 1, .evYield_SpAttack = 0, - .item1 = ITEM_NONE, // ITEMMYSTIC_WATER, - .item2 = ITEM_NONE, // ITEMMYSTIC_WATER, + .item1 = ITEM_NONE, // ITEM_MYSTIC_WATER, + .item2 = ITEM_NONE, // ITEM_MYSTIC_WATER, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 25, .friendship = 70, @@ -8930,7 +8930,7 @@ const struct BaseStats gBaseStats[] = .expYield = 59, .evYield_Attack = 1, .evYield_SpAttack = 0, - .item2 = ITEM_NONE, // ITEMSPELL_TAG, + .item2 = ITEM_NONE, // ITEM_SPELL_TAG, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 25, .friendship = 35, @@ -8956,7 +8956,7 @@ const struct BaseStats gBaseStats[] = .expYield = 159, .evYield_Attack = 2, .evYield_SpAttack = 0, - .item2 = ITEM_NONE, // ITEMSPELL_TAG, + .item2 = ITEM_NONE, // ITEM_SPELL_TAG, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 25, .friendship = 35, @@ -8982,7 +8982,7 @@ const struct BaseStats gBaseStats[] = .expYield = 59, .evYield_SpAttack = 0, .evYield_SpDefense = 1, - .item2 = ITEM_NONE, // ITEMSPELL_TAG, + .item2 = ITEM_NONE, // ITEM_SPELL_TAG, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 25, .friendship = 35, @@ -9009,7 +9009,7 @@ const struct BaseStats gBaseStats[] = .evYield_Defense = 1, .evYield_SpAttack = 0, .evYield_SpDefense = 1, - .item2 = ITEM_NONE, // ITEMSPELL_TAG, + .item2 = ITEM_NONE, // ITEM_SPELL_TAG, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 25, .friendship = 35, @@ -9060,7 +9060,7 @@ const struct BaseStats gBaseStats[] = .expYield = 159, .evYield_SpAttack = 1, .evYield_SpDefense = 1, - .item2 = ITEM_NONE, // ITEMCLEANSE_TAG, + .item2 = ITEM_NONE, // ITEM_CLEANSE_TAG, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 25, .friendship = 70, @@ -9135,7 +9135,7 @@ const struct BaseStats gBaseStats[] = .expYield = 60, .evYield_HP = 1, .evYield_SpAttack = 0, - .item2 = ITEM_NONE, // ITEMSNOWBALL, + .item2 = ITEM_NONE, // ITEM_SNOWBALL, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, @@ -9261,8 +9261,8 @@ const struct BaseStats gBaseStats[] = .expYield = 69, .evYield_Defense = 1, .evYield_SpAttack = 0, - .item1 = ITEM_NONE, // ITEMPEARL, - .item2 = ITEM_NONE, // ITEMBIG_PEARL, + .item1 = ITEM_NONE, // ITEM_PEARL, + .item2 = ITEM_NONE, // ITEM_BIG_PEARL, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, @@ -9289,7 +9289,7 @@ const struct BaseStats gBaseStats[] = .evYield_Attack = 1, .evYield_Defense = 1, .evYield_SpAttack = 0, - .item2 = ITEM_NONE, // ITEMDEEP_SEA_TOOTH, + .item2 = ITEM_NONE, // ITEM_DEEP_SEA_TOOTH, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, @@ -9314,7 +9314,7 @@ const struct BaseStats gBaseStats[] = .catchRate = 60, .expYield = 170, .evYield_SpAttack = 2, - .item2 = ITEM_NONE, // ITEMDEEP_SEA_SCALE, + .item2 = ITEM_NONE, // ITEM_DEEP_SEA_SCALE, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, @@ -9341,7 +9341,7 @@ const struct BaseStats gBaseStats[] = .evYield_HP = 1, .evYield_Defense = 1, .evYield_SpAttack = 0, - .item2 = ITEM_NONE, // ITEMDEEP_SEA_SCALE, + .item2 = ITEM_NONE, // ITEM_DEEP_SEA_SCALE, .genderRatio = PERCENT_FEMALE(12.5), .eggCycles = 40, .friendship = 70, @@ -9367,7 +9367,7 @@ const struct BaseStats gBaseStats[] = .expYield = 116, .evYield_Speed = 1, .evYield_SpAttack = 0, - .item1 = ITEM_NONE, // ITEMHEART_SCALE, + .item1 = ITEM_NONE, // ITEM_HEART_SCALE, .genderRatio = PERCENT_FEMALE(75), .eggCycles = 20, .friendship = 70, @@ -9393,7 +9393,7 @@ const struct BaseStats gBaseStats[] = .expYield = 60, .evYield_Attack = 1, .evYield_SpAttack = 0, - .item2 = ITEM_NONE, // ITEMDRAGON_FANG, + .item2 = ITEM_NONE, // ITEM_DRAGON_FANG, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 40, .friendship = 35, @@ -9419,7 +9419,7 @@ const struct BaseStats gBaseStats[] = .expYield = 147, .evYield_Defense = 2, .evYield_SpAttack = 0, - .item2 = ITEM_NONE, // ITEMDRAGON_FANG, + .item2 = ITEM_NONE, // ITEM_DRAGON_FANG, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 40, .friendship = 35, @@ -9445,7 +9445,7 @@ const struct BaseStats gBaseStats[] = .expYield = 270, .evYield_Attack = 3, .evYield_SpAttack = 0, - .item2 = ITEM_NONE, // ITEMDRAGON_FANG, + .item2 = ITEM_NONE, // ITEM_DRAGON_FANG, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 40, .friendship = 35, @@ -9471,7 +9471,7 @@ const struct BaseStats gBaseStats[] = .expYield = 60, .evYield_Defense = 1, .evYield_SpAttack = 0, - .item2 = ITEM_NONE, // ITEMMETAL_COAT, + .item2 = ITEM_NONE, // ITEM_METAL_COAT, .genderRatio = MON_GENDERLESS, .eggCycles = 40, .friendship = 35, @@ -9497,7 +9497,7 @@ const struct BaseStats gBaseStats[] = .expYield = 147, .evYield_Defense = 2, .evYield_SpAttack = 0, - .item2 = ITEM_NONE, // ITEMMETAL_COAT, + .item2 = ITEM_NONE, // ITEM_METAL_COAT, .genderRatio = MON_GENDERLESS, .eggCycles = 40, .friendship = 35, @@ -9523,7 +9523,7 @@ const struct BaseStats gBaseStats[] = .expYield = 270, .evYield_Defense = 3, .evYield_SpAttack = 0, - .item2 = ITEM_NONE, // ITEMMETAL_COAT, + .item2 = ITEM_NONE, // ITEM_METAL_COAT, .genderRatio = MON_GENDERLESS, .eggCycles = 40, .friendship = 35, @@ -9743,8 +9743,8 @@ const struct BaseStats gBaseStats[] = .expYield = 270, .evYield_HP = 3, .evYield_SpAttack = 0, - .item1 = ITEM_NONE, // ITEMSTAR_PIECE, - .item2 = ITEM_NONE, // ITEMSTAR_PIECE, + .item1 = ITEM_NONE, // ITEM_STAR_PIECE, + .item2 = ITEM_NONE, // ITEM_STAR_PIECE, .genderRatio = MON_GENDERLESS, .eggCycles = 120, .friendship = 100, @@ -10144,7 +10144,7 @@ const struct BaseStats gBaseStats[] = .expYield = 39, .evYield_Defense = 1, .evYield_SpAttack = 0, - .item2 = ITEM_NONE, // ITEMMETRONOME, + .item2 = ITEM_NONE, // ITEM_METRONOME, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 15, .friendship = 70, @@ -10170,7 +10170,7 @@ const struct BaseStats gBaseStats[] = .expYield = 134, .evYield_Attack = 2, .evYield_SpAttack = 0, - .item2 = ITEM_NONE, // ITEMMETRONOME, + .item2 = ITEM_NONE, // ITEM_METRONOME, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 15, .friendship = 70, @@ -10270,7 +10270,7 @@ const struct BaseStats gBaseStats[] = .catchRate = 255, .expYield = 56, .evYield_SpAttack = 1, - .item2 = ITEM_NONE, // ITEMPOISON_BARB, + .item2 = ITEM_NONE, // ITEM_POISON_BARB, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, @@ -10295,7 +10295,7 @@ const struct BaseStats gBaseStats[] = .catchRate = 75, .expYield = 232, .evYield_SpAttack = 3, - .item2 = ITEM_NONE, // ITEMPOISON_BARB, + .item2 = ITEM_NONE, // ITEM_POISON_BARB, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, @@ -10494,7 +10494,7 @@ const struct BaseStats gBaseStats[] = .expYield = 148, .evYield_SpAttack = 0, .evYield_SpDefense = 2, - .item2 = ITEM_NONE, // ITEMSILVER_POWDER, + .item2 = ITEM_NONE, // ITEM_SILVER_POWDER, .genderRatio = MON_FEMALE, .eggCycles = 15, .friendship = 70, @@ -10571,7 +10571,7 @@ const struct BaseStats gBaseStats[] = .expYield = 148, .evYield_Attack = 1, .evYield_SpAttack = 1, - .item2 = ITEM_NONE, // ITEMSILVER_POWDER, + .item2 = ITEM_NONE, // ITEM_SILVER_POWDER, .genderRatio = MON_MALE, .eggCycles = 15, .friendship = 70, @@ -10597,7 +10597,7 @@ const struct BaseStats gBaseStats[] = .expYield = 49, .evYield_Speed = 1, .evYield_SpAttack = 0, - .item2 = ITEM_NONE, // ITEMHONEY, + .item2 = ITEM_NONE, // ITEM_HONEY, .genderRatio = PERCENT_FEMALE(12.5), .eggCycles = 15, .friendship = 70, @@ -10624,7 +10624,7 @@ const struct BaseStats gBaseStats[] = .evYield_Defense = 1, .evYield_SpAttack = 0, .evYield_SpDefense = 1, - .item2 = ITEM_NONE, // ITEMPOISON_BARB, + .item2 = ITEM_NONE, // ITEM_POISON_BARB, .genderRatio = MON_FEMALE, .eggCycles = 15, .friendship = 70, @@ -10724,7 +10724,7 @@ const struct BaseStats gBaseStats[] = .catchRate = 190, .expYield = 55, .evYield_SpAttack = 1, - .item2 = ITEM_NONE, // ITEMMIRACLE_SEED, + .item2 = ITEM_NONE, // ITEM_MIRACLE_SEED, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, @@ -10748,7 +10748,7 @@ const struct BaseStats gBaseStats[] = .catchRate = 75, .expYield = 158, .evYield_SpAttack = 2, - .item2 = ITEM_NONE, // ITEMMIRACLE_SEED, + .item2 = ITEM_NONE, // ITEM_MIRACLE_SEED, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, @@ -11046,7 +11046,7 @@ const struct BaseStats gBaseStats[] = .catchRate = 120, .expYield = 57, .evYield_SpAttack = 1, - .item2 = ITEM_NONE, // ITEMCLEANSE_TAG, + .item2 = ITEM_NONE, // ITEM_CLEANSE_TAG, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 25, .friendship = 70, @@ -11121,7 +11121,7 @@ const struct BaseStats gBaseStats[] = .expYield = 60, .evYield_Defense = 1, .evYield_SpAttack = 0, - .item2 = ITEM_NONE, // ITEMMETAL_COAT, + .item2 = ITEM_NONE, // ITEM_METAL_COAT, .genderRatio = MON_GENDERLESS, .eggCycles = 20, .friendship = 70, @@ -11148,7 +11148,7 @@ const struct BaseStats gBaseStats[] = .evYield_Defense = 1, .evYield_SpAttack = 0, .evYield_SpDefense = 1, - .item2 = ITEM_NONE, // ITEMMETAL_COAT, + .item2 = ITEM_NONE, // ITEM_METAL_COAT, .genderRatio = MON_GENDERLESS, .eggCycles = 20, .friendship = 70, @@ -11224,7 +11224,7 @@ const struct BaseStats gBaseStats[] = .expYield = 110, .evYield_HP = 1, .evYield_SpAttack = 0, - .item1 = ITEM_NONE, // ITEMOVAL_STONE, + .item1 = ITEM_NONE, // ITEM_OVAL_STONE, .genderRatio = MON_FEMALE, .eggCycles = 40, .friendship = 140, @@ -11250,7 +11250,7 @@ const struct BaseStats gBaseStats[] = .expYield = 144, .evYield_Attack = 1, .evYield_SpAttack = 0, - .item2 = ITEM_NONE, // ITEMMETRONOME, + .item2 = ITEM_NONE, // ITEM_METRONOME, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 35, @@ -11377,8 +11377,8 @@ const struct BaseStats gBaseStats[] = .expYield = 78, .evYield_HP = 1, .evYield_SpAttack = 0, - .item1 = ITEM_NONE, // ITEMLEFTOVERS, - .item2 = ITEM_NONE, // ITEMLEFTOVERS, + .item1 = ITEM_NONE, // ITEM_LEFTOVERS, + .item2 = ITEM_NONE, // ITEM_LEFTOVERS, .genderRatio = PERCENT_FEMALE(12.5), .eggCycles = 40, .friendship = 70, @@ -11504,7 +11504,7 @@ const struct BaseStats gBaseStats[] = .expYield = 66, .evYield_Defense = 1, .evYield_SpAttack = 0, - .item2 = ITEM_NONE, // ITEMPOISON_BARB, + .item2 = ITEM_NONE, // ITEM_POISON_BARB, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, @@ -11530,7 +11530,7 @@ const struct BaseStats gBaseStats[] = .expYield = 175, .evYield_Defense = 2, .evYield_SpAttack = 0, - .item2 = ITEM_NONE, // ITEMPOISON_BARB, + .item2 = ITEM_NONE, // ITEM_POISON_BARB, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, @@ -11556,7 +11556,7 @@ const struct BaseStats gBaseStats[] = .expYield = 60, .evYield_Attack = 1, .evYield_SpAttack = 0, - .item2 = ITEM_NONE, // ITEMBLACK_SLUDGE, + .item2 = ITEM_NONE, // ITEM_BLACK_SLUDGE, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 10, .friendship = 100, @@ -11582,7 +11582,7 @@ const struct BaseStats gBaseStats[] = .expYield = 172, .evYield_Attack = 2, .evYield_SpAttack = 0, - .item2 = ITEM_NONE, // ITEMBLACK_SLUDGE, + .item2 = ITEM_NONE, // ITEM_BLACK_SLUDGE, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, @@ -11707,7 +11707,7 @@ const struct BaseStats gBaseStats[] = .expYield = 67, .evYield_Attack = 1, .evYield_SpAttack = 0, - .item2 = ITEM_NONE, // ITEMNEVER_MELT_ICE, + .item2 = ITEM_NONE, // ITEM_NEVER_MELT_ICE, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, @@ -11733,7 +11733,7 @@ const struct BaseStats gBaseStats[] = .expYield = 173, .evYield_Attack = 1, .evYield_SpAttack = 1, - .item2 = ITEM_NONE, // ITEMNEVER_MELT_ICE, + .item2 = ITEM_NONE, // ITEM_NEVER_MELT_ICE, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, @@ -11760,7 +11760,7 @@ const struct BaseStats gBaseStats[] = .evYield_Attack = 1, .evYield_Speed = 1, .evYield_SpAttack = 0, - .item2 = ITEM_NONE, // ITEMQUICK_CLAW, + .item2 = ITEM_NONE, // ITEM_QUICK_CLAW, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 35, @@ -11785,7 +11785,7 @@ const struct BaseStats gBaseStats[] = .catchRate = 30, .expYield = 241, .evYield_SpAttack = 3, - .item2 = ITEM_NONE, // ITEMMETAL_COAT, + .item2 = ITEM_NONE, // ITEM_METAL_COAT, .genderRatio = MON_GENDERLESS, .eggCycles = 20, .friendship = 70, @@ -11811,7 +11811,7 @@ const struct BaseStats gBaseStats[] = .expYield = 180, .evYield_HP = 3, .evYield_SpAttack = 0, - .item2 = ITEM_NONE, // ITEMLAGGING_TAIL, + .item2 = ITEM_NONE, // ITEM_LAGGING_TAIL, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, @@ -11887,7 +11887,7 @@ const struct BaseStats gBaseStats[] = .expYield = 243, .evYield_Attack = 3, .evYield_SpAttack = 0, - .item2 = ITEM_NONE, // ITEMELECTIRIZER, + .item2 = ITEM_NONE, // ITEM_ELECTIRIZER, .genderRatio = PERCENT_FEMALE(25), .eggCycles = 25, .friendship = 70, @@ -11912,7 +11912,7 @@ const struct BaseStats gBaseStats[] = .catchRate = 30, .expYield = 243, .evYield_SpAttack = 3, - .item2 = ITEM_NONE, // ITEMMAGMARIZER, + .item2 = ITEM_NONE, // ITEM_MAGMARIZER, .genderRatio = PERCENT_FEMALE(25), .eggCycles = 25, .friendship = 70, @@ -11963,7 +11963,7 @@ const struct BaseStats gBaseStats[] = .expYield = 180, .evYield_Attack = 2, .evYield_SpAttack = 0, - .item2 = ITEM_NONE, // ITEMWIDE_LENS, + .item2 = ITEM_NONE, // ITEM_WIDE_LENS, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, @@ -12138,7 +12138,7 @@ const struct BaseStats gBaseStats[] = .evYield_Defense = 1, .evYield_SpAttack = 0, .evYield_SpDefense = 2, - .item2 = ITEM_NONE, // ITEMMAGNET, + .item2 = ITEM_NONE, // ITEM_MAGNET, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, @@ -12165,7 +12165,7 @@ const struct BaseStats gBaseStats[] = .evYield_Defense = 1, .evYield_SpAttack = 0, .evYield_SpDefense = 2, - .item2 = ITEM_NONE, // ITEMSPELL_TAG, + .item2 = ITEM_NONE, // ITEM_SPELL_TAG, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 25, .friendship = 35, @@ -12651,8 +12651,8 @@ const struct BaseStats gBaseStats[] = .expYield = 270, .evYield_HP = 3, .evYield_SpAttack = 0, - .item1 = ITEM_NONE, // ITEMLUM_BERRY, - .item2 = ITEM_NONE, // ITEMLUM_BERRY, + .item1 = ITEM_NONE, // ITEM_LUM_BERRY, + .item2 = ITEM_NONE, // ITEM_LUM_BERRY, .genderRatio = MON_GENDERLESS, .eggCycles = 120, .friendship = 100, @@ -13447,8 +13447,8 @@ const struct BaseStats gBaseStats[] = .expYield = 56, .evYield_Defense = 1, .evYield_SpAttack = 0, - .item1 = ITEM_NONE, // ITEMEVERSTONE, - .item2 = ITEM_NONE, // ITEMHARD_STONE, + .item1 = ITEM_NONE, // ITEM_EVERSTONE, + .item2 = ITEM_NONE, // ITEM_HARD_STONE, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 15, .friendship = 70, @@ -13475,8 +13475,8 @@ const struct BaseStats gBaseStats[] = .evYield_Attack = 1, .evYield_Defense = 1, .evYield_SpAttack = 0, - .item1 = ITEM_NONE, // ITEMEVERSTONE, - .item2 = ITEM_NONE, // ITEMHARD_STONE, + .item1 = ITEM_NONE, // ITEM_EVERSTONE, + .item2 = ITEM_NONE, // ITEM_HARD_STONE, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 15, .friendship = 70, @@ -13502,8 +13502,8 @@ const struct BaseStats gBaseStats[] = .expYield = 232, .evYield_Attack = 3, .evYield_SpAttack = 0, - .item1 = ITEM_NONE, // ITEMEVERSTONE, - .item2 = ITEM_NONE, // ITEMHARD_STONE, + .item1 = ITEM_NONE, // ITEM_EVERSTONE, + .item2 = ITEM_NONE, // ITEM_HARD_STONE, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 15, .friendship = 70, @@ -13629,8 +13629,8 @@ const struct BaseStats gBaseStats[] = .expYield = 390, .evYield_HP = 2, .evYield_SpAttack = 0, - .item1 = ITEM_NONE, // ITEMORAN_BERRY, - .item2 = ITEM_NONE, // ITEMSITRUS_BERRY, + .item1 = ITEM_NONE, // ITEM_ORAN_BERRY, + .item2 = ITEM_NONE, // ITEM_SITRUS_BERRY, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, @@ -13806,7 +13806,7 @@ const struct BaseStats gBaseStats[] = .expYield = 163, .evYield_HP = 2, .evYield_SpAttack = 0, - .item2 = ITEM_NONE, // ITEMBLACK_BELT, + .item2 = ITEM_NONE, // ITEM_BLACK_BELT, .genderRatio = MON_MALE, .eggCycles = 20, .friendship = 70, @@ -13832,7 +13832,7 @@ const struct BaseStats gBaseStats[] = .expYield = 163, .evYield_Attack = 2, .evYield_SpAttack = 0, - .item2 = ITEM_NONE, // ITEMBLACK_BELT, + .item2 = ITEM_NONE, // ITEM_BLACK_BELT, .genderRatio = MON_MALE, .eggCycles = 20, .friendship = 70, @@ -13858,7 +13858,7 @@ const struct BaseStats gBaseStats[] = .expYield = 62, .evYield_Defense = 1, .evYield_SpAttack = 0, - .item2 = ITEM_NONE, // ITEMMENTAL_HERB, + .item2 = ITEM_NONE, // ITEM_MENTAL_HERB, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 15, .friendship = 70, @@ -13884,7 +13884,7 @@ const struct BaseStats gBaseStats[] = .expYield = 133, .evYield_Defense = 2, .evYield_SpAttack = 0, - .item2 = ITEM_NONE, // ITEMMENTAL_HERB, + .item2 = ITEM_NONE, // ITEM_MENTAL_HERB, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 15, .friendship = 70, @@ -13910,7 +13910,7 @@ const struct BaseStats gBaseStats[] = .expYield = 225, .evYield_Attack = 3, .evYield_SpAttack = 0, - .item2 = ITEM_NONE, // ITEMMENTAL_HERB, + .item2 = ITEM_NONE, // ITEM_MENTAL_HERB, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 15, .friendship = 70, @@ -13936,7 +13936,7 @@ const struct BaseStats gBaseStats[] = .expYield = 52, .evYield_Defense = 1, .evYield_SpAttack = 0, - .item2 = ITEM_NONE, // ITEMPOISON_BARB, + .item2 = ITEM_NONE, // ITEM_POISON_BARB, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 15, .friendship = 70, @@ -13962,7 +13962,7 @@ const struct BaseStats gBaseStats[] = .expYield = 126, .evYield_Defense = 2, .evYield_SpAttack = 0, - .item2 = ITEM_NONE, // ITEMPOISON_BARB, + .item2 = ITEM_NONE, // ITEM_POISON_BARB, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 15, .friendship = 70, @@ -13988,7 +13988,7 @@ const struct BaseStats gBaseStats[] = .expYield = 218, .evYield_Speed = 3, .evYield_SpAttack = 0, - .item2 = ITEM_NONE, // ITEMPOISON_BARB, + .item2 = ITEM_NONE, // ITEM_POISON_BARB, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, @@ -14014,7 +14014,7 @@ const struct BaseStats gBaseStats[] = .expYield = 56, .evYield_Speed = 1, .evYield_SpAttack = 0, - .item2 = ITEM_NONE, // ITEMABSORB_BULB, + .item2 = ITEM_NONE, // ITEM_ABSORB_BULB, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, @@ -14040,7 +14040,7 @@ const struct BaseStats gBaseStats[] = .expYield = 168, .evYield_Speed = 2, .evYield_SpAttack = 0, - .item2 = ITEM_NONE, // ITEMABSORB_BULB, + .item2 = ITEM_NONE, // ITEM_ABSORB_BULB, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, @@ -14065,7 +14065,7 @@ const struct BaseStats gBaseStats[] = .catchRate = 190, .expYield = 56, .evYield_SpAttack = 1, - .item2 = ITEM_NONE, // ITEMABSORB_BULB, + .item2 = ITEM_NONE, // ITEM_ABSORB_BULB, .genderRatio = MON_FEMALE, .eggCycles = 20, .friendship = 70, @@ -14090,7 +14090,7 @@ const struct BaseStats gBaseStats[] = .catchRate = 75, .expYield = 168, .evYield_SpAttack = 2, - .item2 = ITEM_NONE, // ITEMABSORB_BULB, + .item2 = ITEM_NONE, // ITEM_ABSORB_BULB, .genderRatio = MON_FEMALE, .eggCycles = 20, .friendship = 70, @@ -14116,7 +14116,7 @@ const struct BaseStats gBaseStats[] = .expYield = 161, .evYield_Speed = 2, .evYield_SpAttack = 0, - .item2 = ITEM_NONE, // ITEMDEEP_SEA_TOOTH, + .item2 = ITEM_NONE, // ITEM_DEEP_SEA_TOOTH, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 40, .friendship = 70, @@ -14142,7 +14142,7 @@ const struct BaseStats gBaseStats[] = .expYield = 58, .evYield_Attack = 1, .evYield_SpAttack = 0, - .item2 = ITEM_NONE, // ITEMBLACK_GLASSES, + .item2 = ITEM_NONE, // ITEM_BLACK_GLASSES, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, @@ -14168,7 +14168,7 @@ const struct BaseStats gBaseStats[] = .expYield = 123, .evYield_Attack = 2, .evYield_SpAttack = 0, - .item2 = ITEM_NONE, // ITEMBLACK_GLASSES, + .item2 = ITEM_NONE, // ITEM_BLACK_GLASSES, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, @@ -14194,7 +14194,7 @@ const struct BaseStats gBaseStats[] = .expYield = 234, .evYield_Attack = 3, .evYield_SpAttack = 0, - .item1 = ITEM_NONE, // ITEMBLACK_GLASSES, + .item1 = ITEM_NONE, // ITEM_BLACK_GLASSES, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, @@ -14269,7 +14269,7 @@ const struct BaseStats gBaseStats[] = .catchRate = 255, .expYield = 161, .evYield_SpAttack = 2, - .item2 = ITEM_NONE, // ITEMMIRACLE_SEED, + .item2 = ITEM_NONE, // ITEM_MIRACLE_SEED, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, @@ -14295,7 +14295,7 @@ const struct BaseStats gBaseStats[] = .expYield = 65, .evYield_Defense = 1, .evYield_SpAttack = 0, - .item2 = ITEM_NONE, // ITEMHARD_STONE, + .item2 = ITEM_NONE, // ITEM_HARD_STONE, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, @@ -14321,7 +14321,7 @@ const struct BaseStats gBaseStats[] = .expYield = 170, .evYield_Defense = 2, .evYield_SpAttack = 0, - .item2 = ITEM_NONE, // ITEMHARD_STONE, + .item2 = ITEM_NONE, // ITEM_HARD_STONE, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, @@ -14347,7 +14347,7 @@ const struct BaseStats gBaseStats[] = .expYield = 70, .evYield_Attack = 1, .evYield_SpAttack = 0, - .item2 = ITEM_NONE, // ITEMSHED_SHELL, + .item2 = ITEM_NONE, // ITEM_SHED_SHELL, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 15, .friendship = 35, @@ -14374,7 +14374,7 @@ const struct BaseStats gBaseStats[] = .evYield_Defense = 1, .evYield_SpAttack = 0, .evYield_SpDefense = 1, - .item2 = ITEM_NONE, // ITEMSHED_SHELL, + .item2 = ITEM_NONE, // ITEM_SHED_SHELL, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 15, .friendship = 70, @@ -14424,7 +14424,7 @@ const struct BaseStats gBaseStats[] = .expYield = 61, .evYield_Defense = 1, .evYield_SpAttack = 0, - .item2 = ITEM_NONE, // ITEMSPELL_TAG, + .item2 = ITEM_NONE, // ITEM_SPELL_TAG, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 25, .friendship = 70, @@ -14449,7 +14449,7 @@ const struct BaseStats gBaseStats[] = .expYield = 169, .evYield_Defense = 2, .evYield_SpAttack = 0, - .item2 = ITEM_NONE, // ITEMSPELL_TAG, + .item2 = ITEM_NONE, // ITEM_SPELL_TAG, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 25, .friendship = 70, @@ -14572,7 +14572,7 @@ const struct BaseStats gBaseStats[] = .expYield = 66, .evYield_Speed = 1, .evYield_SpAttack = 0, - .item2 = ITEM_NONE, // ITEMSILK_SCARF, + .item2 = ITEM_NONE, // ITEM_SILK_SCARF, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, @@ -14598,8 +14598,8 @@ const struct BaseStats gBaseStats[] = .expYield = 166, .evYield_Attack = 2, .evYield_SpAttack = 0, - .item1 = ITEM_NONE, // ITEMSILK_SCARF, - .item2 = ITEM_NONE, // ITEMBLACK_SLUDGE, + .item1 = ITEM_NONE, // ITEM_SILK_SCARF, + .item2 = ITEM_NONE, // ITEM_BLACK_SLUDGE, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, @@ -14917,7 +14917,7 @@ const struct BaseStats gBaseStats[] = .catchRate = 255, .expYield = 61, .evYield_SpAttack = 1, - .item2 = ITEM_NONE, // ITEMNEVER_MELT_ICE, + .item2 = ITEM_NONE, // ITEM_NEVER_MELT_ICE, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, @@ -14942,7 +14942,7 @@ const struct BaseStats gBaseStats[] = .catchRate = 120, .expYield = 138, .evYield_SpAttack = 2, - .item2 = ITEM_NONE, // ITEMNEVER_MELT_ICE, + .item2 = ITEM_NONE, // ITEM_NEVER_MELT_ICE, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, @@ -14967,7 +14967,7 @@ const struct BaseStats gBaseStats[] = .catchRate = 45, .expYield = 241, .evYield_SpAttack = 3, - .item1 = ITEM_NONE, // ITEMNEVER_MELT_ICE, + .item1 = ITEM_NONE, // ITEM_NEVER_MELT_ICE, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, @@ -15118,8 +15118,8 @@ const struct BaseStats gBaseStats[] = .expYield = 59, .evYield_HP = 1, .evYield_SpAttack = 0, - .item1 = ITEM_NONE, // ITEMTINY_MUSHROOM, - .item2 = ITEM_NONE, // ITEMBIG_MUSHROOM, + .item1 = ITEM_NONE, // ITEM_TINY_MUSHROOM, + .item2 = ITEM_NONE, // ITEM_BIG_MUSHROOM, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, @@ -15145,8 +15145,8 @@ const struct BaseStats gBaseStats[] = .expYield = 162, .evYield_HP = 2, .evYield_SpAttack = 0, - .item1 = ITEM_NONE, // ITEMTINY_MUSHROOM, - .item2 = ITEM_NONE, // ITEMBIG_MUSHROOM, + .item1 = ITEM_NONE, // ITEM_TINY_MUSHROOM, + .item2 = ITEM_NONE, // ITEM_BIG_MUSHROOM, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, @@ -15297,7 +15297,7 @@ const struct BaseStats gBaseStats[] = .expYield = 61, .evYield_Defense = 1, .evYield_SpAttack = 0, - .item2 = ITEM_NONE, // ITEMSTICKY_BARB, + .item2 = ITEM_NONE, // ITEM_STICKY_BARB, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, @@ -15322,7 +15322,7 @@ const struct BaseStats gBaseStats[] = .expYield = 171, .evYield_Defense = 2, .evYield_SpAttack = 0, - .item2 = ITEM_NONE, // ITEMSTICKY_BARB, + .item2 = ITEM_NONE, // ITEM_STICKY_BARB, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, @@ -15740,7 +15740,7 @@ const struct BaseStats gBaseStats[] = .expYield = 180, .evYield_SpAttack = 0, .evYield_SpDefense = 2, - .item2 = ITEM_NONE, // ITEMNEVER_MELT_ICE, + .item2 = ITEM_NONE, // ITEM_NEVER_MELT_ICE, .genderRatio = MON_GENDERLESS, .eggCycles = 25, .friendship = 70, @@ -15815,7 +15815,7 @@ const struct BaseStats gBaseStats[] = .expYield = 165, .evYield_HP = 2, .evYield_SpAttack = 0, - .item2 = ITEM_NONE, // ITEMSOFT_SAND, + .item2 = ITEM_NONE, // ITEM_SOFT_SAND, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, @@ -15891,7 +15891,7 @@ const struct BaseStats gBaseStats[] = .expYield = 170, .evYield_Attack = 2, .evYield_SpAttack = 0, - .item2 = ITEM_NONE, // ITEMDRAGON_FANG, + .item2 = ITEM_NONE, // ITEM_DRAGON_FANG, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 30, .friendship = 70, @@ -15917,7 +15917,7 @@ const struct BaseStats gBaseStats[] = .expYield = 61, .evYield_Attack = 1, .evYield_SpAttack = 0, - .item2 = ITEM_NONE, // ITEMLIGHT_CLAY, + .item2 = ITEM_NONE, // ITEM_LIGHT_CLAY, .genderRatio = MON_GENDERLESS, .eggCycles = 25, .friendship = 70, @@ -15943,7 +15943,7 @@ const struct BaseStats gBaseStats[] = .expYield = 169, .evYield_Attack = 2, .evYield_SpAttack = 0, - .item2 = ITEM_NONE, // ITEMLIGHT_CLAY, + .item2 = ITEM_NONE, // ITEM_LIGHT_CLAY, .genderRatio = MON_GENDERLESS, .eggCycles = 25, .friendship = 70, @@ -16287,8 +16287,8 @@ const struct BaseStats gBaseStats[] = .catchRate = 15, .expYield = 248, .evYield_SpAttack = 3, - .item1 = ITEM_NONE, // ITEMSILVER_POWDER, - .item2 = ITEM_NONE, // ITEMSILVER_POWDER, + .item1 = ITEM_NONE, // ITEM_SILVER_POWDER, + .item2 = ITEM_NONE, // ITEM_SILVER_POWDER, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 40, .friendship = 70, @@ -16602,8 +16602,8 @@ const struct BaseStats gBaseStats[] = .evYield_Speed = 1, .evYield_SpAttack = 1, .evYield_SpDefense = 1, - .item1 = ITEM_NONE, // ITEMSTAR_PIECE, - .item2 = ITEM_NONE, // ITEMSTAR_PIECE, + .item1 = ITEM_NONE, // ITEM_STAR_PIECE, + .item2 = ITEM_NONE, // ITEM_STAR_PIECE, .genderRatio = MON_GENDERLESS, .eggCycles = 120, .friendship = 100, @@ -17247,7 +17247,7 @@ const struct BaseStats gBaseStats[] = .expYield = 70, .evYield_Attack = 1, .evYield_SpAttack = 0, - .item2 = ITEM_NONE, // ITEMMENTAL_HERB, + .item2 = ITEM_NONE, // ITEM_MENTAL_HERB, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 25, .friendship = 70, @@ -17273,7 +17273,7 @@ const struct BaseStats gBaseStats[] = .expYield = 173, .evYield_Attack = 2, .evYield_SpAttack = 0, - .item2 = ITEM_NONE, // ITEMMENTAL_HERB, + .item2 = ITEM_NONE, // ITEM_MENTAL_HERB, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 25, .friendship = 70, @@ -17941,7 +17941,7 @@ const struct BaseStats gBaseStats[] = .expYield = 175, .evYield_Attack = 2, .evYield_SpAttack = 0, - .item2 = ITEM_NONE, // ITEMKINGS_ROCK, + .item2 = ITEM_NONE, // ITEM_KINGS_ROCK, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, @@ -18018,7 +18018,7 @@ const struct BaseStats gBaseStats[] = .expYield = 60, .evYield_SpAttack = 0, .evYield_SpDefense = 1, - .item2 = ITEM_NONE, // ITEMSHED_SHELL, + .item2 = ITEM_NONE, // ITEM_SHED_SHELL, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 40, .friendship = 35, @@ -18044,7 +18044,7 @@ const struct BaseStats gBaseStats[] = .expYield = 158, .evYield_SpAttack = 0, .evYield_SpDefense = 2, - .item2 = ITEM_NONE, // ITEMSHED_SHELL, + .item2 = ITEM_NONE, // ITEM_SHED_SHELL, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 40, .friendship = 35, @@ -18685,7 +18685,7 @@ const struct BaseStats gBaseStats[] = .expYield = 53, .evYield_Attack = 1, .evYield_SpAttack = 0, - .item2 = ITEM_NONE, // ITEMORAN_BERRY, + .item2 = ITEM_NONE, // ITEM_ORAN_BERRY, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 15, .friendship = 70, @@ -18711,7 +18711,7 @@ const struct BaseStats gBaseStats[] = .expYield = 124, .evYield_Attack = 2, .evYield_SpAttack = 0, - .item2 = ITEM_NONE, // ITEMSITRUS_BERRY, + .item2 = ITEM_NONE, // ITEM_SITRUS_BERRY, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 15, .friendship = 70, @@ -18737,7 +18737,7 @@ const struct BaseStats gBaseStats[] = .expYield = 218, .evYield_Attack = 3, .evYield_SpAttack = 0, - .item2 = ITEM_NONE, // ITEMRAWST_BERRY, + .item2 = ITEM_NONE, // ITEM_RAWST_BERRY, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 15, .friendship = 70, @@ -18763,7 +18763,7 @@ const struct BaseStats gBaseStats[] = .expYield = 51, .evYield_Attack = 1, .evYield_SpAttack = 0, - .item2 = ITEM_NONE, // ITEMPECHA_BERRY, + .item2 = ITEM_NONE, // ITEM_PECHA_BERRY, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 15, .friendship = 70, @@ -18789,7 +18789,7 @@ const struct BaseStats gBaseStats[] = .expYield = 146, .evYield_Attack = 2, .evYield_SpAttack = 0, - .item2 = ITEM_NONE, // ITEMPECHA_BERRY, + .item2 = ITEM_NONE, // ITEM_PECHA_BERRY, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 15, .friendship = 70, @@ -18839,7 +18839,7 @@ const struct BaseStats gBaseStats[] = .expYield = 140, .evYield_Defense = 2, .evYield_SpAttack = 0, - .item2 = ITEM_NONE, // ITEMCELL_BATTERY, + .item2 = ITEM_NONE, // ITEM_CELL_BATTERY, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 15, .friendship = 70, @@ -18887,7 +18887,7 @@ const struct BaseStats gBaseStats[] = .expYield = 68, .evYield_Attack = 1, .evYield_SpAttack = 0, - .item2 = ITEM_NONE, // ITEMASPEAR_BERRY, + .item2 = ITEM_NONE, // ITEM_ASPEAR_BERRY, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, @@ -18913,7 +18913,7 @@ const struct BaseStats gBaseStats[] = .expYield = 167, .evYield_Attack = 2, .evYield_SpAttack = 0, - .item2 = ITEM_NONE, // ITEMCHERI_BERRY, + .item2 = ITEM_NONE, // ITEM_CHERI_BERRY, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, @@ -18938,7 +18938,7 @@ const struct BaseStats gBaseStats[] = .catchRate = 45, .expYield = 167, .evYield_SpAttack = 2, - .item2 = ITEM_NONE, // ITEMHONEY, + .item2 = ITEM_NONE, // ITEM_HONEY, .genderRatio = PERCENT_FEMALE(75), .eggCycles = 20, .friendship = 70, @@ -18963,7 +18963,7 @@ const struct BaseStats gBaseStats[] = .expYield = 61, .evYield_Speed = 1, .evYield_SpAttack = 0, - .item2 = ITEM_NONE, // ITEMHONEY, + .item2 = ITEM_NONE, // ITEM_HONEY, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, @@ -18989,7 +18989,7 @@ const struct BaseStats gBaseStats[] = .expYield = 162, .evYield_Speed = 2, .evYield_SpAttack = 0, - .item2 = ITEM_NONE, // ITEMHONEY, + .item2 = ITEM_NONE, // ITEM_HONEY, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, @@ -19089,7 +19089,7 @@ const struct BaseStats gBaseStats[] = .expYield = 61, .evYield_Defense = 1, .evYield_SpAttack = 0, - .item2 = ITEM_NONE, // ITEMPOISON_BARB, + .item2 = ITEM_NONE, // ITEM_POISON_BARB, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, @@ -19115,7 +19115,7 @@ const struct BaseStats gBaseStats[] = .expYield = 173, .evYield_Defense = 2, .evYield_SpAttack = 0, - .item2 = ITEM_NONE, // ITEMPOISON_BARB, + .item2 = ITEM_NONE, // ITEM_POISON_BARB, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, @@ -19141,7 +19141,7 @@ const struct BaseStats gBaseStats[] = .expYield = 77, .evYield_Attack = 1, .evYield_SpAttack = 0, - .item2 = ITEM_NONE, // ITEMLIGHT_CLAY, + .item2 = ITEM_NONE, // ITEM_LIGHT_CLAY, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, @@ -19167,7 +19167,7 @@ const struct BaseStats gBaseStats[] = .expYield = 175, .evYield_Attack = 2, .evYield_SpAttack = 0, - .item2 = ITEM_NONE, // ITEMLIGHT_CLAY, + .item2 = ITEM_NONE, // ITEM_LIGHT_CLAY, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, @@ -19193,7 +19193,7 @@ const struct BaseStats gBaseStats[] = .expYield = 54, .evYield_SpAttack = 0, .evYield_SpDefense = 1, - .item2 = ITEM_NONE, // ITEMMYSTIC_WATER, + .item2 = ITEM_NONE, // ITEM_MYSTIC_WATER, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 15, .friendship = 70, @@ -19219,7 +19219,7 @@ const struct BaseStats gBaseStats[] = .expYield = 159, .evYield_SpAttack = 0, .evYield_SpDefense = 2, - .item2 = ITEM_NONE, // ITEMMYSTIC_WATER, + .item2 = ITEM_NONE, // ITEM_MYSTIC_WATER, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 15, .friendship = 70, @@ -19245,7 +19245,7 @@ const struct BaseStats gBaseStats[] = .expYield = 50, .evYield_Attack = 1, .evYield_SpAttack = 0, - .item2 = ITEM_NONE, // ITEMMIRACLE_SEED, + .item2 = ITEM_NONE, // ITEM_MIRACLE_SEED, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, @@ -19271,7 +19271,7 @@ const struct BaseStats gBaseStats[] = .expYield = 168, .evYield_Attack = 2, .evYield_SpAttack = 0, - .item2 = ITEM_NONE, // ITEMMIRACLE_SEED, + .item2 = ITEM_NONE, // ITEM_MIRACLE_SEED, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, @@ -19297,8 +19297,8 @@ const struct BaseStats gBaseStats[] = .expYield = 57, .evYield_SpAttack = 0, .evYield_SpDefense = 1, - .item1 = ITEM_NONE, // ITEMTINY_MUSHROOM, - .item2 = ITEM_NONE, // ITEMBIG_MUSHROOM, + .item1 = ITEM_NONE, // ITEM_TINY_MUSHROOM, + .item2 = ITEM_NONE, // ITEM_BIG_MUSHROOM, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, @@ -19324,8 +19324,8 @@ const struct BaseStats gBaseStats[] = .expYield = 142, .evYield_SpAttack = 0, .evYield_SpDefense = 2, - .item1 = ITEM_NONE, // ITEMTINY_MUSHROOM, - .item2 = ITEM_NONE, // ITEMBIG_MUSHROOM, + .item1 = ITEM_NONE, // ITEM_TINY_MUSHROOM, + .item2 = ITEM_NONE, // ITEM_BIG_MUSHROOM, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, @@ -19351,7 +19351,7 @@ const struct BaseStats gBaseStats[] = .expYield = 64, .evYield_Speed = 1, .evYield_SpAttack = 0, - .item2 = ITEM_NONE, // ITEMSMOKE_BALL, + .item2 = ITEM_NONE, // ITEM_SMOKE_BALL, .genderRatio = PERCENT_FEMALE(12.5), .eggCycles = 20, .friendship = 70, @@ -19377,7 +19377,7 @@ const struct BaseStats gBaseStats[] = .expYield = 168, .evYield_Speed = 2, .evYield_SpAttack = 0, - .item2 = ITEM_NONE, // ITEMSMOKE_BALL, + .item2 = ITEM_NONE, // ITEM_SMOKE_BALL, .genderRatio = MON_FEMALE, .eggCycles = 20, .friendship = 70, @@ -19453,7 +19453,7 @@ const struct BaseStats gBaseStats[] = .expYield = 42, .evYield_HP = 1, .evYield_SpAttack = 0, - .item2 = ITEM_NONE, // ITEMGRASSY_SEED, + .item2 = ITEM_NONE, // ITEM_GRASSY_SEED, .genderRatio = MON_FEMALE, .eggCycles = 20, .friendship = 70, @@ -19479,7 +19479,7 @@ const struct BaseStats gBaseStats[] = .expYield = 102, .evYield_Speed = 2, .evYield_SpAttack = 0, - .item2 = ITEM_NONE, // ITEMGRASSY_SEED, + .item2 = ITEM_NONE, // ITEM_GRASSY_SEED, .genderRatio = MON_FEMALE, .eggCycles = 20, .friendship = 70, @@ -19505,7 +19505,7 @@ const struct BaseStats gBaseStats[] = .expYield = 230, .evYield_Attack = 3, .evYield_SpAttack = 0, - .item1 = ITEM_NONE, // ITEMGRASSY_SEED, + .item1 = ITEM_NONE, // ITEM_GRASSY_SEED, .genderRatio = MON_FEMALE, .eggCycles = 20, .friendship = 70, @@ -19531,7 +19531,7 @@ const struct BaseStats gBaseStats[] = .expYield = 170, .evYield_SpAttack = 0, .evYield_SpDefense = 2, - .item2 = ITEM_NONE, // ITEMMISTY_SEED, + .item2 = ITEM_NONE, // ITEM_MISTY_SEED, .genderRatio = PERCENT_FEMALE(75), .eggCycles = 20, .friendship = 70, @@ -19655,7 +19655,7 @@ const struct BaseStats gBaseStats[] = .expYield = 64, .evYield_Defense = 1, .evYield_SpAttack = 0, - .item2 = ITEM_NONE, // ITEMSPELL_TAG, + .item2 = ITEM_NONE, // ITEM_SPELL_TAG, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 15, .friendship = 70, @@ -19681,7 +19681,7 @@ const struct BaseStats gBaseStats[] = .expYield = 168, .evYield_Defense = 2, .evYield_SpAttack = 0, - .item2 = ITEM_NONE, // ITEMSPELL_TAG, + .item2 = ITEM_NONE, // ITEM_SPELL_TAG, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 15, .friendship = 70, @@ -19781,7 +19781,7 @@ const struct BaseStats gBaseStats[] = .evYield_Defense = 1, .evYield_SpAttack = 0, .evYield_SpDefense = 1, - .item2 = ITEM_NONE, // ITEMSTAR_PIECE, + .item2 = ITEM_NONE, // ITEM_STAR_PIECE, .genderRatio = MON_GENDERLESS, .eggCycles = 25, .friendship = 70, @@ -19830,7 +19830,7 @@ const struct BaseStats gBaseStats[] = .expYield = 170, .evYield_Defense = 2, .evYield_SpAttack = 0, - .item2 = ITEM_NONE, // ITEMCHARCOAL, + .item2 = ITEM_NONE, // ITEM_CHARCOAL, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, @@ -19855,7 +19855,7 @@ const struct BaseStats gBaseStats[] = .expYield = 152, .evYield_Attack = 2, .evYield_SpAttack = 0, - .item2 = ITEM_NONE, // ITEMELECTRIC_SEED, + .item2 = ITEM_NONE, // ITEM_ELECTRIC_SEED, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 10, .friendship = 70, @@ -19881,7 +19881,7 @@ const struct BaseStats gBaseStats[] = .expYield = 167, .evYield_SpAttack = 0, .evYield_SpDefense = 2, - .item2 = ITEM_NONE, // ITEMCHESTO_BERRY, + .item2 = ITEM_NONE, // ITEM_CHESTO_BERRY, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, @@ -19906,7 +19906,7 @@ const struct BaseStats gBaseStats[] = .expYield = 166, .evYield_Attack = 2, .evYield_SpAttack = 0, - .item2 = ITEM_NONE, // ITEMRAZOR_FANG, + .item2 = ITEM_NONE, // ITEM_RAZOR_FANG, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 15, .friendship = 70, @@ -19931,7 +19931,7 @@ const struct BaseStats gBaseStats[] = .catchRate = 70, .expYield = 170, .evYield_SpAttack = 2, - .item2 = ITEM_NONE, // ITEMPERSIM_BERRY, + .item2 = ITEM_NONE, // ITEM_PERSIM_BERRY, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, @@ -19981,7 +19981,7 @@ const struct BaseStats gBaseStats[] = .expYield = 60, .evYield_Defense = 1, .evYield_SpAttack = 0, - .item2 = ITEM_NONE, // ITEMRAZOR_CLAW, + .item2 = ITEM_NONE, // ITEM_RAZOR_CLAW, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 40, .friendship = 70, @@ -20007,7 +20007,7 @@ const struct BaseStats gBaseStats[] = .expYield = 147, .evYield_Defense = 2, .evYield_SpAttack = 0, - .item2 = ITEM_NONE, // ITEMRAZOR_CLAW, + .item2 = ITEM_NONE, // ITEM_RAZOR_CLAW, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 40, .friendship = 70, @@ -20033,7 +20033,7 @@ const struct BaseStats gBaseStats[] = .expYield = 270, .evYield_Defense = 3, .evYield_SpAttack = 0, - .item1 = ITEM_NONE, // ITEMRAZOR_CLAW, + .item1 = ITEM_NONE, // ITEM_RAZOR_CLAW, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 40, .friendship = 70,