Leahnaya/Dynamic-Pokemon-Expansion
1
0
Fork 0
mirror of https://github.com/Skeli789/Dynamic-Pokemon-Expansion.git synced 2026-09-08 18:15:49 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into Unbound

Browse Source
This commit is contained in:
Skeli
2019-12-06 00:01:02 +02:00
parent df100a31e4 29d481a83a
commit 25c11f262b
3 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/items.h
View File

@@ -677,8 +677,8 @@
#define ITEM_RAZOR_CLAW 0xE6
#define ITEM_RAZOR_FANG 0xE7
#define ITEM_REAPER_CLOTH 0xE8
#define ITEM_DUBIOUS_DISK 0xE9
#define ITEM_ELECTRIZER 0xEA
#define ITEM_DUBIOUS_DISC 0xE9
#define ITEM_ELECTIRIZER 0xEA
//New Key Items
#define ITEM_GRACIDEA 0x217

6
src/Base_Stats.c
View File

@@ -4122,7 +4122,7 @@ const struct BaseStats gBaseStats[] =
.evYield_SpDefense = 0,
.evYield_Speed = 2,
.item1 = ITEM_NONE,
.item2 = ITEM_ELECTRIZER,
.item2 = ITEM_ELECTIRIZER,
.genderRatio = PERCENT_FEMALE(25),
.eggCycles = 25,
.friendship = 70,
@@ -7884,7 +7884,7 @@ const struct BaseStats gBaseStats[] =
.evYield_SpDefense = 0,
.evYield_Speed = 1,
.item1 = ITEM_NONE,
.item2 = ITEM_ELECTRIZER,
.item2 = ITEM_ELECTIRIZER,
.genderRatio = PERCENT_FEMALE(25),
.eggCycles = 25,
.friendship = 70,
@@ -16299,7 +16299,7 @@ const struct BaseStats gBaseStats[] =
.evYield_SpDefense = 0,
.evYield_Speed = 0,
.item1 = ITEM_NONE,
.item2 = ITEM_ELECTRIZER,
.item2 = ITEM_ELECTIRIZER,
.genderRatio = PERCENT_FEMALE(25),
.eggCycles = 25,
.friendship = 70,

8
src/Evolution Table.c
View File

@@ -105,8 +105,8 @@ const struct Evolution gEvolutionTable[NUM_SPECIES][EVOS_PER_MON] =
[SPECIES_STARYU] = {{EVO_ITEM, ITEM_WATER_STONE, SPECIES_STARMIE, 0}},
[SPECIES_SCYTHER] = {{EVO_TRADE_ITEM, ITEM_METAL_COAT, SPECIES_SCIZOR, 0},
{EVO_ITEM, ITEM_METAL_COAT, SPECIES_SCIZOR, 0}},
[SPECIES_ELECTABUZZ] = {{EVO_ITEM, ITEM_ELECTRIZER, SPECIES_ELECTIVIRE, 0},
{EVO_TRADE_ITEM, ITEM_ELECTRIZER, SPECIES_ELECTIVIRE, 0}},
[SPECIES_ELECTABUZZ] = {{EVO_ITEM, ITEM_ELECTIRIZER, SPECIES_ELECTIVIRE, 0},
{EVO_TRADE_ITEM, ITEM_ELECTIRIZER, SPECIES_ELECTIVIRE, 0}},
[SPECIES_MAGMAR] = {{EVO_TRADE_ITEM, ITEM_PEARL_STRING, SPECIES_MAGMORTAR, 0},
{EVO_ITEM, ITEM_PEARL_STRING, SPECIES_MAGMORTAR, 0}},
[SPECIES_PINSIR] = {{EVO_MEGA, ITEM_PINSIRITE, SPECIES_PINSIR_MEGA, MEGA_VARIANT_STANDARD}},
@@ -173,8 +173,8 @@ const struct Evolution gEvolutionTable[NUM_SPECIES][EVOS_PER_MON] =
[SPECIES_HOUNDOUR] = {{EVO_LEVEL, 24, SPECIES_HOUNDOOM, 0}},
[SPECIES_HOUNDOOM] = {{EVO_MEGA, ITEM_HOUNDOOMINITE, SPECIES_HOUNDOOM_MEGA, MEGA_VARIANT_STANDARD}},
[SPECIES_PHANPY] = {{EVO_LEVEL, 25, SPECIES_DONPHAN, 0}},
[SPECIES_PORYGON2] = {{EVO_TRADE_ITEM, ITEM_DUBIOUS_DISK, SPECIES_PORYGON_Z, 0},
{EVO_ITEM, ITEM_DUBIOUS_DISK, SPECIES_PORYGON_Z, 0}},
[SPECIES_PORYGON2] = {{EVO_TRADE_ITEM, ITEM_DUBIOUS_DISC, SPECIES_PORYGON_Z, 0},
{EVO_ITEM, ITEM_DUBIOUS_DISC, SPECIES_PORYGON_Z, 0}},
[SPECIES_TYROGUE] = {{EVO_LEVEL_ATK_GT_DEF, 20, SPECIES_HITMONLEE, 0},
{EVO_LEVEL_ATK_EQ_DEF, 20, SPECIES_HITMONTOP, 0},
{EVO_LEVEL_ATK_LT_DEF, 20, SPECIES_HITMONCHAN, 0}},