diff --git a/src/data/tms.ts b/src/data/tms.ts
index a0359a5d526..761dcdf6be4 100644
--- a/src/data/tms.ts
+++ b/src/data/tms.ts
@@ -282,9 +282,13 @@ export const tmSpecies: TmSpecies = {
     Species.MEWTWO,
     Species.MEW,
     Species.HOPPIP,
+    Species.SKIPLOOM,
+    Species.JUMPLUFF,
     Species.ESPEON,
     Species.UMBREON,
     Species.SLOWKING,
+    Species.SKITTY,
+    Species.DELCATTY,
     Species.MUNCHLAX,
     Species.RHYPERIOR,
     Species.LEAFEON,
@@ -301,6 +305,7 @@ export const tmSpecies: TmSpecies = {
     Species.PERRSERKER,
     Species.INDEEDEE,
     Species.CALYREX,
+    Species.ANNIHILAPE,
     Species.ALOLA_RAICHU,
     Species.ALOLA_MEOWTH,
     Species.ALOLA_PERSIAN,
@@ -400,11 +405,7 @@ export const tmSpecies: TmSpecies = {
     Species.REGIROCK,
     Species.GROUDON,
     Species.JIRACHI,
-    [
-      Species.DEOXYS,
-      "",
-      "speed",
-    ],
+    Species.DEOXYS,
     Species.CHIMCHAR,
     Species.MONFERNO,
     Species.INFERNAPE,
@@ -459,6 +460,10 @@ export const tmSpecies: TmSpecies = {
     Species.HOOPA,
     Species.INCINEROAR,
     Species.GUMSHOOS,
+    [
+      Species.LYCANROC,
+      "midnight",
+    ],
     Species.KOMMO_O,
     Species.MARSHADOW,
     Species.BLACEPHALON,
@@ -603,11 +608,7 @@ export const tmSpecies: TmSpecies = {
     Species.REGICE,
     Species.REGISTEEL,
     Species.JIRACHI,
-    [
-      Species.DEOXYS,
-      "",
-      "speed",
-    ],
+    Species.DEOXYS,
     Species.BUIZEL,
     Species.FLOATZEL,
     Species.AMBIPOM,
@@ -807,11 +808,7 @@ export const tmSpecies: TmSpecies = {
     Species.REGISTEEL,
     Species.GROUDON,
     Species.JIRACHI,
-    [
-      Species.DEOXYS,
-      "",
-      "speed",
-    ],
+    Species.DEOXYS,
     Species.CHIMCHAR,
     Species.MONFERNO,
     Species.INFERNAPE,
@@ -877,6 +874,10 @@ export const tmSpecies: TmSpecies = {
     Species.CRABOMINABLE,
     Species.STUFFUL,
     Species.BEWEAR,
+    [
+      Species.LYCANROC,
+      "midnight",
+    ],
     Species.KOMMO_O,
     Species.TAPU_KOKO,
     Species.BUZZWOLE,
@@ -954,6 +955,8 @@ export const tmSpecies: TmSpecies = {
     Species.EXEGGUTOR,
     Species.CUBONE,
     Species.MAROWAK,
+    Species.HITMONLEE,
+    Species.HITMONCHAN,
     Species.LICKITUNG,
     Species.RHYHORN,
     Species.RHYDON,
@@ -1078,6 +1081,7 @@ export const tmSpecies: TmSpecies = {
     Species.LILLIGANT,
     Species.DWEBBLE,
     Species.CRUSTLE,
+    Species.SCRAFTY,
     Species.ZORUA,
     Species.ZOROARK,
     Species.SAWSBUCK,
@@ -2026,6 +2030,7 @@ export const tmSpecies: TmSpecies = {
     Species.PUPITAR,
     Species.TYRANITAR,
     Species.LUGIA,
+    Species.HO_OH,
     Species.TREECKO,
     Species.GROVYLE,
     Species.SCEPTILE,
@@ -2146,6 +2151,7 @@ export const tmSpecies: TmSpecies = {
     Species.LUXRAY,
     Species.ROSERADE,
     Species.SHIELDON,
+    Species.BASTIODON,
     Species.FLOATZEL,
     Species.SHELLOS,
     Species.GASTRODON,
@@ -2188,8 +2194,15 @@ export const tmSpecies: TmSpecies = {
     Species.GIRATINA,
     Species.CRESSELIA,
     Species.ARCEUS,
+    Species.SERPERIOR,
     Species.TEPIG,
+    Species.PIGNITE,
+    Species.EMBOAR,
     Species.SAMUROTT,
+    Species.BLITZLE,
+    Species.ZEBSTRIKA,
+    Species.DRILBUR,
+    Species.EXCADRILL,
     Species.AUDINO,
     Species.CONKELDURR,
     Species.THROH,
@@ -2197,11 +2210,13 @@ export const tmSpecies: TmSpecies = {
     Species.KROKOROK,
     Species.KROOKODILE,
     Species.DARMANITAN,
+    Species.SCRAFTY,
     Species.TIRTOUGA,
     Species.CARRACOSTA,
     Species.GARBODOR,
     Species.ZOROARK,
     Species.GOTHITELLE,
+    Species.REUNICLUS,
     Species.DEERLING,
     Species.SAWSBUCK,
     Species.FOONGUS,
@@ -2216,6 +2231,7 @@ export const tmSpecies: TmSpecies = {
     Species.SHELMET,
     Species.ACCELGOR,
     Species.DRUDDIGON,
+    Species.GOLETT,
     Species.GOLURK,
     Species.BOUFFALANT,
     Species.RUFFLET,
@@ -2226,9 +2242,15 @@ export const tmSpecies: TmSpecies = {
     Species.HYDREIGON,
     Species.LARVESTA,
     Species.VOLCARONA,
+    Species.COBALION,
+    Species.TERRAKION,
+    Species.VIRIZION,
     Species.TORNADUS,
     Species.THUNDURUS,
+    Species.RESHIRAM,
+    Species.ZEKROM,
     Species.LANDORUS,
+    Species.KYUREM,
     Species.CHESPIN,
     Species.QUILLADIN,
     Species.CHESNAUGHT,
@@ -2261,18 +2283,17 @@ export const tmSpecies: TmSpecies = {
     Species.LITTEN,
     Species.TORRACAT,
     Species.INCINEROAR,
+    Species.BRIONNE,
+    Species.PRIMARINA,
     Species.GUMSHOOS,
     Species.CRABRAWLER,
     Species.CRABOMINABLE,
     Species.ROCKRUFF,
-    [
-      Species.LYCANROC,
-      "midday",
-      "midnight",
-    ],
+    Species.LYCANROC,
     Species.TOXAPEX,
     Species.MUDBRAY,
     Species.MUDSDALE,
+    Species.ARAQUANID,
     Species.SALAZZLE,
     Species.BEWEAR,
     Species.ORANGURU,
@@ -2283,10 +2304,12 @@ export const tmSpecies: TmSpecies = {
     Species.JANGMO_O,
     Species.HAKAMO_O,
     Species.KOMMO_O,
+    Species.SOLGALEO,
     Species.NIHILEGO,
     Species.BUZZWOLE,
     Species.CELESTEELA,
     Species.GUZZLORD,
+    Species.NECROZMA,
     Species.MAGEARNA,
     Species.STAKATAKA,
     Species.MELMETAL,
@@ -3648,6 +3671,7 @@ export const tmSpecies: TmSpecies = {
     Species.SPINARAK,
     Species.ARIADOS,
     Species.PINECO,
+    Species.FORRETRESS,
     Species.QWILFISH,
     Species.HERACROSS,
     Species.ZIGZAGOON,
@@ -4258,6 +4282,7 @@ export const tmSpecies: TmSpecies = {
     Species.DEWOTT,
     Species.SAMUROTT,
     Species.PANPOUR,
+    Species.SIMIPOUR,
     Species.DRILBUR,
     Species.EXCADRILL,
     Species.TYMPOLE,
@@ -4288,6 +4313,7 @@ export const tmSpecies: TmSpecies = {
     Species.WISHIWASHI,
     Species.MAREANIE,
     Species.TOXAPEX,
+    Species.DEWPIDER,
     Species.ARAQUANID,
     Species.BRUXISH,
     Species.DRAMPA,
@@ -4328,7 +4354,10 @@ export const tmSpecies: TmSpecies = {
     Species.ROARING_MOON,
     Species.WALKING_WAKE,
     Species.HYDRAPPLE,
-    Species.ROTOM,
+    [
+      Species.ROTOM,
+      "wash",
+    ],
     Species.GALAR_SLOWPOKE,
     Species.GALAR_SLOWBRO,
     Species.GALAR_SLOWKING,
@@ -5148,7 +5177,10 @@ export const tmSpecies: TmSpecies = {
     Species.ARCTIBAX,
     Species.BAXCALIBUR,
     Species.CHIEN_PAO,
-    Species.ROTOM,
+    [
+      Species.ROTOM,
+      "frost",
+    ],
     Species.ALOLA_RATTATA,
     Species.ALOLA_RATICATE,
     Species.ALOLA_SANDSHREW,
@@ -5909,6 +5941,8 @@ export const tmSpecies: TmSpecies = {
     Species.MACHAMP,
     Species.PONYTA,
     Species.RAPIDASH,
+    Species.DODUO,
+    Species.DODRIO,
     Species.DROWZEE,
     Species.HYPNO,
     Species.EXEGGUTOR,
@@ -7108,6 +7142,7 @@ export const tmSpecies: TmSpecies = {
     Species.HEATRAN,
     Species.VICTINI,
     Species.PANSEAR,
+    Species.SIMISEAR,
     Species.DARUMAKA,
     Species.DARMANITAN,
     Species.LITWICK,
@@ -10173,6 +10208,8 @@ export const tmSpecies: TmSpecies = {
     Species.ZORUA,
     Species.ZOROARK,
     Species.SOLOSIS,
+    Species.DUOSION,
+    Species.REUNICLUS,
     Species.FRILLISH,
     Species.JELLICENT,
     Species.LITWICK,
@@ -10184,6 +10221,7 @@ export const tmSpecies: TmSpecies = {
     Species.PHANTUMP,
     Species.TREVENANT,
     Species.ROWLET,
+    Species.DARTRIX,
     Species.DECIDUEYE,
     Species.SANDYGAST,
     Species.PALOSSAND,
@@ -10226,6 +10264,7 @@ export const tmSpecies: TmSpecies = {
     Species.HISUI_ZORUA,
     Species.HISUI_ZOROARK,
     Species.HISUI_BRAVIARY,
+    Species.HISUI_DECIDUEYE,
   ],
   [Moves.SCREECH]: [
     Species.RATTATA,
@@ -11532,6 +11571,7 @@ export const tmSpecies: TmSpecies = {
     Species.PSYDUCK,
     Species.GOLDUCK,
     Species.TENTACOOL,
+    Species.TENTACRUEL,
     Species.MAGNEMITE,
     Species.MAGNETON,
     Species.GRIMER,
@@ -11587,6 +11627,9 @@ export const tmSpecies: TmSpecies = {
     Species.DUSKULL,
     Species.DUSCLOPS,
     Species.CLAMPERL,
+    Species.HUNTAIL,
+    Species.GOREBYSS,
+    Species.JIRACHI,
     Species.SHINX,
     Species.LUXIO,
     Species.LUXRAY,
@@ -11598,6 +11641,7 @@ export const tmSpecies: TmSpecies = {
     Species.MIME_JR,
     Species.SPIRITOMB,
     Species.SKORUPI,
+    Species.DRAPION,
     Species.FINNEON,
     Species.LUMINEON,
     Species.MANTYKE,
@@ -11612,17 +11656,23 @@ export const tmSpecies: TmSpecies = {
     Species.REGIGIGAS,
     Species.GIRATINA,
     Species.CRESSELIA,
+    Species.DARKRAI,
     Species.ARCEUS,
     Species.WATCHOG,
     Species.ZORUA,
     Species.ZOROARK,
     Species.SOLOSIS,
+    Species.DUOSION,
+    Species.REUNICLUS,
     Species.FRILLISH,
+    Species.JELLICENT,
     Species.EELEKTROSS,
     Species.LITWICK,
     Species.LAMPENT,
     Species.CHANDELURE,
     Species.CRYOGONAL,
+    Species.GOLETT,
+    Species.GOLURK,
     Species.DELPHOX,
     Species.VIVILLON,
     Species.PHANTUMP,
@@ -11630,6 +11680,7 @@ export const tmSpecies: TmSpecies = {
     Species.PUMPKABOO,
     Species.GOURGEIST,
     Species.ROWLET,
+    Species.DARTRIX,
     Species.DECIDUEYE,
     Species.MORELULL,
     Species.SHIINOTIC,
@@ -11643,7 +11694,11 @@ export const tmSpecies: TmSpecies = {
     Species.ORBEETLE,
     Species.SINISTEA,
     Species.POLTEAGEIST,
+    Species.CURSOLA,
+    Species.MR_RIME,
     Species.DREEPY,
+    Species.DRAKLOAK,
+    Species.DRAGAPULT,
     Species.ETERNATUS,
     Species.SPECTRIER,
     Species.WYRDEER,
@@ -11688,6 +11743,7 @@ export const tmSpecies: TmSpecies = {
     Species.HISUI_ZORUA,
     Species.HISUI_ZOROARK,
     Species.HISUI_BRAVIARY,
+    Species.HISUI_DECIDUEYE,
   ],
   [Moves.LIGHT_SCREEN]: [
     Species.BULBASAUR,
@@ -13875,6 +13931,7 @@ export const tmSpecies: TmSpecies = {
     Species.MAMOSWINE,
     Species.UXIE,
     Species.PANSEAR,
+    Species.SIMISEAR,
     Species.MUNNA,
     Species.MUSHARNA,
     Species.WOOBAT,
@@ -19142,6 +19199,7 @@ export const tmSpecies: TmSpecies = {
   ],
   [Moves.REVERSAL]: [
     Species.RATTATA,
+    Species.RATICATE,
     Species.PIKACHU,
     Species.RAICHU,
     Species.DIGLETT,
@@ -19155,6 +19213,7 @@ export const tmSpecies: TmSpecies = {
     Species.MACHOKE,
     Species.MACHAMP,
     Species.HITMONLEE,
+    Species.HITMONCHAN,
     Species.RHYHORN,
     Species.RHYDON,
     Species.KANGASKHAN,
@@ -19172,6 +19231,8 @@ export const tmSpecies: TmSpecies = {
     Species.YANMA,
     Species.PINECO,
     Species.FORRETRESS,
+    Species.SNUBBULL,
+    Species.GRANBULL,
     Species.QWILFISH,
     Species.SCIZOR,
     Species.SHUCKLE,
@@ -19180,8 +19241,10 @@ export const tmSpecies: TmSpecies = {
     Species.SWINUB,
     Species.PILOSWINE,
     Species.DELIBIRD,
+    Species.SKARMORY,
     Species.HOUNDOUR,
     Species.HOUNDOOM,
+    Species.HITMONTOP,
     Species.MILTANK,
     Species.ENTEI,
     Species.TORCHIC,
@@ -19210,11 +19273,14 @@ export const tmSpecies: TmSpecies = {
     Species.LUCARIO,
     Species.CROAGUNK,
     Species.TOXICROAK,
+    Species.WEAVILE,
     Species.RHYPERIOR,
     Species.YANMEGA,
     Species.MAMOSWINE,
     Species.GALLADE,
     Species.VICTINI,
+    Species.PIGNITE,
+    Species.EMBOAR,
     Species.LILLIPUP,
     Species.HERDIER,
     Species.STOUTLAND,
@@ -19225,6 +19291,7 @@ export const tmSpecies: TmSpecies = {
     Species.SAWK,
     Species.BASCULIN,
     Species.DARMANITAN,
+    Species.SCRAFTY,
     Species.ESCAVALIER,
     Species.AXEW,
     Species.FRAXURE,
@@ -19256,6 +19323,11 @@ export const tmSpecies: TmSpecies = {
     Species.CRABRAWLER,
     Species.CRABOMINABLE,
     Species.ORICORIO,
+    [
+      Species.LYCANROC,
+      "midnight",
+      "dusk",
+    ],
     Species.BEWEAR,
     Species.PASSIMIAN,
     Species.SILVALLY,
@@ -19312,6 +19384,7 @@ export const tmSpecies: TmSpecies = {
     Species.OGERPON,
     Species.GOUGING_FIRE,
     Species.ALOLA_RATTATA,
+    Species.ALOLA_RATICATE,
     Species.ALOLA_RAICHU,
     Species.ALOLA_DIGLETT,
     Species.ALOLA_DUGTRIO,
@@ -25824,7 +25897,100 @@ export const tmSpecies: TmSpecies = {
     Species.DRAGAPULT,
     Species.KUBFU,
     Species.URSHIFU,
+    Species.WYRDEER,
+    Species.KLEAVOR,
+    Species.URSALUNA,
+    Species.BASCULEGION,
+    Species.SNEASLER,
+    Species.OVERQWIL,
+    Species.ENAMORUS,
+    Species.SPRIGATITO,
+    Species.FLORAGATO,
+    Species.MEOWSCARADA,
+    Species.FUECOCO,
+    Species.CROCALOR,
+    Species.SKELEDIRGE,
+    Species.QUAXLY,
+    Species.QUAXWELL,
+    Species.QUAQUAVAL,
+    Species.LECHONK,
+    Species.OINKOLOGNE,
+    Species.TAROUNTULA,
+    Species.SPIDOPS,
+    Species.NYMBLE,
+    Species.LOKIX,
+    Species.PAWMI,
+    Species.PAWMO,
+    Species.PAWMOT,
+    Species.FIDOUGH,
+    Species.DACHSBUN,
+    Species.SMOLIV,
+    Species.DOLLIV,
+    Species.ARBOLIVA,
+    Species.SQUAWKABILLY,
+    Species.NACLI,
+    Species.NACLSTACK,
+    Species.GARGANACL,
+    Species.CHARCADET,
+    Species.ARMAROUGE,
+    Species.CERULEDGE,
+    Species.TADBULB,
+    Species.BELLIBOLT,
+    Species.WATTREL,
+    Species.KILOWATTREL,
+    Species.MASCHIFF,
+    Species.MABOSSTIFF,
+    Species.SHROODLE,
+    Species.GRAFAIAI,
+    Species.BRAMBLIN,
+    Species.BRAMBLEGHAST,
+    Species.TOEDSCOOL,
+    Species.TOEDSCRUEL,
+    Species.KLAWF,
+    Species.CAPSAKID,
+    Species.SCOVILLAIN,
+    Species.RELLOR,
+    Species.RABSCA,
+    Species.FLITTLE,
+    Species.ESPATHRA,
+    Species.TINKATINK,
+    Species.TINKATUFF,
+    Species.TINKATON,
+    Species.WIGLETT,
+    Species.WUGTRIO,
+    Species.BOMBIRDIER,
+    Species.FINIZEN,
+    Species.PALAFIN,
+    Species.VAROOM,
+    Species.REVAVROOM,
+    Species.CYCLIZAR,
+    Species.ORTHWORM,
+    Species.GLIMMET,
+    Species.GLIMMORA,
+    Species.GREAVARD,
+    Species.HOUNDSTONE,
+    Species.FLAMIGO,
+    Species.CETODDLE,
+    Species.CETITAN,
+    Species.VELUZA,
+    Species.DONDOZO,
+    Species.TATSUGIRI,
+    Species.ANNIHILAPE,
+    Species.CLODSIRE,
+    Species.FARIGIRAF,
+    Species.DUDUNSPARCE,
+    Species.KINGAMBIT,
+    Species.FRIGIBAX,
+    Species.ARCTIBAX,
+    Species.BAXCALIBUR,
+    Species.DIPPLIN,
+    Species.OKIDOGI,
+    Species.MUNKIDORI,
     Species.FEZANDIPITI,
+    Species.OGERPON,
+    Species.ARCHALUDON,
+    Species.HYDRAPPLE,
+    Species.TERAPAGOS,
     Species.ALOLA_RATTATA,
     Species.ALOLA_RATICATE,
     Species.ALOLA_RAICHU,
@@ -25860,6 +26026,23 @@ export const tmSpecies: TmSpecies = {
     Species.GALAR_DARMANITAN,
     Species.GALAR_YAMASK,
     Species.GALAR_STUNFISK,
+    Species.HISUI_GROWLITHE,
+    Species.HISUI_ARCANINE,
+    Species.HISUI_TYPHLOSION,
+    Species.HISUI_QWILFISH,
+    Species.HISUI_SNEASEL,
+    Species.HISUI_SAMUROTT,
+    Species.HISUI_LILLIGANT,
+    Species.HISUI_ZORUA,
+    Species.HISUI_ZOROARK,
+    Species.HISUI_BRAVIARY,
+    Species.HISUI_SLIGGOO,
+    Species.HISUI_GOODRA,
+    Species.HISUI_AVALUGG,
+    Species.HISUI_DECIDUEYE,
+    Species.PALDEA_TAUROS,
+    Species.PALDEA_WOOPER,
+    Species.BLOODMOON_URSALUNA,
   ],
   [Moves.SLEEP_TALK]: [
     Species.BULBASAUR,
@@ -26757,6 +26940,8 @@ export const tmSpecies: TmSpecies = {
     Species.FUECOCO,
     Species.CROCALOR,
     Species.SKELEDIRGE,
+    Species.QUAXLY,
+    Species.QUAXWELL,
     Species.QUAQUAVAL,
     Species.LECHONK,
     Species.OINKOLOGNE,
@@ -26833,10 +27018,12 @@ export const tmSpecies: TmSpecies = {
     Species.FLUTTER_MANE,
     Species.SLITHER_WING,
     Species.SANDY_SHOCKS,
+    Species.IRON_TREADS,
     Species.IRON_BUNDLE,
     Species.IRON_HANDS,
     Species.IRON_JUGULIS,
     Species.IRON_MOTH,
+    Species.IRON_THORNS,
     Species.FRIGIBAX,
     Species.ARCTIBAX,
     Species.BAXCALIBUR,
@@ -29618,6 +29805,7 @@ export const tmSpecies: TmSpecies = {
     Species.GREAT_TUSK,
     Species.IRON_TREADS,
     Species.IRON_LEAVES,
+    Species.IRON_BOULDER,
     Species.GALAR_RAPIDASH,
     [
       Species.CALYREX,
@@ -29840,17 +30028,20 @@ export const tmSpecies: TmSpecies = {
     Species.GENGAR,
     Species.DROWZEE,
     Species.HYPNO,
+    Species.HITMONCHAN,
     Species.MR_MIME,
     Species.JYNX,
     Species.SNORLAX,
     Species.DRAGONITE,
     Species.MEW,
     Species.LEDYBA,
+    Species.LEDIAN,
     Species.PICHU,
     Species.CLEFFA,
     Species.IGGLYBUFF,
     Species.TOGEPI,
     Species.TOGETIC,
+    Species.BELLOSSOM,
     Species.MARILL,
     Species.AZUMARILL,
     Species.POLITOED,
@@ -29862,6 +30053,8 @@ export const tmSpecies: TmSpecies = {
     Species.WOOPER,
     Species.QUAGSIRE,
     Species.WOBBUFFET,
+    Species.SNUBBULL,
+    Species.GRANBULL,
     Species.SHUCKLE,
     Species.PHANPY,
     Species.DONPHAN,
@@ -29925,6 +30118,8 @@ export const tmSpecies: TmSpecies = {
     Species.LILLIGANT,
     Species.DARUMAKA,
     Species.DARMANITAN,
+    Species.SCRAGGY,
+    Species.SCRAFTY,
     Species.ZORUA,
     Species.ZOROARK,
     Species.MINCCINO,
@@ -29951,6 +30146,7 @@ export const tmSpecies: TmSpecies = {
     Species.POPPLIO,
     Species.BRIONNE,
     Species.PRIMARINA,
+    Species.TOUCANNON,
     Species.SALAZZLE,
     Species.COMFEY,
     Species.ORANGURU,
@@ -29961,10 +30157,14 @@ export const tmSpecies: TmSpecies = {
     Species.TOXTRICITY,
     Species.MR_RIME,
     Species.ALCREMIE,
-    Species.INDEEDEE,
+    [
+      Species.INDEEDEE,
+      "male",
+    ],
     Species.ZARUDE,
     Species.CALYREX,
     Species.FUECOCO,
+    Species.CROCALOR,
     Species.SKELEDIRGE,
     Species.QUAXLY,
     Species.QUAXWELL,
@@ -30307,8 +30507,13 @@ export const tmSpecies: TmSpecies = {
     Species.ZACIAN,
     Species.ZAMAZENTA,
     Species.ZARUDE,
+    Species.WYRDEER,
+    Species.SNEASLER,
     Species.CYCLIZAR,
     Species.ORTHWORM,
+    Species.ANNIHILAPE,
+    Species.FARIGIRAF,
+    Species.DUDUNSPARCE,
     Species.ALOLA_RATTATA,
     Species.ALOLA_RATICATE,
     Species.ALOLA_RAICHU,
@@ -30328,6 +30533,10 @@ export const tmSpecies: TmSpecies = {
     Species.GALAR_SLOWKING,
     Species.GALAR_ZIGZAGOON,
     Species.GALAR_LINOONE,
+    Species.HISUI_GROWLITHE,
+    Species.HISUI_ARCANINE,
+    Species.HISUI_TYPHLOSION,
+    Species.HISUI_SLIGGOO,
     Species.HISUI_GOODRA,
   ],
   [Moves.METAL_CLAW]: [
@@ -33185,8 +33394,11 @@ export const tmSpecies: TmSpecies = {
     Species.HERDIER,
     Species.STOUTLAND,
     Species.PANSAGE,
+    Species.SIMISAGE,
     Species.PANSEAR,
+    Species.SIMISAGE,
     Species.PANPOUR,
+    Species.SIMIPOUR,
     Species.BASCULIN,
     Species.SANDILE,
     Species.KROKOROK,
@@ -34575,6 +34787,7 @@ export const tmSpecies: TmSpecies = {
     Species.LOTAD,
     Species.LOMBRE,
     Species.LUDICOLO,
+    Species.WINGULL,
     Species.PELIPPER,
     Species.EXPLOUD,
     Species.MAKUHITA,
@@ -34624,17 +34837,25 @@ export const tmSpecies: TmSpecies = {
     Species.PHIONE,
     Species.MANAPHY,
     Species.ARCEUS,
+    Species.OSHAWOTT,
+    Species.DEWOTT,
+    Species.SAMUROTT,
     Species.BASCULIN,
     Species.TIRTOUGA,
     Species.CARRACOSTA,
+    Species.DUCKLETT,
+    Species.SWANNA,
     Species.FRILLISH,
     Species.JELLICENT,
     Species.ALOMOMOLA,
     Species.BARBARACLE,
+    Species.SKRELP,
+    Species.DRAGALGE,
     Species.POPPLIO,
     Species.BRIONNE,
     Species.PRIMARINA,
     Species.WISHIWASHI,
+    Species.BRUXISH,
     Species.DHELMISE,
     Species.TAPU_FINI,
     Species.SOBBLE,
@@ -34651,7 +34872,16 @@ export const tmSpecies: TmSpecies = {
     Species.EISCUE,
     Species.DRACOVISH,
     Species.ARCTOVISH,
+    Species.BASCULEGION,
+    Species.QUAXLY,
+    Species.QUAXWELL,
+    Species.QUAQUAVAL,
+    Species.WIGLETT,
+    Species.WUGTRIO,
+    Species.PALAFIN,
+    Species.TATSUGIRI,
     Species.IRON_BUNDLE,
+    Species.WALKING_WAKE,
     Species.GALAR_SLOWPOKE,
     Species.GALAR_SLOWBRO,
     Species.GALAR_SLOWKING,
@@ -34662,12 +34892,18 @@ export const tmSpecies: TmSpecies = {
       Species.URSHIFU,
       "rapid-strike",
     ],
+    Species.HISUI_SAMUROTT,
+    [
+      Species.PALDEA_TAUROS,
+      "aqua",
+    ],
   ],
   [Moves.BEAT_UP]: [
     Species.CHARMANDER,
     Species.CHARMELEON,
     Species.CHARIZARD,
     Species.EKANS,
+    Species.ARBOK,
     Species.NIDORAN_F,
     Species.NIDORINA,
     Species.NIDOQUEEN,
@@ -34677,6 +34913,7 @@ export const tmSpecies: TmSpecies = {
     Species.DIGLETT,
     Species.DUGTRIO,
     Species.MANKEY,
+    Species.PRIMEAPE,
     Species.KANGASKHAN,
     Species.MEW,
     Species.AIPOM,
@@ -34720,6 +34957,10 @@ export const tmSpecies: TmSpecies = {
     Species.TANDEMAUS,
     Species.MAUSHOLD,
     Species.BRAMBLIN,
+    Species.BRAMBLEGHAST,
+    Species.ANNIHILAPE,
+    Species.FARIGIRAF,
+    Species.KINGAMBIT,
     Species.FEZANDIPITI,
     Species.PIKACHU,
     Species.ALOLA_DIGLETT,
@@ -36894,6 +37135,7 @@ export const tmSpecies: TmSpecies = {
     Species.SCEPTILE,
     Species.COMBUSKEN,
     Species.BLAZIKEN,
+    Species.MARSHTOMP,
     Species.SWAMPERT,
     Species.LUDICOLO,
     Species.SHROOMISH,
@@ -36984,6 +37226,7 @@ export const tmSpecies: TmSpecies = {
     Species.GOLETT,
     Species.GOLURK,
     Species.HEATMOR,
+    Species.ZEKROM,
     Species.MELOETTA,
     Species.CHESPIN,
     Species.QUILLADIN,
@@ -37010,9 +37253,11 @@ export const tmSpecies: TmSpecies = {
     Species.ZERAORA,
     Species.RILLABOOM,
     Species.GRIMMSNARL,
+    Species.MR_RIME,
     Species.KUBFU,
     Species.URSHIFU,
     Species.ZARUDE,
+    Species.URSALUNA,
     Species.SNEASLER,
     Species.PAWMO,
     Species.PAWMOT,
@@ -37035,7 +37280,9 @@ export const tmSpecies: TmSpecies = {
       Species.LYCANROC,
       "midnight",
     ],
+    Species.GALAR_MR_MIME,
     Species.GALAR_DARUMAKA,
+    Species.GALAR_DARMANITAN,
     Species.HISUI_TYPHLOSION,
     Species.HISUI_SNEASEL,
     Species.HISUI_ZORUA,
@@ -37184,12 +37431,18 @@ export const tmSpecies: TmSpecies = {
     Species.TAPU_FINI,
     Species.XURKITREE,
     Species.GROOKEY,
+    Species.THWACKEY,
+    Species.RILLABOOM,
+    Species.CURSOLA,
     Species.ALOLA_GEODUDE,
     Species.ALOLA_GRAVELER,
     Species.ALOLA_GOLEM,
     Species.ALOLA_EXEGGUTOR,
     Species.ETERNAL_FLOETTE,
     Species.GALAR_CORSOLA,
+    Species.HISUI_TYPHLOSION,
+    Species.HISUI_LILLIGANT,
+    Species.HISUI_DECIDUEYE,
   ],
   [Moves.CHARGE]: [
     Species.PIKACHU,
@@ -38709,7 +38962,9 @@ export const tmSpecies: TmSpecies = {
   ],
   [Moves.REVENGE]: [
     Species.RATTATA,
+    Species.RATICATE,
     Species.MANKEY,
+    Species.PRIMEAPE,
     Species.MACHOP,
     Species.MACHOKE,
     Species.MACHAMP,
@@ -38721,6 +38976,7 @@ export const tmSpecies: TmSpecies = {
     Species.MEW,
     Species.AIPOM,
     Species.PINECO,
+    Species.FORRETRESS,
     Species.QWILFISH,
     Species.HERACROSS,
     Species.HITMONTOP,
@@ -38729,12 +38985,16 @@ export const tmSpecies: TmSpecies = {
     Species.BLAZIKEN,
     Species.SHIFTRY,
     Species.MAKUHITA,
+    Species.HARIYAMA,
     Species.CACTURNE,
     Species.ZANGOOSE,
     Species.CRAWDAUNT,
     Species.DUSKULL,
     Species.DUSCLOPS,
     Species.STARLY,
+    Species.STARAVIA,
+    Species.STARAPTOR,
+    Species.AMBIPOM,
     Species.VESPIQUEN,
     Species.RIOLU,
     Species.LUCARIO,
@@ -38750,6 +39010,7 @@ export const tmSpecies: TmSpecies = {
     Species.DEWOTT,
     Species.SAMUROTT,
     Species.PATRAT,
+    Species.WATCHOG,
     Species.TIMBURR,
     Species.GURDURR,
     Species.CONKELDURR,
@@ -38785,6 +39046,7 @@ export const tmSpecies: TmSpecies = {
     Species.TORRACAT,
     Species.INCINEROAR,
     Species.YUNGOOS,
+    Species.GUMSHOOS,
     Species.MUDSDALE,
     Species.BEWEAR,
     Species.PASSIMIAN,
@@ -38817,13 +39079,18 @@ export const tmSpecies: TmSpecies = {
     Species.KUBFU,
     Species.URSHIFU,
     Species.ZARUDE,
+    Species.BASCULEGION,
+    Species.ANNIHILAPE,
+    Species.KINGAMBIT,
     Species.ALOLA_RATTATA,
+    Species.ALOLA_RATICATE,
     [
       Species.LYCANROC,
       "midnight",
     ],
     Species.GALAR_FARFETCHD,
     Species.GALAR_ZAPDOS,
+    Species.HISUI_SAMUROTT,
     Species.GALAR_STUNFISK,
   ],
   [Moves.BRICK_BREAK]: [
@@ -40317,6 +40584,7 @@ export const tmSpecies: TmSpecies = {
     Species.XATU,
     Species.MURKROW,
     Species.DELIBIRD,
+    Species.LUGIA,
     Species.TORCHIC,
     Species.COMBUSKEN,
     Species.BLAZIKEN,
@@ -40373,6 +40641,8 @@ export const tmSpecies: TmSpecies = {
     Species.COMBUSKEN,
     Species.BLAZIKEN,
     Species.CHIMCHAR,
+    Species.MONFERNO,
+    Species.INFERNAPE,
     Species.RIOLU,
     Species.LUCARIO,
     Species.VICTINI,
@@ -40913,6 +41183,7 @@ export const tmSpecies: TmSpecies = {
   ],
   [Moves.AIR_CUTTER]: [
     Species.CHARMANDER,
+    Species.CHARMELEON,
     Species.CHARIZARD,
     Species.BUTTERFREE,
     Species.BEEDRILL,
@@ -40968,6 +41239,8 @@ export const tmSpecies: TmSpecies = {
     Species.ALTARIA,
     Species.TROPIUS,
     Species.SALAMENCE,
+    Species.LATIAS,
+    Species.LATIOS,
     Species.EMPOLEON,
     Species.STARLY,
     Species.STARAVIA,
@@ -41008,6 +41281,9 @@ export const tmSpecies: TmSpecies = {
     Species.ROWLET,
     Species.DARTRIX,
     Species.DECIDUEYE,
+    Species.PIKIPEK,
+    Species.TRUMBEAK,
+    Species.TOUCANNON,
     Species.ORICORIO,
     Species.KARTANA,
     Species.NAGANADEL,
@@ -41134,7 +41410,10 @@ export const tmSpecies: TmSpecies = {
     Species.KORAIDON,
     Species.MIRAIDON,
     Species.GOUGING_FIRE,
-    Species.ROTOM,
+    [
+      Species.ROTOM,
+      "heat",
+    ],
     Species.GALAR_WEEZING,
     Species.GALAR_DARUMAKA,
     Species.GALAR_DARMANITAN,
@@ -41644,6 +41923,7 @@ export const tmSpecies: TmSpecies = {
     Species.NATU,
     Species.XATU,
     Species.SKITTY,
+    Species.DELCATTY,
     Species.LUNATONE,
     Species.SOLROCK,
     Species.BALTOY,
@@ -41674,6 +41954,7 @@ export const tmSpecies: TmSpecies = {
     Species.NECROZMA,
     Species.ETERNATUS,
     Species.RELLOR,
+    Species.RABSCA,
   ],
   [Moves.SIGNAL_BEAM]: [
     Species.BLASTOISE,
@@ -42161,7 +42442,9 @@ export const tmSpecies: TmSpecies = {
     Species.SHAYMIN,
     Species.ARCEUS,
     Species.PATRAT,
+    Species.WATCHOG,
     Species.PANSAGE,
+    Species.SIMISAGE,
     Species.LEAVANNY,
     Species.PETILIL,
     Species.LILLIGANT,
@@ -42591,6 +42874,7 @@ export const tmSpecies: TmSpecies = {
   ],
   [Moves.ICICLE_SPEAR]: [
     Species.SEEL,
+    Species.DEWGONG,
     Species.SHELLDER,
     Species.CLOYSTER,
     Species.JYNX,
@@ -43018,6 +43302,7 @@ export const tmSpecies: TmSpecies = {
     Species.MACHAMP,
     Species.HITMONLEE,
     Species.HITMONCHAN,
+    Species.ELECTABUZZ,
     Species.PINSIR,
     Species.MEWTWO,
     Species.MEW,
@@ -43051,10 +43336,12 @@ export const tmSpecies: TmSpecies = {
     Species.LUCARIO,
     Species.CROAGUNK,
     Species.TOXICROAK,
+    Species.ELECTIVIRE,
     Species.GALLADE,
     Species.DIALGA,
     Species.PALKIA,
     Species.ARCEUS,
+    Species.PIGNITE,
     Species.EMBOAR,
     Species.TIMBURR,
     Species.GURDURR,
@@ -44239,6 +44526,8 @@ export const tmSpecies: TmSpecies = {
     Species.DRAGONITE,
     Species.MEW,
     Species.TOTODILE,
+    Species.CROCONAW,
+    Species.FERALIGATR,
     Species.STEELIX,
     Species.KINGDRA,
     Species.LARVITAR,
@@ -44341,6 +44630,7 @@ export const tmSpecies: TmSpecies = {
     Species.GROUDON,
     Species.TORTERRA,
     Species.SHIELDON,
+    Species.BASTIODON,
     Species.GASTRODON,
     Species.BRONZOR,
     Species.BRONZONG,
@@ -44374,6 +44664,7 @@ export const tmSpecies: TmSpecies = {
     Species.TRUMBEAK,
     Species.TOUCANNON,
     Species.LYCANROC,
+    Species.MINIOR,
     Species.NECROZMA,
     Species.STAKATAKA,
     Species.BLACEPHALON,
@@ -44400,6 +44691,7 @@ export const tmSpecies: TmSpecies = {
     Species.GLIMMET,
     Species.GLIMMORA,
     Species.IRON_THORNS,
+    Species.IRON_BOULDER,
     [
       Species.WORMADAM,
       "sandy",
@@ -48382,7 +48674,10 @@ export const tmSpecies: TmSpecies = {
     Species.IRON_BOULDER,
     Species.IRON_CROWN,
     Species.SHAYMIN,
-    Species.ROTOM,
+    [
+      Species.ROTOM,
+      "fan",
+    ],
     Species.GALAR_ARTICUNO,
     Species.GALAR_MOLTRES,
     Species.HISUI_SAMUROTT,
@@ -52277,6 +52572,9 @@ export const tmSpecies: TmSpecies = {
     Species.BULBASAUR,
     Species.IVYSAUR,
     Species.VENUSAUR,
+    Species.ODDISH,
+    Species.GLOOM,
+    Species.VILEPLUME,
     Species.BELLSPROUT,
     Species.WEEPINBELL,
     Species.VICTREEBEL,
@@ -52285,6 +52583,8 @@ export const tmSpecies: TmSpecies = {
     Species.TANGELA,
     Species.MEW,
     Species.CHIKORITA,
+    Species.BAYLEEF,
+    Species.MEGANIUM,
     Species.BELLOSSOM,
     Species.HOPPIP,
     Species.SKIPLOOM,
@@ -52318,6 +52618,7 @@ export const tmSpecies: TmSpecies = {
     Species.SERVINE,
     Species.SERPERIOR,
     Species.PANSAGE,
+    Species.SIMISAGE,
     Species.LEAVANNY,
     Species.PETILIL,
     Species.LILLIGANT,
@@ -52371,7 +52672,10 @@ export const tmSpecies: TmSpecies = {
     Species.OGERPON,
     Species.HYDRAPPLE,
     Species.SHAYMIN,
-    Species.ROTOM,
+    [
+      Species.ROTOM,
+      "mow",
+    ],
     Species.ALOLA_EXEGGUTOR,
     Species.HISUI_VOLTORB,
     Species.HISUI_ELECTRODE,