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

Added missing cross-gen evolutions #3547

Merged
merged 5 commits into from
Nov 9, 2023
Merged

Added missing cross-gen evolutions #3547

Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
20e2ad2
Added missing cross-gen evolutions
fdeblasio Nov 9, 2023
b9639ce
Added forms for evos
fdeblasio Nov 9, 2023
d43eaa0
Converted some EVO_NONEs into EVO_MOVE
fdeblasio Nov 9, 2023
343a31b
Moved Ursaring's evolution up
fdeblasio Nov 9, 2023
55aa89b
Added evolution methods for Dudunsparce and Maushold
fdeblasio Nov 9, 2023
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
22 changes: 21 additions & 1 deletion src/data/pokemon/evolution.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,9 @@ const struct Evolution gEvolutionTable[NUM_SPECIES][EVOS_PER_MON] =
[SPECIES_MEOWTH] = {{EVO_LEVEL, 28, SPECIES_PERSIAN}},
[SPECIES_PSYDUCK] = {{EVO_LEVEL, 33, SPECIES_GOLDUCK}},
[SPECIES_MANKEY] = {{EVO_LEVEL, 28, SPECIES_PRIMEAPE}},
#if P_GEN_9_POKEMON == TRUE
[SPECIES_PRIMEAPE] = {{EVO_NONE, 0, SPECIES_ANNIHILAPE}},
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think it would be fine to evolve with Rage Fist.

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would also add Psyshield Bash as evo move to Stantler sind it's an egg move.

Copy link

@kittenchilly kittenchilly Nov 9, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think it would be fine to evolve with Rage Fist.

I would rather we add the actual evo methods instead of temporary ones like this

Copy link
Collaborator

@AlexOn1ine AlexOn1ine Nov 9, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think it would be fine to evolve with Rage Fist.

I would rather we add the actual evo methods instead of temporary ones like this

Me too but I don't think it's currently possible and I think temporary evos are better then nothing

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would also add Psyshield Bash as evo move to Stantler sind it's an egg move.

Already added in d43eaa0!

#endif
[SPECIES_GROWLITHE] = {{EVO_ITEM, ITEM_FIRE_STONE, SPECIES_ARCANINE}},
[SPECIES_GROWLITHE_HISUIAN] = {{EVO_ITEM, ITEM_FIRE_STONE, SPECIES_ARCANINE_HISUIAN}},
[SPECIES_POLIWAG] = {{EVO_LEVEL, 25, SPECIES_POLIWHIRL}},
Expand Down Expand Up @@ -167,8 +170,15 @@ const struct Evolution gEvolutionTable[NUM_SPECIES][EVOS_PER_MON] =
#if P_GEN_4_POKEMON == TRUE
[SPECIES_MURKROW] = {{EVO_ITEM, ITEM_DUSK_STONE, SPECIES_HONCHKROW}},
[SPECIES_MISDREAVUS] = {{EVO_ITEM, ITEM_DUSK_STONE, SPECIES_MISMAGIUS}},
#endif
#if P_GEN_9_POKEMON == TRUE
[SPECIES_GIRAFARIG] = {{EVO_MOVE, MOVE_TWIN_BEAM, SPECIES_FARIGIRAF}},
#endif
[SPECIES_PINECO] = {{EVO_LEVEL, 31, SPECIES_FORRETRESS}},
#if P_GEN_9_POKEMON == TRUE
[SPECIES_DUNSPARCE] = {{EVO_NONE, 0, SPECIES_DUDUNSPARCE_TWO_SEGMENT},
{EVO_NONE, 0, SPECIES_DUDUNSPARCE_THREE_SEGMENT}},
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It evolves with Hyper Drill in SV

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I almost did that but I wasn't sure how it would work with the Dudunsparce form. I guess for now it will default to SPECIES_DUDUNSPARCE_TWO_SEGMENT

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could you not add the method for it to evolve? Unless I'm missing something is should be doable.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

{{EVO_MOVE, MOVE_HYPER_DRILL, SPECIES_DUDUNSPARCE_TWO_SEGMENT},
{EVO_MOVE, MOVE_HYPER_DRILL, SPECIES_DUDUNSPARCE_THREE_SEGMENT}},

This is what I have now. This should work, right? Although I'm assuming it will always default to the TWO_SEGMENT form since it comes first

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It should, yes. My suggestion would be to just add a new evolution method in GetEvolutionTargetSpecies so it can evolve into both segments.

Copy link
Collaborator

@AlexOn1ine AlexOn1ine Nov 9, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It should, yes. My suggestion would be to just add a new evolution method in GetEvolutionTargetSpecies so it can evolve into both segments.

Hm, it might not work the way I think it could

#endif
#if P_GEN_4_POKEMON == TRUE
[SPECIES_GLIGAR] = {{EVO_ITEM_HOLD_NIGHT, ITEM_RAZOR_FANG, SPECIES_GLISCOR},
{EVO_ITEM_NIGHT, ITEM_RAZOR_FANG, SPECIES_GLISCOR}},
Expand All @@ -190,6 +200,9 @@ const struct Evolution gEvolutionTable[NUM_SPECIES][EVOS_PER_MON] =
#if P_GEN_4_POKEMON == TRUE
[SPECIES_PORYGON2] = {{EVO_TRADE_ITEM, ITEM_DUBIOUS_DISC, SPECIES_PORYGON_Z},
{EVO_ITEM, ITEM_DUBIOUS_DISC, SPECIES_PORYGON_Z}},
#endif
#if P_GEN_9_POKEMON == TRUE
[SPECIES_STANTLER] = {{EVO_NONE, 0, SPECIES_WYRDEER}},
#endif
[SPECIES_TYROGUE] = {{EVO_LEVEL_ATK_LT_DEF, 20, SPECIES_HITMONCHAN},
{EVO_LEVEL_ATK_GT_DEF, 20, SPECIES_HITMONLEE},
Expand Down Expand Up @@ -363,6 +376,10 @@ const struct Evolution gEvolutionTable[NUM_SPECIES][EVOS_PER_MON] =
[SPECIES_COTTONEE] = {{EVO_ITEM, ITEM_SUN_STONE, SPECIES_WHIMSICOTT}},
[SPECIES_PETILIL] = {{EVO_ITEM, ITEM_SUN_STONE, SPECIES_LILLIGANT},
{EVO_NONE, 0, SPECIES_LILLIGANT_HISUIAN}},
#if P_GEN_9_POKEMON == TRUE
[SPECIES_BASCULIN_WHITE_STRIPED] = {{EVO_NONE, 0, SPECIES_BASCULEGION_MALE},
{EVO_NONE, 0, SPECIES_BASCULEGION_FEMALE}},
#endif
[SPECIES_SANDILE] = {{EVO_LEVEL, 29, SPECIES_KROKOROK}},
[SPECIES_KROKOROK] = {{EVO_LEVEL, 40, SPECIES_KROOKODILE}},
[SPECIES_DARUMAKA] = {{EVO_LEVEL, 35, SPECIES_DARMANITAN_STANDARD_MODE}},
Expand Down Expand Up @@ -402,6 +419,9 @@ const struct Evolution gEvolutionTable[NUM_SPECIES][EVOS_PER_MON] =
[SPECIES_MIENFOO] = {{EVO_LEVEL, 50, SPECIES_MIENSHAO}},
[SPECIES_GOLETT] = {{EVO_LEVEL, 43, SPECIES_GOLURK}},
[SPECIES_PAWNIARD] = {{EVO_LEVEL, 52, SPECIES_BISHARP}},
#if P_GEN_9_POKEMON == TRUE
[SPECIES_BISHARP] = {{EVO_NONE, 0, SPECIES_KINGAMBIT}},
#endif
[SPECIES_RUFFLET] = {{EVO_LEVEL, 54, SPECIES_BRAVIARY},
{EVO_NONE, 0, SPECIES_BRAVIARY_HISUIAN}},
[SPECIES_VULLABY] = {{EVO_LEVEL, 54, SPECIES_MANDIBUZZ}},
Expand Down Expand Up @@ -594,7 +614,7 @@ const struct Evolution gEvolutionTable[NUM_SPECIES][EVOS_PER_MON] =
[SPECIES_SANDSHREW_ALOLAN] = {{EVO_ITEM, ITEM_ICE_STONE, SPECIES_SANDSLASH_ALOLAN}},
[SPECIES_VULPIX_ALOLAN] = {{EVO_ITEM, ITEM_ICE_STONE, SPECIES_NINETALES_ALOLAN}},
[SPECIES_DIGLETT_ALOLAN] = {{EVO_LEVEL, 26, SPECIES_DUGTRIO_ALOLAN}},
[SPECIES_MEOWTH_ALOLAN] = {{EVO_FRIENDSHIP, 28, SPECIES_PERSIAN_ALOLAN}},
[SPECIES_MEOWTH_ALOLAN] = {{EVO_FRIENDSHIP, 0, SPECIES_PERSIAN_ALOLAN}},
[SPECIES_GEODUDE_ALOLAN] = {{EVO_LEVEL, 25, SPECIES_GRAVELER_ALOLAN}},
[SPECIES_GRAVELER_ALOLAN] = {{EVO_TRADE, 0, SPECIES_GOLEM_ALOLAN},
{EVO_ITEM, ITEM_LINKING_CORD, SPECIES_GOLEM_ALOLAN}},
Expand Down
Loading