diff --git a/src/data/balance/tms.ts b/src/data/balance/tms.ts
index e08b677c30c..1a509637e05 100644
--- a/src/data/balance/tms.ts
+++ b/src/data/balance/tms.ts
@@ -1107,12 +1107,7 @@ export const tmSpecies: TmSpecies = {
     Species.QUILLADIN,
     Species.CHESNAUGHT,
     Species.FROGADIER,
-    [
-      Species.GRENINJA,
-      "",
-      "battle-bond",
-      "ash",
-    ],
+    Species.GRENINJA,
     Species.BUNNELBY,
     Species.DIGGERSBY,
     Species.FLETCHLING,
@@ -2878,12 +2873,7 @@ export const tmSpecies: TmSpecies = {
     Species.DELPHOX,
     Species.FROAKIE,
     Species.FROGADIER,
-    [
-      Species.GRENINJA,
-      "",
-      "battle-bond",
-      "ash",
-    ],
+    Species.GRENINJA,
     Species.BUNNELBY,
     Species.DIGGERSBY,
     Species.FLETCHLING,
@@ -3910,7 +3900,6 @@ export const tmSpecies: TmSpecies = {
     Species.YAMPER,
     Species.BOLTUND,
     Species.ZAMAZENTA,
-    Species.URSHIFU,
     Species.ZARUDE,
     Species.GLASTRIER,
     Species.WYRDEER,
@@ -3940,6 +3929,10 @@ export const tmSpecies: TmSpecies = {
     Species.ALOLA_NINETALES,
     Species.ALOLA_PERSIAN,
     Species.ALOLA_GOLEM,
+    [
+      Species.URSHIFU,
+      "single-strike",
+    ],
     Species.HISUI_GROWLITHE,
     Species.HISUI_ARCANINE,
     Species.HISUI_TYPHLOSION,
@@ -6987,14 +6980,7 @@ export const tmSpecies: TmSpecies = {
     Species.LITLEO,
     Species.PYROAR,
     Species.FLABEBE,
-    [
-      Species.FLOETTE,
-      "red",
-      "yellow",
-      "orange",
-      "blue",
-      "white",
-    ],
+    Species.FLOETTE,
     Species.FLORGES,
     Species.SKIDDO,
     Species.GOGOAT,
@@ -8301,7 +8287,6 @@ export const tmSpecies: TmSpecies = {
     [
       Species.WORMADAM,
       "sandy",
-      "trash",
     ],
     Species.ALOLA_SANDSHREW,
     Species.ALOLA_SANDSLASH,
@@ -8612,12 +8597,7 @@ export const tmSpecies: TmSpecies = {
     Species.CHESNAUGHT,
     Species.FROAKIE,
     Species.FROGADIER,
-    [
-      Species.GRENINJA,
-      "",
-      "battle-bond",
-      "ash",
-    ],
+    Species.GRENINJA,
     Species.BUNNELBY,
     Species.DIGGERSBY,
     Species.LITLEO,
@@ -9406,14 +9386,7 @@ export const tmSpecies: TmSpecies = {
     Species.LITLEO,
     Species.PYROAR,
     Species.FLABEBE,
-    [
-      Species.FLOETTE,
-      "red",
-      "yellow",
-      "orange",
-      "blue",
-      "white",
-    ],
+    Species.FLOETTE,
     Species.FLORGES,
     Species.SKIDDO,
     Species.GOGOAT,
@@ -9766,14 +9739,7 @@ export const tmSpecies: TmSpecies = {
     Species.DELPHOX,
     Species.VIVILLON,
     Species.FLABEBE,
-    [
-      Species.FLOETTE,
-      "red",
-      "yellow",
-      "orange",
-      "blue",
-      "white",
-    ],
+    Species.FLOETTE,
     Species.FLORGES,
     Species.ESPURR,
     Species.MEOWSTIC,
@@ -11147,14 +11113,7 @@ export const tmSpecies: TmSpecies = {
     Species.LITLEO,
     Species.PYROAR,
     Species.FLABEBE,
-    [
-      Species.FLOETTE,
-      "red",
-      "yellow",
-      "orange",
-      "blue",
-      "white",
-    ],
+    Species.FLOETTE,
     Species.FLORGES,
     Species.SKIDDO,
     Species.GOGOAT,
@@ -13657,12 +13616,7 @@ export const tmSpecies: TmSpecies = {
     Species.DELPHOX,
     Species.FROAKIE,
     Species.FROGADIER,
-    [
-      Species.GRENINJA,
-      "",
-      "battle-bond",
-      "ash",
-    ],
+    Species.GRENINJA,
     Species.FLETCHLING,
     Species.FLETCHINDER,
     Species.TALONFLAME,
@@ -15326,14 +15280,7 @@ export const tmSpecies: TmSpecies = {
     Species.LITLEO,
     Species.PYROAR,
     Species.FLABEBE,
-    [
-      Species.FLOETTE,
-      "red",
-      "yellow",
-      "orange",
-      "blue",
-      "white",
-    ],
+    Species.FLOETTE,
     Species.FLORGES,
     Species.SKIDDO,
     Species.GOGOAT,
@@ -16934,14 +16881,7 @@ export const tmSpecies: TmSpecies = {
     Species.LITLEO,
     Species.PYROAR,
     Species.FLABEBE,
-    [
-      Species.FLOETTE,
-      "red",
-      "yellow",
-      "orange",
-      "blue",
-      "white",
-    ],
+    Species.FLOETTE,
     Species.FLORGES,
     Species.SKIDDO,
     Species.GOGOAT,
@@ -18483,14 +18423,7 @@ export const tmSpecies: TmSpecies = {
     Species.LITLEO,
     Species.PYROAR,
     Species.FLABEBE,
-    [
-      Species.FLOETTE,
-      "red",
-      "yellow",
-      "orange",
-      "blue",
-      "white",
-    ],
+    Species.FLOETTE,
     Species.FLORGES,
     Species.SKIDDO,
     Species.GOGOAT,
@@ -20250,14 +20183,7 @@ export const tmSpecies: TmSpecies = {
     Species.LITLEO,
     Species.PYROAR,
     Species.FLABEBE,
-    [
-      Species.FLOETTE,
-      "red",
-      "yellow",
-      "orange",
-      "blue",
-      "white",
-    ],
+    Species.FLOETTE,
     Species.FLORGES,
     Species.SKIDDO,
     Species.GOGOAT,
@@ -21583,12 +21509,7 @@ export const tmSpecies: TmSpecies = {
     Species.DELPHOX,
     Species.FROAKIE,
     Species.FROGADIER,
-    [
-      Species.GRENINJA,
-      "",
-      "battle-bond",
-      "ash",
-    ],
+    Species.GRENINJA,
     Species.BUNNELBY,
     Species.DIGGERSBY,
     Species.LITLEO,
@@ -22516,7 +22437,6 @@ export const tmSpecies: TmSpecies = {
     [
       Species.WORMADAM,
       "sandy",
-      "trash",
     ],
     Species.ALOLA_DIGLETT,
     Species.ALOLA_DUGTRIO,
@@ -22691,14 +22611,7 @@ export const tmSpecies: TmSpecies = {
     Species.CHESNAUGHT,
     Species.VIVILLON,
     Species.FLABEBE,
-    [
-      Species.FLOETTE,
-      "red",
-      "yellow",
-      "orange",
-      "blue",
-      "white",
-    ],
+    Species.FLOETTE,
     Species.FLORGES,
     Species.SKIDDO,
     Species.GOGOAT,
@@ -23402,12 +23315,7 @@ export const tmSpecies: TmSpecies = {
     Species.DELPHOX,
     Species.FROAKIE,
     Species.FROGADIER,
-    [
-      Species.GRENINJA,
-      "",
-      "battle-bond",
-      "ash",
-    ],
+    Species.GRENINJA,
     Species.BUNNELBY,
     Species.DIGGERSBY,
     Species.FLETCHLING,
@@ -24134,12 +24042,7 @@ export const tmSpecies: TmSpecies = {
     Species.KELDEO,
     Species.FROAKIE,
     Species.FROGADIER,
-    [
-      Species.GRENINJA,
-      "",
-      "battle-bond",
-      "ash",
-    ],
+    Species.GRENINJA,
     Species.PANCHAM,
     Species.PANGORO,
     Species.HONEDGE,
@@ -24842,14 +24745,7 @@ export const tmSpecies: TmSpecies = {
     Species.LITLEO,
     Species.PYROAR,
     Species.FLABEBE,
-    [
-      Species.FLOETTE,
-      "red",
-      "yellow",
-      "orange",
-      "blue",
-      "white",
-    ],
+    Species.FLOETTE,
     Species.FLORGES,
     Species.SKIDDO,
     Species.GOGOAT,
@@ -25712,14 +25608,7 @@ export const tmSpecies: TmSpecies = {
     Species.LITLEO,
     Species.PYROAR,
     Species.FLABEBE,
-    [
-      Species.FLOETTE,
-      "red",
-      "yellow",
-      "orange",
-      "blue",
-      "white",
-    ],
+    Species.FLOETTE,
     Species.FLORGES,
     Species.SKIDDO,
     Species.GOGOAT,
@@ -26695,14 +26584,7 @@ export const tmSpecies: TmSpecies = {
     Species.LITLEO,
     Species.PYROAR,
     Species.FLABEBE,
-    [
-      Species.FLOETTE,
-      "red",
-      "yellow",
-      "orange",
-      "blue",
-      "white",
-    ],
+    Species.FLOETTE,
     Species.FLORGES,
     Species.SKIDDO,
     Species.GOGOAT,
@@ -27845,14 +27727,7 @@ export const tmSpecies: TmSpecies = {
     Species.LITLEO,
     Species.PYROAR,
     Species.FLABEBE,
-    [
-      Species.FLOETTE,
-      "red",
-      "yellow",
-      "orange",
-      "blue",
-      "white",
-    ],
+    Species.FLOETTE,
     Species.FLORGES,
     Species.SKIDDO,
     Species.GOGOAT,
@@ -28911,14 +28786,7 @@ export const tmSpecies: TmSpecies = {
     Species.LITLEO,
     Species.PYROAR,
     Species.FLABEBE,
-    [
-      Species.FLOETTE,
-      "red",
-      "yellow",
-      "orange",
-      "blue",
-      "white",
-    ],
+    Species.FLOETTE,
     Species.FLORGES,
     Species.SKIDDO,
     Species.GOGOAT,
@@ -29514,14 +29382,7 @@ export const tmSpecies: TmSpecies = {
     Species.DELPHOX,
     Species.VIVILLON,
     Species.FLABEBE,
-    [
-      Species.FLOETTE,
-      "red",
-      "yellow",
-      "orange",
-      "blue",
-      "white",
-    ],
+    Species.FLOETTE,
     Species.FLORGES,
     Species.ESPURR,
     Species.MEOWSTIC,
@@ -31408,14 +31269,7 @@ export const tmSpecies: TmSpecies = {
     Species.LITLEO,
     Species.PYROAR,
     Species.FLABEBE,
-    [
-      Species.FLOETTE,
-      "red",
-      "yellow",
-      "orange",
-      "blue",
-      "white",
-    ],
+    Species.FLOETTE,
     Species.FLORGES,
     Species.SKIDDO,
     Species.GOGOAT,
@@ -32327,14 +32181,7 @@ export const tmSpecies: TmSpecies = {
     Species.LITLEO,
     Species.PYROAR,
     Species.FLABEBE,
-    [
-      Species.FLOETTE,
-      "red",
-      "yellow",
-      "orange",
-      "blue",
-      "white",
-    ],
+    Species.FLOETTE,
     Species.FLORGES,
     Species.SKIDDO,
     Species.GOGOAT,
@@ -33037,14 +32884,7 @@ export const tmSpecies: TmSpecies = {
     Species.LITLEO,
     Species.PYROAR,
     Species.FLABEBE,
-    [
-      Species.FLOETTE,
-      "red",
-      "yellow",
-      "orange",
-      "blue",
-      "white",
-    ],
+    Species.FLOETTE,
     Species.FLORGES,
     Species.SKIDDO,
     Species.GOGOAT,
@@ -33471,7 +33311,6 @@ export const tmSpecies: TmSpecies = {
     Species.ARCTOVISH,
     Species.ZACIAN,
     Species.ZAMAZENTA,
-    Species.URSHIFU,
     Species.ZARUDE,
     Species.REGIDRAGO,
     Species.GLASTRIER,
@@ -33522,6 +33361,10 @@ export const tmSpecies: TmSpecies = {
     Species.ALOLA_MUK,
     Species.GALAR_MEOWTH,
     Species.GALAR_STUNFISK,
+    [
+      Species.URSHIFU,
+      "single-strike",
+    ],
     [
       Species.CALYREX,
       "ice",
@@ -36644,14 +36487,7 @@ export const tmSpecies: TmSpecies = {
     Species.LITLEO,
     Species.PYROAR,
     Species.FLABEBE,
-    [
-      Species.FLOETTE,
-      "red",
-      "yellow",
-      "orange",
-      "blue",
-      "white",
-    ],
+    Species.FLOETTE,
     Species.FLORGES,
     Species.SKIDDO,
     Species.GOGOAT,
@@ -37389,14 +37225,7 @@ export const tmSpecies: TmSpecies = {
     Species.BUNNELBY,
     Species.DIGGERSBY,
     Species.FLABEBE,
-    [
-      Species.FLOETTE,
-      "red",
-      "yellow",
-      "orange",
-      "blue",
-      "white",
-    ],
+    Species.FLOETTE,
     Species.FLORGES,
     Species.SKIDDO,
     Species.GOGOAT,
@@ -38266,23 +38095,11 @@ export const tmSpecies: TmSpecies = {
     Species.DELPHOX,
     Species.FROAKIE,
     Species.FROGADIER,
-    [
-      Species.GRENINJA,
-      "",
-      "battle-bond",
-      "ash",
-    ],
+    Species.GRENINJA,
     Species.LITLEO,
     Species.PYROAR,
     Species.FLABEBE,
-    [
-      Species.FLOETTE,
-      "red",
-      "yellow",
-      "orange",
-      "blue",
-      "white",
-    ],
+    Species.FLOETTE,
     Species.FLORGES,
     Species.SKIDDO,
     Species.GOGOAT,
@@ -39323,12 +39140,7 @@ export const tmSpecies: TmSpecies = {
     Species.CHESPIN,
     Species.QUILLADIN,
     Species.CHESNAUGHT,
-    [
-      Species.GRENINJA,
-      "",
-      "battle-bond",
-      "ash",
-    ],
+    Species.GRENINJA,
     Species.BUNNELBY,
     Species.DIGGERSBY,
     Species.SKIDDO,
@@ -40356,7 +40168,10 @@ export const tmSpecies: TmSpecies = {
     Species.FENNEKIN,
     Species.BRAIXEN,
     Species.DELPHOX,
-    Species.MEOWSTIC,
+    [
+      Species.MEOWSTIC,
+      "male",
+    ],
     Species.KLEFKI,
     Species.PHANTUMP,
     Species.TREVENANT,
@@ -41805,7 +41620,6 @@ export const tmSpecies: TmSpecies = {
     [
       Species.WORMADAM,
       "sandy",
-      "trash",
     ],
     Species.ALOLA_SANDSHREW,
     Species.ALOLA_SANDSLASH,
@@ -43701,12 +43515,7 @@ export const tmSpecies: TmSpecies = {
     Species.DELPHOX,
     Species.FROAKIE,
     Species.FROGADIER,
-    [
-      Species.GRENINJA,
-      "",
-      "battle-bond",
-      "ash",
-    ],
+    Species.GRENINJA,
     Species.BUNNELBY,
     Species.DIGGERSBY,
     Species.SKIDDO,
@@ -44160,14 +43969,7 @@ export const tmSpecies: TmSpecies = {
     Species.QUILLADIN,
     Species.CHESNAUGHT,
     Species.FLABEBE,
-    [
-      Species.FLOETTE,
-      "red",
-      "yellow",
-      "orange",
-      "blue",
-      "white",
-    ],
+    Species.FLOETTE,
     Species.FLORGES,
     Species.SKIDDO,
     Species.GOGOAT,
@@ -44377,14 +44179,7 @@ export const tmSpecies: TmSpecies = {
     Species.DELPHOX,
     Species.VIVILLON,
     Species.FLABEBE,
-    [
-      Species.FLOETTE,
-      "red",
-      "yellow",
-      "orange",
-      "blue",
-      "white",
-    ],
+    Species.FLOETTE,
     Species.FLORGES,
     Species.ESPURR,
     Species.MEOWSTIC,
@@ -45256,6 +45051,10 @@ export const tmSpecies: TmSpecies = {
     Species.IRON_CROWN,
     Species.TERAPAGOS,
     Species.ALOLA_EXEGGUTOR,
+    [
+      Species.INDEEDEE,
+      "male",
+    ],
   ],
   [Moves.GYRO_BALL]: [
     Species.SQUIRTLE,
@@ -47501,12 +47300,7 @@ export const tmSpecies: TmSpecies = {
     Species.ACCELGOR,
     Species.FROAKIE,
     Species.FROGADIER,
-    [
-      Species.GRENINJA,
-      "",
-      "battle-bond",
-      "ash",
-    ],
+    Species.GRENINJA,
     Species.SKRELP,
     Species.DRAGALGE,
     Species.MAREANIE,
@@ -48143,7 +47937,6 @@ export const tmSpecies: TmSpecies = {
     Species.RUNERIGUS,
     Species.MORPEKO,
     Species.DURALUDON,
-    Species.URSHIFU,
     Species.ZARUDE,
     Species.SPECTRIER,
     Species.OVERQWIL,
@@ -48179,6 +47972,10 @@ export const tmSpecies: TmSpecies = {
     Species.GALAR_WEEZING,
     Species.GALAR_MOLTRES,
     Species.GALAR_YAMASK,
+    [
+      Species.URSHIFU,
+      "single-strike",
+    ],
     [
       Species.CALYREX,
       "shadow",
@@ -48456,14 +48253,7 @@ export const tmSpecies: TmSpecies = {
     Species.QUILLADIN,
     Species.CHESNAUGHT,
     Species.FLABEBE,
-    [
-      Species.FLOETTE,
-      "red",
-      "yellow",
-      "orange",
-      "blue",
-      "white",
-    ],
+    Species.FLOETTE,
     Species.FLORGES,
     Species.SKIDDO,
     Species.GOGOAT,
@@ -49622,7 +49412,10 @@ export const tmSpecies: TmSpecies = {
     Species.TORTERRA,
     Species.BUDEW,
     Species.ROSERADE,
-    Species.WORMADAM,
+    [
+      Species.WORMADAM,
+      "plant",
+    ],
     Species.MOTHIM,
     Species.CHERUBI,
     Species.CHERRIM,
@@ -49698,14 +49491,7 @@ export const tmSpecies: TmSpecies = {
     Species.CHESNAUGHT,
     Species.VIVILLON,
     Species.FLABEBE,
-    [
-      Species.FLOETTE,
-      "red",
-      "yellow",
-      "orange",
-      "blue",
-      "white",
-    ],
+    Species.FLOETTE,
     Species.FLORGES,
     Species.SKIDDO,
     Species.GOGOAT,
@@ -52635,7 +52421,10 @@ export const tmSpecies: TmSpecies = {
     Species.TORTERRA,
     Species.BUDEW,
     Species.ROSERADE,
-    Species.WORMADAM,
+    [
+      Species.WORMADAM,
+      "plant",
+    ],
     Species.SNOVER,
     Species.ABOMASNOW,
     Species.TANGROWTH,
@@ -53751,7 +53540,10 @@ export const tmSpecies: TmSpecies = {
     Species.BIBAREL,
     Species.BUDEW,
     Species.ROSERADE,
-    Species.WORMADAM,
+    [
+      Species.WORMADAM,
+      "plant",
+    ],
     Species.PACHIRISU,
     Species.CHERUBI,
     Species.CHERRIM,
@@ -53863,14 +53655,7 @@ export const tmSpecies: TmSpecies = {
     Species.BUNNELBY,
     Species.DIGGERSBY,
     Species.FLABEBE,
-    [
-      Species.FLOETTE,
-      "red",
-      "yellow",
-      "orange",
-      "blue",
-      "white",
-    ],
+    Species.FLOETTE,
     Species.FLORGES,
     Species.SKIDDO,
     Species.GOGOAT,
@@ -55590,12 +55375,7 @@ export const tmSpecies: TmSpecies = {
     Species.CHESPIN,
     Species.QUILLADIN,
     Species.CHESNAUGHT,
-    [
-      Species.GRENINJA,
-      "",
-      "battle-bond",
-      "ash",
-    ],
+    Species.GRENINJA,
     Species.PANCHAM,
     Species.PANGORO,
     Species.HELIOPTILE,
@@ -55877,7 +55657,6 @@ export const tmSpecies: TmSpecies = {
     Species.MR_RIME,
     Species.MORPEKO,
     Species.DURALUDON,
-    Species.URSHIFU,
     Species.SPECTRIER,
     Species.MEOWSCARADA,
     Species.SQUAWKABILLY,
@@ -55918,6 +55697,10 @@ export const tmSpecies: TmSpecies = {
     Species.GALAR_MOLTRES,
     Species.GALAR_SLOWKING,
     Species.GALAR_STUNFISK,
+    [
+      Species.URSHIFU,
+      "single-strike",
+    ],
     [
       Species.CALYREX,
       "shadow",
@@ -56577,14 +56360,7 @@ export const tmSpecies: TmSpecies = {
     Species.LITLEO,
     Species.PYROAR,
     Species.FLABEBE,
-    [
-      Species.FLOETTE,
-      "red",
-      "yellow",
-      "orange",
-      "blue",
-      "white",
-    ],
+    Species.FLOETTE,
     Species.FLORGES,
     Species.SKIDDO,
     Species.GOGOAT,
@@ -57019,14 +56795,7 @@ export const tmSpecies: TmSpecies = {
     Species.LITLEO,
     Species.PYROAR,
     Species.FLABEBE,
-    [
-      Species.FLOETTE,
-      "red",
-      "yellow",
-      "orange",
-      "blue",
-      "white",
-    ],
+    Species.FLOETTE,
     Species.FLORGES,
     Species.PANCHAM,
     Species.PANGORO,
@@ -57354,14 +57123,7 @@ export const tmSpecies: TmSpecies = {
     Species.BRAIXEN,
     Species.DELPHOX,
     Species.FLABEBE,
-    [
-      Species.FLOETTE,
-      "red",
-      "yellow",
-      "orange",
-      "blue",
-      "white",
-    ],
+    Species.FLOETTE,
     Species.FLORGES,
     Species.ESPURR,
     Species.MEOWSTIC,
@@ -58997,7 +58759,6 @@ export const tmSpecies: TmSpecies = {
     [
       Species.WORMADAM,
       "sandy",
-      "trash",
     ],
     Species.ALOLA_SANDSHREW,
     Species.ALOLA_SANDSLASH,
@@ -60070,7 +59831,6 @@ export const tmSpecies: TmSpecies = {
     Species.DURALUDON,
     Species.ZACIAN,
     Species.ZAMAZENTA,
-    Species.URSHIFU,
     Species.ZARUDE,
     Species.GLASTRIER,
     Species.SPECTRIER,
@@ -60116,6 +59876,10 @@ export const tmSpecies: TmSpecies = {
     Species.HISUI_ZOROARK,
     Species.HISUI_BRAVIARY,
     Species.BLOODMOON_URSALUNA,
+    [
+      Species.URSHIFU,
+      "single-strike",
+    ],
   ],
   [Moves.PHANTOM_FORCE]: [
     Species.HAUNTER,
@@ -60446,14 +60210,7 @@ export const tmSpecies: TmSpecies = {
     Species.QUILLADIN,
     Species.CHESNAUGHT,
     Species.FLABEBE,
-    [
-      Species.FLOETTE,
-      "red",
-      "yellow",
-      "orange",
-      "blue",
-      "white",
-    ],
+    Species.FLOETTE,
     Species.FLORGES,
     Species.SKIDDO,
     Species.GOGOAT,
@@ -60529,16 +60286,12 @@ export const tmSpecies: TmSpecies = {
     Species.WHIMSICOTT,
     Species.ALOMOMOLA,
     Species.FLABEBE,
-    [
-      Species.FLOETTE,
-      "red",
-      "yellow",
-      "orange",
-      "blue",
-      "white",
-    ],
+    Species.FLOETTE,
     Species.FLORGES,
-    Species.MEOWSTIC,
+    [
+      Species.MEOWSTIC,
+      "male",
+    ],
     Species.SPRITZEE,
     Species.AROMATISSE,
     Species.SYLVEON,
@@ -61402,14 +61155,7 @@ export const tmSpecies: TmSpecies = {
     Species.LITLEO,
     Species.PYROAR,
     Species.FLABEBE,
-    [
-      Species.FLOETTE,
-      "red",
-      "yellow",
-      "orange",
-      "blue",
-      "white",
-    ],
+    Species.FLOETTE,
     Species.FLORGES,
     Species.SKIDDO,
     Species.GOGOAT,
@@ -61899,14 +61645,7 @@ export const tmSpecies: TmSpecies = {
     Species.MELOETTA,
     Species.DELPHOX,
     Species.FLABEBE,
-    [
-      Species.FLOETTE,
-      "red",
-      "yellow",
-      "orange",
-      "blue",
-      "white",
-    ],
+    Species.FLOETTE,
     Species.FLORGES,
     Species.SPRITZEE,
     Species.AROMATISSE,
@@ -62617,7 +62356,6 @@ export const tmSpecies: TmSpecies = {
     Species.SIRFETCHD,
     Species.FALINKS,
     Species.PINCURCHIN,
-    Species.URSHIFU,
     Species.ZARUDE,
     Species.GLASTRIER,
     Species.TAROUNTULA,
@@ -62647,6 +62385,10 @@ export const tmSpecies: TmSpecies = {
     Species.GALAR_ZAPDOS,
     Species.GALAR_CORSOLA,
     Species.GALAR_LINOONE,
+    [
+      Species.URSHIFU,
+      "single-strike",
+    ],
     [
       Species.CALYREX,
       "ice",
@@ -63541,12 +63283,7 @@ export const tmSpecies: TmSpecies = {
     Species.KELDEO,
     Species.FROAKIE,
     Species.FROGADIER,
-    [
-      Species.GRENINJA,
-      "",
-      "battle-bond",
-      "ash",
-    ],
+    Species.GRENINJA,
     Species.INKAY,
     Species.MALAMAR,
     Species.BINACLE,
@@ -64755,7 +64492,6 @@ export const tmSpecies: TmSpecies = {
     Species.OBSTAGOON,
     Species.PERRSERKER,
     Species.MORPEKO,
-    Species.URSHIFU,
     Species.ZARUDE,
     Species.GLASTRIER,
     Species.SPECTRIER,
@@ -64803,6 +64539,10 @@ export const tmSpecies: TmSpecies = {
     Species.GALAR_LINOONE,
     Species.GALAR_DARMANITAN,
     Species.GALAR_STUNFISK,
+    [
+      Species.URSHIFU,
+      "single-strike",
+    ],
     [
       Species.CALYREX,
       "ice",
@@ -65933,12 +65673,7 @@ export const tmSpecies: TmSpecies = {
     Species.DELPHOX,
     Species.FROAKIE,
     Species.FROGADIER,
-    [
-      Species.GRENINJA,
-      "",
-      "battle-bond",
-      "ash",
-    ],
+    Species.GRENINJA,
     Species.BUNNELBY,
     Species.DIGGERSBY,
     Species.FLETCHLING,
@@ -65950,14 +65685,7 @@ export const tmSpecies: TmSpecies = {
     Species.LITLEO,
     Species.PYROAR,
     Species.FLABEBE,
-    [
-      Species.FLOETTE,
-      "red",
-      "yellow",
-      "orange",
-      "blue",
-      "white",
-    ],
+    Species.FLOETTE,
     Species.FLORGES,
     Species.SKIDDO,
     Species.GOGOAT,
@@ -66291,6 +66019,13 @@ export const tmSpecies: TmSpecies = {
     Species.MUNKIDORI,
     Species.FEZANDIPITI,
     Species.OGERPON,
+    Species.ARCHALUDON,
+    Species.HYDRAPPLE,
+    Species.GOUGING_FIRE,
+    Species.RAGING_BOLT,
+    Species.IRON_BOULDER,
+    Species.IRON_CROWN,
+    Species.PECHARUNT,
     Species.GALAR_MEOWTH,
     Species.GALAR_SLOWPOKE,
     Species.GALAR_SLOWBRO,
@@ -66429,16 +66164,8 @@ export const tmSpecies: TmSpecies = {
     Species.PIPLUP,
     Species.PRINPLUP,
     Species.EMPOLEON,
-    [
-      Species.SHELLOS,
-      "east",
-      "west",
-    ],
-    [
-      Species.GASTRODON,
-      "east",
-      "west",
-    ],
+    Species.SHELLOS,
+    Species.GASTRODON,
     Species.MISMAGIUS,
     Species.HAPPINY,
     Species.SNOVER,
@@ -66456,25 +66183,11 @@ export const tmSpecies: TmSpecies = {
     Species.CUBCHOO,
     Species.BEARTIC,
     Species.CRYOGONAL,
-    [
-      Species.TORNADUS,
-      "incarnate",
-      "therian",
-    ],
-    [
-      Species.KYUREM,
-      "",
-      "black",
-      "white",
-    ],
+    Species.TORNADUS,
+    Species.KYUREM,
     Species.FROAKIE,
     Species.FROGADIER,
-    [
-      Species.GRENINJA,
-      "",
-      "battle-bond",
-      "ash",
-    ],
+    Species.GRENINJA,
     Species.SKRELP,
     Species.DRAGALGE,
     Species.BERGMITE,
@@ -66482,11 +66195,7 @@ export const tmSpecies: TmSpecies = {
     Species.DIANCIE,
     Species.PRIMARINA,
     Species.CRABOMINABLE,
-    [
-      Species.MAGEARNA,
-      "",
-      "original",
-    ],
+    Species.MAGEARNA,
     Species.INTELEON,
     Species.FROSMOTH,
     Species.EISCUE,
@@ -66779,12 +66488,7 @@ export const tmSpecies: TmSpecies = {
     Species.CHESNAUGHT,
     Species.FROAKIE,
     Species.FROGADIER,
-    [
-      Species.GRENINJA,
-      "",
-      "battle-bond",
-      "ash",
-    ],
+    Species.GRENINJA,
     Species.LITLEO,
     Species.PYROAR,
     Species.FLABEBE,
@@ -67007,23 +66711,14 @@ export const tmSpecies: TmSpecies = {
     Species.WEAVILE,
     Species.GLACEON,
     Species.FROSLASS,
-    [
-      Species.PALKIA,
-      "",
-      "origin",
-    ],
+    Species.PALKIA,
     Species.PHIONE,
     Species.MANAPHY,
     Species.ARCEUS,
     Species.OSHAWOTT,
     Species.DEWOTT,
     Species.SAMUROTT,
-    [
-      Species.BASCULIN,
-      "red-striped",
-      "blue-striped",
-      "white-striped",
-    ],
+    Species.BASCULIN,
     Species.MINCCINO,
     Species.CINCCINO,
     Species.DUCKLETT,
@@ -67036,12 +66731,7 @@ export const tmSpecies: TmSpecies = {
     Species.KELDEO,
     Species.FROAKIE,
     Species.FROGADIER,
-    [
-      Species.GRENINJA,
-      "",
-      "battle-bond",
-      "ash",
-    ],
+    Species.GRENINJA,
     Species.FLABEBE,
     Species.FLOETTE,
     Species.FLORGES,
@@ -67304,6 +66994,10 @@ export const tmSpecies: TmSpecies = {
     Species.FEZANDIPITI,
     Species.ALOLA_RAICHU,
     Species.ETERNAL_FLOETTE,
+    [
+      Species.INDEEDEE,
+      "female",
+    ],
   ],
   [Moves.TEMPER_FLARE]: [
     Species.CHARMANDER,