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

Update Evolution Map Sections

Browse Source
This commit is contained in:
Skeli
2020-03-22 18:32:26 +02:00
parent 21e683f356
commit 2bb21e1cf3
2 changed files with 12 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
include/evolution.h
View File

@@ -56,24 +56,8 @@ enum MegaEvoVariants
MEGA_VARIANT_ULTRA_BURST, //Necrozma
};
#define MAP_NAME_ROUTE_1 0x65
#define MAP_NAME_ROUTE_2 0x66
#define MAP_NAME_FLOWER_PARADISE 0x88
#define MAP_NAME_GRIM_WOODS 0x7E
#define MAP_NAME_ROUTE_4 0x63
#define MAP_NAME_CINDER_VOLCANO 0x7F
#define MAP_NAME_ROUTE_5 0x69
#define MAP_NAME_VALLEY_CAVE 0x83
#define MAP_NAME_ROUTE_6 0x6A
#define MAP_NAME_ROUTE_7 0x6B
#define MAP_NAME_ROUTE_8 0x6C
#define MAP_NAME_FROST_MOUNTAIN 0x82
#define MAP_NAME_BLIZZARD_CITY 0x5C
#define MAP_NAME_ROUTE_9 0x6D
#define MAP_NAME_ROUTE_10 0x64
#define MAP_NAME_ROUTE_11 0x6F
#define MAP_NAME_THUNDERCAP_MT 0x8A
#define MAP_NAME_ROUTE_12 0x70
#define MAP_NAME_VIVILL_WOODS 0x8C
#define MAP_NAME_ROUTE_16 0x74
#define MAP_NAME_ROUTE_17 0x75
#define MAPSEC_FROST_MOUNTAIN 0x82
#define MAPSEC_ROUTE_8 0x6C
#define MAPSEC_BLIZZARD_CITY 0x5C
#define MAPSEC_FROZEN_FOREST 0x99
#define MAPSEC_THUNDERCAP_MOUNTAIN 0x8A

13
src/Evolution Table.c
View File

@@ -77,7 +77,7 @@ 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_THUNDERCAP_MOUNTAIN, 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}},
@@ -215,7 +215,7 @@ 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_THUNDERCAP_MOUNTAIN, 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}},
@@ -529,10 +529,11 @@ 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_THUNDERCAP_MOUNTAIN, SPECIES_VIKAVOLT, 0}},
[SPECIES_CRABRAWLER] = {{EVO_MAP, MAPSEC_FROST_MOUNTAIN, SPECIES_CRABOMINABLE, 0},
{EVO_MAP, MAPSEC_ROUTE_8, SPECIES_NONE, 0},
{EVO_MAP, MAPSEC_BLIZZARD_CITY, SPECIES_NONE, 0},
{EVO_MAP, MAPSEC_FROZEN_FOREST, SPECIES_NONE, 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},