Cloyir/pokeemmo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed disabled cross-evolutions still being possible (#7678)

Browse Source
This commit is contained in:
Eduardo Quezada 2025-09-02 09:46:48 -04:00 committed by GitHub
parent c252e2256b
commit f39fdf57cf
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 127 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

94
src/data/pokemon/species_info/gen_1_families.h
View File

@ -5730,7 +5730,9 @@ const struct SpeciesInfo gSpeciesInfoGen1[] =
)
.levelUpLearnset = sGolbatLevelUpLearnset,
.teachableLearnset = sGolbatTeachableLearnset,
#if P_GEN_2_CROSS_EVOS
.evolutions = EVOLUTION({EVO_LEVEL, 0, SPECIES_CROBAT, CONDITIONS({IF_MIN_FRIENDSHIP, FRIENDSHIP_EVO_THRESHOLD})}),
#endif
},
#if P_GEN_2_CROSS_EVOS
@ -5979,8 +5981,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] =
)
.levelUpLearnset = sGloomLevelUpLearnset,
.teachableLearnset = sGloomTeachableLearnset,
.evolutions = EVOLUTION({EVO_ITEM, ITEM_LEAF_STONE, SPECIES_VILEPLUME},
{EVO_ITEM, ITEM_SUN_STONE, SPECIES_BELLOSSOM}),
.evolutions = EVOLUTION({EVO_ITEM, ITEM_LEAF_STONE, SPECIES_VILEPLUME}
#if P_GEN_2_CROSS_EVOS
,{EVO_ITEM, ITEM_SUN_STONE, SPECIES_BELLOSSOM}
#endif
),
},
[SPECIES_VILEPLUME] =
@ -7577,7 +7582,9 @@ const struct SpeciesInfo gSpeciesInfoGen1[] =
)
.levelUpLearnset = sPrimeapeLevelUpLearnset,
.teachableLearnset = sPrimeapeTeachableLearnset,
#if P_GEN_9_CROSS_EVOS
.evolutions = EVOLUTION({EVO_LEVEL, 0, SPECIES_ANNIHILAPE, CONDITIONS({IF_USED_MOVE_X_TIMES, MOVE_RAGE_FIST, 20})}),
#endif
},
#if P_GEN_9_CROSS_EVOS
@ -8064,9 +8071,12 @@ const struct SpeciesInfo gSpeciesInfoGen1[] =
)
.levelUpLearnset = sPoliwhirlLevelUpLearnset,
.teachableLearnset = sPoliwhirlTeachableLearnset,
.evolutions = EVOLUTION({EVO_ITEM, ITEM_WATER_STONE, SPECIES_POLIWRATH},
{EVO_TRADE, 0, SPECIES_POLITOED, CONDITIONS({IF_HOLD_ITEM, ITEM_KINGS_ROCK})},
{EVO_ITEM, ITEM_KINGS_ROCK, SPECIES_POLITOED}),
.evolutions = EVOLUTION({EVO_ITEM, ITEM_WATER_STONE, SPECIES_POLIWRATH}
#if P_GEN_2_CROSS_EVOS
,{EVO_TRADE, 0, SPECIES_POLITOED, CONDITIONS({IF_HOLD_ITEM, ITEM_KINGS_ROCK})},
{EVO_ITEM, ITEM_KINGS_ROCK, SPECIES_POLITOED}
#endif
),
},
[SPECIES_POLIWRATH] =
@ -10045,9 +10055,12 @@ const struct SpeciesInfo gSpeciesInfoGen1[] =
.teachableLearnset = sSlowpokeTeachableLearnset,
.eggMoveLearnset = sSlowpokeEggMoveLearnset,
.formSpeciesIdTable = sSlowpokeFormSpeciesIdTable,
.evolutions = EVOLUTION({EVO_LEVEL, 37, SPECIES_SLOWBRO},
{EVO_TRADE, 0, SPECIES_SLOWKING, CONDITIONS({IF_HOLD_ITEM, ITEM_KINGS_ROCK})},
{EVO_ITEM, ITEM_KINGS_ROCK, SPECIES_SLOWKING}),
.evolutions = EVOLUTION({EVO_LEVEL, 37, SPECIES_SLOWBRO}
#if P_GEN_2_CROSS_EVOS
,{EVO_TRADE, 0, SPECIES_SLOWKING, CONDITIONS({IF_HOLD_ITEM, ITEM_KINGS_ROCK})},
{EVO_ITEM, ITEM_KINGS_ROCK, SPECIES_SLOWKING}
#endif
),
},
[SPECIES_SLOWBRO] =
@ -10326,8 +10339,11 @@ const struct SpeciesInfo gSpeciesInfoGen1[] =
.teachableLearnset = sSlowpokeGalarTeachableLearnset,
.eggMoveLearnset = sSlowpokeGalarEggMoveLearnset,
.formSpeciesIdTable = sSlowpokeFormSpeciesIdTable,
.evolutions = EVOLUTION({EVO_ITEM, ITEM_GALARICA_CUFF, SPECIES_SLOWBRO_GALAR},
{EVO_ITEM, ITEM_GALARICA_WREATH, SPECIES_SLOWKING_GALAR}),
.evolutions = EVOLUTION({EVO_ITEM, ITEM_GALARICA_CUFF, SPECIES_SLOWBRO_GALAR}
#if P_GEN_2_CROSS_EVOS
,{EVO_ITEM, ITEM_GALARICA_WREATH, SPECIES_SLOWKING_GALAR}
#endif
),
},
[SPECIES_SLOWBRO_GALAR] =
@ -10609,8 +10625,10 @@ const struct SpeciesInfo gSpeciesInfoGen1[] =
)
.levelUpLearnset = sMagnetonLevelUpLearnset,
.teachableLearnset = sMagnetonTeachableLearnset,
#if P_GEN_4_CROSS_EVOS
.evolutions = EVOLUTION({EVO_LEVEL, 0, SPECIES_MAGNEZONE, CONDITIONS({IF_IN_MAPSEC, MAPSEC_NEW_MAUVILLE})},
{EVO_ITEM, ITEM_THUNDER_STONE, SPECIES_MAGNEZONE}),
#endif
},
#if P_GEN_4_CROSS_EVOS
@ -12107,8 +12125,10 @@ const struct SpeciesInfo gSpeciesInfoGen1[] =
.levelUpLearnset = sOnixLevelUpLearnset,
.teachableLearnset = sOnixTeachableLearnset,
.eggMoveLearnset = sOnixEggMoveLearnset,
#if P_GEN_2_CROSS_EVOS
.evolutions = EVOLUTION({EVO_TRADE, 0, SPECIES_STEELIX, CONDITIONS({IF_HOLD_ITEM, ITEM_METAL_COAT})},
{EVO_ITEM, ITEM_METAL_COAT, SPECIES_STEELIX}),
#endif
},
#if P_GEN_2_CROSS_EVOS
@ -13805,7 +13825,9 @@ const struct SpeciesInfo gSpeciesInfoGen1[] =
.levelUpLearnset = sLickitungLevelUpLearnset,
.teachableLearnset = sLickitungTeachableLearnset,
.eggMoveLearnset = sLickitungEggMoveLearnset,
#if P_GEN_4_CROSS_EVOS
.evolutions = EVOLUTION({EVO_LEVEL, 0, SPECIES_LICKILICKY, CONDITIONS({IF_KNOWS_MOVE, MOVE_ROLLOUT})}),
#endif
},
#if P_GEN_4_CROSS_EVOS
@ -14274,8 +14296,10 @@ const struct SpeciesInfo gSpeciesInfoGen1[] =
)
.levelUpLearnset = sRhydonLevelUpLearnset,
.teachableLearnset = sRhydonTeachableLearnset,
#if P_GEN_4_CROSS_EVOS
.evolutions = EVOLUTION({EVO_TRADE, 0, SPECIES_RHYPERIOR, CONDITIONS({IF_HOLD_ITEM, ITEM_PROTECTOR})},
{EVO_ITEM, ITEM_PROTECTOR, SPECIES_RHYPERIOR}),
#endif
},
#if P_GEN_4_CROSS_EVOS
@ -14510,7 +14534,9 @@ const struct SpeciesInfo gSpeciesInfoGen1[] =
.levelUpLearnset = sChanseyLevelUpLearnset,
.teachableLearnset = sChanseyTeachableLearnset,
.eggMoveLearnset = sChanseyEggMoveLearnset,
#if P_GEN_2_CROSS_EVOS
.evolutions = EVOLUTION({EVO_LEVEL, 0, SPECIES_BLISSEY, CONDITIONS({IF_MIN_FRIENDSHIP, FRIENDSHIP_EVO_THRESHOLD})}),
#endif
},
#if P_GEN_2_CROSS_EVOS
@ -14655,7 +14681,9 @@ const struct SpeciesInfo gSpeciesInfoGen1[] =
.levelUpLearnset = sTangelaLevelUpLearnset,
.teachableLearnset = sTangelaTeachableLearnset,
.eggMoveLearnset = sTangelaEggMoveLearnset,
#if P_GEN_4_CROSS_EVOS
.evolutions = EVOLUTION({EVO_LEVEL, 0, SPECIES_TANGROWTH, CONDITIONS({IF_KNOWS_MOVE, MOVE_ANCIENT_POWER})}),
#endif
},
#if P_GEN_4_CROSS_EVOS
@ -15037,8 +15065,10 @@ const struct SpeciesInfo gSpeciesInfoGen1[] =
)
.levelUpLearnset = sSeadraLevelUpLearnset,
.teachableLearnset = sSeadraTeachableLearnset,
#if P_GEN_2_CROSS_EVOS
.evolutions = EVOLUTION({EVO_TRADE, 0, SPECIES_KINGDRA, CONDITIONS({IF_HOLD_ITEM, ITEM_DRAGON_SCALE})},
{EVO_ITEM, ITEM_DRAGON_SCALE, SPECIES_KINGDRA}),
#endif
},
#if P_GEN_2_CROSS_EVOS
@ -15826,9 +15856,20 @@ const struct SpeciesInfo gSpeciesInfoGen1[] =
.levelUpLearnset = sScytherLevelUpLearnset,
.teachableLearnset = sScytherTeachableLearnset,
.eggMoveLearnset = sScytherEggMoveLearnset,
.evolutions = EVOLUTION({EVO_TRADE, 0, SPECIES_SCIZOR, CONDITIONS({IF_HOLD_ITEM, ITEM_METAL_COAT})},
{EVO_ITEM, ITEM_BLACK_AUGURITE, SPECIES_KLEAVOR},
{EVO_ITEM, ITEM_METAL_COAT, SPECIES_SCIZOR}),
#if P_GEN_2_CROSS_EVOS || P_GEN_8_CROSS_EVOS
.evolutions = EVOLUTION(
#if P_GEN_2_CROSS_EVOS
{EVO_TRADE, 0, SPECIES_SCIZOR, CONDITIONS({IF_HOLD_ITEM, ITEM_METAL_COAT})},
{EVO_ITEM, ITEM_METAL_COAT, SPECIES_SCIZOR}
#if P_GEN_8_CROSS_EVOS
,
#endif
#endif
#if P_GEN_8_CROSS_EVOS
{EVO_ITEM, ITEM_BLACK_AUGURITE, SPECIES_KLEAVOR}
#endif
),
#endif
},
#if P_GEN_2_CROSS_EVOS
@ -16346,8 +16387,10 @@ const struct SpeciesInfo gSpeciesInfoGen1[] =
)
.levelUpLearnset = sElectabuzzLevelUpLearnset,
.teachableLearnset = sElectabuzzTeachableLearnset,
#if P_GEN_4_CROSS_EVOS
.evolutions = EVOLUTION({EVO_TRADE, 0, SPECIES_ELECTIVIRE, CONDITIONS({IF_HOLD_ITEM, ITEM_ELECTIRIZER})},
{EVO_ITEM, ITEM_ELECTIRIZER, SPECIES_ELECTIVIRE}),
#endif
},
#if P_GEN_4_CROSS_EVOS
@ -16567,8 +16610,10 @@ const struct SpeciesInfo gSpeciesInfoGen1[] =
)
.levelUpLearnset = sMagmarLevelUpLearnset,
.teachableLearnset = sMagmarTeachableLearnset,
#if P_GEN_4_CROSS_EVOS
.evolutions = EVOLUTION({EVO_TRADE, 0, SPECIES_MAGMORTAR, CONDITIONS({IF_HOLD_ITEM, ITEM_MAGMARIZER})},
{EVO_ITEM, ITEM_MAGMARIZER, SPECIES_MAGMORTAR}),
#endif
},
#if P_GEN_4_CROSS_EVOS
@ -17609,14 +17654,21 @@ const struct SpeciesInfo gSpeciesInfoGen1[] =
.formChangeTable = sEeveeFormChangeTable,
.evolutions = EVOLUTION({EVO_ITEM, ITEM_THUNDER_STONE, SPECIES_JOLTEON},
{EVO_ITEM, ITEM_WATER_STONE, SPECIES_VAPOREON},
{EVO_ITEM, ITEM_FIRE_STONE, SPECIES_FLAREON},
{EVO_LEVEL, 0, SPECIES_SYLVEON, CONDITIONS({IF_MIN_FRIENDSHIP, FRIENDSHIP_EVO_THRESHOLD}, {IF_KNOWS_MOVE_TYPE, TYPE_FAIRY})},
{EVO_LEVEL, 0, SPECIES_ESPEON, CONDITIONS({IF_MIN_FRIENDSHIP, FRIENDSHIP_EVO_THRESHOLD}, {IF_NOT_TIME, TIME_NIGHT})},
{EVO_LEVEL, 0, SPECIES_UMBREON, CONDITIONS({IF_MIN_FRIENDSHIP, FRIENDSHIP_EVO_THRESHOLD}, {IF_TIME, TIME_NIGHT})},
{EVO_LEVEL, 0, SPECIES_LEAFEON, CONDITIONS({IF_IN_MAP, MAP_PETALBURG_WOODS})},
{EVO_ITEM, ITEM_FIRE_STONE, SPECIES_FLAREON}
#if P_GEN_6_CROSS_EVOS
,{EVO_LEVEL, 0, SPECIES_SYLVEON, CONDITIONS({IF_MIN_FRIENDSHIP, FRIENDSHIP_EVO_THRESHOLD}, {IF_KNOWS_MOVE_TYPE, TYPE_FAIRY})}
#endif
#if P_GEN_2_CROSS_EVOS
,{EVO_LEVEL, 0, SPECIES_ESPEON, CONDITIONS({IF_MIN_FRIENDSHIP, FRIENDSHIP_EVO_THRESHOLD}, {IF_NOT_TIME, TIME_NIGHT})},
{EVO_LEVEL, 0, SPECIES_UMBREON, CONDITIONS({IF_MIN_FRIENDSHIP, FRIENDSHIP_EVO_THRESHOLD}, {IF_TIME, TIME_NIGHT})}
#endif
#if P_GEN_4_CROSS_EVOS
,{EVO_LEVEL, 0, SPECIES_LEAFEON, CONDITIONS({IF_IN_MAP, MAP_PETALBURG_WOODS})},
{EVO_ITEM, ITEM_LEAF_STONE, SPECIES_LEAFEON},
{EVO_LEVEL, 0, SPECIES_GLACEON, CONDITIONS({IF_IN_MAP, MAP_SHOAL_CAVE_LOW_TIDE_ICE_ROOM})},
{EVO_ITEM, ITEM_ICE_STONE, SPECIES_GLACEON}),
{EVO_ITEM, ITEM_ICE_STONE, SPECIES_GLACEON}
#endif
),
},
#if P_GIGANTAMAX_FORMS
@ -18366,8 +18418,10 @@ const struct SpeciesInfo gSpeciesInfoGen1[] =
)
.levelUpLearnset = sPorygonLevelUpLearnset,
.teachableLearnset = sPorygonTeachableLearnset,
#if P_GEN_2_CROSS_EVOS
.evolutions = EVOLUTION({EVO_TRADE, 0, SPECIES_PORYGON2, CONDITIONS({IF_HOLD_ITEM, ITEM_UPGRADE})},
{EVO_ITEM, ITEM_UPGRADE, SPECIES_PORYGON2}),
#endif
},
#if P_GEN_2_CROSS_EVOS
@ -18443,8 +18497,10 @@ const struct SpeciesInfo gSpeciesInfoGen1[] =
)
.levelUpLearnset = sPorygon2LevelUpLearnset,
.teachableLearnset = sPorygon2TeachableLearnset,
#if P_GEN_4_CROSS_EVOS
.evolutions = EVOLUTION({EVO_TRADE, 0, SPECIES_PORYGON_Z, CONDITIONS({IF_HOLD_ITEM, ITEM_DUBIOUS_DISC})},
{EVO_ITEM, ITEM_DUBIOUS_DISC, SPECIES_PORYGON_Z}),
#endif
},
#if P_GEN_4_CROSS_EVOS

30
src/data/pokemon/species_info/gen_2_families.h
View File

@ -1619,7 +1619,9 @@ const struct SpeciesInfo gSpeciesInfoGen2[] =
)
.levelUpLearnset = sTogeticLevelUpLearnset,
.teachableLearnset = sTogeticTeachableLearnset,
#if P_GEN_4_CROSS_EVOS
.evolutions = EVOLUTION({EVO_ITEM, ITEM_SHINY_STONE, SPECIES_TOGEKISS}),
#endif
},
#if P_GEN_4_CROSS_EVOS
@ -2868,7 +2870,9 @@ const struct SpeciesInfo gSpeciesInfoGen2[] =
.levelUpLearnset = sAipomLevelUpLearnset,
.teachableLearnset = sAipomTeachableLearnset,
.eggMoveLearnset = sAipomEggMoveLearnset,
#if P_GEN_4_CROSS_EVOS
.evolutions = EVOLUTION({EVO_LEVEL, 0, SPECIES_AMBIPOM, CONDITIONS({IF_KNOWS_MOVE, MOVE_DOUBLE_HIT})}),
#endif
},
#if P_GEN_4_CROSS_EVOS
@ -3191,7 +3195,9 @@ const struct SpeciesInfo gSpeciesInfoGen2[] =
.levelUpLearnset = sYanmaLevelUpLearnset,
.teachableLearnset = sYanmaTeachableLearnset,
.eggMoveLearnset = sYanmaEggMoveLearnset,
#if P_GEN_4_CROSS_EVOS
.evolutions = EVOLUTION({EVO_LEVEL, 0, SPECIES_YANMEGA, CONDITIONS({IF_KNOWS_MOVE, MOVE_ANCIENT_POWER})}),
#endif
},
#if P_GEN_4_CROSS_EVOS
@ -3669,7 +3675,9 @@ const struct SpeciesInfo gSpeciesInfoGen2[] =
.levelUpLearnset = sMurkrowLevelUpLearnset,
.teachableLearnset = sMurkrowTeachableLearnset,
.eggMoveLearnset = sMurkrowEggMoveLearnset,
#if P_GEN_4_CROSS_EVOS
.evolutions = EVOLUTION({EVO_ITEM, ITEM_DUSK_STONE, SPECIES_HONCHKROW}),
#endif
},
#if P_GEN_4_CROSS_EVOS
@ -3819,7 +3827,9 @@ const struct SpeciesInfo gSpeciesInfoGen2[] =
.levelUpLearnset = sMisdreavusLevelUpLearnset,
.teachableLearnset = sMisdreavusTeachableLearnset,
.eggMoveLearnset = sMisdreavusEggMoveLearnset,
#if P_GEN_4_CROSS_EVOS
.evolutions = EVOLUTION({EVO_ITEM, ITEM_DUSK_STONE, SPECIES_MISMAGIUS}),
#endif
},
#if P_GEN_4_CROSS_EVOS
@ -4239,7 +4249,9 @@ const struct SpeciesInfo gSpeciesInfoGen2[] =
.levelUpLearnset = sGirafarigLevelUpLearnset,
.teachableLearnset = sGirafarigTeachableLearnset,
.eggMoveLearnset = sGirafarigEggMoveLearnset,
#if P_GEN_9_CROSS_EVOS
.evolutions = EVOLUTION({EVO_LEVEL, 0, SPECIES_FARIGIRAF, CONDITIONS({IF_KNOWS_MOVE, MOVE_TWIN_BEAM})}),
#endif
},
#if P_GEN_9_CROSS_EVOS
@ -4527,8 +4539,10 @@ const struct SpeciesInfo gSpeciesInfoGen2[] =
.levelUpLearnset = sDunsparceLevelUpLearnset,
.teachableLearnset = sDunsparceTeachableLearnset,
.eggMoveLearnset = sDunsparceEggMoveLearnset,
#if P_GEN_9_CROSS_EVOS
.evolutions = EVOLUTION({EVO_LEVEL, 0, SPECIES_DUDUNSPARCE_TWO_SEGMENT, CONDITIONS({IF_KNOWS_MOVE, MOVE_HYPER_DRILL}, {IF_PID_MODULO_100_GT, 0})},
{EVO_LEVEL, 0, SPECIES_DUDUNSPARCE_THREE_SEGMENT, CONDITIONS({IF_KNOWS_MOVE, MOVE_HYPER_DRILL}, {IF_PID_MODULO_100_EQ, 0})}),
#endif
},
#if P_GEN_9_CROSS_EVOS
@ -4742,8 +4756,10 @@ const struct SpeciesInfo gSpeciesInfoGen2[] =
.levelUpLearnset = sGligarLevelUpLearnset,
.teachableLearnset = sGligarTeachableLearnset,
.eggMoveLearnset = sGligarEggMoveLearnset,
.evolutions = EVOLUTION({EVO_LEVEL, 0, SPECIES_GLISCOR, CONDITIONS({IF_TIME, TIME_NIGHT}, {IF_HOLD_ITEM, ITEM_RAZOR_FANG})},
#if P_GEN_4_CROSS_EVOS
.evolutions = EVOLUTION({EVO_LEVEL, 0, SPECIES_GLISCOR, CONDITIONS({IF_TIME, TIME_NIGHT}, {IF_HOLD_ITEM, ITEM_RAZOR_FANG})},
{EVO_ITEM, ITEM_RAZOR_FANG, SPECIES_GLISCOR, CONDITIONS({IF_TIME, TIME_NIGHT})}),
#endif
},
#if P_GEN_4_CROSS_EVOS
@ -5506,8 +5522,10 @@ const struct SpeciesInfo gSpeciesInfoGen2[] =
.teachableLearnset = sSneaselTeachableLearnset,
.eggMoveLearnset = sSneaselEggMoveLearnset,
.formSpeciesIdTable = sSneaselFormSpeciesIdTable,
.evolutions = EVOLUTION({EVO_LEVEL, 0, SPECIES_WEAVILE, CONDITIONS({IF_TIME, TIME_NIGHT}, {IF_HOLD_ITEM, ITEM_RAZOR_CLAW})},
#if P_GEN_4_CROSS_EVOS
.evolutions = EVOLUTION({EVO_LEVEL, 0, SPECIES_WEAVILE, CONDITIONS({IF_TIME, TIME_NIGHT}, {IF_HOLD_ITEM, ITEM_RAZOR_CLAW})},
{EVO_ITEM, ITEM_RAZOR_CLAW, SPECIES_WEAVILE, CONDITIONS({IF_TIME, TIME_NIGHT})}),
#endif
},
#if P_GEN_4_CROSS_EVOS
@ -5672,7 +5690,7 @@ const struct SpeciesInfo gSpeciesInfoGen2[] =
.levelUpLearnset = sSneaselHisuiLevelUpLearnset,
.teachableLearnset = sSneaselHisuiTeachableLearnset,
.formSpeciesIdTable = sSneaselFormSpeciesIdTable,
.evolutions = EVOLUTION({EVO_LEVEL, 0, SPECIES_SNEASLER, CONDITIONS({IF_NOT_TIME, TIME_NIGHT}, {IF_HOLD_ITEM, ITEM_RAZOR_CLAW})},
.evolutions = EVOLUTION({EVO_LEVEL, 0, SPECIES_SNEASLER, CONDITIONS({IF_NOT_TIME, TIME_NIGHT}, {IF_HOLD_ITEM, ITEM_RAZOR_CLAW})},
{EVO_ITEM, ITEM_RAZOR_CLAW, SPECIES_SNEASLER, CONDITIONS({IF_NOT_TIME, TIME_NIGHT})}),
},
@ -5897,8 +5915,10 @@ const struct SpeciesInfo gSpeciesInfoGen2[] =
)
.levelUpLearnset = sUrsaringLevelUpLearnset,
.teachableLearnset = sUrsaringTeachableLearnset,
#if P_GEN_8_CROSS_EVOS
.evolutions = EVOLUTION({EVO_ITEM, ITEM_PEAT_BLOCK, SPECIES_URSALUNA, CONDITIONS({IF_TIME, TIME_NIGHT})},
{EVO_NONE, 0, SPECIES_URSALUNA_BLOODMOON}),
#endif
},
#if P_GEN_8_CROSS_EVOS
@ -6330,7 +6350,9 @@ const struct SpeciesInfo gSpeciesInfoGen2[] =
)
.levelUpLearnset = sPiloswineLevelUpLearnset,
.teachableLearnset = sPiloswineTeachableLearnset,
#if P_GEN_4_CROSS_EVOS
.evolutions = EVOLUTION({EVO_LEVEL, 0, SPECIES_MAMOSWINE, CONDITIONS({IF_KNOWS_MOVE, MOVE_ANCIENT_POWER})}),
#endif
},
#if P_GEN_4_CROSS_EVOS
@ -7534,7 +7556,9 @@ const struct SpeciesInfo gSpeciesInfoGen2[] =
.levelUpLearnset = sStantlerLevelUpLearnset,
.teachableLearnset = sStantlerTeachableLearnset,
.eggMoveLearnset = sStantlerEggMoveLearnset,
#if P_GEN_8_CROSS_EVOS
.evolutions = EVOLUTION({EVO_LEVEL, 0, SPECIES_WYRDEER, CONDITIONS({IF_USED_MOVE_X_TIMES, MOVE_PSYSHIELD_BASH, 20})}),
#endif
},
#if P_GEN_8_CROSS_EVOS

20
src/data/pokemon/species_info/gen_3_families.h
View File

@ -2801,8 +2801,11 @@ const struct SpeciesInfo gSpeciesInfoGen3[] =
)
.levelUpLearnset = sKirliaLevelUpLearnset,
.teachableLearnset = sKirliaTeachableLearnset,
.evolutions = EVOLUTION({EVO_LEVEL, 30, SPECIES_GARDEVOIR},
{EVO_ITEM, ITEM_DAWN_STONE, SPECIES_GALLADE, CONDITIONS({IF_GENDER, MON_MALE})}),
.evolutions = EVOLUTION({EVO_LEVEL, 30, SPECIES_GARDEVOIR}
#if P_GEN_4_CROSS_EVOS
,{EVO_ITEM, ITEM_DAWN_STONE, SPECIES_GALLADE, CONDITIONS({IF_GENDER, MON_MALE})}
#endif
),
},
[SPECIES_GARDEVOIR] =
@ -4314,8 +4317,10 @@ const struct SpeciesInfo gSpeciesInfoGen3[] =
.levelUpLearnset = sNosepassLevelUpLearnset,
.teachableLearnset = sNosepassTeachableLearnset,
.eggMoveLearnset = sNosepassEggMoveLearnset,
#if P_GEN_4_CROSS_EVOS
.evolutions = EVOLUTION({EVO_LEVEL, 0, SPECIES_PROBOPASS, CONDITIONS({IF_IN_MAPSEC, MAPSEC_NEW_MAUVILLE})},
{EVO_ITEM, ITEM_THUNDER_STONE, SPECIES_PROBOPASS}),
#endif
},
#if P_GEN_4_CROSS_EVOS
@ -6069,7 +6074,9 @@ const struct SpeciesInfo gSpeciesInfoGen3[] =
.levelUpLearnset = sRoseliaLevelUpLearnset,
.teachableLearnset = sRoseliaTeachableLearnset,
.eggMoveLearnset = sRoseliaEggMoveLearnset,
#if P_GEN_4_CROSS_EVOS
.evolutions = EVOLUTION({EVO_ITEM, ITEM_SHINY_STONE, SPECIES_ROSERADE}),
#endif
},
#if P_GEN_4_CROSS_EVOS
@ -9900,8 +9907,10 @@ const struct SpeciesInfo gSpeciesInfoGen3[] =
)
.levelUpLearnset = sDusclopsLevelUpLearnset,
.teachableLearnset = sDusclopsTeachableLearnset,
#if P_GEN_4_CROSS_EVOS
.evolutions = EVOLUTION({EVO_TRADE, 0, SPECIES_DUSKNOIR, CONDITIONS({IF_HOLD_ITEM, ITEM_REAPER_CLOTH})},
{EVO_ITEM, ITEM_REAPER_CLOTH, SPECIES_DUSKNOIR}),
#endif
},
#if P_GEN_4_CROSS_EVOS
@ -10459,8 +10468,11 @@ const struct SpeciesInfo gSpeciesInfoGen3[] =
.levelUpLearnset = sSnoruntLevelUpLearnset,
.teachableLearnset = sSnoruntTeachableLearnset,
.eggMoveLearnset = sSnoruntEggMoveLearnset,
.evolutions = EVOLUTION({EVO_LEVEL, 42, SPECIES_GLALIE},
{EVO_ITEM, ITEM_DAWN_STONE, SPECIES_FROSLASS, CONDITIONS({IF_GENDER, MON_FEMALE})}),
.evolutions = EVOLUTION({EVO_LEVEL, 42, SPECIES_GLALIE}
#if P_GEN_4_CROSS_EVOS
,{EVO_ITEM, ITEM_DAWN_STONE, SPECIES_FROSLASS, CONDITIONS({IF_GENDER, MON_FEMALE})}
#endif
),
},
[SPECIES_GLALIE] =

2
src/data/pokemon/species_info/gen_5_families.h
View File

@ -11107,7 +11107,9 @@ const struct SpeciesInfo gSpeciesInfoGen5[] =
)
.levelUpLearnset = sBisharpLevelUpLearnset,
.teachableLearnset = sBisharpTeachableLearnset,
#if P_GEN_9_CROSS_EVOS
.evolutions = EVOLUTION({EVO_LEVEL, 0, SPECIES_KINGAMBIT, CONDITIONS({IF_DEFEAT_X_WITH_ITEMS, SPECIES_BISHARP, ITEM_LEADERS_CREST, 3})}),
#endif
},
#if P_GEN_9_CROSS_EVOS

9
src/data/pokemon/species_info/gen_8_families.h
View File

@ -2466,8 +2466,11 @@ const struct SpeciesInfo gSpeciesInfoGen8[] =
.teachableLearnset = sApplinTeachableLearnset,
.eggMoveLearnset = sApplinEggMoveLearnset,
.evolutions = EVOLUTION({EVO_ITEM, ITEM_TART_APPLE, SPECIES_FLAPPLE},
{EVO_ITEM, ITEM_SWEET_APPLE, SPECIES_APPLETUN},
{EVO_ITEM, ITEM_SYRUPY_APPLE, SPECIES_DIPPLIN}),
{EVO_ITEM, ITEM_SWEET_APPLE, SPECIES_APPLETUN}
#if P_GEN_9_CROSS_EVOS
,{EVO_ITEM, ITEM_SYRUPY_APPLE, SPECIES_DIPPLIN}
#endif
),
},
[SPECIES_FLAPPLE] =
@ -6405,7 +6408,9 @@ const struct SpeciesInfo gSpeciesInfoGen8[] =
.eggMoveLearnset = sDuraludonEggMoveLearnset,
.formSpeciesIdTable = sDuraludonFormSpeciesIdTable,
.formChangeTable = sDuraludonFormChangeTable,
#if P_GEN_9_CROSS_EVOS
.evolutions = EVOLUTION({EVO_ITEM, ITEM_METAL_ALLOY, SPECIES_ARCHALUDON}),
#endif
},
#if P_GIGANTAMAX_FORMS