diff --git a/src/data/arena-tag.ts b/src/data/arena-tag.ts
index 642cc72404a..c2430db950b 100644
--- a/src/data/arena-tag.ts
+++ b/src/data/arena-tag.ts
@@ -65,7 +65,7 @@ export class MistTag extends ArenaTag {
     super.onAdd(arena);
 
     const source = arena.scene.getPokemonById(this.sourceId);
-    arena.scene.queueMessage(getPokemonMessage(source, `'s team became\nshrowded in mist!`));
+    arena.scene.queueMessage(getPokemonMessage(source, `'s team became\nshrouded in mist!`));
   }
 
   apply(arena: Arena, args: any[]): boolean {
diff --git a/src/data/dialogue.ts b/src/data/dialogue.ts
index daf12e5f03d..8fd9fc12560 100644
--- a/src/data/dialogue.ts
+++ b/src/data/dialogue.ts
@@ -1453,7 +1453,7 @@ export const trainerTypeDialogue = {
       `I thought that you would be able to get this far. Let's get this started.`
     ],
     victory: [
-      `You got me. You are magneficent!`,
+      `You got me. You are magnificent!`,
       `I never expected another trainer to beat me… I'm surprised.`
     ],
     defeat: [
diff --git a/src/data/egg-moves.ts b/src/data/egg-moves.ts
index 96053402828..55f57a025e8 100644
--- a/src/data/egg-moves.ts
+++ b/src/data/egg-moves.ts
@@ -250,88 +250,88 @@ export const speciesEggMoves = {
   [Species.DARKRAI]: [ Moves.FIERY_WRATH, Moves.MOONBLAST, Moves.SEARING_SHOT, Moves.MALIGNANT_CHAIN ],
   [Species.SHAYMIN]: [ Moves.SPRINGTIDE_STORM, Moves.HEAT_WAVE, Moves.BLEAKWIND_STORM, Moves.MATCHA_GOTCHA ],
   [Species.ARCEUS]: [ Moves.QUIVER_DANCE, Moves.SPIRIT_SHACKLE, Moves.VICTORY_DANCE, Moves.COLLISION_COURSE ],
-  [Species.VICTINI]: [ Moves.PHOTON_GEYSER, Moves.BOLT_STRIKE, Moves.BLUE_FLARE, Moves.VICTORY_DANCE ],
-  [Species.SNIVY]: [ Moves.SYNTHESIS, Moves.SAPPY_SEED, Moves.POWER_GEM, Moves.DRACO_METEOR ],
-  [Species.TEPIG]: [ Moves.SUCKER_PUNCH, Moves.SLACK_OFF, Moves.MACH_PUNCH, Moves.VICTORY_DANCE ],
-  [Species.OSHAWOTT]: [ Moves.SECRET_SWORD, Moves.AQUA_CUTTER, Moves.NASTY_PLOT, Moves.BEHEMOTH_BLADE ],
-  [Species.PATRAT]: [ Moves.COVET, Moves.EXTREME_SPEED, Moves.ACUPRESSURE, Moves.LAST_RESORT ],
-  [Species.LILLIPUP]: [ Moves.COVET, Moves.LAST_RESPECTS, Moves.HIGH_HORSEPOWER, Moves.NO_RETREAT ],
-  [Species.PURRLOIN]: [ Moves.PSYCHIC_FANGS, Moves.SWORDS_DANCE, Moves.PARTING_SHOT, Moves.WICKED_BLOW ],
-  [Species.PANSAGE]: [ Moves.NASTY_PLOT, Moves.AURA_SPHERE, Moves.TRAILBLAZE, Moves.FRENZY_PLANT ],
-  [Species.PANSEAR]: [ Moves.NASTY_PLOT, Moves.AURA_SPHERE, Moves.SCORCHING_SANDS, Moves.BLAST_BURN ],
-  [Species.PANPOUR]: [ Moves.NASTY_PLOT, Moves.AURA_SPHERE, Moves.FREEZE_DRY, Moves.HYDRO_CANNON ],
+  [Species.VICTINI]: [ Moves.RECOVER, Moves.BOLT_STRIKE, Moves.PHOTON_GEYSER, Moves.VICTORY_DANCE ],
+  [Species.SNIVY]: [ Moves.BURNING_JEALOUSY, Moves.SAPPY_SEED, Moves.SUPERPOWER, Moves.FLEUR_CANNON ],
+  [Species.TEPIG]: [ Moves.AXE_KICK, Moves.VOLT_TACKLE, Moves.DRAIN_PUNCH, Moves.VICTORY_DANCE ],
+  [Species.OSHAWOTT]: [ Moves.ICE_SPINNER, Moves.SHELL_SIDE_ARM, Moves.SACRED_SWORD, Moves.SHELL_SMASH ],
+  [Species.PATRAT]: [ Moves.YAWN, Moves.PSYCHIC_FANGS, Moves.GLARE, Moves.EXTREME_SPEED ],
+  [Species.LILLIPUP]: [ Moves.CLOSE_COMBAT, Moves.THIEF, Moves.HIGH_HORSEPOWER, Moves.LAST_RESPECTS ],
+  [Species.PURRLOIN]: [ Moves.ENCORE, Moves.ASSIST, Moves.PARTING_SHOT, Moves.WICKED_BLOW ],
+  [Species.PANSAGE]: [ Moves.SWORDS_DANCE, Moves.TEMPER_FLARE, Moves.EARTHQUAKE, Moves.IVY_CUDGEL ],
+  [Species.PANSEAR]: [ Moves.NASTY_PLOT, Moves.SCALD, Moves.SCORCHING_SANDS, Moves.SEARING_SHOT ],
+  [Species.PANPOUR]: [ Moves.NASTY_PLOT, Moves.ENERGY_BALL, Moves.AURA_SPHERE, Moves.STEAM_ERUPTION ],
   [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.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 ],
-  [Species.AUDINO]: [ Moves.BOOMBURST, Moves.MOONBLAST, Moves.METRONOME, Moves.COSMIC_POWER ],
-  [Species.TIMBURR]: [ Moves.MACH_PUNCH, Moves.BULLET_PUNCH, Moves.SWORDS_DANCE, Moves.ACCELEROCK ],
-  [Species.TYMPOLE]: [ Moves.LIQUIDATION, Moves.STOMPING_TANTRUM, Moves.RECOVER, Moves.JET_PUNCH ],
-  [Species.THROH]: [ Moves.UPPER_HAND, Moves.MACH_PUNCH, Moves.SPIN_OUT, Moves.DRAIN_PUNCH ],
-  [Species.SAWK]: [ Moves.UPPER_HAND, Moves.MACH_PUNCH, Moves.SMART_STRIKE, Moves.THUNDEROUS_KICK ],
-  [Species.SEWADDLE]: [ Moves.SMACK_DOWN, Moves.TROP_KICK, Moves.TIDY_UP, Moves.FIRST_IMPRESSION ],
-  [Species.VENIPEDE]: [ Moves.STEAMROLLER, Moves.MORTAL_SPIN, Moves.NOXIOUS_TORQUE, Moves.EARTHQUAKE ],
-  [Species.COTTONEE]: [ Moves.MUD_SHOT, Moves.STEALTH_ROCK, Moves.AIR_SLASH, Moves.SEED_FLARE ],
-  [Species.PETILIL]: [ Moves.DRAIN_PUNCH, Moves.BATON_PASS, Moves.EARTH_POWER, Moves.ICE_BEAM ],
-  [Species.BASCULIN]: [ Moves.LAST_RESPECTS, Moves.CLOSE_COMBAT, Moves.SHADOW_SNEAK, Moves.FISHIOUS_REND ],
-  [Species.SANDILE]: [ Moves.DIRE_CLAW, Moves.PARTING_SHOT, Moves.RAGING_FURY, Moves.PRECIPICE_BLADES ],
-  [Species.DARUMAKA]: [ Moves.DRAIN_PUNCH, Moves.THUNDER_PUNCH, Moves.BURNING_BULWARK, Moves.V_CREATE ],
-  [Species.MARACTUS]: [ Moves.SPIKY_SHIELD, Moves.FLOWER_TRICK, Moves.BARB_BARRAGE, Moves.SEED_FLARE ],
-  [Species.DWEBBLE]: [ Moves.CRABHAMMER, Moves.STONE_AXE, Moves.LEECH_LIFE, Moves.SHELL_TRAP ],
-  [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.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 ],
-  [Species.MINCCINO]: [ Moves.COVET, Moves.TIDY_UP, Moves.BONE_RUSH, Moves.POPULATION_BOMB ],
-  [Species.GOTHITA]: [ Moves.MILK_DRINK, Moves.MYSTICAL_POWER, Moves.MYSTICAL_FIRE, Moves.DARK_VOID ],
-  [Species.SOLOSIS]: [ Moves.COSMIC_POWER, Moves.MOONBLAST, Moves.FREEZE_DRY, Moves.PSYSTRIKE ],
+  [Species.PIDOVE]: [ Moves.NIGHT_SLASH, Moves.TIDY_UP, Moves.FLOATY_FALL, Moves.TRIPLE_ARROWS ],
+  [Species.BLITZLE]: [ Moves.HIGH_HORSEPOWER, Moves.THUNDEROUS_KICK, Moves.FLARE_BLITZ, Moves.VOLT_TACKLE ],
+  [Species.ROGGENROLA]: [ Moves.BODY_PRESS, Moves.CURSE, Moves.SHORE_UP, Moves.DIAMOND_STORM ],
+  [Species.WOOBAT]: [ Moves.QUIVER_DANCE, Moves.STORED_POWER, Moves.MYSTICAL_FIRE, Moves.OBLIVION_WING ],
+  [Species.DRILBUR]: [ Moves.IRON_HEAD, Moves.ICE_SPINNER, Moves.SHIFT_GEAR, Moves.BEHEMOTH_BASH ],
+  [Species.AUDINO]: [ Moves.FOLLOW_ME, Moves.MOONBLAST, Moves.WISH, Moves.LUNAR_BLESSING ],
+  [Species.TIMBURR]: [ Moves.MACH_PUNCH, Moves.DRAIN_PUNCH, Moves.ICE_HAMMER, Moves.DOUBLE_IRON_BASH ],
+  [Species.TYMPOLE]: [ Moves.LIQUIDATION, Moves.HIGH_HORSEPOWER, Moves.TOXIC, Moves.SHORE_UP ],
+  [Species.THROH]: [ Moves.DRAIN_PUNCH, Moves.SLACK_OFF, Moves.METEOR_MASH, Moves.NO_RETREAT ],
+  [Species.SAWK]: [ Moves.DRAIN_PUNCH, Moves.MACH_PUNCH, Moves.ENDEAVOR, Moves.VICTORY_DANCE ],
+  [Species.SEWADDLE]: [ Moves.STONE_AXE, Moves.PSYCHO_CUT, Moves.TIDY_UP, Moves.BITTER_BLADE ],
+  [Species.VENIPEDE]: [ Moves.SWORDS_DANCE, Moves.BATON_PASS, Moves.NOXIOUS_TORQUE, Moves.EARTHQUAKE ],
+  [Species.COTTONEE]: [ Moves.POLLEN_PUFF, Moves.PARTING_SHOT, Moves.SLEEP_POWDER, Moves.SEED_FLARE ],
+  [Species.PETILIL]: [ Moves.THUNDEROUS_KICK, Moves.BATON_PASS, Moves.AQUA_STEP, Moves.FIERY_DANCE ],
+  [Species.BASCULIN]: [ Moves.LAST_RESPECTS, Moves.CLOSE_COMBAT, Moves.DRAGON_DANCE, Moves.FISHIOUS_REND ],
+  [Species.SANDILE]: [ Moves.DIRE_CLAW, Moves.PARTING_SHOT, Moves.FIRE_LASH, Moves.PRECIPICE_BLADES ],
+  [Species.DARUMAKA]: [ Moves.DRAIN_PUNCH, Moves.THUNDER_PUNCH, Moves.BLAZING_TORQUE, Moves.V_CREATE ],
+  [Species.MARACTUS]: [ Moves.SCORCHING_SANDS, Moves.QUIVER_DANCE, Moves.FIERY_DANCE, Moves.SEED_FLARE ],
+  [Species.DWEBBLE]: [ Moves.CRABHAMMER, Moves.STONE_AXE, Moves.LEECH_LIFE, Moves.SHORE_UP ],
+  [Species.SCRAGGY]: [ Moves.SUCKER_PUNCH, Moves.TRIPLE_AXEL, Moves.DRAGON_DANCE, Moves.COLLISION_COURSE ],
+  [Species.SIGILYPH]: [ Moves.STORED_POWER, Moves.TAKE_HEART, Moves.FREEZING_GLARE, Moves.OBLIVION_WING ],
+  [Species.YAMASK]: [ Moves.RECOVER, Moves.INFERNAL_PARADE, Moves.AURA_SPHERE, Moves.TOPSY_TURVY ],
+  [Species.TIRTOUGA]: [ Moves.ICE_SPINNER, Moves.ACCELEROCK, Moves.SHORE_UP, Moves.WAVE_CRASH ],
+  [Species.ARCHEN]: [ Moves.ROOST, Moves.ACCELEROCK, Moves.FLOATY_FALL, Moves.MIGHTY_CLEAVE ],
+  [Species.TRUBBISH]: [ Moves.TIDY_UP, Moves.RECOVER, Moves.DIRE_CLAW, Moves.GIGATON_HAMMER ],
+  [Species.ZORUA]: [ Moves.BADDY_BAD, Moves.PSYCHIC, Moves.AURA_SPHERE, Moves.WICKED_BLOW ],
+  [Species.MINCCINO]: [ Moves.ICICLE_SPEAR, Moves.TIDY_UP, Moves.BONE_RUSH, Moves.POPULATION_BOMB ],
+  [Species.GOTHITA]: [ Moves.MILK_DRINK, Moves.COSMIC_POWER, Moves.AURA_SPHERE, Moves.PSYSTRIKE ],
+  [Species.SOLOSIS]: [ Moves.COSMIC_POWER, Moves.MOONBLAST, Moves.AURA_SPHERE, Moves.PSYSTRIKE ],
   [Species.DUCKLETT]: [ Moves.QUIVER_DANCE, Moves.EARTH_POWER, Moves.FREEZE_DRY, Moves.OBLIVION_WING ],
-  [Species.VANILLITE]: [ Moves.MILK_DRINK, Moves.DECORATE, Moves.LOCK_ON, Moves.EARTH_POWER ],
-  [Species.DEERLING]: [ Moves.TIDY_UP, Moves.HEADBUTT, Moves.JUMP_KICK, Moves.FLOWER_TRICK ],
-  [Species.EMOLGA]: [ Moves.ROOST, Moves.CHARM, Moves.THUNDER_WAVE, Moves.THUNDER_CAGE ],
-  [Species.KARRABLAST]: [ Moves.SHIFT_GEAR, Moves.LEECH_LIFE, Moves.ROCK_WRECKER, Moves.DOUBLE_IRON_BASH ],
-  [Species.FOONGUS]: [ Moves.PAIN_SPLIT, Moves.CORROSIVE_GAS, Moves.SHELL_SIDE_ARM, Moves.STRENGTH_SAP ],
-  [Species.FRILLISH]: [ Moves.STRENGTH_SAP, Moves.BOUNCY_BUBBLE, Moves.FREEZE_DRY, Moves.MOONGEIST_BEAM ],
-  [Species.ALOMOMOLA]: [ Moves.BOUNCY_BUBBLE, Moves.HEART_SWAP, Moves.ATTRACT, Moves.TAKE_HEART ],
-  [Species.JOLTIK]: [ Moves.THUNDER_CAGE, Moves.PARABOLIC_CHARGE, Moves.QUIVER_DANCE, Moves.EARTH_POWER ],
-  [Species.FERROSEED]: [ Moves.STRENGTH_SAP, Moves.BODY_PRESS, Moves.DRILL_RUN, Moves.DOUBLE_IRON_BASH ],
-  [Species.KLINK]: [ Moves.TRAILBLAZE, Moves.HIGH_HORSEPOWER, Moves.FUSION_BOLT, Moves.DOUBLE_IRON_BASH ],
-  [Species.TYNAMO]: [ Moves.PARABOLIC_CHARGE, Moves.LEECH_LIFE, Moves.DRAGON_DANCE, Moves.FUSION_BOLT ],
-  [Species.ELGYEM]: [ Moves.MYSTICAL_POWER, Moves.METEOR_BEAM, Moves.COSMIC_POWER, Moves.MOONGEIST_BEAM ],
-  [Species.LITWICK]: [ Moves.NASTY_PLOT, Moves.SCORCHING_SANDS, Moves.TORCH_SONG, Moves.MOONGEIST_BEAM ],
-  [Species.AXEW]: [ Moves.STONE_AXE, Moves.GLAIVE_RUSH, Moves.TEMPER_FLARE, Moves.VICTORY_DANCE ],
-  [Species.CUBCHOO]: [ Moves.MOUNTAIN_GALE, Moves.DRAIN_PUNCH, Moves.SWORDS_DANCE, Moves.WAVE_CRASH ],
-  [Species.CRYOGONAL]: [ Moves.SURF, Moves.EARTH_POWER, Moves.NASTY_PLOT, Moves.BLEAKWIND_STORM ],
-  [Species.SHELMET]: [ Moves.SHED_TAIL, Moves.LEECH_LIFE, Moves.SILK_TRAP, Moves.CEASELESS_EDGE ],
-  [Species.STUNFISK]: [ Moves.SPIKES, Moves.BANEFUL_BUNKER, Moves.SUPERCELL_SLAM, Moves.DRAGON_DANCE ],
-  [Species.MIENFOO]: [ Moves.TIDY_UP, Moves.ICE_SPINNER, Moves.SUPERCELL_SLAM, Moves.BRAVE_BIRD ],
-  [Species.DRUDDIGON]: [ Moves.SPIKY_SHIELD, Moves.STOMPING_TANTRUM, Moves.CLANGOROUS_SOUL, Moves.DIAMOND_STORM ],
-  [Species.GOLETT]: [ Moves.BULK_UP, Moves.RAGE_FIST, Moves.HEADLONG_RUSH, Moves.DOUBLE_IRON_BASH ],
-  [Species.PAWNIARD]: [ Moves.SUCKER_PUNCH, Moves.CEASELESS_EDGE, Moves.AQUA_CUTTER, Moves.PSYBLADE ],
-  [Species.BOUFFALANT]: [ Moves.EARTHQUAKE, Moves.FLAME_CHARGE, Moves.IRON_HEAD, Moves.RAGING_BULL ],
-  [Species.RUFFLET]: [ Moves.FLOATY_FALL, Moves.DAZZLING_GLEAM, Moves.HEAT_WAVE, Moves.BOLT_BEAK ],
-  [Species.VULLABY]: [ Moves.RUINATION, Moves.BODY_PRESS, Moves.ROOST, Moves.BADDY_BAD ],
-  [Species.HEATMOR]: [ Moves.SCORCHING_SANDS, Moves.NASTY_PLOT, Moves.FLASH_CANNON, Moves.SEARING_SHOT ],
-  [Species.DURANT]: [ Moves.SMART_STRIKE, Moves.FIRST_IMPRESSION, Moves.HONE_CLAWS, Moves.EXTREME_SPEED ],
-  [Species.DEINO]: [ Moves.FIERY_WRATH, Moves.HYDRO_STEAM, Moves.CORROSIVE_GAS, Moves.FICKLE_BEAM ],
-  [Species.LARVESTA]: [ Moves.TORCH_SONG, Moves.POLLEN_PUFF, Moves.EARTH_POWER, Moves.BLUE_FLARE ],
+  [Species.VANILLITE]: [ Moves.EARTH_POWER, Moves.AURORA_VEIL, Moves.LOCK_ON, Moves.MILK_DRINK ],
+  [Species.DEERLING]: [ Moves.TIDY_UP, Moves.HEADBUTT, Moves.BODY_SLAM, Moves.FLOWER_TRICK ],
+  [Species.EMOLGA]: [ Moves.ROOST, Moves.HEAT_WAVE, Moves.TAILWIND, Moves.ZING_ZAP ],
+  [Species.KARRABLAST]: [ Moves.TRICK_ROOM, Moves.SHORE_UP, Moves.MIGHTY_CLEAVE, Moves.BITTER_BLADE ],
+  [Species.FOONGUS]: [ Moves.POLLEN_PUFF, Moves.PARTING_SHOT, Moves.FOUL_PLAY, Moves.STRENGTH_SAP ],
+  [Species.FRILLISH]: [ Moves.STRENGTH_SAP, Moves.INFERNAL_PARADE, Moves.FREEZE_DRY, Moves.STEAM_ERUPTION ],
+  [Species.ALOMOMOLA]: [ Moves.FLIP_TURN, Moves.HEART_SWAP, Moves.TOXIC, Moves.GLITZY_GLOW ],
+  [Species.JOLTIK]: [ Moves.THUNDER, Moves.PARABOLIC_CHARGE, Moves.EARTH_POWER, Moves.QUIVER_DANCE ],
+  [Species.FERROSEED]: [ Moves.STRENGTH_SAP, Moves.BODY_PRESS, Moves.SPIKY_SHIELD, Moves.SAPPY_SEED ],
+  [Species.KLINK]: [ Moves.FLARE_BLITZ, Moves.HIGH_HORSEPOWER, Moves.FUSION_BOLT, Moves.DOUBLE_IRON_BASH ],
+  [Species.TYNAMO]: [ Moves.LIQUIDATION, Moves.RECOVER, Moves.PARTING_SHOT, Moves.BOLT_BEAK ],
+  [Species.ELGYEM]: [ Moves.MYSTICAL_POWER, Moves.TRICK_ROOM, Moves.STORED_POWER, Moves.PSYSTRIKE ],
+  [Species.LITWICK]: [ Moves.FIERY_DANCE, Moves.EARTH_POWER, Moves.MOONBLAST, Moves.ASTRAL_BARRAGE ],
+  [Species.AXEW]: [ Moves.STONE_AXE, Moves.DIRE_CLAW, Moves.FIRE_LASH, Moves.GLAIVE_RUSH ],
+  [Species.CUBCHOO]: [ Moves.MOUNTAIN_GALE, Moves.WOOD_HAMMER, Moves.SWORDS_DANCE, Moves.WAVE_CRASH ],
+  [Species.CRYOGONAL]: [ Moves.SURF, Moves.EARTH_POWER, Moves.NASTY_PLOT, Moves.FREEZY_FROST ],
+  [Species.SHELMET]: [ Moves.SHED_TAIL, Moves.NASTY_PLOT, Moves.BATON_PASS, Moves.HEAT_WAVE ],
+  [Species.STUNFISK]: [ Moves.SHORE_UP, Moves.BANEFUL_BUNKER, Moves.THUNDER_CAGE, Moves.THUNDERCLAP ],
+  [Species.MIENFOO]: [ Moves.GUNK_SHOT, Moves.TRIPLE_AXEL, Moves.SUPERCELL_SLAM, Moves.TIDY_UP ],
+  [Species.DRUDDIGON]: [ Moves.SPIKY_SHIELD, Moves.ROOST, Moves.DRAGON_HAMMER, Moves.FIRE_LASH ],
+  [Species.GOLETT]: [ Moves.BULK_UP, Moves.BULLET_PUNCH, Moves.HEADLONG_RUSH, Moves.RAGE_FIST ],
+  [Species.PAWNIARD]: [ Moves.SUCKER_PUNCH, Moves.CEASELESS_EDGE, Moves.BITTER_BLADE, Moves.LAST_RESPECTS ],
+  [Species.BOUFFALANT]: [ Moves.SLACK_OFF, Moves.JUMP_KICK, Moves.HEAD_SMASH, Moves.FLARE_BLITZ ],
+  [Species.RUFFLET]: [ Moves.FLOATY_FALL, Moves.MOONBLAST, Moves.HEAT_WAVE, Moves.BOLT_BEAK ],
+  [Species.VULLABY]: [ Moves.TOXIC, Moves.BODY_PRESS, Moves.ROOST, Moves.TOPSY_TURVY ],
+  [Species.HEATMOR]: [ Moves.EARTH_POWER, Moves.OVERHEAT, Moves.FLASH_CANNON, Moves.V_CREATE ],
+  [Species.DURANT]: [ Moves.HIGH_HORSEPOWER, Moves.FIRST_IMPRESSION, Moves.SWORDS_DANCE, Moves.BEHEMOTH_BASH ],
+  [Species.DEINO]: [ Moves.FIERY_WRATH, Moves.ESPER_WING, Moves.SLUDGE_WAVE, Moves.FICKLE_BEAM ],
+  [Species.LARVESTA]: [ Moves.THUNDERBOLT, Moves.ERUPTION, Moves.EARTH_POWER, Moves.TORCH_SONG ],
   [Species.COBALION]: [ Moves.TACHYON_CUTTER, Moves.BODY_PRESS, Moves.CEASELESS_EDGE, Moves.VICTORY_DANCE ],
   [Species.TERRAKION]: [ Moves.MIGHTY_CLEAVE, Moves.HEADLONG_RUSH, Moves.CEASELESS_EDGE, Moves.VICTORY_DANCE ],
   [Species.VIRIZION]: [ Moves.PSYBLADE, Moves.SAPPY_SEED, Moves.CEASELESS_EDGE, Moves.VICTORY_DANCE ],
-  [Species.TORNADUS]: [ Moves.MIST_BALL, Moves.BRAVE_BIRD, Moves.DRAIN_PUNCH, Moves.BLIZZARD ],
-  [Species.THUNDURUS]: [ Moves.THUNDER_CAGE, Moves.BULK_UP, Moves.FLOATY_FALL, Moves.THUNDERCLAP ],
-  [Species.RESHIRAM]: [ Moves.FUSION_BOLT, Moves.FIERY_DANCE, Moves.POWER_GEM, Moves.DRAGON_ENERGY ],
-  [Species.ZEKROM]: [ Moves.FUSION_FLARE, Moves.BOLT_BEAK, Moves.DRAGON_HAMMER, Moves.VOLT_TACKLE ],
-  [Species.LANDORUS]: [ Moves.ROCK_SLIDE, Moves.LANDS_WRATH, Moves.AERIAL_ACE, Moves.AQUA_TAIL ],
-  [Species.KYUREM]: [ Moves.ICICLE_CRASH, Moves.DRAGON_HAMMER, Moves.ICE_SHARD, Moves.GLACIAL_LANCE ],
-  [Species.KELDEO]: [ Moves.WATER_PLEDGE, Moves.AIR_SLASH, Moves.ICE_BEAM, Moves.TACHYON_CUTTER ],
-  [Species.MELOETTA]: [ Moves.TORCH_SONG, Moves.QUIVER_DANCE, Moves.VICTORY_DANCE, Moves.BOOMBURST ],
-  [Species.GENESECT]: [ Moves.FOCUS_BLAST, Moves.STEEL_BEAM, Moves.SHIFT_GEAR, Moves.QUIVER_DANCE ],
+  [Species.TORNADUS]: [ Moves.EARTH_POWER, Moves.U_TURN, Moves.ICE_BEAM, Moves.AEROBLAST ],
+  [Species.THUNDURUS]: [ Moves.EARTH_POWER, Moves.AEROBLAST, Moves.THUNDERCLAP, Moves.ELECTRO_SHOT ],
+  [Species.RESHIRAM]: [ Moves.FUSION_BOLT, Moves.CALM_MIND, Moves.SOLAR_BEAM, Moves.DRAGON_ENERGY ],
+  [Species.ZEKROM]: [ Moves.FUSION_FLARE, Moves.THUNDEROUS_KICK, Moves.DRAGON_HAMMER, Moves.BOLT_BEAK ],
+  [Species.LANDORUS]: [ Moves.STONE_AXE, Moves.HIGH_HORSEPOWER, Moves.ROOST, Moves.FLOATY_FALL ],
+  [Species.KYUREM]: [ Moves.ICICLE_CRASH, Moves.DRAGON_ENERGY, Moves.PHOTON_GEYSER, Moves.GLACIAL_LANCE ],
+  [Species.KELDEO]: [ Moves.TACHYON_CUTTER, Moves.THUNDERBOLT, Moves.ICE_BEAM, Moves.STEAM_ERUPTION ],
+  [Species.MELOETTA]: [ Moves.THUNDEROUS_KICK, Moves.QUIVER_DANCE, Moves.VICTORY_DANCE, Moves.BOOMBURST ],
+  [Species.GENESECT]: [ Moves.AURA_SPHERE, Moves.U_TURN, Moves.SHIFT_GEAR, Moves.TAIL_GLOW ],
   [Species.CHESPIN]: [ Moves.DRAIN_PUNCH, Moves.BELLY_DRUM, Moves.TAUNT, Moves.SAPPY_SEED ],
   [Species.FENNEKIN]: [ Moves.DRAGON_PULSE, Moves.STRANGE_STEAM, Moves.HYPNOSIS, Moves.MYSTICAL_POWER ],
   [Species.FROAKIE]: [ Moves.FAKE_OUT, Moves.ICY_WIND, Moves.FLIP_TURN, Moves.SURGING_STRIKES ],
@@ -369,61 +369,61 @@ export const speciesEggMoves = {
   [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.SPECTRAL_THIEF ],
   [Species.VOLCANION]: [ Moves.HYDRO_STEAM, Moves.HYDRO_CANNON, Moves.BLAST_BURN, Moves.METEOR_BEAM ],
-  [Species.ROWLET]: [ Moves.SNIPE_SHOT, Moves.ESPER_WING, Moves.TRIPLE_ARROWS, Moves.THOUSAND_ARROWS ],
-  [Species.LITTEN]: [ Moves.FAKE_OUT, Moves.PARTING_SHOT, Moves.PSYCHIC_FANGS, Moves.FLYING_PRESS ],
-  [Species.POPPLIO]: [ Moves.ENCORE, Moves.BOUNCY_BUBBLE, Moves.ALLURING_VOICE, Moves.BOOMBURST ],
-  [Species.PIKIPEK]: [ Moves.BOOMBURST, Moves.FLAME_CHARGE, Moves.KNOCK_OFF, Moves.BURNING_BULWARK ],
-  [Species.YUNGOOS]: [ Moves.HYPER_FANG, Moves.POISON_FANG, Moves.SWORDS_DANCE, Moves.FORESIGHT ],
-  [Species.GRUBBIN]: [ Moves.ELECTROWEB, Moves.AIR_SLASH, Moves.SIGNAL_BEAM, Moves.ELECTRO_SHOT ],
-  [Species.CRABRAWLER]: [ Moves.MACH_PUNCH, Moves.FIRE_PUNCH, Moves.JET_PUNCH, Moves.WOOD_HAMMER ],
+  [Species.ROWLET]: [ Moves.SNIPE_SHOT, Moves.POLTERGEIST, Moves.FIRST_IMPRESSION, Moves.VICTORY_DANCE ],
+  [Species.LITTEN]: [ Moves.FAKE_OUT, Moves.PARTING_SHOT, Moves.SUCKER_PUNCH, Moves.SACRED_FIRE ],
+  [Species.POPPLIO]: [ Moves.PSYCHIC_NOISE, Moves.BOUNCY_BUBBLE, Moves.ALLURING_VOICE, Moves.TORCH_SONG ],
+  [Species.PIKIPEK]: [ Moves.FLOATY_FALL, Moves.BONE_RUSH, Moves.KNOCK_OFF, Moves.BURNING_BULWARK ],
+  [Species.YUNGOOS]: [ Moves.EXTREME_SPEED, Moves.PURSUIT, Moves.TIDY_UP, Moves.MULTI_ATTACK ],
+  [Species.GRUBBIN]: [ Moves.ICE_BEAM, Moves.EARTH_POWER, Moves.QUIVER_DANCE, Moves.THUNDERCLAP ],
+  [Species.CRABRAWLER]: [ Moves.CURSE, Moves.SHORE_UP, Moves.SUCKER_PUNCH, Moves.SURGING_STRIKES ],
   [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.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 ],
-  [Species.MORELULL]: [ Moves.STUN_SPORE, Moves.LEECH_SEED, Moves.POLLEN_PUFF, Moves.FLOWER_SHIELD ],
-  [Species.SALANDIT]: [ Moves.FAKE_OUT, Moves.TEMPER_FLARE, Moves.SLUDGE_WAVE, Moves.SCALD ],
-  [Species.STUFFUL]: [ Moves.RAGE, Moves.COACHING, Moves.TEATIME, Moves.SKY_UPPERCUT ],
-  [Species.BOUNSWEET]: [ Moves.TRIPLE_AXEL, Moves.PLAY_ROUGH, Moves.GRASSY_GLIDE, Moves.AQUA_STEP ],
-  [Species.COMFEY]: [ Moves.DECORATE, Moves.POLLEN_PUFF, Moves.TAILWIND, Moves.FLOWER_SHIELD ],
-  [Species.ORANGURU]: [ Moves.FOUL_PLAY, Moves.YAWN, Moves.CRAFTY_SHIELD, Moves.BOOMBURST ],
-  [Species.PASSIMIAN]: [ Moves.TRAILBLAZE, Moves.BULK_UP, Moves.PROTECT, Moves.MACH_PUNCH ],
-  [Species.WIMPOD]: [ Moves.ICE_PUNCH, Moves.FLIP_TURN, Moves.KOWTOW_CLEAVE, Moves.SURGING_STRIKES ],
-  [Species.SANDYGAST]: [ Moves.TRICK_ROOM, Moves.BREAKING_SWIPE, Moves.GYRO_BALL, Moves.BODY_PRESS ],
-  [Species.PYUKUMUKU]: [ Moves.SUBSTITUTE, Moves.RECYCLE, Moves.LIFE_DEW, Moves.MIRROR_COAT ],
-  [Species.TYPE_NULL]: [ Moves.CALM_MIND, Moves.RECOVER, Moves.RETURN, Moves.JUDGMENT ],
-  [Species.MINIOR]: [ Moves.DRACO_METEOR, Moves.FLOATY_FALL, Moves.METEOR_MASH, Moves.SPACIAL_REND ],
-  [Species.KOMALA]: [ Moves.SLACK_OFF, Moves.THRASH, Moves.PSYSHIELD_BASH, Moves.DRAGON_HAMMER ],
-  [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.CUTIEFLY]: [ Moves.SILK_TRAP, Moves.DECORATE, Moves.PARTING_SHOT, Moves.FLORAL_HEALING ],
+  [Species.ROCKRUFF]: [ Moves.KNOCK_OFF, Moves.TIDY_UP, Moves.ICE_SPINNER, Moves.MIGHTY_CLEAVE ],
+  [Species.WISHIWASHI]: [ Moves.FLIP_TURN, Moves.ICE_SPINNER, Moves.SWORDS_DANCE, Moves.POPULATION_BOMB ],
+  [Species.MAREANIE]: [ Moves.SPIKES, Moves.SIZZLY_SLIDE, Moves.MORTAL_SPIN, Moves.LEECH_SEED ],
+  [Species.MUDBRAY]: [ Moves.BODY_PRESS, Moves.YAWN, Moves.SHORE_UP, Moves.LANDS_WRATH ],
+  [Species.DEWPIDER]: [ Moves.AQUA_JET, Moves.SILK_TRAP, Moves.ROCK_SLIDE, Moves.AQUA_STEP ],
+  [Species.FOMANTIS]: [ Moves.SUPERPOWER, Moves.STONE_AXE, Moves.PSYCHO_CUT, Moves.BITTER_BLADE ],
+  [Species.MORELULL]: [ Moves.CALM_MIND, Moves.LEECH_SEED, Moves.STRENGTH_SAP, Moves.SPARKLY_SWIRL ],
+  [Species.SALANDIT]: [ Moves.FAKE_OUT, Moves.FIERY_DANCE, Moves.SCALD, Moves.MALIGNANT_CHAIN ],
+  [Species.STUFFUL]: [ Moves.DRAIN_PUNCH, Moves.THUNDER_PUNCH, Moves.ICE_PUNCH, Moves.RAGE_FIST ],
+  [Species.BOUNSWEET]: [ Moves.TRIPLE_AXEL, Moves.AQUA_STEP, Moves.THUNDEROUS_KICK, Moves.SAPPY_SEED ],
+  [Species.COMFEY]: [ Moves.BUZZY_BUZZ, Moves.POLLEN_PUFF, Moves.STRENGTH_SAP, Moves.MATCHA_GOTCHA ],
+  [Species.ORANGURU]: [ Moves.FOUL_PLAY, Moves.YAWN, Moves.FOLLOW_ME, Moves.LUNAR_BLESSING ],
+  [Species.PASSIMIAN]: [ Moves.FAKE_OUT, Moves.SUCKER_PUNCH, Moves.SPIKES, Moves.SWORDS_DANCE ],
+  [Species.WIMPOD]: [ Moves.ICE_SPINNER, Moves.OBSTRUCT, Moves.KNOCK_OFF, Moves.SURGING_STRIKES ],
+  [Species.SANDYGAST]: [ Moves.SCORCHING_SANDS, Moves.PARTING_SHOT, Moves.CURSE, Moves.SALT_CURE ],
+  [Species.PYUKUMUKU]: [ Moves.MIRROR_COAT, Moves.BANEFUL_BUNKER, Moves.TOXIC_SPIKES, Moves.SALT_CURE ],
+  [Species.TYPE_NULL]: [ Moves.DIRE_CLAW, Moves.RECOVER, Moves.EXTREME_SPEED, Moves.NO_RETREAT ],
+  [Species.MINIOR]: [ Moves.EARTH_POWER, Moves.FLOATY_FALL, Moves.SUPERCELL_SLAM, Moves.DIAMOND_STORM ],
+  [Species.KOMALA]: [ Moves.SLACK_OFF, Moves.EXTREME_SPEED, Moves.DARKEST_LARIAT, Moves.CLOSE_COMBAT ],
+  [Species.TURTONATOR]: [ Moves.SHELL_SMASH, Moves.ARMOR_CANNON, Moves.EARTH_POWER, Moves.CLANGING_SCALES ],
+  [Species.TOGEDEMARU]: [ Moves.SIZZLY_SLIDE, Moves.RECOVER, Moves.SPIKES, Moves.DOUBLE_IRON_BASH ],
+  [Species.MIMIKYU]: [ Moves.SPIRIT_BREAK, Moves.NUZZLE, Moves.PARTING_SHOT, Moves.SPECTRAL_THIEF ],
   [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 ],
-  [Species.TAPU_KOKO]: [ Moves.SPIRIT_BREAK, Moves.PSYSHIELD_BASH, Moves.FLIP_TURN, Moves.BOLT_BEAK ],
-  [Species.TAPU_LELE]: [ Moves.FLORAL_HEALING, Moves.HELPING_HAND, Moves.ALLY_SWITCH, Moves.GEOMANCY ],
-  [Species.TAPU_BULU]: [ Moves.JUNGLE_HEALING, Moves.SPIKY_SHIELD, Moves.COACHING, Moves.GRASSY_GLIDE ],
-  [Species.TAPU_FINI]: [ Moves.WATER_SPOUT, Moves.COSMIC_POWER, Moves.RECOVER, Moves.SPARKLY_SWIRL ],
-  [Species.COSMOG]: [ Moves.MYSTICAL_POWER, Moves.METEOR_MASH, Moves.PSYSHIELD_BASH, Moves.ASTRAL_BARRAGE ],
-  [Species.NIHILEGO]: [ Moves.INFESTATION, Moves.POWER_WHIP, Moves.GIGA_DRAIN, Moves.MALIGNANT_CHAIN ],
-  [Species.BUZZWOLE]: [ Moves.HORN_LEECH, Moves.DIZZY_PUNCH, Moves.METEOR_MASH, Moves.PLASMA_FISTS ],
-  [Species.PHEROMOSA]: [ Moves.DAZZLING_GLEAM, Moves.EXTREME_SPEED, Moves.AXE_KICK, Moves.THUNDEROUS_KICK ],
-  [Species.XURKITREE]: [ Moves.THUNDER, Moves.EXPLOSION, Moves.RISING_VOLTAGE, Moves.TAIL_GLOW ],
-  [Species.CELESTEELA]: [ Moves.FOCUS_BLAST, Moves.HEAT_WAVE, Moves.TERA_BLAST, Moves.AEROBLAST ],
-  [Species.KARTANA]: [ Moves.SLASH, Moves.PSYBLADE, Moves.BITTER_BLADE, Moves.BEHEMOTH_BLADE ],
-  [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.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.ASTRAL_BARRAGE ],
-  [Species.ZERAORA]: [ Moves.ZIPPY_ZAP, Moves.EXTREME_SPEED, Moves.DOUBLE_SHOCK, Moves.WICKED_BLOW ],
-  [Species.MELTAN]: [ Moves.MAKE_IT_RAIN, Moves.DRAIN_PUNCH, Moves.BULLET_PUNCH, Moves.PLASMA_FISTS ],
+  [Species.DRAMPA]: [ Moves.YAWN, Moves.FLAMETHROWER, Moves.CLANGING_SCALES, Moves.CLANGOROUS_SOUL ],
+  [Species.DHELMISE]: [ Moves.POLTERGEIST, Moves.SHIFT_GEAR, Moves.LEAF_BLADE, Moves.DOUBLE_IRON_BASH ],
+  [Species.JANGMO_O]: [ Moves.ICE_BEAM, Moves.RECOVER, Moves.SECRET_SWORD, Moves.GLAIVE_RUSH ],
+  [Species.TAPU_KOKO]: [ Moves.PLAY_ROUGH, Moves.ICE_SPINNER, Moves.RISING_VOLTAGE, Moves.BOLT_BEAK ],
+  [Species.TAPU_LELE]: [ Moves.MOONLIGHT, Moves.NASTY_PLOT, Moves.HEAT_WAVE, Moves.EXPANDING_FORCE ],
+  [Species.TAPU_BULU]: [ Moves.JUNGLE_HEALING, Moves.CLOSE_COMBAT, Moves.PLAY_ROUGH, Moves.GRASSY_GLIDE ],
+  [Species.TAPU_FINI]: [ Moves.AURA_SPHERE, Moves.EARTH_POWER, Moves.RECOVER, Moves.QUIVER_DANCE ],
+  [Species.COSMOG]: [ Moves.VICTORY_DANCE, Moves.QUIVER_DANCE, Moves.STORED_POWER, Moves.PHOTON_GEYSER ],
+  [Species.NIHILEGO]: [ Moves.RECOVER, Moves.QUIVER_DANCE, Moves.GIGA_DRAIN, Moves.MALIGNANT_CHAIN ],
+  [Species.BUZZWOLE]: [ Moves.LEECH_LIFE, Moves.BULLET_PUNCH, Moves.DARKEST_LARIAT, Moves.COLLISION_COURSE ],
+  [Species.PHEROMOSA]: [ Moves.AURA_SPHERE, Moves.MAKE_IT_RAIN, Moves.ATTACK_ORDER, Moves.COLLISION_COURSE ],
+  [Species.XURKITREE]: [ Moves.OVERHEAT, Moves.GIGA_DRAIN, Moves.THUNDERCLAP, Moves.TAIL_GLOW ],
+  [Species.CELESTEELA]: [ Moves.ROOST, Moves.BUZZY_BUZZ, Moves.SPIKES, Moves.OBLIVION_WING ],
+  [Species.KARTANA]: [ Moves.MIGHTY_CLEAVE, Moves.CEASELESS_EDGE, Moves.BITTER_BLADE, Moves.BEHEMOTH_BLADE ],
+  [Species.GUZZLORD]: [ Moves.DIRE_CLAW, Moves.GLAIVE_RUSH, Moves.SLACK_OFF, Moves.BADDY_BAD ],
+  [Species.NECROZMA]: [ Moves.COSMIC_POWER, Moves.SACRED_FIRE, Moves.ASTRAL_BARRAGE, Moves.CLANGOROUS_SOUL ],
+  [Species.MAGEARNA]: [ Moves.RECOVER, Moves.EARTH_POWER, Moves.COSMIC_POWER, Moves.MAKE_IT_RAIN ],
+  [Species.MARSHADOW]: [ Moves.POWER_UP_PUNCH, Moves.TRIPLE_AXEL, Moves.STORM_THROW, Moves.DOUBLE_IRON_BASH ],
+  [Species.POIPOLE]: [ Moves.SLUDGE_BOMB, Moves.BUG_BUZZ, Moves.SEARING_SHOT, Moves.DRAGON_ENERGY ],
+  [Species.STAKATAKA]: [ Moves.SALT_CURE, Moves.SHORE_UP, Moves.CURSE, Moves.DOUBLE_IRON_BASH ],
+  [Species.BLACEPHALON]: [ Moves.NASTY_PLOT, Moves.SEARING_SHOT, Moves.GIGA_DRAIN, Moves.ASTRAL_BARRAGE ],
+  [Species.ZERAORA]: [ Moves.SWORDS_DANCE, Moves.TRIPLE_AXEL, Moves.BOLT_STRIKE, Moves.PYRO_BALL ],
+  [Species.MELTAN]: [ Moves.BULLET_PUNCH, Moves.DRAIN_PUNCH, Moves.BULK_UP, Moves.RECOVER ],
   [Species.GROOKEY]: [ Moves.JUNGLE_HEALING, Moves.CLOSE_COMBAT, Moves.BOOMBURST, Moves.BELLY_DRUM ],
   [Species.SCORBUNNY]: [ Moves.EXTREME_SPEED, Moves.TROP_KICK, Moves.WILD_CHARGE, Moves.THUNDEROUS_KICK ],
   [Species.SOBBLE]: [ Moves.SHELL_SIDE_ARM, Moves.FROST_BREATH, Moves.AURA_SPHERE, Moves.SURGING_STRIKES ],
@@ -543,13 +543,13 @@ export const speciesEggMoves = {
   [Species.IRON_CROWN]: [ Moves.KINGS_SHIELD, Moves.SECRET_SWORD, Moves.PHOTON_GEYSER, Moves.ELECTRO_DRIFT ],
   [Species.TERAPAGOS]: [ Moves.EARTH_POWER, Moves.SHORE_UP, Moves.ICE_BEAM, Moves.SHELL_SMASH ],
   [Species.PECHARUNT]: [ Moves.TOXIC_SPIKES, Moves.BODY_PRESS, Moves.HEX, Moves.BANEFUL_BUNKER ],
-  [Species.ALOLA_RATTATA]: [ Moves.STUFF_CHEEKS, Moves.BADDY_BAD, Moves.FLAME_WHEEL, Moves.RECYCLE ],
-  [Species.ALOLA_SANDSHREW]: [ Moves.SPIKY_SHIELD, Moves.ICE_SHARD, Moves.CRUSH_CLAW, Moves.SPIN_OUT ],
-  [Species.ALOLA_VULPIX]: [ Moves.MOONBLAST, Moves.HYPNOSIS, Moves.CHILLING_WATER, Moves.FREEZY_FROST ],
-  [Species.ALOLA_DIGLETT]: [ Moves.STONE_EDGE, Moves.SWORDS_DANCE, Moves.THIEF, Moves.POPULATION_BOMB ],
-  [Species.ALOLA_MEOWTH]: [ Moves.MAKE_IT_RAIN, Moves.COVET, Moves.HYPNOSIS, Moves.PARTING_SHOT ],
-  [Species.ALOLA_GEODUDE]: [ Moves.HEAD_CHARGE, Moves.RAPID_SPIN, Moves.MAGNET_RISE, Moves.HEAD_SMASH ],
-  [Species.ALOLA_GRIMER]: [ Moves.SUCKER_PUNCH, Moves.DIRE_CLAW, Moves.RECYCLE, Moves.EMBARGO ],
+  [Species.ALOLA_RATTATA]: [ Moves.STORM_THROW, Moves.PLAY_ROUGH, Moves.TIDY_UP, Moves.POPULATION_BOMB ],
+  [Species.ALOLA_SANDSHREW]: [ Moves.SPIKY_SHIELD, Moves.AQUA_CUTTER, Moves.SHIFT_GEAR, Moves.GLACIAL_LANCE ],
+  [Species.ALOLA_VULPIX]: [ Moves.MOONBLAST, Moves.AURORA_VEIL, Moves.PARTING_SHOT, Moves.FREEZY_FROST ],
+  [Species.ALOLA_DIGLETT]: [ Moves.LANDS_WRATH, Moves.SWORDS_DANCE, Moves.TRIPLE_DIVE, Moves.DOUBLE_IRON_BASH ],
+  [Species.ALOLA_MEOWTH]: [ Moves.MAKE_IT_RAIN, Moves.BUZZY_BUZZ, Moves.PARTING_SHOT, Moves.BADDY_BAD ],
+  [Species.ALOLA_GEODUDE]: [ Moves.HIGH_HORSEPOWER, Moves.BULK_UP, Moves.STONE_AXE, Moves.EXTREME_SPEED ],
+  [Species.ALOLA_GRIMER]: [ Moves.SUCKER_PUNCH, Moves.DIRE_CLAW, Moves.STRENGTH_SAP, Moves.SURGING_STRIKES ],
   [Species.ETERNAL_FLOETTE]: [ Moves.DECORATE, Moves.FORESTS_CURSE, Moves.POLLEN_PUFF, Moves.QUIVER_DANCE ],
   [Species.GALAR_MEOWTH]: [ Moves.MAKE_IT_RAIN, Moves.KNOCK_OFF, Moves.TRAILBLAZE, Moves.BEHEMOTH_BASH ],
   [Species.GALAR_PONYTA]: [ Moves.PURIFY, Moves.POISON_JAB, Moves.HORN_LEECH, Moves.PSYSTRIKE ],
diff --git a/src/data/move.ts b/src/data/move.ts
index 16fbb255c19..79364fb41d0 100644
--- a/src/data/move.ts
+++ b/src/data/move.ts
@@ -2304,7 +2304,10 @@ export class WaterSuperEffectTypeMultiplierAttr extends VariableMoveTypeMultipli
 export class OneHitKOAccuracyAttr extends VariableAccuracyAttr {
   apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean {
     const accuracy = args[0] as Utils.NumberHolder;
-    accuracy.value = 30 + 70 * Math.min(target.level / user.level, 0.5) * 2;
+    if (user.level < target.level)
+      accuracy.value = 0;
+    else
+      accuracy.value = Math.min(Math.max(30 + 100 * (1 - target.level / user.level), 0), 100);
     return true;
   }
 }
diff --git a/src/data/pokemon-level-moves.ts b/src/data/pokemon-level-moves.ts
index e205febcd2a..51ddbb53d8a 100644
--- a/src/data/pokemon-level-moves.ts
+++ b/src/data/pokemon-level-moves.ts
@@ -18391,6 +18391,69 @@ export const pokemonFormLevelMoves: PokemonSpeciesFormLevelMoves = {
       [ 60, Moves.STONE_EDGE ],
     ],
   },
+  [Species.NECROZMA]: {
+    1: [
+      [ 0, Moves.SUNSTEEL_STRIKE ],
+      [ 1, Moves.CONFUSION ],
+      [ 1, Moves.METAL_CLAW ],
+      [ 1, Moves.MORNING_SUN ],
+      [ 1, Moves.MOONLIGHT ],
+      [ 1, Moves.GRAVITY ],
+      [ 1, Moves.CHARGE_BEAM ],
+      [ 8, Moves.STEALTH_ROCK ],
+      [ 16, Moves.SLASH ],
+      [ 24, Moves.NIGHT_SLASH ],
+      [ 32, Moves.PSYCHO_CUT ],
+      [ 40, Moves.STORED_POWER ],
+      [ 48, Moves.ROCK_BLAST ],
+      [ 56, Moves.IRON_DEFENSE ],
+      [ 64, Moves.POWER_GEM ],
+      [ 72, Moves.PHOTON_GEYSER ],
+      [ 80, Moves.AUTOTOMIZE ],
+      [ 88, Moves.PRISMATIC_LASER ],
+    ],
+    2: [
+      [ 0, Moves.MOONGEIST_BEAM ],
+      [ 1, Moves.CONFUSION ],
+      [ 1, Moves.METAL_CLAW ],
+      [ 1, Moves.MORNING_SUN ],
+      [ 1, Moves.MOONLIGHT ],
+      [ 1, Moves.GRAVITY ],
+      [ 1, Moves.CHARGE_BEAM ],
+      [ 8, Moves.STEALTH_ROCK ],
+      [ 16, Moves.SLASH ],
+      [ 24, Moves.NIGHT_SLASH ],
+      [ 32, Moves.PSYCHO_CUT ],
+      [ 40, Moves.STORED_POWER ],
+      [ 48, Moves.ROCK_BLAST ],
+      [ 56, Moves.IRON_DEFENSE ],
+      [ 64, Moves.POWER_GEM ],
+      [ 72, Moves.PHOTON_GEYSER ],
+      [ 80, Moves.AUTOTOMIZE ],
+      [ 88, Moves.PRISMATIC_LASER ],
+    ],
+    3: [
+      [ 0, Moves.SUNSTEEL_STRIKE ],
+      [ 0, Moves.MOONGEIST_BEAM ],
+      [ 1, Moves.CONFUSION ],
+      [ 1, Moves.METAL_CLAW ],
+      [ 1, Moves.MORNING_SUN ],
+      [ 1, Moves.MOONLIGHT ],
+      [ 1, Moves.GRAVITY ],
+      [ 1, Moves.CHARGE_BEAM ],
+      [ 8, Moves.STEALTH_ROCK ],
+      [ 16, Moves.SLASH ],
+      [ 24, Moves.NIGHT_SLASH ],
+      [ 32, Moves.PSYCHO_CUT ],
+      [ 40, Moves.STORED_POWER ],
+      [ 48, Moves.ROCK_BLAST ],
+      [ 56, Moves.IRON_DEFENSE ],
+      [ 64, Moves.POWER_GEM ],
+      [ 72, Moves.PHOTON_GEYSER ],
+      [ 80, Moves.AUTOTOMIZE ],
+      [ 88, Moves.PRISMATIC_LASER ],
+    ],
+  },
   [Species.TOXTRICITY]: {
     1: [
       [ 0, Moves.SPARK ],
diff --git a/src/data/pokemon-species.ts b/src/data/pokemon-species.ts
index 3c77c4d5562..72850fb05ed 100644
--- a/src/data/pokemon-species.ts
+++ b/src/data/pokemon-species.ts
@@ -802,13 +802,13 @@ export function initSpecies() {
       new PokemonForm("G-Max", SpeciesFormKey.GIGANTAMAX, Type.WATER, null, 25, 85.5, Abilities.TORRENT, Abilities.NONE, Abilities.RAIN_DISH, 630, 100, 95, 130, 105, 125, 75, 45, 50, 265),
     ),
     new PokemonSpecies(Species.CATERPIE, 1, false, false, false, "Worm Pokémon", Type.BUG, null, 0.3, 2.9, Abilities.SHIELD_DUST, Abilities.NONE, Abilities.RUN_AWAY, 195, 45, 30, 35, 20, 20, 45, 255, 50, 39, GrowthRate.MEDIUM_FAST, 50, false),
-    new PokemonSpecies(Species.METAPOD, 1, false, false, false, "Cocoon Pokémon", Type.BUG, null, 0.7, 9.9, Abilities.SHED_SKIN, Abilities.NONE, Abilities.NONE, 205, 50, 20, 55, 25, 25, 30, 120, 50, 72, GrowthRate.MEDIUM_FAST, 50, false),
+    new PokemonSpecies(Species.METAPOD, 1, false, false, false, "Cocoon Pokémon", Type.BUG, null, 0.7, 9.9, Abilities.SHED_SKIN, Abilities.NONE, Abilities.SHED_SKIN, 205, 50, 20, 55, 25, 25, 30, 120, 50, 72, GrowthRate.MEDIUM_FAST, 50, false),
     new PokemonSpecies(Species.BUTTERFREE, 1, false, false, false, "Butterfly Pokémon", Type.BUG, Type.FLYING, 1.1, 32, Abilities.COMPOUND_EYES, Abilities.NONE, Abilities.TINTED_LENS, 395, 60, 45, 50, 90, 80, 70, 45, 50, 198, GrowthRate.MEDIUM_FAST, 50, true, true,
       new PokemonForm("Normal", "", Type.BUG, Type.FLYING, 1.1, 32, Abilities.COMPOUND_EYES, Abilities.NONE, Abilities.TINTED_LENS, 395, 60, 45, 50, 90, 80, 70, 45, 50, 198, true),
       new PokemonForm("G-Max", SpeciesFormKey.GIGANTAMAX, Type.BUG, Type.FLYING, 17, 32, Abilities.COMPOUND_EYES, Abilities.NONE, Abilities.TINTED_LENS, 495, 75, 50, 75, 120, 100, 75, 45, 50, 198, true),
     ),
     new PokemonSpecies(Species.WEEDLE, 1, false, false, false, "Hairy Bug Pokémon", Type.BUG, Type.POISON, 0.3, 3.2, Abilities.SHIELD_DUST, Abilities.NONE, Abilities.RUN_AWAY, 195, 40, 35, 30, 20, 20, 50, 255, 70, 39, GrowthRate.MEDIUM_FAST, 50, false),
-    new PokemonSpecies(Species.KAKUNA, 1, false, false, false, "Cocoon Pokémon", Type.BUG, Type.POISON, 0.6, 10, Abilities.SHED_SKIN, Abilities.NONE, Abilities.NONE, 205, 45, 25, 50, 25, 25, 35, 120, 70, 72, GrowthRate.MEDIUM_FAST, 50, false),
+    new PokemonSpecies(Species.KAKUNA, 1, false, false, false, "Cocoon Pokémon", Type.BUG, Type.POISON, 0.6, 10, Abilities.SHED_SKIN, Abilities.NONE, Abilities.SHED_SKIN, 205, 45, 25, 50, 25, 25, 35, 120, 70, 72, GrowthRate.MEDIUM_FAST, 50, false),
     new PokemonSpecies(Species.BEEDRILL, 1, false, false, false, "Poison Bee Pokémon", Type.BUG, Type.POISON, 1, 29.5, Abilities.SWARM, Abilities.NONE, Abilities.SNIPER, 395, 65, 90, 40, 45, 80, 75, 45, 70, 178, GrowthRate.MEDIUM_FAST, 50, false, true,
       new PokemonForm("Normal", "", Type.BUG, Type.POISON, 1, 29.5, Abilities.SWARM, Abilities.NONE, Abilities.SNIPER, 395, 65, 90, 40, 45, 80, 75, 45, 70, 178),
       new PokemonForm("Mega", SpeciesFormKey.MEGA, Type.BUG, Type.POISON, 1.4, 40.5, Abilities.ADAPTABILITY, Abilities.NONE, Abilities.ADAPTABILITY, 495, 65, 150, 40, 15, 80, 145, 45, 70, 178),
@@ -1172,9 +1172,9 @@ export function initSpecies() {
     new PokemonSpecies(Species.ZIGZAGOON, 3, false, false, false, "Tiny Raccoon Pokémon", Type.NORMAL, null, 0.4, 17.5, Abilities.PICKUP, Abilities.GLUTTONY, Abilities.QUICK_FEET, 240, 38, 30, 41, 30, 41, 60, 255, 50, 56, GrowthRate.MEDIUM_FAST, 50, false),
     new PokemonSpecies(Species.LINOONE, 3, false, false, false, "Rushing Pokémon", Type.NORMAL, null, 0.5, 32.5, Abilities.PICKUP, Abilities.GLUTTONY, Abilities.QUICK_FEET, 420, 78, 70, 61, 50, 61, 100, 90, 50, 147, GrowthRate.MEDIUM_FAST, 50, false),
     new PokemonSpecies(Species.WURMPLE, 3, false, false, false, "Worm Pokémon", Type.BUG, null, 0.3, 3.6, Abilities.SHIELD_DUST, Abilities.NONE, Abilities.RUN_AWAY, 195, 45, 45, 35, 20, 30, 20, 255, 70, 56, GrowthRate.MEDIUM_FAST, 50, false),
-    new PokemonSpecies(Species.SILCOON, 3, false, false, false, "Cocoon Pokémon", Type.BUG, null, 0.6, 10, Abilities.SHED_SKIN, Abilities.NONE, Abilities.NONE, 205, 50, 35, 55, 25, 25, 15, 120, 70, 72, GrowthRate.MEDIUM_FAST, 50, false),
+    new PokemonSpecies(Species.SILCOON, 3, false, false, false, "Cocoon Pokémon", Type.BUG, null, 0.6, 10, Abilities.SHED_SKIN, Abilities.NONE, Abilities.SHED_SKIN, 205, 50, 35, 55, 25, 25, 15, 120, 70, 72, GrowthRate.MEDIUM_FAST, 50, false),
     new PokemonSpecies(Species.BEAUTIFLY, 3, false, false, false, "Butterfly Pokémon", Type.BUG, Type.FLYING, 1, 28.4, Abilities.SWARM, Abilities.NONE, Abilities.RIVALRY, 395, 60, 70, 50, 100, 50, 65, 45, 70, 178, GrowthRate.MEDIUM_FAST, 50, true),
-    new PokemonSpecies(Species.CASCOON, 3, false, false, false, "Cocoon Pokémon", Type.BUG, null, 0.7, 11.5, Abilities.SHED_SKIN, Abilities.NONE, Abilities.NONE, 205, 50, 35, 55, 25, 25, 15, 120, 70, 72, GrowthRate.MEDIUM_FAST, 50, false),
+    new PokemonSpecies(Species.CASCOON, 3, false, false, false, "Cocoon Pokémon", Type.BUG, null, 0.7, 11.5, Abilities.SHED_SKIN, Abilities.NONE, Abilities.SHED_SKIN, 205, 50, 35, 55, 25, 25, 15, 120, 70, 72, GrowthRate.MEDIUM_FAST, 50, false),
     new PokemonSpecies(Species.DUSTOX, 3, false, false, false, "Poison Moth Pokémon", Type.BUG, Type.POISON, 1.2, 31.6, Abilities.SHIELD_DUST, Abilities.NONE, Abilities.COMPOUND_EYES, 385, 60, 50, 70, 50, 90, 65, 45, 70, 173, GrowthRate.MEDIUM_FAST, 50, true),
     new PokemonSpecies(Species.LOTAD, 3, false, false, false, "Water Weed Pokémon", Type.WATER, Type.GRASS, 0.5, 2.6, Abilities.SWIFT_SWIM, Abilities.RAIN_DISH, Abilities.OWN_TEMPO, 220, 40, 30, 30, 40, 50, 30, 255, 50, 44, GrowthRate.MEDIUM_SLOW, 50, false),
     new PokemonSpecies(Species.LOMBRE, 3, false, false, false, "Jolly Pokémon", Type.WATER, Type.GRASS, 1.2, 32.5, Abilities.SWIFT_SWIM, Abilities.RAIN_DISH, Abilities.OWN_TEMPO, 340, 60, 50, 50, 60, 70, 50, 120, 50, 119, GrowthRate.MEDIUM_SLOW, 50, false),
diff --git a/src/phases.ts b/src/phases.ts
index 91741bacd2b..038907d9400 100644
--- a/src/phases.ts
+++ b/src/phases.ts
@@ -702,7 +702,7 @@ export class EncounterPhase extends BattlePhase {
       }
 
       if (!this.loaded)
-        this.scene.gameData.setPokemonSeen(enemyPokemon);
+        this.scene.gameData.setPokemonSeen(enemyPokemon, true, battle.battleType === BattleType.TRAINER);
 
       if (enemyPokemon.species.speciesId === Species.ETERNATUS) {
         if (this.scene.gameMode.isClassic && (battle.battleSpec === BattleSpec.FINAL_BOSS || this.scene.gameMode.isWaveFinal(battle.waveIndex))) {
diff --git a/src/system/game-data.ts b/src/system/game-data.ts
index c5b9f32cf9c..0c176e446d9 100644
--- a/src/system/game-data.ts
+++ b/src/system/game-data.ts
@@ -993,13 +993,13 @@ export class GameData {
     this.starterData = starterData;
   }
 
-  setPokemonSeen(pokemon: Pokemon, incrementCount: boolean = true): void {
+  setPokemonSeen(pokemon: Pokemon, incrementCount: boolean = true, trainer: boolean = false): void {
     const dexEntry = this.dexData[pokemon.species.speciesId];
     dexEntry.seenAttr |= pokemon.getDexAttr();
     if (incrementCount) {
       dexEntry.seenCount++;
       this.gameStats.pokemonSeen++;
-      if (pokemon.isShiny())
+      if (!trainer && pokemon.isShiny())
         this.gameStats.shinyPokemonSeen++;
     }
   }