Cloyir/pokeemmo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'RHH/pokemon_expansion' into PE-Ultima-Forms

Browse Source 
# Conflicts:
#	src/data/pokemon/evolution.h
This commit is contained in:
Eduardo Quezada D'Ottone 2020-11-13 16:40:31 -03:00
commit 54630ff5a9
2 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/constants/pokemon.h
View File

@ -271,6 +271,7 @@
// Evolution types // Evolution types
#define EVO_MEGA_EVOLUTION 0xffff // Not an actual evolution, used to temporarily mega evolve in battle. #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 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_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 #define EVO_FRIENDSHIP_NIGHT 3 // Pokémon levels up at night with friendship ≥ 220

1
src/data/pokemon/evolution.h
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_METAGROSS_MEGA}}, [SPECIES_METAGROSS] = {{EVO_MEGA_EVOLUTION, ITEM_NONE,/*ITEM_METAGROSSITE*/ SPECIES_METAGROSS_MEGA}},
[SPECIES_LATIAS] = {{EVO_MEGA_EVOLUTION, ITEM_NONE,/*ITEM_LATIASITE*/ SPECIES_LATIAS_MEGA}}, [SPECIES_LATIAS] = {{EVO_MEGA_EVOLUTION, ITEM_NONE,/*ITEM_LATIASITE*/ SPECIES_LATIAS_MEGA}},
[SPECIES_LATIOS] = {{EVO_MEGA_EVOLUTION, ITEM_NONE,/*ITEM_LATIOSITE*/ SPECIES_LATIOS_MEGA}}, [SPECIES_LATIOS] = {{EVO_MEGA_EVOLUTION, ITEM_NONE,/*ITEM_LATIOSITE*/ SPECIES_LATIOS_MEGA}},
[SPECIES_RAYQUAZA] = {{EVO_MOVE_MEGA_EVOLUTION, MOVE_NONE,/*MOVE_DRAGON_ASCENT*/ SPECIES_RAYQUAZA_MEGA}},
// Gens 4-7 // Gens 4-7
[SPECIES_TURTWIG] = {{EVO_LEVEL, 18, SPECIES_GROTLE}}, [SPECIES_TURTWIG] = {{EVO_LEVEL, 18, SPECIES_GROTLE}},