From 251019d63de19f1169705bbbfb757d1206feccaf Mon Sep 17 00:00:00 2001 From: kittenchilly Date: Wed, 12 Jun 2024 04:33:03 -0500 Subject: [PATCH] Update wild held items to Gen 9 (#4769) * Update wild held items to Gen 9 * Update gen_1_families.h * Update gen_5_families.h --- .../pokemon/species_info/gen_2_families.h | 1 + .../pokemon/species_info/gen_5_families.h | 1 + .../pokemon/species_info/gen_7_families.h | 8 +++---- .../pokemon/species_info/gen_9_families.h | 24 +++++++++++++++++++ 4 files changed, 30 insertions(+), 4 deletions(-) diff --git a/src/data/pokemon/species_info/gen_2_families.h b/src/data/pokemon/species_info/gen_2_families.h index 492efdd048..5c42d99ef9 100644 --- a/src/data/pokemon/species_info/gen_2_families.h +++ b/src/data/pokemon/species_info/gen_2_families.h @@ -4330,6 +4330,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = .catchRate = 120, .expYield = (P_UPDATED_EXP_YIELDS >= GEN_5) ? 66 : 124, .evYield_Attack = 1, + .itemCommon = ITEM_HONEY, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = STANDARD_FRIENDSHIP, diff --git a/src/data/pokemon/species_info/gen_5_families.h b/src/data/pokemon/species_info/gen_5_families.h index ee8ead9858..b25aae6546 100644 --- a/src/data/pokemon/species_info/gen_5_families.h +++ b/src/data/pokemon/species_info/gen_5_families.h @@ -8503,6 +8503,7 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = .catchRate = 45, .expYield = 172, .evYield_Attack = 2, + .itemRare = ITEM_LEADERS_CREST, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = 35, diff --git a/src/data/pokemon/species_info/gen_7_families.h b/src/data/pokemon/species_info/gen_7_families.h index fef7f30e2e..fdb038b4c6 100644 --- a/src/data/pokemon/species_info/gen_7_families.h +++ b/src/data/pokemon/species_info/gen_7_families.h @@ -1197,7 +1197,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .catchRate = 45, .expYield = 167, .evYield_SpAttack = 2, - .itemRare = ITEM_HONEY, + .itemRare = ITEM_RED_NECTAR, .genderRatio = PERCENT_FEMALE(75), .eggCycles = 20, .friendship = STANDARD_FRIENDSHIP, @@ -1252,7 +1252,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .catchRate = 45, .expYield = 167, .evYield_SpAttack = 2, - .itemRare = ITEM_HONEY, + .itemRare = ITEM_YELLOW_NECTAR, .genderRatio = PERCENT_FEMALE(75), .eggCycles = 20, .friendship = STANDARD_FRIENDSHIP, @@ -1307,7 +1307,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .catchRate = 45, .expYield = 167, .evYield_SpAttack = 2, - .itemRare = ITEM_HONEY, + .itemRare = ITEM_PINK_NECTAR, .genderRatio = PERCENT_FEMALE(75), .eggCycles = 20, .friendship = STANDARD_FRIENDSHIP, @@ -1362,7 +1362,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .catchRate = 45, .expYield = 167, .evYield_SpAttack = 2, - .itemRare = ITEM_HONEY, + .itemRare = ITEM_PURPLE_NECTAR, .genderRatio = PERCENT_FEMALE(75), .eggCycles = 20, .friendship = STANDARD_FRIENDSHIP, diff --git a/src/data/pokemon/species_info/gen_9_families.h b/src/data/pokemon/species_info/gen_9_families.h index da82e9bc5a..8110770ffd 100644 --- a/src/data/pokemon/species_info/gen_9_families.h +++ b/src/data/pokemon/species_info/gen_9_families.h @@ -2529,6 +2529,8 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .catchRate = 190, .expYield = 67, .evYield_SpDefense = 1, + .itemCommon = ITEM_TINY_MUSHROOM, + .itemRare = ITEM_BIG_MUSHROOM, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = STANDARD_FRIENDSHIP, @@ -2582,6 +2584,8 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .catchRate = 90, .expYield = 180, .evYield_SpDefense = 2, + .itemCommon = ITEM_TINY_MUSHROOM, + .itemRare = ITEM_BIG_MUSHROOM, .genderRatio = PERCENT_FEMALE(50), .eggCycles = 20, .friendship = STANDARD_FRIENDSHIP, @@ -4354,6 +4358,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .catchRate = 30, .expYield = 285, .evYield_Attack = 3, + .itemRare = ITEM_BOOSTER_ENERGY, .genderRatio = MON_GENDERLESS, .eggCycles = 50, .friendship = 0, @@ -4409,6 +4414,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .catchRate = 50, .expYield = 285, .evYield_HP = 3, + .itemRare = ITEM_BOOSTER_ENERGY, .genderRatio = MON_GENDERLESS, .eggCycles = 50, .friendship = 0, @@ -4464,6 +4470,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .catchRate = 50, .expYield = 285, .evYield_Attack = 3, + .itemRare = ITEM_BOOSTER_ENERGY, .genderRatio = MON_GENDERLESS, .eggCycles = 50, .friendship = 0, @@ -4521,6 +4528,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .evYield_Speed = 1, .evYield_SpAttack = 1, .evYield_SpDefense = 1, + .itemRare = ITEM_BOOSTER_ENERGY, .genderRatio = MON_GENDERLESS, .eggCycles = 50, .friendship = 0, @@ -4577,6 +4585,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .catchRate = 30, .expYield = 285, .evYield_Attack = 3, + .itemRare = ITEM_BOOSTER_ENERGY, .genderRatio = MON_GENDERLESS, .eggCycles = 50, .friendship = 0, @@ -4631,6 +4640,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .catchRate = 30, .expYield = 285, .evYield_SpAttack = 3, + .itemRare = ITEM_BOOSTER_ENERGY, .genderRatio = MON_GENDERLESS, .eggCycles = 50, .friendship = 0, @@ -4686,6 +4696,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .catchRate = 30, .expYield = 285, .evYield_Defense = 3, + .itemRare = ITEM_BOOSTER_ENERGY, .genderRatio = MON_GENDERLESS, .eggCycles = 50, .friendship = 0, @@ -4741,6 +4752,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .catchRate = 50, .expYield = 285, .evYield_Speed = 3, + .itemRare = ITEM_BOOSTER_ENERGY, .genderRatio = MON_GENDERLESS, .eggCycles = 50, .friendship = 0, @@ -4796,6 +4808,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .catchRate = 50, .expYield = 285, .evYield_Attack = 3, + .itemRare = ITEM_BOOSTER_ENERGY, .genderRatio = MON_GENDERLESS, .eggCycles = 50, .friendship = 0, @@ -4851,6 +4864,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .catchRate = 30, .expYield = 285, .evYield_SpAttack = 3, + .itemRare = ITEM_BOOSTER_ENERGY, .genderRatio = MON_GENDERLESS, .eggCycles = 50, .friendship = 0, @@ -4907,6 +4921,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .catchRate = 30, .expYield = 285, .evYield_SpAttack = 3, + .itemRare = ITEM_BOOSTER_ENERGY, .genderRatio = MON_GENDERLESS, .eggCycles = 50, .friendship = 0, @@ -4963,6 +4978,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .catchRate = 30, .expYield = 285, .evYield_Attack = 3, + .itemRare = ITEM_BOOSTER_ENERGY, .genderRatio = MON_GENDERLESS, .eggCycles = 50, .friendship = 0, @@ -5561,6 +5577,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .catchRate = 10, .expYield = 295, .evYield_Attack = 3, + .itemRare = ITEM_BOOSTER_ENERGY, .genderRatio = MON_GENDERLESS, .eggCycles = 50, .friendship = 0, @@ -5617,6 +5634,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .catchRate = 10, .expYield = 295, .evYield_Attack = 3, + .itemRare = ITEM_BOOSTER_ENERGY, .genderRatio = MON_GENDERLESS, .eggCycles = 50, .friendship = 0, @@ -5783,6 +5801,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .catchRate = 5, .expYield = 295, .evYield_SpAttack = 3, + .itemRare = ITEM_BOOSTER_ENERGY, .genderRatio = MON_GENDERLESS, .eggCycles = 50, .friendship = 0, @@ -5837,6 +5856,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .catchRate = 5, .expYield = 295, .evYield_Attack = 3, + .itemRare = ITEM_BOOSTER_ENERGY, .genderRatio = MON_GENDERLESS, .eggCycles = 50, .friendship = 0, @@ -6335,6 +6355,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .catchRate = 10, .expYield = 295, .evYield_Defense = 3, + .itemRare = ITEM_BOOSTER_ENERGY, .genderRatio = MON_GENDERLESS, .eggCycles = 50, .friendship = 0, @@ -6390,6 +6411,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .catchRate = 10, .expYield = 295, .evYield_SpAttack = 3, + .itemRare = ITEM_BOOSTER_ENERGY, .genderRatio = MON_GENDERLESS, .eggCycles = 50, .friendship = 0, @@ -6445,6 +6467,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .catchRate = 10, .expYield = 295, .evYield_Speed = 3, + .itemRare = ITEM_BOOSTER_ENERGY, .genderRatio = MON_GENDERLESS, .eggCycles = 50, .friendship = 0, @@ -6499,6 +6522,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] = .catchRate = 10, .expYield = 295, .evYield_SpAttack = 3, + .itemRare = ITEM_BOOSTER_ENERGY, .genderRatio = MON_GENDERLESS, .eggCycles = 50, .friendship = 0,