mirror of
https://github.com/Skeli789/Dynamic-Pokemon-Expansion.git
synced 2026-04-25 07:36:55 -05:00
Bug Fixes + Item Name Updates
-Evolution Fixes -Zubat Egg Move Fix -Deoxys Icon Fix
This commit is contained in:
Skeli
parent
328f729d62
commit
f4c1b85364
|
|
@ -21,6 +21,9 @@
|
|||
080970A6 C0 46 C0 46 C0 46 C0 46 C0 46
|
||||
080971DA C0 46
|
||||
|
||||
#Deoxys Icon Fixes
|
||||
08097038 C0 46 C0 46 C0 46 C0 46 C0 46 C0 46 C0 46 C0 46 C0 46
|
||||
|
||||
#Update Pokedex
|
||||
#081025EC FA
|
||||
#081025EE 40 01
|
||||
|
|
|
|||
|
|
@ -1,3 +1,5 @@
|
|||
#pragma once
|
||||
|
||||
#define ITEM_NONE 0
|
||||
#define ITEM_MASTER_BALL 1
|
||||
#define ITEM_ULTRA_BALL 2
|
||||
|
|
@ -230,7 +232,7 @@
|
|||
#define ITEM_LUCKY_PUNCH 222
|
||||
#define ITEM_METAL_POWDER 223
|
||||
#define ITEM_THICK_CLUB 224
|
||||
#define ITEM_STICK 225
|
||||
#define ITEM_LEEK 225
|
||||
#define ITEM_0E2 226
|
||||
#define ITEM_0E3 227
|
||||
#define ITEM_0E4 228
|
||||
|
|
@ -726,6 +728,7 @@
|
|||
#define ITEM_BOTTLE_CAP 0x268
|
||||
#define ITEM_GOLD_BOTTLE_CAP 0x269
|
||||
#define ITEM_ABILITY_CAPSULE 0x260
|
||||
#define ITEM_WISHING_PIECE 0x58
|
||||
|
||||
//Nectars
|
||||
#define ITEM_RED_NECTAR 0x26A
|
||||
|
|
@ -823,6 +826,10 @@ enum
|
|||
//Sword & Shield Hold Items
|
||||
#define ITEM_EJECT_PACK 0x2C0
|
||||
#define ITEM_ROOM_SERVICE 0x2C1
|
||||
#define ITEM_BLUNDER_POLICY 0x2C2
|
||||
#define ITEM_HEAVY_DUTY_BOOTS 0x2C3
|
||||
#define ITEM_UTILITY_UMBRELLA 0x2C4
|
||||
#define ITEM_THROAT_SPRAY 0x2C5
|
||||
|
||||
#define ITEMS_COUNT (ITEM_ROOM_SERVICE + 1)
|
||||
|
||||
|
|
@ -843,4 +850,12 @@ enum
|
|||
#define ITEM_QUEST_LOG 0x15C
|
||||
#define ITEM_SMELLY_SOCKS 0x15F
|
||||
|
||||
#define ITEM_MEGA_CUFF 0x77
|
||||
#define ITEM_MEGA_BONNET 0x78
|
||||
#define ITEM_MEGA_EARING 0x20F
|
||||
#define ITEM_MEGA_CHARM 0x210
|
||||
#define ITEM_MEGA_BRACELET 0x211
|
||||
#define ITEM_MEGA_ANKLET 0x212
|
||||
#define ITEM_MEGA_PENDANT 0x213
|
||||
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -2736,7 +2736,7 @@ const struct BaseStats gBaseStats[] =
|
|||
.evYield_SpDefense = 0,
|
||||
.evYield_Speed = 0,
|
||||
.item1 = ITEM_NONE,
|
||||
.item2 = ITEM_STICK,
|
||||
.item2 = ITEM_LEEK,
|
||||
.genderRatio = PERCENT_FEMALE(50),
|
||||
.eggCycles = 20,
|
||||
.friendship = 50,
|
||||
|
|
|
|||
|
|
@ -173,6 +173,22 @@ const u16 gEggMoves[] =
|
|||
MOVE_CAPTIVATE,
|
||||
MOVE_MEMENTO),
|
||||
|
||||
egg_moves(ZUBAT,
|
||||
MOVE_QUICKATTACK,
|
||||
MOVE_PURSUIT,
|
||||
MOVE_FEINTATTACK,
|
||||
MOVE_GUST,
|
||||
MOVE_WHIRLWIND,
|
||||
MOVE_CURSE,
|
||||
MOVE_NASTYPLOT,
|
||||
MOVE_HYPNOSIS,
|
||||
MOVE_ZENHEADBUTT,
|
||||
MOVE_BRAVEBIRD,
|
||||
MOVE_GIGADRAIN,
|
||||
MOVE_STEELWING,
|
||||
MOVE_DEFOG,
|
||||
MOVE_VENOMDRENCH),
|
||||
|
||||
egg_moves(ODDISH,
|
||||
MOVE_RAZORLEAF,
|
||||
MOVE_FLAIL,
|
||||
|
|
|
|||
|
|
@ -10,14 +10,17 @@ const struct Evolution gEvolutionTable[NUM_SPECIES][EVOS_PER_MON] =
|
|||
{
|
||||
[SPECIES_BULBASAUR] = {{EVO_LEVEL, 16, SPECIES_IVYSAUR, 0}},
|
||||
[SPECIES_IVYSAUR] = {{EVO_LEVEL, 32, SPECIES_VENUSAUR, 0}},
|
||||
[SPECIES_VENUSAUR] = {{EVO_MEGA, ITEM_VENUSAURITE, SPECIES_VENUSAUR_MEGA, MEGA_VARIANT_STANDARD}},
|
||||
[SPECIES_VENUSAUR] = {{EVO_MEGA, ITEM_VENUSAURITE, SPECIES_VENUSAUR_MEGA, MEGA_VARIANT_STANDARD}/*,
|
||||
{EVO_GIGANTAMAX, TRUE, SPECIES_VENUSAUR_GIGA, 0}*/},
|
||||
[SPECIES_CHARMANDER] = {{EVO_LEVEL, 16, SPECIES_CHARMELEON, 0}},
|
||||
[SPECIES_CHARMELEON] = {{EVO_LEVEL, 36, SPECIES_CHARIZARD, 0}},
|
||||
[SPECIES_CHARIZARD] = {{EVO_MEGA, ITEM_CHARIZARDITE_X, SPECIES_CHARIZARD_MEGA_X, MEGA_VARIANT_STANDARD},
|
||||
{EVO_MEGA, ITEM_CHARIZARDITE_Y, SPECIES_CHARIZARD_MEGA_Y, MEGA_VARIANT_STANDARD}},
|
||||
{EVO_MEGA, ITEM_CHARIZARDITE_Y, SPECIES_CHARIZARD_MEGA_Y, MEGA_VARIANT_STANDARD}/*,
|
||||
{EVO_GIGANTAMAX, TRUE, SPECIES_CHARIZARD_GIGA, 0}*/},
|
||||
[SPECIES_SQUIRTLE] = {{EVO_LEVEL, 16, SPECIES_WARTORTLE, 0}},
|
||||
[SPECIES_WARTORTLE] = {{EVO_LEVEL, 36, SPECIES_BLASTOISE, 0}},
|
||||
[SPECIES_BLASTOISE] = {{EVO_MEGA, ITEM_BLASTOISINITE, SPECIES_BLASTOISE_MEGA, MEGA_VARIANT_STANDARD}},
|
||||
[SPECIES_BLASTOISE] = {{EVO_MEGA, ITEM_BLASTOISINITE, SPECIES_BLASTOISE_MEGA, MEGA_VARIANT_STANDARD}/*,
|
||||
{EVO_GIGANTAMAX, TRUE, SPECIES_BLASTOISE_GIGA, 0}*/},
|
||||
[SPECIES_CATERPIE] = {{EVO_LEVEL, 7, SPECIES_METAPOD, 0}},
|
||||
[SPECIES_METAPOD] = {{EVO_LEVEL, 10, SPECIES_BUTTERFREE, 0}},
|
||||
[SPECIES_WEEDLE] = {{EVO_LEVEL, 7, SPECIES_KAKUNA, 0}},
|
||||
|
|
@ -157,7 +160,7 @@ const struct Evolution gEvolutionTable[NUM_SPECIES][EVOS_PER_MON] =
|
|||
[SPECIES_YANMA] = {{EVO_MOVE, MOVE_ANCIENTPOWER, SPECIES_YANMEGA, 0}},
|
||||
[SPECIES_WOOPER] = {{EVO_LEVEL, 20, SPECIES_QUAGSIRE, 0}},
|
||||
[SPECIES_MURKROW] = {{EVO_ITEM, ITEM_DUSK_STONE, SPECIES_HONCHKROW, 0}},
|
||||
[SPECIES_MISDREAVUS] = {{EVO_ITEM, ITEM_036, SPECIES_MISMAGIUS, 0}},
|
||||
[SPECIES_MISDREAVUS] = {{EVO_ITEM, ITEM_DUSK_STONE, SPECIES_MISMAGIUS, 0}},
|
||||
[SPECIES_PINECO] = {{EVO_LEVEL, 31, SPECIES_FORRETRESS, 0}},
|
||||
[SPECIES_GLIGAR] = {{EVO_HOLD_ITEM_NIGHT, ITEM_RAZOR_FANG, SPECIES_GLISCOR, 0}},
|
||||
[SPECIES_STEELIX] = {{EVO_MEGA, ITEM_STEELIXITE, SPECIES_STEELIX_MEGA, MEGA_VARIANT_STANDARD}},
|
||||
|
|
@ -436,7 +439,7 @@ const struct Evolution gEvolutionTable[NUM_SPECIES][EVOS_PER_MON] =
|
|||
{EVO_TRADE_ITEM, ITEM_NONE, SPECIES_AROMATISSE, 0}},
|
||||
[SPECIES_SWIRLIX] = {{EVO_ITEM, ITEM_NONE, SPECIES_SLURPUFF, 0},
|
||||
{EVO_TRADE_ITEM, ITEM_NONE, SPECIES_SLURPUFF, 0}},
|
||||
[SPECIES_INKAY] = {{EVO_LEVEL, 40, SPECIES_MALAMAR, 0}},
|
||||
[SPECIES_INKAY] = {{EVO_LEVEL, 30, SPECIES_MALAMAR, 0}},
|
||||
[SPECIES_BINACLE] = {{EVO_LEVEL, 39, SPECIES_BARBARACLE, 0}},
|
||||
[SPECIES_SKRELP] = {{EVO_LEVEL, 48, SPECIES_DRAGALGE, 0}},
|
||||
[SPECIES_CLAUNCHER] = {{EVO_LEVEL, 37, SPECIES_CLAWITZER, 0}},
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user