Some Fixes + SwSh Prep

This commit is contained in:
Skeli 2019-12-02 20:55:20 +02:00
parent 5d33ba8829
commit e8ce326bd0
12 changed files with 444 additions and 163 deletions

Binary file not shown.

Before

Width:  |  Height:  |  Size: 783 B

After

Width:  |  Height:  |  Size: 884 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1000 B

After

Width:  |  Height:  |  Size: 1.1 KiB

View File

@ -37,7 +37,7 @@
#define ABILITY_CHLOROPHYLL 0x22
#define ABILITY_ILLUMINATE 0x23
#define ABILITY_TRACE 0x24
#define ABILITY_HUGEPOWER 0x25
#define ABILITY_HUGEPOWER 0x25 //Also Pure Power
#define ABILITY_POISONPOINT 0x26
#define ABILITY_INNERFOCUS 0x27
#define ABILITY_MAGMAARMOR 0x28
@ -74,9 +74,9 @@
#define ABILITY_ARENATRAP 0x47
#define ABILITY_VITALSPIRIT 0x48
#define ABILITY_WHITESMOKE 0x49
#define ABILITY_PUREPOWER 0x4A
#define ABILITY_NEUTRALIINGGAS 0x4A
#define ABILITY_SHELLARMOR 0x4B
#define ABILITY_CACOPHONY 0x4C
#define ABILITY_HUNGERSWITCH 0x4C
#define ABILITY_AIRLOCK 0x4D
#define ABILITY_SWEETVEIL 0x4E
#define ABILITY_SKILLLINK 0x4F
@ -150,7 +150,7 @@
#define ABILITY_FLAREBOOST 0x93
#define ABILITY_FURCOAT 0x94
#define ABILITY_WONDERSKIN 0x95
#define ABILITY_PROTEAN 0x96
#define ABILITY_PROTEAN 0x96 //Also Libero
#define ABILITY_PARENTALBOND 0x97
#define ABILITY_MOLDBREAKER 0x98
#define ABILITY_TURBOBLAZE 0x99
@ -160,11 +160,11 @@
#define ABILITY_BEASTBOOST 0x9D
#define ABILITY_CORROSION 0x9E
#define ABILITY_DISGUISE 0x9F
#define ABILITY_EMERGENCYEXIT 0xA0
#define ABILITY_EMERGENCYEXIT 0xA0 //Also Wimp Out
#define ABILITY_FLUFFY 0xA1
#define ABILITY_FULLMETALBODY 0xA2
#define ABILITY_BROKEN_1 0xA3
#define ABILITY_BROKEN_2 0xA4
#define ABILITY_STEELY_SPIRIT 0xA2
#define ABILITY_PERISH_BODY 0xA3
#define ABILITY_WANDERING_SPIRIT 0xA4
#define ABILITY_POWERCONSTRUCT 0xA5
#define ABILITY_PRISMARMOR 0xA6
#define ABILITY_RKS_SYSTEM 0xA7
@ -215,7 +215,7 @@
#define ABILITY_PRIMORDIALSEA 0xD4
#define ABILITY_DESOLATELAND 0xD5
#define ABILITY_DELTASTREAM 0xD6
#define ABILITY_WIMPOUT 0xD7
#define ABILITY_GORILLATACTICS 0xD7
#define ABILITY_BERSERK 0xD8
#define ABILITY_LONGREACH 0xD9
#define ABILITY_LIQUIDVOICE 0xDA
@ -238,3 +238,20 @@
#define ABILITY_POWEROFALCHEMY 0xEB
#define ABILITY_NEUROFORCE 0xEC
#define ABILITY_GALVANIZE 0xED
#define ABILITY_INTREPIDSWORD 0xEE
#define ABILITY_DAUNTLESSSHIELD 0xEF
#define ABILITY_BALLFETCH 0xF0
#define ABILITY_COTTONDOWN 0xF1
#define ABILITY_MIRRORARMOR 0xF2
#define ABILITY_GULPMISSLE 0xF3
#define ABILITY_STALWART 0xF4 //Also Propellor Tail
#define ABILITY_STEAMENGINE 0xF5
#define ABILITY_PUNKROCK 0xF6
#define ABILITY_SANDSPIT 0xF7
#define ABILITY_ICESCALES 0xF8
#define ABILITY_RIPEN 0xF9
#define ABILITY_ICEFACE 0xFA
#define ABILITY_POWERSPOT 0xFB
#define ABILITY_MIMICRY 0xFC
#define ABILITY_SCREENCLEANER 0xFD
#define ABILITY_PASTELVEIL 0xFE

View File

@ -45,6 +45,7 @@ enum EvolutionMethods
EVO_LEVEL_SPECIFIC_TIME_RANGE, // above given level with a range (unknown is [start][end]. eg lycanroc -> 1700-1800 hrs -> 0x1112)
};
#define EVO_GIGANTAMAX 0xFD
#define EVO_MEGA 0xFE
enum MegaEvoVariants

View File

@ -563,7 +563,7 @@
#define MOVE_NOBLEROAR 0x22E
#define MOVE_DRAGONASCENT 0x22F
#define MOVE_PARTINGSHOT 0x230
#define MOVE_TOPSYTURVY 0x231
#define MOVE_TOPSYTURVY 0x231
#define MOVE_COREENFORCER 0x232
#define MOVE_CHATTER 0x233
#define MOVE_CONFIDE 0x234
@ -681,63 +681,198 @@
#define MOVE_CELEBRATE 0x2A4
#define MOVE_HOLDHANDS 0x2A5
#define MOVE_BREAKNECK_BLITZ_P 0x2A6
#define MOVE_BREAKNECK_BLITZ_S 0x2A7
#define MOVE_ALL_OUT_PUMMELING_P 0x2A8
#define MOVE_ALL_OUT_PUMMELING_S 0x2A9
#define MOVE_SUPERSONIC_SKYSTRIKE_P 0x2AA
#define MOVE_SUPERSONIC_SKYSTRIKE_S 0x2AB
#define MOVE_ACID_DOWNPOUR_P 0x2AC
#define MOVE_ACID_DOWNPOUR_S 0x2AD
#define MOVE_TECTONIC_RAGE_P 0x2AE
#define MOVE_TECTONIC_RAGE_S 0x2AF
#define MOVE_CONTINENTAL_CRUSH_P 0x2B0
#define MOVE_CONTINENTAL_CRUSH_S 0x2B1
#define MOVE_SAVAGE_SPIN_OUT_P 0x2B2
#define MOVE_SAVAGE_SPIN_OUT_S 0x2B3
#define MOVE_NEVER_ENDING_NIGHTMARE_P 0x2B4
#define MOVE_NEVER_ENDING_NIGHTMARE_S 0x2B5
#define MOVE_CORKSCREW_CRASH_P 0x2B6
#define MOVE_CORKSCREW_CRASH_S 0x2B7
#define MOVE_INFERNO_OVERDRIVE_P 0x2B8
#define MOVE_INFERNO_OVERDRIVE_S 0x2B9
#define MOVE_HYDRO_VORTEX_P 0x2BA
#define MOVE_HYDRO_VORTEX_S 0x2BB
#define MOVE_BLOOM_DOOM_P 0x2BC
#define MOVE_BLOOM_DOOM_S 0x2BD
#define MOVE_GIGAVOLT_HAVOC_P 0x2BE
#define MOVE_GIGAVOLT_HAVOC_S 0x2BF
#define MOVE_SHATTERED_PSYCHE_P 0x2C0
#define MOVE_SHATTERED_PSYCHE_S 0x2C1
#define MOVE_SUBZERO_SLAMMER_P 0x2C2
#define MOVE_SUBZERO_SLAMMER_S 0x2C3
#define MOVE_DEVASTATING_DRAKE_P 0x2C4
#define MOVE_DEVASTATING_DRAKE_S 0x2C5
#define MOVE_BLACK_HOLE_ECLIPSE_P 0x2C6
#define MOVE_BLACK_HOLE_ECLIPSE_S 0x2C7
#define MOVE_TWINKLE_TACKLE_P 0x2C8
#define MOVE_TWINKLE_TACKLE_S 0x2C9
//Sword & Shield Moves
#define MOVE_DYNAMAXCANNON 0x2A6
#define MOVE_SNIPESHOT 0x2A7
#define MOVE_JAWLOCK 0x2A8
#define MOVE_STUFFCHEEKS 0x2A9
#define MOVE_NORETREAT 0x2AA
#define MOVE_TARSHOT 0x2AB
#define MOVE_MAGICPOWDER 0x2AC
#define MOVE_DRAGONDARTS 0x2AD
#define MOVE_TEATIME 0x2AE
#define MOVE_OCTOLOCK 0x2AF
#define MOVE_BOLTBEAK 0x2B0
#define MOVE_FISHIOUSREND 0x2B1
#define MOVE_COURTCHANGE 0x2B2
#define MOVE_CLANGOROUSSOUL 0x2B3
#define MOVE_BODYPRESS 0x2B4
#define MOVE_DECORATE 0x2B5
#define MOVE_DRUMBEATING 0x2B6
#define MOVE_SNAPTRAP 0x2B7
#define MOVE_PYROBALL 0x2B8
#define MOVE_BEHEMOTHBLADE 0x2B9
#define MOVE_BEHEMOTHBASH 0x2BA
#define MOVE_AURAWHEEL 0x2BB
#define MOVE_BREAKINGSWIPE 0x2BC
#define MOVE_BRANCHPOKE 0x2BD
#define MOVE_OVERDRIVE 0x2BE
#define MOVE_APPLEACID 0x2BF
#define MOVE_GRAVAPPLE 0x2C0
#define MOVE_SPIRITBREAK 0x2C1
#define MOVE_STRANGESTEAM 0x2C2
#define MOVE_LIFEDEW 0x2C3
#define MOVE_OBSTRUCT 0x2C4
#define MOVE_FALSESURRENDER 0x2C5
#define MOVE_METEORASSAULT 0x2C6
#define MOVE_ETERNABEAM 0x2C7
#define MOVE_STEELBEAM 0x2C8
#define MOVE_CATASTROPIKA 0x2CA
#define MOVE_10000000_VOLT_THUNDERBOLT 0x2CB
#define MOVE_STOKED_SPARKSURFER 0x2CC //Paralyze Target
#define MOVE_EXTREME_EVOBOOST 0x2CD //Double Ancient Power
#define MOVE_PULVERIZING_PANCAKE 0x2CE
#define MOVE_GENESIS_SUPERNOVA 0x2CF //Sets up Psychic Terrain
#define MOVE_SINISTER_ARROW_RAID 0x2D0
#define MOVE_MALICIOUS_MOONSAULT 0x2D1
#define MOVE_OCEANIC_OPERETTA 0x2D2
#define MOVE_SPLINTERED_STORMSHARDS 0x2D3 //Removes Terrain
#define MOVE_LETS_SNUGGLE_FOREVER 0x2D4
#define MOVE_CLANGOROUS_SOULBLAZE 0x2D5 //Ancient Power
#define MOVE_GUARDIAN_OF_ALOLA 0x2D6
#define MOVE_SEARING_SUNRAZE_SMASH 0x2D7
#define MOVE_MENACING_MOONRAZE_MAELSTROM 0x2D8
#define MOVE_LIGHT_THAT_BURNS_THE_SKY 0x2D9
#define MOVE_SOUL_STEALING_7_STAR_STRIKE 0x2DA
//Z-Moves
#define MOVE_BREAKNECK_BLITZ_P 0x2C9
#define MOVE_BREAKNECK_BLITZ_S 0x2CA
#define MOVE_ALL_OUT_PUMMELING_P 0x2CB
#define MOVE_ALL_OUT_PUMMELING_S 0x2CC
#define MOVE_SUPERSONIC_SKYSTRIKE_P 0x2CD
#define MOVE_SUPERSONIC_SKYSTRIKE_S 0x2CE
#define MOVE_ACID_DOWNPOUR_P 0x2CF
#define MOVE_ACID_DOWNPOUR_S 0x2D0
#define MOVE_TECTONIC_RAGE_P 0x2D1
#define MOVE_TECTONIC_RAGE_S 0x2D2
#define MOVE_CONTINENTAL_CRUSH_P 0x2D3
#define MOVE_CONTINENTAL_CRUSH_S 0x2D4
#define MOVE_SAVAGE_SPIN_OUT_P 0x2D5
#define MOVE_SAVAGE_SPIN_OUT_S 0x2D6
#define MOVE_NEVER_ENDING_NIGHTMARE_P 0x2D7
#define MOVE_NEVER_ENDING_NIGHTMARE_S 0x2D8
#define MOVE_CORKSCREW_CRASH_P 0x2D9
#define MOVE_CORKSCREW_CRASH_S 0x2DA
#define MOVE_INFERNO_OVERDRIVE_P 0x2DB
#define MOVE_INFERNO_OVERDRIVE_S 0x2DC
#define MOVE_HYDRO_VORTEX_P 0x2DD
#define MOVE_HYDRO_VORTEX_S 0x2DE
#define MOVE_BLOOM_DOOM_P 0x2DF
#define MOVE_BLOOM_DOOM_S 0x2E0
#define MOVE_GIGAVOLT_HAVOC_P 0x2E1
#define MOVE_GIGAVOLT_HAVOC_S 0x2E2
#define MOVE_SHATTERED_PSYCHE_P 0x2E3
#define MOVE_SHATTERED_PSYCHE_S 0x2E4
#define MOVE_SUBZERO_SLAMMER_P 0x2E5
#define MOVE_SUBZERO_SLAMMER_S 0x2E6
#define MOVE_DEVASTATING_DRAKE_P 0x2E7
#define MOVE_DEVASTATING_DRAKE_S 0x2E8
#define MOVE_BLACK_HOLE_ECLIPSE_P 0x2E9
#define MOVE_BLACK_HOLE_ECLIPSE_S 0x2EA
#define MOVE_TWINKLE_TACKLE_P 0x2EB
#define MOVE_TWINKLE_TACKLE_S 0x2EC
#define FIRST_Z_MOVE MOVE_BREAKNECK_BLITZ_P
#define LAST_Z_MOVE MOVE_SOUL_STEALING_7_STAR_STRIKE
#define MOVE_CATASTROPIKA 0x2ED
#define MOVE_10000000_VOLT_THUNDERBOLT 0x2EE
#define MOVE_STOKED_SPARKSURFER 0x2EF //Paralyze Target
#define MOVE_EXTREME_EVOBOOST 0x2F0 //Double Ancient Power
#define MOVE_PULVERIZING_PANCAKE 0x2F1
#define MOVE_GENESIS_SUPERNOVA 0x2F2 //Sets up Psychic Terrain
#define MOVE_SINISTER_ARROW_RAID 0x2F3
#define MOVE_MALICIOUS_MOONSAULT 0x2F4
#define MOVE_OCEANIC_OPERETTA 0x2F5
#define MOVE_SPLINTERED_STORMSHARDS 0x2F6 //Removes Terrain
#define MOVE_LETS_SNUGGLE_FOREVER 0x2F7
#define MOVE_CLANGOROUS_SOULBLAZE 0x2F8 //Ancient Power
#define MOVE_GUARDIAN_OF_ALOLA 0x2F9
#define MOVE_SEARING_SUNRAZE_SMASH 0x2FA
#define MOVE_MENACING_MOONRAZE_MAELSTROM 0x2FB
#define MOVE_LIGHT_THAT_BURNS_THE_SKY 0x2FC
#define MOVE_SOUL_STEALING_7_STAR_STRIKE 0x2FD
#define LAST_MOVE_INDEX MOVE_SOUL_STEALING_7_STAR_STRIKE
#define MOVES_COUNT (MOVE_SOUL_STEALING_7_STAR_STRIKE + 1)
#define FIRST_Z_MOVE MOVE_BREAKNECK_BLITZ_P
#define LAST_Z_MOVE MOVE_SOUL_STEALING_7_STAR_STRIKE
//Max Moves
#define MOVE_MAX_GUARD 0x2FE
#define MOVE_MAX_STRIKE_P 0x2FF
#define MOVE_MAX_STRIKE_S 0x300
#define MOVE_MAX_KNUCKLE_P 0x301
#define MOVE_MAX_KNUCKLE_S 0x302
#define MOVE_MAX_AIRSTREAM_P 0x303
#define MOVE_MAX_AIRSTREAM_S 0x304
#define MOVE_MAX_OOZE_P 0x305
#define MOVE_MAX_OOZE_S 0x306
#define MOVE_MAX_QUAKE_P 0x307
#define MOVE_MAX_QUAKE_S 0x308
#define MOVE_MAX_ROCKFALL_P 0x309
#define MOVE_MAX_ROCKFALL_S 0x30A
#define MOVE_MAX_FLUTTERBY_P 0x30B
#define MOVE_MAX_FLUTTERBY_S 0x30C
#define MOVE_MAX_PHANTASM_P 0x30D
#define MOVE_MAX_PHANTASM_S 0x30E
#define MOVE_MAX_STEELSPIKE_P 0x30F
#define MOVE_MAX_STEELSPIKE_S 0x310
#define MOVE_MAX_FLARE_P 0x311
#define MOVE_MAX_FLARE_S 0x312
#define MOVE_MAX_GEYSER_P 0x313
#define MOVE_MAX_GEYSER_S 0x314
#define MOVE_MAX_OVERGROWTH_P 0x315
#define MOVE_MAX_OVERGROWTH_S 0x316
#define MOVE_MAX_LIGHTNING_P 0x317
#define MOVE_MAX_LIGHTNING_S 0x318
#define MOVE_MAX_MINDSTORM_P 0x319
#define MOVE_MAX_MINDSTORM_S 0x31A
#define MOVE_MAX_HAILSTORM_P 0x31B
#define MOVE_MAX_HAILSTORM_S 0x31C
#define MOVE_MAX_WYRMWIND_P 0x31D
#define MOVE_MAX_WYRMWIND_S 0x31E
#define MOVE_MAX_DARKNESS_P 0x31F
#define MOVE_MAX_DARKNESS_S 0x320
#define MOVE_MAX_STARFALL_P 0x321
#define MOVE_MAX_STARFALL_S 0x322
#define MOVE_G_MAX_WILDFIRE_P 0x323
#define MOVE_G_MAX_WILDFIRE_S 0x324
#define MOVE_G_MAX_BEFUDDLE_P 0x325
#define MOVE_G_MAX_BEFUDDLE_S 0x326
#define MOVE_G_MAX_VOLT_CRASH_P 0x327
#define MOVE_G_MAX_VOLT_CRASH_S 0x328
#define MOVE_G_MAX_GOLD_RUSH_P 0x329
#define MOVE_G_MAX_GOLD_RUSH_S 0x32A
#define MOVE_G_MAX_CHI_STRIKE_P 0x32B
#define MOVE_G_MAX_CHI_STRIKE_S 0x32C
#define MOVE_G_MAX_TERROR_P 0x32D
#define MOVE_G_MAX_TERROR_S 0x32E
#define MOVE_G_MAX_FOAM_BURST_P 0x32F
#define MOVE_G_MAX_FOAM_BURST_S 0x330
#define MOVE_G_MAX_RESONANCE_P 0x331
#define MOVE_G_MAX_RESONANCE_S 0x332
#define MOVE_G_MAX_CUDDLE_P 0x333
#define MOVE_G_MAX_CUDDLE_S 0x334
#define MOVE_G_MAX_REPLENISH_P 0x335
#define MOVE_G_MAX_REPLENISH_S 0x336
#define MOVE_G_MAX_MALODOR_P 0x337
#define MOVE_G_MAX_MALODOR_S 0x338
#define MOVE_G_MAX_MELTDOWN_P 0x339
#define MOVE_G_MAX_MELTDOWN_S 0x33A
#define MOVE_G_MAX_STONESURGE_P 0x33B
#define MOVE_G_MAX_STONESURGE_S 0x33C
#define MOVE_G_MAX_WIND_RAGE_P 0x33D
#define MOVE_G_MAX_WIND_RAGE_S 0x33E
#define MOVE_G_MAX_STUN_SHOCK_P 0x33F
#define MOVE_G_MAX_STUN_SHOCK_S 0x340
#define MOVE_G_MAX_FINALE_P 0x341
#define MOVE_G_MAX_FINALE_S 0x342
#define MOVE_G_MAX_DEPLETION_P 0x343
#define MOVE_G_MAX_DEPLETION_S 0x344
#define MOVE_G_MAX_GRAVITAS_P 0x345
#define MOVE_G_MAX_GRAVITAS_S 0x346
#define MOVE_G_MAX_VOLCALITH_P 0x347
#define MOVE_G_MAX_VOLCALITH_S 0x348
#define MOVE_G_MAX_SANDBLAST_P 0x349
#define MOVE_G_MAX_SANDBLAST_S 0x34A
#define MOVE_G_MAX_SNOOZE_P 0x34B
#define MOVE_G_MAX_SNOOZE_S 0x34C
#define MOVE_G_MAX_TARTNESS_P 0x34D
#define MOVE_G_MAX_TARTNESS_S 0x34E
#define MOVE_G_MAX_SWEETNESS_P 0x34F
#define MOVE_G_MAX_SWEETNESS_S 0x350
#define MOVE_G_MAX_SMITE_P 0x351
#define MOVE_G_MAX_SMITE_S 0x352
#define MOVE_G_MAX_STEELSURGE_P 0x353
#define MOVE_G_MAX_STEELSURGE_S 0x354
#define MOVE_G_MAX_CENTIFERNO_P 0x355
#define MOVE_G_MAX_CENTIFERNO_S 0x356
#define FIRST_MAX_MOVE MOVE_MAX_GUARD
#define LAST_MAX_MOVE MOVE_MAX_STARFALL_S
#define FIRST_G_MAX_MOVE MOVE_G_MAX_WILDFIRE_P
#define LAST_G_MAX_MOVE MOVE_G_MAX_CENTIFERNO_S
#define LAST_MOVE_INDEX MOVE_G_MAX_CENTIFERNO_S
#define MOVES_COUNT (MOVE_G_MAX_CENTIFERNO_S + 1)
#define NON_Z_MOVE_COUNT (MOVE_STEELBEAM + 1)

View File

@ -1,8 +1,9 @@
#include "src/defines.h"
##Repoints all pointers found at given location
##(Eg. repoints pointer located at 0x8016364 which is 0x81D65A8 in vanilla, does not repoint 0x8016364)
gSpeciesNames 08000144
gBaseStats 080001BC
gLevelUpLearnsets 0803EA7C
gEggMoves 08045C50
gTMHMLearnsets 08043C68
gTutorLearnsets 08120C30
@ -32,4 +33,8 @@ gMonIconPaletteIndices 0800013C
gItemAnimationTable 0812EAE0
gTMHMMoves 08125A8C
gMoveTutorMoves 08120BE4
gMoveTutorMoves 08120BE4
#ifdef EXPAND_LEARNSETS
gLevelUpLearnsets 0803EA7C
#endif

View File

@ -10134,7 +10134,7 @@ const struct BaseStats gBaseStats[] =
.friendship = 70,
.growthRate = GROWTH_MEDIUM_SLOW,
.eggGroup1 = EGG_GROUP_BUG,
.eggGroup2 = EGG_GROUP_BUG,
.eggGroup2 = EGG_GROUP_DRAGON,
.ability1 = ABILITY_HYPERCUTTER,
.ability2 = ABILITY_ARENATRAP,
.safariZoneFleeRate = 0,
@ -10167,7 +10167,7 @@ const struct BaseStats gBaseStats[] =
.friendship = 70,
.growthRate = GROWTH_MEDIUM_SLOW,
.eggGroup1 = EGG_GROUP_BUG,
.eggGroup2 = EGG_GROUP_BUG,
.eggGroup2 = EGG_GROUP_DRAGON,
.ability1 = ABILITY_LEVITATE,
.ability2 = ABILITY_LEVITATE,
.safariZoneFleeRate = 0,
@ -10200,7 +10200,7 @@ const struct BaseStats gBaseStats[] =
.friendship = 70,
.growthRate = GROWTH_MEDIUM_SLOW,
.eggGroup1 = EGG_GROUP_BUG,
.eggGroup2 = EGG_GROUP_BUG,
.eggGroup2 = EGG_GROUP_DRAGON,
.ability1 = ABILITY_LEVITATE,
.ability2 = ABILITY_LEVITATE,
.safariZoneFleeRate = 0,
@ -10927,7 +10927,7 @@ const struct BaseStats gBaseStats[] =
.growthRate = GROWTH_MEDIUM_FAST,
.eggGroup1 = EGG_GROUP_HUMAN_LIKE,
.eggGroup2 = EGG_GROUP_HUMAN_LIKE,
.ability1 = ABILITY_PUREPOWER,
.ability1 = ABILITY_HUGEPOWER, //ABILITY_PUREPOWER
.ability2 = ABILITY_NONE,
.safariZoneFleeRate = 90,
.hiddenAbility = ABILITY_TELEPATHY,
@ -10960,7 +10960,7 @@ const struct BaseStats gBaseStats[] =
.growthRate = GROWTH_MEDIUM_FAST,
.eggGroup1 = EGG_GROUP_HUMAN_LIKE,
.eggGroup2 = EGG_GROUP_HUMAN_LIKE,
.ability1 = ABILITY_PUREPOWER,
.ability1 = ABILITY_HUGEPOWER, //ABILITY_PUREPOWER
.ability2 = ABILITY_NONE,
.safariZoneFleeRate = 60,
.hiddenAbility = ABILITY_TELEPATHY,
@ -12114,7 +12114,7 @@ const struct BaseStats gBaseStats[] =
.friendship = 35,
.growthRate = GROWTH_SLOW,
.eggGroup1 = EGG_GROUP_AMORPHOUS,
.eggGroup2 = EGG_GROUP_AMORPHOUS,
.eggGroup2 = EGG_GROUP_HUMAN_LIKE,
.ability1 = ABILITY_SYNCHRONIZE,
.ability2 = ABILITY_TRACE,
.safariZoneFleeRate = 0,
@ -12147,7 +12147,7 @@ const struct BaseStats gBaseStats[] =
.friendship = 35,
.growthRate = GROWTH_SLOW,
.eggGroup1 = EGG_GROUP_AMORPHOUS,
.eggGroup2 = EGG_GROUP_AMORPHOUS,
.eggGroup2 = EGG_GROUP_HUMAN_LIKE,
.ability1 = ABILITY_SYNCHRONIZE,
.ability2 = ABILITY_TRACE,
.safariZoneFleeRate = 0,
@ -12180,7 +12180,7 @@ const struct BaseStats gBaseStats[] =
.friendship = 35,
.growthRate = GROWTH_SLOW,
.eggGroup1 = EGG_GROUP_AMORPHOUS,
.eggGroup2 = EGG_GROUP_AMORPHOUS,
.eggGroup2 = EGG_GROUP_HUMAN_LIKE,
.ability1 = ABILITY_SYNCHRONIZE,
.ability2 = ABILITY_TRACE,
.safariZoneFleeRate = 0,
@ -16602,7 +16602,7 @@ const struct BaseStats gBaseStats[] =
.friendship = 35,
.growthRate = GROWTH_SLOW,
.eggGroup1 = EGG_GROUP_AMORPHOUS,
.eggGroup2 = EGG_GROUP_AMORPHOUS,
.eggGroup2 = EGG_GROUP_HUMAN_LIKE,
.ability1 = ABILITY_STEADFAST,
.ability2 = ABILITY_NONE,
.safariZoneFleeRate = 0,
@ -25841,7 +25841,7 @@ const struct BaseStats gBaseStats[] =
.eggCycles = 20,
.friendship = 70,
.growthRate = GROWTH_MEDIUM_FAST,
.eggGroup1 = EGG_GROUP_HUMAN_LIKE,
.eggGroup1 = EGG_GROUP_FLYING,
.eggGroup2 = EGG_GROUP_HUMAN_LIKE,
.ability1 = ABILITY_LIMBER,
.ability2 = ABILITY_UNBURDEN,
@ -26204,8 +26204,8 @@ const struct BaseStats gBaseStats[] =
.eggCycles = 20,
.friendship = 70,
.growthRate = GROWTH_MEDIUM_FAST,
.eggGroup1 = EGG_GROUP_FIELD,
.eggGroup2 = EGG_GROUP_FIELD,
.eggGroup1 = EGG_GROUP_MONSTER,
.eggGroup2 = EGG_GROUP_MINERAL,
.ability1 = ABILITY_OWNTEMPO,
.ability2 = ABILITY_ICEBODY,
.safariZoneFleeRate = 0,
@ -26238,7 +26238,7 @@ const struct BaseStats gBaseStats[] =
.friendship = 70,
.growthRate = GROWTH_MEDIUM_FAST,
.eggGroup1 = EGG_GROUP_MONSTER,
.eggGroup2 = EGG_GROUP_MONSTER,
.eggGroup2 = EGG_GROUP_MINERAL,
.ability1 = ABILITY_OWNTEMPO,
.ability2 = ABILITY_ICEBODY,
.safariZoneFleeRate = 0,
@ -26271,7 +26271,7 @@ const struct BaseStats gBaseStats[] =
.friendship = 70,
.growthRate = GROWTH_MEDIUM_FAST,
.eggGroup1 = EGG_GROUP_FLYING,
.eggGroup2 = EGG_GROUP_FLYING,
.eggGroup2 = EGG_GROUP_DRAGON,
.ability1 = ABILITY_FRISK,
.ability2 = ABILITY_INFILTRATOR,
.safariZoneFleeRate = 0,
@ -26304,7 +26304,7 @@ const struct BaseStats gBaseStats[] =
.friendship = 70,
.growthRate = GROWTH_MEDIUM_FAST,
.eggGroup1 = EGG_GROUP_FLYING,
.eggGroup2 = EGG_GROUP_FLYING,
.eggGroup2 = EGG_GROUP_DRAGON,
.ability1 = ABILITY_FRISK,
.ability2 = ABILITY_INFILTRATOR,
.safariZoneFleeRate = 0,
@ -28747,7 +28747,7 @@ const struct BaseStats gBaseStats[] =
.growthRate = GROWTH_MEDIUM_FAST,
.eggGroup1 = EGG_GROUP_HUMAN_LIKE,
.eggGroup2 = EGG_GROUP_HUMAN_LIKE,
.ability1 = ABILITY_PUREPOWER,
.ability1 = ABILITY_HUGEPOWER, //ABILITY_PUREPOWER
.ability2 = ABILITY_NONE,
.safariZoneFleeRate = 0,
.hiddenAbility = ABILITY_NONE,
@ -31552,7 +31552,7 @@ const struct BaseStats gBaseStats[] =
.growthRate = GROWTH_MEDIUM_FAST,
.eggGroup1 = EGG_GROUP_BUG,
.eggGroup2 = EGG_GROUP_WATER_3,
.ability1 = ABILITY_WIMPOUT,
.ability1 = ABILITY_EMERGENCYEXIT, //ABILITY_WIMP_OUT
.ability2 = ABILITY_NONE,
.safariZoneFleeRate = 0,
.hiddenAbility = ABILITY_NONE,
@ -32344,7 +32344,7 @@ const struct BaseStats gBaseStats[] =
.growthRate = GROWTH_SLOW,
.eggGroup1 = EGG_GROUP_UNDISCOVERED,
.eggGroup2 = EGG_GROUP_UNDISCOVERED,
.ability1 = ABILITY_FULLMETALBODY,
.ability1 = ABILITY_CLEARBODY, //ABILITY_FULLMETALBODY,
.ability2 = ABILITY_NONE,
.safariZoneFleeRate = 0,
.hiddenAbility = ABILITY_NONE,

View File

@ -57,7 +57,8 @@ const u16 gEggMoves[] =
MOVE_WATERSPOUT,
MOVE_BRINE,
MOVE_DRAGONPULSE,
MOVE_AURASPHERE),
MOVE_AURASPHERE,
MOVE_LIFEDEW),
egg_moves(PIDGEY,
MOVE_PURSUIT,
@ -169,7 +170,8 @@ const u16 gEggMoves[] =
MOVE_SECRETPOWER,
MOVE_HEX,
MOVE_TAILSLAP,
MOVE_CAPTIVATE),
MOVE_CAPTIVATE,
MOVE_MEMENTO),
egg_moves(ODDISH,
MOVE_RAZORLEAF,
@ -182,7 +184,8 @@ const u16 gEggMoves[] =
MOVE_SECRETPOWER,
MOVE_NATUREPOWER,
MOVE_AFTERYOU,
MOVE_STRENGTHSAP),
MOVE_STRENGTHSAP,
MOVE_LEECHSEED),
egg_moves(PARAS,
MOVE_SCREECH,
@ -243,7 +246,8 @@ const u16 gEggMoves[] =
MOVE_TAILWHIP,
MOVE_SNATCH,
MOVE_IRONTAIL,
MOVE_FOULPLAY),
MOVE_FOULPLAY,
MOVE_COVET),
egg_moves(PSYDUCK,
MOVE_HYPNOSIS,
@ -426,7 +430,8 @@ const u16 gEggMoves[] =
MOVE_TRUMPCARD,
MOVE_SIMPLEBEAM,
MOVE_FIRSTIMPRESSION,
MOVE_FINALGAMBIT),
MOVE_FINALGAMBIT,
MOVE_SKYATTACK),
egg_moves(DODUO,
MOVE_QUICKATTACK,
@ -486,7 +491,8 @@ const u16 gEggMoves[] =
MOVE_WATERPULSE,
MOVE_AQUARING,
MOVE_AVALANCHE,
MOVE_TWINEEDLE),
MOVE_TWINEEDLE,
MOVE_LIFEDEW),
egg_moves(GASTLY,
MOVE_PSYWAVE,
@ -513,7 +519,8 @@ const u16 gEggMoves[] =
MOVE_HEAVYSLAM,
MOVE_STEALTHROCK,
MOVE_ROTOTILLER,
MOVE_WIDEGUARD),
MOVE_WIDEGUARD,
MOVE_HEADSMASH),
egg_moves(DROWZEE,
MOVE_BARRIER,
@ -542,7 +549,10 @@ const u16 gEggMoves[] =
MOVE_AGILITY,
MOVE_ENDURE,
MOVE_CHIPAWAY,
MOVE_BIDE),
MOVE_BIDE,
MOVE_HAMMERARM,
MOVE_SLASH,
MOVE_NIGHTSLASH),
egg_moves(EXEGGCUTE,
MOVE_SYNTHESIS,
@ -690,7 +700,8 @@ const u16 gEggMoves[] =
MOVE_BODYSLAM,
MOVE_MUDSHOT,
MOVE_SKULLBASH,
MOVE_SIGNALBEAM),
MOVE_SIGNALBEAM,
MOVE_ACUPRESSURE),
egg_moves(MR_MIME,
MOVE_FUTURESIGHT,
@ -705,7 +716,8 @@ const u16 gEggMoves[] =
MOVE_POWERSPLIT,
MOVE_MAGICROOM,
MOVE_ICYWIND,
MOVE_PSYCHICTERRAIN),
MOVE_PSYCHICTERRAIN,
MOVE_TICKLE),
egg_moves(SCYTHER,
MOVE_COUNTER,
@ -745,7 +757,8 @@ const u16 gEggMoves[] =
MOVE_DRAGONPULSE,
MOVE_AVALANCHE,
MOVE_FUTURESIGHT,
MOVE_FREEZEDRY),
MOVE_FREEZEDRY,
MOVE_SPARKLINGARIA),
egg_moves(EEVEE,
MOVE_CHARM,
@ -761,7 +774,9 @@ const u16 gEggMoves[] =
MOVE_NATURALGIFT,
MOVE_STOREDPOWER,
MOVE_SYNCHRONOISE,
MOVE_CAPTIVATE),
MOVE_CAPTIVATE,
MOVE_DOUBLEKICK,
MOVE_MUDSLAP),
egg_moves(OMANYTE,
MOVE_BUBBLEBEAM,
@ -817,7 +832,8 @@ const u16 gEggMoves[] =
MOVE_NATURALGIFT,
MOVE_AFTERYOU,
MOVE_BELCH,
MOVE_POWERUPPUNCH),
MOVE_POWERUPPUNCH,
MOVE_GASTROACID),
egg_moves(DRATINI,
MOVE_MIST,
@ -1014,7 +1030,8 @@ const u16 gEggMoves[] =
MOVE_EXTRASENSORY,
MOVE_SECRETPOWER,
MOVE_STOREDPOWER,
MOVE_MORNINGSUN),
MOVE_MORNINGSUN,
MOVE_AERIALACE),
egg_moves(NATU,
MOVE_HAZE,
@ -1280,7 +1297,9 @@ const u16 gEggMoves[] =
MOVE_MUDSLAP,
MOVE_ACID,
MOVE_ROCKBLAST,
MOVE_FINALGAMBIT),
MOVE_FINALGAMBIT,
MOVE_DEFENSECURL,
MOVE_COVET),
egg_moves(HERACROSS,
MOVE_HARDEN,
@ -1407,7 +1426,8 @@ const u16 gEggMoves[] =
MOVE_FREEZEDRY,
MOVE_DESTINYBOND,
MOVE_SPIKES,
MOVE_COUNTER),
MOVE_COUNTER,
MOVE_MEMENTO),
egg_moves(MANTINE,
MOVE_TWISTER,
@ -1419,7 +1439,9 @@ const u16 gEggMoves[] =
MOVE_WATERSPORT,
MOVE_SPLASH,
MOVE_WIDEGUARD,
MOVE_AMNESIA),
MOVE_AMNESIA,
MOVE_TAILWIND,
MOVE_CONFUSERAY),
egg_moves(SKARMORY,
MOVE_DRILLPECK,
@ -1663,7 +1685,8 @@ const u16 gEggMoves[] =
MOVE_FOULPLAY,
MOVE_BEATUP,
MOVE_BULLETSEED,
MOVE_GRASSYTERRAIN),
MOVE_GRASSYTERRAIN,
MOVE_NIGHTSLASH),
egg_moves(NINCADA,
MOVE_ENDURE,
@ -1673,7 +1696,8 @@ const u16 gEggMoves[] =
MOVE_BUGBUZZ,
MOVE_NIGHTSLASH,
MOVE_BUGBITE,
MOVE_FINALGAMBIT),
MOVE_FINALGAMBIT,
MOVE_FLAIL),
egg_moves(TAILLOW,
MOVE_PURSUIT,
@ -1810,7 +1834,9 @@ const u16 gEggMoves[] =
MOVE_SKULLBASH,
MOVE_FLAMEBURST,
MOVE_CLEARSMOG,
MOVE_SUPERPOWER),
MOVE_SUPERPOWER,
MOVE_FLAIL,
MOVE_ANCIENTPOWER),
egg_moves(SABLEYE,
MOVE_RECOVER,
@ -1862,7 +1888,8 @@ const u16 gEggMoves[] =
MOVE_CHIPAWAY,
MOVE_DOUBLEEDGE,
MOVE_AQUAJET,
MOVE_SWITCHEROO),
MOVE_SWITCHEROO,
MOVE_SLASH),
egg_moves(FEEBAS,
MOVE_MIRRORCOAT,
@ -1996,7 +2023,8 @@ const u16 gEggMoves[] =
MOVE_AVALANCHE,
MOVE_HEX,
MOVE_FAKETEARS,
MOVE_SWITCHEROO),
MOVE_SWITCHEROO,
MOVE_ICICLECRASH),
egg_moves(AZURILL,
MOVE_ENCORE,
@ -2117,7 +2145,8 @@ const u16 gEggMoves[] =
MOVE_NATURALGIFT,
MOVE_GRASSWHISTLE,
MOVE_BULLETSEED,
MOVE_POWERWHIP),
MOVE_POWERWHIP,
MOVE_EXTRASENSORY),
egg_moves(SLAKOTH,
MOVE_PURSUIT,
@ -2338,7 +2367,8 @@ const u16 gEggMoves[] =
MOVE_ENCORE,
MOVE_SYNCHRONOISE,
MOVE_SKILLSWAP,
MOVE_MISTYTERRAIN),
MOVE_MISTYTERRAIN,
MOVE_KNOCKOFF),
egg_moves(BAGON,
MOVE_HYDROPUMP,
@ -2735,7 +2765,8 @@ const u16 gEggMoves[] =
MOVE_NATURALGIFT,
MOVE_AFTERYOU,
MOVE_SELFDESTRUCT,
MOVE_BELCH),
MOVE_BELCH,
MOVE_FISSURE),
egg_moves(RIOLU,
MOVE_CROSSCHOP,
@ -2753,7 +2784,8 @@ const u16 gEggMoves[] =
MOVE_BULLETPUNCH,
MOVE_FOLLOWME,
MOVE_CIRCLETHROW,
MOVE_METEORMASH),
MOVE_METEORMASH,
MOVE_HOWL),
egg_moves(HIPPOPOTAS,
MOVE_STOCKPILE,
@ -2838,7 +2870,8 @@ const u16 gEggMoves[] =
MOVE_SIGNALBEAM,
MOVE_WIDEGUARD,
MOVE_AMNESIA,
MOVE_TAILWIND),
MOVE_TAILWIND,
MOVE_CONFUSERAY),
egg_moves(SNOVER,
MOVE_LEECHSEED,
@ -2926,7 +2959,8 @@ const u16 gEggMoves[] =
MOVE_ENCORE,
MOVE_YAWN,
MOVE_COVET,
MOVE_COPYCAT),
MOVE_COPYCAT,
MOVE_QUICKATTACK),
egg_moves(PANSAGE,
MOVE_COVET,
@ -2990,7 +3024,8 @@ const u16 gEggMoves[] =
MOVE_WISH,
MOVE_MORNINGSUN,
MOVE_LUCKYCHANT,
MOVE_NIGHTSLASH),
MOVE_NIGHTSLASH,
MOVE_DEFOG),
egg_moves(BLITZLE,
MOVE_MEFIRST,
@ -3065,7 +3100,8 @@ const u16 gEggMoves[] =
MOVE_FORCEPALM,
MOVE_REVERSAL,
MOVE_MACHPUNCH,
MOVE_POWERUPPUNCH),
MOVE_POWERUPPUNCH,
MOVE_DEFOG),
egg_moves(TYMPOLE,
MOVE_WATERPULSE,
@ -3077,7 +3113,8 @@ const u16 gEggMoves[] =
MOVE_MIST,
MOVE_EARTHPOWER,
MOVE_AFTERYOU,
MOVE_VENOMDRENCH),
MOVE_VENOMDRENCH,
MOVE_MUDSLAP),
egg_moves(SEWADDLE,
MOVE_SILVERWIND,
@ -3110,7 +3147,8 @@ const u16 gEggMoves[] =
MOVE_SWITCHEROO,
MOVE_WORRYSEED,
MOVE_CAPTIVATE,
MOVE_MISTYTERRAIN),
MOVE_MISTYTERRAIN,
MOVE_NATUREPOWER),
egg_moves(PETILIL,
MOVE_NATURALGIFT,
@ -3134,7 +3172,8 @@ const u16 gEggMoves[] =
MOVE_RAGE,
MOVE_BRINE,
MOVE_REVENGE,
MOVE_HEADSMASH),
MOVE_HEADSMASH,
MOVE_ENDEAVOR),
egg_moves(SANDILE,
MOVE_DOUBLEEDGE,
@ -3184,7 +3223,8 @@ const u16 gEggMoves[] =
MOVE_SPIKES,
MOVE_BLOCK,
MOVE_WIDEGUARD,
MOVE_ROTOTILLER),
MOVE_ROTOTILLER,
MOVE_KNOCKOFF),
egg_moves(SCRAGGY,
MOVE_DRAINPUNCH,
@ -3286,7 +3326,8 @@ const u16 gEggMoves[] =
MOVE_CAPTIVATE,
MOVE_MEANLOOK,
MOVE_DARKPULSE,
MOVE_HEALPULSE),
MOVE_HEALPULSE,
MOVE_FAKEOUT),
egg_moves(SOLOSIS,
MOVE_NIGHTSHADE,
@ -3318,7 +3359,9 @@ const u16 gEggMoves[] =
MOVE_IRONDEFENSE,
MOVE_MAGNETRISE,
MOVE_ICESHARD,
MOVE_POWDERSNOW),
MOVE_POWDERSNOW,
MOVE_EXPLOSION,
MOVE_ICICLECRASH),
egg_moves(DEERLING,
MOVE_FAKETEARS,
@ -3354,7 +3397,8 @@ const u16 gEggMoves[] =
MOVE_BUGBITE,
MOVE_SCREECH,
MOVE_KNOCKOFF,
MOVE_DRILLRUN),
MOVE_DRILLRUN,
MOVE_NIGHTSLASH),
egg_moves(FOONGUS,
MOVE_GASTROACID,
@ -3372,7 +3416,8 @@ const u16 gEggMoves[] =
MOVE_PAINSPLIT,
MOVE_MIST,
MOVE_RECOVER,
MOVE_CONSTRICT),
MOVE_CONSTRICT,
MOVE_STRENGTHSAP),
egg_moves(ALOMOMOLA,
MOVE_PAINSPLIT,
@ -3402,7 +3447,8 @@ const u16 gEggMoves[] =
MOVE_GRAVITY,
MOVE_ROCKCLIMB,
MOVE_STEALTHROCK,
MOVE_ACIDSPRAY),
MOVE_ACIDSPRAY,
MOVE_KNOCKOFF),
egg_moves(ELGYEM,
MOVE_TELEPORT,
@ -3413,7 +3459,8 @@ const u16 gEggMoves[] =
MOVE_BARRIER,
MOVE_NASTYPLOT,
MOVE_SKILLSWAP,
MOVE_COSMICPOWER),
MOVE_COSMICPOWER,
MOVE_DESTINYBOND),
egg_moves(LITWICK,
MOVE_ACIDARMOR,
@ -3435,7 +3482,8 @@ const u16 gEggMoves[] =
MOVE_ENDEAVOR,
MOVE_IRONTAIL,
MOVE_DRAGONPULSE,
MOVE_HARDEN),
MOVE_HARDEN,
MOVE_FIRSTIMPRESSION),
egg_moves(CUBCHOO,
MOVE_YAWN,
@ -3548,7 +3596,10 @@ const u16 gEggMoves[] =
MOVE_ROCKCLIMB,
MOVE_BATONPASS,
MOVE_THUNDERFANG,
MOVE_FEINTATTACK),
MOVE_FEINTATTACK,
MOVE_FIRSTIMPRESSION,
MOVE_METALBURST,
MOVE_FLAIL),
egg_moves(DEINO,
MOVE_FIREFANG,
@ -3600,7 +3651,8 @@ const u16 gEggMoves[] =
MOVE_RAGE,
MOVE_BRINE,
MOVE_REVENGE,
MOVE_HEADSMASH),
MOVE_HEADSMASH,
MOVE_ENDEAVOR),
egg_moves(DEERLING_SUMMER,
MOVE_FAKETEARS,
@ -3712,20 +3764,23 @@ const u16 gEggMoves[] =
MOVE_TRICK,
MOVE_YAWN,
MOVE_ASSIST,
MOVE_BARRIER),
MOVE_BARRIER,
MOVE_TICKLE),
egg_moves(HONEDGE,
MOVE_METALSOUND,
MOVE_SHADOWSNEAK,
MOVE_DESTINYBOND,
MOVE_WIDEGUARD),
MOVE_WIDEGUARD,
MOVE_BLOCK),
egg_moves(SPRITZEE,
MOVE_DISABLE,
MOVE_WISH,
MOVE_CAPTIVATE,
MOVE_REFRESH,
MOVE_NASTYPLOT),
MOVE_NASTYPLOT,
MOVE_AFTERYOU),
egg_moves(SWIRLIX,
MOVE_AFTERYOU,
@ -3740,13 +3795,16 @@ const u16 gEggMoves[] =
MOVE_CAMOUFLAGE,
MOVE_FLATTER,
MOVE_DESTINYBOND,
MOVE_GUARDSWAP),
MOVE_GUARDSWAP,
MOVE_DISABLE,
MOVE_ACUPRESSURE),
egg_moves(BINACLE,
MOVE_TICKLE,
MOVE_SWITCHEROO,
MOVE_HELPINGHAND,
MOVE_WATERSPORT),
MOVE_WATERSPORT,
MOVE_NIGHTSLASH),
egg_moves(SKRELP,
MOVE_TOXICSPIKES,
@ -3766,7 +3824,9 @@ const u16 gEggMoves[] =
MOVE_AGILITY,
MOVE_GLARE,
MOVE_CAMOUFLAGE,
MOVE_ELECTRICTERRAIN),
MOVE_ELECTRICTERRAIN,
MOVE_DRAGONRUSH,
MOVE_DRAGONTAIL),
egg_moves(TYRUNT,
MOVE_DRAGONDANCE,
@ -3791,7 +3851,10 @@ const u16 gEggMoves[] =
MOVE_MUDSPORT,
MOVE_BATONPASS,
MOVE_QUICKGUARD,
MOVE_FEINT),
MOVE_FEINT,
MOVE_DEFOG,
MOVE_MEANLOOK,
MOVE_CROSSCHOP),
egg_moves(DEDENNE,
MOVE_EERIEIMPULSE,
@ -3806,7 +3869,8 @@ const u16 gEggMoves[] =
MOVE_IRONTAIL,
MOVE_POISONTAIL,
MOVE_COUNTER,
MOVE_ENDURE),
MOVE_ENDURE,
MOVE_LIFEDEW),
egg_moves(KLEFKI,
MOVE_SWITCHEROO,
@ -3819,7 +3883,9 @@ const u16 gEggMoves[] =
MOVE_BESTOW,
MOVE_IMPRISON,
MOVE_VENOMDRENCH,
MOVE_POWERUPPUNCH),
MOVE_POWERUPPUNCH,
MOVE_SUCKERPUNCH,
MOVE_DISABLE),
egg_moves(PUMPKABOO,
MOVE_DISABLE,
@ -3837,7 +3903,9 @@ const u16 gEggMoves[] =
MOVE_SWITCHEROO,
MOVE_SNATCH,
MOVE_OUTRAGE,
MOVE_TAILWIND),
MOVE_TAILWIND,
MOVE_DEFOG,
MOVE_DRAGONRUSH),
egg_moves(FLABEBE_BLUE,
MOVE_COPYCAT,
@ -3887,7 +3955,8 @@ const u16 gEggMoves[] =
MOVE_OMINOUSWIND,
MOVE_HAZE,
MOVE_BATONPASS,
MOVE_DEFOG),
MOVE_DEFOG,
MOVE_KNOCKOFF),
egg_moves(LITTEN,
MOVE_NASTYPLOT,
@ -3896,7 +3965,8 @@ const u16 gEggMoves[] =
MOVE_FAKEOUT,
MOVE_REVENGE,
MOVE_HEATWAVE,
MOVE_POWERTRIP),
MOVE_POWERTRIP,
MOVE_PARTINGSHOT),
egg_moves(POPPLIO,
MOVE_CHARM,
@ -3904,7 +3974,8 @@ const u16 gEggMoves[] =
MOVE_AQUARING,
MOVE_AROMATICMIST,
MOVE_PERISHSONG,
MOVE_WONDERROOM),
MOVE_WONDERROOM,
MOVE_LIFEDEW),
egg_moves(PIKIPEK,
MOVE_BRAVEBIRD,
@ -3923,7 +3994,8 @@ const u16 gEggMoves[] =
MOVE_HARDEN,
MOVE_ELECTROWEB,
MOVE_MUDSHOT,
MOVE_ENDURE),
MOVE_ENDURE,
MOVE_DISCHARGE),
egg_moves(CRABRAWLER,
MOVE_WIDEGUARD,
@ -3944,7 +4016,8 @@ const u16 gEggMoves[] =
MOVE_BESTOW,
MOVE_MOONBLAST,
MOVE_POWDER,
MOVE_STICKYWEB),
MOVE_STICKYWEB,
MOVE_AROMATICMIST),
egg_moves(ROCKRUFF,
MOVE_CRUSHCLAW,
@ -3971,7 +4044,8 @@ const u16 gEggMoves[] =
MOVE_DOUBLEEDGE,
MOVE_MAGNITUDE,
MOVE_CLOSECOMBAT,
MOVE_MUDBOMB),
MOVE_MUDBOMB,
MOVE_FISSURE),
egg_moves(DEWPIDER,
MOVE_POWERSPLIT,
@ -3999,7 +4073,8 @@ const u16 gEggMoves[] =
MOVE_KNOCKOFF,
MOVE_SANDATTACK,
MOVE_SNATCH,
MOVE_FAKEOUT),
MOVE_FAKEOUT,
MOVE_MUDSLAP),
egg_moves(STUFFUL,
MOVE_ICEPUNCH,
@ -4008,7 +4083,10 @@ const u16 gEggMoves[] =
MOVE_ENDURE,
MOVE_WIDEGUARD,
MOVE_MEGAKICK,
MOVE_STOMPINGTANTRUM),
MOVE_STOMPINGTANTRUM,
MOVE_ROLLOUT,
MOVE_DEFENSECURL,
MOVE_STOMP),
egg_moves(BOUNSWEET,
MOVE_GRASSWHISTLE,
@ -4016,7 +4094,8 @@ const u16 gEggMoves[] =
MOVE_PLAYROUGH,
MOVE_FEINT,
MOVE_CHARM,
MOVE_ACUPRESSURE),
MOVE_ACUPRESSURE,
MOVE_ENDEAVOR),
egg_moves(COMFEY,
MOVE_ENDURE,
@ -4027,7 +4106,10 @@ const u16 gEggMoves[] =
egg_moves(ORANGURU,
MOVE_EXTRASENSORY,
MOVE_WONDERROOM,
MOVE_PSYCHICTERRAIN),
MOVE_PSYCHICTERRAIN,
MOVE_YAWN,
MOVE_LASTRESORT,
MOVE_DREAMEATER),
egg_moves(PASSIMIAN,
MOVE_SEISMICTOSS,
@ -4035,14 +4117,17 @@ const u16 gEggMoves[] =
MOVE_QUICKGUARD,
MOVE_IRONHEAD,
MOVE_QUICKATTACK,
MOVE_FEINT),
MOVE_FEINT,
MOVE_COUNTER,
MOVE_KNOCKOFF),
egg_moves(WIMPOD,
MOVE_SPIKES,
MOVE_METALCLAW,
MOVE_WIDEGUARD,
MOVE_HARDEN,
MOVE_AQUAJET),
MOVE_AQUAJET,
MOVE_ROLLOUT),
egg_moves(SANDYGAST,
MOVE_AMNESIA,
@ -4058,7 +4143,8 @@ const u16 gEggMoves[] =
MOVE_VENOMDRENCH,
MOVE_BESTOW,
MOVE_TICKLE,
MOVE_SPITE),
MOVE_SPITE,
MOVE_MIRRORCOAT),
egg_moves(KOMALA,
MOVE_CHARM,
@ -4070,7 +4156,9 @@ const u16 gEggMoves[] =
MOVE_WIDEGUARD,
MOVE_REVENGE,
MOVE_HEADSMASH,
MOVE_FIRESPIN),
MOVE_FIRESPIN,
MOVE_RAPIDSPIN,
MOVE_CURSE),
egg_moves(TOGEDEMARU,
MOVE_REVERSAL,
@ -4100,7 +4188,8 @@ const u16 gEggMoves[] =
MOVE_DRAGONRUSH,
MOVE_RAZORWIND,
MOVE_MIST,
MOVE_PLAYROUGH),
MOVE_PLAYROUGH,
MOVE_TICKLE),
egg_moves(JANGMO_O,
MOVE_COUNTER,

View File

@ -13,9 +13,11 @@
#define SPECIES_TABLES_TERMIN 0xFEFE
//CHANGE THESE IF YOU WANT
//#define EXPAND_LEARNSETS //Uncomment this line if you'd prefer to expand movesets here as opposed to the CFRU.
#define EXPAND_LEARNSETS //If you're using this feature, make sure you insert the Complete Fire Red Upgrade
// afterwards or the game will crash when selecting certain Pokemon. Comment out this
// line if you're using the CFRU to expand movesets.
//#define INCLUDE_FOOTPRINTS //If you uncomment this line, make sure to uncomment gMonFootprintTable in "repoints", and remove the footprint remover in "bytereplacement"
#define NUM_TMSHMS 128
#define NUM_MOVE_TUTOR_MOVES 64
#define NUM_MOVE_TUTOR_MOVES 64

View File

@ -88,10 +88,6 @@ VANILLISH
VANILLUXE
CUBCHOO
BEARTIC
TERRAKION
KYUREM
KYUREM_BLACK
KYUREM_WHITE
BARBARACLE
TYRANTRUM
AMAURA

View File

@ -21,4 +21,22 @@ BRAIXEN
DELPHOX
LITTEN
TORRACAT
INCINEROAR
INCINEROAR
SILVALLY
SILVALLY_FIGHT
SILVALLY_FLYING
SILVALLY_POISON
SILVALLY_GROUND
SILVALLY_ROCK
SILVALLY_BUG
SILVALLY_GHOST
SILVALLY_STEEL
SILVALLY_FIRE
SILVALLY_WATER
SILVALLY_GRASS
SILVALLY_ELECTRIC
SILVALLY_PSYCHIC
SILVALLY_ICE
SILVALLY_DRAGON
SILVALLY_DARK
SILVALLY_FAIRY

View File

@ -22,4 +22,22 @@ GRENINJA
ASHGRENINJA
POPPLIO
BRIONNE
PRIMARINA
PRIMARINA
SILVALLY
SILVALLY_FIGHT
SILVALLY_FLYING
SILVALLY_POISON
SILVALLY_GROUND
SILVALLY_ROCK
SILVALLY_BUG
SILVALLY_GHOST
SILVALLY_STEEL
SILVALLY_FIRE
SILVALLY_WATER
SILVALLY_GRASS
SILVALLY_ELECTRIC
SILVALLY_PSYCHIC
SILVALLY_ICE
SILVALLY_DRAGON
SILVALLY_DARK
SILVALLY_FAIRY