diff --git a/include/constants/battle_string_ids.h b/include/constants/battle_string_ids.h index 76d7476c54..3bb098591c 100644 --- a/include/constants/battle_string_ids.h +++ b/include/constants/battle_string_ids.h @@ -549,7 +549,7 @@ #define STRINGID_NOONEWILLBEABLETORUNAWAY 545 #define STRINGID_DESTINYKNOTACTIVATES 546 #define STRINGID_CLOAKEDINAFREEZINGLIGHT 547 -#define STRINGID_FERVENTWISHREACHED 548 +#define STRINGID_FERVENTWISHREACHED 548 #define BATTLESTRINGS_COUNT 549 diff --git a/include/constants/pokemon.h b/include/constants/pokemon.h index 1e2f6b335e..14e59d99a2 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 // 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_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 b1ec32ebf7..835db4462e 100644 --- a/src/battle_util.c +++ b/src/battle_util.c @@ -7506,7 +7506,6 @@ u16 GetWishMegaEvolutionSpecies(u16 preEvoSpecies, u16 moveId1, u16 moveId2, u16 bool32 CanMegaEvolve(u8 battlerId) { - u8 i; u32 itemId, holdEffect, species; struct Pokemon *mon; u8 battlerPosition = GetBattlerPosition(battlerId);