ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-11-18 20:47:40 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #158 from LOuroboros/patch-1

Browse Source 
Update evolution.h
This commit is contained in:
DizzyEggg 2019-06-09 09:49:33 +02:00 committed by GitHub
commit 90ba2c545b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -141,7 +141,7 @@ const struct Evolution gEvolutionTable[NUM_SPECIES][EVOS_PER_MON] =
[SPECIES_STEELIX] = {{EVO_MEGA_EVOLUTION, ITEM_NONE,/*ITEM_STEELIXITE*/ SPECIES_MEGA_STEELIX}}, [SPECIES_STEELIX] = {{EVO_MEGA_EVOLUTION, ITEM_NONE,/*ITEM_STEELIXITE*/ SPECIES_MEGA_STEELIX}},
[SPECIES_SNUBBULL] = {{EVO_LEVEL, 23, SPECIES_GRANBULL}}, [SPECIES_SNUBBULL] = {{EVO_LEVEL, 23, SPECIES_GRANBULL}},
[SPECIES_SCIZOR] = {{EVO_MEGA_EVOLUTION, ITEM_NONE,/*ITEM_SCIZORITE*/ SPECIES_MEGA_SCIZOR}}, [SPECIES_SCIZOR] = {{EVO_MEGA_EVOLUTION, ITEM_NONE,/*ITEM_SCIZORITE*/ SPECIES_MEGA_SCIZOR}},
[SPECIES_HERACROSS] = {{EVO_MEGA_EVOLUTION, ITEM_NONE,/*ITEM_HERCRONITE*/ SPECIES_MEGA_HERACROSS}}, [SPECIES_HERACROSS] = {{EVO_MEGA_EVOLUTION, ITEM_NONE,/*ITEM_HERACRONITE*/ SPECIES_MEGA_HERACROSS}},
[SPECIES_SNEASEL] = {{EVO_ITEM_HOLD_NIGHT, ITEM_NONE,/*ITEM_RAZOR_CLAW*/ SPECIES_WEAVILE}}, [SPECIES_SNEASEL] = {{EVO_ITEM_HOLD_NIGHT, ITEM_NONE,/*ITEM_RAZOR_CLAW*/ SPECIES_WEAVILE}},
[SPECIES_TEDDIURSA] = {{EVO_LEVEL, 30, SPECIES_URSARING}}, [SPECIES_TEDDIURSA] = {{EVO_LEVEL, 30, SPECIES_URSARING}},
[SPECIES_SLUGMA] = {{EVO_LEVEL, 38, SPECIES_MAGCARGO}}, [SPECIES_SLUGMA] = {{EVO_LEVEL, 38, SPECIES_MAGCARGO}},
@ -390,13 +390,13 @@ const struct Evolution gEvolutionTable[NUM_SPECIES][EVOS_PER_MON] =
[SPECIES_LITLEO] = {{EVO_LEVEL_MALE, 35, SPECIES_PYROAR}, [SPECIES_LITLEO] = {{EVO_LEVEL_MALE, 35, SPECIES_PYROAR},
{EVO_LEVEL_FEMALE, 35, SPECIES_PYROAR}}, {EVO_LEVEL_FEMALE, 35, SPECIES_PYROAR}},
[SPECIES_FLABEBE] = {{EVO_LEVEL, 19, SPECIES_FLOETTE}}, [SPECIES_FLABEBE] = {{EVO_LEVEL, 19, SPECIES_FLOETTE}},
[SPECIES_FLOETTE] = {{EVO_ITEM, ITEM_NONE,/*SHINY_STONE*/ SPECIES_FLORGES}}, [SPECIES_FLOETTE] = {{EVO_ITEM, ITEM_NONE,/*ITEM_SHINY_STONE*/ SPECIES_FLORGES}},
[SPECIES_SKIDDO] = {{EVO_LEVEL, 32, SPECIES_GOGOAT}}, [SPECIES_SKIDDO] = {{EVO_LEVEL, 32, SPECIES_GOGOAT}},
[SPECIES_PANCHAM] = {{EVO_LEVEL_SPECIFIC_MON_TYPE_IN_PARTY, 32, SPECIES_PANGORO}}, [SPECIES_PANCHAM] = {{EVO_LEVEL_SPECIFIC_MON_TYPE_IN_PARTY, 32, SPECIES_PANGORO}},
[SPECIES_ESPURR] = {{EVO_LEVEL_MALE, 25, SPECIES_MEOWSTIC}, [SPECIES_ESPURR] = {{EVO_LEVEL_MALE, 25, SPECIES_MEOWSTIC},
{EVO_LEVEL_FEMALE, 25, SPECIES_MEOWSTIC_F}}, {EVO_LEVEL_FEMALE, 25, SPECIES_MEOWSTIC_F}},
[SPECIES_HONEDGE] = {{EVO_LEVEL, 35, SPECIES_DOUBLADE}}, [SPECIES_HONEDGE] = {{EVO_LEVEL, 35, SPECIES_DOUBLADE}},
[SPECIES_DOUBLADE] = {{EVO_ITEM, ITEM_NONE,/*DUSK_STONE*/ SPECIES_AEGISLASH}}, [SPECIES_DOUBLADE] = {{EVO_ITEM, ITEM_NONE,/*ITEM_DUSK_STONE*/ SPECIES_AEGISLASH}},
[SPECIES_SPRITZEE] = {{EVO_TRADE_ITEM, ITEM_NONE,/*ITEM_SACHET*/ SPECIES_AROMATISSE}}, [SPECIES_SPRITZEE] = {{EVO_TRADE_ITEM, ITEM_NONE,/*ITEM_SACHET*/ SPECIES_AROMATISSE}},
[SPECIES_SWIRLIX] = {{EVO_TRADE_ITEM, ITEM_NONE,/*ITEM_WHIPPED_DREAM*/ SPECIES_SLURPUFF}}, [SPECIES_SWIRLIX] = {{EVO_TRADE_ITEM, ITEM_NONE,/*ITEM_WHIPPED_DREAM*/ SPECIES_SLURPUFF}},
[SPECIES_INKAY] = {{EVO_LEVEL, 30, SPECIES_MALAMAR}}, [SPECIES_INKAY] = {{EVO_LEVEL, 30, SPECIES_MALAMAR}},