diff --git a/src/data/move.ts b/src/data/move.ts
index 5673d437f9e..a0249ca67a7 100644
--- a/src/data/move.ts
+++ b/src/data/move.ts
@@ -5080,7 +5080,7 @@ const invalidMetronomeMoves: Moves[] = [
   Moves.AFTER_YOU,
   Moves.APPLE_ACID,
   Moves.ARMOR_CANNON,
-  // Moves.ASSIST,
+  Moves.ASSIST,
   Moves.ASTRAL_BARRAGE,
   Moves.AURA_WHEEL,
   Moves.BANEFUL_BUNKER,
@@ -5088,13 +5088,13 @@ const invalidMetronomeMoves: Moves[] = [
   Moves.BEHEMOTH_BASH,
   Moves.BEHEMOTH_BLADE,
   Moves.BELCH,
-  // Moves.BESTOW,
+  Moves.BESTOW,
   Moves.BLAZING_TORQUE,
   Moves.BODY_PRESS,
   Moves.BRANCH_POKE,
   Moves.BREAKING_SWIPE,
   Moves.CELEBRATE,
-  // Moves.CHATTER,
+  Moves.CHATTER,
   Moves.CHILLING_WATER,
   Moves.CHILLY_RECEPTION,
   Moves.CLANGOROUS_SOUL,
@@ -5104,13 +5104,13 @@ const invalidMetronomeMoves: Moves[] = [
   Moves.COPYCAT,
   Moves.COUNTER,
   Moves.COVET,
-  // Moves.CRAFTY_SHIELD,
+  Moves.CRAFTY_SHIELD,
   Moves.DECORATE,
   Moves.DESTINY_BOND,
   Moves.DETECT,
   Moves.DIAMOND_STORM,
   Moves.DOODLE,
-  // Moves.DOUBLE_IRON_BASH,
+  Moves.DOUBLE_IRON_BASH,
   Moves.DOUBLE_SHOCK,
   Moves.DRAGON_ASCENT,
   Moves.DRAGON_ENERGY,
@@ -5118,7 +5118,7 @@ const invalidMetronomeMoves: Moves[] = [
   Moves.DYNAMAX_CANNON,
   Moves.ELECTRO_DRIFT,
   Moves.ENDURE,
-  // Moves.ETERNABEAM,
+  Moves.ETERNABEAM,
   Moves.FALSE_SURRENDER,
   Moves.FEINT,
   Moves.FIERY_WRATH,
@@ -5139,29 +5139,29 @@ const invalidMetronomeMoves: Moves[] = [
   Moves.INSTRUCT,
   Moves.JET_PUNCH,
   Moves.JUNGLE_HEALING,
-  // Moves.KINGS_SHIELD,
+  Moves.KINGS_SHIELD,
   Moves.LIFE_DEW,
-  // Moves.LIGHT_OF_RUIN,
+  Moves.LIGHT_OF_RUIN,
   Moves.MAKE_IT_RAIN,
   Moves.MAGICAL_TORQUE,
-  // Moves.MAT_BLOCK,
-  // Moves.ME_FIRST,
-  // Moves.METEOR_ASSAULT,
+  Moves.MAT_BLOCK,
+  Moves.ME_FIRST,
+  Moves.METEOR_ASSAULT,
   Moves.METRONOME,
   Moves.MIMIC,
-  // Moves.MIND_BLOWN,
+  Moves.MIND_BLOWN,
   Moves.MIRROR_COAT,
-  // Moves.MIRROR_MOVE,
+  Moves.MIRROR_MOVE,
   Moves.MOONGEIST_BEAM,
-  // Moves.NATURE_POWER,
-  // Moves.NATURES_MADNESS,
+  Moves.NATURE_POWER,
+  Moves.NATURES_MADNESS,
   Moves.NOXIOUS_TORQUE,
-  // Moves.OBSTRUCT,
+  Moves.OBSTRUCT,
   Moves.ORDER_UP,
   Moves.ORIGIN_PULSE,
   Moves.OVERDRIVE,
   Moves.PHOTON_GEYSER,
-  // Moves.PLASMA_FISTS,
+  Moves.PLASMA_FISTS,
   Moves.POPULATION_BOMB,
   Moves.POUNCE,
   Moves.POWER_SHIFT,
@@ -5180,20 +5180,20 @@ const invalidMetronomeMoves: Moves[] = [
   Moves.SALT_CURE,
   Moves.SECRET_SWORD,
   Moves.SHED_TAIL,
-  // Moves.SHELL_TRAP,
+  Moves.SHELL_TRAP,
   Moves.SILK_TRAP,
   Moves.SKETCH,
   Moves.SLEEP_TALK,
-  // Moves.SNAP_TRAP,
+  Moves.SNAP_TRAP,
   Moves.SNARL,
-  // Moves.SNATCH,
+  Moves.SNATCH,
   Moves.SNORE,
   Moves.SNOWSCAPE,
-  // Moves.SPECTRAL_THIEF,
+  Moves.SPECTRAL_THIEF,
   Moves.SPICY_EXTRACT,
   Moves.SPIKY_SHIELD,
   Moves.SPIRIT_BREAK,
-  // Moves.SPOTLIGHT,
+  Moves.SPOTLIGHT,
   Moves.STEAM_ERUPTION,
   Moves.STEEL_BEAM,
   Moves.STRANGE_STEAM,
@@ -5201,11 +5201,11 @@ const invalidMetronomeMoves: Moves[] = [
   Moves.SUNSTEEL_STRIKE,
   Moves.SURGING_STRIKES,
   Moves.SWITCHEROO,
-  // Moves.TECHNO_BLAST,
+  Moves.TECHNO_BLAST,
   Moves.TERA_STARSTORM,
   Moves.THIEF,
-  // Moves.THOUSAND_ARROWS,
-  // Moves.THOUSAND_WAVES,
+  Moves.THOUSAND_ARROWS,
+  Moves.THOUSAND_WAVES,
   Moves.THUNDER_CAGE,
   Moves.THUNDEROUS_KICK,
   Moves.TIDY_UP,
@@ -5216,7 +5216,64 @@ const invalidMetronomeMoves: Moves[] = [
   Moves.V_CREATE,
   Moves.WICKED_BLOW,
   Moves.WICKED_TORQUE,
-  Moves.WIDE_GUARD
+  Moves.WIDE_GUARD,
+  /* Max moves */
+  Moves.MAX_STRIKE,
+  Moves.MAX_KNUCKLE,
+  Moves.MAX_AIRSTREAM,
+  Moves.MAX_OOZE,
+  Moves.MAX_QUAKE,
+  Moves.MAX_ROCKFALL,
+  Moves.MAX_FLUTTERBY,
+  Moves.MAX_PHANTASM,
+  Moves.MAX_STEELSPIKE,
+  Moves.MAX_FLARE,
+  Moves.MAX_GEYSER,
+  Moves.MAX_OVERGROWTH,
+  Moves.MAX_LIGHTNING,
+  Moves.MAX_MINDSTORM,
+  Moves.MAX_HAILSTORM,
+  Moves.MAX_WYRMWIND,
+  Moves.MAX_DARKNESS,
+  Moves.MAX_STARFALL,
+  Moves.MAX_GUARD,
+  /* Z moves */
+  Moves.BREAKNECK_BLITZ__PHYSICAL,
+  Moves.BREAKNECK_BLITZ__SPECIAL,
+  Moves.ALL_OUT_PUMMELING__PHYSICAL,
+  Moves.ALL_OUT_PUMMELING__SPECIAL,
+  Moves.SUPERSONIC_SKYSTRIKE__PHYSICAL,
+  Moves.SUPERSONIC_SKYSTRIKE__SPECIAL,
+  Moves.ACID_DOWNPOUR__PHYSICAL,
+  Moves.ACID_DOWNPOUR__SPECIAL,
+  Moves.TECTONIC_RAGE__PHYSICAL,
+  Moves.TECTONIC_RAGE__SPECIAL,
+  Moves.CONTINENTAL_CRUSH__PHYSICAL,
+  Moves.CONTINENTAL_CRUSH__SPECIAL,
+  Moves.SAVAGE_SPIN_OUT__PHYSICAL,
+  Moves.SAVAGE_SPIN_OUT__SPECIAL,
+  Moves.NEVER_ENDING_NIGHTMARE__PHYSICAL,
+  Moves.NEVER_ENDING_NIGHTMARE__SPECIAL,
+  Moves.CORKSCREW_CRASH__PHYSICAL,
+  Moves.CORKSCREW_CRASH__SPECIAL,
+  Moves.INFERNO_OVERDRIVE__PHYSICAL,
+  Moves.INFERNO_OVERDRIVE__SPECIAL,
+  Moves.HYDRO_VORTEX__PHYSICAL,
+  Moves.HYDRO_VORTEX__SPECIAL,
+  Moves.BLOOM_DOOM__PHYSICAL,
+  Moves.BLOOM_DOOM__SPECIAL,
+  Moves.GIGAVOLT_HAVOC__PHYSICAL,
+  Moves.GIGAVOLT_HAVOC__SPECIAL,
+  Moves.SHATTERED_PSYCHE__PHYSICAL,
+  Moves.SHATTERED_PSYCHE__SPECIAL,
+  Moves.SUBZERO_SLAMMER__PHYSICAL,
+  Moves.SUBZERO_SLAMMER__SPECIAL,
+  Moves.DEVASTATING_DRAKE__PHYSICAL,
+  Moves.DEVASTATING_DRAKE__SPECIAL,
+  Moves.BLACK_HOLE_ECLIPSE__PHYSICAL,
+  Moves.BLACK_HOLE_ECLIPSE__SPECIAL,
+  Moves.TWINKLE_TACKLE__PHYSICAL,
+  Moves.TWINKLE_TACKLE__SPECIAL,
 ];
 
 const invalidAssistMoves: Moves[] = [
@@ -5272,12 +5329,11 @@ const invalidAssistMoves: Moves[] = [
   Moves.WHIRLWIND,
 ];
 
-// Commented moves are not usable in Gen 8, but may have been usable in Gen 7
 const invalidSleepTalkMoves: Moves[] = [
-  // Moves.ASSIST,
+  Moves.ASSIST,
   Moves.BELCH,
-  // Moves.BEAK_BLAST,
-  // Moves.BIDE,
+  Moves.BEAK_BLAST,
+  Moves.BIDE,
   Moves.BOUNCE,
   Moves.COPYCAT,
   Moves.DIG,
@@ -5286,20 +5342,20 @@ const invalidSleepTalkMoves: Moves[] = [
   Moves.FREEZE_SHOCK,
   Moves.FLY,
   Moves.FOCUS_PUNCH,
-  // Moves.GEOMANCY,
+  Moves.GEOMANCY,
   Moves.ICE_BURN,
   Moves.ME_FIRST,
   Moves.METRONOME,
-  // Moves.MIRROR_MOVE,
+  Moves.MIRROR_MOVE,
   Moves.MIMIC,
   Moves.PHANTOM_FORCE,
-  // Moves.RAZOR_WIND,
-  // Moves.SHADOW_FORCE,
+  Moves.RAZOR_WIND,
+  Moves.SHADOW_FORCE,
   Moves.SHELL_TRAP,
-  // Moves.SKETCH,
+  Moves.SKETCH,
   Moves.SKULL_BASH,
   Moves.SKY_ATTACK,
-  // Moves.SKY_DROP,
+  Moves.SKY_DROP,
   Moves.SLEEP_TALK,
   Moves.SOLAR_BLADE,
   Moves.SOLAR_BEAM,