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

Update EXP Yield for Indigo Disk mons + other data fixes #3974

Merged
merged 7 commits into from
Jan 12, 2024
+13 −10
Merged

Update EXP Yield for Indigo Disk mons + other data fixes #3974

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
7f90d1d
Update EXP Yield for Indigo Disk mons
kittenchilly Jan 11, 2024
bc1f748
Update gen_8.h
kittenchilly Jan 11, 2024
530bbe7
Also update all body colors
kittenchilly Jan 11, 2024
7e4506a
Revert "Also update all body colors"
kittenchilly Jan 11, 2024
6f44f5b
Merge branch 'upcoming' into expyield
kittenchilly Jan 11, 2024
e5a8827
Merge branch 'upcoming' into expyield
kittenchilly Jan 11, 2024
d6c08ab
Merge branch 'upcoming' into expyield
AlexOn1ine Jan 12, 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
4 changes: 2 additions & 2 deletions src/data/pokemon/species_info/gen_8.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1951,7 +1951,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] =
.baseSpDefense = 80,
.types = { TYPE_GRASS, TYPE_DRAGON },
.catchRate = 10,
.expYield = 170, //Currently unknown
.expYield = 270,
.evYield_SpAttack = 3,
.genderRatio = PERCENT_FEMALE(50),
.eggCycles = 20,
Expand Down Expand Up @@ -4307,7 +4307,7 @@ const struct SpeciesInfo gSpeciesInfoGen8[] =
.baseSpDefense = 65,
.types = { TYPE_STEEL, TYPE_DRAGON },
.catchRate = 10,
.expYield = 187, //Currently unknown
.expYield = 300,
.evYield_Defense = 3,
.genderRatio = PERCENT_FEMALE(50),
.eggCycles = 30,
Expand Down
19 changes: 11 additions & 8 deletions src/data/pokemon/species_info/gen_9.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5443,7 +5443,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] =
.baseSpDefense = 93,
.types = { TYPE_FIRE, TYPE_DRAGON },
.catchRate = 10,
.expYield = 261, //Currently unknown
.expYield = 295,
.evYield_Defense = 3,
.genderRatio = MON_GENDERLESS,
.eggCycles = 50,
Expand Down Expand Up @@ -5493,7 +5493,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] =
.baseSpDefense = 89,
.types = { TYPE_ELECTRIC, TYPE_DRAGON },
.catchRate = 10,
.expYield = 261, //Currently unknown
.expYield = 295,
.evYield_SpAttack = 3,
.genderRatio = MON_GENDERLESS,
.eggCycles = 50,
Expand Down Expand Up @@ -5543,7 +5543,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] =
.baseSpDefense = 108,
.types = { TYPE_ROCK, TYPE_PSYCHIC },
.catchRate = 10,
.expYield = 261, //Currently unknown
.expYield = 295,
.evYield_Speed = 3,
.genderRatio = MON_GENDERLESS,
.eggCycles = 50,
Expand Down Expand Up @@ -5592,7 +5592,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] =
.baseSpDefense = 108,
.types = { TYPE_STEEL, TYPE_PSYCHIC },
.catchRate = 10,
.expYield = 261, //Currently unknown
.expYield = 295,
.evYield_SpAttack = 3,
.genderRatio = MON_GENDERLESS,
.eggCycles = 50,
Expand Down Expand Up @@ -5635,9 +5635,8 @@ const struct SpeciesInfo gSpeciesInfoGen9[] =
#define TERAPAGOS_MISC_INFO \
.types = { TYPE_NORMAL, TYPE_NORMAL }, \
.catchRate = 255, \
.expYield = 275, \
.genderRatio = PERCENT_FEMALE(50), \
.eggCycles = 20, \
.eggCycles = 5, \
.friendship = STANDARD_FRIENDSHIP, \
.growthRate = GROWTH_SLOW, \
.eggGroups = { EGG_GROUP_NO_EGGS_DISCOVERED, EGG_GROUP_NO_EGGS_DISCOVERED }, \
Expand All @@ -5661,6 +5660,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] =
.baseSpeed = 60,
.baseSpAttack = 65,
.baseSpDefense = 85,
.expYield = 90,
.evYield_Defense = 1,
.abilities = { ABILITY_TERA_SHIFT, ABILITY_NONE },
.height = 2,
Expand Down Expand Up @@ -5694,7 +5694,9 @@ const struct SpeciesInfo gSpeciesInfoGen9[] =
.baseSpeed = 85,
.baseSpAttack = 105,
.baseSpDefense = 110,
.expYield = 120,
.evYield_Defense = 2,
.evYield_SpDefense = 2,
.abilities = { ABILITY_TERA_SHELL, ABILITY_NONE },
.height = 3,
.weight = 160,
Expand Down Expand Up @@ -5727,6 +5729,7 @@ const struct SpeciesInfo gSpeciesInfoGen9[] =
.baseSpeed = 85,
.baseSpAttack = 130,
.baseSpDefense = 110,
.expYield = 140,
.evYield_HP = 3,
.abilities = { ABILITY_TERAFORM_ZERO, ABILITY_NONE },
.height = 17,
Expand Down Expand Up @@ -5763,10 +5766,10 @@ const struct SpeciesInfo gSpeciesInfoGen9[] =
.baseSpDefense = 88,
.types = { TYPE_POISON, TYPE_GHOST },
.catchRate = 3,
.expYield = 261, //Currently unknown
.expYield = 300,
.evYield_Defense = 3,
.genderRatio = MON_GENDERLESS,
.eggCycles = 50,
.eggCycles = 20,
.friendship = 0,
.growthRate = GROWTH_SLOW,
.eggGroups = { EGG_GROUP_NO_EGGS_DISCOVERED, EGG_GROUP_NO_EGGS_DISCOVERED },
Expand Down
Loading