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

Merge branch 'master' into Unbound

Browse Source
This commit is contained in:
Skeli
2020-01-02 23:17:16 +02:00
parent 0f66ae5dca 34a7e294ba
commit e4d4ad03b0
2 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/items.h
View File

@@ -734,7 +734,7 @@
#define ITEM_PURPLE_NECTAR 0x26D
//Evolution Items
#define ITEM_LINK_CABLE 0x5B
#define ITEM_LINK_STONE 0x5B
#define ITEM_DUSK_STONE 0x63
#define ITEM_DAWN_STONE 0x64
#define ITEM_SHINY_STONE 0x65

28
src/Evolution Table.c
View File

@@ -57,16 +57,16 @@ const struct Evolution gEvolutionTable[NUM_SPECIES][EVOS_PER_MON] =
{EVO_ITEM, ITEM_KINGS_ROCK, SPECIES_POLITOED, 0}},
[SPECIES_ABRA] = {{EVO_LEVEL, 16, SPECIES_KADABRA, 0}},
[SPECIES_KADABRA] = {{EVO_TRADE, 0, SPECIES_ALAKAZAM, 0},
{EVO_ITEM, ITEM_LINK_CABLE, SPECIES_ALAKAZAM, 0}},
{EVO_ITEM, ITEM_LINK_STONE, SPECIES_ALAKAZAM, 0}},
[SPECIES_ALAKAZAM] = {{EVO_MEGA, ITEM_ALAKAZITE, SPECIES_ALAKAZAM_MEGA, MEGA_VARIANT_STANDARD}},
[SPECIES_MACHOP] = {{EVO_LEVEL, 28, SPECIES_MACHOKE, 0}},
[SPECIES_MACHOKE] = {{EVO_TRADE, 0, SPECIES_MACHAMP, 0},
{EVO_ITEM, ITEM_LINK_CABLE, SPECIES_MACHAMP, 0}},
{EVO_ITEM, ITEM_LINK_STONE, SPECIES_MACHAMP, 0}},
[SPECIES_BELLSPROUT] = {{EVO_LEVEL, 21, SPECIES_WEEPINBELL, 0}},
[SPECIES_WEEPINBELL] = {{EVO_ITEM, ITEM_LEAF_STONE, SPECIES_VICTREEBEL, 0}},
[SPECIES_TENTACOOL] = {{EVO_LEVEL, 30, SPECIES_TENTACRUEL, 0}},
[SPECIES_GEODUDE] = {{EVO_LEVEL, 25, SPECIES_GRAVELER, 0}},
[SPECIES_GRAVELER] = {{EVO_ITEM, ITEM_LINK_CABLE, SPECIES_GOLEM, 0},
[SPECIES_GRAVELER] = {{EVO_ITEM, ITEM_LINK_STONE, SPECIES_GOLEM, 0},
{EVO_TRADE, 0, SPECIES_GOLEM, 0}},
[SPECIES_PONYTA] = {{EVO_LEVEL, 40, SPECIES_RAPIDASH, 0}},
[SPECIES_SLOWPOKE] = {{EVO_LEVEL, 37, SPECIES_SLOWBRO, 0},
@@ -81,7 +81,7 @@ const struct Evolution gEvolutionTable[NUM_SPECIES][EVOS_PER_MON] =
[SPECIES_SHELLDER] = {{EVO_ITEM, ITEM_WATER_STONE, SPECIES_CLOYSTER, 0}},
[SPECIES_GASTLY] = {{EVO_LEVEL, 25, SPECIES_HAUNTER, 0}},
[SPECIES_HAUNTER] = {{EVO_TRADE, 0, SPECIES_GENGAR, 0},
{EVO_ITEM, ITEM_LINK_CABLE, SPECIES_GENGAR, 0}},
{EVO_ITEM, ITEM_LINK_STONE, SPECIES_GENGAR, 0}},
[SPECIES_GENGAR] = {{EVO_MEGA, ITEM_GENGARITE, SPECIES_GENGAR_MEGA, MEGA_VARIANT_STANDARD}},
[SPECIES_ONIX] = {{EVO_TRADE_ITEM, ITEM_METAL_COAT, SPECIES_STEELIX, 0},
{EVO_ITEM, ITEM_METAL_COAT, SPECIES_STEELIX, 0}},
@@ -341,14 +341,14 @@ const struct Evolution gEvolutionTable[NUM_SPECIES][EVOS_PER_MON] =
[SPECIES_TRANQUILL] = {{EVO_LEVEL, 32, SPECIES_UNFEZANT, 0}},
[SPECIES_BLITZLE] = {{EVO_LEVEL, 27, SPECIES_ZEBSTRIKA, 0}},
[SPECIES_ROGGENROLA] = {{EVO_LEVEL, 25, SPECIES_BOLDORE, 0}},
[SPECIES_BOLDORE] = {{EVO_ITEM, ITEM_LINK_CABLE, SPECIES_GIGALITH, 0},
[SPECIES_BOLDORE] = {{EVO_ITEM, ITEM_LINK_STONE, SPECIES_GIGALITH, 0},
{EVO_TRADE, 0, SPECIES_GIGALITH, 0}},
[SPECIES_WOOBAT] = {{EVO_FRIENDSHIP, 0, SPECIES_SWOOBAT, 0}},
[SPECIES_DRILBUR] = {{EVO_LEVEL, 31, SPECIES_EXCADRILL, 0}},
[SPECIES_AUDINO] = {{EVO_MEGA, ITEM_AUDINITE, SPECIES_AUDINO_MEGA, MEGA_VARIANT_STANDARD}},
[SPECIES_TIMBURR] = {{EVO_LEVEL, 25, SPECIES_GURDURR, 0}},
[SPECIES_GURDURR] = {{EVO_TRADE, 0, SPECIES_CONKELDURR, 0},
{EVO_ITEM, ITEM_LINK_CABLE, SPECIES_CONKELDURR, 0}},
{EVO_ITEM, ITEM_LINK_STONE, SPECIES_CONKELDURR, 0}},
[SPECIES_TYMPOLE] = {{EVO_LEVEL, 25, SPECIES_PALPITOAD, 0}},
[SPECIES_PALPITOAD] = {{EVO_LEVEL, 36, SPECIES_SEISMITOAD, 0}},
[SPECIES_SEWADDLE] = {{EVO_LEVEL, 20, SPECIES_SWADLOON, 0}},
@@ -376,7 +376,7 @@ const struct Evolution gEvolutionTable[NUM_SPECIES][EVOS_PER_MON] =
[SPECIES_VANILLITE] = {{EVO_LEVEL, 35, SPECIES_VANILLISH, 0}},
[SPECIES_VANILLISH] = {{EVO_LEVEL, 47, SPECIES_VANILLUXE, 0}},
[SPECIES_DEERLING] = {{EVO_LEVEL, 34, SPECIES_SAWSBUCK, 0}},
[SPECIES_KARRABLAST] = {{EVO_ITEM, ITEM_LINK_CABLE, SPECIES_ESCAVALIER, 0},
[SPECIES_KARRABLAST] = {{EVO_ITEM, ITEM_LINK_STONE, SPECIES_ESCAVALIER, 0},
{EVO_TRADE, 0, SPECIES_ESCAVALIER, 0}},
[SPECIES_FOONGUS] = {{EVO_LEVEL, 39, SPECIES_AMOONGUSS, 0}},
[SPECIES_FRILLISH] = {{EVO_LEVEL, 40, SPECIES_JELLICENT, 0}},
@@ -392,7 +392,7 @@ const struct Evolution gEvolutionTable[NUM_SPECIES][EVOS_PER_MON] =
[SPECIES_AXEW] = {{EVO_LEVEL, 38, SPECIES_FRAXURE, 0}},
[SPECIES_FRAXURE] = {{EVO_LEVEL, 48, SPECIES_HAXORUS, 0}},
[SPECIES_CUBCHOO] = {{EVO_LEVEL, 37, SPECIES_BEARTIC, 0}},
[SPECIES_SHELMET] = {{EVO_ITEM, ITEM_LINK_CABLE, SPECIES_ACCELGOR, 0},
[SPECIES_SHELMET] = {{EVO_ITEM, ITEM_LINK_STONE, SPECIES_ACCELGOR, 0},
{EVO_TRADE, 0, SPECIES_ACCELGOR, 0}},
[SPECIES_MIENFOO] = {{EVO_LEVEL, 50, SPECIES_MIENSHAO, 0}},
[SPECIES_GOLETT] = {{EVO_LEVEL, 43, SPECIES_GOLURK, 0}},
@@ -446,9 +446,9 @@ const struct Evolution gEvolutionTable[NUM_SPECIES][EVOS_PER_MON] =
[SPECIES_GOOMY] = {{EVO_LEVEL, 40, SPECIES_SLIGGOO, 0}},
[SPECIES_SLIGGOO] = {{EVO_RAINY_FOGGY_OW, 50, SPECIES_GOODRA, 0}},
[SPECIES_PHANTUMP] = {{EVO_TRADE, 0, SPECIES_TREVENANT, 0},
{EVO_ITEM, ITEM_LINK_CABLE, SPECIES_TREVENANT, 0}},
{EVO_ITEM, ITEM_LINK_STONE, SPECIES_TREVENANT, 0}},
[SPECIES_PUMPKABOO] = {{EVO_TRADE, 0, SPECIES_GOURGEIST, 0},
{EVO_ITEM, ITEM_LINK_CABLE, SPECIES_GOURGEIST, 0}},
{EVO_ITEM, ITEM_LINK_STONE, SPECIES_GOURGEIST, 0}},
[SPECIES_BERGMITE] = {{EVO_LEVEL, 37, SPECIES_AVALUGG, 0}},
[SPECIES_NOIBAT] = {{EVO_LEVEL, 48, SPECIES_NOIVERN, 0}},
[SPECIES_DIANCIE] = {{EVO_MEGA, ITEM_DIANCITE, SPECIES_DIANCIE_MEGA, MEGA_VARIANT_STANDARD}},
@@ -461,11 +461,11 @@ const struct Evolution gEvolutionTable[NUM_SPECIES][EVOS_PER_MON] =
[SPECIES_FLOETTE_YELLOW] = {{EVO_ITEM, ITEM_SHINY_STONE, SPECIES_FLORGES_YELLOW, 0}},
[SPECIES_FLOETTE_WHITE] = {{EVO_ITEM, ITEM_SHINY_STONE, SPECIES_FLORGES_WHITE, 0}},
[SPECIES_PUMPKABOO_XL] = {{EVO_TRADE, 0, SPECIES_GOURGEIST_XL, 0},
{EVO_ITEM, ITEM_LINK_CABLE, SPECIES_GOURGEIST_XL, 0}},
{EVO_ITEM, ITEM_LINK_STONE, SPECIES_GOURGEIST_XL, 0}},
[SPECIES_PUMPKABOO_L] = {{EVO_TRADE, 0, SPECIES_GOURGEIST_L, 0},
{EVO_ITEM, ITEM_LINK_CABLE, SPECIES_GOURGEIST_L, 0}},
{EVO_ITEM, ITEM_LINK_STONE, SPECIES_GOURGEIST_L, 0}},
[SPECIES_PUMPKABOO_M] = {{EVO_TRADE, 0, SPECIES_GOURGEIST_M, 0},
{EVO_ITEM, ITEM_LINK_CABLE, SPECIES_GOURGEIST_M, 0}},
{EVO_ITEM, ITEM_LINK_STONE, SPECIES_GOURGEIST_M, 0}},
[SPECIES_VENUSAUR_MEGA] = {{EVO_MEGA, ITEM_NONE, SPECIES_VENUSAUR, MEGA_VARIANT_STANDARD}},
[SPECIES_CHARIZARD_MEGA_X] = {{EVO_MEGA, ITEM_NONE, SPECIES_CHARIZARD, MEGA_VARIANT_STANDARD}},
[SPECIES_CHARIZARD_MEGA_Y] = {{EVO_MEGA, ITEM_NONE, SPECIES_CHARIZARD, MEGA_VARIANT_STANDARD}},
@@ -557,7 +557,7 @@ const struct Evolution gEvolutionTable[NUM_SPECIES][EVOS_PER_MON] =
[SPECIES_DIGLETT_A] = {{EVO_LEVEL, 26, SPECIES_DUGTRIO_A, 0}},
[SPECIES_MEOWTH_A] = {{EVO_FRIENDSHIP, 0, SPECIES_PERSIAN_A, 0}},
[SPECIES_GEODUDE_A] = {{EVO_LEVEL, 25, SPECIES_GRAVELER_A, 0}},
[SPECIES_GRAVELER_A] = {{EVO_ITEM, ITEM_LINK_CABLE, SPECIES_GOLEM_A, 0},
[SPECIES_GRAVELER_A] = {{EVO_ITEM, ITEM_LINK_STONE, SPECIES_GOLEM_A, 0},
{EVO_TRADE, 0, SPECIES_GOLEM_A, 0}},
[SPECIES_GRIMER_A] = {{EVO_LEVEL, 38, SPECIES_MUK_A, 0}},
[SPECIES_EXEGGCUTE_A] = {{EVO_ITEM, ITEM_LEAF_STONE, SPECIES_EXEGGUTOR_A, 0}},