Merge pull request #1219 from LOuroboros/pokeexp_move_megaevo_tweaks

Small tweaks related to EVO_MOVE_MEGA_EVOLUTION
This commit is contained in:
ultima-soul 2020-11-12 23:11:44 -08:00 committed by GitHub
commit 28147cd3ba
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 0 deletions

View File

@ -271,6 +271,7 @@
// Evolution types
#define EVO_MEGA_EVOLUTION 0xffff // Not an actual evolution, used to temporarily mega evolve in battle.
#define EVO_MOVE_MEGA_EVOLUTION 0xfffe // Mega Evolution that checks for a move instead of held item.
#define EVO_FRIENDSHIP 1 // Pokémon levels up with friendship ≥ 220
#define EVO_FRIENDSHIP_DAY 2 // Pokémon levels up during the day with friendship ≥ 220
#define EVO_FRIENDSHIP_NIGHT 3 // Pokémon levels up at night with friendship ≥ 220

View File

@ -251,6 +251,7 @@ const struct Evolution gEvolutionTable[NUM_SPECIES][EVOS_PER_MON] =
[SPECIES_METAGROSS] = {{EVO_MEGA_EVOLUTION, ITEM_NONE,/*ITEM_METAGROSSITE*/ SPECIES_MEGA_METAGROSS}},
[SPECIES_LATIAS] = {{EVO_MEGA_EVOLUTION, ITEM_NONE,/*ITEM_LATIASITE*/ SPECIES_MEGA_LATIAS}},
[SPECIES_LATIOS] = {{EVO_MEGA_EVOLUTION, ITEM_NONE,/*ITEM_LATIOSITE*/ SPECIES_MEGA_LATIOS}},
[SPECIES_RAYQUAZA] = {{EVO_MOVE_MEGA_EVOLUTION, MOVE_NONE,/*MOVE_DRAGON_ASCENT*/ SPECIES_MEGA_RAYQUAZA}},
// Gens 4-7
[SPECIES_TURTWIG] = {{EVO_LEVEL, 18, SPECIES_GROTLE}},