diff --git a/src/data/egg-moves.ts b/src/data/egg-moves.ts
index 8ef84e96d..f7964e157 100644
--- a/src/data/egg-moves.ts
+++ b/src/data/egg-moves.ts
@@ -41,7 +41,7 @@ export const speciesEggMoves = {
   [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.SHELLDER]: [ Moves.BODY_PRESS, Moves.WATER_SHURIKEN, Moves.BANEFUL_BUNKER, Moves.RECOVER ],
-  [Species.GASTLY]: [ Moves.CLEAR_SMOG, Moves.THIEF, Moves.NASTY_PLOT, Moves.NONE ],
+  [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 ],
@@ -176,7 +176,7 @@ export const speciesEggMoves = {
   [Species.FEEBAS]: [ Moves.TAILWIND, Moves.SPARKLY_SWIRL, Moves.FREEZE_DRY, Moves.BLEAKWIND_STORM ],
   [Species.CASTFORM]: [ Moves.FREEZE_DRY, Moves.ERUPTION, Moves.WATER_SPOUT, Moves.METEOR_BEAM ],
   [Species.KECLEON]: [ Moves.DRAGON_CLAW, Moves.DRAGON_DANCE, Moves.SPIRIT_BREAK, Moves.TRANSFORM ],
-  [Species.SHUPPET]: [ Moves.MORTAL_SPIN, Moves.CIRCLE_THROW, Moves.BATON_PASS, Moves.NONE ],
+  [Species.SHUPPET]: [ Moves.MORTAL_SPIN, Moves.CIRCLE_THROW, Moves.BATON_PASS, Moves.SPECTRAL_THIEF ],
   [Species.DUSKULL]: [ Moves.TAKE_HEART, Moves.SHADOW_FORCE, Moves.FREEZY_FROST, Moves.WICKED_BLOW ],
   [Species.TROPIUS]: [ Moves.LEAF_BLADE, Moves.STEEL_WING, Moves.BRAVE_BIRD, Moves.VICTORY_DANCE ],
   [Species.ABSOL]: [ Moves.KOWTOW_CLEAVE, Moves.FURY_CUTTER, Moves.PSYBLADE, Moves.CEASELESS_EDGE ],
@@ -367,7 +367,7 @@ export const speciesEggMoves = {
   [Species.YVELTAL]: [ Moves.AURA_SPHERE, Moves.FIERY_WRATH, Moves.NASTY_PLOT, Moves.WICKED_BLOW ],
   [Species.ZYGARDE]: [ Moves.RAPID_SPIN, Moves.SHED_TAIL, Moves.VICTORY_DANCE, Moves.DRAGON_ENERGY ],
   [Species.DIANCIE]: [ Moves.DECORATE, Moves.COSMIC_POWER, Moves.EARTH_POWER, Moves.SPARKLY_SWIRL ],
-  [Species.HOOPA]: [ Moves.PSYCHIC_NOISE, Moves.TOPSY_TURVY, Moves.BATON_PASS, Moves.NONE ],
+  [Species.HOOPA]: [ Moves.PSYCHIC_NOISE, Moves.TOPSY_TURVY, Moves.BATON_PASS, Moves.SPECTRAL_THIEF ],
   [Species.VOLCANION]: [ Moves.HYDRO_STEAM, Moves.HYDRO_CANNON, Moves.BLAST_BURN, Moves.METEOR_BEAM ],
   [Species.ROWLET]: [ Moves.SNIPE_SHOT, Moves.DRACO_METEOR, Moves.TRIPLE_ARROWS, Moves.THOUSAND_ARROWS ],
   [Species.LITTEN]: [ Moves.FAKE_OUT, Moves.PARTING_SHOT, Moves.PSYCHIC_FANGS, Moves.FLYING_PRESS ],
@@ -471,7 +471,7 @@ export const speciesEggMoves = {
   [Species.SPECTRIER]: [ Moves.EARTH_POWER, Moves.PSYCHIC, Moves.GLARE, Moves.ASTRAL_BARRAGE ],
   [Species.CALYREX]: [ Moves.POWER_GEM, Moves.ICE_BEAM, Moves.SHADOW_BALL, Moves.MALIGNANT_CHAIN ],
   [Species.ENAMORUS]: [ Moves.SPIRIT_BREAK, Moves.TAKE_HEART, Moves.STORED_POWER, Moves.OVERHEAT ],
-  [Species.SPRIGATITO]: [ Moves.SCALD, Moves.SEED_FLARE, Moves.TELEPORT, Moves.WICKED_BLOW ],
+  [Species.SPRIGATITO]: [ Moves.PETAL_BLIZZARD, Moves.COPYCAT, Moves.SUCKER_PUNCH, Moves.WICKED_BLOW ],
   [Species.FUECOCO]: [ Moves.EARTHQUAKE, Moves.SLACK_OFF, Moves.INFERNAL_PARADE, Moves.BELCH ],
   [Species.QUAXLY]: [ Moves.HIGH_JUMP_KICK, Moves.ROOST, Moves.REVELATION_DANCE, Moves.SURGING_STRIKES ],
   [Species.LECHONK]: [ Moves.PLUCK, Moves.RECYCLE, Moves.POWER_TRIP, Moves.FILLET_AWAY ],
@@ -481,23 +481,23 @@ export const speciesEggMoves = {
   [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 ],
-  [Species.SQUAWKABILLY]: [ Moves.PARTING_SHOT, Moves.FINAL_GAMBIT, Moves.NONE, Moves.BOOMBURST ],
+  [Species.SQUAWKABILLY]: [ Moves.PARTING_SHOT, Moves.FINAL_GAMBIT, Moves.DOUBLE_EDGE, Moves.BOOMBURST ],
   [Species.NACLI]: [ Moves.BODY_PRESS, Moves.POWER_GEM, Moves.EXPLOSION, Moves.PRECIPICE_BLADES ],
-  [Species.CHARCADET]: [ Moves.DISABLE, Moves.FLASH_CANNON, Moves.THIEF, Moves.NONE ],
+  [Species.CHARCADET]: [ Moves.DISABLE, Moves.FLASH_CANNON, Moves.THIEF, Moves.SPECTRAL_THIEF ],
   [Species.TADBULB]: [ Moves.MUDDY_WATER, Moves.PARABOLIC_CHARGE, Moves.NUZZLE, Moves.SURF ],
   [Species.WATTREL]: [ Moves.FEATHER_DANCE, Moves.WEATHER_BALL, Moves.ENDEAVOR, Moves.BOLT_BEAK ],
   [Species.MASCHIFF]: [ Moves.BADDY_BAD, Moves.RETALIATE, Moves.ENDEAVOR, Moves.PLAY_ROUGH ],
   [Species.SHROODLE]: [ Moves.COPYCAT, Moves.SUPER_FANG, Moves.TOXIC, Moves.SKETCH ],
   [Species.BRAMBLIN]: [ Moves.SHADOW_SNEAK, Moves.STRENGTH_SAP, Moves.POLTERGEIST, Moves.SAPPY_SEED ],
   [Species.TOEDSCOOL]: [ Moves.RAPID_SPIN, Moves.KNOCK_OFF, Moves.TOXIC, Moves.NOXIOUS_TORQUE ],
-  [Species.KLAWF]: [ Moves.ANCIENT_POWER, Moves.KNOCK_OFF, Moves.NONE, Moves.DIRE_CLAW ],
+  [Species.KLAWF]: [ Moves.ANCIENT_POWER, Moves.KNOCK_OFF, Moves.CRABHAMMER, Moves.DIRE_CLAW ],
   [Species.CAPSAKID]: [ Moves.RAGE_POWDER, Moves.ROLLOUT, Moves.LEECH_SEED, Moves.FIERY_DANCE ],
   [Species.RELLOR]: [ Moves.COSMIC_POWER, Moves.RECOVER, Moves.WEATHER_BALL, Moves.GLITZY_GLOW ],
   [Species.FLITTLE]: [ Moves.GLITZY_GLOW, Moves.HYPNOSIS, Moves.ROOST, Moves.OBLIVION_WING ],
   [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.NONE ],
+  [Species.FINIZEN]: [ Moves.BOUNCE, Moves.COUNTER, Moves.BOOMBURST, Moves.FISHIOUS_REND ],
   [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 ],
@@ -513,20 +513,20 @@ export const speciesEggMoves = {
   [Species.BRUTE_BONNET]: [ Moves.CRUNCH, Moves.SAPPY_SEED, Moves.FRENZY_PLANT, Moves.STRENGTH_SAP ],
   [Species.FLUTTER_MANE]: [ Moves.MOONLIGHT, Moves.SNARL, Moves.EARTH_POWER, Moves.MOONGEIST_BEAM ],
   [Species.SLITHER_WING]: [ Moves.DRAIN_PUNCH, Moves.VICTORY_DANCE, Moves.SIZZLY_SLIDE, Moves.COLLISION_COURSE ],
-  [Species.SANDY_SHOCKS]: [ Moves.NONE, Moves.SCORCHING_SANDS, Moves.CALM_MIND, Moves.ELECTRO_SHOT ],
+  [Species.SANDY_SHOCKS]: [ Moves.PARABOLIC_CHARGE, Moves.SCORCHING_SANDS, Moves.CALM_MIND, Moves.ELECTRO_SHOT ],
   [Species.IRON_TREADS]: [ Moves.SUPERCELL_SLAM, Moves.BULK_UP, Moves.HEAD_SMASH, Moves.COLLISION_COURSE ],
-  [Species.IRON_BUNDLE]: [ Moves.NONE, Moves.SCALD, Moves.NASTY_PLOT, Moves.GLACIATE ],
+  [Species.IRON_BUNDLE]: [ Moves.PARABOLIC_CHARGE, Moves.SCALD, Moves.NASTY_PLOT, Moves.GLACIATE ],
   [Species.IRON_HANDS]: [ Moves.MACH_PUNCH, Moves.HIGH_HORSEPOWER, Moves.MAT_BLOCK, Moves.PLASMA_FISTS ],
   [Species.IRON_JUGULIS]: [ Moves.FIERY_WRATH, Moves.FLAMETHROWER, Moves.NASTY_PLOT, Moves.OBLIVION_WING ],
-  [Species.IRON_MOTH]: [ Moves.NONE, Moves.QUIVER_DANCE, Moves.FLASH_CANNON, Moves.TORCH_SONG ],
+  [Species.IRON_MOTH]: [ Moves.PARABOLIC_CHARGE, Moves.QUIVER_DANCE, Moves.FLASH_CANNON, Moves.TORCH_SONG ],
   [Species.IRON_THORNS]: [ Moves.DRAIN_PUNCH, Moves.SUPERPOWER, Moves.SHIFT_GEAR, Moves.FUSION_BOLT ],
-  [Species.FRIGIBAX]: [ Moves.ICICLE_SPEAR, Moves.AQUA_TAIL, Moves.NONE, Moves.DRAGON_RUSH ],
+  [Species.FRIGIBAX]: [ Moves.ICICLE_SPEAR, Moves.AQUA_TAIL, Moves.FREEZE_DRY, Moves.DRAGON_RUSH ],
   [Species.GIMMIGHOUL]: [ Moves.PAY_DAY, Moves.HAPPY_HOUR, Moves.MIRROR_COAT, Moves.TECHNO_BLAST ],
   [Species.WO_CHIEN]: [ Moves.POLLEN_PUFF, Moves.FORESTS_CURSE, Moves.FOLLOW_ME, Moves.SPORE ],
   [Species.CHIEN_PAO]: [ Moves.STOMPING_TANTRUM, Moves.WATERFALL, Moves.CHILLY_RECEPTION, Moves.BEHEMOTH_BLADE ],
   [Species.TING_LU]: [ Moves.HEAT_CRASH, Moves.IRON_HEAD, Moves.HORN_LEECH, Moves.STRENGTH_SAP ],
   [Species.CHI_YU]: [ Moves.ENERGY_BALL, Moves.STORED_POWER, Moves.SCALD, Moves.BLUE_FLARE ],
-  [Species.ROARING_MOON]: [ Moves.RAGING_FURY, Moves.FLOATY_FALL, Moves.NONE, Moves.COLLISION_COURSE ],
+  [Species.ROARING_MOON]: [ Moves.RAGING_FURY, Moves.FLOATY_FALL, Moves.OBSTRUCT, Moves.COLLISION_COURSE ],
   [Species.IRON_VALIANT]: [ Moves.SECRET_SWORD, Moves.PLAY_ROUGH, Moves.QUIVER_DANCE, Moves.ELECTRO_DRIFT ],
   [Species.KORAIDON]: [ Moves.HEAD_SMASH, Moves.BULK_UP, Moves.IRON_HEAD, Moves.CLANGOROUS_SOUL ],
   [Species.MIRAIDON]: [ Moves.ICE_BEAM, Moves.CALM_MIND, Moves.FLASH_CANNON, Moves.CLANGOROUS_SOUL ],
@@ -563,14 +563,14 @@ export const speciesEggMoves = {
   [Species.GALAR_DARUMAKA]: [ Moves.ICE_SPINNER, Moves.TRAILBLAZE, Moves.DRAIN_PUNCH, Moves.FLARE_BLITZ ],
   [Species.GALAR_YAMASK]: [ Moves.BULK_UP, Moves.GLARE, Moves.OUTRAGE, Moves.DIRE_CLAW ],
   [Species.GALAR_STUNFISK]: [ Moves.SPIKY_SHIELD, Moves.JAW_LOCK, Moves.RECOVER, Moves.BEHEMOTH_BASH ],
-  [Species.HISUI_GROWLITHE]: [ Moves.TRAILBLAZE, Moves.NONE, Moves.MORNING_SUN, Moves.BURNING_BULWARK ],
+  [Species.HISUI_GROWLITHE]: [ Moves.TRAILBLAZE, Moves.HEAD_SMASH, Moves.MORNING_SUN, Moves.BURNING_BULWARK ],
   [Species.HISUI_VOLTORB]: [ Moves.TRAILBLAZE, Moves.ELECTRO_SHOT, Moves.PARABOLIC_CHARGE, Moves.SEED_FLARE ],
   [Species.HISUI_QWILFISH]: [ Moves.NUZZLE, Moves.SCALE_SHOT, Moves.SUPERSONIC, Moves.PARTING_SHOT ],
   [Species.HISUI_SNEASEL]: [ Moves.DRAIN_PUNCH, Moves.BULLET_PUNCH, Moves.FAKE_OUT, Moves.VICTORY_DANCE ],
   [Species.HISUI_ZORUA]: [ Moves.ALLURING_VOICE, Moves.GLARE, Moves.TORCH_SONG, Moves.TRANSFORM ],
   [Species.PALDEA_TAUROS]: [ Moves.HEAD_CHARGE, Moves.BLAZE_KICK, Moves.AQUA_STEP, Moves.NO_RETREAT ],
   [Species.PALDEA_WOOPER]: [ Moves.RECOVER, Moves.DOUBLE_KICK, Moves.ANCIENT_POWER, Moves.VENOM_DRENCH ],
-  [Species.BLOODMOON_URSALUNA]: [ Moves.GLARE, Moves.EARTH_POWER, Moves.CALM_MIND, Moves.BOOMBURST ],
+  [Species.BLOODMOON_URSALUNA]: [ Moves.GLARE, Moves.EARTH_POWER, Moves.CALM_MIND, Moves.BOOMBURST ]
 };
 
 function parseEggMoves(content: string): void {
@@ -592,6 +592,9 @@ function parseEggMoves(content: string): void {
       const moveName = cols[m + 1].trim();
       const moveIndex = moveName !== 'N/A' ? moveNames.findIndex(mn => mn === moveName.toLowerCase()) : -1;
       eggMoves.push(moveIndex > -1 ? moveIndex as Moves : Moves.NONE);
+
+      if (moveIndex === -1)
+        console.warn(moveName, 'could not be parsed');
     }
 
     if (eggMoves.find(m => m !== Moves.NONE))