@pkmn/sim 0.5.8 → 0.5.11

package/build/config/formats.js

@@ -191,7 +191,7 @@ exports.Formats = [
         ],
         banlist: [
             'Calyrex-Ice', 'Calyrex-Shadow', 'Cinderace', 'Dialga', 'Dragonite', 'Eternatus', 'Genesect', 'Giratina', 'Giratina-Origin', 'Groudon', 'Ho-Oh', 'Jirachi',
-            'Kyogre', 'Kyurem-Black', 'Kyurem-White', 'Lugia', 'Lunala', 'Magearna', 'Marshadow', 'Melmetal', 'Mew', 'Mewtwo', 'Mimikyu', 'Necrozma-Dawn-Wings',
+            'Kyogre', 'Kyurem-Black', 'Kyurem-White', 'Lugia', 'Lunala', 'Magearna', 'Marshadow', 'Melmetal', 'Mew', 'Mewtwo', 'Mimikyu', 'Necrozma', 'Necrozma-Dawn-Wings',
             'Necrozma-Dusk-Mane', 'Palkia', 'Rayquaza', 'Reshiram', 'Sableye', 'Snorlax', 'Solgaleo', 'Victini', 'Xerneas', 'Yveltal', 'Zacian', 'Zacian-Crowned',
             'Zamazenta', 'Zamazenta-Crowned', 'Zekrom', 'Moody', 'Power Construct', 'Bright Powder', 'Focus Band', 'Focus Sash', 'Lax Incense', 'Quick Claw', 'Perish Song',
         ],
@@ -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',
         ],
     },
     {
@@ -443,7 +443,7 @@ 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', 'Eternatus',
+            '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',
@@ -472,16 +472,14 @@ exports.Formats = [
             'Drizzle', 'Drought',
             // Slowbronite is banned so it doesn't validate on Galarian Slowbro
             'Slowbronite',
-            // NDOU suspect
-            'Dragapult',
         ],
         // Used to distinguish UU from below UU in the client
         restricted: [
-            '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',
+            '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',
         ],
     },
     {
@@ -591,141 +589,217 @@ exports.Formats = [
         column: 2,
     },
     {
-        name: "[Gen 8] Trademarked",
-        desc: `Sacrifice your Pokémon's ability for a status move that activates on switch-in.`,
+        name: "[Gen 8] Shared Power",
+        desc: `Once a Poké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', 'Victini', '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', 'Stench', 'Tinted Lens', 'Triage', 'Unaware',
+            'Unburden', 'Water Bubble', 'King\'s Rock', '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',
-            'Switcheroo', 'Teleport', 'Trick', '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', '2 Ability 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));
+            }
+            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.)`,
+                ];
             }
-            return problems;
+        },
+        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',
-                '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 item = this.dex.items.get(set.item);
+            if (item.itemUser?.length) {
+                if (!item.itemUser.includes(crossSpecies.name) || crossSpecies.name !== species.name) {
+                    return [`${species.name} cannot use ${item.name} because it is cross evolved into ${crossSpecies.name}.`];
                 }
             }
-            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 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;
             }
-            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;
+            // @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;
         },
-        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 "";
-                    },
-                };
-            },
+        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.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 (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];
+            }
+            if (mixedSpecies.types[0] === mixedSpecies.types[1])
+                mixedSpecies.types = [mixedSpecies.types[0]];
+            return mixedSpecies;
         },
-    },
-    {
-        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', '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.`);
-                }
+        onBegin() {
+            for (const pokemon of this.getAllPokemon()) {
+                pokemon.baseSpecies = pokemon.species;
             }
-            return problems;
         },
     },
     // Other Metagames
@@ -808,12 +882,12 @@ exports.Formats = [
         mod: 'mixandmega',
         ruleset: ['Obtainable', 'Species Clause', 'Nickname Clause', 'OHKO Clause', 'Evasion Moves Clause', 'Team Preview', 'HP Percentage Mod', 'Cancel Mod', 'Overflow Stat Mod', 'Dynamax Clause', 'Sleep Clause Mod', 'Endless Battle Clause'],
         banlist: [
-            'Calyrex-Shadow', 'Kyogre', 'Zacian',
+            'Calyrex-Shadow', 'Eternatus', 'Kyogre', 'Zacian',
             'Beedrillite', 'Blazikenite', 'Gengarite', 'Kangaskhanite', 'Mawilite', 'Medichamite', 'Pidgeotite',
             'Moody', 'Shadow Tag', 'Baton Pass', 'Electrify',
         ],
         restricted: [
-            'Calyrex-Ice', 'Dialga', 'Eternatus', 'Gengar', 'Giratina', 'Groudon', 'Ho-Oh', 'Kyurem-Black', 'Kyurem-White',
+            'Calyrex-Ice', 'Dialga', 'Gengar', 'Giratina', 'Groudon', 'Ho-Oh', 'Kyurem-Black', 'Kyurem-White',
             'Lugia', 'Lunala', 'Marshadow', 'Melmetal', 'Mewtwo', 'Naganadel', 'Necrozma-Dawn-Wings', 'Necrozma-Dusk-Mane',
             'Palkia', 'Pheromosa', 'Rayquaza', 'Regigigas', 'Reshiram', 'Urshifu', 'Urshifu-Rapid-Strike', 'Xerneas',
             'Yveltal', 'Zekrom', 'Zygarde-Complete',
@@ -907,9 +981,10 @@ exports.Formats = [
         mod: 'gen8',
         ruleset: ['Standard', 'Dynamax Clause', 'Sleep Moves Clause'],
         banlist: [
-            'Blissey', 'Calyrex-Shadow', 'Chansey', 'Dragapult', 'Hawlucha', 'Marowak-Alola', 'Melmetal', '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', 'Dragapult', 'Eternatus', 'Hawlucha', 'Marowak-Alola', 'Melmetal', '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();
@@ -1034,9 +1109,8 @@ 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'],
+        banlist: ['RU', 'NUBL', 'Damp Rock', 'Heat Rock'],
     },
     {
         name: "[Gen 8 BDSP] LC",
@@ -1045,7 +1119,7 @@ exports.Formats = [
         ],
         mod: 'gen8bdsp',
         ruleset: ['Little Cup', 'Standard'],
-        banlist: ['Gligar', 'Meditite', 'Misdreavus', 'Murkrow', 'Scyther', 'Sneasel', 'Tangela', 'Vulpix', 'Yanma', 'Moody', 'Baton Pass'],
+        banlist: ['Gligar', 'Meditite', 'Misdreavus', 'Murkrow', 'Scyther', 'Sneasel', 'Tangela', 'Vulpix', 'Yanma', 'Moody', 'Baton Pass', 'Sticky Web'],
     },
     {
         name: "[Gen 8 BDSP] Monotype",
@@ -1120,10 +1194,10 @@ exports.Formats = [
         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',
-            'Lunala', 'Marshadow', 'Mew', 'Mewtwo', 'Naganadel', 'Necrozma-Dawn-Wings', 'Necrozma-Dusk-Mane', 'Palkia', 'Pheromosa', 'Rayquaza', 'Reshiram',
-            'Reuniclus', 'Shedinja', 'Slowking-Galar', 'Solgaleo', 'Spectrier', 'Tornadus-Therian', 'Volcarona', 'Xerneas', 'Yveltal', 'Zacian', 'Zacian-Crowned',
-            'Zamazenta', 'Zamazenta-Crowned', 'Zekrom', 'Zeraora', 'Zygarde-Base', 'Arena Trap', 'Moody', 'Power Construct', 'Shadow Tag', 'Baton Pass',
+            'Groudon', 'Ho-Oh', 'Hydreigon', 'Kartana', 'Kyogre', 'Kyurem', 'Kyurem-Black', 'Kyurem-White', 'Landorus-Base', 'Lugia', 'Lunala', 'Marshadow',
+            'Mew', 'Mewtwo', 'Naganadel', 'Necrozma-Dawn-Wings', 'Necrozma-Dusk-Mane', 'Palkia', 'Pheromosa', 'Rayquaza', 'Reshiram', 'Shedinja', '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', 'Calm Mind',
         ],
     },
     {
@@ -1314,6 +1388,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.`,
@@ -1637,67 +1743,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 "";
+                    },
+                };
+            },
         },
     },
     {
@@ -1846,7 +1998,6 @@ exports.Formats = [
         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;
@@ -2132,36 +2283,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
     ///////////////////////////////////////////////////////////////////
@@ -2434,22 +2591,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.`,
@@ -2766,14 +2907,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',
         ],
     },
     {
@@ -2966,16 +3108,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: [
@@ -3012,7 +3144,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'],
     },
     {
@@ -3101,16 +3233,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",
@@ -3243,6 +3373,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: [
@@ -3388,6 +3530,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.`,