diff --git a/src/data/egg-moves.ts b/src/data/egg-moves.ts
index 10a35f84afe..7af6ceb0afc 100644
--- a/src/data/egg-moves.ts
+++ b/src/data/egg-moves.ts
@@ -6,11 +6,11 @@ import * as Utils from "../utils";
 
 export const speciesEggMoves = {
   [Species.BULBASAUR]: [ Moves.GIGA_DRAIN, Moves.SLUDGE_BOMB, Moves.WEATHER_BALL, Moves.STRENGTH_SAP ],
-  [Species.CHARMANDER]: [ Moves.DRAGON_DANCE, Moves.MORNING_SUN, Moves.FIRE_PLEDGE, Moves.SACRED_FIRE ],
+  [Species.CHARMANDER]: [ Moves.DRAGON_DANCE, Moves.MORNING_SUN, Moves.SNARL, Moves.SACRED_FIRE ],
   [Species.SQUIRTLE]: [ Moves.BODY_PRESS, Moves.FLIP_TURN, Moves.BOUNCY_BUBBLE, Moves.RECOVER ],
   [Species.CATERPIE]: [ Moves.STRUGGLE_BUG, Moves.ELECTROWEB, Moves.STICKY_WEB, Moves.TAIL_GLOW ],
   [Species.WEEDLE]: [ Moves.BUG_BITE, Moves.SWORDS_DANCE, Moves.BANEFUL_BUNKER, Moves.BARB_BARRAGE ],
-  [Species.PIDGEY]: [ Moves.DUAL_WINGBEAT, Moves.COVET, Moves.U_TURN, Moves.RAZOR_WIND ],
+  [Species.PIDGEY]: [ Moves.DUAL_WINGBEAT, Moves.COVET, Moves.U_TURN, Moves.BLEAKWIND_STORM ],
   [Species.RATTATA]: [ Moves.TRAILBLAZE, Moves.POISON_FANG, Moves.JAW_LOCK, Moves.EXTREME_SPEED ],
   [Species.SPEAROW]: [ Moves.FEATHER_DANCE, Moves.SNARL, Moves.PARTING_SHOT, Moves.HYPER_DRILL ],
   [Species.EKANS]: [ Moves.POISON_TAIL, Moves.SCALE_SHOT, Moves.LEECH_LIFE, Moves.SHED_TAIL ],
@@ -21,45 +21,45 @@ export const speciesEggMoves = {
   [Species.ZUBAT]: [ Moves.GLARE, Moves.BRAVE_BIRD, Moves.SLUDGE_BOMB, Moves.OBLIVION_WING ],
   [Species.ODDISH]: [ Moves.SEED_BOMB, Moves.ACID_SPRAY, Moves.STRENGTH_SAP, Moves.SPORE ],
   [Species.PARAS]: [ Moves.FIRST_IMPRESSION, Moves.DIRE_CLAW, Moves.CRABHAMMER, Moves.SHELL_SMASH ],
-  [Species.VENONAT]: [ Moves.LASER_FOCUS, Moves.SIGNAL_BEAM, Moves.TOXIC_SPIKES, Moves.POLLEN_PUFF ],
-  [Species.DIGLETT]: [ Moves.MAGNITUDE, Moves.HONE_CLAWS, Moves.TRIPLE_DIVE, Moves.POPULATION_BOMB ],
+  [Species.VENONAT]: [ Moves.TWIN_BEAM, Moves.SIGNAL_BEAM, Moves.TOXIC_SPIKES, Moves.POLLEN_PUFF ],
+  [Species.DIGLETT]: [ Moves.MUD_SHOT, Moves.HONE_CLAWS, Moves.TRIPLE_DIVE, Moves.POPULATION_BOMB ],
   [Species.MEOWTH]: [ Moves.COVET, Moves.HAPPY_HOUR, Moves.PARTING_SHOT, Moves.MAKE_IT_RAIN ],
   [Species.PSYDUCK]: [ Moves.MYSTICAL_POWER, Moves.AQUA_STEP, Moves.PSYCHIC, Moves.MIND_BLOWN ],
-  [Species.MANKEY]: [ Moves.BEAT_UP, Moves.FORESIGHT, Moves.U_TURN, Moves.PLAY_ROUGH ],
-  [Species.GROWLITHE]: [ Moves.RAGING_FURY, Moves.BOUNCE, Moves.NOBLE_ROAR, Moves.FLARE_BLITZ ],
+  [Species.MANKEY]: [ Moves.BEAT_UP, Moves.PLAY_ROUGH, Moves.TAUNT, Moves.CLOSE_COMBAT ],
+  [Species.GROWLITHE]: [ Moves.THUNDER_FANG, Moves.HYPER_VOICE, Moves.NOBLE_ROAR, Moves.RAGING_FURY ],
   [Species.POLIWAG]: [ Moves.BOUNCY_BUBBLE, Moves.FREEZE_DRY, Moves.ZEN_HEADBUTT, Moves.SURGING_STRIKES ],
   [Species.ABRA]: [ Moves.MYSTICAL_FIRE, Moves.HEX, Moves.EXPANDING_FORCE, Moves.MYSTICAL_POWER ],
   [Species.MACHOP]: [ Moves.BULLET_PUNCH, Moves.KNOCK_OFF, Moves.COACHING, Moves.WICKED_BLOW ],
   [Species.BELLSPROUT]: [ Moves.SUNNY_DAY, Moves.WEATHER_BALL, Moves.COIL, Moves.STRENGTH_SAP ],
-  [Species.TENTACOOL]: [ Moves.KNOCK_OFF, Moves.FREEZE_DRY, Moves.ACUPRESSURE, Moves.MALIGNANT_CHAIN ],
+  [Species.TENTACOOL]: [ Moves.KNOCK_OFF, Moves.WHIRLPOOL, Moves.ACUPRESSURE, Moves.MALIGNANT_CHAIN ],
   [Species.GEODUDE]: [ Moves.BODY_PRESS, Moves.CURSE, Moves.SHORE_UP, Moves.ROCK_WRECKER ],
   [Species.PONYTA]: [ Moves.HIGH_HORSEPOWER, Moves.TRAILBLAZE, Moves.MORNING_SUN, Moves.WILD_CHARGE ],
-  [Species.SLOWPOKE]: [ Moves.BOUNCY_BUBBLE, Moves.SHELL_SIDE_ARM, Moves.TRICK_ROOM, Moves.EXPANDING_FORCE ],
-  [Species.MAGNEMITE]: [ Moves.STEEL_BEAM, Moves.BODY_PRESS, Moves.AUTOTOMIZE, Moves.PARABOLIC_CHARGE ],
+  [Species.SLOWPOKE]: [ Moves.BOUNCY_BUBBLE, Moves.TELEPORT, Moves.TRICK_ROOM, Moves.EXPANDING_FORCE ],
+  [Species.MAGNEMITE]: [ Moves.PARABOLIC_CHARGE, Moves.BODY_PRESS, Moves.AUTOTOMIZE, Moves.STEEL_BEAM ],
   [Species.FARFETCHD]: [ Moves.BATON_PASS, Moves.SACRED_SWORD, Moves.ROOST, Moves.VICTORY_DANCE ],
   [Species.DODUO]: [ Moves.HIGH_JUMP_KICK, Moves.PARTING_SHOT, Moves.BRAVE_BIRD, Moves.TRIPLE_ARROWS ],
   [Species.SEEL]: [ Moves.FREEZE_DRY, Moves.CHILLING_WATER, Moves.ENCORE, Moves.RECOVER ],
-  [Species.GRIMER]: [ Moves.SHADOW_SNEAK, Moves.CURSE, Moves.PAIN_SPLIT, Moves.TRANSFORM ],
+  [Species.GRIMER]: [ Moves.SHADOW_SNEAK, Moves.CURSE, Moves.CORROSIVE_GAS, Moves.PAIN_SPLIT ],
   [Species.SHELLDER]: [ Moves.BODY_PRESS, Moves.WATER_SHURIKEN, Moves.BANEFUL_BUNKER, Moves.RECOVER ],
   [Species.GASTLY]: [ Moves.CLEAR_SMOG, Moves.THIEF, Moves.NASTY_PLOT, Moves.SPECTRAL_THIEF ],
-  [Species.ONIX]: [ Moves.FLAIL, Moves.DRAGON_TAIL, Moves.HEAD_SMASH, Moves.SHORE_UP ],
-  [Species.DROWZEE]: [ Moves.DREAM_EATER, Moves.BELLY_DRUM, Moves.NIGHTMARE, Moves.DARK_VOID ],
-  [Species.KRABBY]: [ Moves.CRUSH_GRIP, Moves.SHELL_SMASH, Moves.SHORE_UP, Moves.CEASELESS_EDGE ],
-  [Species.VOLTORB]: [ Moves.CHLOROBLAST, Moves.VOLT_SWITCH, Moves.MIMIC, Moves.BUZZY_BUZZ ],
+  [Species.ONIX]: [ Moves.SHORE_UP, Moves.DRAGON_TAIL, Moves.HEAD_SMASH, Moves.BODY_PRESS ],
+  [Species.DROWZEE]: [ Moves.DREAM_EATER, Moves.METRONOME, Moves.NIGHTMARE, Moves.DARK_VOID ],
+  [Species.KRABBY]: [ Moves.CRUSH_GRIP, Moves.CEASELESS_EDGE, Moves.SHORE_UP, Moves.SHELL_SMASH ],
+  [Species.VOLTORB]: [ Moves.BUZZY_BUZZ, Moves.VOLT_SWITCH, Moves.MIMIC, Moves.SPIN_OUT ],
   [Species.EXEGGCUTE]: [ Moves.GLITZY_GLOW, Moves.CHLOROBLAST, Moves.TRICK_ROOM, Moves.JUNGLE_HEALING ],
-  [Species.CUBONE]: [ Moves.SHADOW_BONE, Moves.SUCKER_PUNCH, Moves.PAIN_SPLIT, Moves.BELLY_DRUM ],
+  [Species.CUBONE]: [ Moves.SHADOW_BONE, Moves.SUCKER_PUNCH, Moves.PAIN_SPLIT, Moves.SKULL_BASH ],
   [Species.LICKITUNG]: [ Moves.CURSE, Moves.STUFF_CHEEKS, Moves.RECYCLE, Moves.BELCH ],
   [Species.KOFFING]: [ Moves.INFESTATION, Moves.PAIN_SPLIT, Moves.CORROSIVE_GAS, Moves.GUNK_SHOT ],
-  [Species.RHYHORN]: [ Moves.DRILL_PECK, Moves.IRON_HEAD, Moves.ROCK_POLISH, Moves.HEAD_SMASH ],
-  [Species.TANGELA]: [ Moves.STRENGTH_SAP, Moves.NATURE_POWER, Moves.LEECH_SEED, Moves.LEAF_STORM ],
+  [Species.RHYHORN]: [ Moves.STOMPING_TANTRUM, Moves.IRON_HEAD, Moves.ROCK_POLISH, Moves.HEAD_SMASH ],
+  [Species.TANGELA]: [ Moves.STRENGTH_SAP, Moves.NATURE_POWER, Moves.LEECH_SEED, Moves.OCTOLOCK ],
   [Species.KANGASKHAN]: [ Moves.POWER_UP_PUNCH, Moves.SKULL_BASH, Moves.HAMMER_ARM, Moves.DOUBLE_EDGE ],
   [Species.HORSEA]: [ Moves.SNIPE_SHOT, Moves.AURORA_BEAM, Moves.SCALE_SHOT, Moves.CLANGOROUS_SOUL ],
   [Species.GOLDEEN]: [ Moves.DRILL_RUN, Moves.FLIP_TURN, Moves.AQUA_TAIL, Moves.FISHIOUS_REND ],
-  [Species.STARYU]: [ Moves.MYSTICAL_POWER, Moves.BOUNCY_BUBBLE, Moves.CONFUSE_RAY, Moves.METEOR_BEAM ],
+  [Species.STARYU]: [ Moves.METEOR_BEAM, Moves.BOUNCY_BUBBLE, Moves.CONFUSE_RAY, Moves.MYSTICAL_POWER ],
   [Species.SCYTHER]: [ Moves.DUAL_WINGBEAT, Moves.NIGHT_SLASH, Moves.HONE_CLAWS, Moves.MIGHTY_CLEAVE ],
   [Species.PINSIR]: [ Moves.CRUSH_GRIP, Moves.LUNGE, Moves.CLOSE_COMBAT, Moves.EXTREME_SPEED ],
   [Species.TAUROS]: [ Moves.HIGH_HORSEPOWER, Moves.TRAILBLAZE, Moves.SWORDS_DANCE, Moves.HEAD_CHARGE ],
-  [Species.MAGIKARP]: [ Moves.BOUNCE, Moves.EXTREME_SPEED, Moves.FLOATY_FALL, Moves.FISHIOUS_REND ],
+  [Species.MAGIKARP]: [ Moves.FLIP_TURN, Moves.BODY_SLAM, Moves.AGILITY, Moves.BOUNCE ],
   [Species.LAPRAS]: [ Moves.SPARKLING_ARIA, Moves.FREEZE_DRY, Moves.CHILLY_RECEPTION, Moves.BOOMBURST ],
   [Species.EEVEE]: [ Moves.EXTREME_SPEED, Moves.NATURE_POWER, Moves.TIDY_UP, Moves.VEEVEE_VOLLEY ],
   [Species.PORYGON]: [ Moves.PARABOLIC_CHARGE, Moves.AURA_SPHERE, Moves.TOPSY_TURVY, Moves.TECHNO_BLAST ],
@@ -74,7 +74,7 @@ export const speciesEggMoves = {
   [Species.MEW]: [ Moves.PSYSTRIKE, Moves.DECORATE, Moves.REVIVAL_BLESSING, Moves.SKETCH ],
   [Species.CHIKORITA]: [ Moves.ROCK_SLIDE, Moves.CALM_MIND, Moves.DRAGON_DANCE, Moves.MYSTICAL_FIRE ],
   [Species.CYNDAQUIL]: [ Moves.EXTRASENSORY, Moves.EARTH_POWER, Moves.FIERY_DANCE, Moves.NASTY_PLOT ],
-  [Species.TOTODILE]: [ Moves.AQUA_JET, Moves.DRAGON_DANCE, Moves.JAW_LOCK, Moves.FISHIOUS_REND ],
+  [Species.TOTODILE]: [ Moves.AQUA_JET, Moves.DRAGON_DANCE, Moves.ICE_PUNCH, Moves.WAVE_CRASH ],
   [Species.SENTRET]: [ Moves.TIDY_UP, Moves.TAIL_SLAP, Moves.EXTREME_SPEED, Moves.BELLY_DRUM ],
   [Species.HOOTHOOT]: [ Moves.CALM_MIND, Moves.ESPER_WING, Moves.FREEZING_GLARE, Moves.OBLIVION_WING ],
   [Species.LEDYBA]: [ Moves.FIRST_IMPRESSION, Moves.FLOATY_FALL, Moves.FLORAL_HEALING, Moves.SPORE ],
@@ -88,7 +88,7 @@ export const speciesEggMoves = {
   [Species.MAREEP]: [ Moves.AURORA_BEAM, Moves.BODY_PRESS, Moves.AURA_SPHERE, Moves.THUNDERCLAP ],
   [Species.HOPPIP]: [ Moves.CHLOROBLAST, Moves.TAILWIND, Moves.ESPER_WING, Moves.OBLIVION_WING ],
   [Species.AIPOM]: [ Moves.TAIL_SLAP, Moves.THUNDER_WAVE, Moves.METRONOME, Moves.SEED_BOMB ],
-  [Species.SUNKERN]: [ Moves.SPORE, Moves.BOUNCY_BUBBLE, Moves.LIGHT_SCREEN, Moves.CHLOROBLAST ],
+  [Species.SUNKERN]: [ Moves.SPORE, Moves.SAPPY_SEED, Moves.LIGHT_SCREEN, Moves.CHLOROBLAST ],
   [Species.YANMA]: [ Moves.DUAL_WINGBEAT, Moves.LEECH_LIFE, Moves.FLYING_PRESS, Moves.DRAGON_DANCE ],
   [Species.WOOPER]: [ Moves.ACID_SPRAY, Moves.RECOVER, Moves.BODY_PRESS, Moves.COSMIC_POWER ],
   [Species.MURKROW]: [ Moves.FLATTER, Moves.TAILWIND, Moves.NUZZLE, Moves.PARTING_SHOT ],
@@ -110,7 +110,7 @@ export const speciesEggMoves = {
   [Species.REMORAID]: [ Moves.TWIN_BEAM, Moves.SNIPE_SHOT, Moves.OCTOLOCK, Moves.EXPLOSION ],
   [Species.DELIBIRD]: [ Moves.POPULATION_BOMB, Moves.AURORA_VEIL, Moves.SNOWSCAPE, Moves.GLACIATE ],
   [Species.SKARMORY]: [ Moves.ROOST, Moves.BODY_PRESS, Moves.IRON_HEAD, Moves.BEHEMOTH_BASH ],
-  [Species.HOUNDOUR]: [ Moves.FIERY_WRATH, Moves.DESTINY_BOND, Moves.SLUDGE_BOMB, Moves.PARTING_SHOT ],
+  [Species.HOUNDOUR]: [ Moves.TEMPER_FLARE, Moves.DESTINY_BOND, Moves.PARTING_SHOT, Moves.FIERY_WRATH ],
   [Species.PHANPY]: [ Moves.RECOVER, Moves.ROCK_POLISH, Moves.SUBSTITUTE, Moves.HEADLONG_RUSH ],
   [Species.STANTLER]: [ Moves.HORN_LEECH, Moves.EARTHQUAKE, Moves.HEAD_CHARGE, Moves.SWORDS_DANCE ],
   [Species.TYROGUE]: [ Moves.MACH_PUNCH, Moves.RAPID_SPIN, Moves.TRIPLE_KICK, Moves.COLLISION_COURSE ],
@@ -124,7 +124,7 @@ export const speciesEggMoves = {
   [Species.LARVITAR]: [ Moves.DRAGON_DANCE, Moves.MOUNTAIN_GALE, Moves.MIGHTY_CLEAVE, Moves.RECOVER ],
   [Species.LUGIA]: [ Moves.FREEZING_GLARE, Moves.EARTH_POWER, Moves.CHILLING_WATER, Moves.OBLIVION_WING ],
   [Species.HO_OH]: [ Moves.BURNING_BULWARK, Moves.ESPER_WING, Moves.BEAK_BLAST, Moves.REVIVAL_BLESSING ],
-  [Species.CELEBI]: [ Moves.MYSTICAL_POWER, Moves.SEED_FLARE, Moves.COSMIC_POWER, Moves.ROAR_OF_TIME ],
+  [Species.CELEBI]: [ Moves.MYSTICAL_POWER, Moves.NATURE_POWER, Moves.COSMIC_POWER, Moves.SEED_FLARE ],
   [Species.TREECKO]: [ Moves.DRAGON_PULSE, Moves.PETAL_DANCE, Moves.DRAGON_CHEER, Moves.DRAGON_ENERGY ],
   [Species.TORCHIC]: [ Moves.FIRE_PUNCH, Moves.POWER_UP_PUNCH, Moves.THROAT_CHOP, Moves.COLLISION_COURSE ],
   [Species.MUDKIP]: [ Moves.POISON_JAB, Moves.WAVE_CRASH, Moves.COSMIC_POWER, Moves.HEAD_SMASH ],
@@ -143,7 +143,7 @@ export const speciesEggMoves = {
   [Species.WHISMUR]: [ Moves.ALLURING_VOICE, Moves.DOUBLE_HIT, Moves.SPARKLING_ARIA, Moves.TORCH_SONG ],
   [Species.MAKUHITA]: [ Moves.UPPER_HAND, Moves.MAT_BLOCK, Moves.DETECT, Moves.MIGHTY_CLEAVE ],
   [Species.AZURILL]: [ Moves.BOUNCY_BUBBLE, Moves.SPIRIT_BREAK, Moves.FLOATY_FALL, Moves.STRENGTH_SAP ],
-  [Species.NOSEPASS]: [ Moves.PAIN_SPLIT, Moves.SMART_STRIKE, Moves.TACHYON_CUTTER, Moves.BODY_PRESS ],
+  [Species.NOSEPASS]: [ Moves.PARABOLIC_CHARGE, Moves.BODY_PRESS, Moves.PAIN_SPLIT, Moves.STEEL_BEAM ],
   [Species.SKITTY]: [ Moves.METRONOME, Moves.ASSIST, Moves.ENTRAINMENT, Moves.SKETCH ],
   [Species.SABLEYE]: [ Moves.RAGE_FIST, Moves.TOXIC, Moves.SMART_STRIKE, Moves.KINGS_SHIELD ],
   [Species.MAWILE]: [ Moves.SPIRIT_BREAK, Moves.JAW_LOCK, Moves.HYPER_FANG, Moves.HARD_PRESS ],
@@ -155,7 +155,7 @@ export const speciesEggMoves = {
   [Species.VOLBEAT]: [ Moves.FIRE_BLAST, Moves.BOOMBURST, Moves.VOLT_SWITCH, Moves.TAKE_HEART ],
   [Species.ILLUMISE]: [ Moves.FIRE_BLAST, Moves.MOONBLAST, Moves.HEALING_WISH, Moves.TAIL_GLOW ],
   [Species.GULPIN]: [ Moves.MORTAL_SPIN, Moves.LEECH_LIFE, Moves.MIRROR_COAT, Moves.MALIGNANT_CHAIN ],
-  [Species.CARVANHA]: [ Moves.WAVE_CRASH, Moves.SCALE_SHOT, Moves.FILLET_AWAY, Moves.FISHIOUS_REND ],
+  [Species.CARVANHA]: [ Moves.JAW_LOCK, Moves.SCALE_SHOT, Moves.FILLET_AWAY, Moves.WAVE_CRASH ],
   [Species.WAILMER]: [ Moves.CURSE, Moves.STEAMROLLER, Moves.FREEZE_DRY, Moves.RECOVER ],
   [Species.NUMEL]: [ Moves.SPIKES, Moves.STEALTH_ROCK, Moves.SHORE_UP, Moves.THOUSAND_WAVES ],
   [Species.TORKOAL]: [ Moves.IRON_DEFENSE, Moves.SPIKES, Moves.BODY_PRESS, Moves.EXPLOSION ],
@@ -169,7 +169,7 @@ export const speciesEggMoves = {
   [Species.LUNATONE]: [ Moves.MOONBLAST, Moves.METEOR_BEAM, Moves.TRICK_ROOM, Moves.LUNAR_BLESSING ],
   [Species.SOLROCK]: [ Moves.FLAMETHROWER, Moves.METEOR_BEAM, Moves.TRICK_ROOM, Moves.ERUPTION ],
   [Species.BARBOACH]: [ Moves.DRAGON_DANCE, Moves.WILD_CHARGE, Moves.ROCK_SLIDE, Moves.WAVE_CRASH ],
-  [Species.CORPHISH]: [ Moves.SHELL_SMASH, Moves.BULLET_PUNCH, Moves.WAVE_CRASH, Moves.CEASELESS_EDGE ],
+  [Species.CORPHISH]: [ Moves.CEASELESS_EDGE, Moves.BULLET_PUNCH, Moves.WAVE_CRASH, Moves.SHELL_SMASH ],
   [Species.BALTOY]: [ Moves.PSYCHIC, Moves.SCORCHING_SANDS, Moves.IRON_DEFENSE, Moves.BODY_PRESS ],
   [Species.LILEEP]: [ Moves.METEOR_BEAM, Moves.STEALTH_ROCK, Moves.SPIKES, Moves.SEED_FLARE ],
   [Species.ANORITH]: [ Moves.STEALTH_ROCK, Moves.WAVE_CRASH, Moves.LEECH_LIFE, Moves.STONE_AXE ],
@@ -183,29 +183,29 @@ export const speciesEggMoves = {
   [Species.WYNAUT]: [ Moves.BATON_PASS, Moves.SUBSTITUTE, Moves.EXPLOSION, Moves.RECOVER ],
   [Species.SNORUNT]: [ Moves.FREEZY_FROST, Moves.JAW_LOCK, Moves.LAST_RESPECTS, Moves.MOONGEIST_BEAM ],
   [Species.SPHEAL]: [ Moves.AURORA_VEIL, Moves.FREEZE_DRY, Moves.WATER_PLEDGE, Moves.KINGS_SHIELD ],
-  [Species.CLAMPERL]: [ Moves.JAW_LOCK, Moves.FISHIOUS_REND, Moves.DRAINING_KISS, Moves.GEOMANCY ],
+  [Species.CLAMPERL]: [ Moves.JAW_LOCK, Moves.DRAINING_KISS, Moves.RAZOR_SHELL, Moves.WAVE_CRASH ],
   [Species.RELICANTH]: [ Moves.ROCK_POLISH, Moves.STEALTH_ROCK, Moves.ZEN_HEADBUTT, Moves.WAVE_CRASH ],
   [Species.LUVDISC]: [ Moves.ATTRACT, Moves.HEART_SWAP, Moves.BOUNCY_BUBBLE, Moves.TAKE_HEART ],
   [Species.BAGON]: [ Moves.EXTREME_SPEED, Moves.TAILWIND, Moves.KNOCK_OFF, Moves.SLACK_OFF ],
-  [Species.BELDUM]: [ Moves.PSYSHIELD_BASH, Moves.RECOVER, Moves.BODY_PRESS, Moves.GIGATON_HAMMER ],
+  [Species.BELDUM]: [ Moves.PSYSHIELD_BASH, Moves.RECOVER, Moves.BODY_PRESS, Moves.BEHEMOTH_BASH ],
   [Species.REGIROCK]: [ Moves.STONE_AXE, Moves.BODY_PRESS, Moves.GRASSY_GLIDE, Moves.ROCK_WRECKER ],
   [Species.REGICE]: [ Moves.GLACIATE, Moves.AURORA_VEIL, Moves.WAVE_CRASH, Moves.FREEZY_FROST ],
   [Species.REGISTEEL]: [ Moves.HARD_PRESS, Moves.ROCK_SLIDE, Moves.HEAT_CRASH, Moves.GIGATON_HAMMER ],
   [Species.LATIAS]: [ Moves.COSMIC_POWER, Moves.DRAGON_ENERGY, Moves.DRAINING_KISS, Moves.LUSTER_PURGE ],
   [Species.LATIOS]: [ Moves.COSMIC_POWER, Moves.DRAGON_ENERGY, Moves.OBLIVION_WING, Moves.MIST_BALL ],
-  [Species.KYOGRE]: [ Moves.FISHIOUS_REND, Moves.CHLOROBLAST, Moves.SPARKLING_ARIA, Moves.HYDRO_CANNON ],
+  [Species.KYOGRE]: [ Moves.FREEZE_DRY, Moves.HURRICANE, Moves.CALM_MIND, Moves.FISHIOUS_REND ],
   [Species.GROUDON]: [ Moves.STONE_AXE, Moves.BLAZING_TORQUE, Moves.BEHEMOTH_BASH, Moves.BLAST_BURN ],
   [Species.RAYQUAZA]: [ Moves.OBLIVION_WING, Moves.DRAGON_DARTS, Moves.ORIGIN_PULSE, Moves.PRECIPICE_BLADES ],
   [Species.JIRACHI]: [ Moves.COSMIC_POWER, Moves.SUNSTEEL_STRIKE, Moves.PHOTON_GEYSER, Moves.EERIE_SPELL ],
   [Species.DEOXYS]: [ Moves.CLOSE_COMBAT, Moves.HAZE, Moves.LEECH_LIFE, Moves.PHOTON_GEYSER ],
   [Species.TURTWIG]: [ Moves.HEADLONG_RUSH, Moves.SHELTER, Moves.BODY_PRESS, Moves.FRENZY_PLANT ],
   [Species.CHIMCHAR]: [ Moves.RAGING_FURY, Moves.BURN_UP, Moves.WORK_UP, Moves.WICKED_BLOW ],
-  [Species.PIPLUP]: [ Moves.KINGS_SHIELD, Moves.DEFEND_ORDER, Moves.ATTACK_ORDER, Moves.SUNSTEEL_STRIKE ],
+  [Species.PIPLUP]: [ Moves.KINGS_SHIELD, Moves.FLIP_TURN, Moves.NOBLE_ROAR, Moves.SUNSTEEL_STRIKE ],
   [Species.STARLY]: [ Moves.SWORDS_DANCE, Moves.OUTRAGE, Moves.FLAME_CHARGE, Moves.COLLISION_COURSE ],
   [Species.BIDOOF]: [ Moves.SUPER_FANG, Moves.LIQUIDATION, Moves.BODY_PRESS, Moves.NO_RETREAT ],
   [Species.KRICKETOT]: [ Moves.BOOMBURST, Moves.ALLURING_VOICE, Moves.SPARKLING_ARIA, Moves.QUIVER_DANCE ],
-  [Species.SHINX]: [ Moves.HOWL, Moves.JAW_LOCK, Moves.FACADE, Moves.VOLT_TACKLE ],
-  [Species.BUDEW]: [ Moves.FLORAL_HEALING, Moves.BOOMBURST, Moves.SPORE, Moves.SEED_FLARE ],
+  [Species.SHINX]: [ Moves.PSYCHIC_FANGS, Moves.JAW_LOCK, Moves.FACADE, Moves.VOLT_TACKLE ],
+  [Species.BUDEW]: [ Moves.FLORAL_HEALING, Moves.PIN_MISSILE, Moves.SPORE, Moves.SEED_FLARE ],
   [Species.CRANIDOS]: [ Moves.STONE_AXE, Moves.DRAGON_RUSH, Moves.SUPERPOWER, Moves.ROCK_WRECKER ],
   [Species.SHIELDON]: [ Moves.COSMIC_POWER, Moves.BODY_PRESS, Moves.KINGS_SHIELD, Moves.BEHEMOTH_BASH ],
   [Species.BURMY]: [ Moves.BODY_PRESS, Moves.TOXIC, Moves.RECOVER, Moves.SHELTER ],
@@ -219,7 +219,7 @@ export const speciesEggMoves = {
   [Species.GLAMEOW]: [ Moves.U_TURN, Moves.STOMPING_TANTRUM, Moves.COVET, Moves.WICKED_BLOW ],
   [Species.CHINGLING]: [ Moves.BUZZY_BUZZ, Moves.BOOMBURST, Moves.TORCH_SONG, Moves.EERIE_SPELL ],
   [Species.STUNKY]: [ Moves.CORROSIVE_GAS, Moves.BURNING_JEALOUSY, Moves.SUPER_FANG, Moves.WICKED_BLOW ],
-  [Species.BRONZOR]: [ Moves.COSMIC_POWER, Moves.TACHYON_CUTTER, Moves.MIRROR_COAT, Moves.PSYSTRIKE ],
+  [Species.BRONZOR]: [ Moves.PSYSHIELD_BASH, Moves.COSMIC_POWER, Moves.MIRROR_COAT, Moves.TACHYON_CUTTER ],
   [Species.BONSLY]: [ Moves.INGRAIN, Moves.GRASSY_GLIDE, Moves.EXTREME_SPEED, Moves.HEAD_SMASH ],
   [Species.MIME_JR]: [ Moves.CALM_MIND, Moves.ATTRACT, Moves.TAUNT, Moves.GLITZY_GLOW ],
   [Species.HAPPINY]: [ Moves.HAPPY_HOUR, Moves.SEISMIC_TOSS, Moves.STEALTH_ROCK, Moves.INSTRUCT ],
@@ -262,7 +262,7 @@ export const speciesEggMoves = {
   [Species.PANPOUR]: [ Moves.NASTY_PLOT, Moves.AURA_SPHERE, Moves.FREEZE_DRY, Moves.HYDRO_CANNON ],
   [Species.MUNNA]: [ Moves.COSMIC_POWER, Moves.AURA_SPHERE, Moves.EARTH_POWER, Moves.MYSTICAL_POWER ],
   [Species.PIDOVE]: [ Moves.SUCKER_PUNCH, Moves.TIDY_UP, Moves.COVET, Moves.FLOATY_FALL ],
-  [Species.BLITZLE]: [ Moves.VOLT_TACKLE, Moves.FLARE_BLITZ, Moves.WORK_UP, Moves.ELECTRO_DRIFT ],
+  [Species.BLITZLE]: [ Moves.HIGH_HORSEPOWER, Moves.TRAILBLAZE, Moves.WORK_UP, Moves.VOLT_TACKLE ],
   [Species.ROGGENROLA]: [ Moves.BODY_PRESS, Moves.CURSE, Moves.STONE_AXE, Moves.DIAMOND_STORM ],
   [Species.WOOBAT]: [ Moves.MYSTICAL_POWER, Moves.ESPER_WING, Moves.MYSTICAL_FIRE, Moves.OBLIVION_WING ],
   [Species.DRILBUR]: [ Moves.IRON_HEAD, Moves.HYPER_DRILL, Moves.TRAILBLAZE, Moves.BEHEMOTH_BLADE ],
@@ -283,7 +283,7 @@ export const speciesEggMoves = {
   [Species.SCRAGGY]: [ Moves.SUCKER_PUNCH, Moves.GUNK_SHOT, Moves.SHED_TAIL, Moves.ATTACK_ORDER ],
   [Species.SIGILYPH]: [ Moves.METEOR_BEAM, Moves.LUNAR_BLESSING, Moves.FREEZING_GLARE, Moves.OBLIVION_WING ],
   [Species.YAMASK]: [ Moves.RECOVER, Moves.COSMIC_POWER, Moves.AURA_SPHERE, Moves.MAKE_IT_RAIN ],
-  [Species.TIRTOUGA]: [ Moves.FISHIOUS_REND, Moves.SHELL_SIDE_ARM, Moves.JAW_LOCK, Moves.NO_RETREAT ],
+  [Species.TIRTOUGA]: [ Moves.RAZOR_SHELL, Moves.SHELL_SIDE_ARM, Moves.JAW_LOCK, Moves.NO_RETREAT ],
   [Species.ARCHEN]: [ Moves.FLOATY_FALL, Moves.HEAD_SMASH, Moves.BRAVE_BIRD, Moves.DRAGON_DANCE ],
   [Species.TRUBBISH]: [ Moves.CORROSIVE_GAS, Moves.DEFEND_ORDER, Moves.DIRE_CLAW, Moves.GIGATON_HAMMER ],
   [Species.ZORUA]: [ Moves.BADDY_BAD, Moves.EXTRASENSORY, Moves.AURA_SPHERE, Moves.TRANSFORM ],
@@ -337,7 +337,7 @@ export const speciesEggMoves = {
   [Species.FROAKIE]: [ Moves.FAKE_OUT, Moves.ICY_WIND, Moves.FLIP_TURN, Moves.SURGING_STRIKES ],
   [Species.BUNNELBY]: [ Moves.DRAIN_PUNCH, Moves.COVET, Moves.ENDEAVOR, Moves.HEADLONG_RUSH ],
   [Species.FLETCHLING]: [ Moves.BLAZING_TORQUE, Moves.U_TURN, Moves.MIRROR_MOVE, Moves.BEAK_BLAST ],
-  [Species.SCATTERBUG]: [ Moves.DECORATE, Moves.STOCKPILE, Moves.TAILWIND, Moves.LIFE_DEW ],
+  [Species.SCATTERBUG]: [ Moves.LIFE_DEW, Moves.COSMIC_POWER, Moves.TAILWIND, Moves.DECORATE ],
   [Species.LITLEO]: [ Moves.STOMPING_TANTRUM, Moves.BURN_UP, Moves.WILD_CHARGE, Moves.VICTORY_DANCE ],
   [Species.FLABEBE]: [ Moves.DECORATE, Moves.FLOWER_TRICK, Moves.FLORAL_HEALING, Moves.GLITZY_GLOW ],
   [Species.SKIDDO]: [ Moves.STOMPING_TANTRUM, Moves.GRASSY_GLIDE, Moves.GRASSY_TERRAIN, Moves.HEAD_SMASH ],
@@ -345,7 +345,7 @@ export const speciesEggMoves = {
   [Species.FURFROU]: [ Moves.POPULATION_BOMB, Moves.JAW_LOCK, Moves.FAKE_OUT, Moves.GIGA_IMPACT ],
   [Species.ESPURR]: [ Moves.GLARE, Moves.DRAINING_KISS, Moves.TWIN_BEAM, Moves.PSYSTRIKE ],
   [Species.HONEDGE]: [ Moves.TACHYON_CUTTER, Moves.PSYCHO_CUT, Moves.BITTER_BLADE, Moves.BEHEMOTH_BLADE ],
-  [Species.SPRITZEE]: [ Moves.STRANGE_STEAM, Moves.PSYSTRIKE, Moves.MOONBLAST, Moves.RELIC_SONG ],
+  [Species.SPRITZEE]: [ Moves.STRANGE_STEAM, Moves.FOUL_PLAY, Moves.LIFE_DEW, Moves.RELIC_SONG ],
   [Species.SWIRLIX]: [ Moves.TEATIME, Moves.RECYCLE, Moves.SPIRIT_BREAK, Moves.BELLY_DRUM ],
   [Species.INKAY]: [ Moves.KNOCK_OFF, Moves.LEECH_LIFE, Moves.PARTING_SHOT, Moves.HAMMER_ARM ],
   [Species.BINACLE]: [ Moves.AQUA_CUTTER, Moves.ACCELEROCK, Moves.BULK_UP, Moves.MIGHTY_CLEAVE ],
@@ -379,8 +379,8 @@ export const speciesEggMoves = {
   [Species.ORICORIO]: [ Moves.QUIVER_DANCE, Moves.FIERY_DANCE, Moves.PETAL_DANCE, Moves.LUNAR_DANCE ],
   [Species.CUTIEFLY]: [ Moves.FOLLOW_ME, Moves.TAILWIND, Moves.GRASS_WHISTLE, Moves.INSTRUCT ],
   [Species.ROCKRUFF]: [ Moves.KNOCK_OFF, Moves.BULK_UP, Moves.FLAME_CHARGE, Moves.STONE_AXE ],
-  [Species.WISHIWASHI]: [ Moves.FLIP_TURN, Moves.SCALE_SHOT, Moves.SWORDS_DANCE, Moves.FISHIOUS_REND ],
-  [Species.MAREANIE]: [ Moves.SPIKES, Moves.STEALTH_ROCK, Moves.STOCKPILE, Moves.MORTAL_SPIN ],
+  [Species.WISHIWASHI]: [ Moves.FLIP_TURN, Moves.SCALE_SHOT, Moves.SWORDS_DANCE, Moves.POPULATION_BOMB ],
+  [Species.MAREANIE]: [ Moves.SPIKES, Moves.AQUA_RING, Moves.STOCKPILE, Moves.MORTAL_SPIN ],
   [Species.MUDBRAY]: [ Moves.BODY_PRESS, Moves.YAWN, Moves.IRON_DEFENSE, Moves.RECOVER ],
   [Species.DEWPIDER]: [ Moves.STICKY_WEB, Moves.SILK_TRAP, Moves.WAVE_CRASH, Moves.HEAD_SMASH ],
   [Species.FOMANTIS]: [ Moves.SUPERPOWER, Moves.HEADLONG_RUSH, Moves.DRACO_METEOR, Moves.FLEUR_CANNON ],
@@ -400,7 +400,7 @@ export const speciesEggMoves = {
   [Species.TURTONATOR]: [ Moves.BURNING_BULWARK, Moves.BODY_PRESS, Moves.SCORCHING_SANDS, Moves.DRACO_METEOR ],
   [Species.TOGEDEMARU]: [ Moves.FAKE_OUT, Moves.PIN_MISSILE, Moves.WISH, Moves.BARB_BARRAGE ],
   [Species.MIMIKYU]: [ Moves.LEECH_LIFE, Moves.THUNDER_WAVE, Moves.WILL_O_WISP, Moves.SHADOW_FORCE ],
-  [Species.BRUXISH]: [ Moves.SUPER_FANG, Moves.PAIN_SPLIT, Moves.FLIP_TURN, Moves.FISHIOUS_REND ],
+  [Species.BRUXISH]: [ Moves.SUPER_FANG, Moves.JAW_LOCK, Moves.PAIN_SPLIT, Moves.FISHIOUS_REND ],
   [Species.DRAMPA]: [ Moves.THUNDER_WAVE, Moves.HEAT_WAVE, Moves.TAILWIND, Moves.BOOMBURST ],
   [Species.DHELMISE]: [ Moves.TOXIC, Moves.GRASSY_GLIDE, Moves.STEEL_ROLLER, Moves.SOAK ],
   [Species.JANGMO_O]: [ Moves.SCALE_SHOT, Moves.DRAGON_CHEER, Moves.AURA_SPHERE, Moves.MAT_BLOCK ],
@@ -418,7 +418,7 @@ export const speciesEggMoves = {
   [Species.GUZZLORD]: [ Moves.RECYCLE, Moves.STUFF_CHEEKS, Moves.TEATIME, Moves.SLACK_OFF ],
   [Species.NECROZMA]: [ Moves.DAZZLING_GLEAM, Moves.FLAMETHROWER, Moves.AURORA_BEAM, Moves.LIGHT_OF_RUIN ],
   [Species.MAGEARNA]: [ Moves.GEAR_GRIND, Moves.EARTH_POWER, Moves.MAKE_IT_RAIN, Moves.SPARKLY_SWIRL ],
-  [Species.MARSHADOW]: [ Moves.ATTRACT, Moves.DEFEND_ORDER, Moves.ATTACK_ORDER, Moves.NO_RETREAT ],
+  [Species.MARSHADOW]: [ Moves.POWER_UP_PUNCH, Moves.THIEF, Moves.SNATCH, Moves.NO_RETREAT ],
   [Species.POIPOLE]: [ Moves.POISON_STING, Moves.SHELL_SIDE_ARM, Moves.STICKY_WEB, Moves.DRAGON_ENERGY ],
   [Species.STAKATAKA]: [ Moves.SHELTER, Moves.SHELL_TRAP, Moves.OBSTRUCT, Moves.CRUSH_GRIP ],
   [Species.BLACEPHALON]: [ Moves.PYRO_BALL, Moves.POLLEN_PUFF, Moves.BOOMBURST, Moves.RECOVER ],
@@ -477,7 +477,7 @@ export const speciesEggMoves = {
   [Species.LECHONK]: [ Moves.PLUCK, Moves.RECYCLE, Moves.POWER_TRIP, Moves.FILLET_AWAY ],
   [Species.TAROUNTULA]: [ Moves.STEAMROLLER, Moves.LUNGE, Moves.SUCKER_PUNCH, Moves.FIRST_IMPRESSION ],
   [Species.NYMBLE]: [ Moves.POWER_UP_PUNCH, Moves.KNOCK_OFF, Moves.LEECH_LIFE, Moves.WICKED_BLOW ],
-  [Species.PAWMI]: [ Moves.VOLT_TACKLE, Moves.WISH, Moves.DRAIN_PUNCH, Moves.HAMMER_ARM ],
+  [Species.PAWMI]: [ Moves.DRAIN_PUNCH, Moves.WISH, Moves.HELPING_HAND, Moves.VOLT_TACKLE ],
   [Species.TANDEMAUS]: [ Moves.BITE, Moves.FEINT, Moves.BARRAGE, Moves.BOOMBURST ],
   [Species.FIDOUGH]: [ Moves.COPYCAT, Moves.WISH, Moves.COVET, Moves.MAGICAL_TORQUE ],
   [Species.SMOLIV]: [ Moves.STRENGTH_SAP, Moves.SYNTHESIS, Moves.WEATHER_BALL, Moves.CHLOROBLAST ],
@@ -497,7 +497,7 @@ export const speciesEggMoves = {
   [Species.TINKATINK]: [ Moves.FALSE_SURRENDER, Moves.DRAIN_PUNCH, Moves.ICE_HAMMER, Moves.NO_RETREAT ],
   [Species.WIGLETT]: [ Moves.FINAL_GAMBIT, Moves.THIEF, Moves.IRON_HEAD, Moves.SURGING_STRIKES ],
   [Species.BOMBIRDIER]: [ Moves.SKY_ATTACK, Moves.POWER_TRIP, Moves.SUCKER_PUNCH, Moves.POPULATION_BOMB ],
-  [Species.FINIZEN]: [ Moves.BOUNCE, Moves.COUNTER, Moves.BOOMBURST, Moves.FISHIOUS_REND ],
+  [Species.FINIZEN]: [ Moves.BOUNCE, Moves.DRAIN_PUNCH, Moves.COUNTER, Moves.BOOMBURST ],
   [Species.VAROOM]: [ Moves.TOXIC, Moves.GEAR_GRIND, Moves.BLAZING_TORQUE, Moves.NOXIOUS_TORQUE ],
   [Species.CYCLIZAR]: [ Moves.AQUA_TAIL, Moves.IRON_TAIL, Moves.POWER_WHIP, Moves.DRAGON_DANCE ],
   [Species.ORTHWORM]: [ Moves.METAL_BURST, Moves.COIL, Moves.BODY_PRESS, Moves.DRAGON_HAMMER ],