diff --git a/src/data/pokemon/base_stats.h b/src/data/pokemon/base_stats.h index dd92b6f268..9b2e97137b 100644 --- a/src/data/pokemon/base_stats.h +++ b/src/data/pokemon/base_stats.h @@ -308,7 +308,7 @@ const struct BaseStats gBaseStats[] = .expYield = 178, .evYield_SpAttack = 2, .evYield_SpDefense = 1, - .item2 = ITEM_NONE, // ITEM_SILVER_POWDER, + .item2 = ITEM_SILVER_POWDER, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 15, .friendship = 70, @@ -390,7 +390,7 @@ const struct BaseStats gBaseStats[] = .expYield = 178, .evYield_Attack = 2, .evYield_SpDefense = 1, - .item2 = ITEM_NONE, // ITEM_POISON_BARB, + .item2 = ITEM_POISON_BARB, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 15, .friendship = 70, @@ -559,7 +559,7 @@ const struct BaseStats gBaseStats[] = .catchRate = 255, .expYield = 52, .evYield_Speed = 1, - .item2 = ITEM_NONE, // ITEM_SHARP_BEAK, + .item2 = ITEM_SHARP_BEAK, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 15, .friendship = 70, @@ -587,7 +587,7 @@ const struct BaseStats gBaseStats[] = .catchRate = 90, .expYield = 155, .evYield_Speed = 2, - .item2 = ITEM_NONE, // ITEM_SHARP_BEAK, + .item2 = ITEM_SHARP_BEAK, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 15, .friendship = 70, @@ -678,7 +678,7 @@ const struct BaseStats gBaseStats[] = .catchRate = 190, .expYield = 112, .evYield_Speed = 2, - .item2 = ITEM_NONE, // ITEM_LIGHT_BALL, + .item2 = ITEM_LIGHT_BALL, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 10, .friendship = 70, @@ -733,7 +733,9 @@ const struct BaseStats gBaseStats[] = .catchRate = 255, .expYield = 60, .evYield_Defense = 1, - .item2 = ITEM_NONE, // ITEM_GRIP_CLAW, + #ifdef ITEM_EXPANSION + .item2 = ITEM_GRIP_CLAW, + #endif .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, @@ -761,7 +763,9 @@ const struct BaseStats gBaseStats[] = .catchRate = 90, .expYield = 158, .evYield_Defense = 2, - .item2 = ITEM_NONE, // ITEM_GRIP_CLAW, + #ifdef ITEM_EXPANSION + .item2 = ITEM_GRIP_CLAW, + #endif .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, @@ -976,7 +980,7 @@ const struct BaseStats gBaseStats[] = .catchRate = 150, .expYield = 113, .evYield_HP = 2, - .item2 = ITEM_NONE, // ITEM_MOON_STONE, + .item2 = ITEM_MOON_STONE, .genderRatio = PERCENT_FEMALE(75), .eggCycles = 10, .friendship = 140, @@ -1015,7 +1019,7 @@ const struct BaseStats gBaseStats[] = .catchRate = 25, .expYield = 217, .evYield_HP = 3, - .item2 = ITEM_NONE, // ITEM_MOON_STONE, + .item2 = ITEM_MOON_STONE, .genderRatio = PERCENT_FEMALE(75), .eggCycles = 10, .friendship = 140, @@ -1045,7 +1049,7 @@ const struct BaseStats gBaseStats[] = .catchRate = 190, .expYield = 60, .evYield_Speed = 1, - .item2 = ITEM_NONE, // ITEM_CHARCOAL, + .item2 = ITEM_CHARCOAL, .genderRatio = PERCENT_FEMALE(75), .eggCycles = 20, .friendship = 70, @@ -1072,7 +1076,7 @@ const struct BaseStats gBaseStats[] = .expYield = 177, .evYield_Speed = 1, .evYield_SpDefense = 1, - .item2 = ITEM_NONE, // ITEM_CHARCOAL, + .item2 = ITEM_CHARCOAL, .genderRatio = PERCENT_FEMALE(75), .eggCycles = 20, .friendship = 70, @@ -1103,7 +1107,7 @@ const struct BaseStats gBaseStats[] = .catchRate = 170, .expYield = 95, .evYield_HP = 2, - .item2 = ITEM_NONE, // ITEM_MOON_STONE, + .item2 = ITEM_MOON_STONE, .genderRatio = PERCENT_FEMALE(75), .eggCycles = 10, .friendship = 70, @@ -1142,7 +1146,7 @@ const struct BaseStats gBaseStats[] = .catchRate = 50, .expYield = 196, .evYield_HP = 3, - .item2 = ITEM_NONE, // ITEM_MOON_STONE, + .item2 = ITEM_MOON_STONE, .genderRatio = PERCENT_FEMALE(75), .eggCycles = 10, .friendship = 70, @@ -1226,7 +1230,9 @@ const struct BaseStats gBaseStats[] = .catchRate = 255, .expYield = 64, .evYield_SpAttack = 1, - .item2 = ITEM_NONE, // ITEM_ABSORB_BULB, + #ifdef ITEM_EXPANSION + .item2 = ITEM_ABSORB_BULB, + #endif .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, @@ -1252,7 +1258,9 @@ const struct BaseStats gBaseStats[] = .catchRate = 120, .expYield = 138, .evYield_SpAttack = 2, - .item2 = ITEM_NONE, // ITEM_ABSORB_BULB, + #ifdef ITEM_EXPANSION + .item2 = ITEM_ABSORB_BULB, + #endif .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, @@ -1282,7 +1290,9 @@ const struct BaseStats gBaseStats[] = .catchRate = 45, .expYield = 221, .evYield_SpAttack = 3, - .item2 = ITEM_NONE, // ITEM_ABSORB_BULB, + #ifdef ITEM_EXPANSION + .item2 = ITEM_ABSORB_BULB, + #endif .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, @@ -1308,8 +1318,8 @@ const struct BaseStats gBaseStats[] = .catchRate = 190, .expYield = 57, .evYield_Attack = 1, - .item1 = ITEM_NONE, // ITEM_TINY_MUSHROOM, - .item2 = ITEM_NONE, // ITEM_BIG_MUSHROOM, + .item1 = ITEM_TINY_MUSHROOM, + .item2 = ITEM_BIG_MUSHROOM, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, @@ -1340,8 +1350,8 @@ const struct BaseStats gBaseStats[] = .expYield = 142, .evYield_Attack = 2, .evYield_Defense = 1, - .item1 = ITEM_NONE, // ITEM_TINY_MUSHROOM, - .item2 = ITEM_NONE, // ITEM_BIG_MUSHROOM, + .item1 = ITEM_TINY_MUSHROOM, + .item2 = ITEM_BIG_MUSHROOM, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, @@ -1401,7 +1411,9 @@ const struct BaseStats gBaseStats[] = .expYield = 158, .evYield_Speed = 1, .evYield_SpAttack = 1, - .item2 = ITEM_NONE, // ITEM_SHED_SHELL, + #ifdef ITEM_EXPANSION + .item2 = ITEM_SHED_SHELL, + #endif .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, @@ -1431,7 +1443,7 @@ const struct BaseStats gBaseStats[] = .catchRate = 255, .expYield = 53, .evYield_Speed = 1, - .item2 = ITEM_NONE, // ITEM_SOFT_SAND, + .item2 = ITEM_SOFT_SAND, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, @@ -1463,7 +1475,7 @@ const struct BaseStats gBaseStats[] = .catchRate = 50, .expYield = 149, .evYield_Speed = 2, - .item2 = ITEM_NONE, // ITEM_SOFT_SAND, + .item2 = ITEM_SOFT_SAND, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, @@ -1491,7 +1503,7 @@ const struct BaseStats gBaseStats[] = .catchRate = 255, .expYield = 58, .evYield_Speed = 1, - .item2 = ITEM_NONE, // ITEM_QUICK_CLAW, + .item2 = ITEM_QUICK_CLAW, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, @@ -1521,7 +1533,7 @@ const struct BaseStats gBaseStats[] = .catchRate = 90, .expYield = 154, .evYield_Speed = 2, - .item2 = ITEM_NONE, // ITEM_QUICK_CLAW, + .item2 = ITEM_QUICK_CLAW, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, @@ -1738,7 +1750,7 @@ const struct BaseStats gBaseStats[] = .catchRate = 120, .expYield = 135, .evYield_Speed = 2, - .item2 = ITEM_NONE, // ITEM_KINGS_ROCK, + .item2 = ITEM_KINGS_ROCK, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, @@ -1768,7 +1780,7 @@ const struct BaseStats gBaseStats[] = .catchRate = 45, .expYield = 230, .evYield_Defense = 3, - .item2 = ITEM_NONE, // ITEM_KINGS_ROCK, + .item2 = ITEM_KINGS_ROCK, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, @@ -1794,7 +1806,7 @@ const struct BaseStats gBaseStats[] = .catchRate = 200, .expYield = 62, .evYield_SpAttack = 1, - .item2 = ITEM_NONE, // ITEM_TWISTED_SPOON, + .item2 = ITEM_TWISTED_SPOON, .genderRatio = PERCENT_FEMALE(25), .eggCycles = 20, .friendship = 70, @@ -1822,7 +1834,7 @@ const struct BaseStats gBaseStats[] = .catchRate = 100, .expYield = 140, .evYield_SpAttack = 2, - .item2 = ITEM_NONE, // ITEM_TWISTED_SPOON, + .item2 = ITEM_TWISTED_SPOON, .genderRatio = PERCENT_FEMALE(25), .eggCycles = 20, .friendship = 70, @@ -1854,7 +1866,7 @@ const struct BaseStats gBaseStats[] = .catchRate = 50, .expYield = 225, .evYield_SpAttack = 3, - .item2 = ITEM_NONE, // ITEM_TWISTED_SPOON, + .item2 = ITEM_TWISTED_SPOON, .genderRatio = PERCENT_FEMALE(25), .eggCycles = 20, .friendship = 70, @@ -1882,7 +1894,7 @@ const struct BaseStats gBaseStats[] = .catchRate = 180, .expYield = 61, .evYield_Attack = 1, - .item2 = ITEM_NONE, // ITEM_FOCUS_BAND, + .item2 = ITEM_FOCUS_BAND, .genderRatio = PERCENT_FEMALE(25), .eggCycles = 20, .friendship = 70, @@ -1912,7 +1924,7 @@ const struct BaseStats gBaseStats[] = .catchRate = 90, .expYield = 142, .evYield_Attack = 2, - .item2 = ITEM_NONE, // ITEM_FOCUS_BAND, + .item2 = ITEM_FOCUS_BAND, .genderRatio = PERCENT_FEMALE(25), .eggCycles = 20, .friendship = 70, @@ -1942,7 +1954,7 @@ const struct BaseStats gBaseStats[] = .catchRate = 45, .expYield = 227, .evYield_Attack = 3, - .item2 = ITEM_NONE, // ITEM_FOCUS_BAND, + .item2 = ITEM_FOCUS_BAND, .genderRatio = PERCENT_FEMALE(25), .eggCycles = 20, .friendship = 70, @@ -2057,7 +2069,7 @@ const struct BaseStats gBaseStats[] = .catchRate = 190, .expYield = 67, .evYield_SpDefense = 1, - .item2 = ITEM_NONE, // ITEM_POISON_BARB, + .item2 = ITEM_POISON_BARB, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, @@ -2083,7 +2095,7 @@ const struct BaseStats gBaseStats[] = .catchRate = 60, .expYield = 180, .evYield_SpDefense = 2, - .item2 = ITEM_NONE, // ITEM_POISON_BARB, + .item2 = ITEM_POISON_BARB, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, @@ -2109,7 +2121,7 @@ const struct BaseStats gBaseStats[] = .catchRate = 255, .expYield = 60, .evYield_Defense = 1, - .item2 = ITEM_NONE, // ITEM_EVERSTONE, + .item2 = ITEM_EVERSTONE, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 15, .friendship = 70, @@ -2135,7 +2147,7 @@ const struct BaseStats gBaseStats[] = .catchRate = 120, .expYield = 137, .evYield_Defense = 2, - .item2 = ITEM_NONE, // ITEM_EVERSTONE, + .item2 = ITEM_EVERSTONE, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 15, .friendship = 70, @@ -2165,7 +2177,7 @@ const struct BaseStats gBaseStats[] = .catchRate = 45, .expYield = 223, .evYield_Defense = 3, - .item2 = ITEM_NONE, // ITEM_EVERSTONE, + .item2 = ITEM_EVERSTONE, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 15, .friendship = 70, @@ -2241,7 +2253,9 @@ const struct BaseStats gBaseStats[] = .catchRate = 190, .expYield = 63, .evYield_HP = 1, - .item2 = ITEM_NONE, // ITEM_LAGGING_TAIL, + #ifdef ITEM_EXPANSION + .item2 = ITEM_LAGGING_TAIL, + #endif .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, @@ -2269,7 +2283,7 @@ const struct BaseStats gBaseStats[] = .catchRate = 75, .expYield = 172, .evYield_Defense = 2, - .item2 = ITEM_NONE, // ITEM_KINGS_ROCK, + .item2 = ITEM_KINGS_ROCK, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, @@ -2297,7 +2311,7 @@ const struct BaseStats gBaseStats[] = .catchRate = 190, .expYield = 65, .evYield_SpAttack = 1, - .item2 = ITEM_NONE, // ITEM_METAL_COAT, + .item2 = ITEM_METAL_COAT, .genderRatio = MON_GENDERLESS, .eggCycles = 20, .friendship = 70, @@ -2325,7 +2339,7 @@ const struct BaseStats gBaseStats[] = .catchRate = 60, .expYield = 163, .evYield_SpAttack = 2, - .item2 = ITEM_NONE, // ITEM_METAL_COAT, + .item2 = ITEM_METAL_COAT, .genderRatio = MON_GENDERLESS, .eggCycles = 20, .friendship = 70, @@ -2357,7 +2371,7 @@ const struct BaseStats gBaseStats[] = .catchRate = 45, .expYield = 132, .evYield_Attack = 1, - .item2 = ITEM_NONE, // ITEM_STICK, + .item2 = ITEM_STICK, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, @@ -2385,7 +2399,7 @@ const struct BaseStats gBaseStats[] = .catchRate = 190, .expYield = 62, .evYield_Attack = 1, - .item2 = ITEM_NONE, // ITEM_SHARP_BEAK, + .item2 = ITEM_SHARP_BEAK, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, @@ -2417,7 +2431,7 @@ const struct BaseStats gBaseStats[] = .catchRate = 45, .expYield = 165, .evYield_Attack = 2, - .item2 = ITEM_NONE, // ITEM_SHARP_BEAK, + .item2 = ITEM_SHARP_BEAK, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, @@ -2503,7 +2517,9 @@ const struct BaseStats gBaseStats[] = .catchRate = 190, .expYield = 65, .evYield_HP = 1, - .item2 = ITEM_NONE, // ITEM_BLACK_SLUDGE, + #ifdef ITEM_EXPANSION + .item2 = ITEM_BLACK_SLUDGE, + #endif .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, @@ -2532,7 +2548,9 @@ const struct BaseStats gBaseStats[] = .expYield = 175, .evYield_HP = 1, .evYield_Attack = 1, - .item1 = ITEM_NONE, // ITEM_BLACK_SLUDGE, + #ifdef ITEM_EXPANSION + .item1 = ITEM_BLACK_SLUDGE, + #endif .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, @@ -2560,8 +2578,8 @@ const struct BaseStats gBaseStats[] = .catchRate = 190, .expYield = 61, .evYield_Defense = 1, - .item1 = ITEM_NONE, // ITEM_PEARL, - .item2 = ITEM_NONE, // ITEM_BIG_PEARL, + .item1 = ITEM_PEARL, + .item2 = ITEM_BIG_PEARL, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, @@ -2591,8 +2609,8 @@ const struct BaseStats gBaseStats[] = .catchRate = 60, .expYield = 184, .evYield_Defense = 2, - .item1 = ITEM_NONE, // ITEM_PEARL, - .item2 = ITEM_NONE, // ITEM_BIG_PEARL, + .item1 = ITEM_PEARL, + .item2 = ITEM_BIG_PEARL, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, @@ -2899,7 +2917,9 @@ const struct BaseStats gBaseStats[] = .catchRate = 90, .expYield = 65, .evYield_Defense = 1, - .item2 = ITEM_NONE, // ITEM_PSYCHIC_SEED, + #ifdef ITEM_EXPANSION + .item2 = ITEM_PSYCHIC_SEED, + #endif .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, @@ -2958,7 +2978,7 @@ const struct BaseStats gBaseStats[] = .catchRate = 190, .expYield = 64, .evYield_Defense = 1, - .item2 = ITEM_NONE, // ITEM_THICK_CLUB, + .item2 = ITEM_THICK_CLUB, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, @@ -2984,7 +3004,7 @@ const struct BaseStats gBaseStats[] = .catchRate = 75, .expYield = 149, .evYield_Defense = 2, - .item2 = ITEM_NONE, // ITEM_THICK_CLUB, + .item2 = ITEM_THICK_CLUB, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, @@ -3068,7 +3088,9 @@ const struct BaseStats gBaseStats[] = .catchRate = 45, .expYield = 77, .evYield_HP = 2, - .item2 = ITEM_NONE, // ITEM_LAGGING_TAIL, + #ifdef ITEM_EXPANSION + .item2 = ITEM_LAGGING_TAIL, + #endif .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, @@ -3094,7 +3116,7 @@ const struct BaseStats gBaseStats[] = .catchRate = 190, .expYield = 68, .evYield_Defense = 1, - .item2 = ITEM_NONE, // ITEM_SMOKE_BALL, + .item2 = ITEM_SMOKE_BALL, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, @@ -3119,7 +3141,7 @@ const struct BaseStats gBaseStats[] = .catchRate = 60, .expYield = 172, .evYield_Defense = 2, - .item2 = ITEM_NONE, // ITEM_SMOKE_BALL, + .item2 = ITEM_SMOKE_BALL, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, @@ -3198,7 +3220,7 @@ const struct BaseStats gBaseStats[] = .catchRate = 30, .expYield = 395, .evYield_HP = 2, - .item1 = ITEM_NONE, // ITEM_LUCKY_PUNCH, + .item1 = ITEM_LUCKY_PUNCH, .genderRatio = MON_FEMALE, .eggCycles = 40, .friendship = 140, @@ -3284,7 +3306,7 @@ const struct BaseStats gBaseStats[] = .catchRate = 225, .expYield = 59, .evYield_SpAttack = 1, - .item2 = ITEM_NONE, // ITEM_DRAGON_SCALE, + .item2 = ITEM_DRAGON_SCALE, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, @@ -3315,7 +3337,7 @@ const struct BaseStats gBaseStats[] = .expYield = 154, .evYield_Defense = 1, .evYield_SpAttack = 1, - .item2 = ITEM_NONE, // ITEM_DRAGON_SCALE, + .item2 = ITEM_DRAGON_SCALE, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, @@ -3345,7 +3367,7 @@ const struct BaseStats gBaseStats[] = .catchRate = 225, .expYield = 64, .evYield_Attack = 1, - .item2 = ITEM_NONE, // ITEM_MYSTIC_WATER, + .item2 = ITEM_MYSTIC_WATER, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, @@ -3371,7 +3393,7 @@ const struct BaseStats gBaseStats[] = .catchRate = 60, .expYield = 158, .evYield_Attack = 2, - .item2 = ITEM_NONE, // ITEM_MYSTIC_WATER, + .item2 = ITEM_MYSTIC_WATER, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, @@ -3397,8 +3419,8 @@ const struct BaseStats gBaseStats[] = .catchRate = 225, .expYield = 68, .evYield_Speed = 1, - .item1 = ITEM_NONE, // ITEM_STARDUST, - .item2 = ITEM_NONE, // ITEM_STAR_PIECE, + .item1 = ITEM_STARDUST, + .item2 = ITEM_STAR_PIECE, .genderRatio = MON_GENDERLESS, .eggCycles = 20, .friendship = 70, @@ -3426,8 +3448,8 @@ const struct BaseStats gBaseStats[] = .catchRate = 60, .expYield = 182, .evYield_Speed = 2, - .item1 = ITEM_NONE, // ITEM_STARDUST, - .item2 = ITEM_NONE, // ITEM_STAR_PIECE, + .item1 = ITEM_STARDUST, + .item2 = ITEM_STAR_PIECE, .genderRatio = MON_GENDERLESS, .eggCycles = 20, .friendship = 70, @@ -3547,7 +3569,9 @@ const struct BaseStats gBaseStats[] = .catchRate = 45, .expYield = 172, .evYield_Speed = 2, - .item2 = ITEM_NONE, // ITEM_ELECTIRIZER, + #ifdef ITEM_EXPANSION + .item2 = ITEM_ELECTIRIZER, + #endif .genderRatio = PERCENT_FEMALE(25), .eggCycles = 25, .friendship = 70, @@ -3573,7 +3597,9 @@ const struct BaseStats gBaseStats[] = .catchRate = 45, .expYield = 173, .evYield_SpAttack = 2, - .item2 = ITEM_NONE, // ITEM_MAGMARIZER, + #ifdef ITEM_EXPANSION + .item2 = ITEM_MAGMARIZER, + #endif .genderRatio = PERCENT_FEMALE(25), .eggCycles = 25, .friendship = 70, @@ -3712,8 +3738,8 @@ const struct BaseStats gBaseStats[] = .catchRate = 45, .expYield = 187, .evYield_HP = 2, - .item1 = ITEM_NONE, // ITEM_MYSTIC_WATER, - .item2 = ITEM_NONE, // ITEM_MYSTIC_WATER, + .item1 = ITEM_MYSTIC_WATER, + .item2 = ITEM_MYSTIC_WATER, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 40, .friendship = 70, @@ -3741,8 +3767,10 @@ const struct BaseStats gBaseStats[] = .catchRate = 35, .expYield = 101, .evYield_HP = 1, - .item1 = ITEM_NONE, // ITEM_QUICK_POWDER, - .item2 = ITEM_NONE, // ITEM_METAL_POWDER, + #ifdef ITEM_EXPANSION + .item1 = ITEM_QUICK_POWDER, + #endif + .item2 = ITEM_METAL_POWDER, .genderRatio = MON_GENDERLESS, .eggCycles = 20, .friendship = 70, @@ -4042,8 +4070,8 @@ const struct BaseStats gBaseStats[] = .catchRate = 25, .expYield = 189, .evYield_HP = 2, - .item1 = ITEM_NONE, // ITEM_LEFTOVERS, - .item2 = ITEM_NONE, // ITEM_LEFTOVERS, + .item1 = ITEM_LEFTOVERS, + .item2 = ITEM_LEFTOVERS, .genderRatio = PERCENT_FEMALE(12.5), .eggCycles = 40, .friendship = 70, @@ -4152,7 +4180,7 @@ const struct BaseStats gBaseStats[] = .catchRate = 45, .expYield = 60, .evYield_Attack = 1, - .item2 = ITEM_NONE, // ITEM_DRAGON_SCALE, + .item2 = ITEM_DRAGON_SCALE, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 40, .friendship = 35, @@ -4178,7 +4206,7 @@ const struct BaseStats gBaseStats[] = .catchRate = 45, .expYield = 147, .evYield_Attack = 2, - .item2 = ITEM_NONE, // ITEM_DRAGON_SCALE, + .item2 = ITEM_DRAGON_SCALE, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 40, .friendship = 35, @@ -4204,7 +4232,7 @@ const struct BaseStats gBaseStats[] = .catchRate = 45, .expYield = 270, .evYield_Attack = 3, - .item2 = ITEM_NONE, // ITEM_DRAGON_SCALE, + .item2 = ITEM_DRAGON_SCALE, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 40, .friendship = 35, @@ -4259,8 +4287,8 @@ const struct BaseStats gBaseStats[] = .catchRate = 45, .expYield = 270, .evYield_HP = 3, - .item1 = ITEM_NONE, // ITEM_LUM_BERRY, - .item2 = ITEM_NONE, // ITEM_LUM_BERRY, + .item1 = ITEM_LUM_BERRY, + .item2 = ITEM_LUM_BERRY, .genderRatio = MON_GENDERLESS, .eggCycles = 120, .friendship = 100, @@ -4778,7 +4806,7 @@ const struct BaseStats gBaseStats[] = .catchRate = 190, .expYield = 66, .evYield_HP = 1, - .item2 = ITEM_NONE, // ITEM_DEEP_SEA_SCALE, + .item2 = ITEM_DEEP_SEA_SCALE, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, @@ -4804,7 +4832,7 @@ const struct BaseStats gBaseStats[] = .catchRate = 75, .expYield = 161, .evYield_HP = 2, - .item2 = ITEM_NONE, // ITEM_DEEP_SEA_SCALE, + .item2 = ITEM_DEEP_SEA_SCALE, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, @@ -4860,7 +4888,7 @@ const struct BaseStats gBaseStats[] = .catchRate = 150, .expYield = 44, .evYield_SpDefense = 1, - .item2 = ITEM_NONE, // ITEM_MOON_STONE, + .item2 = ITEM_MOON_STONE, .genderRatio = PERCENT_FEMALE(75), .eggCycles = 10, .friendship = 140, @@ -5126,7 +5154,9 @@ const struct BaseStats gBaseStats[] = .catchRate = 45, .expYield = 221, .evYield_SpDefense = 3, - .item2 = ITEM_NONE, // ITEM_ABSORB_BULB, + #ifdef ITEM_EXPANSION + .item2 = ITEM_ABSORB_BULB, + #endif .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, @@ -5249,7 +5279,7 @@ const struct BaseStats gBaseStats[] = .catchRate = 45, .expYield = 225, .evYield_SpDefense = 3, - .item2 = ITEM_NONE, // ITEM_KINGS_ROCK, + .item2 = ITEM_KINGS_ROCK, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, @@ -5451,7 +5481,9 @@ const struct BaseStats gBaseStats[] = .catchRate = 75, .expYield = 78, .evYield_Speed = 1, - .item2 = ITEM_NONE, // ITEM_WIDE_LENS, + #ifdef ITEM_EXPANSION + .item2 = ITEM_WIDE_LENS, + #endif .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, @@ -5614,7 +5646,7 @@ const struct BaseStats gBaseStats[] = .catchRate = 70, .expYield = 172, .evYield_SpDefense = 3, - .item2 = ITEM_NONE, // ITEM_KINGS_ROCK, + .item2 = ITEM_KINGS_ROCK, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, @@ -5851,7 +5883,7 @@ const struct BaseStats gBaseStats[] = .catchRate = 25, .expYield = 179, .evYield_Defense = 2, - .item2 = ITEM_NONE, // ITEM_METAL_COAT, + .item2 = ITEM_METAL_COAT, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 25, .friendship = 70, @@ -5949,7 +5981,7 @@ const struct BaseStats gBaseStats[] = .catchRate = 45, .expYield = 88, .evYield_Attack = 1, - .item2 = ITEM_NONE, // ITEM_POISON_BARB, + .item2 = ITEM_POISON_BARB, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, @@ -6005,8 +6037,8 @@ const struct BaseStats gBaseStats[] = .expYield = 177, .evYield_Defense = 1, .evYield_SpDefense = 1, - .item1 = ITEM_NONE, // ITEM_BERRY_JUICE, - .item2 = ITEM_NONE, // ITEM_BERRY_JUICE, + .item1 = ITEM_BERRY_JUICE, + .item2 = ITEM_BERRY_JUICE, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, @@ -6063,7 +6095,7 @@ const struct BaseStats gBaseStats[] = .catchRate = 60, .expYield = 86, .evYield_Speed = 1, - .item2 = ITEM_NONE, // ITEM_QUICK_CLAW, + .item2 = ITEM_QUICK_CLAW, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 35, @@ -6274,7 +6306,9 @@ const struct BaseStats gBaseStats[] = .expYield = 144, .evYield_Defense = 1, .evYield_SpDefense = 1, - .item2 = ITEM_NONE, // ITEM_LUMINOUS_MOSS, + #ifdef ITEM_EXPANSION + .item2 = ITEM_LUMINOUS_MOSS, + #endif .genderRatio = PERCENT_FEMALE(75), .eggCycles = 20, .friendship = 70, @@ -6415,7 +6449,7 @@ const struct BaseStats gBaseStats[] = .catchRate = 25, .expYield = 163, .evYield_Defense = 2, - .item2 = ITEM_NONE, // ITEM_METAL_COAT, + .item2 = ITEM_METAL_COAT, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 25, .friendship = 70, @@ -6499,7 +6533,7 @@ const struct BaseStats gBaseStats[] = .evYield_Attack = 1, .evYield_SpAttack = 1, .evYield_SpDefense = 1, - .item2 = ITEM_NONE, // ITEM_DRAGON_SCALE, + .item2 = ITEM_DRAGON_SCALE, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, @@ -6754,7 +6788,9 @@ const struct BaseStats gBaseStats[] = .catchRate = 45, .expYield = 72, .evYield_Speed = 1, - .item2 = ITEM_NONE, // ITEM_ELECTIRIZER, + #ifdef ITEM_EXPANSION + .item2 = ITEM_ELECTIRIZER, + #endif .genderRatio = PERCENT_FEMALE(25), .eggCycles = 25, .friendship = 70, @@ -6780,7 +6816,9 @@ const struct BaseStats gBaseStats[] = .catchRate = 45, .expYield = 73, .evYield_Speed = 1, - .item2 = ITEM_NONE, // ITEM_MAGMARIZER, + #ifdef ITEM_EXPANSION + .item2 = ITEM_MAGMARIZER, + #endif .genderRatio = PERCENT_FEMALE(25), .eggCycles = 25, .friendship = 70, @@ -6806,8 +6844,8 @@ const struct BaseStats gBaseStats[] = .catchRate = 45, .expYield = 172, .evYield_Defense = 2, - .item1 = ITEM_NONE, // ITEM_MOOMOO_MILK, - .item2 = ITEM_NONE, // ITEM_MOOMOO_MILK, + .item1 = ITEM_MOOMOO_MILK, + .item2 = ITEM_MOOMOO_MILK, .genderRatio = MON_FEMALE, .eggCycles = 20, .friendship = 70, @@ -6837,7 +6875,7 @@ const struct BaseStats gBaseStats[] = .catchRate = 30, .expYield = 608, .evYield_HP = 3, - .item2 = ITEM_NONE, // ITEM_LUCKY_EGG, + .item2 = ITEM_LUCKY_EGG, .genderRatio = MON_FEMALE, .eggCycles = 40, .friendship = 140, @@ -7058,8 +7096,8 @@ const struct BaseStats gBaseStats[] = .catchRate = 3, .expYield = 306, .evYield_SpDefense = 3, - .item1 = ITEM_NONE, // ITEM_SACRED_ASH, - .item2 = ITEM_NONE, // ITEM_SACRED_ASH, + .item1 = ITEM_SACRED_ASH, + .item2 = ITEM_SACRED_ASH, .genderRatio = MON_GENDERLESS, .eggCycles = 120, .friendship = 0, @@ -7087,8 +7125,8 @@ const struct BaseStats gBaseStats[] = .catchRate = 45, .expYield = 270, .evYield_HP = 3, - .item1 = ITEM_NONE, // ITEM_LUM_BERRY, - .item2 = ITEM_NONE, // ITEM_LUM_BERRY, + .item1 = ITEM_LUM_BERRY, + .item2 = ITEM_LUM_BERRY, .genderRatio = MON_GENDERLESS, .eggCycles = 120, .friendship = 100, @@ -7403,8 +7441,8 @@ const struct BaseStats gBaseStats[] = .catchRate = 255, .expYield = 56, .evYield_Speed = 1, - .item1 = ITEM_NONE, // ITEM_POTION, - .item2 = ITEM_NONE, // ITEM_REVIVE, + .item1 = ITEM_POTION, + .item2 = ITEM_REVIVE, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 15, .friendship = 70, @@ -7434,8 +7472,8 @@ const struct BaseStats gBaseStats[] = .catchRate = 90, .expYield = 147, .evYield_Speed = 2, - .item1 = ITEM_NONE, // ITEM_POTION, - .item2 = ITEM_NONE, // ITEM_MAX_REVIVE, + .item1 = ITEM_POTION, + .item2 = ITEM_MAX_REVIVE, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 15, .friendship = 70, @@ -7465,8 +7503,8 @@ const struct BaseStats gBaseStats[] = .catchRate = 255, .expYield = 56, .evYield_HP = 1, - .item1 = ITEM_NONE, // ITEM_PECHA_BERRY, - .item2 = ITEM_NONE, // ITEM_BRIGHT_POWDER, + .item1 = ITEM_PECHA_BERRY, + .item2 = ITEM_BRIGHT_POWDER, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 15, .friendship = 70, @@ -7520,7 +7558,9 @@ const struct BaseStats gBaseStats[] = .catchRate = 45, .expYield = 178, .evYield_SpAttack = 3, - .item2 = ITEM_NONE, // ITEM_SHED_SHELL, + #ifdef ITEM_EXPANSION + .item2 = ITEM_SHED_SHELL, + #endif .genderRatio = PERCENT_FEMALE(50), .eggCycles = 15, .friendship = 70, @@ -7572,7 +7612,9 @@ const struct BaseStats gBaseStats[] = .catchRate = 45, .expYield = 173, .evYield_SpDefense = 3, - .item2 = ITEM_NONE, // ITEM_SHED_SHELL, + #ifdef ITEM_EXPANSION + .item2 = ITEM_SHED_SHELL, + #endif .genderRatio = PERCENT_FEMALE(50), .eggCycles = 15, .friendship = 70, @@ -7598,7 +7640,7 @@ const struct BaseStats gBaseStats[] = .catchRate = 255, .expYield = 44, .evYield_SpDefense = 1, - .item2 = ITEM_NONE, // ITEM_MENTAL_HERB, + .item2 = ITEM_MENTAL_HERB, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 15, .friendship = 70, @@ -7624,7 +7666,7 @@ const struct BaseStats gBaseStats[] = .catchRate = 120, .expYield = 119, .evYield_SpDefense = 2, - .item2 = ITEM_NONE, // ITEM_MENTAL_HERB, + .item2 = ITEM_MENTAL_HERB, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 15, .friendship = 70, @@ -7650,7 +7692,7 @@ const struct BaseStats gBaseStats[] = .catchRate = 45, .expYield = 216, .evYield_SpDefense = 3, - .item2 = ITEM_NONE, // ITEM_MENTAL_HERB, + .item2 = ITEM_MENTAL_HERB, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 15, .friendship = 70, @@ -7676,7 +7718,9 @@ const struct BaseStats gBaseStats[] = .catchRate = 255, .expYield = 44, .evYield_Defense = 1, - .item2 = ITEM_NONE, // ITEM_POWER_HERB, + #ifdef ITEM_EXPANSION + .item2 = ITEM_POWER_HERB, + #endif .genderRatio = PERCENT_FEMALE(50), .eggCycles = 15, .friendship = 70, @@ -7704,7 +7748,9 @@ const struct BaseStats gBaseStats[] = .catchRate = 120, .expYield = 119, .evYield_Attack = 2, - .item2 = ITEM_NONE, // ITEM_POWER_HERB, + #ifdef ITEM_EXPANSION + .item2 = ITEM_POWER_HERB, + #endif .genderRatio = PERCENT_FEMALE(50), .eggCycles = 15, .friendship = 70, @@ -7732,7 +7778,9 @@ const struct BaseStats gBaseStats[] = .catchRate = 45, .expYield = 216, .evYield_Attack = 3, - .item2 = ITEM_NONE, // ITEM_POWER_HERB, + #ifdef ITEM_EXPANSION + .item2 = ITEM_POWER_HERB, + #endif .genderRatio = PERCENT_FEMALE(50), .eggCycles = 15, .friendship = 70, @@ -7818,7 +7866,9 @@ const struct BaseStats gBaseStats[] = .catchRate = 190, .expYield = 54, .evYield_Speed = 1, - .item1 = ITEM_NONE, // ITEM_PRETTY_WING, + #ifdef ITEM_EXPANSION + .item1 = ITEM_PRETTY_WING, + #endif .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, @@ -7852,7 +7902,9 @@ const struct BaseStats gBaseStats[] = .catchRate = 45, .expYield = 154, .evYield_Defense = 2, - .item1 = ITEM_NONE, // ITEM_PRETTY_WING, + #ifdef ITEM_EXPANSION + .item1 = ITEM_PRETTY_WING, + #endif .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, @@ -7986,7 +8038,9 @@ const struct BaseStats gBaseStats[] = .catchRate = 200, .expYield = 54, .evYield_Speed = 1, - .item1 = ITEM_NONE, // ITEM_HONEY, + #ifdef ITEM_EXPANSION + .item1 = ITEM_HONEY, + #endif .genderRatio = PERCENT_FEMALE(50), .eggCycles = 15, .friendship = 70, @@ -8018,7 +8072,7 @@ const struct BaseStats gBaseStats[] = .expYield = 159, .evYield_SpAttack = 1, .evYield_SpDefense = 1, - .item2 = ITEM_NONE, // ITEM_SILVER_POWDER, + .item2 = ITEM_SILVER_POWDER, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 15, .friendship = 70, @@ -8046,8 +8100,8 @@ const struct BaseStats gBaseStats[] = .catchRate = 255, .expYield = 59, .evYield_HP = 1, - .item1 = ITEM_NONE, // ITEM_TINY_MUSHROOM, - .item2 = ITEM_NONE, // ITEM_BIG_MUSHROOM, + .item1 = ITEM_TINY_MUSHROOM, + .item2 = ITEM_BIG_MUSHROOM, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 15, .friendship = 70, @@ -8077,8 +8131,8 @@ const struct BaseStats gBaseStats[] = .catchRate = 90, .expYield = 161, .evYield_Attack = 2, - .item1 = ITEM_NONE, // ITEM_TINY_MUSHROOM, - .item2 = ITEM_NONE, // ITEM_BIG_MUSHROOM, + .item1 = ITEM_TINY_MUSHROOM, + .item2 = ITEM_BIG_MUSHROOM, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 15, .friendship = 70, @@ -8180,7 +8234,7 @@ const struct BaseStats gBaseStats[] = .catchRate = 255, .expYield = 53, .evYield_Defense = 1, - .item2 = ITEM_NONE, // ITEM_SOFT_SAND, + .item2 = ITEM_SOFT_SAND, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 15, .friendship = 70, @@ -8342,7 +8396,7 @@ const struct BaseStats gBaseStats[] = .catchRate = 180, .expYield = 47, .evYield_HP = 1, - .item2 = ITEM_NONE, // ITEM_BLACK_BELT, + .item2 = ITEM_BLACK_BELT, .genderRatio = PERCENT_FEMALE(25), .eggCycles = 20, .friendship = 70, @@ -8370,7 +8424,7 @@ const struct BaseStats gBaseStats[] = .catchRate = 200, .expYield = 166, .evYield_HP = 2, - .item2 = ITEM_NONE, // ITEM_KINGS_ROCK, + .item2 = ITEM_KINGS_ROCK, .genderRatio = PERCENT_FEMALE(25), .eggCycles = 20, .friendship = 70, @@ -8430,7 +8484,7 @@ const struct BaseStats gBaseStats[] = .catchRate = 255, .expYield = 75, .evYield_Defense = 1, - .item2 = ITEM_NONE, // ITEM_MAGNET, + .item2 = ITEM_MAGNET, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, @@ -8522,7 +8576,9 @@ const struct BaseStats gBaseStats[] = .expYield = 133, .evYield_Attack = 1, .evYield_Defense = 1, - .item2 = ITEM_NONE, // ITEM_WIDE_LENS, + #ifdef ITEM_EXPANSION + .item2 = ITEM_WIDE_LENS, + #endif .genderRatio = PERCENT_FEMALE(50), .eggCycles = 25, .friendship = 35, @@ -8558,7 +8614,9 @@ const struct BaseStats gBaseStats[] = .expYield = 133, .evYield_Attack = 1, .evYield_Defense = 1, - .item2 = ITEM_NONE, // ITEM_IRON_BALL, + #ifdef ITEM_EXPANSION + .item2 = ITEM_IRON_BALL, + #endif .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, @@ -8586,7 +8644,7 @@ const struct BaseStats gBaseStats[] = .catchRate = 180, .expYield = 66, .evYield_Defense = 1, - .item2 = ITEM_NONE, // ITEM_HARD_STONE, + .item2 = ITEM_HARD_STONE, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 35, .friendship = 35, @@ -8614,7 +8672,7 @@ const struct BaseStats gBaseStats[] = .catchRate = 90, .expYield = 151, .evYield_Defense = 2, - .item2 = ITEM_NONE, // ITEM_HARD_STONE, + .item2 = ITEM_HARD_STONE, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 35, .friendship = 35, @@ -8642,7 +8700,7 @@ const struct BaseStats gBaseStats[] = .catchRate = 45, .expYield = 239, .evYield_Defense = 3, - .item2 = ITEM_NONE, // ITEM_HARD_STONE, + .item2 = ITEM_HARD_STONE, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 35, .friendship = 35, @@ -8774,7 +8832,9 @@ const struct BaseStats gBaseStats[] = .catchRate = 200, .expYield = 142, .evYield_Speed = 1, - .item2 = ITEM_NONE, // ITEM_CELL_BATTERY, + #ifdef ITEM_EXPANSION + .item2 = ITEM_CELL_BATTERY, + #endif .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, @@ -8800,7 +8860,9 @@ const struct BaseStats gBaseStats[] = .catchRate = 200, .expYield = 142, .evYield_Speed = 1, - .item2 = ITEM_NONE, // ITEM_CELL_BATTERY, + #ifdef ITEM_EXPANSION + .item2 = ITEM_CELL_BATTERY, + #endif .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, @@ -8831,7 +8893,7 @@ const struct BaseStats gBaseStats[] = .catchRate = 150, .expYield = 151, .evYield_Speed = 1, - .item2 = ITEM_NONE, // ITEM_BRIGHT_POWDER, + .item2 = ITEM_BRIGHT_POWDER, .genderRatio = MON_MALE, .eggCycles = 15, .friendship = 70, @@ -8864,7 +8926,7 @@ const struct BaseStats gBaseStats[] = .catchRate = 150, .expYield = 151, .evYield_Speed = 1, - .item2 = ITEM_NONE, // ITEM_BRIGHT_POWDER, + .item2 = ITEM_BRIGHT_POWDER, .genderRatio = MON_FEMALE, .eggCycles = 15, .friendship = 70, @@ -8894,7 +8956,7 @@ const struct BaseStats gBaseStats[] = .catchRate = 150, .expYield = 140, .evYield_SpAttack = 2, - .item2 = ITEM_NONE, // ITEM_POISON_BARB, + .item2 = ITEM_POISON_BARB, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, @@ -8922,8 +8984,8 @@ const struct BaseStats gBaseStats[] = .catchRate = 225, .expYield = 60, .evYield_HP = 1, - .item1 = ITEM_NONE, // ITEM_ORAN_BERRY, - .item2 = ITEM_NONE, // ITEM_SITRUS_BERRY, + .item1 = ITEM_ORAN_BERRY, + .item2 = ITEM_SITRUS_BERRY, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, @@ -8951,8 +9013,8 @@ const struct BaseStats gBaseStats[] = .catchRate = 75, .expYield = 163, .evYield_HP = 2, - .item1 = ITEM_NONE, // ITEM_ORAN_BERRY, - .item2 = ITEM_NONE, // ITEM_SITRUS_BERRY, + .item1 = ITEM_ORAN_BERRY, + .item2 = ITEM_SITRUS_BERRY, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, @@ -8980,7 +9042,7 @@ const struct BaseStats gBaseStats[] = .catchRate = 225, .expYield = 61, .evYield_Attack = 1, - .item2 = ITEM_NONE, // ITEM_DEEP_SEA_TOOTH, + .item2 = ITEM_DEEP_SEA_TOOTH, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 35, @@ -9006,7 +9068,7 @@ const struct BaseStats gBaseStats[] = .catchRate = 60, .expYield = 161, .evYield_Attack = 2, - .item2 = ITEM_NONE, // ITEM_DEEP_SEA_TOOTH, + .item2 = ITEM_DEEP_SEA_TOOTH, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 35, @@ -9141,7 +9203,7 @@ const struct BaseStats gBaseStats[] = .catchRate = 90, .expYield = 165, .evYield_Defense = 2, - .item2 = ITEM_NONE, // ITEM_CHARCOAL, + .item2 = ITEM_CHARCOAL, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, @@ -9250,7 +9312,7 @@ const struct BaseStats gBaseStats[] = .catchRate = 255, .expYield = 58, .evYield_Attack = 1, - .item2 = ITEM_NONE, // ITEM_SOFT_SAND, + .item2 = ITEM_SOFT_SAND, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, @@ -9342,7 +9404,9 @@ const struct BaseStats gBaseStats[] = .catchRate = 190, .expYield = 67, .evYield_SpAttack = 1, - .item2 = ITEM_NONE, // ITEM_STICKY_BARB, + #ifdef ITEM_EXPANSION + .item2 = ITEM_STICKY_BARB, + #endif .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 35, @@ -9369,7 +9433,9 @@ const struct BaseStats gBaseStats[] = .expYield = 166, .evYield_Attack = 1, .evYield_SpAttack = 1, - .item2 = ITEM_NONE, // ITEM_STICKY_BARB, + #ifdef ITEM_EXPANSION + .item2 = ITEM_STICKY_BARB, + #endif .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 35, @@ -9445,7 +9511,7 @@ const struct BaseStats gBaseStats[] = .catchRate = 90, .expYield = 160, .evYield_Attack = 2, - .item2 = ITEM_NONE, // ITEM_QUICK_CLAW, + .item2 = ITEM_QUICK_CLAW, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, @@ -9474,7 +9540,9 @@ const struct BaseStats gBaseStats[] = .expYield = 160, .evYield_Attack = 1, .evYield_SpAttack = 1, - .item2 = ITEM_NONE, // ITEM_SHED_SHELL, + #ifdef ITEM_EXPANSION + .item2 = ITEM_SHED_SHELL, + #endif .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, @@ -9506,8 +9574,8 @@ const struct BaseStats gBaseStats[] = .catchRate = 45, .expYield = 161, .evYield_SpAttack = 2, - .item1 = ITEM_NONE, // ITEM_STARDUST, - .item2 = ITEM_NONE, // ITEM_MOON_STONE, + .item1 = ITEM_STARDUST, + .item2 = ITEM_MOON_STONE, .genderRatio = MON_GENDERLESS, .eggCycles = 25, .friendship = 70, @@ -9536,8 +9604,8 @@ const struct BaseStats gBaseStats[] = .catchRate = 45, .expYield = 161, .evYield_Attack = 2, - .item1 = ITEM_NONE, // ITEM_STARDUST, - .item2 = ITEM_NONE, // ITEM_SUN_STONE, + .item1 = ITEM_STARDUST, + .item2 = ITEM_SUN_STONE, .genderRatio = MON_GENDERLESS, .eggCycles = 25, .friendship = 70, @@ -9674,7 +9742,9 @@ const struct BaseStats gBaseStats[] = .catchRate = 255, .expYield = 60, .evYield_SpDefense = 1, - .item2 = ITEM_NONE, // ITEM_LIGHT_CLAY, + #ifdef ITEM_EXPANSION + .item2 = ITEM_LIGHT_CLAY, + #endif .genderRatio = MON_GENDERLESS, .eggCycles = 20, .friendship = 70, @@ -9699,7 +9769,9 @@ const struct BaseStats gBaseStats[] = .catchRate = 90, .expYield = 175, .evYield_SpDefense = 2, - .item2 = ITEM_NONE, // ITEM_LIGHT_CLAY, + #ifdef ITEM_EXPANSION + .item2 = ITEM_LIGHT_CLAY, + #endif .genderRatio = MON_GENDERLESS, .eggCycles = 20, .friendship = 70, @@ -9724,7 +9796,9 @@ const struct BaseStats gBaseStats[] = .catchRate = 45, .expYield = 71, .evYield_SpDefense = 1, - .item2 = ITEM_NONE, // ITEM_BIG_ROOT, + #ifdef ITEM_EXPANSION + .item2 = ITEM_BIG_ROOT, + #endif .genderRatio = PERCENT_FEMALE(12.5), .eggCycles = 30, .friendship = 70, @@ -9752,7 +9826,9 @@ const struct BaseStats gBaseStats[] = .catchRate = 45, .expYield = 173, .evYield_SpDefense = 2, - .item2 = ITEM_NONE, // ITEM_BIG_ROOT, + #ifdef ITEM_EXPANSION + .item2 = ITEM_BIG_ROOT, + #endif .genderRatio = PERCENT_FEMALE(12.5), .eggCycles = 30, .friendship = 70, @@ -9886,8 +9962,8 @@ const struct BaseStats gBaseStats[] = .catchRate = 45, .expYield = 147, .evYield_HP = 1, - .item1 = ITEM_NONE, // ITEM_MYSTIC_WATER, - .item2 = ITEM_NONE, // ITEM_MYSTIC_WATER, + .item1 = ITEM_MYSTIC_WATER, + .item2 = ITEM_MYSTIC_WATER, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 25, .friendship = 70, @@ -9939,7 +10015,7 @@ const struct BaseStats gBaseStats[] = .catchRate = 225, .expYield = 59, .evYield_Attack = 1, - .item2 = ITEM_NONE, // ITEM_SPELL_TAG, + .item2 = ITEM_SPELL_TAG, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 25, .friendship = 35, @@ -9969,7 +10045,7 @@ const struct BaseStats gBaseStats[] = .catchRate = 45, .expYield = 159, .evYield_Attack = 2, - .item2 = ITEM_NONE, // ITEM_SPELL_TAG, + .item2 = ITEM_SPELL_TAG, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 25, .friendship = 35, @@ -9999,7 +10075,7 @@ const struct BaseStats gBaseStats[] = .catchRate = 190, .expYield = 59, .evYield_SpDefense = 1, - .item2 = ITEM_NONE, // ITEM_SPELL_TAG, + .item2 = ITEM_SPELL_TAG, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 25, .friendship = 35, @@ -10028,7 +10104,7 @@ const struct BaseStats gBaseStats[] = .expYield = 159, .evYield_Defense = 1, .evYield_SpDefense = 1, - .item2 = ITEM_NONE, // ITEM_SPELL_TAG, + .item2 = ITEM_SPELL_TAG, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 25, .friendship = 35, @@ -10092,7 +10168,7 @@ const struct BaseStats gBaseStats[] = .expYield = 159, .evYield_SpAttack = 1, .evYield_SpDefense = 1, - .item2 = ITEM_NONE, // ITEM_CLEANSE_TAG, + .item2 = ITEM_CLEANSE_TAG, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 25, .friendship = 70, @@ -10173,7 +10249,9 @@ const struct BaseStats gBaseStats[] = .catchRate = 190, .expYield = 60, .evYield_HP = 1, - .item2 = ITEM_NONE, // ITEM_SNOWBALL, + #ifdef ITEM_EXPANSION + .item2 = ITEM_SNOWBALL, + #endif .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, @@ -10319,8 +10397,8 @@ const struct BaseStats gBaseStats[] = .catchRate = 255, .expYield = 69, .evYield_Defense = 1, - .item1 = ITEM_NONE, // ITEM_PEARL, - .item2 = ITEM_NONE, // ITEM_BIG_PEARL, + .item1 = ITEM_PEARL, + .item2 = ITEM_BIG_PEARL, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, @@ -10349,7 +10427,7 @@ const struct BaseStats gBaseStats[] = .expYield = 170, .evYield_Attack = 1, .evYield_Defense = 1, - .item2 = ITEM_NONE, // ITEM_DEEP_SEA_TOOTH, + .item2 = ITEM_DEEP_SEA_TOOTH, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, @@ -10375,7 +10453,7 @@ const struct BaseStats gBaseStats[] = .catchRate = 60, .expYield = 170, .evYield_SpAttack = 2, - .item2 = ITEM_NONE, // ITEM_DEEP_SEA_SCALE, + .item2 = ITEM_DEEP_SEA_SCALE, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, @@ -10404,7 +10482,7 @@ const struct BaseStats gBaseStats[] = .expYield = 170, .evYield_HP = 1, .evYield_Defense = 1, - .item2 = ITEM_NONE, // ITEM_DEEP_SEA_SCALE, + .item2 = ITEM_DEEP_SEA_SCALE, .genderRatio = PERCENT_FEMALE(12.5), .eggCycles = 40, .friendship = 70, @@ -10430,7 +10508,7 @@ const struct BaseStats gBaseStats[] = .catchRate = 225, .expYield = 116, .evYield_Speed = 1, - .item1 = ITEM_NONE, // ITEM_HEART_SCALE, + .item1 = ITEM_HEART_SCALE, .genderRatio = PERCENT_FEMALE(75), .eggCycles = 20, .friendship = 70, @@ -10458,7 +10536,7 @@ const struct BaseStats gBaseStats[] = .catchRate = 45, .expYield = 60, .evYield_Attack = 1, - .item2 = ITEM_NONE, // ITEM_DRAGON_FANG, + .item2 = ITEM_DRAGON_FANG, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 40, .friendship = 35, @@ -10486,7 +10564,7 @@ const struct BaseStats gBaseStats[] = .catchRate = 45, .expYield = 147, .evYield_Defense = 2, - .item2 = ITEM_NONE, // ITEM_DRAGON_FANG, + .item2 = ITEM_DRAGON_FANG, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 40, .friendship = 35, @@ -10514,7 +10592,7 @@ const struct BaseStats gBaseStats[] = .catchRate = 45, .expYield = 270, .evYield_Attack = 3, - .item2 = ITEM_NONE, // ITEM_DRAGON_FANG, + .item2 = ITEM_DRAGON_FANG, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 40, .friendship = 35, @@ -10542,7 +10620,7 @@ const struct BaseStats gBaseStats[] = .catchRate = 3, .expYield = 60, .evYield_Defense = 1, - .item2 = ITEM_NONE, // ITEM_METAL_COAT, + .item2 = ITEM_METAL_COAT, .genderRatio = MON_GENDERLESS, .eggCycles = 40, .friendship = 35, @@ -10570,7 +10648,7 @@ const struct BaseStats gBaseStats[] = .catchRate = 3, .expYield = 147, .evYield_Defense = 2, - .item2 = ITEM_NONE, // ITEM_METAL_COAT, + .item2 = ITEM_METAL_COAT, .genderRatio = MON_GENDERLESS, .eggCycles = 40, .friendship = 35, @@ -10598,7 +10676,7 @@ const struct BaseStats gBaseStats[] = .catchRate = 3, .expYield = 270, .evYield_Defense = 3, - .item2 = ITEM_NONE, // ITEM_METAL_COAT, + .item2 = ITEM_METAL_COAT, .genderRatio = MON_GENDERLESS, .eggCycles = 40, .friendship = 35, @@ -10827,8 +10905,8 @@ const struct BaseStats gBaseStats[] = .catchRate = 3, .expYield = 270, .evYield_HP = 3, - .item1 = ITEM_NONE, // ITEM_STAR_PIECE, - .item2 = ITEM_NONE, // ITEM_STAR_PIECE, + .item1 = ITEM_STAR_PIECE, + .item2 = ITEM_STAR_PIECE, .genderRatio = MON_GENDERLESS, .eggCycles = 120, .friendship = 100, @@ -11264,7 +11342,9 @@ const struct BaseStats gBaseStats[] = .catchRate = 255, .expYield = 39, .evYield_Defense = 1, - .item2 = ITEM_NONE, // ITEM_METRONOME, + #ifdef ITEM_EXPANSION + .item2 = ITEM_METRONOME, + #endif .genderRatio = PERCENT_FEMALE(50), .eggCycles = 15, .friendship = 70, @@ -11290,7 +11370,9 @@ const struct BaseStats gBaseStats[] = .catchRate = 45, .expYield = 134, .evYield_Attack = 2, - .item2 = ITEM_NONE, // ITEM_METRONOME, + #ifdef ITEM_EXPANSION + .item2 = ITEM_METRONOME, + #endif .genderRatio = PERCENT_FEMALE(50), .eggCycles = 15, .friendship = 70, @@ -11405,7 +11487,7 @@ const struct BaseStats gBaseStats[] = .catchRate = 255, .expYield = 56, .evYield_SpAttack = 1, - .item2 = ITEM_NONE, // ITEM_POISON_BARB, + .item2 = ITEM_POISON_BARB, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, @@ -11437,7 +11519,7 @@ const struct BaseStats gBaseStats[] = .catchRate = 75, .expYield = 232, .evYield_SpAttack = 3, - .item2 = ITEM_NONE, // ITEM_POISON_BARB, + .item2 = ITEM_POISON_BARB, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, @@ -11600,7 +11682,7 @@ const struct BaseStats gBaseStats[] = .catchRate = 45, .expYield = 148, .evYield_SpDefense = 2, - .item2 = ITEM_NONE, // ITEM_SILVER_POWDER, + .item2 = ITEM_SILVER_POWDER, .genderRatio = MON_FEMALE, .eggCycles = 15, .friendship = 70, @@ -11631,7 +11713,7 @@ const struct BaseStats gBaseStats[] = .expYield = 148, .evYield_Attack = 1, .evYield_SpAttack = 1, - .item2 = ITEM_NONE, // ITEM_SILVER_POWDER, + .item2 = ITEM_SILVER_POWDER, .genderRatio = MON_MALE, .eggCycles = 15, .friendship = 70, @@ -11659,7 +11741,9 @@ const struct BaseStats gBaseStats[] = .catchRate = 120, .expYield = 49, .evYield_Speed = 1, - .item2 = ITEM_NONE, // ITEM_HONEY, + #ifdef ITEM_EXPANSION + .item2 = ITEM_HONEY, + #endif .genderRatio = PERCENT_FEMALE(12.5), .eggCycles = 15, .friendship = 70, @@ -11690,7 +11774,7 @@ const struct BaseStats gBaseStats[] = .expYield = 166, .evYield_Defense = 1, .evYield_SpDefense = 1, - .item2 = ITEM_NONE, // ITEM_POISON_BARB, + .item2 = ITEM_POISON_BARB, .genderRatio = MON_FEMALE, .eggCycles = 15, .friendship = 70, @@ -11793,7 +11877,7 @@ const struct BaseStats gBaseStats[] = .catchRate = 190, .expYield = 55, .evYield_SpAttack = 1, - .item2 = ITEM_NONE, // ITEM_MIRACLE_SEED, + .item2 = ITEM_MIRACLE_SEED, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, @@ -11818,7 +11902,7 @@ const struct BaseStats gBaseStats[] = .catchRate = 75, .expYield = 158, .evYield_SpAttack = 2, - .item2 = ITEM_NONE, // ITEM_MIRACLE_SEED, + .item2 = ITEM_MIRACLE_SEED, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, @@ -12156,7 +12240,7 @@ const struct BaseStats gBaseStats[] = .catchRate = 120, .expYield = 57, .evYield_SpAttack = 1, - .item2 = ITEM_NONE, // ITEM_CLEANSE_TAG, + .item2 = ITEM_CLEANSE_TAG, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 25, .friendship = 70, @@ -12239,7 +12323,7 @@ const struct BaseStats gBaseStats[] = .catchRate = 255, .expYield = 60, .evYield_Defense = 1, - .item2 = ITEM_NONE, // ITEM_METAL_COAT, + .item2 = ITEM_METAL_COAT, .genderRatio = MON_GENDERLESS, .eggCycles = 20, .friendship = 70, @@ -12270,7 +12354,7 @@ const struct BaseStats gBaseStats[] = .expYield = 175, .evYield_Defense = 1, .evYield_SpDefense = 1, - .item2 = ITEM_NONE, // ITEM_METAL_COAT, + .item2 = ITEM_METAL_COAT, .genderRatio = MON_GENDERLESS, .eggCycles = 20, .friendship = 70, @@ -12361,7 +12445,9 @@ const struct BaseStats gBaseStats[] = .catchRate = 130, .expYield = 110, .evYield_HP = 1, - .item1 = ITEM_NONE, // ITEM_OVAL_STONE, + #ifdef ITEM_EXPANSION + .item1 = ITEM_OVAL_STONE, + #endif .genderRatio = MON_FEMALE, .eggCycles = 40, .friendship = 140, @@ -12389,7 +12475,9 @@ const struct BaseStats gBaseStats[] = .catchRate = 30, .expYield = 144, .evYield_Attack = 1, - .item2 = ITEM_NONE, // ITEM_METRONOME, + #ifdef ITEM_EXPANSION + .item2 = ITEM_METRONOME, + #endif .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 35, @@ -12522,8 +12610,8 @@ const struct BaseStats gBaseStats[] = .catchRate = 50, .expYield = 78, .evYield_HP = 1, - .item1 = ITEM_NONE, // ITEM_LEFTOVERS, - .item2 = ITEM_NONE, // ITEM_LEFTOVERS, + .item1 = ITEM_LEFTOVERS, + .item2 = ITEM_LEFTOVERS, .genderRatio = PERCENT_FEMALE(12.5), .eggCycles = 40, .friendship = 70, @@ -12664,7 +12752,7 @@ const struct BaseStats gBaseStats[] = .catchRate = 120, .expYield = 66, .evYield_Defense = 1, - .item2 = ITEM_NONE, // ITEM_POISON_BARB, + .item2 = ITEM_POISON_BARB, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, @@ -12694,7 +12782,7 @@ const struct BaseStats gBaseStats[] = .catchRate = 45, .expYield = 175, .evYield_Defense = 2, - .item2 = ITEM_NONE, // ITEM_POISON_BARB, + .item2 = ITEM_POISON_BARB, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, @@ -12724,7 +12812,9 @@ const struct BaseStats gBaseStats[] = .catchRate = 140, .expYield = 60, .evYield_Attack = 1, - .item2 = ITEM_NONE, // ITEM_BLACK_SLUDGE, + #ifdef ITEM_EXPANSION + .item2 = ITEM_BLACK_SLUDGE, + #endif .genderRatio = PERCENT_FEMALE(50), .eggCycles = 10, .friendship = 100, @@ -12754,7 +12844,9 @@ const struct BaseStats gBaseStats[] = .catchRate = 75, .expYield = 172, .evYield_Attack = 2, - .item2 = ITEM_NONE, // ITEM_BLACK_SLUDGE, + #ifdef ITEM_EXPANSION + .item2 = ITEM_BLACK_SLUDGE, + #endif .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, @@ -12891,7 +12983,7 @@ const struct BaseStats gBaseStats[] = .catchRate = 120, .expYield = 67, .evYield_Attack = 1, - .item2 = ITEM_NONE, // ITEM_NEVER_MELT_ICE, + .item2 = ITEM_NEVER_MELT_ICE, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, @@ -12922,7 +13014,7 @@ const struct BaseStats gBaseStats[] = .expYield = 173, .evYield_Attack = 1, .evYield_SpAttack = 1, - .item2 = ITEM_NONE, // ITEM_NEVER_MELT_ICE, + .item2 = ITEM_NEVER_MELT_ICE, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, @@ -12953,7 +13045,7 @@ const struct BaseStats gBaseStats[] = .expYield = 179, .evYield_Attack = 1, .evYield_Speed = 1, - .item2 = ITEM_NONE, // ITEM_QUICK_CLAW, + .item2 = ITEM_QUICK_CLAW, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 35, @@ -12981,7 +13073,7 @@ const struct BaseStats gBaseStats[] = .catchRate = 30, .expYield = 241, .evYield_SpAttack = 3, - .item2 = ITEM_NONE, // ITEM_METAL_COAT, + .item2 = ITEM_METAL_COAT, .genderRatio = MON_GENDERLESS, .eggCycles = 20, .friendship = 70, @@ -13009,7 +13101,9 @@ const struct BaseStats gBaseStats[] = .catchRate = 30, .expYield = 180, .evYield_HP = 3, - .item2 = ITEM_NONE, // ITEM_LAGGING_TAIL, + #ifdef ITEM_EXPANSION + .item2 = ITEM_LAGGING_TAIL, + #endif .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, @@ -13093,7 +13187,9 @@ const struct BaseStats gBaseStats[] = .catchRate = 30, .expYield = 243, .evYield_Attack = 3, - .item2 = ITEM_NONE, // ITEM_ELECTIRIZER, + #ifdef ITEM_EXPANSION + .item2 = ITEM_ELECTIRIZER, + #endif .genderRatio = PERCENT_FEMALE(25), .eggCycles = 25, .friendship = 70, @@ -13123,7 +13219,9 @@ const struct BaseStats gBaseStats[] = .catchRate = 30, .expYield = 243, .evYield_SpAttack = 3, - .item2 = ITEM_NONE, // ITEM_MAGMARIZER, + #ifdef ITEM_EXPANSION + .item2 = ITEM_MAGMARIZER, + #endif .genderRatio = PERCENT_FEMALE(25), .eggCycles = 25, .friendship = 70, @@ -13182,7 +13280,9 @@ const struct BaseStats gBaseStats[] = .catchRate = 30, .expYield = 180, .evYield_Attack = 2, - .item2 = ITEM_NONE, // ITEM_WIDE_LENS, + #ifdef ITEM_EXPANSION + .item2 = ITEM_WIDE_LENS, + #endif .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, @@ -13389,7 +13489,7 @@ const struct BaseStats gBaseStats[] = .expYield = 184, .evYield_Defense = 1, .evYield_SpDefense = 2, - .item2 = ITEM_NONE, // ITEM_MAGNET, + .item2 = ITEM_MAGNET, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, @@ -13418,7 +13518,7 @@ const struct BaseStats gBaseStats[] = .expYield = 236, .evYield_Defense = 1, .evYield_SpDefense = 2, - .item2 = ITEM_NONE, // ITEM_SPELL_TAG, + .item2 = ITEM_SPELL_TAG, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 25, .friendship = 35, @@ -13819,8 +13919,8 @@ const struct BaseStats gBaseStats[] = .catchRate = 45, .expYield = 270, .evYield_HP = 3, - .item1 = ITEM_NONE, // ITEM_LUM_BERRY, - .item2 = ITEM_NONE, // ITEM_LUM_BERRY, + .item1 = ITEM_LUM_BERRY, + .item2 = ITEM_LUM_BERRY, .genderRatio = MON_GENDERLESS, .eggCycles = 120, .friendship = 100, @@ -14714,8 +14814,8 @@ const struct BaseStats gBaseStats[] = .catchRate = 255, .expYield = 56, .evYield_Defense = 1, - .item1 = ITEM_NONE, // ITEM_EVERSTONE, - .item2 = ITEM_NONE, // ITEM_HARD_STONE, + .item1 = ITEM_EVERSTONE, + .item2 = ITEM_HARD_STONE, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 15, .friendship = 70, @@ -14746,8 +14846,8 @@ const struct BaseStats gBaseStats[] = .expYield = 137, .evYield_Attack = 1, .evYield_Defense = 1, - .item1 = ITEM_NONE, // ITEM_EVERSTONE, - .item2 = ITEM_NONE, // ITEM_HARD_STONE, + .item1 = ITEM_EVERSTONE, + .item2 = ITEM_HARD_STONE, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 15, .friendship = 70, @@ -14781,8 +14881,8 @@ const struct BaseStats gBaseStats[] = .catchRate = 45, .expYield = 232, .evYield_Attack = 3, - .item1 = ITEM_NONE, // ITEM_EVERSTONE, - .item2 = ITEM_NONE, // ITEM_HARD_STONE, + .item1 = ITEM_EVERSTONE, + .item2 = ITEM_HARD_STONE, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 15, .friendship = 70, @@ -14930,8 +15030,8 @@ const struct BaseStats gBaseStats[] = .catchRate = 255, .expYield = 390, .evYield_HP = 2, - .item1 = ITEM_NONE, // ITEM_ORAN_BERRY, - .item2 = ITEM_NONE, // ITEM_SITRUS_BERRY, + .item1 = ITEM_ORAN_BERRY, + .item2 = ITEM_SITRUS_BERRY, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, @@ -15139,7 +15239,7 @@ const struct BaseStats gBaseStats[] = .catchRate = 45, .expYield = 163, .evYield_HP = 2, - .item2 = ITEM_NONE, // ITEM_BLACK_BELT, + .item2 = ITEM_BLACK_BELT, .genderRatio = MON_MALE, .eggCycles = 20, .friendship = 70, @@ -15167,7 +15267,7 @@ const struct BaseStats gBaseStats[] = .catchRate = 45, .expYield = 163, .evYield_Attack = 2, - .item2 = ITEM_NONE, // ITEM_BLACK_BELT, + .item2 = ITEM_BLACK_BELT, .genderRatio = MON_MALE, .eggCycles = 20, .friendship = 70, @@ -15195,7 +15295,7 @@ const struct BaseStats gBaseStats[] = .catchRate = 255, .expYield = 62, .evYield_Defense = 1, - .item2 = ITEM_NONE, // ITEM_MENTAL_HERB, + .item2 = ITEM_MENTAL_HERB, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 15, .friendship = 70, @@ -15223,7 +15323,7 @@ const struct BaseStats gBaseStats[] = .catchRate = 120, .expYield = 133, .evYield_Defense = 2, - .item2 = ITEM_NONE, // ITEM_MENTAL_HERB, + .item2 = ITEM_MENTAL_HERB, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 15, .friendship = 70, @@ -15257,7 +15357,7 @@ const struct BaseStats gBaseStats[] = .catchRate = 45, .expYield = 225, .evYield_Attack = 3, - .item2 = ITEM_NONE, // ITEM_MENTAL_HERB, + .item2 = ITEM_MENTAL_HERB, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 15, .friendship = 70, @@ -15285,7 +15385,7 @@ const struct BaseStats gBaseStats[] = .catchRate = 255, .expYield = 52, .evYield_Defense = 1, - .item2 = ITEM_NONE, // ITEM_POISON_BARB, + .item2 = ITEM_POISON_BARB, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 15, .friendship = 70, @@ -15317,7 +15417,7 @@ const struct BaseStats gBaseStats[] = .catchRate = 120, .expYield = 126, .evYield_Defense = 2, - .item2 = ITEM_NONE, // ITEM_POISON_BARB, + .item2 = ITEM_POISON_BARB, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 15, .friendship = 70, @@ -15353,7 +15453,7 @@ const struct BaseStats gBaseStats[] = .catchRate = 45, .expYield = 218, .evYield_Speed = 3, - .item2 = ITEM_NONE, // ITEM_POISON_BARB, + .item2 = ITEM_POISON_BARB, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, @@ -15390,7 +15490,9 @@ const struct BaseStats gBaseStats[] = .catchRate = 190, .expYield = 56, .evYield_Speed = 1, - .item2 = ITEM_NONE, // ITEM_ABSORB_BULB, + #ifdef ITEM_EXPANSION + .item2 = ITEM_ABSORB_BULB, + #endif .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, @@ -15425,7 +15527,9 @@ const struct BaseStats gBaseStats[] = .catchRate = 75, .expYield = 168, .evYield_Speed = 2, - .item2 = ITEM_NONE, // ITEM_ABSORB_BULB, + #ifdef ITEM_EXPANSION + .item2 = ITEM_ABSORB_BULB, + #endif .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, @@ -15455,7 +15559,9 @@ const struct BaseStats gBaseStats[] = .catchRate = 190, .expYield = 56, .evYield_SpAttack = 1, - .item2 = ITEM_NONE, // ITEM_ABSORB_BULB, + #ifdef ITEM_EXPANSION + .item2 = ITEM_ABSORB_BULB, + #endif .genderRatio = MON_FEMALE, .eggCycles = 20, .friendship = 70, @@ -15483,7 +15589,9 @@ const struct BaseStats gBaseStats[] = .catchRate = 75, .expYield = 168, .evYield_SpAttack = 2, - .item2 = ITEM_NONE, // ITEM_ABSORB_BULB, + #ifdef ITEM_EXPANSION + .item2 = ITEM_ABSORB_BULB, + #endif .genderRatio = MON_FEMALE, .eggCycles = 20, .friendship = 70, @@ -15511,7 +15619,7 @@ const struct BaseStats gBaseStats[] = .catchRate = 25, .expYield = 161, .evYield_Speed = 2, - .item2 = ITEM_NONE, // ITEM_DEEP_SEA_TOOTH, + .item2 = ITEM_DEEP_SEA_TOOTH, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 40, .friendship = 70, @@ -15541,7 +15649,7 @@ const struct BaseStats gBaseStats[] = .catchRate = 180, .expYield = 58, .evYield_Attack = 1, - .item2 = ITEM_NONE, // ITEM_BLACK_GLASSES, + .item2 = ITEM_BLACK_GLASSES, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, @@ -15571,7 +15679,7 @@ const struct BaseStats gBaseStats[] = .catchRate = 90, .expYield = 123, .evYield_Attack = 2, - .item2 = ITEM_NONE, // ITEM_BLACK_GLASSES, + .item2 = ITEM_BLACK_GLASSES, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, @@ -15605,7 +15713,7 @@ const struct BaseStats gBaseStats[] = .catchRate = 45, .expYield = 234, .evYield_Attack = 3, - .item1 = ITEM_NONE, // ITEM_BLACK_GLASSES, + .item1 = ITEM_BLACK_GLASSES, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, @@ -15689,7 +15797,7 @@ const struct BaseStats gBaseStats[] = .catchRate = 255, .expYield = 161, .evYield_SpAttack = 2, - .item2 = ITEM_NONE, // ITEM_MIRACLE_SEED, + .item2 = ITEM_MIRACLE_SEED, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, @@ -15717,7 +15825,7 @@ const struct BaseStats gBaseStats[] = .catchRate = 190, .expYield = 65, .evYield_Defense = 1, - .item2 = ITEM_NONE, // ITEM_HARD_STONE, + .item2 = ITEM_HARD_STONE, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, @@ -15749,7 +15857,7 @@ const struct BaseStats gBaseStats[] = .catchRate = 75, .expYield = 170, .evYield_Defense = 2, - .item2 = ITEM_NONE, // ITEM_HARD_STONE, + .item2 = ITEM_HARD_STONE, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, @@ -15777,7 +15885,9 @@ const struct BaseStats gBaseStats[] = .catchRate = 180, .expYield = 70, .evYield_Attack = 1, - .item2 = ITEM_NONE, // ITEM_SHED_SHELL, + #ifdef ITEM_EXPANSION + .item2 = ITEM_SHED_SHELL, + #endif .genderRatio = PERCENT_FEMALE(50), .eggCycles = 15, .friendship = 35, @@ -15808,7 +15918,9 @@ const struct BaseStats gBaseStats[] = .expYield = 171, .evYield_Defense = 1, .evYield_SpDefense = 1, - .item2 = ITEM_NONE, // ITEM_SHED_SHELL, + #ifdef ITEM_EXPANSION + .item2 = ITEM_SHED_SHELL, + #endif .genderRatio = PERCENT_FEMALE(50), .eggCycles = 15, .friendship = 70, @@ -15867,7 +15979,7 @@ const struct BaseStats gBaseStats[] = .catchRate = 190, .expYield = 61, .evYield_Defense = 1, - .item2 = ITEM_NONE, // ITEM_SPELL_TAG, + .item2 = ITEM_SPELL_TAG, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 25, .friendship = 70, @@ -15896,7 +16008,7 @@ const struct BaseStats gBaseStats[] = .catchRate = 90, .expYield = 169, .evYield_Defense = 2, - .item2 = ITEM_NONE, // ITEM_SPELL_TAG, + .item2 = ITEM_SPELL_TAG, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 25, .friendship = 70, @@ -16039,7 +16151,7 @@ const struct BaseStats gBaseStats[] = .catchRate = 190, .expYield = 66, .evYield_Speed = 1, - .item2 = ITEM_NONE, // ITEM_SILK_SCARF, + .item2 = ITEM_SILK_SCARF, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, @@ -16067,8 +16179,10 @@ const struct BaseStats gBaseStats[] = .catchRate = 60, .expYield = 166, .evYield_Attack = 2, - .item1 = ITEM_NONE, // ITEM_SILK_SCARF, - .item2 = ITEM_NONE, // ITEM_BLACK_SLUDGE, + .item1 = ITEM_SILK_SCARF, + #ifdef ITEM_EXPANSION + .item2 = ITEM_BLACK_SLUDGE, + #endif .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, @@ -16444,7 +16558,7 @@ const struct BaseStats gBaseStats[] = .catchRate = 255, .expYield = 61, .evYield_SpAttack = 1, - .item2 = ITEM_NONE, // ITEM_NEVER_MELT_ICE, + .item2 = ITEM_NEVER_MELT_ICE, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, @@ -16474,7 +16588,7 @@ const struct BaseStats gBaseStats[] = .catchRate = 120, .expYield = 138, .evYield_SpAttack = 2, - .item2 = ITEM_NONE, // ITEM_NEVER_MELT_ICE, + .item2 = ITEM_NEVER_MELT_ICE, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, @@ -16504,7 +16618,7 @@ const struct BaseStats gBaseStats[] = .catchRate = 45, .expYield = 241, .evYield_SpAttack = 3, - .item1 = ITEM_NONE, // ITEM_NEVER_MELT_ICE, + .item1 = ITEM_NEVER_MELT_ICE, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, @@ -16673,8 +16787,8 @@ const struct BaseStats gBaseStats[] = .catchRate = 190, .expYield = 59, .evYield_HP = 1, - .item1 = ITEM_NONE, // ITEM_TINY_MUSHROOM, - .item2 = ITEM_NONE, // ITEM_BIG_MUSHROOM, + .item1 = ITEM_TINY_MUSHROOM, + .item2 = ITEM_BIG_MUSHROOM, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, @@ -16702,8 +16816,8 @@ const struct BaseStats gBaseStats[] = .catchRate = 75, .expYield = 162, .evYield_HP = 2, - .item1 = ITEM_NONE, // ITEM_TINY_MUSHROOM, - .item2 = ITEM_NONE, // ITEM_BIG_MUSHROOM, + .item1 = ITEM_TINY_MUSHROOM, + .item2 = ITEM_BIG_MUSHROOM, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, @@ -16876,7 +16990,9 @@ const struct BaseStats gBaseStats[] = .catchRate = 255, .expYield = 61, .evYield_Defense = 1, - .item2 = ITEM_NONE, // ITEM_STICKY_BARB, + #ifdef ITEM_EXPANSION + .item2 = ITEM_STICKY_BARB, + #endif .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, @@ -16905,7 +17021,9 @@ const struct BaseStats gBaseStats[] = .catchRate = 90, .expYield = 171, .evYield_Defense = 2, - .item2 = ITEM_NONE, // ITEM_STICKY_BARB, + #ifdef ITEM_EXPANSION + .item2 = ITEM_STICKY_BARB, + #endif .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, @@ -17387,7 +17505,7 @@ const struct BaseStats gBaseStats[] = .catchRate = 25, .expYield = 180, .evYield_SpDefense = 2, - .item2 = ITEM_NONE, // ITEM_NEVER_MELT_ICE, + .item2 = ITEM_NEVER_MELT_ICE, .genderRatio = MON_GENDERLESS, .eggCycles = 25, .friendship = 70, @@ -17470,7 +17588,7 @@ const struct BaseStats gBaseStats[] = .catchRate = 75, .expYield = 165, .evYield_HP = 2, - .item2 = ITEM_NONE, // ITEM_SOFT_SAND, + .item2 = ITEM_SOFT_SAND, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, @@ -17554,7 +17672,7 @@ const struct BaseStats gBaseStats[] = .catchRate = 45, .expYield = 170, .evYield_Attack = 2, - .item2 = ITEM_NONE, // ITEM_DRAGON_FANG, + .item2 = ITEM_DRAGON_FANG, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 30, .friendship = 70, @@ -17584,7 +17702,9 @@ const struct BaseStats gBaseStats[] = .catchRate = 190, .expYield = 61, .evYield_Attack = 1, - .item2 = ITEM_NONE, // ITEM_LIGHT_CLAY, + #ifdef ITEM_EXPANSION + .item2 = ITEM_LIGHT_CLAY, + #endif .genderRatio = MON_GENDERLESS, .eggCycles = 25, .friendship = 70, @@ -17614,7 +17734,9 @@ const struct BaseStats gBaseStats[] = .catchRate = 90, .expYield = 169, .evYield_Attack = 2, - .item2 = ITEM_NONE, // ITEM_LIGHT_CLAY, + #ifdef ITEM_EXPANSION + .item2 = ITEM_LIGHT_CLAY, + #endif .genderRatio = MON_GENDERLESS, .eggCycles = 25, .friendship = 70, @@ -17998,8 +18120,8 @@ const struct BaseStats gBaseStats[] = .catchRate = 15, .expYield = 248, .evYield_SpAttack = 3, - .item1 = ITEM_NONE, // ITEM_SILVER_POWDER, - .item2 = ITEM_NONE, // ITEM_SILVER_POWDER, + .item1 = ITEM_SILVER_POWDER, + .item2 = ITEM_SILVER_POWDER, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 40, .friendship = 70, @@ -18308,8 +18430,8 @@ const struct BaseStats gBaseStats[] = .evYield_Speed = 1, .evYield_SpAttack = 1, .evYield_SpDefense = 1, - .item1 = ITEM_NONE, // ITEM_STAR_PIECE, - .item2 = ITEM_NONE, // ITEM_STAR_PIECE, + .item1 = ITEM_STAR_PIECE, + .item2 = ITEM_STAR_PIECE, .genderRatio = MON_GENDERLESS, .eggCycles = 120, .friendship = 100, @@ -19034,7 +19156,7 @@ const struct BaseStats gBaseStats[] = .catchRate = 220, .expYield = 70, .evYield_Attack = 1, - .item2 = ITEM_NONE, // ITEM_MENTAL_HERB, + .item2 = ITEM_MENTAL_HERB, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 25, .friendship = 70, @@ -19064,7 +19186,7 @@ const struct BaseStats gBaseStats[] = .catchRate = 65, .expYield = 173, .evYield_Attack = 2, - .item2 = ITEM_NONE, // ITEM_MENTAL_HERB, + .item2 = ITEM_MENTAL_HERB, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 25, .friendship = 70, @@ -19818,7 +19940,7 @@ const struct BaseStats gBaseStats[] = .catchRate = 100, .expYield = 175, .evYield_Attack = 2, - .item2 = ITEM_NONE, // ITEM_KINGS_ROCK, + .item2 = ITEM_KINGS_ROCK, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, @@ -19907,7 +20029,9 @@ const struct BaseStats gBaseStats[] = .catchRate = 45, .expYield = 60, .evYield_SpDefense = 1, - .item2 = ITEM_NONE, // ITEM_SHED_SHELL, + #ifdef ITEM_EXPANSION + .item2 = ITEM_SHED_SHELL, + #endif .genderRatio = PERCENT_FEMALE(50), .eggCycles = 40, .friendship = 35, @@ -19937,7 +20061,9 @@ const struct BaseStats gBaseStats[] = .catchRate = 45, .expYield = 158, .evYield_SpDefense = 2, - .item2 = ITEM_NONE, // ITEM_SHED_SHELL, + #ifdef ITEM_EXPANSION + .item2 = ITEM_SHED_SHELL, + #endif .genderRatio = PERCENT_FEMALE(50), .eggCycles = 40, .friendship = 35, @@ -20671,7 +20797,7 @@ const struct BaseStats gBaseStats[] = .catchRate = 255, .expYield = 53, .evYield_Attack = 1, - .item2 = ITEM_NONE, // ITEM_ORAN_BERRY, + .item2 = ITEM_ORAN_BERRY, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 15, .friendship = 70, @@ -20701,7 +20827,7 @@ const struct BaseStats gBaseStats[] = .catchRate = 120, .expYield = 124, .evYield_Attack = 2, - .item2 = ITEM_NONE, // ITEM_SITRUS_BERRY, + .item2 = ITEM_SITRUS_BERRY, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 15, .friendship = 70, @@ -20731,7 +20857,7 @@ const struct BaseStats gBaseStats[] = .catchRate = 45, .expYield = 218, .evYield_Attack = 3, - .item2 = ITEM_NONE, // ITEM_RAWST_BERRY, + .item2 = ITEM_RAWST_BERRY, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 15, .friendship = 70, @@ -20761,7 +20887,7 @@ const struct BaseStats gBaseStats[] = .catchRate = 255, .expYield = 51, .evYield_Attack = 1, - .item2 = ITEM_NONE, // ITEM_PECHA_BERRY, + .item2 = ITEM_PECHA_BERRY, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 15, .friendship = 70, @@ -20791,7 +20917,7 @@ const struct BaseStats gBaseStats[] = .catchRate = 127, .expYield = 146, .evYield_Attack = 2, - .item2 = ITEM_NONE, // ITEM_PECHA_BERRY, + .item2 = ITEM_PECHA_BERRY, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 15, .friendship = 70, @@ -20845,7 +20971,9 @@ const struct BaseStats gBaseStats[] = .catchRate = 120, .expYield = 140, .evYield_Defense = 2, - .item2 = ITEM_NONE, // ITEM_CELL_BATTERY, + #ifdef ITEM_EXPANSION + .item2 = ITEM_CELL_BATTERY, + #endif .genderRatio = PERCENT_FEMALE(50), .eggCycles = 15, .friendship = 70, @@ -20898,7 +21026,7 @@ const struct BaseStats gBaseStats[] = .catchRate = 225, .expYield = 68, .evYield_Attack = 1, - .item2 = ITEM_NONE, // ITEM_ASPEAR_BERRY, + .item2 = ITEM_ASPEAR_BERRY, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, @@ -20928,7 +21056,7 @@ const struct BaseStats gBaseStats[] = .catchRate = 60, .expYield = 167, .evYield_Attack = 2, - .item2 = ITEM_NONE, // ITEM_CHERI_BERRY, + .item2 = ITEM_CHERI_BERRY, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, @@ -20958,7 +21086,9 @@ const struct BaseStats gBaseStats[] = .catchRate = 45, .expYield = 167, .evYield_SpAttack = 2, - .item2 = ITEM_NONE, // ITEM_HONEY, + #ifdef ITEM_EXPANSION + .item2 = ITEM_HONEY, + #endif .genderRatio = PERCENT_FEMALE(75), .eggCycles = 20, .friendship = 70, @@ -20987,7 +21117,9 @@ const struct BaseStats gBaseStats[] = .catchRate = 190, .expYield = 61, .evYield_Speed = 1, - .item2 = ITEM_NONE, // ITEM_HONEY, + #ifdef ITEM_EXPANSION + .item2 = ITEM_HONEY, + #endif .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, @@ -21017,7 +21149,9 @@ const struct BaseStats gBaseStats[] = .catchRate = 75, .expYield = 162, .evYield_Speed = 2, - .item2 = ITEM_NONE, // ITEM_HONEY, + #ifdef ITEM_EXPANSION + .item2 = ITEM_HONEY, + #endif .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, @@ -21131,7 +21265,7 @@ const struct BaseStats gBaseStats[] = .catchRate = 190, .expYield = 61, .evYield_Defense = 1, - .item2 = ITEM_NONE, // ITEM_POISON_BARB, + .item2 = ITEM_POISON_BARB, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, @@ -21161,7 +21295,7 @@ const struct BaseStats gBaseStats[] = .catchRate = 75, .expYield = 173, .evYield_Defense = 2, - .item2 = ITEM_NONE, // ITEM_POISON_BARB, + .item2 = ITEM_POISON_BARB, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, @@ -21191,7 +21325,9 @@ const struct BaseStats gBaseStats[] = .catchRate = 190, .expYield = 77, .evYield_Attack = 1, - .item2 = ITEM_NONE, // ITEM_LIGHT_CLAY, + #ifdef ITEM_EXPANSION + .item2 = ITEM_LIGHT_CLAY, + #endif .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, @@ -21221,7 +21357,9 @@ const struct BaseStats gBaseStats[] = .catchRate = 60, .expYield = 175, .evYield_Attack = 2, - .item2 = ITEM_NONE, // ITEM_LIGHT_CLAY, + #ifdef ITEM_EXPANSION + .item2 = ITEM_LIGHT_CLAY, + #endif .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, @@ -21251,7 +21389,7 @@ const struct BaseStats gBaseStats[] = .catchRate = 200, .expYield = 54, .evYield_SpDefense = 1, - .item2 = ITEM_NONE, // ITEM_MYSTIC_WATER, + .item2 = ITEM_MYSTIC_WATER, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 15, .friendship = 70, @@ -21281,7 +21419,7 @@ const struct BaseStats gBaseStats[] = .catchRate = 100, .expYield = 159, .evYield_SpDefense = 2, - .item2 = ITEM_NONE, // ITEM_MYSTIC_WATER, + .item2 = ITEM_MYSTIC_WATER, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 15, .friendship = 70, @@ -21311,7 +21449,7 @@ const struct BaseStats gBaseStats[] = .catchRate = 190, .expYield = 50, .evYield_Attack = 1, - .item2 = ITEM_NONE, // ITEM_MIRACLE_SEED, + .item2 = ITEM_MIRACLE_SEED, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, @@ -21341,7 +21479,7 @@ const struct BaseStats gBaseStats[] = .catchRate = 75, .expYield = 168, .evYield_Attack = 2, - .item2 = ITEM_NONE, // ITEM_MIRACLE_SEED, + .item2 = ITEM_MIRACLE_SEED, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, @@ -21371,8 +21509,8 @@ const struct BaseStats gBaseStats[] = .catchRate = 190, .expYield = 57, .evYield_SpDefense = 1, - .item1 = ITEM_NONE, // ITEM_TINY_MUSHROOM, - .item2 = ITEM_NONE, // ITEM_BIG_MUSHROOM, + .item1 = ITEM_TINY_MUSHROOM, + .item2 = ITEM_BIG_MUSHROOM, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, @@ -21398,8 +21536,8 @@ const struct BaseStats gBaseStats[] = .catchRate = 75, .expYield = 142, .evYield_SpDefense = 2, - .item1 = ITEM_NONE, // ITEM_TINY_MUSHROOM, - .item2 = ITEM_NONE, // ITEM_BIG_MUSHROOM, + .item1 = ITEM_TINY_MUSHROOM, + .item2 = ITEM_BIG_MUSHROOM, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, @@ -21425,7 +21563,7 @@ const struct BaseStats gBaseStats[] = .catchRate = 120, .expYield = 64, .evYield_Speed = 1, - .item2 = ITEM_NONE, // ITEM_SMOKE_BALL, + .item2 = ITEM_SMOKE_BALL, .genderRatio = PERCENT_FEMALE(12.5), .eggCycles = 20, .friendship = 70, @@ -21455,7 +21593,7 @@ const struct BaseStats gBaseStats[] = .catchRate = 45, .expYield = 168, .evYield_Speed = 2, - .item2 = ITEM_NONE, // ITEM_SMOKE_BALL, + .item2 = ITEM_SMOKE_BALL, .genderRatio = MON_FEMALE, .eggCycles = 20, .friendship = 70, @@ -21543,7 +21681,9 @@ const struct BaseStats gBaseStats[] = .catchRate = 235, .expYield = 42, .evYield_HP = 1, - .item2 = ITEM_NONE, // ITEM_GRASSY_SEED, + #ifdef ITEM_EXPANSION + .item2 = ITEM_GRASSY_SEED, + #endif .genderRatio = MON_FEMALE, .eggCycles = 20, .friendship = 70, @@ -21573,7 +21713,9 @@ const struct BaseStats gBaseStats[] = .catchRate = 120, .expYield = 102, .evYield_Speed = 2, - .item2 = ITEM_NONE, // ITEM_GRASSY_SEED, + #ifdef ITEM_EXPANSION + .item2 = ITEM_GRASSY_SEED, + #endif .genderRatio = MON_FEMALE, .eggCycles = 20, .friendship = 70, @@ -21603,7 +21745,9 @@ const struct BaseStats gBaseStats[] = .catchRate = 45, .expYield = 230, .evYield_Attack = 3, - .item1 = ITEM_NONE, // ITEM_GRASSY_SEED, + #ifdef ITEM_EXPANSION + .item1 = ITEM_GRASSY_SEED, + #endif .genderRatio = MON_FEMALE, .eggCycles = 20, .friendship = 70, @@ -21633,7 +21777,9 @@ const struct BaseStats gBaseStats[] = .catchRate = 60, .expYield = 170, .evYield_SpDefense = 2, - .item2 = ITEM_NONE, // ITEM_MISTY_SEED, + #ifdef ITEM_EXPANSION + .item2 = ITEM_MISTY_SEED, + #endif .genderRatio = PERCENT_FEMALE(75), .eggCycles = 20, .friendship = 70, @@ -21777,7 +21923,7 @@ const struct BaseStats gBaseStats[] = .catchRate = 140, .expYield = 64, .evYield_Defense = 1, - .item2 = ITEM_NONE, // ITEM_SPELL_TAG, + .item2 = ITEM_SPELL_TAG, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 15, .friendship = 70, @@ -21807,7 +21953,7 @@ const struct BaseStats gBaseStats[] = .catchRate = 60, .expYield = 168, .evYield_Defense = 2, - .item2 = ITEM_NONE, // ITEM_SPELL_TAG, + .item2 = ITEM_SPELL_TAG, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 15, .friendship = 70, @@ -21919,7 +22065,7 @@ const struct BaseStats gBaseStats[] = .expYield = 154, .evYield_Defense = 1, .evYield_SpDefense = 1, - .item2 = ITEM_NONE, // ITEM_STAR_PIECE, + .item2 = ITEM_STAR_PIECE, .genderRatio = MON_GENDERLESS, .eggCycles = 25, .friendship = 70, @@ -21976,7 +22122,7 @@ const struct BaseStats gBaseStats[] = .catchRate = 70, .expYield = 170, .evYield_Defense = 2, - .item2 = ITEM_NONE, // ITEM_CHARCOAL, + .item2 = ITEM_CHARCOAL, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, @@ -22001,7 +22147,9 @@ const struct BaseStats gBaseStats[] = .catchRate = 180, .expYield = 152, .evYield_Attack = 2, - .item2 = ITEM_NONE, // ITEM_ELECTRIC_SEED, + #ifdef ITEM_EXPANSION + .item2 = ITEM_ELECTRIC_SEED, + #endif .genderRatio = PERCENT_FEMALE(50), .eggCycles = 10, .friendship = 70, @@ -22031,7 +22179,7 @@ const struct BaseStats gBaseStats[] = .catchRate = 45, .expYield = 167, .evYield_SpDefense = 2, - .item2 = ITEM_NONE, // ITEM_CHESTO_BERRY, + .item2 = ITEM_CHESTO_BERRY, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, @@ -22060,7 +22208,9 @@ const struct BaseStats gBaseStats[] = .catchRate = 80, .expYield = 166, .evYield_Attack = 2, - .item2 = ITEM_NONE, // ITEM_RAZOR_FANG, + #ifdef ITEM_EXPANSION + .item2 = ITEM_RAZOR_FANG, + #endif .genderRatio = PERCENT_FEMALE(50), .eggCycles = 15, .friendship = 70, @@ -22090,7 +22240,7 @@ const struct BaseStats gBaseStats[] = .catchRate = 70, .expYield = 170, .evYield_SpAttack = 2, - .item2 = ITEM_NONE, // ITEM_PERSIM_BERRY, + .item2 = ITEM_PERSIM_BERRY, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, @@ -22148,7 +22298,9 @@ const struct BaseStats gBaseStats[] = .catchRate = 45, .expYield = 60, .evYield_Defense = 1, - .item2 = ITEM_NONE, // ITEM_RAZOR_CLAW, + #ifdef ITEM_EXPANSION + .item2 = ITEM_RAZOR_CLAW, + #endif .genderRatio = PERCENT_FEMALE(50), .eggCycles = 40, .friendship = 70, @@ -22178,7 +22330,9 @@ const struct BaseStats gBaseStats[] = .catchRate = 45, .expYield = 147, .evYield_Defense = 2, - .item2 = ITEM_NONE, // ITEM_RAZOR_CLAW, + #ifdef ITEM_EXPANSION + .item2 = ITEM_RAZOR_CLAW, + #endif .genderRatio = PERCENT_FEMALE(50), .eggCycles = 40, .friendship = 70, @@ -22208,7 +22362,9 @@ const struct BaseStats gBaseStats[] = .catchRate = 45, .expYield = 270, .evYield_Defense = 3, - .item1 = ITEM_NONE, // ITEM_RAZOR_CLAW, + #ifdef ITEM_EXPANSION + .item1 = ITEM_RAZOR_CLAW, + #endif .genderRatio = PERCENT_FEMALE(50), .eggCycles = 40, .friendship = 70, @@ -24297,7 +24453,7 @@ const struct BaseStats gBaseStats[] = .catchRate = 255, .expYield = 51, .evYield_Speed = 1, - .item2 = ITEM_NONE, // ITEM_PECHA_BERRY, + .item2 = ITEM_PECHA_BERRY, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 15, .friendship = 70, @@ -24327,7 +24483,7 @@ const struct BaseStats gBaseStats[] = .catchRate = 127, .expYield = 145, .evYield_Speed = 2, - .item2 = ITEM_NONE, // ITEM_PECHA_BERRY, + .item2 = ITEM_PECHA_BERRY, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 15, .friendship = 70, @@ -24385,7 +24541,9 @@ const struct BaseStats gBaseStats[] = .catchRate = 255, .expYield = 60, .evYield_Defense = 1, - .item2 = ITEM_NONE, // ITEM_GRIP_CLAW, + #ifdef ITEM_EXPANSION + .item2 = ITEM_GRIP_CLAW, + #endif .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, @@ -24444,7 +24602,9 @@ const struct BaseStats gBaseStats[] = .catchRate = 190, .expYield = 60, .evYield_Speed = 1, - .item2 = ITEM_NONE, // ITEM_SNOWBALL, + #ifdef ITEM_EXPANSION + .item2 = ITEM_SNOWBALL, + #endif .genderRatio = PERCENT_FEMALE(75), .eggCycles = 20, .friendship = 70, @@ -24504,7 +24664,7 @@ const struct BaseStats gBaseStats[] = .catchRate = 255, .expYield = 53, .evYield_Speed = 1, - .item2 = ITEM_NONE, // ITEM_SOFT_SAND, + .item2 = ITEM_SOFT_SAND, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, @@ -24534,7 +24694,7 @@ const struct BaseStats gBaseStats[] = .catchRate = 50, .expYield = 149, .evYield_Speed = 2, - .item2 = ITEM_NONE, // ITEM_SOFT_SAND, + .item2 = ITEM_SOFT_SAND, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, @@ -24564,7 +24724,7 @@ const struct BaseStats gBaseStats[] = .catchRate = 255, .expYield = 58, .evYield_Speed = 1, - .item2 = ITEM_NONE, // ITEM_QUICK_CLAW, + .item2 = ITEM_QUICK_CLAW, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, @@ -24594,7 +24754,7 @@ const struct BaseStats gBaseStats[] = .catchRate = 90, .expYield = 154, .evYield_Speed = 2, - .item2 = ITEM_NONE, // ITEM_QUICK_CLAW, + .item2 = ITEM_QUICK_CLAW, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, @@ -24624,7 +24784,9 @@ const struct BaseStats gBaseStats[] = .catchRate = 255, .expYield = 60, .evYield_Defense = 1, - .item2 = ITEM_NONE, // ITEM_CELL_BATTERY, + #ifdef ITEM_EXPANSION + .item2 = ITEM_CELL_BATTERY, + #endif .genderRatio = PERCENT_FEMALE(50), .eggCycles = 15, .friendship = 70, @@ -24652,7 +24814,9 @@ const struct BaseStats gBaseStats[] = .catchRate = 120, .expYield = 137, .evYield_Defense = 2, - .item2 = ITEM_NONE, // ITEM_CELL_BATTERY, + #ifdef ITEM_EXPANSION + .item2 = ITEM_CELL_BATTERY, + #endif .genderRatio = PERCENT_FEMALE(50), .eggCycles = 15, .friendship = 70, @@ -24707,7 +24871,9 @@ const struct BaseStats gBaseStats[] = .catchRate = 190, .expYield = 65, .evYield_HP = 1, - .item2 = ITEM_NONE, // ITEM_BLACK_SLUDGE, + #ifdef ITEM_EXPANSION + .item2 = ITEM_BLACK_SLUDGE, + #endif .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, @@ -24825,7 +24991,7 @@ const struct BaseStats gBaseStats[] = .catchRate = 190, .expYield = 112, .evYield_Speed = 2, - .item2 = ITEM_NONE, // ITEM_LIGHT_BALL, + .item2 = ITEM_LIGHT_BALL, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 10, .friendship = 70, @@ -24851,7 +25017,7 @@ const struct BaseStats gBaseStats[] = .catchRate = 190, .expYield = 112, .evYield_Speed = 2, - .item2 = ITEM_NONE, // ITEM_LIGHT_BALL, + .item2 = ITEM_LIGHT_BALL, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 10, .friendship = 70, @@ -24877,7 +25043,7 @@ const struct BaseStats gBaseStats[] = .catchRate = 190, .expYield = 112, .evYield_Speed = 2, - .item2 = ITEM_NONE, // ITEM_LIGHT_BALL, + .item2 = ITEM_LIGHT_BALL, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 10, .friendship = 70, @@ -24903,7 +25069,7 @@ const struct BaseStats gBaseStats[] = .catchRate = 190, .expYield = 112, .evYield_Speed = 2, - .item2 = ITEM_NONE, // ITEM_LIGHT_BALL, + .item2 = ITEM_LIGHT_BALL, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 10, .friendship = 70, @@ -24929,7 +25095,7 @@ const struct BaseStats gBaseStats[] = .catchRate = 190, .expYield = 112, .evYield_Speed = 2, - .item2 = ITEM_NONE, // ITEM_LIGHT_BALL, + .item2 = ITEM_LIGHT_BALL, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 10, .friendship = 70, @@ -24955,7 +25121,7 @@ const struct BaseStats gBaseStats[] = .catchRate = 190, .expYield = 112, .evYield_Speed = 2, - .item2 = ITEM_NONE, // ITEM_LIGHT_BALL, + .item2 = ITEM_LIGHT_BALL, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 10, .friendship = 70, @@ -24981,7 +25147,7 @@ const struct BaseStats gBaseStats[] = .catchRate = 190, .expYield = 112, .evYield_Speed = 2, - .item2 = ITEM_NONE, // ITEM_LIGHT_BALL, + .item2 = ITEM_LIGHT_BALL, .genderRatio = MON_MALE, .eggCycles = 10, .friendship = 70, @@ -25007,7 +25173,7 @@ const struct BaseStats gBaseStats[] = .catchRate = 190, .expYield = 112, .evYield_Speed = 2, - .item2 = ITEM_NONE, // ITEM_LIGHT_BALL, + .item2 = ITEM_LIGHT_BALL, .genderRatio = MON_MALE, .eggCycles = 10, .friendship = 70, @@ -25033,7 +25199,7 @@ const struct BaseStats gBaseStats[] = .catchRate = 190, .expYield = 112, .evYield_Speed = 2, - .item2 = ITEM_NONE, // ITEM_LIGHT_BALL, + .item2 = ITEM_LIGHT_BALL, .genderRatio = MON_MALE, .eggCycles = 10, .friendship = 70, @@ -25059,7 +25225,7 @@ const struct BaseStats gBaseStats[] = .catchRate = 190, .expYield = 112, .evYield_Speed = 2, - .item2 = ITEM_NONE, // ITEM_LIGHT_BALL, + .item2 = ITEM_LIGHT_BALL, .genderRatio = MON_MALE, .eggCycles = 10, .friendship = 70, @@ -25085,7 +25251,7 @@ const struct BaseStats gBaseStats[] = .catchRate = 190, .expYield = 112, .evYield_Speed = 2, - .item2 = ITEM_NONE, // ITEM_LIGHT_BALL, + .item2 = ITEM_LIGHT_BALL, .genderRatio = MON_MALE, .eggCycles = 10, .friendship = 70, @@ -25111,7 +25277,7 @@ const struct BaseStats gBaseStats[] = .catchRate = 190, .expYield = 112, .evYield_Speed = 2, - .item2 = ITEM_NONE, // ITEM_LIGHT_BALL, + .item2 = ITEM_LIGHT_BALL, .genderRatio = MON_MALE, .eggCycles = 10, .friendship = 70, @@ -25137,7 +25303,7 @@ const struct BaseStats gBaseStats[] = .catchRate = 190, .expYield = 112, .evYield_Speed = 2, - .item2 = ITEM_NONE, // ITEM_LIGHT_BALL, + .item2 = ITEM_LIGHT_BALL, .genderRatio = MON_MALE, .eggCycles = 10, .friendship = 70, @@ -25863,8 +26029,8 @@ const struct BaseStats gBaseStats[] = .catchRate = 45, .expYield = 147, .evYield_HP = 1, - .item1 = ITEM_NONE, // ITEM_MYSTIC_WATER, - .item2 = ITEM_NONE, // ITEM_MYSTIC_WATER, + .item1 = ITEM_MYSTIC_WATER, + .item2 = ITEM_MYSTIC_WATER, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 25, .friendship = 70, @@ -25889,8 +26055,8 @@ const struct BaseStats gBaseStats[] = .catchRate = 45, .expYield = 147, .evYield_HP = 1, - .item1 = ITEM_NONE, // ITEM_MYSTIC_WATER, - .item2 = ITEM_NONE, // ITEM_MYSTIC_WATER, + .item1 = ITEM_MYSTIC_WATER, + .item2 = ITEM_MYSTIC_WATER, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 25, .friendship = 70, @@ -25915,8 +26081,8 @@ const struct BaseStats gBaseStats[] = .catchRate = 45, .expYield = 147, .evYield_HP = 1, - .item1 = ITEM_NONE, // ITEM_MYSTIC_WATER, - .item2 = ITEM_NONE, // ITEM_MYSTIC_WATER, + .item1 = ITEM_MYSTIC_WATER, + .item2 = ITEM_MYSTIC_WATER, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 25, .friendship = 70, @@ -26124,7 +26290,7 @@ const struct BaseStats gBaseStats[] = .catchRate = 75, .expYield = 158, .evYield_SpAttack = 2, - .item2 = ITEM_NONE, // ITEM_MIRACLE_SEED, + .item2 = ITEM_MIRACLE_SEED, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 70, @@ -26360,8 +26526,8 @@ const struct BaseStats gBaseStats[] = .catchRate = 45, .expYield = 270, .evYield_HP = 3, - .item1 = ITEM_NONE, // ITEM_LUM_BERRY, - .item2 = ITEM_NONE, // ITEM_LUM_BERRY, + .item1 = ITEM_LUM_BERRY, + .item2 = ITEM_LUM_BERRY, .genderRatio = MON_GENDERLESS, .eggCycles = 120, .friendship = 100, @@ -26862,7 +27028,7 @@ const struct BaseStats gBaseStats[] = .catchRate = 25, .expYield = 161, .evYield_Speed = 2, - .item2 = ITEM_NONE, // ITEM_DEEP_SEA_SCALE, + .item2 = ITEM_DEEP_SEA_SCALE, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 40, .friendship = 70, @@ -27257,8 +27423,8 @@ const struct BaseStats gBaseStats[] = .evYield_Attack = 1, .evYield_Defense = 1, .evYield_Speed = 1, - .item1 = ITEM_NONE, // ITEM_STAR_PIECE, - .item2 = ITEM_NONE, // ITEM_STAR_PIECE, + .item1 = ITEM_STAR_PIECE, + .item2 = ITEM_STAR_PIECE, .genderRatio = MON_GENDERLESS, .eggCycles = 120, .friendship = 100, @@ -29044,7 +29210,9 @@ const struct BaseStats gBaseStats[] = .catchRate = 45, .expYield = 167, .evYield_SpAttack = 2, - .item2 = ITEM_NONE, // ITEM_HONEY, + #ifdef ITEM_EXPANSION + .item2 = ITEM_HONEY, + #endif .genderRatio = PERCENT_FEMALE(75), .eggCycles = 20, .friendship = 70, @@ -29073,7 +29241,9 @@ const struct BaseStats gBaseStats[] = .catchRate = 45, .expYield = 167, .evYield_SpAttack = 2, - .item2 = ITEM_NONE, // ITEM_HONEY, + #ifdef ITEM_EXPANSION + .item2 = ITEM_HONEY, + #endif .genderRatio = PERCENT_FEMALE(75), .eggCycles = 20, .friendship = 70, @@ -29102,7 +29272,9 @@ const struct BaseStats gBaseStats[] = .catchRate = 45, .expYield = 167, .evYield_SpAttack = 2, - .item2 = ITEM_NONE, // ITEM_HONEY, + #ifdef ITEM_EXPANSION + .item2 = ITEM_HONEY, + #endif .genderRatio = PERCENT_FEMALE(75), .eggCycles = 20, .friendship = 70, @@ -29715,7 +29887,7 @@ const struct BaseStats gBaseStats[] = .expYield = 154, .evYield_Defense = 1, .evYield_SpDefense = 1, - .item2 = ITEM_NONE, // ITEM_STAR_PIECE, + .item2 = ITEM_STAR_PIECE, .genderRatio = MON_GENDERLESS, .eggCycles = 25, .friendship = 70, @@ -29745,7 +29917,7 @@ const struct BaseStats gBaseStats[] = .expYield = 154, .evYield_Defense = 1, .evYield_SpDefense = 1, - .item2 = ITEM_NONE, // ITEM_STAR_PIECE, + .item2 = ITEM_STAR_PIECE, .genderRatio = MON_GENDERLESS, .eggCycles = 25, .friendship = 70, @@ -29775,7 +29947,7 @@ const struct BaseStats gBaseStats[] = .expYield = 154, .evYield_Defense = 1, .evYield_SpDefense = 1, - .item2 = ITEM_NONE, // ITEM_STAR_PIECE, + .item2 = ITEM_STAR_PIECE, .genderRatio = MON_GENDERLESS, .eggCycles = 25, .friendship = 70, @@ -29805,7 +29977,7 @@ const struct BaseStats gBaseStats[] = .expYield = 154, .evYield_Defense = 1, .evYield_SpDefense = 1, - .item2 = ITEM_NONE, // ITEM_STAR_PIECE, + .item2 = ITEM_STAR_PIECE, .genderRatio = MON_GENDERLESS, .eggCycles = 25, .friendship = 70, @@ -29835,7 +30007,7 @@ const struct BaseStats gBaseStats[] = .expYield = 154, .evYield_Defense = 1, .evYield_SpDefense = 1, - .item2 = ITEM_NONE, // ITEM_STAR_PIECE, + .item2 = ITEM_STAR_PIECE, .genderRatio = MON_GENDERLESS, .eggCycles = 25, .friendship = 70, @@ -29865,7 +30037,7 @@ const struct BaseStats gBaseStats[] = .expYield = 154, .evYield_Defense = 1, .evYield_SpDefense = 1, - .item2 = ITEM_NONE, // ITEM_STAR_PIECE, + .item2 = ITEM_STAR_PIECE, .genderRatio = MON_GENDERLESS, .eggCycles = 25, .friendship = 70, @@ -29895,7 +30067,7 @@ const struct BaseStats gBaseStats[] = .expYield = 154, .evYield_Defense = 1, .evYield_SpDefense = 1, - .item2 = ITEM_NONE, // ITEM_STAR_PIECE, + .item2 = ITEM_STAR_PIECE, .genderRatio = MON_GENDERLESS, .eggCycles = 25, .friendship = 70, @@ -29925,7 +30097,7 @@ const struct BaseStats gBaseStats[] = .expYield = 154, .evYield_Defense = 1, .evYield_SpDefense = 1, - .item2 = ITEM_NONE, // ITEM_STAR_PIECE, + .item2 = ITEM_STAR_PIECE, .genderRatio = MON_GENDERLESS, .eggCycles = 25, .friendship = 70, @@ -29955,7 +30127,7 @@ const struct BaseStats gBaseStats[] = .expYield = 154, .evYield_Defense = 1, .evYield_SpDefense = 1, - .item2 = ITEM_NONE, // ITEM_STAR_PIECE, + .item2 = ITEM_STAR_PIECE, .genderRatio = MON_GENDERLESS, .eggCycles = 25, .friendship = 70, @@ -29985,7 +30157,7 @@ const struct BaseStats gBaseStats[] = .expYield = 154, .evYield_Defense = 1, .evYield_SpDefense = 1, - .item2 = ITEM_NONE, // ITEM_STAR_PIECE, + .item2 = ITEM_STAR_PIECE, .genderRatio = MON_GENDERLESS, .eggCycles = 25, .friendship = 70, @@ -30015,7 +30187,7 @@ const struct BaseStats gBaseStats[] = .expYield = 154, .evYield_Defense = 1, .evYield_SpDefense = 1, - .item2 = ITEM_NONE, // ITEM_STAR_PIECE, + .item2 = ITEM_STAR_PIECE, .genderRatio = MON_GENDERLESS, .eggCycles = 25, .friendship = 70, @@ -30045,7 +30217,7 @@ const struct BaseStats gBaseStats[] = .expYield = 154, .evYield_Defense = 1, .evYield_SpDefense = 1, - .item2 = ITEM_NONE, // ITEM_STAR_PIECE, + .item2 = ITEM_STAR_PIECE, .genderRatio = MON_GENDERLESS, .eggCycles = 25, .friendship = 70, @@ -30075,7 +30247,7 @@ const struct BaseStats gBaseStats[] = .expYield = 154, .evYield_Defense = 1, .evYield_SpDefense = 1, - .item2 = ITEM_NONE, // ITEM_STAR_PIECE, + .item2 = ITEM_STAR_PIECE, .genderRatio = MON_GENDERLESS, .eggCycles = 25, .friendship = 70,