Leahnaya/Dynamic-Pokemon-Expansion
1
0
Fork 0
mirror of https://github.com/Skeli789/Dynamic-Pokemon-Expansion.git synced 2026-09-07 01:25:32 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/Skeli789/Dynamic-Pokemon-Expansion

Browse Source
This commit is contained in:
Skeli
2021-04-26 14:48:10 -04:00
parent 5129651b1f 14d5da39d7
commit b75571fbd9
2 changed files with 18 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/Evolution Table.c
View File

@@ -6,6 +6,9 @@
#define TIME_RANGE(startTime, endTime) ((startTime << 8) | endTime)
#define MAPSEC_POWER_PLANT 0x8E
#define MAPSEC_ICEFALL_CAVE 0xB1
const struct Evolution gEvolutionTable[NUM_SPECIES][EVOS_PER_MON] =
{
[SPECIES_BULBASAUR] = {{EVO_LEVEL, 16, SPECIES_IVYSAUR, 0}},
@@ -81,7 +84,8 @@ const struct Evolution gEvolutionTable[NUM_SPECIES][EVOS_PER_MON] =
{EVO_ITEM, ITEM_KINGS_ROCK, SPECIES_SLOWKING, 0}},
[SPECIES_SLOWBRO] = {{EVO_MEGA, ITEM_SLOWBRONITE, SPECIES_SLOWBRO_MEGA, MEGA_VARIANT_STANDARD}},
[SPECIES_MAGNEMITE] = {{EVO_LEVEL, 30, SPECIES_MAGNETON, 0}},
[SPECIES_MAGNETON] = {{EVO_MAP, MAP_NAME_THUNDERCAP_MT, SPECIES_MAGNEZONE, 0}},
[SPECIES_MAGNETON] = {{EVO_MAP, MAPSEC_POWER_PLANT, SPECIES_MAGNEZONE, 0},
{EVO_ITEM, ITEM_THUNDER_STONE, SPECIES_MAGNEZONE, 0}},
[SPECIES_DODUO] = {{EVO_LEVEL, 31, SPECIES_DODRIO, 0}},
[SPECIES_SEEL] = {{EVO_LEVEL, 34, SPECIES_DEWGONG, 0}},
[SPECIES_GRIMER] = {{EVO_LEVEL, 38, SPECIES_MUK, 0}},
@@ -122,14 +126,14 @@ const struct Evolution gEvolutionTable[NUM_SPECIES][EVOS_PER_MON] =
[SPECIES_MAGIKARP] = {{EVO_LEVEL, 20, SPECIES_GYARADOS, 0}},
[SPECIES_GYARADOS] = {{EVO_MEGA, ITEM_GYARADOSITE, SPECIES_GYARADOS_MEGA, MEGA_VARIANT_STANDARD}},
// [SPECIES_LAPRAS] = {{EVO_GIGANTAMAX, TRUE, SPECIES_LAPRAS_GIGA, 0}},
[SPECIES_EEVEE] = {{EVO_FRIENDSHIP_DAY, 0, SPECIES_ESPEON, 0},
[SPECIES_EEVEE] = {{EVO_MOVE_TYPE, TYPE_FAIRY, SPECIES_SYLVEON, 0}, //Overriden by Espeon and Umbreon if need be
{EVO_FRIENDSHIP_DAY, 0, SPECIES_ESPEON, 0},
{EVO_FRIENDSHIP_NIGHT, 0, SPECIES_UMBREON, 0},
{EVO_ITEM, ITEM_FIRE_STONE, SPECIES_FLAREON, 0},
{EVO_ITEM, ITEM_THUNDER_STONE, SPECIES_JOLTEON, 0},
{EVO_ITEM, ITEM_WATER_STONE, SPECIES_VAPOREON, 0},
{EVO_ITEM, ITEM_LEAF_STONE, SPECIES_LEAFEON, 0},
{EVO_ITEM, ITEM_ICE_STONE, SPECIES_GLACEON, 0},
{EVO_MOVE_TYPE, TYPE_FAIRY, SPECIES_SYLVEON, 0}/*,
{EVO_ITEM, ITEM_ICE_STONE, SPECIES_GLACEON, 0}/*,
{EVO_GIGANTAMAX, TRUE, SPECIES_EEVEE_GIGA, 0}*/},
[SPECIES_PORYGON] = {{EVO_ITEM, ITEM_UP_GRADE, SPECIES_PORYGON2, 0},
{EVO_TRADE_ITEM, ITEM_UP_GRADE, SPECIES_PORYGON2, 0}},
@@ -224,11 +228,12 @@ const struct Evolution gEvolutionTable[NUM_SPECIES][EVOS_PER_MON] =
[SPECIES_WAILMER] = {{EVO_LEVEL, 40, SPECIES_WAILORD, 0}},
[SPECIES_SKITTY] = {{EVO_ITEM, ITEM_MOON_STONE, SPECIES_DELCATTY, 0}},
[SPECIES_BALTOY] = {{EVO_LEVEL, 36, SPECIES_CLAYDOL, 0}},
[SPECIES_NOSEPASS] = {{EVO_MAP, MAP_NAME_THUNDERCAP_MT, SPECIES_PROBOPASS, 0}},
[SPECIES_NOSEPASS] = {{EVO_MAP, MAPSEC_POWER_PLANT, SPECIES_PROBOPASS, 0},
{EVO_ITEM, ITEM_THUNDER_STONE, SPECIES_PROBOPASS, 0}},
[SPECIES_SABLEYE] = {{EVO_MEGA, ITEM_SABLENITE, SPECIES_SABLEYE_MEGA, MEGA_VARIANT_STANDARD}},
[SPECIES_BARBOACH] = {{EVO_LEVEL, 30, SPECIES_WHISCASH, 0}},
[SPECIES_CORPHISH] = {{EVO_LEVEL, 30, SPECIES_CRAWDAUNT, 0}},
[SPECIES_FEEBAS] = {{EVO_BEAUTY, 0, SPECIES_MILOTIC, 0},
[SPECIES_FEEBAS] = {/*{EVO_BEAUTY, 0, SPECIES_MILOTIC, 0},*/
{EVO_ITEM, ITEM_PRISM_SCALE, SPECIES_MILOTIC, 0},
{EVO_TRADE_ITEM, ITEM_PRISM_SCALE, SPECIES_MILOTIC, 0}},
[SPECIES_CARVANHA] = {{EVO_LEVEL, 30, SPECIES_SHARPEDO, 0}},
@@ -310,7 +315,7 @@ const struct Evolution gEvolutionTable[NUM_SPECIES][EVOS_PER_MON] =
[SPECIES_COMBEE] = {{EVO_FEMALE_LEVEL, 21, SPECIES_VESPIQUEN, 0}},
[SPECIES_BUIZEL] = {{EVO_LEVEL, 26, SPECIES_FLOATZEL, 0}},
[SPECIES_CHERUBI] = {{EVO_LEVEL, 25, SPECIES_CHERRIM, 0}},
[SPECIES_SHELLOS] = {{EVO_LEVEL, 32, SPECIES_GASTRODON, 0}},
[SPECIES_SHELLOS] = {{EVO_LEVEL, 30, SPECIES_GASTRODON, 0}},
[SPECIES_DRIFLOON] = {{EVO_LEVEL, 28, SPECIES_DRIFBLIM, 0}},
[SPECIES_BUNEARY] = {{EVO_FRIENDSHIP, 0, SPECIES_LOPUNNY, 0}},
[SPECIES_LOPUNNY] = {{EVO_MEGA, ITEM_LOPUNNITE, SPECIES_LOPUNNY_MEGA, MEGA_VARIANT_STANDARD}},
@@ -420,7 +425,7 @@ const struct Evolution gEvolutionTable[NUM_SPECIES][EVOS_PER_MON] =
{EVO_MALE_LEVEL, 20, SPECIES_MOTHIM, 0}},
[SPECIES_BURMY_TRASH] = {{EVO_FEMALE_LEVEL, 20, SPECIES_WORMADAM_TRASH, 0},
{EVO_MALE_LEVEL, 20, SPECIES_MOTHIM, 0}},
[SPECIES_SHELLOS_EAST] = {{EVO_LEVEL, 32, SPECIES_GASTRODON_EAST, 0}},
[SPECIES_SHELLOS_EAST] = {{EVO_LEVEL, 30, SPECIES_GASTRODON_EAST, 0}},
[SPECIES_DEERLING_SUMMER] = {{EVO_LEVEL, 34, SPECIES_SAWSBUCK_SUMMER, 0}},
[SPECIES_DEERLING_AUTUMN] = {{EVO_LEVEL, 34, SPECIES_SAWSBUCK_AUTUMN, 0}},
[SPECIES_DEERLING_WINTER] = {{EVO_LEVEL, 34, SPECIES_SAWSBUCK_WINTER, 0}},
@@ -539,10 +544,10 @@ const struct Evolution gEvolutionTable[NUM_SPECIES][EVOS_PER_MON] =
[SPECIES_TRUMBEAK] = {{EVO_LEVEL, 28, SPECIES_TOUCANNON, 0}},
[SPECIES_YUNGOOS] = {{EVO_LEVEL_DAY, 20, SPECIES_GUMSHOOS, 0}},
[SPECIES_GRUBBIN] = {{EVO_LEVEL, 20, SPECIES_CHARJABUG, 0}},
[SPECIES_CHARJABUG] = {{EVO_MAP, MAP_NAME_THUNDERCAP_MT, SPECIES_VIKAVOLT, 0}},
[SPECIES_CRABRAWLER] = {{EVO_MAP, MAP_NAME_FROST_MOUNTAIN, SPECIES_CRABOMINABLE, 0},
{EVO_MAP, MAP_NAME_ROUTE_8, SPECIES_NONE, 0},
{EVO_MAP, MAP_NAME_BLIZZARD_CITY, SPECIES_NONE, 0}},
[SPECIES_CHARJABUG] = {{EVO_MAP, MAPSEC_POWER_PLANT, SPECIES_VIKAVOLT, 0},
{EVO_ITEM, ITEM_THUNDER_STONE, SPECIES_VIKAVOLT, 0}},
[SPECIES_CRABRAWLER] = {{EVO_MAP, MAPSEC_ICEFALL_CAVE, SPECIES_CRABOMINABLE, 0},
{EVO_ITEM, ITEM_ICE_STONE, SPECIES_CRABOMINABLE, 0}},
[SPECIES_CUTIEFLY] = {{EVO_LEVEL, 25, SPECIES_RIBOMBEE, 0}},
[SPECIES_ROCKRUFF] = {{EVO_LEVEL_SPECIFIC_TIME_RANGE, 25, SPECIES_LYCANROC_DUSK, TIME_RANGE(17, 20)}, //5 PM - 7:59 PM
{EVO_LEVEL_DAY, 25, SPECIES_LYCANROC, 0},

1
src/Pokedex_Orders.c
View File

@@ -703,6 +703,7 @@ const u16 gPokedexOrder_Alphabetical[] =
SPECIES_OMASTAR,
SPECIES_ONIX,
SPECIES_ORANGURU,
SPECIES_ORBEETLE,
SPECIES_ORICORIO,
SPECIES_OSHAWOTT,
SPECIES_PACHIRISU,