From 6f122ac8f841745ad64c15e65fa2df664d9004ee Mon Sep 17 00:00:00 2001 From: LOuroboros Date: Wed, 11 Nov 2020 15:18:39 -0300 Subject: [PATCH 1/2] Defined EVO_MOVE_MEGA_EVOLUTION for BE compatibility --- include/constants/pokemon.h | 1 + 1 file changed, 1 insertion(+) diff --git a/include/constants/pokemon.h b/include/constants/pokemon.h index e87f8f8220..9129f4a710 100644 --- a/include/constants/pokemon.h +++ b/include/constants/pokemon.h @@ -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 From 47c0a38401a086a37c9122e74ef36acc4e95e4b7 Mon Sep 17 00:00:00 2001 From: LOuroboros Date: Wed, 11 Nov 2020 15:19:56 -0300 Subject: [PATCH 2/2] Added Rayquaza's Mega Evolution to the list of evolutions --- src/data/pokemon/evolution.h | 1 + 1 file changed, 1 insertion(+) diff --git a/src/data/pokemon/evolution.h b/src/data/pokemon/evolution.h index 06a2bb571d..9f5a3889bf 100644 --- a/src/data/pokemon/evolution.h +++ b/src/data/pokemon/evolution.h @@ -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}},