From ddb61427090bf0234ff7f7995684c59facadf1cf Mon Sep 17 00:00:00 2001 From: Eduardo Quezada D'Ottone Date: Sun, 8 Nov 2020 21:08:58 -0300 Subject: [PATCH] Review changes 3. --- include/constants/pokemon.h | 2 +- src/battle_util.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/constants/pokemon.h b/include/constants/pokemon.h index 14e59d99a2..3341223858 100644 --- a/include/constants/pokemon.h +++ b/include/constants/pokemon.h @@ -294,7 +294,7 @@ // Evolution types #define EVO_MEGA_EVOLUTION 0xffff // Not an actual evolution, used to temporarily mega evolve in battle. -#define EVO_WISH_MEGA_EVOLUTION 0xfffe // Mega Evolution that checks for a move instead of held item. +#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 diff --git a/src/battle_util.c b/src/battle_util.c index 835db4462e..03fc228e49 100644 --- a/src/battle_util.c +++ b/src/battle_util.c @@ -7494,7 +7494,7 @@ u16 GetWishMegaEvolutionSpecies(u16 preEvoSpecies, u16 moveId1, u16 moveId2, u16 for (i = 0; i < EVOS_PER_MON; i++) { - if (gEvolutionTable[preEvoSpecies][i].method == EVO_WISH_MEGA_EVOLUTION) + if (gEvolutionTable[preEvoSpecies][i].method == EVO_MOVE_MEGA_EVOLUTION) { par = gEvolutionTable[preEvoSpecies][i].param; if (par == moveId1 || par == moveId2 || par == moveId3 || par == moveId4)