Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update wild held items to Gen 9 #4769

Merged
merged 3 commits into from
Jun 12, 2024
Merged

Update wild held items to Gen 9 #4769

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
060ce5b
Update wild held items to Gen 9
kittenchilly Jun 11, 2024
ba83934
Update gen_1_families.h
kittenchilly Jun 11, 2024
e6ff5de
Update gen_5_families.h
kittenchilly Jun 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/data/pokemon/species_info/gen_2_families.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
1 change: 1 addition & 0 deletions src/data/pokemon/species_info/gen_5_families.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
8 changes: 4 additions & 4 deletions src/data/pokemon/species_info/gen_7_families.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1197,7 +1197,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] =
.catchRate = 45,
.expYield = 167,
.evYield_SpAttack = 2,
.itemRare = ITEM_HONEY,
Bassoonian marked this conversation as resolved.
Show resolved Hide resolved
.itemRare = ITEM_RED_NECTAR,
.genderRatio = PERCENT_FEMALE(75),
.eggCycles = 20,
.friendship = STANDARD_FRIENDSHIP,
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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,
Expand Down
24 changes: 24 additions & 0 deletions src/data/pokemon/species_info/gen_9_families.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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,
Expand Down
Loading