@pkmn/sim 0.5.2 → 0.5.6

package/build/config/formats.js

@@ -132,7 +132,7 @@ exports.Formats = [
         ],
         mod: 'gen8',
         ruleset: ['[Gen 8] RU'],
-        banlist: ['RU', 'NUBL', 'Drizzle', 'Drought'],
+        banlist: ['RU', 'NUBL', 'Drizzle', 'Drought', 'Slush Rush'],
     },
     {
         name: "[Gen 8] PU",
@@ -193,7 +193,7 @@ exports.Formats = [
             'Calyrex-Ice', 'Calyrex-Shadow', 'Cinderace', 'Dialga', 'Dragonite', 'Eternatus', 'Genesect', 'Giratina', 'Giratina-Origin', 'Groudon', 'Ho-Oh', 'Jirachi',
             'Kyogre', 'Kyurem-Black', 'Kyurem-White', 'Lugia', 'Lunala', 'Magearna', 'Marshadow', 'Melmetal', 'Mew', 'Mewtwo', 'Mimikyu', 'Necrozma-Dawn-Wings',
             'Necrozma-Dusk-Mane', 'Palkia', 'Rayquaza', 'Reshiram', 'Sableye', 'Snorlax', 'Solgaleo', 'Victini', 'Xerneas', 'Yveltal', 'Zacian', 'Zacian-Crowned',
-            'Zamazenta', 'Zamazenta-Crowned', 'Zekrom', 'Moody', 'Bright Powder', 'Focus Band', 'Focus Sash', 'Lax Incense', 'Quick Claw', 'Perish Song',
+            'Zamazenta', 'Zamazenta-Crowned', 'Zekrom', 'Moody', 'Power Construct', 'Bright Powder', 'Focus Band', 'Focus Sash', 'Lax Incense', 'Quick Claw', 'Perish Song',
         ],
     },
     {
@@ -217,7 +217,7 @@ exports.Formats = [
         mod: 'gen8',
         ruleset: ['[Gen 8] PU'],
         banlist: [
-            'PU', 'Centiskorch', 'Drampa', 'Exeggutor-Alola', 'Gallade', 'Haunter', 'Magmortar', 'Magneton', 'Omastar', 'Rotom-Frost',
+            'PU', 'Aurorus', 'Centiskorch', 'Drampa', 'Exeggutor-Alola', 'Gallade', 'Haunter', 'Magmortar', 'Magneton', 'Omastar', 'Rotom-Frost',
             'Turtonator', 'Vanilluxe', 'Vikavolt', 'Silvally-Dragon', 'Silvally-Ground', 'Sneasel', 'Damp Rock', 'Grassy Seed',
         ],
     },
@@ -231,9 +231,9 @@ exports.Formats = [
         ruleset: ['[Gen 8] LC'],
         banlist: [
             // LC OU
-            'Abra', 'Archen', 'Carvanha', 'Diglett-Base', 'Dwebble', 'Ferroseed', 'Foongus', 'Frillish', 'Grookey', 'Koffing',
-            'Larvesta', 'Magnemite', 'Mareanie', 'Mienfoo', 'Mudbray', 'Munchlax', 'Natu', 'Onix', 'Pawniard', 'Ponyta',
-            'Ponyta-Galar', 'Porygon', 'Slowpoke-Base', 'Spritzee', 'Staryu', 'Timburr', 'Trapinch', 'Tyrunt', 'Vulpix',
+            'Abra', 'Carvanha', 'Croagunk', 'Diglett-Base', 'Dwebble', 'Ferroseed', 'Foongus', 'Frillish', 'Grookey',
+            'Koffing', 'Larvesta', 'Magnemite', 'Mareanie', 'Mienfoo', 'Mudbray', 'Munchlax', 'Natu', 'Onix', 'Pawniard',
+            'Ponyta', 'Ponyta-Galar', 'Porygon', 'Slowpoke-Base', 'Staryu', 'Timburr', 'Trapinch', 'Tyrunt', 'Vulpix',
             // LC UUBL
             'Farfetch\u2019d-Galar', 'Scorbunny', 'Shellder', 'Wingull',
         ],
@@ -264,19 +264,9 @@ exports.Formats = [
     {
         name: "[Gen 8] Battle Stadium Singles",
         mod: 'gen8',
-        ruleset: ['Flat Rules', '!! Adjust Level = 50', 'Min Source Gen = 8', 'Limit One Restricted'],
+        ruleset: ['Flat Rules', '!! Adjust Level = 50', 'Min Source Gen = 8', 'Limit Two Restricted'],
         restricted: ['Restricted Legendary'],
     },
-    {
-        name: "[Gen 8] Battle Stadium Singles Series 9",
-        threads: [
-            `&bullet; <a href="https://www.smogon.com/forums/threads/3679374/">BSS Discussion</a>`,
-            `&bullet; <a href="https://www.smogon.com/forums/threads/3672698/">BSS Viability Rankings</a>`,
-        ],
-        mod: 'gen8',
-        searchShow: false,
-        ruleset: ['Flat Rules', '!! Adjust Level = 50', 'Min Source Gen = 8'],
-    },
     {
         name: "[Gen 8] Custom Game",
         mod: 'gen8',
@@ -342,35 +332,14 @@ exports.Formats = [
         banlist: ['Corsola-Galar', 'Cutiefly', 'Ponyta-Base', 'Scyther', 'Sneasel', 'Swirlix', 'Tangela', 'Vulpix', 'Vulpix-Alola'],
     },
     {
-        name: "[Gen 8] VGC 2021 Series 11",
-        threads: [
-            `&bullet; <a href="https://www.smogon.com/forums/threads/3677186/">VGC 2021 Series 11 Metagame Discussion</a>`,
-            `&bullet; <a href="https://www.smogon.com/forums/threads/3693427/">VGC 2021 Series 11 Sample Teams</a>`,
-            `&bullet; <a href="https://www.smogon.com/forums/threads/3693284/">VGC 2021 Series 11 Viability Rankings</a>`,
-        ],
+        name: "[Gen 8] VGC 2022",
         mod: 'gen8',
         gameType: 'doubles',
-        ruleset: ['Flat Rules', '!! Adjust Level = 50', 'Min Source Gen = 8', 'VGC Timer', 'Limit One Restricted'],
+        ruleset: ['Flat Rules', '!! Adjust Level = 50', 'Min Source Gen = 8', 'VGC Timer', 'Limit Two Restricted'],
         restricted: ['Restricted Legendary'],
     },
     {
-        name: "[Gen 8] Tiny Tourney",
-        threads: [
-            `&bullet; <a href="https://www.smogon.com/forums/threads/3694047/">Tiny Tourney Metagame Discussion</a>`,
-        ],
-        mod: 'gen8',
-        gameType: 'doubles',
-        ruleset: ['Flat Rules', '!! Adjust Level = 50', 'Min Source Gen = 8'],
-        onValidateSet(set) {
-            const species = this.dex.species.get(set.species);
-            if (!species.nfe || species.prevo)
-                return [`Non-first-stage Pok\u00e9mon cannot be used in Tiny Tourney.`];
-            if (species.heightm > 1)
-                return [`${species.name} is too tall to be used in Tiny Tourney.`];
-        },
-    },
-    {
-        name: "[Gen 8] VGC 2021 Series 9",
+        name: "[Gen 8] VGC 2021",
         mod: 'gen8',
         gameType: 'doubles',
         searchShow: false,
@@ -468,13 +437,15 @@ exports.Formats = [
         mod: 'gen8',
         ruleset: ['Standard NatDex', 'OHKO Clause', 'Evasion Moves Clause', 'Species Clause', 'Dynamax Clause', 'Sleep Clause Mod'],
         banlist: [
-            'Alakazam-Mega', 'Arceus', 'Blastoise-Mega', 'Blaziken-Mega', 'Calyrex-Ice', 'Calyrex-Shadow', 'Cinderace', 'Darkrai', 'Darmanitan-Galar',
-            'Deoxys-Attack', 'Deoxys-Base', 'Deoxys-Speed', 'Dialga', 'Dracovish', 'Dragapult', 'Eternatus', 'Genesect', 'Gengar-Mega', 'Giratina',
-            'Giratina-Origin', 'Groudon', 'Ho-Oh', 'Kangaskhan-Mega', 'Kyogre', 'Kyurem-Black', 'Kyurem-White', 'Landorus-Base', 'Lucario-Mega',
-            'Lugia', 'Lunala', 'Magearna', 'Marshadow', 'Metagross-Mega', 'Mewtwo', 'Naganadel', 'Necrozma-Dawn-Wings', 'Necrozma-Dusk-Mane',
-            'Necrozma-Ultra', 'Palkia', 'Pheromosa', 'Rayquaza', 'Reshiram', 'Salamence-Mega', 'Shaymin-Sky', 'Solgaleo', 'Spectrier', 'Tornadus-Therian',
-            'Urshifu-Base', 'Xerneas', 'Yveltal', 'Zacian', 'Zacian-Crowned', 'Zamazenta', 'Zamazenta-Crowned', 'Zekrom', 'Zygarde-Base', 'Zygarde-Complete',
-            'Arena Trap', 'Moody', 'Power Construct', 'Shadow Tag', 'King\'s Rock', 'Razor Fang', 'Quick Claw', 'Baton Pass',
+            'Alakazam-Mega', 'Arceus', 'Blastoise-Mega', 'Blaziken-Mega', 'Calyrex-Ice', 'Calyrex-Shadow', 'Cinderace', 'Darkrai',
+            'Darmanitan-Galar', 'Deoxys-Attack', 'Deoxys-Base', 'Deoxys-Speed', 'Dialga', 'Dracovish', 'Dragapult', 'Eternatus',
+            'Genesect', 'Gengar-Mega', 'Giratina', 'Giratina-Origin', 'Groudon', 'Ho-Oh', 'Kangaskhan-Mega', 'Kyogre', 'Kyurem-Black',
+            'Kyurem-White', 'Landorus-Base', 'Lucario-Mega', 'Lugia', 'Lunala', 'Magearna', 'Marshadow', 'Metagross-Mega', 'Mewtwo',
+            'Naganadel', 'Necrozma-Dawn-Wings', 'Necrozma-Dusk-Mane', 'Necrozma-Ultra', 'Palkia', 'Pheromosa', 'Rayquaza', 'Reshiram',
+            'Salamence-Mega', 'Shaymin-Sky', 'Solgaleo', 'Spectrier', 'Urshifu-Base', 'Xerneas', 'Yveltal', 'Zacian',
+            'Zacian-Crowned', 'Zamazenta', 'Zamazenta-Crowned', 'Zekrom', 'Zygarde-Base', 'Zygarde-Complete', 'Arena Trap', 'Moody',
+            'Power Construct', 'Sand Veil', 'Shadow Tag', 'Snow Cloak', 'Bright Powder', 'King\'s Rock', 'Lax Incense', 'Razor Fang',
+            'Quick Claw', 'Baton Pass',
         ],
     },
     {
@@ -488,22 +459,25 @@ exports.Formats = [
         ruleset: ['[Gen 8] National Dex'],
         banlist: [
             // National Dex OU
-            'Blaziken', 'Blissey', 'Chansey', 'Charizard-Mega-X', 'Charizard-Mega-Y', 'Clefable', 'Corviknight', 'Diancie-Mega',
-            'Excadrill', 'Ferrothorn', 'Garchomp', 'Gliscor', 'Greninja', 'Heatran', 'Kartana', 'Kommo-o', 'Kyurem', 'Landorus-Therian',
-            'Lopunny-Mega', 'Magnezone', 'Mawile-Mega', 'Medicham-Mega', 'Pelipper', 'Rillaboom', 'Scizor-Mega', 'Serperior',
-            'Slowbro-Base', 'Swampert-Mega', 'Tapu Fini', 'Tapu Koko', 'Tapu Lele', 'Toxapex', 'Tyranitar', 'Victini', 'Volcarona',
-            'Weavile', 'Zapdos-Base',
+            'Blissey', 'Chansey', 'Charizard-Mega-X', 'Charizard-Mega-Y', 'Clefable', 'Corviknight', 'Diancie-Mega', 'Excadrill',
+            'Ferrothorn', 'Garchomp', 'Gliscor', 'Greninja', 'Heatran', 'Kartana', 'Kommo-o', 'Kyurem', 'Landorus-Therian', 'Lopunny-Mega',
+            'Magnezone', 'Mawile-Mega', 'Pelipper', 'Rillaboom', 'Scizor-Mega', 'Serperior', 'Slowbro-Base', 'Swampert-Mega', 'Tapu Fini',
+            'Tapu Koko', 'Tapu Lele', 'Toxapex', 'Tyranitar', 'Victini', 'Volcarona', 'Weavile', 'Zapdos-Base',
             'ND UUBL',
             'Drizzle', 'Drought',
             // Slowbronite is banned so it doesn't validate on Galarian Slowbro
             'Slowbronite',
+            // NatDex suspect
+            'Tornadus-Therian',
         ],
         // Used to distinguish UU from below UU in the client
         restricted: [
-            'Absol-Mega', 'Aegislash', 'Alomomola', 'Altaria-Mega', 'Amoonguss', 'Beedrill-Mega', 'Bisharp', 'Breloom', 'Celesteela',
-            'Donphan', 'Dragonite', 'Hippowdon', 'Infernape', 'Keldeo', 'Krookodile', 'Mandibuzz', 'Manectric-Mega', 'Melmetal', 'Mew',
-            'Moltres-Base', 'Porygon2', 'Regieleki', 'Rotom-Heat', 'Rotom-Wash', 'Scizor', 'Skarmory', 'Slowking', 'Slowking-Galar',
-            'Swampert-Base', 'Tangrowth', 'Umbreon', 'Urshifu-Rapid-Strike',
+            'Aegislash', 'Alakazam-Base', 'Altaria-Mega', 'Amoonguss', 'Beedrill-Mega', 'Blaziken-Base', 'Breloom', 'Celesteela',
+            'Chandelure', 'Donphan', 'Dracozolt', 'Dragonite', 'Feraligatr', 'Gastrodon', 'Hatterene', 'Hippowdon', 'Infernape',
+            'Keldeo', 'Krookodile', 'Mamoswine', 'Mandibuzz', 'Manectric-Mega', 'Melmetal', 'Mienshao', 'Moltres-Base',
+            'Nidoking', 'Nidoqueen', 'Nihilego', 'Quagsire', 'Regieleki', 'Ribombee', 'Rotom-Heat', 'Rotom-Wash', 'Salamence',
+            'Scizor', 'Skarmory', 'Slowking-Base', 'Swampert-Base', 'Talonflame', 'Tangrowth', 'Tornadus-Base', 'Umbreon',
+            'Urshifu-Rapid-Strike',
         ],
     },
     {
@@ -539,33 +513,60 @@ exports.Formats = [
         section: "Pet Mods",
     },
     {
-        name: "[Gen 8] Fusion Evolution UU",
+        name: "[Gen 8] Alternatium",
+        desc: `A metagame made up of only Pok&eacute;mon with alternate forms, with all of them being separate and unique.`,
         threads: [
-            `&bullet; <a href="https://www.smogon.com/forums/threads/3674163/">Fusion Evolution UU</a>`,
+            `&bullet; <a href="https://www.smogon.com/forums/threads/3683767/">Alternatium</a>`,
+            `&bullet; <a href="https://docs.google.com/spreadsheets/d/1bvvkPg1CrUBJFJJeuwkts8elfJcEcahGOoHm-vGBXOI/edit?usp=sharing">Spreadsheet</a>`,
         ],
-        mod: "fusionevolutionuu",
-        searchShow: false,
-        ruleset: ['Standard NatDex', 'OHKO Clause', 'Evasion Moves Clause', 'Species Clause', 'Dynamax Clause', 'Sleep Clause Mod', 'Z-Move Clause', 'Data Mod', 'Mega Data Mod'],
-        banlist: [
-            'All Pokemon', 'Lopunnite', 'Tapu Lop-Mega', 'Red Orb', 'Grousle-Primal',
+        mod: 'alternatium',
+        ruleset: ['Standard NatDex', 'Z-Move Clause', 'OHKO Clause', 'Evasion Moves Clause', 'Dynamax Clause', 'Sleep Clause Mod'],
+        banlist: ['All Pokemon', 'Past'],
+        unbanlist: [
+            'Silvally', 'Silvally-Bug', 'Silvally-Dark', 'Silvally-Dragon', 'Silvally-Electric', 'Silvally-Fairy', 'Silvally-Fighting', 'Silvally-Fire', 'Silvally-Flying', 'Silvally-Ghost',
+            'Silvally-Grass', 'Silvally-Ground', 'Silvally-Ice', 'Silvally-Poison', 'Silvally-Psychic', 'Silvally-Rock', 'Silvally-Steel', 'Silvally-Water', 'Pikachu', 'Pikachu-Rock-Star',
+            'Pikachu-Belle', 'Pikachu-Idol', 'Pikachu-PhD', 'Pikachu-Libre', 'Pikachu-Partner', 'Pikachu-Starter', 'Darmanitan', 'Darmanitan-Zen', 'Darmanitan-Galar', 'Darmanitan-Galar-Zen',
+            'Aegishield', 'Aegislash', 'Zacian', 'Zacian-Crowned', 'Zamazenta', 'Zamazenta-Crowned', 'Rotom', 'Rotom-Heat', 'Rotom-Wash', 'Rotom-Frost', 'Rotom-Fan', 'Rotom-Mow', 'Dugtrio',
+            'Dugtrio-Alola', 'Muk', 'Muk-Oilslick', 'Slowbro', 'Slowbro-Galar', 'Slowking', 'Slowking-Galar', 'Tornadus', 'Cummulus', 'Thundurus', 'Thundurus-Therian', 'Landorus', 'Landorus-Bengal',
+            'Vivillon-Fancy', 'Vivillon', 'Vivillon-Pokeball', 'Genesect', 'Genesect-Password', 'Genesect-Molten', 'Genesect-Freezer', 'Genesect-Type-Delta', 'Groudon', 'Groudon-Primal', 'Kyogre',
+            'Kyogre-Primal', 'Deoxys-Wood', 'Deoxys-Gem', 'Deoxys-Tank', 'Deoxys-Speed', 'Sandslash-Lustrous', 'Sandslash-Alola', 'Ninetales-Steamwork', 'Ninetales-Alola', 'Giratina', 'Giratina-Shadow',
+            'Eternatus', 'Manustorm', 'Exeggutor', 'Exeggutor-Lighthouse', 'Weezing', 'Weezing-King', 'Raticate', 'Raticate-Alola', 'Linoone', 'Linoone-Punk', 'Catastroform', 'Castform-Firestorm',
+            'Castform-Thunderstorm', 'Castform-Snowy', 'Wormadam', 'Wormadam-Sandy', 'Fibormadam', 'Farfetch\u2019d', 'Farfetch\u2019d-Galar', 'Corsola', 'Corsoul', 'Shaymin', 'Shaymin-Sky', 'Keldeo',
+            'Swordeo', 'Meloetta', 'Meloetta-Fighter', 'Lycanday', 'Lycanroc-Spectre', 'Lycanroc-Dusk', 'Gourgeist', 'Gourgeist-Fae', 'Gourgeist-Pulpy', 'Supergeist', 'Cramorant', 'Cramorant-Swimmer',
+            'Cramorant-Gorging', 'Eiscue', 'Eiscue-Noice', 'Mimikyu', 'Mimikyu-Sparkstone', 'Morpeko-Marsh', 'Morvilant', 'Zygarde-Wyrm', 'Zygarde-Canid', 'Zygarde-Goliath',
+        ],
+        onValidateTeam(team, format) {
+            const speciesTable = new Set();
+            for (const set of team) {
+                const species = this.dex.species.get(set.species);
+                if (speciesTable.has(species.id)) {
+                    return [
+                        `You are limited to one of each Pokémon by Species Clause (except for different formes).`,
+                        `(You have more than one ${species.id}.)`,
+                    ];
+                }
+                speciesTable.add(species.id);
+            }
+        },
+    },
+    {
+        name: "[Gen 8] Random Dex",
+        desc: `A micrometagame project consisting of 80 randomly selected fully-evolved Pok&eacute;mon.`,
+        threads: [
+            `&bullet; <a href="https://www.smogon.com/forums/threads/3690182/">Random Dex</a>`,
         ],
+        mod: 'randomdex',
+        ruleset: ['Standard NatDex', 'OHKO Clause', 'Evasion Moves Clause', 'Species Clause', 'Dynamax Clause', 'Sleep Clause Mod'],
+        banlist: ['All Pokemon', 'Past', 'Arena Trap', 'Moody', 'Shadow Tag', 'Baton Pass', 'Bright Powder', 'Lax Incense', 'King\'s Rock', 'Razor Fang', 'Kangaskhanite', 'Medichamite', 'Kommonium Z'],
         unbanlist: [
-            'Volquag', 'Toxalure', 'Kingtsar', 'Tanette', 'Slowton',
-            'Flaant', 'Umbat', 'Chomplim', 'Chomplim-Mega', 'Xotalion', 'Miemie', 'Dusking', 'Jelliswine',
-            'Pigapult', 'Lycanserker-Dusk', 'Tapu Lop', 'Dragontler', 'Eternabat',
-            'Grimmlurk', 'Manicuno-Galar', 'Yacian-Crowned', 'Cryogolem', 'Stoudrago',
-            'Grousle', 'Dongoro', 'Slurpum',
-            'Corveot', 'Corveot-Mega', 'Igglyzenta-Crowned', 'Arctres-Galar', 'Garborude', 'Noicity', 'Ferros',
-            'Landmaldo-Therian', 'Tentoxys-Defense', 'Strikados-Galar', 'Hooporant',
-            'Silvino-Bug', 'Silvino-Dark', 'Silvino-Dragon', 'Silvino-Electric', 'Silvino-Fairy', 'Silvino-Fighting',
-            'Silvino-Fire', 'Silvino-Flying', 'Silvino-Ghost', 'Silvino-Grass', 'Silvino-Ground', 'Silvino-Ice',
-            'Silvino-Poison', 'Silvino-Psychic', 'Silvino-Rock', 'Silvino-Steel', 'Silvino-Water', 'Silvino',
-            'Silvino-Bug-Mega', 'Silvino-Dark-Mega', 'Silvino-Dragon-Mega',
-            'Silvino-Electric-Mega', 'Silvino-Fairy-Mega', 'Silvino-Fighting-Mega',
-            'Silvino-Fire-Mega', 'Silvino-Flying-Mega', 'Silvino-Ghost-Mega',
-            'Silvino-Grass-Mega', 'Silvino-Ground-Mega', 'Silvino-Ice-Mega',
-            'Silvino-Poison-Mega', 'Silvino-Psychic-Mega', 'Silvino-Rock-Mega',
-            'Silvino-Steel-Mega', 'Silvino-Water-Mega', 'Silvino-Mega',
+            'Absol', 'Absol-Mega', 'Appletun', 'Articuno', 'Aurorus', 'Basculin', 'Beartic', 'Bisharp', 'Calyrex', 'Camerupt', 'Camerupt-Mega',
+            'Celesteela', 'Cloyster', 'Crawdaunt', 'Cursola', 'Dedenne', 'Delibird', 'Eelektross', 'Espeon', 'Flapple', 'Flareon', 'Flygon',
+            'Galvantula', 'Girafarig', 'Glaceon', 'Goodra', 'Gourgeist', 'Grimmsnarl', 'Guzzlord', 'Heliolisk', 'Hitmonchan', 'Hitmonlee',
+            'Hitmontop', 'Incineroar', 'Indeedee', 'Jolteon', 'Kangaskhan', 'Kommo-o', 'Lanturn', 'Leafeon', 'Leavanny', 'Ludicolo', 'Lunatone',
+            'Luvdisc', 'Machamp', 'Mandibuzz', 'Medicham', 'Nihilego', 'Palossand', 'Pidgeot', 'Pidgeot-Mega', 'Probopass', 'Pyroar', 'Sawk',
+            'Sceptile', 'Sceptile-Mega', 'Scolipede', 'Shiftry', 'Simisage', 'Slowbro', 'Slowbro-Mega', 'Slowking', 'Swoobat', 'Sylveon',
+            'Tapu Bulu', 'Tapu Fini', 'Tauros', 'Typhlosion', 'Umbreon', 'Ursaring', 'Vaporeon', 'Whiscash', 'Wishiwashi', 'Zebstrika', 'Absolite',
+            'Pidgeotite', 'Sceptilite', 'Cameruptite', 'Slowbronite',
         ],
     },
     {
@@ -586,36 +587,134 @@ exports.Formats = [
         column: 2,
     },
     {
-        name: "[Gen 8] Revelationmons",
-        desc: `The moves in the first slot(s) of a Pok&eacute;mon's set have their types changed to match the Pok&eacute;mon's type(s).`,
+        name: "[Gen 8] Trademarked",
+        desc: `Sacrifice your Pok&eacute;mon's ability for a status move that activates on switch-in.`,
         threads: [
-            `&bullet; <a href="https://www.smogon.com/forums/threads/3692297/">Revelationmons</a>`,
+            `&bullet; <a href="https://www.smogon.com/forums/threads/3656980/">Trademarked</a>`,
         ],
         mod: 'gen8',
-        ruleset: ['Standard', 'Dynamax Clause', 'Revelationmons Mod', 'Sleep Moves Clause'],
+        // searchShow: false,
+        ruleset: ['Standard', 'Dynamax Clause'],
         banlist: [
-            'Barraskewda', 'Blacephalon', 'Calyrex-Ice', 'Calyrex-Shadow', 'Darmanitan-Galar', 'Dialga', 'Dracovish', 'Dragonite', 'Dragapult',
-            'Eternatus', 'Genesect', 'Giratina', 'Giratina-Origin', 'Groudon', 'Ho-Oh', 'Kommo-o', 'Kyogre', 'Kyurem-Black', 'Kyurem-White',
-            'Landorus-Base', 'Lugia', 'Lunala', 'Magearna', 'Marshadow', 'Mewtwo', 'Naganadel', 'Necrozma-Dawn-Wings', 'Necrozma-Dusk-Mane',
-            'Noivern', 'Palkia', 'Pheromosa', 'Rayquaza', 'Reshiram', 'Solgaleo', 'Spectrier', 'Urshifu-Base', 'Xerneas', 'Yveltal', 'Zacian',
-            'Zacian-Crowned', 'Zamazenta', 'Zamazenta-Crowned', 'Zekrom', 'Zygarde-Base', 'Arena Trap', 'Magnet Pull', 'Moody', 'Power Construct',
-            'Shadow Tag', 'King\'s Rock', 'Baton Pass',
+            'Calyrex-Ice', 'Calyrex-Shadow', 'Darmanitan-Galar', 'Dialga', 'Dracovish', 'Dragapult', 'Eternatus', 'Kyurem-Black', 'Kyurem-White',
+            'Giratina', 'Giratina-Origin', 'Genesect', 'Groudon', 'Ho-Oh', 'Kartana', 'Kyogre', 'Lugia', 'Lunala', 'Magearna', 'Marowak-Alola',
+            'Marshadow', 'Melmetal', 'Mewtwo', 'Naganadel', 'Necrozma-Dawn-Wings', 'Necrozma-Dusk-Mane', 'Palkia', 'Pheromosa', 'Rayquaza',
+            'Reshiram', 'Solgaleo', 'Urshifu-Base', 'Xerneas', 'Yveltal', 'Zacian', 'Zacian-Crowned', 'Zamazenta', 'Zamazenta-Crowned', 'Zekrom',
+            'Zygarde-Base', 'Arena Trap', 'Moody', 'Power Construct', 'Shadow Tag', 'Baton Pass',
+        ],
+        restricted: [
+            'Baneful Bunker', 'Block', 'Copycat', 'Corrosive Gas', 'Detect', 'Destiny Bond', 'Disable', 'Encore', 'Fairy Lock', 'Hypnosis', 'Ingrain',
+            'Instruct', 'Lovely Kiss', 'King\'s Shield', 'Mat Block', 'Mean Look', 'Memento', 'move:Metronome', 'Obstruct', 'Octolock', 'Nature Power',
+            'Parting Shot', 'Psycho Shift', 'Protect', 'Roar', 'Sing', 'Skill Swap', 'Sleep Powder', 'Sleep Talk', 'Spiky Shield', 'Spore', 'Substitute',
+            'Teleport', 'Whirlwind', 'Wish', 'Yawn',
         ],
-        restricted: ['Bolt Beak', 'U-turn', 'Volt Switch'],
+        onValidateTeam(team, format, teamHas) {
+            const problems = [];
+            for (const trademark in teamHas.trademarks) {
+                if (teamHas.trademarks[trademark] > 1) {
+                    problems.push(`You are limited to 1 of each Trademark.`, `(You have ${teamHas.trademarks[trademark]} Pok\u00e9mon with ${trademark} as a Trademark.)`);
+                }
+            }
+            return problems;
+        },
+        validateSet(set, teamHas) {
+            const dex = this.dex;
+            const ability = dex.moves.get(set.ability);
+            if (!ability.exists) { // Not even a real move
+                return this.validateSet(set, teamHas);
+            }
+            // Absolute trademark bans
+            if (ability.category !== 'Status') {
+                return [`${ability.name} is not a status move, and cannot be used as a trademark.`];
+            }
+            if (ability.forceSwitch || ability.selfSwitch) {
+                return [
+                    `Force-switching and self-switching moves are banned from being used as trademarks.`,
+                    `(${ability.name} is a ${ability.forceSwitch ? 'force' : 'self'}-switching move.)`,
+                ];
+            }
+            const irrevokablyRestricted = [
+                'Assist', 'Copycat', 'Metronome', 'Mirror Move', 'Sleep Talk',
+                'Skill Swap', // Self-propagates indefinitely
+            ];
+            if (irrevokablyRestricted.includes(ability.name)) {
+                return [`${ability.name} cannot safely function as a trademark.`];
+            }
+            // Contingent trademark bans
+            if (this.ruleTable.isRestricted(`move:${ability.id}`)) {
+                return [`${ability.name} is restricted from being used as a trademark.`];
+            }
+            if (set.moves.map(this.toID).includes(ability.id)) {
+                return [`${set.name} may not use ${ability.name} as both a trademark and one of its moves simultaneously.`];
+            }
+            const customRules = this.format.customRules || [];
+            if (!customRules.includes('!obtainableabilities'))
+                customRules.push('!obtainableabilities');
+            const TeamValidator = require('../sim/team-validator').TeamValidator;
+            const validator = new TeamValidator(dex.formats.get(`${this.format.id}@@@${customRules.join(',')}`));
+            const moves = set.moves;
+            set.moves = [ability.id];
+            set.ability = dex.species.get(set.species).abilities['0'];
+            let problems = validator.validateSet(set, {}) || [];
+            if (problems.length)
+                return problems;
+            set.moves = moves;
+            set.ability = dex.species.get(set.species).abilities['0'];
+            problems = problems.concat(validator.validateSet(set, teamHas) || []);
+            set.ability = ability.id;
+            if (!teamHas.trademarks)
+                teamHas.trademarks = {};
+            teamHas.trademarks[ability.name] = (teamHas.trademarks[ability.name] || 0) + 1;
+            return problems.length ? problems : null;
+        },
+        pokemon: {
+            getAbility() {
+                const move = this.battle.dex.moves.get(this.battle.toID(this.ability));
+                if (!move.exists)
+                    return Object.getPrototypeOf(this).getAbility.call(this);
+                return {
+                    id: move.id,
+                    name: move.name,
+                    onStart(pokemon) {
+                        this.add('-activate', pokemon, 'ability: ' + move.name);
+                        this.actions.useMove(move, pokemon);
+                    },
+                    toString() {
+                        return "";
+                    },
+                };
+            },
+        },
     },
     {
-        name: "[Gen 8 BDSP] Balanced Hackmons",
-        desc: `Anything that can be hacked in-game and is usable in local battles is allowed.`,
+        name: "[Gen 8] Linked",
+        desc: `The first two moves in a Pok&eacute;mon's moveset are used simultaneously.`,
         threads: [
-            `&bullet; <a href="https://www.smogon.com/forums/posts/9043074">BDSP Balanced Hackmons</a>`,
+            `&bullet; <a href="https://www.smogon.com/forums/threads/3660421/">Linked</a>`,
         ],
-        mod: 'gen8bdsp',
-        ruleset: ['-Nonexistent', 'OHKO Clause', 'Evasion Moves Clause', 'Species Clause', 'Team Preview', 'HP Percentage Mod', 'Cancel Mod', 'Sleep Moves Clause', 'Endless Battle Clause'],
+        mod: 'linked',
+        ruleset: ['Standard', 'Dynamax Clause'],
         banlist: [
-            'Shedinja', 'Arena Trap', 'Contrary', 'Gorilla Tactics', 'Huge Power', 'Illusion', 'Innards Out', 'Intrepid Sword',
-            'Magnet Pull', 'Moody', 'Neutralizing Gas', 'Parental Bond', 'Pure Power', 'Shadow Tag', 'Stakeout', 'Water Bubble',
-            'Wonder Guard', 'Comatose + Sleep Talk', 'Shell Smash',
+            'Calyrex-Ice', 'Calyrex-Shadow', 'Cinderace', 'Darmanitan-Galar', 'Dialga', 'Dracovish', 'Eternatus', 'Genesect', 'Giratina', 'Giratina-Origin', 'Groudon', 'Ho-Oh',
+            'Kyogre', 'Kyurem', 'Kyurem-Black', 'Kyurem-White', 'Landorus-Base', 'Lugia', 'Lunala', 'Magearna', 'Marshadow', 'Mewtwo', 'Naganadel', 'Necrozma-Dawn-Wings',
+            'Necrozma-Dusk-Mane', 'Palkia', 'Pheromosa', 'Rayquaza', 'Reshiram', 'Solgaleo', 'Spectrier', 'Urshifu-Base', 'Xerneas', 'Yveltal', 'Zacian', 'Zacian-Crowned',
+            'Zamazenta', 'Zamazenta-Crowned', 'Zekrom', 'Zygarde-Base', 'Zygarde-Complete', 'Arena Trap', 'Moody', 'Power Construct', 'Sand Veil', 'Shadow Tag', 'Snow Cloak',
+            'Bright Powder', 'King\'s Rock', 'Lax Incense', 'Baton Pass',
         ],
+        restricted: [
+            'Baneful Bunker', 'Bounce', 'Protect', 'Detect', 'Dig', 'Dive', 'Fly', 'King\'s Shield', 'Nature\'s Madness', 'Night Shade',
+            'Obstruct', 'Phantom Force', 'Seismic Toss', 'Shadow Force', 'Sky Drop', 'Spiky Shield', 'Super Fang',
+        ],
+        onValidateSet(set) {
+            const problems = [];
+            for (const [i, moveid] of set.moves.entries()) {
+                const move = this.dex.moves.get(moveid);
+                if ([0, 1].includes(i) && this.ruleTable.isRestricted(`move:${move.id}`)) {
+                    problems.push(`${set.name || set.species}'s move ${move.name} cannot be linked.`);
+                }
+            }
+            return problems;
+        },
     },
     // Other Metagames
     ///////////////////////////////////////////////////////////////////
@@ -659,6 +758,34 @@ exports.Formats = [
             }
         },
     },
+    {
+        name: "[Gen 8] Almost Any Ability",
+        desc: `Pok&eacute;mon have access to almost any ability.`,
+        threads: [
+            `&bullet; <a href="https://www.smogon.com/forums/threads/3656414/">Almost Any Ability</a>`,
+            `&bullet; <a href="https://www.smogon.com/forums/threads/3682690/">AAA Resources</a>`,
+        ],
+        mod: 'gen8',
+        ruleset: ['Obtainable', '!Obtainable Abilities', 'Species Clause', 'Nickname Clause', '2 Ability Clause', 'OHKO Clause', 'Evasion Moves Clause', 'Team Preview', 'HP Percentage Mod', 'Cancel Mod', 'Dynamax Clause', 'Sleep Moves Clause', 'Endless Battle Clause'],
+        banlist: [
+            'Archeops', 'Blacephalon', 'Buzzwole', 'Calyrex-Ice', 'Calyrex-Shadow', 'Dialga', 'Dracovish', 'Dragapult', 'Dragonite', 'Eternatus', 'Gengar', 'Giratina',
+            'Giratina-Origin', 'Groudon', 'Ho-Oh', 'Kartana', 'Keldeo', 'Kyogre', 'Kyurem', 'Kyurem-Black', 'Kyurem-White', 'Lugia', 'Lunala', 'Magearna', 'Marshadow',
+            'Melmetal', 'Mewtwo', 'Naganadel', 'Necrozma-Dawn-Wings', 'Necrozma-Dusk-Mane', 'Noivern', 'Palkia', 'Pheromosa', 'Rayquaza', 'Regigigas', 'Reshiram', 'Shedinja',
+            'Solgaleo', 'Spectrier', 'Urshifu-Base', 'Urshifu-Rapid-Strike', 'Victini', 'Weavile', 'Xerneas', 'Yveltal', 'Zacian', 'Zacian-Crowned', 'Zamazenta-Base', 'Zekrom',
+            'Zeraora', 'Zygarde-Base', 'Arena Trap', 'Comatose', 'Contrary', 'Fluffy', 'Fur Coat', 'Gorilla Tactics', 'Huge Power', 'Ice Scales', 'Illusion', 'Imposter',
+            'Innards Out', 'Intrepid Sword', 'Libero', 'Magnet Pull', 'Moody', 'Neutralizing Gas', 'Parental Bond', 'Poison Heal', 'Power Construct', 'Protean', 'Pure Power',
+            'Shadow Tag', 'Simple', 'Stakeout', 'Speed Boost', 'Water Bubble', 'Wonder Guard', 'King\'s Rock', 'Baton Pass',
+        ],
+        onValidateSet(set) {
+            // Temporary fix until battle-only is implemented properly
+            if (this.toID(set.species) === 'zamazentacrowned' && this.toID(set.ability) !== 'dauntlessshield') {
+                return [`Zamazenta-Crowned can only use Dauntless Shield because it is a battle-only forme.`];
+            }
+            if (this.toID(set.species) === 'zaciancrowned' && this.toID(set.ability) !== 'intrepidsword') {
+                return [`Zacian-Crowned can only use Intrepid Sword because it is a battle-only forme.`];
+            }
+        },
+    },
     {
         name: "[Gen 8] Mix and Mega",
         desc: `Mega evolve any Pok&eacute;mon with any mega stone and no limit. Boosts based on mega evolution from gen 7.`,
@@ -676,7 +803,8 @@ exports.Formats = [
         restricted: [
             'Calyrex-Ice', 'Dialga', 'Eternatus', 'Gengar', 'Giratina', 'Groudon', 'Ho-Oh', 'Kyurem-Black', 'Kyurem-White',
             'Lugia', 'Lunala', 'Marshadow', 'Melmetal', 'Mewtwo', 'Naganadel', 'Necrozma-Dawn-Wings', 'Necrozma-Dusk-Mane',
-            'Palkia', 'Rayquaza', 'Regigigas', 'Reshiram', 'Urshifu-Base', 'Xerneas', 'Yveltal', 'Zekrom', 'Zygarde-Complete',
+            'Palkia', 'Pheromosa', 'Rayquaza', 'Regigigas', 'Reshiram', 'Urshifu', 'Urshifu-Rapid-Strike', 'Xerneas',
+            'Yveltal', 'Zekrom', 'Zygarde-Complete',
         ],
         onValidateTeam(team) {
             const itemTable = new Set();
@@ -721,49 +849,23 @@ exports.Formats = [
             }
         },
     },
-    {
-        name: "[Gen 8] Almost Any Ability",
-        desc: `Pok&eacute;mon have access to almost any ability.`,
-        threads: [
-            `&bullet; <a href="https://www.smogon.com/forums/threads/3656414/">Almost Any Ability</a>`,
-            `&bullet; <a href="https://www.smogon.com/forums/threads/3682690/">AAA Resources</a>`,
-        ],
-        mod: 'gen8',
-        ruleset: ['Obtainable', '!Obtainable Abilities', 'Species Clause', 'Nickname Clause', '2 Ability Clause', 'OHKO Clause', 'Evasion Moves Clause', 'Team Preview', 'HP Percentage Mod', 'Cancel Mod', 'Dynamax Clause', 'Sleep Moves Clause', 'Endless Battle Clause'],
-        banlist: [
-            'Archeops', 'Buzzwole', 'Calyrex-Ice', 'Calyrex-Shadow', 'Dialga', 'Dracovish', 'Dragapult', 'Dragonite', 'Eternatus', 'Gengar', 'Giratina', 'Giratina-Origin',
-            'Groudon', 'Ho-Oh', 'Kartana', 'Keldeo', 'Kyogre', 'Kyurem', 'Kyurem-Black', 'Kyurem-White', 'Lugia', 'Lunala', 'Magearna', 'Marshadow', 'Melmetal', 'Mewtwo',
-            'Naganadel', 'Necrozma-Dawn-Wings', 'Necrozma-Dusk-Mane', 'Noivern', 'Palkia', 'Pheromosa', 'Rayquaza', 'Regigigas', 'Reshiram', 'Shedinja', 'Solgaleo', 'Spectrier',
-            'Urshifu-Base', 'Urshifu-Rapid-Strike', 'Victini', 'Weavile', 'Xerneas', 'Yveltal', 'Zacian', 'Zacian-Crowned', 'Zamazenta-Base', 'Zekrom', 'Zeraora', 'Zygarde-Base',
-            'Arena Trap', 'Comatose', 'Contrary', 'Fluffy', 'Fur Coat', 'Gorilla Tactics', 'Huge Power', 'Ice Scales', 'Illusion', 'Imposter', 'Innards Out', 'Intrepid Sword',
-            'Libero', 'Magnet Pull', 'Moody', 'Neutralizing Gas', 'Parental Bond', 'Poison Heal', 'Power Construct', 'Protean', 'Pure Power', 'Shadow Tag', 'Simple', 'Stakeout',
-            'Speed Boost', 'Water Bubble', 'Wonder Guard', 'King\'s Rock', 'Baton Pass',
-        ],
-        onValidateSet(set) {
-            // Temporary fix until battle-only is implemented properly
-            if (this.toID(set.species) === 'zamazentacrowned' && this.toID(set.ability) !== 'dauntlessshield') {
-                return [`Zamazenta-Crowned can only use Dauntless Shield because it is a battle-only forme.`];
-            }
-            if (this.toID(set.species) === 'zaciancrowned' && this.toID(set.ability) !== 'intrepidsword') {
-                return [`Zacian-Crowned can only use Intrepid Sword because it is a battle-only forme.`];
-            }
-        },
-    },
     {
         name: "[Gen 8] STABmons",
         desc: `Pok&eacute;mon can use any move of their typing, in addition to the moves they can normally learn.`,
         threads: [
             `&bullet; <a href="https://www.smogon.com/forums/threads/3656429/">STABmons</a>`,
+            `&bullet; <a href="https://www.smogon.com/forums/threads/3695169/">STABmons Resources</a>`,
         ],
         mod: 'gen8',
-        ruleset: ['Standard', 'STABmons Move Legality', 'Dynamax Clause', 'Sleep Moves Clause'],
+        ruleset: ['Standard', 'STABmons Move Legality', 'Dynamax Clause', 'Sleep Moves Clause', '!Sleep Clause Mod'],
         banlist: [
-            'Aegislash', 'Calyrex-Ice', 'Calyrex-Shadow', 'Darmanitan-Galar', 'Dialga', 'Dracovish', 'Dragapult', 'Dragonite', 'Eternatus', 'Genesect',
-            'Garchomp', 'Giratina', 'Giratina-Origin', 'Groudon', 'Ho-Oh', 'Kartana', 'Kyogre', 'Kyurem-Black', 'Kyurem-White', 'Landorus', 'Landorus-Therian',
-            'Lugia', 'Lunala', 'Marshadow', 'Mewtwo', 'Naganadel', 'Necrozma-Dawn-Wings', 'Necrozma-Dusk-Mane', 'Palkia', 'Pheromosa', 'Porygon-Z',
-            'Rayquaza', 'Reshiram', 'Silvally', 'Solgaleo', 'Spectrier', 'Tapu Bulu', 'Tapu Koko', 'Thundurus-Base', 'Urshifu-Base', 'Xerneas', 'Yveltal',
-            'Zacian', 'Zacian-Crowned', 'Zamazenta', 'Zamazenta-Crowned', 'Zapdos-Galar', 'Zekrom', 'Zygarde-Base', 'Arena Trap', 'Magnet Pull', 'Moody',
-            'Power Construct', 'Shadow Tag', 'King\'s Rock', 'Baton Pass',
+            'Aegislash', 'Blacephalon', 'Calyrex-Ice', 'Calyrex-Shadow', 'Darmanitan-Galar', 'Dialga', 'Dracovish', 'Dragapult', 'Dragonite',
+            'Eternatus', 'Genesect', 'Garchomp', 'Giratina', 'Giratina-Origin', 'Groudon', 'Ho-Oh', 'Kartana', 'Kyogre', 'Kyurem-Black',
+            'Kyurem-White', 'Landorus', 'Landorus-Therian', 'Lugia', 'Lunala', 'Marshadow', 'Mewtwo', 'Naganadel', 'Necrozma-Dawn-Wings',
+            'Necrozma-Dusk-Mane', 'Palkia', 'Pheromosa', 'Porygon-Z', 'Rayquaza', 'Reshiram', 'Silvally', 'Solgaleo', 'Spectrier', 'Tapu Bulu',
+            'Tapu Koko', 'Thundurus-Base', 'Urshifu-Base', 'Xerneas', 'Yveltal', 'Zacian', 'Zacian-Crowned', 'Zamazenta', 'Zamazenta-Crowned',
+            'Zapdos-Galar', 'Zekrom', 'Zygarde-Base', 'Arena Trap', 'Magnet Pull', 'Moody', 'Power Construct', 'Shadow Tag', 'King\'s Rock',
+            'Baton Pass',
         ],
         restricted: [
             'Acupressure', 'Astral Barrage', 'Belly Drum', 'Bolt Beak', 'Clangorous Soul', 'Double Iron Bash', 'Electrify', 'Extreme Speed', 'Fishious Rend',
@@ -791,11 +893,11 @@ exports.Formats = [
             `&bullet; <a href="https://www.smogon.com/forums/threads/3660461/">Godly Gift</a>`,
         ],
         mod: 'gen8',
-        ruleset: ['Standard', 'Dynamax Clause'],
+        ruleset: ['Standard', 'Dynamax Clause', 'Sleep Moves Clause'],
         banlist: [
-            'Blissey', 'Calyrex-Shadow', 'Chansey', 'Dragapult', 'Hawlucha', 'Marowak-Alola', 'Melmetal', 'Pikachu', 'Toxapex',
+            'Blissey', 'Calyrex-Shadow', 'Chansey', 'Dragapult', 'Hawlucha', 'Mantine', 'Marowak-Alola', 'Melmetal', 'Pikachu', 'Toxapex',
             'Xerneas', 'Zacian', 'Zacian-Crowned', 'Uber > 1', 'AG ++ Uber > 1', 'Arena Trap', 'Huge Power', 'Moody', 'Pure Power',
-            'Shadow Tag', 'Baton Pass',
+            'Shadow Tag', 'Bright Powder', 'Focus Band', 'King\'s Rock', 'Lax Incense', 'Quick Claw', 'Baton Pass',
         ],
         onValidateTeam(team) {
             const gods = new Set();
@@ -877,7 +979,8 @@ exports.Formats = [
         name: "[Gen 8 BDSP] OU",
         threads: [
             `&bullet; <a href="https://www.smogon.com/forums/threads/3693629/">BDSP OU Metagame Discussion</a>`,
-            `&bullet; <a href="https://www.smogon.com/forums/threads/3693620/">BDSP OU Viability List</a>`,
+            `&bullet; <a href="https://www.smogon.com/forums/threads/3693721/">BDSP OU Sample Teams</a>`,
+            `&bullet; <a href="https://www.smogon.com/forums/threads/3696088/">BDSP OU Viability Rankings</a>`,
         ],
         mod: 'gen8bdsp',
         ruleset: ['Standard'],
@@ -904,6 +1007,31 @@ exports.Formats = [
         ruleset: ['[Gen 8 BDSP] OU'],
         banlist: ['OU', 'UUBL'],
     },
+    {
+        name: "[Gen 8 BDSP] RU",
+        threads: [
+            `&bullet; <a href="https://www.smogon.com/forums/threads/3695563/">BDSP RU</a>`,
+        ],
+        mod: 'gen8bdsp',
+        ruleset: ['[Gen 8 BDSP] UU'],
+        banlist: ['UU', 'RUBL', 'Drought'],
+    },
+    {
+        name: "[Gen 8 BDSP] NU",
+        mod: 'gen8bdsp',
+        searchShow: false,
+        ruleset: ['[Gen 8 BDSP] RU'],
+        banlist: ['RU', 'NUBL'],
+    },
+    {
+        name: "[Gen 8 BDSP] LC",
+        threads: [
+            `&bullet; <a href="https://www.smogon.com/forums/threads/3696004/">BDSP LC</a>`,
+        ],
+        mod: 'gen8bdsp',
+        ruleset: ['Little Cup', 'Standard'],
+        banlist: ['Gligar', 'Meditite', 'Misdreavus', 'Murkrow', 'Scyther', 'Sneasel', 'Tangela', 'Vulpix', 'Yanma', 'Moody', 'Baton Pass'],
+    },
     {
         name: "[Gen 8 BDSP] Monotype",
         threads: [
@@ -925,6 +1053,14 @@ exports.Formats = [
         searchShow: false,
         ruleset: ['[Gen 8 BDSP] OU', '+CAP'],
     },
+    {
+        name: "[Gen 8 BDSP] 3v3 Singles",
+        threads: [
+            `&bullet; <a href="https://www.smogon.com/forums/threads/3695092/">BDSP 3v3 Singles</a>`,
+        ],
+        mod: 'gen8bdsp',
+        ruleset: ['Flat Rules', 'Min Source Gen = 8'],
+    },
     {
         name: "[Gen 8 BDSP] Doubles OU",
         threads: [
@@ -968,11 +1104,11 @@ exports.Formats = [
         searchShow: false,
         ruleset: ['Obtainable', 'Species Clause', 'Nickname Clause', 'OHKO Clause', 'Evasion Moves Clause', 'Team Preview', 'HP Percentage Mod', 'Cancel Mod', 'Dynamax Clause', 'Sleep Clause Mod', 'Endless Battle Clause'],
         banlist: [
-            'Calyrex-Ice', 'Calyrex-Shadow', 'Darmanitan-Galar', 'Dialga', 'Dracovish', 'Dragonite', 'Eternatus', 'Genesect', 'Giratina', 'Giratina-Origin', 'Groudon',
-            'Ho-Oh', 'Hydreigon', 'Kartana', 'Kyogre', 'Kyurem', 'Kyurem-Black', 'Kyurem-White', 'Landorus-Base', 'Latias', 'Latios', 'Lugia', 'Lunala', 'Marshadow',
-            'Mew', 'Mewtwo', 'Naganadel', 'Necrozma-Dawn-Wings', 'Necrozma-Dusk-Mane', 'Palkia', 'Pheromosa', 'Rayquaza', 'Reshiram', 'Reuniclus', 'Shedinja',
-            'Slowking-Galar', 'Solgaleo', 'Spectrier', 'Tornadus-Therian', 'Xerneas', 'Yveltal', 'Zacian', 'Zacian-Crowned', 'Zamazenta', 'Zamazenta-Crowned', 'Zekrom',
-            'Zeraora', 'Zygarde-Base', 'Arena Trap', 'Moody', 'Power Construct', 'Shadow Tag', 'Baton Pass',
+            'Calyrex-Ice', 'Calyrex-Shadow', 'Darmanitan-Galar', 'Dialga', 'Dracovish', 'Dragonite', 'Eternatus', 'Genesect', 'Giratina', 'Giratina-Origin',
+            'Groudon', 'Ho-Oh', 'Hydreigon', 'Kartana', 'Kyogre', 'Kyurem', 'Kyurem-Black', 'Kyurem-White', 'Landorus-Base', 'Latias', 'Latios', 'Lugia',
+            'Lunala', 'Marshadow', 'Mew', 'Mewtwo', 'Naganadel', 'Necrozma-Dawn-Wings', 'Necrozma-Dusk-Mane', 'Palkia', 'Pheromosa', 'Rayquaza', 'Reshiram',
+            'Reuniclus', 'Shedinja', 'Slowking-Galar', 'Solgaleo', 'Spectrier', 'Tornadus-Therian', 'Volcarona', 'Xerneas', 'Yveltal', 'Zacian', 'Zacian-Crowned',
+            'Zamazenta', 'Zamazenta-Crowned', 'Zekrom', 'Zeraora', 'Zygarde-Base', 'Arena Trap', 'Moody', 'Power Construct', 'Shadow Tag', 'Baton Pass',
         ],
         onModifySpeciesPriority: 2,
         onModifySpecies(species, target, source, effect) {
@@ -1502,6 +1638,53 @@ exports.Formats = [
             }
         },
     },
+    {
+        name: "[Gen 8] Pokebilities",
+        desc: `Pok&eacute;mon have all of their released abilities simultaneously.`,
+        threads: [
+            `&bullet; <a href="https://www.smogon.com/forums/threads/3679692/">Pok&eacute;bilities</a>`,
+        ],
+        mod: 'pokebilities',
+        searchShow: false,
+        ruleset: ['Standard', 'Dynamax Clause'],
+        banlist: [
+            'Calyrex-Ice', 'Calyrex-Shadow', 'Cinderace', 'Conkeldurr', 'Darmanitan-Galar', 'Dialga', 'Dracovish', 'Dracozolt',
+            'Eternatus', 'Excadrill', 'Genesect', 'Giratina', 'Giratina-Origin', 'Groudon', 'Ho-Oh', 'Kyogre', 'Kyurem-Black',
+            'Kyurem-White', 'Landorus-Base', 'Lugia', 'Lunala', 'Magearna', 'Marshadow', 'Mewtwo', 'Naganadel', 'Necrozma-Dawn-Wings',
+            'Necrozma-Dusk-Mane', 'Palkia', 'Pheromosa', 'Porygon-Z', 'Rayquaza', 'Reshiram', 'Solgaleo', 'Spectrier', 'Urshifu-Base',
+            'Xerneas', 'Yveltal', 'Zacian', 'Zacian-Crowned', 'Zamazenta-Base', 'Zekrom', 'Zygarde-Base', 'Power Construct',
+            'Baton Pass', 'King\'s Rock',
+            // Moody users
+            'Glalie', 'Octillery', 'Remoraid', 'Snorunt',
+            // Shadow Tag/Arena Trap
+            'Diglett-Base', 'Dugtrio-Base', 'Gothita', 'Gothitelle', 'Gothorita', 'Trapinch', 'Wobbuffet', 'Wynaut',
+        ],
+        onBegin() {
+            for (const pokemon of this.getAllPokemon()) {
+                if (pokemon.ability === this.toID(pokemon.species.abilities['S'])) {
+                    continue;
+                }
+                pokemon.m.innates = Object.keys(pokemon.species.abilities)
+                    .filter(key => key !== 'S' && (key !== 'H' || !pokemon.species.unreleasedHidden))
+                    .map(key => this.toID(pokemon.species.abilities[key]))
+                    .filter(ability => ability !== pokemon.ability);
+            }
+        },
+        onSwitchInPriority: 2,
+        onSwitchIn(pokemon) {
+            if (pokemon.m.innates) {
+                for (const innate of pokemon.m.innates) {
+                    pokemon.addVolatile("ability:" + innate, pokemon);
+                }
+            }
+        },
+        onAfterMega(pokemon) {
+            for (const innate of Object.keys(pokemon.volatiles).filter(i => i.startsWith('ability:'))) {
+                pokemon.removeVolatile(innate);
+            }
+            pokemon.m.innates = undefined;
+        },
+    },
     {
         name: "[Gen 8] The Loser's Game",
         desc: `The first player to lose all of their Pok&eacute;mon wins.`,
@@ -1624,106 +1807,6 @@ exports.Formats = [
             },
         },
     },
-    {
-        name: "[Gen 8] Trademarked",
-        desc: `Sacrifice your Pok&eacute;mon's ability for a status move that activates on switch-in.`,
-        threads: [
-            `&bullet; <a href="https://www.smogon.com/forums/threads/3656980/">Trademarked</a>`,
-        ],
-        mod: 'gen8',
-        searchShow: false,
-        ruleset: ['Standard', 'Dynamax Clause'],
-        banlist: [
-            'Calyrex-Ice', 'Calyrex-Shadow', 'Darmanitan-Galar', 'Dialga', 'Dracovish', 'Dragapult', 'Eternatus', 'Kyurem-Black', 'Kyurem-White',
-            'Giratina', 'Giratina-Origin', 'Genesect', 'Groudon', 'Ho-Oh', 'Kartana', 'Kyogre', 'Lugia', 'Lunala', 'Magearna', 'Marshadow',
-            'Melmetal', 'Mewtwo', 'Naganadel', 'Necrozma-Dawn-Wings', 'Necrozma-Dusk-Mane', 'Palkia', 'Pheromosa', 'Rayquaza', 'Reshiram',
-            'Solgaleo', 'Urshifu-Base', 'Xerneas', 'Yveltal', 'Zacian', 'Zacian-Crowned', 'Zamazenta', 'Zamazenta-Crowned', 'Zekrom', 'Zygarde-Base',
-            'Arena Trap', 'Moody', 'Power Construct', 'Shadow Tag', 'Baton Pass',
-        ],
-        restricted: [
-            'Baneful Bunker', 'Block', 'Copycat', 'Corrosive Gas', 'Detect', 'Destiny Bond', 'Disable', 'Encore', 'Fairy Lock', 'Hypnosis', 'Ingrain',
-            'Instruct', 'Lovely Kiss', 'King\'s Shield', 'Mat Block', 'Mean Look', 'move:Metronome', 'Obstruct', 'Octolock', 'Nature Power', 'Parting Shot',
-            'Psycho Shift', 'Protect', 'Roar', 'Sing', 'Skill Swap', 'Sleep Powder', 'Sleep Talk', 'Spiky Shield', 'Spore', 'Substitute', 'Teleport',
-            'Whirlwind', 'Wish', 'Yawn',
-        ],
-        onValidateTeam(team, format, teamHas) {
-            const problems = [];
-            for (const trademark in teamHas.trademarks) {
-                if (teamHas.trademarks[trademark] > 1) {
-                    problems.push(`You are limited to 1 of each Trademark.`, `(You have ${teamHas.trademarks[trademark]} Pok\u00e9mon with ${trademark} as a Trademark.)`);
-                }
-            }
-            return problems;
-        },
-        validateSet(set, teamHas) {
-            const dex = this.dex;
-            const ability = dex.moves.get(set.ability);
-            if (!ability.exists) { // Not even a real move
-                return this.validateSet(set, teamHas);
-            }
-            // Absolute trademark bans
-            if (ability.category !== 'Status') {
-                return [`${ability.name} is not a status move, and cannot be used as a trademark.`];
-            }
-            if (ability.forceSwitch || ability.selfSwitch) {
-                return [
-                    `Force-switching and self-switching moves are banned from being used as trademarks.`,
-                    `(${ability.name} is a ${ability.forceSwitch ? 'force' : 'self'}-switching move.)`,
-                ];
-            }
-            const irrevokablyRestricted = [
-                'Assist', 'Copycat', 'Metronome', 'Mirror Move', 'Sleep Talk',
-                'Skill Swap', // Self-propagates indefinitely
-            ];
-            if (irrevokablyRestricted.includes(ability.name)) {
-                return [`${ability.name} cannot safely function as a trademark.`];
-            }
-            // Contingent trademark bans
-            if (this.ruleTable.isRestricted(`move:${ability.id}`)) {
-                return [`${ability.name} is restricted from being used as a trademark.`];
-            }
-            if (set.moves.map(this.toID).includes(ability.id)) {
-                return [`${set.name} may not use ${ability.name} as both a trademark and one of its moves simultaneously.`];
-            }
-            const customRules = this.format.customRules || [];
-            if (!customRules.includes('!obtainableabilities'))
-                customRules.push('!obtainableabilities');
-            const TeamValidator = require('../sim/team-validator').TeamValidator;
-            const validator = new TeamValidator(dex.formats.get(`${this.format.id}@@@${customRules.join(',')}`));
-            const moves = set.moves;
-            set.moves = [ability.id];
-            set.ability = dex.species.get(set.species).abilities['0'];
-            let problems = validator.validateSet(set, {}) || [];
-            if (problems.length)
-                return problems;
-            set.moves = moves;
-            set.ability = dex.species.get(set.species).abilities['0'];
-            problems = problems.concat(validator.validateSet(set, teamHas) || []);
-            set.ability = ability.id;
-            if (!teamHas.trademarks)
-                teamHas.trademarks = {};
-            teamHas.trademarks[ability.name] = (teamHas.trademarks[ability.name] || 0) + 1;
-            return problems.length ? problems : null;
-        },
-        pokemon: {
-            getAbility() {
-                const move = this.battle.dex.moves.get(this.battle.toID(this.ability));
-                if (!move.exists)
-                    return Object.getPrototypeOf(this).getAbility.call(this);
-                return {
-                    id: move.id,
-                    name: move.name,
-                    onStart(pokemon) {
-                        this.add('-activate', pokemon, 'ability: ' + move.name);
-                        this.actions.useMove(move, pokemon);
-                    },
-                    toString() {
-                        return "";
-                    },
-                };
-            },
-        },
-    },
     // Randomized Metas
     ///////////////////////////////////////////////////////////////////
     {
@@ -1831,7 +1914,8 @@ exports.Formats = [
         desc: `Randomized teams of level-balanced Pok&eacute;mon with absolutely any ability, moves, and item.`,
         mod: 'gen8',
         team: 'randomHC',
-        ruleset: ['Obtainable Formes', 'HP Percentage Mod', 'Cancel Mod'],
+        ruleset: ['HP Percentage Mod', 'Cancel Mod'],
+        banlist: ['Nonexistent'],
     },
     {
         name: "[Gen 8] Doubles Hackmons Cup",
@@ -1839,7 +1923,8 @@ exports.Formats = [
         gameType: 'doubles',
         team: 'randomHC',
         searchShow: false,
-        ruleset: ['Obtainable', 'HP Percentage Mod', 'Cancel Mod'],
+        ruleset: ['HP Percentage Mod', 'Cancel Mod'],
+        banlist: ['Nonexistent'],
     },
     {
         name: "[Gen 8] CAP 1v1",
@@ -1908,6 +1993,7 @@ exports.Formats = [
         team: 'randomHC',
         searchShow: false,
         ruleset: ['HP Percentage Mod', 'Cancel Mod'],
+        banlist: ['Nonexistent'],
     },
     {
         name: "[Gen 7 Let's Go] Random Battle",
@@ -1974,6 +2060,7 @@ exports.Formats = [
         team: 'randomHC',
         searchShow: false,
         ruleset: ['HP Percentage Mod', 'Cancel Mod', 'Desync Clause Mod', 'Sleep Clause Mod', 'Freeze Clause Mod', 'Team Type Preview'],
+        banlist: ['Nonexistent'],
         onModifySpecies(species, target, source, effect) {
             if (!target)
                 return;
@@ -1995,47 +2082,36 @@ exports.Formats = [
         column: 3,
     },
     {
-        name: "[Gen 1] UU",
+        name: "[Gen 3] UU",
         threads: [
-            `&bullet; <a href="https://www.smogon.com/forums/threads/3573896/">RBY UU Metagame Discussion</a>`,
-            `&bullet; <a href="https://www.smogon.com/forums/threads/3647713/">RBY UU Viability Rankings</a>`,
+            `&bullet; <a href="https://www.smogon.com/forums/threads/3585923/">ADV UU Metagame Discussion</a>`,
+            `&bullet; <a href="https://www.smogon.com/forums/threads/3548578/">ADV UU Viability Rankings</a>`,
         ],
-        mod: 'gen1',
+        mod: 'gen3',
         // searchShow: false,
-        ruleset: ['[Gen 1] OU'],
-        banlist: ['OU', 'UUBL'],
+        ruleset: ['Standard', 'NFE Clause'],
+        banlist: ['Uber', 'OU', 'UUBL', 'Smeargle + Ingrain', 'Baton Pass'],
+        unbanlist: ['Scyther', 'Sand Veil'],
     },
     {
-        name: "[Gen 6] 1v1",
-        desc: `Bring three Pok&eacute;mon to Team Preview and choose one to battle.`,
+        name: "[Gen 1] NU",
         threads: [
-            `&bullet; <a href="https://www.smogon.com/forums/posts/8031459/">ORAS 1v1</a>`,
+            `&bullet; <a href="https://www.smogon.com/forums/threads/3668913/">RBY NU Viability Rankings</a>`,
         ],
-        mod: 'gen6',
+        mod: 'gen1',
         // searchShow: false,
-        ruleset: [
-            'Max Team Size = 3', 'Picked Team Size = 1',
-            'Obtainable', 'Nickname Clause', 'Moody Clause', 'OHKO Clause', 'Evasion Moves Clause', 'Accuracy Moves Clause', 'Swagger Clause', 'Endless Battle Clause', 'HP Percentage Mod', 'Cancel Mod', 'Team Preview',
-        ],
-        banlist: [
-            'Arceus', 'Blaziken', 'Darkrai', 'Deoxys-Base', 'Deoxys-Attack', 'Deoxys-Defense', 'Dialga', 'Giratina',
-            'Giratina-Origin', 'Groudon', 'Ho-Oh', 'Kangaskhan-Mega', 'Kyogre', 'Kyurem-White', 'Lugia', 'Mewtwo',
-            'Palkia', 'Rayquaza', 'Reshiram', 'Salamence-Mega', 'Shaymin-Sky', 'Xerneas', 'Yveltal', 'Zekrom',
-            'Focus Sash', 'Soul Dew', 'Perish Song',
-        ],
+        ruleset: ['[Gen 1] UU'],
+        banlist: ['UU', 'NUBL'],
     },
     {
-        name: "[Gen 5] Doubles OU",
+        name: "[Gen 4] Ubers",
         threads: [
-            `&bullet; <a href="https://www.smogon.com/forums/threads/3606719/">BW2 Doubles Metagame Discussion</a>`,
-            `&bullet; <a href="https://www.smogon.com/forums/posts/7393048/">BW2 Doubles Viability Rankings</a>`,
-            `&bullet; <a href="https://www.smogon.com/forums/posts/7393081/">BW2 Doubles Sample Teams</a>`,
+            `&bullet; <a href="https://www.smogon.com/forums/posts/8286279/">DPP Ubers</a>`,
         ],
-        mod: 'gen5',
-        gameType: 'doubles',
+        mod: 'gen4',
         // searchShow: false,
-        ruleset: ['Standard', 'Evasion Abilities Clause', 'Swagger Clause', 'Sleep Clause Mod'],
-        banlist: ['DUber', 'Soul Dew', 'Dark Void', 'Gravity'],
+        ruleset: ['Standard'],
+        banlist: ['AG'],
     },
     // Past Gens OU
     ///////////////////////////////////////////////////////////////////
@@ -2072,8 +2148,8 @@ exports.Formats = [
             `&bullet; <a href="https://www.smogon.com/forums/threads/3668699/">BW2 OU Viability Rankings</a>`,
         ],
         mod: 'gen5',
-        ruleset: ['Standard', 'Evasion Abilities Clause', 'Baton Pass Clause', 'Sleep Moves Clause', 'Swagger Clause'],
-        banlist: ['Uber', 'Arena Trap', 'Drizzle ++ Swift Swim', 'Drought ++ Chlorophyll', 'Sand Rush', 'Shadow Tag', 'King\'s Rock', 'Razor Fang', 'Soul Dew', 'Assist'],
+        ruleset: ['Standard', 'Evasion Abilities Clause', 'Sleep Moves Clause', 'Swagger Clause'],
+        banlist: ['Uber', 'Arena Trap', 'Drizzle ++ Swift Swim', 'Drought ++ Chlorophyll', 'Sand Rush', 'Shadow Tag', 'King\'s Rock', 'Razor Fang', 'Soul Dew', 'Assist', 'Baton Pass'],
     },
     {
         name: "[Gen 4] OU",
@@ -2084,7 +2160,7 @@ exports.Formats = [
         ],
         mod: 'gen4',
         ruleset: ['Standard'],
-        banlist: ['AG', 'Uber', 'Arena Trap', 'Sand Veil', 'Swinub + Snow Cloak', 'Piloswine + Snow Cloak', 'Mamoswine + Snow Cloak', 'Soul Dew', 'Baton Pass'],
+        banlist: ['AG', 'Uber', 'Arena Trap', 'Sand Veil', 'Swinub + Snow Cloak', 'Piloswine + Snow Cloak', 'Mamoswine + Snow Cloak', 'Soul Dew', 'Baton Pass', 'Swagger'],
     },
     {
         name: "[Gen 3] OU",
@@ -2094,7 +2170,7 @@ exports.Formats = [
         ],
         mod: 'gen3',
         ruleset: ['Standard', 'One Boost Passer Clause'],
-        banlist: ['Uber', 'Sand Veil', 'Smeargle + Ingrain'],
+        banlist: ['Uber', 'Sand Veil', 'Assist', 'Baton Pass + Mean Look', 'Baton Pass + Spider Web', 'Smeargle + Ingrain'],
     },
     {
         name: "[Gen 2] OU",
@@ -2238,6 +2314,15 @@ exports.Formats = [
         mod: 'gen6',
         ruleset: ['-Nonexistent', 'Team Preview', 'HP Percentage Mod', 'Cancel Mod', 'Endless Battle Clause', 'EV limit = 510'],
     },
+    {
+        name: "[Gen 5] ZU",
+        threads: [
+            `&bullet; <a href="https://www.smogon.com/forums/posts/8034680/">BW2 ZU</a>`,
+        ],
+        mod: 'gen5',
+        ruleset: ['[Gen 5] PU'],
+        banlist: ['PU', 'Dragonair', 'Glalie', 'Machoke', 'Marowak', 'Omanyte', 'Regigigas', 'Trubbish', 'Whirlipede', 'Baton Pass'],
+    },
     // US/UM Singles
     ///////////////////////////////////////////////////////////////////
     {
@@ -2622,6 +2707,25 @@ exports.Formats = [
             'Soul Dew', 'Baton Pass',
         ],
     },
+    {
+        name: "[Gen 6] 1v1",
+        desc: `Bring three Pok&eacute;mon to Team Preview and choose one to battle.`,
+        threads: [
+            `&bullet; <a href="https://www.smogon.com/forums/posts/8031459/">ORAS 1v1</a>`,
+        ],
+        mod: 'gen6',
+        searchShow: false,
+        ruleset: [
+            'Max Team Size = 3', 'Picked Team Size = 1',
+            'Obtainable', 'Nickname Clause', 'Moody Clause', 'OHKO Clause', 'Evasion Moves Clause', 'Accuracy Moves Clause', 'Swagger Clause', 'Endless Battle Clause', 'HP Percentage Mod', 'Cancel Mod', 'Team Preview',
+        ],
+        banlist: [
+            'Arceus', 'Blaziken', 'Darkrai', 'Deoxys-Base', 'Deoxys-Attack', 'Deoxys-Defense', 'Dialga', 'Giratina',
+            'Giratina-Origin', 'Groudon', 'Ho-Oh', 'Kangaskhan-Mega', 'Kyogre', 'Kyurem-White', 'Lugia', 'Mewtwo',
+            'Palkia', 'Rayquaza', 'Reshiram', 'Salamence-Mega', 'Shaymin-Sky', 'Xerneas', 'Yveltal', 'Zekrom',
+            'Focus Sash', 'Soul Dew', 'Perish Song',
+        ],
+    },
     {
         name: "[Gen 6] Anything Goes",
         threads: [
@@ -2820,7 +2924,7 @@ exports.Formats = [
         mod: 'gen5',
         searchShow: false,
         ruleset: ['[Gen 5] NU', 'Sleep Moves Clause'],
-        banlist: ['NU', 'Combusken', 'Gothorita', 'Linoone', 'Riolu', 'Rotom-Frost', 'Simipour', 'Throh', 'Vigoroth'],
+        banlist: ['NU', 'PUBL'],
     },
     {
         name: "[Gen 5] LC",
@@ -2883,6 +2987,19 @@ exports.Formats = [
         section: 'B2/W2 Doubles',
         column: 4,
     },
+    {
+        name: "[Gen 5] Doubles OU",
+        threads: [
+            `&bullet; <a href="https://www.smogon.com/forums/threads/3606719/">BW2 Doubles Metagame Discussion</a>`,
+            `&bullet; <a href="https://www.smogon.com/forums/posts/7393048/">BW2 Doubles Viability Rankings</a>`,
+            `&bullet; <a href="https://www.smogon.com/forums/posts/7393081/">BW2 Doubles Sample Teams</a>`,
+        ],
+        mod: 'gen5',
+        gameType: 'doubles',
+        searchShow: false,
+        ruleset: ['Standard', 'Evasion Abilities Clause', 'Swagger Clause', 'Sleep Clause Mod'],
+        banlist: ['DUber', 'Soul Dew', 'Dark Void', 'Gravity'],
+    },
     {
         name: "[Gen 5] VGC 2013",
         mod: 'gen5',
@@ -2933,16 +3050,6 @@ exports.Formats = [
         section: "DPP Singles",
         column: 5,
     },
-    {
-        name: "[Gen 4] Ubers",
-        threads: [
-            `&bullet; <a href="https://www.smogon.com/forums/posts/8286279/">DPP Ubers</a>`,
-        ],
-        mod: 'gen4',
-        searchShow: false,
-        ruleset: ['Standard'],
-        banlist: ['AG'],
-    },
     {
         name: "[Gen 4] UU",
         threads: [
@@ -2953,7 +3060,7 @@ exports.Formats = [
         searchShow: false,
         ruleset: ['[Gen 4] OU'],
         banlist: ['OU', 'UUBL'],
-        unbanlist: ['Arena Trap'],
+        unbanlist: ['Arena Trap', 'Swagger'],
     },
     {
         name: "[Gen 4] NU",
@@ -3009,8 +3116,8 @@ exports.Formats = [
             'Picked Team Size = 1', 'Max Team Size = 3',
             '[Gen 4] OU', 'Accuracy Moves Clause', 'Sleep Moves Clause', 'Team Preview',
         ],
-        banlist: ['Latias', 'Machamp', 'Porygon-Z', 'Snorlax', 'Togekiss', 'Focus Sash', 'Destiny Bond', 'Explosion', 'Perish Song', 'Self-Destruct'],
-        unbanlist: ['Wobbuffet', 'Wynaut', 'Sand Veil'],
+        banlist: ['Latias', 'Machamp', 'Porygon-Z', 'Shaymin', 'Snorlax', 'Togekiss', 'Focus Sash', 'Destiny Bond', 'Explosion', 'Perish Song', 'Self-Destruct'],
+        unbanlist: ['Wobbuffet', 'Wynaut', 'Sand Veil', 'Swagger'],
     },
     {
         name: "[Gen 4] Anything Goes",
@@ -3041,7 +3148,7 @@ exports.Formats = [
         searchShow: false,
         ruleset: ['[Gen 4] OU'],
         banlist: ['Explosion'],
-        unbanlist: ['Garchomp', 'Latias', 'Latios', 'Manaphy', 'Mew', 'Salamence', 'Wobbuffet', 'Wynaut'],
+        unbanlist: ['Garchomp', 'Latias', 'Latios', 'Manaphy', 'Mew', 'Salamence', 'Wobbuffet', 'Wynaut', 'Swagger'],
     },
     {
         name: "[Gen 4] VGC 2010",
@@ -3083,21 +3190,9 @@ exports.Formats = [
         ],
         mod: 'gen3',
         searchShow: false,
-        ruleset: ['Standard', 'Deoxys Camouflage Clause'],
+        ruleset: ['Standard', 'Deoxys Camouflage Clause', 'One Baton Pass Clause'],
         banlist: ['Wobbuffet + Leftovers'],
     },
-    {
-        name: "[Gen 3] UU",
-        threads: [
-            `&bullet; <a href="https://www.smogon.com/forums/threads/3585923/">ADV UU Metagame Discussion</a>`,
-            `&bullet; <a href="https://www.smogon.com/forums/threads/3548578/">ADV UU Viability Rankings</a>`,
-        ],
-        mod: 'gen3',
-        searchShow: false,
-        ruleset: ['Standard', 'NFE Clause'],
-        banlist: ['Uber', 'OU', 'UUBL', 'Smeargle + Ingrain', 'Baton Pass'],
-        unbanlist: ['Scyther', 'Sand Veil'],
-    },
     {
         name: "[Gen 3] NU",
         threads: [
@@ -3186,7 +3281,10 @@ exports.Formats = [
             'Picked Team Size = 1', 'Max Team Size = 3',
             '[Gen 2] OU', 'Accuracy Moves Clause', 'Sleep Moves Clause', 'Team Preview',
         ],
-        banlist: ['Clefable', 'Snorlax', 'Zapdos', 'Berserk Gene', 'Bright Powder', 'Focus Band', 'King\'s Rock', 'Quick Claw', 'Destiny Bond', 'Explosion', 'Perish Song', 'Present', 'Self-Destruct'],
+        banlist: [
+            'Clefable', 'Snorlax', 'Zapdos', 'Berserk Gene', 'Bright Powder', 'Focus Band', 'King\'s Rock', 'Quick Claw',
+            'Attract', 'Destiny Bond', 'Explosion', 'Perish Song', 'Present', 'Self-Destruct', 'Swagger',
+        ],
     },
     {
         name: "[Gen 2] Nintendo Cup 2000",
@@ -3230,14 +3328,15 @@ exports.Formats = [
         ruleset: ['Standard'],
     },
     {
-        name: "[Gen 1] NU",
+        name: "[Gen 1] UU",
         threads: [
-            `&bullet; <a href="https://www.smogon.com/forums/threads/3668913/">RBY NU Viability Rankings</a>`,
+            `&bullet; <a href="https://www.smogon.com/forums/threads/3573896/">RBY UU Metagame Discussion</a>`,
+            `&bullet; <a href="https://www.smogon.com/forums/threads/3647713/">RBY UU Viability Rankings</a>`,
         ],
         mod: 'gen1',
         searchShow: false,
-        ruleset: ['[Gen 1] UU'],
-        banlist: ['UU', 'NUBL'],
+        ruleset: ['[Gen 1] OU'],
+        banlist: ['OU', 'UUBL'],
     },
     {
         name: "[Gen 1] Japanese OU",