@pkmn/sim 0.5.7 → 0.5.10

package/build/config/formats.js

@@ -217,8 +217,8 @@ exports.Formats = [
         mod: 'gen8',
         ruleset: ['[Gen 8] PU'],
         banlist: [
-            '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',
+            'PU', 'Arctovish', 'Aurorus', 'Centiskorch', 'Drampa', 'Exeggutor-Alola', 'Gallade', 'Haunter', 'Magmortar', 'Magneton', 'Omastar',
+            'Rotom-Frost', 'Turtonator', 'Vanilluxe', 'Vikavolt', 'Silvally-Dragon', 'Silvally-Ground', 'Sneasel', 'Damp Rock', 'Grassy Seed',
         ],
     },
     {
@@ -333,6 +333,11 @@ exports.Formats = [
     },
     {
         name: "[Gen 8] VGC 2022",
+        threads: [
+            `&bullet; <a href="https://www.smogon.com/forums/threads/3677186/">VGC 2022 Metagame Discussion</a>`,
+            `&bullet; <a href="https://www.smogon.com/forums/threads/3695848/">VGC 2022 Sample Teams</a>`,
+            `&bullet; <a href="https://www.smogon.com/forums/threads/3696395/">VGC 2022 Viability Rankings</a>`,
+        ],
         mod: 'gen8',
         gameType: 'doubles',
         ruleset: ['Flat Rules', '!! Adjust Level = 50', 'Min Source Gen = 8', 'VGC Timer', 'Limit Two Restricted'],
@@ -383,7 +388,7 @@ exports.Formats = [
             'HP Percentage Mod', 'Cancel Mod',
         ],
         banlist: [
-            'Pokestar Spirit', 'Shedinja + Sturdy', 'Battle Bond', 'Cheek Pouch', 'Cursed Body', 'Dry Skin', 'Fluffy', 'Fur Coat', 'Gorilla Tactics',
+            'Pokestar Spirit', 'Shedinja + Sturdy', 'Battle Bond', 'Cheek Pouch', 'Cursed Body', 'Dry Skin', 'Fur Coat', 'Gorilla Tactics',
             'Grassy Surge', 'Huge Power', 'Ice Body', 'Iron Barbs', 'Libero', 'Moody', 'Neutralizing Gas', 'Parental Bond', 'Perish Body', 'Poison Heal',
             'Power Construct', 'Pressure', 'Protean', 'Pure Power', 'Rain Dish', 'Rough Skin', 'Sand Spit', 'Sand Stream', 'Snow Warning', 'Stamina',
             'Volt Absorb', 'Water Absorb', 'Wonder Guard', 'Abomasite', 'Aguav Berry', 'Assault Vest', 'Berry', 'Berry Juice', 'Berserk Gene',
@@ -438,11 +443,11 @@ exports.Formats = [
         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',
+            'Darmanitan-Galar', 'Deoxys-Attack', 'Deoxys-Base', 'Deoxys-Speed', 'Dialga', 'Dracovish', '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',
+            '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',
@@ -467,17 +472,16 @@ exports.Formats = [
             'Drizzle', 'Drought',
             // Slowbronite is banned so it doesn't validate on Galarian Slowbro
             'Slowbronite',
-            // NatDex suspect
-            'Tornadus-Therian',
+            // NDOU suspect
+            'Dragapult',
         ],
         // Used to distinguish UU from below UU in the client
         restricted: [
-            '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',
+            'Aegislash', 'Alakazam-Base', 'Altaria-Mega', 'Amoonguss', 'Azumarill', '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',
         ],
     },
     {
@@ -587,134 +591,212 @@ exports.Formats = [
         column: 2,
     },
     {
-        name: "[Gen 8] Trademarked",
-        desc: `Sacrifice your Pok&eacute;mon's ability for a status move that activates on switch-in.`,
+        name: "[Gen 8] Shared Power",
+        desc: `Once a Pok&eacute;mon switches in, its ability is shared with the rest of the team.`,
         threads: [
-            `&bullet; <a href="https://www.smogon.com/forums/threads/3656980/">Trademarked</a>`,
+            `&bullet; <a href="https://www.smogon.com/forums/threads/3660877/">Shared Power</a>`,
         ],
-        mod: 'gen8',
+        mod: 'sharedpower',
         // 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', 'Marowak-Alola',
-            'Marshadow', 'Melmetal', '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', 'Arena Trap', 'Moody', 'Neutralizing Gas', 'Power Construct', 'Shadow Tag', 'Baton Pass',
+            'Calyrex-Ice', 'Calyrex-Shadow', 'Darmanitan-Galar', 'Dialga', 'Dracovish', 'Eternatus', 'Genesect', 'Giratina',
+            'Giratina-Origin', 'Groudon', 'Ho-Oh', 'Kyogre', 'Kyurem-Black', 'Kyurem-White', 'Lugia', 'Lunala', 'Magearna',
+            'Marshadow', 'Melmetal', 'Mewtwo', 'Naganadel', 'Necrozma-Dawn-Wings', 'Necrozma-Dusk-Mane', 'Palkia',
+            'Pheromosa', 'Rayquaza', 'Reshiram', 'Shedinja', 'Solgaleo', 'Urshifu-Base', 'Urshifu-Rapid-Strike',
+            'Xerneas', 'Yveltal', 'Zacian', 'Zacian-Crowned', 'Zamazenta', 'Zamazenta-Crowned', 'Zekrom',
+            'Arena Trap', 'Contrary', 'Drizzle ++ Swift Swim', 'Drought ++ Chlorophyll', 'Electric Surge ++ Surge Surfer',
+            'Fur Coat', 'Guts', 'Harvest', 'Huge Power', 'Imposter', 'Innards Out', 'Libero', 'Magic Bounce', 'Magic Guard',
+            'Magnet Pull', 'Mold Breaker', 'Moody', 'Neutralizing Gas', 'Power Construct', 'Queenly Majesty', 'Quick Draw',
+            'Regenerator', 'Sand Rush', 'Sand Veil', 'Shadow Tag', 'Simple', 'Snow Cloak', 'Snow Warning ++ Slush Rush', 'Speed Boost',
+            'Stakeout', 'Steelworker ++ Steely Spirit', 'Tinted Lens', 'Triage', 'Unaware', 'Unburden', 'Water Bubble',
+            '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',
+        getSharedPower(pokemon) {
+            const sharedPower = new Set();
+            for (const ally of pokemon.side.pokemon) {
+                if (ally.previouslySwitchedIn > 0) {
+                    if (pokemon.battle.dex.currentMod !== 'sharedpower' && ['trace', 'mirrorarmor'].includes(ally.baseAbility)) {
+                        sharedPower.add('noability');
+                        continue;
+                    }
+                    sharedPower.add(ally.baseAbility);
+                }
+            }
+            sharedPower.delete(pokemon.baseAbility);
+            return sharedPower;
+        },
+        onBeforeSwitchIn(pokemon) {
+            let format = this.format;
+            if (!format.getSharedPower)
+                format = this.dex.formats.get('gen8sharedpower');
+            for (const ability of format.getSharedPower(pokemon)) {
+                const effect = 'ability:' + ability;
+                pokemon.volatiles[effect] = { id: this.toID(effect), target: pokemon };
+                if (!pokemon.m.abils)
+                    pokemon.m.abils = [];
+                if (!pokemon.m.abils.includes(effect))
+                    pokemon.m.abils.push(effect);
+            }
+        },
+        onSwitchInPriority: 2,
+        onSwitchIn(pokemon) {
+            let format = this.format;
+            if (!format.getSharedPower)
+                format = this.dex.formats.get('gen8sharedpower');
+            for (const ability of format.getSharedPower(pokemon)) {
+                if (ability === 'noability') {
+                    this.hint(`Mirror Armor and Trace break in Shared Power formats that don't use Shared Power as a base, so they get removed from non-base users.`);
+                }
+                const effect = 'ability:' + ability;
+                delete pokemon.volatiles[effect];
+                pokemon.addVolatile(effect);
+            }
+        },
+    },
+    {
+        name: "[Gen 8] Cross Evolution",
+        desc: `Give a Pok&eacute;mon a Pok&eacute;mon name of the next evolution stage as a nickname to inherit stat changes, typing, abilities, and up to 2 moves from the next stage Pok&eacute;mon.`,
+        threads: [
+            `&bullet; <a href="https://www.smogon.com/forums/threads/3657562/">Cross Evolution</a>`,
         ],
-        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.)`);
+        mod: 'gen8',
+        // searchShow: false,
+        ruleset: ['Standard', 'Overflow Stat Mod', 'Dynamax Clause'],
+        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) {
+            const names = new Set();
+            for (const set of team) {
+                const name = set.name;
+                if (names.has(this.dex.toID(name))) {
+                    return [
+                        `Your Pok\u00e9mon must have different nicknames.`,
+                        `(You have more than one Pok\u00e9mon named '${name}')`,
+                    ];
                 }
+                names.add(this.dex.toID(name));
             }
-            return problems;
+            if (!names.size) {
+                return [
+                    `${this.format.name} works using nicknames; your team has 0 nicknamed Pok\u00e9mon.`,
+                    `(If this was intentional, add a nickname to one Pok\u00e9mon that isn't the name of a Pok\u00e9mon species.)`,
+                ];
+            }
+        },
+        checkCanLearn(move, species, lsetData, set) {
+            // @ts-ignore
+            if (!set.sp?.exists || !set.crossSpecies?.exists) {
+                return this.checkCanLearn(move, species, lsetData, set);
+            }
+            // @ts-ignore
+            const problem = this.checkCanLearn(move, set.sp);
+            if (!problem)
+                return null;
+            // @ts-ignore
+            if (!set.crossMovesLeft)
+                return problem;
+            // @ts-ignore
+            if (this.checkCanLearn(move, set.crossSpecies))
+                return problem;
+            // @ts-ignore
+            set.crossMovesLeft--;
+            return null;
         },
         validateSet(set, teamHas) {
-            const dex = this.dex;
-            const ability = dex.moves.get(set.ability);
-            if (!ability.exists) { // Not even a real move
+            const crossSpecies = this.dex.species.get(set.name);
+            let problems = this.dex.formats.get('Pokemon').onChangeSet?.call(this, set, this.format) || null;
+            if (Array.isArray(problems) && problems.length)
+                return problems;
+            const crossNonstandard = (!this.ruleTable.has('standardnatdex') && crossSpecies.isNonstandard === 'Past') ||
+                crossSpecies.isNonstandard === 'Future';
+            const crossIsCap = !this.ruleTable.has('+pokemontag:cap') && crossSpecies.isNonstandard === 'CAP';
+            if (!crossSpecies.exists || crossNonstandard || crossIsCap)
+                return this.validateSet(set, teamHas);
+            const species = this.dex.species.get(set.species);
+            const check = this.checkSpecies(set, species, species, {});
+            if (check)
+                return [check];
+            const nonstandard = !this.ruleTable.has('standardnatdex') && species.isNonstandard === 'Past';
+            const isCap = !this.ruleTable.has('+pokemontag:cap') && species.isNonstandard === 'CAP';
+            if (!species.exists || nonstandard || isCap || species === crossSpecies)
                 return this.validateSet(set, teamHas);
+            if (!species.nfe)
+                return [`${species.name} cannot cross evolve because it doesn't evolve.`];
+            const crossIsUnreleased = (crossSpecies.tier === "Unreleased" && crossSpecies.isNonstandard === "Unobtainable");
+            if (crossSpecies.battleOnly || crossIsUnreleased || !crossSpecies.prevo) {
+                return [`${species.name} cannot cross evolve into ${crossSpecies.name} because it isn't an evolution.`];
             }
-            // Absolute trademark bans
-            if (ability.category !== 'Status') {
-                return [`${ability.name} is not a status move, and cannot be used as a trademark.`];
+            if (this.ruleTable.isRestrictedSpecies(crossSpecies)) {
+                return [`${species.name} cannot cross evolve into ${crossSpecies.name} because it is banned.`];
             }
-            if (ability.forceSwitch || ability.selfSwitch) {
+            const crossPrevoSpecies = this.dex.species.get(crossSpecies.prevo);
+            if (!crossPrevoSpecies.prevo !== !species.prevo) {
                 return [
-                    `Force-switching and self-switching moves are banned from being used as trademarks.`,
-                    `(${ability.name} is a ${ability.forceSwitch ? 'force' : 'self'}-switching move.)`,
+                    `${species.name} cannot cross evolve into ${crossSpecies.name} because they are not consecutive evolution stages.`,
                 ];
             }
-            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.`];
+            const ability = this.dex.abilities.get(set.ability);
+            if (!this.ruleTable.isRestricted(`ability:${ability.id}`) || Object.values(species.abilities).includes(ability.name)) {
+                set.species = crossSpecies.name;
             }
-            // Contingent trademark bans
-            if (this.ruleTable.isRestricted(`move:${ability.id}`)) {
-                return [`${ability.name} is restricted from being used as a trademark.`];
+            // @ts-ignore
+            set.sp = species;
+            // @ts-ignore
+            set.crossSpecies = crossSpecies;
+            // @ts-ignore
+            set.crossMovesLeft = 2;
+            problems = this.validateSet(set, teamHas);
+            set.name = crossSpecies.name;
+            set.species = species.name;
+            return problems;
+        },
+        onModifySpecies(species, target, source, effect) {
+            if (!target)
+                return; // chat
+            if (effect && ['imposter', 'transform'].includes(effect.id))
+                return;
+            if (target.set.name === target.set.species)
+                return;
+            const crossSpecies = this.dex.species.get(target.set.name);
+            if (!crossSpecies.exists)
+                return;
+            if (species.battleOnly || !species.nfe)
+                return;
+            const crossIsUnreleased = (crossSpecies.tier === "Unreleased" && crossSpecies.isNonstandard === "Unobtainable");
+            if (crossSpecies.battleOnly || crossIsUnreleased || !crossSpecies.prevo)
+                return;
+            const crossPrevoSpecies = this.dex.species.get(crossSpecies.prevo);
+            if (!crossPrevoSpecies.prevo !== !species.prevo)
+                return;
+            const mixedSpecies = this.dex.deepClone(species);
+            mixedSpecies.baseSpecies = mixedSpecies.name = `${species.name}-${crossSpecies.name}`;
+            mixedSpecies.weightkg =
+                Math.max(0.1, +(species.weightkg + crossSpecies.weightkg - crossPrevoSpecies.weightkg)).toFixed(1);
+            mixedSpecies.nfe = false;
+            mixedSpecies.evos = [];
+            mixedSpecies.eggGroups = crossSpecies.eggGroups;
+            mixedSpecies.abilities = crossSpecies.abilities;
+            mixedSpecies.bst = 0;
+            let i;
+            for (i in species.baseStats) {
+                const statChange = crossSpecies.baseStats[i] - crossPrevoSpecies.baseStats[i];
+                mixedSpecies.baseStats[i] = this.clampIntRange(species.baseStats[i] + statChange, 1, 255);
+                mixedSpecies.bst += mixedSpecies.baseStats[i];
             }
-            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.`];
+            if (crossSpecies.types[0] !== crossPrevoSpecies.types[0])
+                mixedSpecies.types[0] = crossSpecies.types[0];
+            if (crossSpecies.types[1] !== crossPrevoSpecies.types[1]) {
+                mixedSpecies.types[1] = crossSpecies.types[1] || crossSpecies.types[0];
             }
-            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;
+            if (mixedSpecies.types[0] === mixedSpecies.types[1])
+                mixedSpecies.types = [mixedSpecies.types[0]];
+            return mixedSpecies;
         },
-        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] 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/threads/3660421/">Linked</a>`,
-        ],
-        mod: 'linked',
-        ruleset: ['Standard', 'Dynamax Clause'],
-        banlist: [
-            'Calyrex-Ice', 'Calyrex-Shadow', 'Cinderace', 'Cloyster', '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', 'Chlorophyll', 'Moody', 'Power Construct', 'Sand Rush', 'Sand Veil', 'Shadow Tag', 'Slush Rush', 'Snow Cloak',
-            'Surge Surfer', 'Swift Swim', 'Unburden', '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', 'Trick Room',
-        ],
-        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.`);
-                }
+        onBegin() {
+            for (const pokemon of this.getAllPokemon()) {
+                pokemon.baseSpecies = pokemon.species;
             }
-            return problems;
         },
     },
     // Other Metagames
@@ -860,17 +942,17 @@ exports.Formats = [
         mod: 'gen8',
         ruleset: ['Standard', 'STABmons Move Legality', 'Dynamax Clause', 'Sleep Moves Clause', '!Sleep Clause Mod'],
         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', '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', 'Magearna', 'Marshadow', 'Mewtwo', 'Naganadel', 'Necrozma-Dawn-Wings', 'Necrozma-Dusk-Mane', 'Palkia',
+            'Pheromosa', 'Porygon-Z', 'Rayquaza', 'Reshiram', 'Silvally', 'Solgaleo', 'Spectrier', 'Tapu Bulu', 'Tapu Koko', 'Tapu Lele', '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',
-            'Geomancy', 'Glacial Lance', 'Oblivion Wing', 'Precipice Blades', 'Shell Smash', 'Shift Gear', 'Thousand Arrows', 'V-create', 'Wicked Blow',
+            'Geomancy', 'Glacial Lance', 'Oblivion Wing', 'Precipice Blades', 'Shell Smash', 'Shift Gear', 'Thousand Arrows', 'Thunderous Kick', 'V-create',
+            'Wicked Blow',
         ],
     },
     {
@@ -1023,7 +1105,6 @@ 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'],
     },
@@ -1106,7 +1187,7 @@ exports.Formats = [
         ],
         mod: 'gen8',
         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'],
+        ruleset: ['Standard', 'Dynamax Clause', 'Camomons 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', 'Latias', 'Latios', 'Lugia',
@@ -1114,21 +1195,6 @@ exports.Formats = [
             '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) {
-            if (!target)
-                return; // Chat command
-            if (effect && ['imposter', 'transform'].includes(effect.id))
-                return;
-            const types = [...new Set(target.baseMoveSlots.slice(0, 2).map(move => this.dex.moves.get(move.id).type))];
-            return { ...species, types: types };
-        },
-        onSwitchIn(pokemon) {
-            this.add('-start', pokemon, 'typechange', (pokemon.illusion || pokemon).getTypes(true).join('/'), '[silent]');
-        },
-        onAfterMega(pokemon) {
-            this.add('-start', pokemon, 'typechange', (pokemon.illusion || pokemon).getTypes(true).join('/'), '[silent]');
-        },
     },
     {
         name: "[Gen 8] Inheritance",
@@ -1318,6 +1384,38 @@ exports.Formats = [
             this.add('-start', pokemon, donorTemplate.name, '[silent]');
         },
     },
+    {
+        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/threads/3660421/">Linked</a>`,
+        ],
+        mod: 'linked',
+        searchShow: false,
+        ruleset: ['Standard', 'Dynamax Clause'],
+        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',
+            'Magearna', 'Marshadow', 'Mewtwo', 'Naganadel', 'Necrozma-Dawn-Wings', 'Necrozma-Dusk-Mane', 'Palkia', 'Pheromosa', 'Rayquaza', 'Reshiram',
+            'Solgaleo', 'Spectrier', 'Urshifu-Base', 'Volcarona', 'Xerneas', 'Yveltal', 'Zacian', 'Zacian-Crowned', 'Zamazenta', 'Zamazenta-Crowned',
+            'Zekrom', 'Zygarde-Base', 'Zygarde-Complete', 'Arena Trap', 'Chlorophyll', 'Moody', 'Power Construct', 'Sand Rush', 'Sand Veil', 'Shadow Tag',
+            'Slush Rush', 'Snow Cloak', 'Speed Boost', 'Surge Surfer', 'Swift Swim', 'Unburden', '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', 'Trick Room',
+        ],
+        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;
+        },
+    },
     {
         name: "[Gen 8] Multibility",
         desc: `Run a second ability at the cost of giving up a Pok&eacute;mon's item slot.`,
@@ -1599,6 +1697,21 @@ exports.Formats = [
             // Shadow Tag/Arena Trap
             'Diglett-Base', 'Dugtrio-Base', 'Gothita', 'Gothitelle', 'Gothorita', 'Trapinch', 'Wobbuffet', 'Wynaut',
         ],
+        onValidateSet(set) {
+            const species = this.dex.species.get(set.species);
+            const unSeenAbilities = Object.keys(species.abilities)
+                .filter(key => key !== 'S' && (key !== 'H' || !species.unreleasedHidden))
+                .map(key => species.abilities[key])
+                .filter(ability => ability !== set.ability);
+            if (unSeenAbilities.length && this.toID(set.ability) !== this.toID(species.abilities['S'])) {
+                for (const abilityName of unSeenAbilities) {
+                    const banReason = this.ruleTable.check('ability:' + this.toID(abilityName));
+                    if (banReason) {
+                        return [`${set.name}'s ability ${abilityName} is ${banReason}.`];
+                    }
+                }
+            }
+        },
         onBegin() {
             for (const pokemon of this.getAllPokemon()) {
                 if (pokemon.ability === this.toID(pokemon.species.abilities['S'])) {
@@ -1626,67 +1739,113 @@ exports.Formats = [
         },
     },
     {
-        name: "[Gen 8] Shared Power",
-        desc: `Once a Pok&eacute;mon switches in, its ability is shared with the rest of the team.`,
+        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/3660877/">Shared Power</a>`,
+            `&bullet; <a href="https://www.smogon.com/forums/threads/3656980/">Trademarked</a>`,
         ],
-        mod: 'sharedpower',
+        mod: 'gen8',
+        // While bugs are being fixed
         searchShow: false,
+        challengeShow: false,
+        tournamentShow: false,
         ruleset: ['Standard', 'Dynamax Clause'],
         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',
-            'Marshadow', 'Melmetal', 'Mewtwo', 'Naganadel', 'Necrozma-Dawn-Wings', 'Necrozma-Dusk-Mane', 'Palkia',
-            'Pheromosa', 'Rayquaza', 'Reshiram', 'Shedinja', 'Solgaleo', 'Urshifu-Base', 'Urshifu-Rapid-Strike',
-            'Xerneas', 'Yveltal', 'Zacian', 'Zacian-Crowned', 'Zamazenta', 'Zamazenta-Crowned', 'Zekrom',
-            'Arena Trap', 'Contrary', 'Drizzle ++ Swift Swim', 'Drought ++ Chlorophyll', 'Electric Surge ++ Surge Surfer',
-            'Fur Coat', 'Guts', 'Harvest', 'Huge Power', 'Imposter', 'Innards Out', 'Libero', 'Magic Bounce', 'Magic Guard',
-            'Magnet Pull', 'Mold Breaker', 'Moody', 'Neutralizing Gas', 'Power Construct', 'Queenly Majesty', 'Quick Draw',
-            'Regenerator', 'Sand Rush', 'Sand Veil', 'Shadow Tag', 'Simple', 'Snow Cloak', 'Snow Warning ++ Slush Rush', 'Speed Boost',
-            'Stakeout', 'Steelworker ++ Steely Spirit', 'Tinted Lens', 'Triage', 'Unaware', 'Unburden', 'Water Bubble',
-            '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', 'Spectrier',
+            'Urshifu-Base', 'Victini', 'Xerneas', 'Yveltal', 'Zacian', 'Zacian-Crowned', 'Zamazenta', 'Zamazenta-Crowned', 'Zekrom', 'Zygarde-Base',
+            'Arena Trap', 'Moody', 'Neutralizing Gas', 'Power Construct', 'Shadow Tag', 'Baton Pass',
         ],
-        getSharedPower(pokemon) {
-            const sharedPower = new Set();
-            for (const ally of pokemon.side.pokemon) {
-                if (ally.previouslySwitchedIn > 0) {
-                    if (pokemon.battle.dex.currentMod !== 'sharedpower' && ['trace', 'mirrorarmor'].includes(ally.baseAbility)) {
-                        sharedPower.add('noability');
-                        continue;
-                    }
-                    sharedPower.add(ally.baseAbility);
+        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',
+            'Switcheroo', 'Teleport', 'Trick', '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.)`);
                 }
             }
-            sharedPower.delete(pokemon.baseAbility);
-            return sharedPower;
+            return problems;
         },
-        onBeforeSwitchIn(pokemon) {
-            let format = this.format;
-            if (!format.getSharedPower)
-                format = this.dex.formats.get('gen8sharedpower');
-            for (const ability of format.getSharedPower(pokemon)) {
-                const effect = 'ability:' + ability;
-                pokemon.volatiles[effect] = { id: this.toID(effect), target: pokemon };
-                if (!pokemon.m.abils)
-                    pokemon.m.abils = [];
-                if (!pokemon.m.abils.includes(effect))
-                    pokemon.m.abils.push(effect);
+        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);
             }
-        },
-        onSwitchInPriority: 2,
-        onSwitchIn(pokemon) {
-            let format = this.format;
-            if (!format.getSharedPower)
-                format = this.dex.formats.get('gen8sharedpower');
-            for (const ability of format.getSharedPower(pokemon)) {
-                if (ability === 'noability') {
-                    this.hint(`Mirror Armor and Trace break in Shared Power formats that don't use Shared Power as a base, so they get removed from non-base users.`);
+            // 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',
+                'Recycle', 'Trace',
+                'Skill Swap', // Self-propagates indefinitely
+            ];
+            for (const m of set.moves) {
+                const move = dex.moves.get(m);
+                if (irrevokablyRestricted.includes(move.name)) {
+                    return [`${move.name} is banned from Trademark, irrespective of custom rules, because it can cause endless turns.`];
                 }
-                const effect = 'ability:' + ability;
-                delete pokemon.volatiles[effect];
-                pokemon.addVolatile(effect);
             }
+            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 "";
+                    },
+                };
+            },
         },
     },
     {
@@ -1830,6 +1989,41 @@ exports.Formats = [
         searchShow: false,
         ruleset: ['[Gen 8] Random Battle', 'Dynamax Clause'],
     },
+    {
+        name: "[Gen 8] Random Battle Mayhem",
+        desc: `[Gen 8] Random Battle (No Dmax) with Team Preview and elements of Camomons, Inverse, Scalemons, and Shared Power.`,
+        mod: 'sharedpower',
+        team: 'random',
+        searchShow: false,
+        ruleset: ['[Gen 8] Random Battle', 'Team Preview', 'Dynamax Clause', 'Camomons Mod', 'Inverse Mod', 'Scalemons Mod'],
+        onBeforeSwitchIn(pokemon) {
+            let format = this.format;
+            if (!format.getSharedPower)
+                format = this.dex.formats.get('gen8sharedpower');
+            for (const ability of format.getSharedPower(pokemon)) {
+                const effect = 'ability:' + ability;
+                pokemon.volatiles[effect] = { id: this.toID(effect), target: pokemon };
+                if (!pokemon.m.abils)
+                    pokemon.m.abils = [];
+                if (!pokemon.m.abils.includes(effect))
+                    pokemon.m.abils.push(effect);
+            }
+        },
+        onSwitchInPriority: 2,
+        onSwitchIn(pokemon) {
+            let format = this.format;
+            if (!format.getSharedPower)
+                format = this.dex.formats.get('gen8sharedpower');
+            for (const ability of format.getSharedPower(pokemon)) {
+                if (ability === 'noability') {
+                    this.hint(`Mirror Armor and Trace break in Shared Power formats that don't use Shared Power as a base, so they get removed from non-base users.`);
+                }
+                const effect = 'ability:' + ability;
+                delete pokemon.volatiles[effect];
+                pokemon.addVolatile(effect);
+            }
+        },
+    },
     {
         name: "[Gen 8] BSS Factory",
         desc: `Randomized 3v3 Singles featuring Pok&eacute;mon and movesets popular in Battle Stadium Singles.`,
@@ -2086,36 +2280,42 @@ exports.Formats = [
         column: 3,
     },
     {
-        name: "[Gen 3] UU",
+        name: "[Gen 4] 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>`,
+            `&bullet; <a href="https://www.smogon.com/forums/threads/3532624/">DPP UU Metagame Discussion</a>`,
+            `&bullet; <a href="https://www.smogon.com/forums/threads/3503638/">DPP UU Viability Rankings</a>`,
         ],
-        mod: 'gen3',
+        mod: 'gen4',
         // searchShow: false,
-        ruleset: ['Standard', 'NFE Clause'],
-        banlist: ['Uber', 'OU', 'UUBL', 'Smeargle + Ingrain', 'Baton Pass'],
-        unbanlist: ['Scyther', 'Sand Veil'],
+        ruleset: ['[Gen 4] OU'],
+        banlist: ['OU', 'UUBL'],
+        unbanlist: ['Arena Trap', 'Swagger'],
     },
     {
-        name: "[Gen 1] NU",
+        name: "[Gen 7] LC",
         threads: [
-            `&bullet; <a href="https://www.smogon.com/forums/threads/3668913/">RBY NU Viability Rankings</a>`,
+            `&bullet; <a href="https://www.smogon.com/dex/sm/formats/lc/">USM LC Banlist</a>`,
+            `&bullet; <a href="https://www.smogon.com/forums/threads/3639319/">USM LC Sample Teams</a>`,
+            `&bullet; <a href="https://www.smogon.com/forums/threads/3621440/">USM LC Viability Rankings</a>`,
         ],
-        mod: 'gen1',
+        mod: 'gen7',
         // searchShow: false,
-        ruleset: ['[Gen 1] UU'],
-        banlist: ['UU', 'NUBL'],
+        ruleset: ['Little Cup', 'Standard', 'Swagger Clause'],
+        banlist: [
+            'Aipom', 'Cutiefly', 'Drifloon', 'Gligar', 'Gothita', 'Meditite', 'Misdreavus', 'Murkrow', 'Porygon',
+            'Scyther', 'Sneasel', 'Swirlix', 'Tangela', 'Trapinch', 'Vulpix-Base', 'Wingull', 'Yanma',
+            'Eevium Z', 'Baton Pass', 'Dragon Rage', 'Sonic Boom', 'Sticky Web',
+        ],
     },
     {
-        name: "[Gen 4] Ubers",
+        name: "[Gen 5] PU",
         threads: [
-            `&bullet; <a href="https://www.smogon.com/forums/posts/8286279/">DPP Ubers</a>`,
+            `&bullet; <a href="https://www.smogon.com/forums/posts/7326932/">BW2 PU</a>`,
         ],
-        mod: 'gen4',
+        mod: 'gen5',
         // searchShow: false,
-        ruleset: ['Standard'],
-        banlist: ['AG'],
+        ruleset: ['[Gen 5] NU', 'Sleep Moves Clause'],
+        banlist: ['NU', 'PUBL'],
     },
     // Past Gens OU
     ///////////////////////////////////////////////////////////////////
@@ -2388,22 +2588,6 @@ exports.Formats = [
         ruleset: ['[Gen 7] NU'],
         banlist: ['NU', 'PUBL'],
     },
-    {
-        name: "[Gen 7] LC",
-        threads: [
-            `&bullet; <a href="https://www.smogon.com/dex/sm/formats/lc/">USM LC Banlist</a>`,
-            `&bullet; <a href="https://www.smogon.com/forums/threads/3639319/">USM LC Sample Teams</a>`,
-            `&bullet; <a href="https://www.smogon.com/forums/threads/3621440/">USM LC Viability Rankings</a>`,
-        ],
-        mod: 'gen7',
-        searchShow: false,
-        ruleset: ['Little Cup', 'Standard', 'Swagger Clause'],
-        banlist: [
-            'Aipom', 'Cutiefly', 'Drifloon', 'Gligar', 'Gothita', 'Meditite', 'Misdreavus', 'Murkrow', 'Porygon',
-            'Scyther', 'Sneasel', 'Swirlix', 'Tangela', 'Trapinch', 'Vulpix-Base', 'Wingull', 'Yanma',
-            'Eevium Z', 'Baton Pass', 'Dragon Rage', 'Sonic Boom', 'Sticky Web',
-        ],
-    },
     {
         name: "[Gen 7] Monotype",
         desc: `All the Pok&eacute;mon on a team must share a type.`,
@@ -2720,14 +2904,15 @@ exports.Formats = [
         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',
+            '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',
+            'Focus Sash', 'Soul Dew', 'Grass Whistle', 'Hypnosis', 'Perish Song', 'Sing', 'Yawn',
         ],
     },
     {
@@ -2920,16 +3105,6 @@ exports.Formats = [
         ruleset: ['[Gen 5] RU', '!Sleep Moves Clause', 'Sleep Clause Mod'],
         banlist: ['RU', 'NUBL', 'Assist', 'Copycat'],
     },
-    {
-        name: "[Gen 5] PU",
-        threads: [
-            `&bullet; <a href="https://www.smogon.com/forums/posts/7326932/">BW2 PU</a>`,
-        ],
-        mod: 'gen5',
-        searchShow: false,
-        ruleset: ['[Gen 5] NU', 'Sleep Moves Clause'],
-        banlist: ['NU', 'PUBL'],
-    },
     {
         name: "[Gen 5] LC",
         threads: [
@@ -2966,7 +3141,7 @@ exports.Formats = [
             'Picked Team Size = 1', 'Max Team Size = 3',
             'Standard', 'Baton Pass Clause', 'Swagger Clause', 'Accuracy Moves Clause',
         ],
-        banlist: ['Uber', 'Cottonee', 'Dragonite', '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', 'Bright Powder', 'Focus Band', 'Focus Sash', 'Lax Incense', 'Quick Claw', 'Soul Dew', 'Perish Song'],
         unbanlist: ['Genesect', 'Landorus', 'Manaphy', 'Thundurus', 'Tornadus-Therian'],
     },
     {
@@ -3055,16 +3230,14 @@ exports.Formats = [
         column: 5,
     },
     {
-        name: "[Gen 4] UU",
+        name: "[Gen 4] Ubers",
         threads: [
-            `&bullet; <a href="https://www.smogon.com/forums/threads/3532624/">DPP UU Metagame Discussion</a>`,
-            `&bullet; <a href="https://www.smogon.com/forums/threads/3503638/">DPP UU Viability Rankings</a>`,
+            `&bullet; <a href="https://www.smogon.com/forums/posts/8286279/">DPP Ubers</a>`,
         ],
         mod: 'gen4',
         searchShow: false,
-        ruleset: ['[Gen 4] OU'],
-        banlist: ['OU', 'UUBL'],
-        unbanlist: ['Arena Trap', 'Swagger'],
+        ruleset: ['Standard'],
+        banlist: ['AG'],
     },
     {
         name: "[Gen 4] NU",
@@ -3197,6 +3370,18 @@ exports.Formats = [
         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: [
@@ -3286,7 +3471,7 @@ exports.Formats = [
             '[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',
+            'Alakazam', 'Clefable', 'Snorlax', 'Zapdos', 'Berserk Gene', 'Bright Powder', 'Focus Band', 'King\'s Rock', 'Quick Claw',
             'Attract', 'Destiny Bond', 'Explosion', 'Perish Song', 'Present', 'Self-Destruct', 'Swagger',
         ],
     },
@@ -3342,6 +3527,16 @@ exports.Formats = [
         ruleset: ['[Gen 1] OU'],
         banlist: ['OU', 'UUBL'],
     },
+    {
+        name: "[Gen 1] NU",
+        threads: [
+            `&bullet; <a href="https://www.smogon.com/forums/threads/3668913/">RBY NU Viability Rankings</a>`,
+        ],
+        mod: 'gen1',
+        searchShow: false,
+        ruleset: ['[Gen 1] UU'],
+        banlist: ['UU', 'NUBL'],
+    },
     {
         name: "[Gen 1] Japanese OU",
         desc: `Generation 1 with Japanese battle mechanics.`,