@pkmn/sim 0.5.23 → 0.5.26

package/build/config/formats.js

@@ -80,10 +80,7 @@ exports.Formats = [
         ],
         mod: 'gen8',
         ruleset: ['Standard', 'Dynamax Clause'],
-        banlist: [
-            'Uber', 'AG', 'Arena Trap', 'Moody', 'Power Construct', 'Sand Veil', 'Shadow Tag', 'Snow Cloak',
-            'Bright Powder', 'King\'s Rock', 'Lax Incense', 'Baton Pass',
-        ],
+        banlist: ['Uber', 'AG', 'Arena Trap', 'Moody', 'Power Construct', 'Sand Veil', 'Shadow Tag', 'Snow Cloak', 'King\'s Rock', 'Baton Pass'],
     },
     {
         name: "[Gen 8] OU (Blitz)",
@@ -137,7 +134,7 @@ exports.Formats = [
     {
         name: "[Gen 8] PU",
         threads: [
-            `&bullet; <a href="https://www.smogon.com/forums/threads/3686048/">PU Metagame Discussion</a>`,
+            `&bullet; <a href="https://www.smogon.com/forums/threads/3707179/">PU Metagame Discussion</a>`,
             `&bullet; <a href="https://www.smogon.com/forums/threads/3676106/">PU Viability Rankings</a>`,
         ],
         mod: 'gen8',
@@ -154,8 +151,8 @@ exports.Formats = [
         mod: 'gen8',
         ruleset: ['Little Cup', 'Standard', 'Dynamax Clause'],
         banlist: [
-            'Corsola-Galar', 'Cutiefly', 'Drifloon', 'Gastly', 'Gothita', 'Rufflet', 'Scraggy', 'Scyther', 'Sneasel', 'Swirlix', 'Tangela', 'Vullaby', 'Vulpix-Alola', 'Woobat', 'Zigzagoon-Base',
-            'Chlorophyll', 'Moody', 'Baton Pass', 'Sticky Web',
+            'Corsola-Galar', 'Cutiefly', 'Drifloon', 'Gastly', 'Gothita', 'Rufflet', 'Scraggy', 'Scyther', 'Sneasel', 'Swirlix',
+            'Tangela', 'Vullaby', 'Vulpix-Alola', 'Woobat', 'Zigzagoon-Base', 'Chlorophyll', 'Moody', 'Baton Pass', 'Sticky Web',
         ],
     },
     {
@@ -172,8 +169,8 @@ exports.Formats = [
             'Blaziken', 'Calyrex-Ice', 'Calyrex-Shadow', 'Dialga', 'Dracovish', 'Eternatus', 'Genesect', 'Giratina', 'Giratina-Origin', 'Groudon', 'Ho-Oh',
             'Kartana', 'Kyogre', 'Kyurem-Black', 'Kyurem-White', 'Landorus-Base', 'Lugia', 'Lunala', 'Magearna', 'Marshadow', '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', 'Moody', 'Power Construct', 'Shadow Tag', 'Bright Powder',
-            'Damp Rock', 'Focus Band', 'King\'s Rock', 'Lax Incense', 'Quick Claw', 'Smooth Rock', 'Terrain Extender', 'Acupressure', 'Baton Pass',
+            'Zacian', 'Zacian-Crowned', 'Zamazenta', 'Zamazenta-Crowned', 'Zekrom', 'Zygarde-Base', 'Moody', 'Power Construct', 'Shadow Tag', 'Damp Rock',
+            'Focus Band', 'King\'s Rock', 'Quick Claw', 'Smooth Rock', 'Terrain Extender', 'Acupressure', 'Baton Pass',
         ],
     },
     {
@@ -266,18 +263,26 @@ exports.Formats = [
     {
         name: "[Gen 8] Battle Stadium Singles",
         mod: 'gen8',
-        ruleset: ['Flat Rules', '!! Adjust Level = 50', 'Min Source Gen = 8', 'Limit Two Restricted'],
-        restricted: ['Restricted Legendary'],
+        ruleset: ['Flat Rules', '!! Adjust Level = 50', 'Min Source Gen = 8'],
+        banlist: ['Eternatus-Eternamax'],
+        unbanlist: ['Mythical', 'Restricted Legendary'],
     },
     {
-        name: "[Gen 8] I Choose 'Chu!",
+        name: "[Gen 8] Champion League",
         threads: [
-            `&bullet; <a href="https://www.smogon.com/forums/threads/3705481/">I Choose 'Chu! Discussion</a>`,
+            `&bullet; <a href="https://www.smogon.com/forums/threads/3707533/">Champion League Discussion</a>`,
         ],
         mod: 'gen8',
         ruleset: ['Flat Rules', '!! Adjust Level = 50', 'Min Source Gen = 8'],
-        banlist: ['All Pokemon', 'Raichu-Alola + Sing'],
-        unbanlist: ['Pichu', 'Pikachu', 'Raichu'],
+        banlist: ['All Pokemon'],
+        unbanlist: [
+            'Venusaur', 'Charizard', 'Blastoise', 'Sandslash-Base', 'Ninetales-Base', 'Arcanine', 'Alakazam', 'Tentacruel', 'Magneton', 'Cloyster',
+            'Exeggutor-Base', 'Rhydon', 'Gyarados', 'Lapras', 'Vaporeon', 'Jolteon', 'Flareon', 'Aerodactyl', 'Dragonite', 'Heracross', 'Skarmory',
+            'Tyranitar', 'Ludicolo', 'Aggron', 'Wailord', 'Altaria', 'Whiscash', 'Claydol', 'Cradily', 'Armaldo', 'Milotic', 'Salamence',
+            'Metagross', 'Roserade', 'Gastrodon', 'Spiritomb', 'Garchomp', 'Lucario', 'Rhyperior', 'Togekiss', 'Seismitoad', 'Archeops',
+            'Vanilluxe', 'Escavalier', 'Haxorus', 'Accelgor', 'Druddigon', 'Bouffalant', 'Hydreigon', 'Volcarona', 'Aegislash', 'Tyrantrum',
+            'Aurorus', 'Hawlucha', 'Carbink', 'Goodra', 'Gourgeist', 'Rillaboom', 'Cinderace', 'Inteleon', 'Mr. Rime', 'Dragapult',
+        ],
     },
     {
         name: "[Gen 8] Custom Game",
@@ -355,6 +360,20 @@ exports.Formats = [
         ruleset: ['Flat Rules', '!! Adjust Level = 50', 'Min Source Gen = 8', 'VGC Timer', 'Limit Two Restricted'],
         restricted: ['Restricted Legendary'],
     },
+    {
+        name: "[Gen 8] Battle Stadium Doubles Series 13",
+        mod: 'gen8',
+        gameType: 'doubles',
+        ruleset: ['Flat Rules', '!! Adjust Level = 50', 'Min Source Gen = 8', 'VGC Timer'],
+        banlist: ['Eternatus-Eternamax'],
+        unbanlist: ['Mythical', 'Restricted Legendary'],
+    },
+    {
+        name: "[Gen 8] Spikemuth Cup",
+        mod: 'gen8',
+        gameType: 'doubles',
+        ruleset: ['Flat Rules', 'Dynamax Clause', '!! Adjust Level = 50', 'Min Source Gen = 8', 'VGC Timer'],
+    },
     {
         name: "[Gen 8] VGC 2021",
         mod: 'gen8',
@@ -453,17 +472,7 @@ 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', 'Sand Veil', 'Shadow Tag', 'Snow Cloak', 'Bright Powder', 'King\'s Rock', 'Lax Incense', 'Razor Fang',
-            'Quick Claw', 'Baton Pass',
-        ],
+        banlist: ['ND Uber', 'Arena Trap', 'Moody', 'Power Construct', 'Sand Veil', 'Shadow Tag', 'Snow Cloak', 'Bright Powder', 'King\'s Rock', 'Lax Incense', 'Razor Fang', 'Quick Claw', 'Baton Pass'],
     },
     {
         name: "[Gen 8] National Dex UU",
@@ -474,25 +483,17 @@ exports.Formats = [
         ],
         mod: 'gen8',
         ruleset: ['[Gen 8] National Dex'],
-        banlist: [
-            // National Dex OU
-            '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', 'Light Clay',
-            // Slowbronite is banned so it doesn't validate on Galarian Slowbro
-            'Slowbronite',
-        ],
-        // Used to distinguish UU from below UU in the client
-        restricted: [
-            'Aegislash', 'Altaria-Mega', 'Amoonguss', 'Azumarill', 'Beedrill-Mega', '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',
+        banlist: ['ND OU', 'ND UUBL', 'Drizzle', 'Drought', 'Light Clay', 'Slowbronite'],
+    },
+    {
+        name: "[Gen 8] National Dex RU",
+        threads: [
+            `&bullet; <a href="https://www.smogon.com/forums/threads/3691290/">National Dex RU</a>`,
         ],
+        mod: 'gen8',
+        searchShow: false,
+        ruleset: ['[Gen 8] National Dex UU'],
+        banlist: ['ND UU', 'ND RUBL'],
     },
     {
         name: "[Gen 8] National Dex Monotype",
@@ -527,41 +528,57 @@ exports.Formats = [
         section: "Pet Mods",
     },
     {
-        name: "[Gen 8] Restrictions",
-        desc: `A metagame made up of brand new Pok&eacute;mon that are made according to various random and non-random restrictions.`,
+        name: "[Gen 8] National Dex BH",
+        desc: `Balanced Hackmons with National Dex elements mixed in.`,
         threads: [
-            `&bullet; <a href="https://www.smogon.com/forums/threads/3673824/">Restrictions</a>`,
-            `&bullet; <a href="https://docs.google.com/spreadsheets/d/1XsplBqN8njHZJT9cTP_3i3YSFITB9WaVfNOYAbNY75M/edit?usp=sharing">Spreadsheet</a>`,
+            `&bullet; <a href="https://www.smogon.com/forums/threads/3658587/">National Dex Balanced Hackmons</a>`,
         ],
-        mod: 'restrictions',
-        ruleset: ['Standard', 'Dynamax Clause'],
-        banlist: ['All Pokemon', 'Past'],
-        unbanlist: [
-            'Vulcaraptor', 'Parakinesis', 'Serpaint', 'Torgeist', 'Regolite', 'Polbearab', 'Centhorn', 'Donzyxote', 'Scimicobra', 'Folliclawe', 'Afloof', 'Nimbusteed',
-            'Aerock', 'Borassa', 'Sharm', 'Nunopod', 'Crypterid', 'Abysseil', 'Faerenheit', 'Spiriteal', 'Zoltanka', 'Flydra', 'Coracrab', 'Quadringo', 'Teslaple',
-            'Kapagon', 'Cyknight', 'Dirtoad', 'Crystelf', 'Rancourgar', 'Scalaron', 'Dragraceful', 'Tantrary', 'Modolith', 'Snailord', 'Arbrella', 'Draugelid',
-            'Cinnastar', 'Refluse', 'Kelven', 'Kodokai', 'Cindarner', 'Thucotuco', 'Sorree', 'Gembezzle', 'Winterloper', 'Agapest', 'Volvolpa', 'Punduluum', 'Wraithful',
-            'Panzarma', 'Krachiten', 'Cellsius', 'Borelem', 'Electangle', 'Orchile', 'Shinodori', 'Fluidrake', 'Potossum', 'Twygdrasill',
+        mod: 'gen8',
+        ruleset: ['-Nonexistent', 'Standard NatDex', 'Forme Clause', 'Sleep Moves Clause', '2 Ability Clause', 'OHKO Clause', 'Evasion Moves Clause', 'Dynamax Clause', 'CFZ Clause', '!Obtainable'],
+        banlist: [
+            // Pokemon
+            'Eternatus-Eternamax', 'Groudon-Primal', 'Rayquaza-Mega', 'Shedinja', 'Cramorant-Gorging', 'Calyrex-Shadow',
+            // Abilities
+            'Arena Trap', 'Contrary', 'Gorilla Tactics', 'Huge Power', 'Illusion', 'Innards Out', 'Libero', 'Magnet Pull', 'Moody', 'Neutralizing Gas', 'Parental Bond', 'Protean', 'Pure Power', 'Shadow Tag', 'Stakeout', 'Water Bubble', 'Wonder Guard',
+            // Items
+            'Gengarite',
+            // Moves
+            'Chatter', 'Double Iron Bash', 'Octolock', 'Shell Smash', 'Bolt Beak', 'Belly Drum', 'Electrify', 'Court Change',
+            // Other
+            'Comatose + Sleep Talk', 'Imprison + Transform',
         ],
+        onValidateSet(set) {
+            if (this.toID(set.ability) === 'intrepidsword' &&
+                !this.toID(set.species).startsWith('zacian') && this.toID(set.item) !== 'rustedsword') {
+                return [`${set.ability} is banned.`];
+            }
+            if (set.species === 'Zacian-Crowned' &&
+                (this.toID(set.item) !== 'rustedsword' || this.toID(set.ability) !== 'intrepidsword')) {
+                return [`${set.species} is banned.`];
+            }
+        },
+        onValidateTeam(team) {
+            let arceus = 0;
+            for (const set of team) {
+                const species = this.dex.species.get(set.species);
+                if (species.baseSpecies === "Arceus")
+                    arceus++;
+            }
+            if (arceus > 1) {
+                return [`You are limited to one Arceus forme.`, `(You have ${arceus} Arceus formes.)`];
+            }
+        },
     },
     {
-        name: "[Gen 8] Roulettemons Random Battle",
+        name: "[Gen 8] JolteMons Random Battle",
+        desc: `Pok&eacute;mon, items, abilities, and moves are redesigned for OU, and new items, abilities, and moves are added, all without changing base stats.`,
         threads: [
-            `&bullet; <a href="https://www.smogon.com/forums/threads/3649106/">Roulettemons</a>`,
-            `&bullet; <a href="https://docs.google.com/spreadsheets/d/1EOA1m7JXTq7Zz0ViVI4n6lBppFjVBa4S1GqhAwkPTZQ/edit?usp=sharing">Spreadsheet</a>`,
+            `&bullet; <a href="https://www.smogon.com/forums/threads/3694234/">JolteMons</a>`,
+            `&bullet; <a href="https://docs.google.com/spreadsheets/d/149ZlQY0bJIAqfWB_233Dvbpqs3pVSHYpIoAQQkwquls/edit?usp=sharing">Spreadsheet</a>`,
         ],
+        mod: 'joltemons',
         team: 'random',
-        mod: 'roulettemons',
-        ruleset: ['Standard NatDex'],
-        onSwitchIn(pokemon) {
-            this.add('-start', pokemon, 'typechange', pokemon.species.types.join('/'), '[silent]');
-        },
-        onChangeSet(set) {
-            if (set.species === 'Chillyte-Mega') {
-                set.species = 'Chillyte';
-                set.ability = 'Grassy Surge';
-            }
-        },
+        ruleset: ['Dynamax Clause', 'Obtainable', 'Species Clause', 'HP Percentage Mod', 'Cancel Mod', 'Sleep Clause Mod', 'Mega Data Mod', 'Z-Move Clause'],
     },
     {
         name: "[Gen 6] NEXT OU",
@@ -581,42 +598,118 @@ exports.Formats = [
         column: 2,
     },
     {
-        name: "[Gen 8] Re-Evolution",
-        desc: `Pok&eacute;mon gain the stat changes they would gain from evolving again.`,
+        name: "[Gen 8] Partners in Crime",
+        desc: `Doubles-based metagame where both active ally Pok&eacute;mon share abilities and moves.`,
         threads: [
-            `&bullet; <a href="https://www.smogon.com/forums/threads/3703643/">Re-Evolution</a>`,
+            `&bullet; <a href="https://www.smogon.com/forums/threads/3706080/">Partners in Crime</a>`,
         ],
-        mod: 'gen8',
-        ruleset: ['Standard', 'Re-Evolution Mod', 'Evasion Abilities Clause', 'Dynamax Clause'],
+        mod: 'partnersincrime',
+        gameType: 'doubles',
+        // searchShow: false,
+        ruleset: ['Standard Doubles', 'Dynamax Clause'],
         banlist: [
-            'Darmanitan-Galar', 'Gyarados', 'Lunala', 'Milotic', 'Naganadel', 'Solgaleo', 'Urshifu-Base', 'Volcarona',
-            'Zacian-Crowned', 'Arena Trap', 'Moody', 'Shadow Tag', 'Bright Powder', 'King\'s Rock', 'Lax Incense', 'Baton Pass',
+            'Calyrex-Ice', 'Calyrex-Shadow', 'Dialga', 'Eternatus', 'Giratina', 'Giratina-Origin', 'Groudon', 'Ho-Oh',
+            'Jirachi', 'Kyogre', 'Kyurem-White', 'Lugia', 'Lunala', 'Magearna', 'Marshadow', 'Melmetal', 'Mewtwo',
+            'Necrozma-Dawn-Wings', 'Necrozma-Dusk-Mane', 'Palkia', 'Rayquaza', 'Reshiram', 'Solgaleo', 'Urshifu-Base',
+            'Xerneas', 'Yveltal', 'Zacian', 'Zacian-Crowned', 'Zamazenta', 'Zamazenta-Crowned', 'Zekrom', 'Emergency Exit',
+            'Huge Power', 'Moody', 'Power Construct', 'Shadow Tag', 'Wimp Out', 'Wonder Guard', 'Bolt Beak', 'Fishious Rend',
+            'Shell Smash', 'Swagger',
         ],
+        onBeforeSwitchIn(pokemon) {
+            pokemon.m.curMoves = this.dex.deepClone(pokemon.moves);
+            let ngas = false;
+            for (const poke of this.getAllActive()) {
+                if (this.toID(poke.ability) === 'neutralizinggas') {
+                    ngas = true;
+                    break;
+                }
+            }
+            const BAD_ABILITIES = ['trace', 'imposter', 'neutralizinggas'];
+            // Abilities that must be applied before both sides trigger onSwitchIn to correctly
+            // handle switch-in ability-to-ability interactions, e.g. Intimidate counters
+            const NEEDED_BEFORE_SWITCH_IN_ABILITIES = [
+                'clearbody', 'competitive', 'contrary', 'defiant', 'fullmetalbody', 'hypercutter', 'innerfocus',
+                'mirrorarmor', 'oblivious', 'owntempo', 'rattled', 'scrappy', 'simple', 'whitesmoke',
+            ];
+            const ally = pokemon.side.active.find(mon => mon && mon !== pokemon && !mon.fainted);
+            if (ally && ally.ability !== pokemon.ability) {
+                if (!pokemon.m.innate && !BAD_ABILITIES.includes(this.toID(ally.ability)) &&
+                    NEEDED_BEFORE_SWITCH_IN_ABILITIES.includes(this.toID(ally.ability))) {
+                    pokemon.m.innate = 'ability:' + ally.ability;
+                    delete pokemon.volatiles[pokemon.m.innate];
+                    if (!ngas || ally.getAbility().isPermanent)
+                        pokemon.addVolatile(pokemon.m.innate);
+                }
+                if (!ally.m.innate && !BAD_ABILITIES.includes(this.toID(pokemon.ability)) &&
+                    NEEDED_BEFORE_SWITCH_IN_ABILITIES.includes(this.toID(pokemon.ability))) {
+                    ally.m.innate = 'ability:' + pokemon.ability;
+                    delete ally.volatiles[ally.m.innate];
+                    if (!ngas || pokemon.getAbility().isPermanent)
+                        ally.addVolatile(ally.m.innate);
+                }
+            }
+        },
+        onSwitchInPriority: 2,
+        onSwitchIn(pokemon) {
+            let ngas = false;
+            for (const poke of this.getAllActive()) {
+                if (this.toID(poke.ability) === 'neutralizinggas') {
+                    ngas = true;
+                    break;
+                }
+            }
+            const BAD_ABILITIES = ['trace', 'imposter', 'neutralizinggas'];
+            const ally = pokemon.side.active.find(mon => mon && mon !== pokemon && !mon.fainted);
+            if (ally && ally.ability !== pokemon.ability) {
+                if (!pokemon.m.innate && !BAD_ABILITIES.includes(this.toID(ally.ability))) {
+                    pokemon.m.innate = 'ability:' + ally.ability;
+                    delete pokemon.volatiles[pokemon.m.innate];
+                    if (!ngas || ally.getAbility().isPermanent)
+                        pokemon.addVolatile(pokemon.m.innate);
+                }
+                if (!ally.m.innate && !BAD_ABILITIES.includes(this.toID(pokemon.ability))) {
+                    ally.m.innate = 'ability:' + pokemon.ability;
+                    delete ally.volatiles[ally.m.innate];
+                    if (!ngas || pokemon.getAbility().isPermanent)
+                        ally.addVolatile(ally.m.innate);
+                }
+            }
+        },
+        onSwitchOut(pokemon) {
+            if (pokemon.m.innate) {
+                pokemon.removeVolatile(pokemon.m.innate);
+                delete pokemon.m.innate;
+            }
+            const ally = pokemon.side.active.find(mon => mon && mon !== pokemon && !mon.fainted);
+            if (ally && ally.m.innate) {
+                ally.removeVolatile(ally.m.innate);
+                delete ally.m.innate;
+            }
+        },
+        onFaint(pokemon) {
+            if (pokemon.m.innate) {
+                pokemon.removeVolatile(pokemon.m.innate);
+                delete pokemon.m.innate;
+            }
+            const ally = pokemon.side.active.find(mon => mon && mon !== pokemon && !mon.fainted);
+            if (ally && ally.m.innate) {
+                ally.removeVolatile(ally.m.innate);
+                delete ally.m.innate;
+            }
+        },
     },
     {
-        name: "[Gen 8] Category Swap",
-        desc: `All physical moves become special, and all special moves become physical.`,
+        name: "[Gen 8] Chimera 1v1",
+        desc: `One Pok&eacute;mon inherits specific traits from your entire 6-mon team, based on their order.`,
         threads: [
-            `&bullet; <a href="https://www.smogon.com/forums/threads/3702709/">Category Swap</a>`,
+            `&bullet; <a href="https://www.smogon.com/forums/threads/3661215/">Chimera 1v1</a>`,
         ],
         mod: 'gen8',
-        ruleset: ['Standard', 'Dynamax Clause'],
+        ruleset: ['Chimera 1v1 Rule', 'Standard', 'Dynamax Clause', 'Sleep Moves Clause'],
         banlist: [
-            'Calyrex-Ice', 'Calyrex-Shadow', 'Darmanitan-Galar', 'Dialga', 'Dracovish', 'Eternatus', 'Genesect', 'Giratina', 'Giratina-Origin', 'Groudon',
-            'Ho-Oh', 'Kyogre', 'Kyurem', 'Kyurem-Black', 'Kyurem-White', 'Landorus-Base', 'Lugia', 'Lunala', 'Mewtwo', 'Necrozma-Dawn-Wings', 'Necrozma-Dusk-Mane',
-            'Palkia', 'Pheromosa', 'Rayquaza', 'Reshiram', 'Solgaleo', 'Xerneas', 'Yveltal', 'Zacian', 'Zacian-Crowned', 'Zamazenta', 'Zamazenta-Crowned',
-            'Zekrom', 'Arena Trap', 'Moody', 'Power Construct', 'Shadow Tag', 'King\'s Rock', 'Baton Pass', 'Draco Meteor', 'Overheat',
+            'Shedinja', 'Huge Power', 'Moody', 'Neutralizing Gas', 'Truant', 'Perish Body', 'Eviolite', 'Focus Sash', 'Leek', 'Light Ball',
+            'Bolt Beak', 'Disable', 'Double Iron Bash', 'Fishious Rend', 'Perish Song', 'Switcheroo', 'Transform', 'Trick',
         ],
-        onModifyMove(move) {
-            if (move.category === 'Status')
-                return;
-            if (move.category === 'Special') {
-                move.category = 'Physical';
-            }
-            else {
-                move.category = 'Special';
-            }
-        },
     },
     // Other Metagames
     ///////////////////////////////////////////////////////////////////
@@ -649,16 +742,16 @@ exports.Formats = [
             `&bullet; <a href="https://www.smogon.com/forums/threads/3682690/">AAA Resources</a>`,
         ],
         mod: 'gen8',
-        ruleset: ['Standard', '!Obtainable Abilities', '2 Ability Clause', 'Dynamax Clause', 'Sleep Moves Clause', '!Sleep Clause Mod'],
+        ruleset: ['Standard OMs', '!Obtainable Abilities', '2 Ability Clause', 'Sleep Moves Clause'],
         banlist: [
-            'Archeops', 'Blacephalon', 'Buzzwole', 'Calyrex-Ice', 'Calyrex-Shadow', 'Dialga', 'Dracovish', 'Dragapult', 'Dragonite', 'Eternatus', 'Gengar',
-            'Giratina', 'Giratina-Origin', 'Groudon', 'Ho-Oh', 'Kartana', 'Keldeo', 'Kommo-o', 'Kyogre', 'Kyurem', 'Kyurem-Black', 'Kyurem-White',
+            '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', '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', 'Protean',
-            'Pure Power', 'Shadow Tag', 'Simple', 'Stakeout', 'Speed Boost', 'Water Bubble', 'Wonder Guard', 'King\'s Rock', 'Baton Pass',
+            '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', 'Magic Bounce', 'Magnet Pull', 'Moody', 'Neutralizing Gas', 'Parental Bond', 'Poison Heal', 'Protean',
+            'Pure Power', 'Shadow Tag', 'Simple', 'Stakeout', 'Speed Boost', 'Unburden', 'Water Bubble', 'Wonder Guard', 'King\'s Rock', 'Baton Pass',
         ],
     },
     {
@@ -669,7 +762,7 @@ exports.Formats = [
             `&bullet; <a href="https://www.smogon.com/forums/threads/3659028/">M&amp;M Resources</a>`,
         ],
         mod: 'mixandmega',
-        ruleset: ['Standard', 'Overflow Stat Mod', 'Dynamax Clause'],
+        ruleset: ['Standard OMs', 'Sleep Clause Mod'],
         banlist: [
             'Calyrex-Shadow', 'Eternatus', 'Kyogre', 'Zacian',
             'Beedrillite', 'Blazikenite', 'Gengarite', 'Kangaskhanite', 'Mawilite', 'Medichamite', 'Pidgeotite',
@@ -739,7 +832,7 @@ exports.Formats = [
             `&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', '!Sleep Clause Mod'],
+        ruleset: ['Standard OMs', 'STABmons Move Legality', 'Sleep Moves Clause'],
         banlist: [
             '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',
@@ -762,7 +855,7 @@ exports.Formats = [
             `&bullet; <a href="https://www.smogon.com/forums/threads/3672463/">NFE Resources</a>`,
         ],
         mod: 'gen8',
-        ruleset: ['Not Fully Evolved', 'Standard', 'Dynamax Clause'],
+        ruleset: ['Standard OMs', 'Not Fully Evolved', 'Sleep Clause Mod'],
         banlist: [
             'Chansey', 'Doublade', 'Golbat', 'Haunter', 'Kadabra', 'Magmar', 'Magneton', 'Mr. Mime-Galar', 'Pawniard', 'Pikachu',
             'Porygon2', 'Rhydon', 'Scyther', 'Sneasel', 'Type: Null', 'Vulpix-Base', 'Arena Trap', 'Shadow Tag', 'Baton Pass',
@@ -775,12 +868,12 @@ exports.Formats = [
             `&bullet; <a href="https://www.smogon.com/forums/threads/3660461/">Godly Gift</a>`,
         ],
         mod: 'gen8',
-        ruleset: ['Standard', 'Dynamax Clause', 'Sleep Moves Clause'],
+        ruleset: ['Standard OMs', 'Sleep Moves Clause'],
         banlist: [
-            'Blissey', 'Calyrex-Shadow', 'Chansey', 'Crawdaunt', 'Dragapult', 'Eternatus', 'Hawlucha', 'Marowak-Alola', 'Melmetal', 'Nidoking',
-            'Nidoqueen', 'Pikachu', 'Toxapex', 'Xerneas', 'Zacian', 'Zacian-Crowned', 'Uber > 1', 'AG ++ Uber > 1', 'Arena Trap', 'Huge Power',
-            'Moody', 'Pure Power', 'Shadow Tag', 'Swift Swim', 'Bright Powder', 'Focus Band', 'King\'s Rock', 'Lax Incense', 'Quick Claw',
-            'Baton Pass',
+            'Blissey', 'Calyrex-Shadow', 'Chansey', 'Crawdaunt', 'Dragapult', 'Eternatus', 'Hawlucha', 'Kyogre', 'Marowak-Alola', 'Melmetal',
+            'Nidoking', 'Nidoqueen', 'Pikachu', 'Toxapex', 'Xerneas', 'Zacian', 'Zacian-Crowned', 'Uber > 1', 'AG ++ Uber > 1', 'Arena Trap',
+            'Huge Power', 'Moody', 'Pure Power', 'Shadow Tag', 'Swift Swim', 'Bright Powder', 'Focus Band', 'King\'s Rock', 'Lax Incense',
+            'Quick Claw', 'Baton Pass',
         ],
         onValidateTeam(team) {
             const gods = new Set();
@@ -858,6 +951,8 @@ exports.Formats = [
             'Decorate', 'Final Gambit', 'Flatter', 'Floral Healing', 'Flower Shield', 'Follow Me', 'Heal Pulse', 'Rage Powder', 'Swagger',
         ],
     },
+    // Brilliant Diamond/Shining Pearl
+    ///////////////////////////////////////////////////////////////////
     {
         section: "BD/SP",
         column: 2,
@@ -881,10 +976,7 @@ exports.Formats = [
         ],
         mod: 'gen8bdsp',
         ruleset: ['Standard'],
-        banlist: [
-            'Uber', 'Arena Trap', 'Drizzle', 'Moody', 'Sand Veil', 'Shadow Tag', 'Snow Cloak',
-            'Bright Powder', 'King\'s Rock', 'Lax Incense', 'Razor Fang', 'Baton Pass',
-        ],
+        banlist: ['Uber', 'Arena Trap', 'Drizzle', 'Moody', 'Sand Veil', 'Shadow Tag', 'Snow Cloak', 'King\'s Rock', 'Razor Fang', 'Baton Pass'],
     },
     {
         name: "[Gen 8 BDSP] Ubers",
@@ -892,6 +984,7 @@ exports.Formats = [
             `&bullet; <a href="https://www.smogon.com/forums/threads/3694036/">BDSP Ubers Discussion &amp; Resources</a>`,
         ],
         mod: 'gen8bdsp',
+        searchShow: false,
         ruleset: ['Standard'],
         banlist: ['AG', 'Baton Pass'],
     },
@@ -901,6 +994,7 @@ exports.Formats = [
             `&bullet; <a href="https://www.smogon.com/forums/threads/3694307/">BDSP UU</a>`,
         ],
         mod: 'gen8bdsp',
+        searchShow: false,
         ruleset: ['[Gen 8 BDSP] OU'],
         banlist: ['OU', 'UUBL'],
     },
@@ -910,6 +1004,7 @@ exports.Formats = [
             `&bullet; <a href="https://www.smogon.com/forums/threads/3695563/">BDSP RU</a>`,
         ],
         mod: 'gen8bdsp',
+        searchShow: false,
         ruleset: ['[Gen 8 BDSP] UU'],
         banlist: ['UU', 'RUBL', 'Drought'],
     },
@@ -919,6 +1014,7 @@ exports.Formats = [
             `&bullet; <a href="https://www.smogon.com/forums/threads/3697080/">BDSP NU</a>`,
         ],
         mod: 'gen8bdsp',
+        searchShow: false,
         ruleset: ['[Gen 8 BDSP] RU'],
         banlist: ['RU', 'NUBL', 'Damp Rock', 'Heat Rock'],
     },
@@ -928,6 +1024,7 @@ exports.Formats = [
             `&bullet; <a href="https://www.smogon.com/forums/threads/3700009/">BDSP PU</a>`,
         ],
         mod: 'gen8bdsp',
+        searchShow: false,
         ruleset: ['[Gen 8 BDSP] NU'],
         banlist: ['NU', 'PUBL'],
     },
@@ -937,6 +1034,7 @@ exports.Formats = [
             `&bullet; <a href="https://www.smogon.com/forums/threads/3696004/">BDSP LC</a>`,
         ],
         mod: 'gen8bdsp',
+        searchShow: false,
         ruleset: ['Little Cup', 'Standard'],
         banlist: ['Gligar', 'Meditite', 'Misdreavus', 'Munchlax', 'Murkrow', 'Scyther', 'Sneasel', 'Tangela', 'Vulpix', 'Yanma', 'Moody', 'Baton Pass', 'Sticky Web'],
     },
@@ -946,6 +1044,7 @@ exports.Formats = [
             `&bullet; <a href="https://www.smogon.com/forums/threads/3694267/">BDSP Monotype</a>`,
         ],
         mod: 'gen8bdsp',
+        searchShow: false,
         ruleset: ['[Gen 8 BDSP] OU', 'Same Type Clause'],
     },
     {
@@ -957,15 +1056,6 @@ 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',
-        searchShow: false,
-        ruleset: ['Flat Rules', 'Min Source Gen = 8'],
-    },
     {
         name: "[Gen 8 BDSP] Doubles OU",
         threads: [
@@ -983,8 +1073,11 @@ exports.Formats = [
         ],
         mod: 'gen8bdsp',
         gameType: 'doubles',
+        searchShow: false,
         ruleset: ['Flat Rules', 'Min Source Gen = 8'],
     },
+    // Challengeable OMs
+    ///////////////////////////////////////////////////////////////////
     {
         section: "Challengeable OMs",
         column: 2,
@@ -997,7 +1090,7 @@ exports.Formats = [
         ],
         mod: 'gen8',
         searchShow: false,
-        ruleset: ['Standard', 'Dynamax Clause', 'Camomons Mod'],
+        ruleset: ['Standard OMs', 'Camomons Mod', 'Sleep Clause Mod'],
         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', 'Lugia', 'Lunala', 'Marshadow',
@@ -1014,7 +1107,7 @@ exports.Formats = [
         ],
         mod: 'gen8',
         searchShow: false,
-        ruleset: ['Standard', 'Overflow Stat Mod', 'Dynamax Clause', '2 Ability Clause'],
+        ruleset: ['Standard OMs', '2 Ability Clause', 'Sleep Clause Mod'],
         banlist: ['Corsola-Galar', 'Sneasel', 'Type: Null', 'Arena Trap', 'Ice Scales', 'Moody', 'King\'s Rock', 'Baton Pass'],
         restricted: ['Chansey', 'Lunala', 'Shedinja', 'Solgaleo', 'Gorilla Tactics', 'Huge Power', 'Pure Power', 'Shadow Tag'],
         onValidateTeam(team) {
@@ -1164,7 +1257,7 @@ exports.Formats = [
         ],
         mod: 'gen8',
         searchShow: false,
-        ruleset: ['Standard', '!Sleep Clause Mod', 'Sleep Moves Clause', '2 Ability Clause', 'Dynamax Clause'],
+        ruleset: ['Standard OMs', '2 Ability Clause', 'Sleep Moves Clause'],
         banlist: [
             'Blacephalon', 'Blaziken', 'Butterfree', 'Calyrex-Ice', 'Calyrex-Shadow', 'Chansey', 'Combusken', 'Cresselia', 'Darmanitan-Galar', 'Dialga',
             'Dracovish', 'Eternatus', 'Giratina', 'Giratina-Origin', 'Groudon', 'Ho-Oh', 'Kartana', 'Kyogre', 'Kyurem-Black', 'Kyurem-White', 'Lugia',
@@ -1353,7 +1446,7 @@ exports.Formats = [
         ],
         mod: 'linked',
         searchShow: false,
-        ruleset: ['Standard', 'Dynamax Clause'],
+        ruleset: ['Standard OMs', 'Sleep Clause Mod'],
         banlist: [
             'Calyrex-Ice', 'Calyrex-Shadow', 'Cinderace', 'Cloyster', 'Darmanitan-Galar', 'Dialga', 'Dracovish', 'Eternatus', 'Genesect', 'Giratina',
             'Giratina-Origin', 'Groudon', 'Ho-Oh', 'Kartana', 'Kyogre', 'Kyurem', 'Kyurem-Black', 'Kyurem-White', 'Landorus-Base', 'Lugia', 'Lunala',
@@ -1385,7 +1478,7 @@ exports.Formats = [
         ],
         mod: 'gen8',
         searchShow: false,
-        ruleset: ['Standard', 'Dynamax Clause', '2 Ability Clause', 'Sleep Moves Clause', '!Sleep Clause Mod'],
+        ruleset: ['Standard OMs', '2 Ability Clause', 'Sleep Moves Clause'],
         banlist: [
             'Calyrex-Ice', 'Calyrex-Shadow', 'Cinderace', 'Darmanitan-Galar', 'Dialga', 'Dracovish', 'Dragonite', 'Eternatus',
             'Genesect', 'Giratina', 'Giratina-Origin', 'Groudon', 'Ho-Oh', 'Kartana', 'Kyogre', 'Kyurem-Black', 'Kyurem-White',
@@ -1590,7 +1683,7 @@ exports.Formats = [
         ],
         mod: 'gen8',
         searchShow: false,
-        ruleset: ['Standard', 'Dynamax Clause'],
+        ruleset: ['Standard OMs', 'Sleep Clause Mod'],
         banlist: [
             'Blissey', 'Calyrex-Ice', 'Calyrex-Shadow', 'Chansey', 'Cloyster', 'Dialga', 'Eternatus', 'Genesect', 'Giratina',
             'Giratina-Origin', 'Groudon', 'Ho-Oh', 'Kyogre', 'Kyurem-Black', 'Kyurem-White', 'Landorus-Base', 'Lugia', 'Lunala',
@@ -1645,7 +1738,7 @@ exports.Formats = [
         ],
         mod: 'pokebilities',
         searchShow: false,
-        ruleset: ['Standard', 'Dynamax Clause'],
+        ruleset: ['Standard OMs', 'Sleep Clause Mod'],
         banlist: [
             'Calyrex-Ice', 'Calyrex-Shadow', 'Cinderace', 'Conkeldurr', 'Darmanitan-Galar', 'Dialga', 'Dracovish', 'Dracozolt',
             'Eternatus', 'Excadrill', 'Genesect', 'Giratina', 'Giratina-Origin', 'Groudon', 'Ho-Oh', 'Kyogre', 'Kyurem-Black',
@@ -1684,10 +1777,29 @@ exports.Formats = [
                     .filter(ability => ability !== pokemon.ability);
             }
         },
+        onBeforeSwitchIn(pokemon) {
+            // Abilities that must be applied before both sides trigger onSwitchIn to correctly
+            // handle switch-in ability-to-ability interactions, e.g. Intimidate counters
+            const neededBeforeSwitchInIDs = [
+                'clearbody', 'competitive', 'contrary', 'defiant', 'fullmetalbody', 'hypercutter', 'innerfocus',
+                'mirrorarmor', 'oblivious', 'owntempo', 'rattled', 'scrappy', 'simple', 'whitesmoke',
+            ];
+            if (pokemon.m.innates) {
+                for (const innate of pokemon.m.innates) {
+                    if (!neededBeforeSwitchInIDs.includes(innate))
+                        continue;
+                    if (pokemon.hasAbility(innate))
+                        continue;
+                    pokemon.addVolatile("ability:" + innate, pokemon);
+                }
+            }
+        },
         onSwitchInPriority: 2,
         onSwitchIn(pokemon) {
             if (pokemon.m.innates) {
                 for (const innate of pokemon.m.innates) {
+                    if (pokemon.hasAbility(innate))
+                        continue;
                     pokemon.addVolatile("ability:" + innate, pokemon);
                 }
             }
@@ -1728,7 +1840,7 @@ exports.Formats = [
         ],
         mod: 'sharedpower',
         searchShow: false,
-        ruleset: ['Standard', 'Dynamax Clause'],
+        ruleset: ['Standard OMs', 'Sleep Clause Mod'],
         banlist: [
             'Calyrex-Ice', 'Calyrex-Shadow', 'Darmanitan-Galar', 'Dialga', 'Dracovish', 'Eternatus', 'Genesect', 'Giratina',
             'Giratina-Origin', 'Groudon', 'Ho-Oh', 'Kyogre', 'Kyurem-Black', 'Kyurem-White', 'Lugia', 'Lunala', 'Magearna',
@@ -1795,7 +1907,7 @@ exports.Formats = [
         searchShow: false,
         challengeShow: false,
         tournamentShow: false,
-        ruleset: ['Standard', 'Dynamax Clause'],
+        ruleset: ['Standard OMs', 'Sleep Clause Mod'],
         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', 'Marowak-Alola', 'Marshadow', 'Melmetal',
@@ -1902,7 +2014,7 @@ exports.Formats = [
         ],
         mod: 'gen8',
         searchShow: false,
-        ruleset: ['Standard', '!OHKO Clause', 'Picked Team Size = 6', 'Adjust Level = 100'],
+        ruleset: ['Standard OMs', 'Sleep Clause Mod', '!OHKO Clause', 'Picked Team Size = 6', 'Adjust Level = 100'],
         banlist: [
             'Sandshrew-Alola', 'Shedinja', 'Infiltrator', 'Magic Guard', 'Choice Scarf',
             'Explosion', 'Final Gambit', 'Healing Wish', 'Lunar Dance', 'Magic Room', 'Memento', 'Misty Explosion', 'Self-Destruct',
@@ -2016,6 +2128,18 @@ exports.Formats = [
             },
         },
     },
+    // Randomized Format Spotlight
+    ///////////////////////////////////////////////////////////////////
+    {
+        section: "Randomized Format Spotlight",
+        column: 2,
+    },
+    {
+        name: "[Gen 3] Challenge Cup",
+        mod: 'gen3',
+        team: 'randomCC',
+        ruleset: ['Obtainable', 'HP Percentage Mod', 'Cancel Mod'],
+    },
     // Randomized Metas
     ///////////////////////////////////////////////////////////////////
     {
@@ -2336,36 +2460,41 @@ exports.Formats = [
         column: 3,
     },
     {
-        name: "[Gen 3] Ubers",
+        name: "[Gen 4] Ubers",
         threads: [
-            `&bullet; <a href="https://www.smogon.com/forums/posts/8286280/">ADV Ubers</a>`,
+            `&bullet; <a href="https://www.smogon.com/forums/posts/8286279/">DPP Ubers</a>`,
         ],
-        mod: 'gen3',
+        mod: 'gen4',
         // searchShow: false,
-        ruleset: ['Standard', 'Deoxys Camouflage Clause', 'One Baton Pass Clause'],
-        banlist: ['Wobbuffet + Leftovers'],
+        ruleset: ['Standard'],
+        banlist: ['AG'],
     },
     {
-        name: "[Gen 5] RU",
+        name: "[Gen 4] LC",
         threads: [
-            `&bullet; <a href="https://www.smogon.com/forums/posts/6431094/">BW2 Sample Teams</a>`,
-            `&bullet; <a href="https://www.smogon.com/forums/threads/3473124/">BW2 RU Viability Rankings</a>`,
+            `&bullet; <a href="https://www.smogon.com/dp/articles/little_cup_guide">DPP LC Guide</a>`,
+            `&bullet; <a href="https://www.smogon.com/forums/posts/7336500/">DPP LC Viability Rankings</a>`,
         ],
-        mod: 'gen5',
+        mod: 'gen4',
         // searchShow: false,
-        ruleset: ['[Gen 5] UU', 'Baton Pass Clause', '!Sleep Clause Mod', 'Sleep Moves Clause'],
-        banlist: ['UU', 'RUBL', 'Shadow Tag', 'Shell Smash + Baton Pass'],
-        unbanlist: ['Prankster + Assist', 'Prankster + Copycat', 'Baton Pass'],
+        ruleset: ['Standard', 'Little Cup', 'Sleep Moves Clause'],
+        banlist: [
+            'Meditite', 'Misdreavus', 'Murkrow', 'Scyther', 'Sneasel', 'Tangela', 'Yanma',
+            'Berry Juice', 'Deep Sea Tooth', 'Dragon Rage', 'Sonic Boom', 'Swagger',
+        ],
     },
     {
-        name: "[Gen 7 Let's Go] UU",
+        name: "[Gen 1] Nintendo Cup 1997",
         threads: [
-            `&bullet; <a href="https://www.smogon.com/forums/threads/3659882/">LGPE UU Metagame Discussion &amp; Resources</a>`,
+            `&bullet; <a href="https://www.smogon.com/forums/threads/3682412/">Nintendo Cup 1997 Discussion &amp; Resources</a>`,
         ],
-        mod: 'gen7letsgo',
+        mod: 'gen1jpn',
         // searchShow: false,
-        ruleset: ['[Gen 7 Let\'s Go] OU'],
-        banlist: ['OU', 'UUBL'],
+        ruleset: [
+            'Picked Team Size = 3', 'Min Level = 50', 'Max Level = 55', 'Max Total Level = 155',
+            'Obtainable', 'Team Preview', 'Stadium Sleep Clause', 'Species Clause', 'Nickname Clause', 'HP Percentage Mod', 'Cancel Mod', 'Nintendo Cup 1997 Move Legality',
+        ],
+        banlist: ['Uber'],
     },
     // Past Gens OU
     ///////////////////////////////////////////////////////////////////
@@ -2472,7 +2601,7 @@ exports.Formats = [
             `&bullet; <a href="https://www.smogon.com/forums/posts/8778656/">USM Mix and Mega</a>`,
         ],
         mod: 'gen7mixandmega',
-        ruleset: ['Standard', 'Mega Rayquaza Clause', 'Overflow Stat Mod'],
+        ruleset: ['Standard OMs', 'Mega Rayquaza Clause', 'Sleep Clause Mod'],
         banlist: ['Shadow Tag', 'Gengarite', 'Baton Pass', 'Electrify'],
         restricted: [
             'Arceus', 'Deoxys', 'Dialga', 'Dragonite', 'Giratina', 'Groudon', 'Ho-Oh', 'Kyogre', 'Kyurem', 'Landorus-Therian', 'Lugia',
@@ -2659,8 +2788,7 @@ exports.Formats = [
             'Groudon', 'Ho-Oh', 'Hoopa-Unbound', 'Kangaskhan-Mega', 'Kartana', 'Kyogre', 'Kyurem-White', 'Lucario-Mega', 'Lugia', 'Lunala', 'Magearna',
             'Marshadow', 'Mawile-Mega', 'Medicham-Mega', 'Metagross-Mega', 'Mewtwo', 'Naganadel', 'Necrozma-Dawn-Wings', 'Necrozma-Dusk-Mane', 'Palkia',
             'Pheromosa', 'Rayquaza', 'Reshiram', 'Salamence-Mega', 'Shaymin-Sky', 'Solgaleo', 'Tapu Lele', 'Xerneas', 'Yveltal', 'Zekrom', 'Zygarde',
-            'Battle Bond', 'Shadow Tag', 'Bright Powder', 'Damp Rock', 'Focus Band', 'King\'s Rock', 'Lax Incense', 'Quick Claw', 'Razor Fang',
-            'Smooth Rock', 'Terrain Extender', 'Baton Pass',
+            'Battle Bond', 'Shadow Tag', 'Damp Rock', 'Focus Band', 'King\'s Rock', 'Quick Claw', 'Razor Fang', 'Smooth Rock', 'Terrain Extender', 'Baton Pass',
         ],
     },
     {
@@ -2948,8 +3076,7 @@ exports.Formats = [
             'Gengar-Mega', 'Giratina', 'Giratina-Origin', 'Greninja', 'Groudon', 'Ho-Oh', 'Hoopa-Unbound', 'Kangaskhan-Mega', 'Kyogre', 'Kyurem-White',
             'Lucario-Mega', 'Lugia', 'Mawile-Mega', 'Medicham-Mega', 'Metagross-Mega', 'Mewtwo', 'Palkia', 'Rayquaza', 'Reshiram', 'Sableye-Mega',
             'Salamence-Mega', 'Shaymin-Sky', 'Slowbro-Mega', 'Talonflame', 'Xerneas', 'Yveltal', 'Zekrom',
-            'Shadow Tag', 'Bright Powder', 'Damp Rock', 'Focus Band', 'King\'s Rock', 'Lax Incense', 'Quick Claw', 'Razor Fang', 'Smooth Rock',
-            'Soul Dew', 'Baton Pass',
+            'Shadow Tag', 'Damp Rock', 'Focus Band', 'King\'s Rock', 'Quick Claw', 'Razor Fang', 'Smooth Rock', 'Soul Dew', 'Baton Pass',
         ],
     },
     {
@@ -3150,6 +3277,18 @@ exports.Formats = [
         ruleset: ['Standard', 'Evasion Abilities Clause', 'Swagger Clause', 'Sleep Clause Mod'],
         banlist: ['Uber', 'OU', 'UUBL', 'Arena Trap', 'Drought', 'Sand Stream', 'Snow Warning', 'Prankster + Assist', 'Prankster + Copycat', 'Baton Pass'],
     },
+    {
+        name: "[Gen 5] RU",
+        threads: [
+            `&bullet; <a href="https://www.smogon.com/forums/posts/6431094/">BW2 Sample Teams</a>`,
+            `&bullet; <a href="https://www.smogon.com/forums/threads/3473124/">BW2 RU Viability Rankings</a>`,
+        ],
+        mod: 'gen5',
+        searchShow: false,
+        ruleset: ['[Gen 5] UU', 'Baton Pass Clause', '!Sleep Clause Mod', 'Sleep Moves Clause'],
+        banlist: ['UU', 'RUBL', 'Shadow Tag', 'Shell Smash + Baton Pass'],
+        unbanlist: ['Prankster + Assist', 'Prankster + Copycat', 'Baton Pass'],
+    },
     {
         name: "[Gen 5] NU",
         threads: [
@@ -3194,6 +3333,7 @@ exports.Formats = [
         mod: 'gen5',
         searchShow: false,
         ruleset: ['[Gen 5] OU', 'Same Type Clause', '!Gems Clause'],
+        banlist: ['Latios'],
     },
     {
         name: "[Gen 5] 1v1",
@@ -3207,7 +3347,7 @@ exports.Formats = [
             'Picked Team Size = 1', 'Max Team Size = 3',
             'Standard', 'Baton Pass Clause', 'Swagger Clause', 'Accuracy Moves Clause', 'Sleep Moves Clause',
         ],
-        banlist: ['Uber', 'Cottonee', 'Dragonite', 'Jirachi', 'Kyurem-Black', 'Mew', 'Togekiss', 'Whimsicott', 'Victini', 'Bright Powder', 'Focus Band', 'Focus Sash', 'Lax Incense', 'Quick Claw', 'Soul Dew', 'Perish Song'],
+        banlist: ['Uber', 'Cottonee', 'Dragonite', 'Jirachi', 'Kyurem-Black', 'Mew', 'Togekiss', 'Whimsicott', 'Victini', 'Focus Band', 'Focus Sash', 'Quick Claw', 'Soul Dew', 'Perish Song'],
         unbanlist: ['Genesect', 'Landorus', 'Manaphy', 'Thundurus', 'Tornadus-Therian'],
     },
     {
@@ -3306,16 +3446,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: [
@@ -3356,20 +3486,6 @@ exports.Formats = [
             'Sharpedo', 'Shiftry', 'Skuntank', 'Slowking', 'Tauros', 'Typhlosion', 'Venomoth', 'Vileplume',
         ],
     },
-    {
-        name: "[Gen 4] LC",
-        threads: [
-            `&bullet; <a href="https://www.smogon.com/dp/articles/little_cup_guide">DPP LC Guide</a>`,
-            `&bullet; <a href="https://www.smogon.com/forums/posts/7336500/">DPP LC Viability Rankings</a>`,
-        ],
-        mod: 'gen4',
-        searchShow: false,
-        ruleset: ['Standard', 'Little Cup', 'Sleep Moves Clause'],
-        banlist: [
-            'Meditite', 'Misdreavus', 'Murkrow', 'Scyther', 'Sneasel', 'Tangela', 'Yanma',
-            'Berry Juice', 'Deep Sea Tooth', 'Dragon Rage', 'Sonic Boom', 'Swagger',
-        ],
-    },
     {
         name: "[Gen 4] Anything Goes",
         mod: 'gen4',
@@ -3465,6 +3581,16 @@ exports.Formats = [
         section: "Past Generations",
         column: 5,
     },
+    {
+        name: "[Gen 3] Ubers",
+        threads: [
+            `&bullet; <a href="https://www.smogon.com/forums/posts/8286280/">ADV Ubers</a>`,
+        ],
+        mod: 'gen3',
+        searchShow: false,
+        ruleset: ['Standard', 'Deoxys Camouflage Clause', 'One Baton Pass Clause'],
+        banlist: ['Wobbuffet + Leftovers'],
+    },
     {
         name: "[Gen 3] UU",
         threads: [
@@ -3474,7 +3600,7 @@ exports.Formats = [
         mod: 'gen3',
         searchShow: false,
         ruleset: ['Standard'],
-        banlist: ['Uber', 'OU', 'UUBL', 'Smeargle + Ingrain', 'Arena Trap', 'Bright Powder', 'Lax Incense', 'Baton Pass', 'Swagger'],
+        banlist: ['Uber', 'OU', 'UUBL', 'Smeargle + Ingrain', 'Arena Trap', 'Baton Pass', 'Swagger'],
     },
     {
         name: "[Gen 3] NU",
@@ -3500,7 +3626,7 @@ exports.Formats = [
         ],
         banlist: [
             'Clefable', 'Slaking', 'Snorlax', 'Suicune', 'Zapdos', 'Destiny Bond', 'Explosion', 'Ingrain', 'Perish Song',
-            'Self-Destruct', 'Bright Powder', 'Focus Band', 'King\'s Rock', 'Lax Incense', 'Quick Claw',
+            'Self-Destruct', 'Focus Band', 'King\'s Rock', 'Quick Claw',
         ],
         unbanlist: ['Mr. Mime', 'Wobbuffet', 'Wynaut', 'Sand Veil'],
     },
@@ -3568,7 +3694,7 @@ exports.Formats = [
             '[Gen 2] OU', 'Accuracy Moves Clause', 'Sleep Moves Clause', 'Team Preview',
         ],
         banlist: [
-            'Alakazam', 'Clefable', 'Snorlax', 'Zapdos', 'Berserk Gene', 'Bright Powder', 'Focus Band', 'King\'s Rock', 'Quick Claw',
+            'Alakazam', 'Clefable', 'Snorlax', 'Zapdos', 'Berserk Gene', 'Focus Band', 'King\'s Rock', 'Quick Claw',
             'Attract', 'Destiny Bond', 'Explosion', 'Perish Song', 'Present', 'Self-Destruct', 'Swagger',
         ],
     },
@@ -3635,24 +3761,24 @@ exports.Formats = [
         banlist: ['UU', 'NUBL'],
     },
     {
-        name: "[Gen 1] Japanese OU",
-        desc: `Generation 1 with Japanese battle mechanics.`,
-        mod: 'gen1jpn',
-        searchShow: false,
-        ruleset: ['Standard'],
-        banlist: ['Uber'],
-    },
-    {
-        name: "[Gen 1] Nintendo Cup 1997",
+        name: "[Gen 1] 1v1",
         threads: [
-            `&bullet; <a href="https://www.smogon.com/forums/threads/3682412/">Nintendo Cup 1997 Discussion &amp; Resources</a>`,
+            `&bullet; <a href="https://www.smogon.com/forums/posts/8031462">RBY 1v1</a>`,
         ],
-        mod: 'gen1jpn',
+        mod: 'gen1',
         searchShow: false,
         ruleset: [
-            'Picked Team Size = 3', 'Min Level = 50', 'Max Level = 55', 'Max Total Level = 155',
-            'Obtainable', 'Team Preview', 'Sleep Clause Mod', 'Species Clause', 'Nickname Clause', 'HP Percentage Mod', 'Cancel Mod', 'Nintendo Cup 1997 Move Legality',
+            'Picked Team Size = 1', 'Max Team Size = 3',
+            '[Gen 1] OU', 'Accuracy Moves Clause', 'Sleep Moves Clause', 'Team Preview',
         ],
+        banlist: ['Bind', 'Clamp', 'Explosion', 'Fire Spin', 'Self-Destruct', 'Wrap'],
+    },
+    {
+        name: "[Gen 1] Japanese OU",
+        desc: `Generation 1 with Japanese battle mechanics.`,
+        mod: 'gen1jpn',
+        searchShow: false,
+        ruleset: ['Standard'],
         banlist: ['Uber'],
     },
     {