ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2025-01-21 10:50:18 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #406 from AsparagusEduardo/RestoreOriginalEvoMethods

Browse Source 
Set evolution methods closer to the actual games.
This commit is contained in:
DizzyEggg 2020-06-15 09:07:21 +02:00 committed by GitHub
commit 038ea79bd4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/data/pokemon/evolution.h
View File

@ -47,15 +47,15 @@ const struct Evolution gEvolutionTable[NUM_SPECIES][EVOS_PER_MON] =
[SPECIES_POLIWHIRL] = {{EVO_ITEM, ITEM_NONE,/*ITEM_WATER_STONE*/ SPECIES_POLIWRATH},
{EVO_TRADE_ITEM, ITEM_NONE,/*ITEM_KINGS_ROCK*/ SPECIES_POLITOED}},
[SPECIES_ABRA] = {{EVO_LEVEL, 16, SPECIES_KADABRA}},
[SPECIES_KADABRA] = {{EVO_LEVEL, 40, SPECIES_ALAKAZAM}},
[SPECIES_KADABRA] = {{EVO_TRADE, 0, SPECIES_ALAKAZAM}},
[SPECIES_ALAKAZAM] = {{EVO_MEGA_EVOLUTION, ITEM_NONE,/*ITEM_ALAKAZITE*/ SPECIES_MEGA_ALAKAZAM}},
[SPECIES_MACHOP] = {{EVO_LEVEL, 28, SPECIES_MACHOKE}},
[SPECIES_MACHOKE] = {{EVO_LEVEL, 40, SPECIES_MACHAMP}},
[SPECIES_MACHOKE] = {{EVO_TRADE, 0, SPECIES_MACHAMP}},
[SPECIES_BELLSPROUT] = {{EVO_LEVEL, 21, SPECIES_WEEPINBELL}},
[SPECIES_WEEPINBELL] = {{EVO_ITEM, ITEM_NONE,/*ITEM_LEAF_STONE*/ SPECIES_VICTREEBEL}},
[SPECIES_TENTACOOL] = {{EVO_LEVEL, 30, SPECIES_TENTACRUEL}},
[SPECIES_GEODUDE] = {{EVO_LEVEL, 25, SPECIES_GRAVELER}},
[SPECIES_GRAVELER] = {{EVO_LEVEL, 40, SPECIES_GOLEM}},
[SPECIES_GRAVELER] = {{EVO_TRADE, 0, SPECIES_GOLEM}},
[SPECIES_PONYTA] = {{EVO_LEVEL, 40, SPECIES_RAPIDASH}},
[SPECIES_SLOWPOKE] = {{EVO_LEVEL, 37, SPECIES_SLOWBRO},
{EVO_TRADE_ITEM, ITEM_NONE,/*ITEM_KINGS_ROCK*/ SPECIES_SLOWKING}},
@ -67,7 +67,7 @@ const struct Evolution gEvolutionTable[NUM_SPECIES][EVOS_PER_MON] =
[SPECIES_GRIMER] = {{EVO_LEVEL, 38, SPECIES_MUK}},
[SPECIES_SHELLDER] = {{EVO_ITEM, ITEM_NONE,/*ITEM_WATER_STONE*/ SPECIES_CLOYSTER}},
[SPECIES_GASTLY] = {{EVO_LEVEL, 25, SPECIES_HAUNTER}},
[SPECIES_HAUNTER] = {{EVO_LEVEL, 40, SPECIES_GENGAR}},
[SPECIES_HAUNTER] = {{EVO_TRADE, 0, SPECIES_GENGAR}},
[SPECIES_GENGAR] = {{EVO_MEGA_EVOLUTION, ITEM_NONE,/*ITEM_GENGARITE*/ SPECIES_MEGA_GENGAR}},
[SPECIES_ONIX] = {{EVO_TRADE_ITEM, ITEM_NONE,/*ITEM_METAL_COAT*/ SPECIES_STEELIX}},
[SPECIES_DROWZEE] = {{EVO_LEVEL, 26, SPECIES_HYPNO}},
@ -197,8 +197,7 @@ const struct Evolution gEvolutionTable[NUM_SPECIES][EVOS_PER_MON] =
[SPECIES_BARBOACH] = {{EVO_LEVEL, 30, SPECIES_WHISCASH}},
[SPECIES_CORPHISH] = {{EVO_LEVEL, 30, SPECIES_CRAWDAUNT}},
[SPECIES_FEEBAS] = {{EVO_BEAUTY, 170, SPECIES_MILOTIC},
{EVO_ITEM_HOLD_DAY, ITEM_NONE,/*ITEM_PRISM_SCALE*/ SPECIES_MILOTIC},
{EVO_ITEM_HOLD_NIGHT, ITEM_NONE,/*ITEM_PRISM_SCALE*/ SPECIES_MILOTIC}},
{EVO_TRADE_ITEM, ITEM_NONE,/*ITEM_PRISM_SCALE*/ SPECIES_MILOTIC}},
[SPECIES_CARVANHA] = {{EVO_LEVEL, 30, SPECIES_SHARPEDO}},
[SPECIES_SHARPEDO] = {{EVO_MEGA_EVOLUTION, ITEM_NONE,/*ITEM_SHARPEDONITE*/ SPECIES_MEGA_SHARPEDO}},
[SPECIES_TRAPINCH] = {{EVO_LEVEL, 35, SPECIES_VIBRAVA}},
@ -322,12 +321,12 @@ const struct Evolution gEvolutionTable[NUM_SPECIES][EVOS_PER_MON] =
{EVO_LEVEL_FEMALE, 32, SPECIES_UNFEZANT}},
[SPECIES_BLITZLE] = {{EVO_LEVEL, 27, SPECIES_ZEBSTRIKA}},
[SPECIES_ROGGENROLA] = {{EVO_LEVEL, 25, SPECIES_BOLDORE}},
[SPECIES_BOLDORE] = {{EVO_LEVEL, 40, SPECIES_GIGALITH}},
[SPECIES_BOLDORE] = {{EVO_TRADE, 0, SPECIES_GIGALITH}},
[SPECIES_WOOBAT] = {{EVO_FRIENDSHIP, 0, SPECIES_SWOOBAT}},
[SPECIES_DRILBUR] = {{EVO_LEVEL, 31, SPECIES_EXCADRILL}},
[SPECIES_AUDINO] = {{EVO_MEGA_EVOLUTION, ITEM_NONE,/*ITEM_AUDINITE*/ SPECIES_MEGA_AUDINO}},
[SPECIES_TIMBURR] = {{EVO_LEVEL, 25, SPECIES_GURDURR}},
[SPECIES_GURDURR] = {{EVO_LEVEL, 40, SPECIES_CONKELDURR}},
[SPECIES_GURDURR] = {{EVO_TRADE, 0, SPECIES_CONKELDURR}},
[SPECIES_TYMPOLE] = {{EVO_LEVEL, 25, SPECIES_PALPITOAD}},
[SPECIES_PALPITOAD] = {{EVO_LEVEL, 36, SPECIES_SEISMITOAD}},
[SPECIES_SEWADDLE] = {{EVO_LEVEL, 20, SPECIES_SWADLOON}},
@ -411,8 +410,8 @@ const struct Evolution gEvolutionTable[NUM_SPECIES][EVOS_PER_MON] =
[SPECIES_AMAURA] = {{EVO_LEVEL_NIGHT, 39, SPECIES_AURORUS}},
[SPECIES_GOOMY] = {{EVO_LEVEL, 40, SPECIES_SLIGGOO}},
[SPECIES_SLIGGOO] = {{EVO_LEVEL_RAIN, 50, SPECIES_GOODRA}},
[SPECIES_PHANTUMP] = {{EVO_LEVEL, 40, SPECIES_TREVENANT}},
[SPECIES_PUMPKABOO] = {{EVO_LEVEL, 40, SPECIES_GOURGEIST}},
[SPECIES_PHANTUMP] = {{EVO_TRADE, 0, SPECIES_TREVENANT}},
[SPECIES_PUMPKABOO] = {{EVO_TRADE, 0, SPECIES_GOURGEIST}},
[SPECIES_BERGMITE] = {{EVO_LEVEL, 37, SPECIES_AVALUGG}},
[SPECIES_NOIBAT] = {{EVO_LEVEL, 48, SPECIES_NOIVERN}},
[SPECIES_DIANCIE] = {{EVO_MEGA_EVOLUTION, ITEM_NONE,/*ITEM_DIANCITE*/ SPECIES_MEGA_DIANCIE}},
@ -455,8 +454,8 @@ const struct Evolution gEvolutionTable[NUM_SPECIES][EVOS_PER_MON] =
[SPECIES_ALOLAN_SANDSHREW] = {{EVO_ITEM, ITEM_NONE,/*ITEM_ICE_STONE*/ SPECIES_ALOLAN_SANDSLASH}},
[SPECIES_ALOLAN_VULPIX] = {{EVO_ITEM, ITEM_NONE,/*ITEM_ICE_STONE*/ SPECIES_ALOLAN_NINETALES}},
[SPECIES_ALOLAN_DIGLETT] = {{EVO_LEVEL, 26, SPECIES_ALOLAN_DUGTRIO}},
[SPECIES_ALOLAN_MEOWTH] = {{EVO_LEVEL, 28, SPECIES_ALOLAN_PERSIAN}},
[SPECIES_ALOLAN_MEOWTH] = {{EVO_FRIENDSHIP, 28, SPECIES_ALOLAN_PERSIAN}},
[SPECIES_ALOLAN_GEODUDE] = {{EVO_LEVEL, 25, SPECIES_ALOLAN_GRAVELER}},
[SPECIES_ALOLAN_GRAVELER] = {{EVO_LEVEL, 40, SPECIES_ALOLAN_GOLEM}},
[SPECIES_ALOLAN_GRAVELER] = {{EVO_TRADE, 0, SPECIES_ALOLAN_GOLEM}},
[SPECIES_ALOLAN_GRIMER] = {{EVO_LEVEL, 38, SPECIES_ALOLAN_MUK}},
};