@pkmn/sim 0.5.16 → 0.5.19

package/build/config/formats.js

@@ -236,7 +236,7 @@ exports.Formats = [
             'Larvesta', 'Magby', 'Magnemite', 'Mareanie', 'Mienfoo', 'Mudbray', 'Munchlax', 'Natu', 'Onix', 'Pawniard',
             'Ponyta', 'Ponyta-Galar', 'Porygon', 'Slowpoke-Base', 'Staryu', 'Timburr', 'Trapinch', 'Tyrunt',
             // LC UUBL
-            'Farfetch\u2019d-Galar', 'Scorbunny', 'Shellder', 'Wingull',
+            'Archen', 'Farfetch\u2019d-Galar', 'Scorbunny', 'Shellder', 'Wingull',
         ],
     },
     {
@@ -330,7 +330,7 @@ exports.Formats = [
         gameType: 'doubles',
         searchShow: false,
         ruleset: ['Standard Doubles', 'Little Cup', 'Dynamax Clause', 'Swagger Clause', 'Sleep Clause Mod'],
-        banlist: ['Corsola-Galar', 'Cutiefly', 'Ponyta-Base', 'Scyther', 'Sneasel', 'Swirlix', 'Tangela', 'Vulpix', 'Vulpix-Alola', 'Ally Switch'],
+        banlist: ['Corsola-Galar', 'Cutiefly', 'Ponyta-Base', 'Scyther', 'Sneasel', 'Swirlix', 'Tangela', 'Vulpix-Base', 'Ally Switch'],
     },
     {
         name: "[Gen 8] VGC 2022",
@@ -570,43 +570,35 @@ exports.Formats = [
         column: 2,
     },
     {
-        name: "[Gen 8] Crazyhouse",
-        desc: `Pokémon you KO are added to your team and removed from the opponent's, and vice versa.`,
+        name: "[Gen 8] Tier Shift",
+        desc: `Pokémon get a +10 boost to each stat, barring HP, per tier below OU they are in.`,
         threads: [
-            `&bullet; <a href="https://www.smogon.com/forums/threads/3699268/">Crazyhouse</a>`,
+            `&bullet; <a href="https://www.smogon.com/forums/threads/3662165/">Tier Shift</a>`,
         ],
         mod: 'gen8',
-        ruleset: ['Standard', 'Crazyhouse Rule', 'Dynamax Clause', 'Sleep Moves Clause', 'Evasion Abilities Clause', '!Sleep Clause Mod'],
+        ruleset: ['Standard', 'Tier Shift Mod', 'Dynamax Clause'],
         banlist: [
-            'Calyrex-Ice', 'Calyrex-Shadow', 'Cinderace', 'Darmanitan-Galar', 'Dialga', 'Dracovish', 'Eternatus', 'Genesect', 'Giratina',
-            'Giratina-Origin', 'Groudon', 'Hawlucha', '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', 'Arena Trap', 'Moody', 'Power Construct', 'Shadow Tag', 'Bright Powder',
-            'King\'s Rock', 'Lax Incense', 'Baton Pass', 'Explosion', 'Final Gambit', 'Healing Wish', 'Lunar Dance', 'Memento',
-            'Misty Explosion', 'Self-Destruct',
+            'Calyrex-Ice', 'Calyrex-Shadow', 'Cinderace', 'Darmanitan-Galar', 'Dialga', 'Dracovish', 'Eternatus', 'Genesect', 'Giratina', 'Giratina-Origin',
+            'Groudon', 'Ho-Oh', 'Kyogre', 'Kyurem', 'Kyurem-Black', 'Kyurem-White', 'Landorus-Base', 'Lugia', 'Lunala', 'Magearna', 'Marshadow', 'Mewtwo',
+            'Naganadel', 'Necrozma-Dawn-Wings', 'Necrozma-Dusk-Mane', 'Palkia', 'Pheromosa', 'Rayquaza', 'Reshiram', 'Solgaleo', 'Spectrier', 'Urshifu-Base',
+            'Xerneas', 'Yveltal', 'Zacian', 'Zacian-Crowned', 'Zamazenta-Base', 'Zekrom', 'Zygarde-Base', 'Arena Trap', 'Moody', 'Power Construct', 'Sand Veil',
+            'Shadow Tag', 'Snow Cloak', 'Bright Powder', 'Damp Rock', 'Eviolite', 'Heat Rock', 'King\'s Rock', 'Lax Incense', 'Baton Pass',
         ],
     },
     {
-        name: "[Gen 8] Pokebilities AAA",
-        desc: `Pok&eacute;mon have all of their released abilities simultaneously alongside any additional ability.`,
+        name: "[Gen 8] Inverse",
+        desc: `Weaknesses become resistances, while resistances and immunities become weaknesses.`,
         threads: [
-            `&bullet; <a href="https://www.smogon.com/forums/posts/8821047">Pok&eacute;bilities AAA</a>`,
+            `&bullet; <a href="https://www.smogon.com/forums/threads/3666858/">Inverse</a>`,
         ],
-        mod: 'pokebilities',
-        ruleset: ['[Gen 8] Pokebilities', '!Obtainable Abilities', 'AAA Restricted Abilities', '2 Ability Clause', 'Sleep Moves Clause', '!Sleep Clause Mod'],
+        mod: 'gen8',
+        ruleset: ['Standard', 'Inverse Mod', 'Dynamax Clause'],
         banlist: [
-            'Blacephalon', 'Buzzwole', 'Clefable', 'Dragapult', 'Dragonite', 'Kartana', 'Keldeo', 'Kyurem', 'Melmetal', 'Mienshao',
-            'Obstagoon', 'Noivern', 'Pangoro', 'Perrserker', 'Rillaboom', 'Tapu Bulu', 'Tapu Lele', 'Urshifu', 'Urshifu-Rapid-Strike',
-            'Victini', 'Weavile', 'Zamazenta-Crowned', 'Arena Trap', 'Moody', 'Shadow Tag', 'Wonder Guard', 'Chlorophyll + Desolate Land',
-            'Chlorophyll + Drought', 'Electric Surge + Surge Surfer', 'Regenerator + Emergency Exit', 'Regenerator + Multiscale',
-            'Regenerator + Shadow Shield', 'Regenerator + Wimp Out', 'Sand Rush + Sand Stream', 'Slush Rush + Snow Warning', 'Swift Swim + Drizzle',
-            'Swift Swim + Primordial Sea', 'Regenerator > 2',
-        ],
-        restricted: [
-            'Comatose', 'Contrary', 'Fluffy', 'Fur Coat', 'Gorilla Tactics', 'Huge Power', 'Ice Scales', 'Illusion', 'Imposter', 'Innards Out',
-            'Intrepid Sword', 'Libero', 'Magnet Pull', 'Neutralizing Gas', 'Parental Bond', 'Poison Heal', 'Prankster', 'Protean',
-            'Pure Power', 'Simple', 'Stakeout', 'Stench', 'Speed Boost', 'Tinted Lens', 'Unburden', 'Water Bubble',
+            'Cinderace', 'Calyrex-Ice', 'Calyrex-Shadow', 'Darmanitan-Galar', 'Dialga', 'Diggersby', 'Dracovish', 'Dracozolt', 'Eternatus', 'Genesect', 'Giratina',
+            'Giratina-Origin', 'Groudon', 'Ho-Oh', 'Kartana', 'Kyogre', 'Kyurem', 'Kyurem-Black', 'Kyurem-White', 'Landorus-Base', 'Lugia', 'Lunala', 'Marshadow',
+            'Mewtwo', 'Naganadel', 'Necrozma-Dawn-Wings', 'Necrozma-Dusk-Mane', 'Palkia', 'Pheromosa', 'Porygon-Z', 'Rayquaza', 'Regidrago', 'Regieleki', 'Reshiram',
+            'Reuniclus', 'Rillaboom', 'Solgaleo', 'Spectrier', 'Urshifu-Base', 'Xerneas', 'Yveltal', 'Zacian', 'Zacian-Crowned', 'Zamazenta-Base', 'Zekrom', 'Arena Trap',
+            'Moody', 'Power Construct', 'Shadow Tag', 'King\'s Rock', 'Baton Pass',
         ],
     },
     // Other Metagames
@@ -631,25 +623,6 @@ exports.Formats = [
             'Water Bubble', 'Wonder Guard', 'Comatose + Sleep Talk', 'Rusted Sword', 'Court Change', 'Bolt Beak', 'Double Iron Bash',
             'Octolock', 'Shell Smash',
         ],
-        onChangeSet(set) {
-            const item = this.dex.toID(set.item);
-            if (set.species === 'Zacian' && item === 'rustedsword') {
-                set.species = 'Zacian-Crowned';
-                set.ability = 'Intrepid Sword';
-                const ironHead = set.moves.indexOf('ironhead');
-                if (ironHead >= 0) {
-                    set.moves[ironHead] = 'behemothblade';
-                }
-            }
-            if (set.species === 'Zamazenta' && item === 'rustedshield') {
-                set.species = 'Zamazenta-Crowned';
-                set.ability = 'Dauntless Shield';
-                const ironHead = set.moves.indexOf('ironhead');
-                if (ironHead >= 0) {
-                    set.moves[ironHead] = 'behemothbash';
-                }
-            }
-        },
     },
     {
         name: "[Gen 8] Almost Any Ability",
@@ -670,15 +643,6 @@ exports.Formats = [
             'Innards Out', 'Intrepid Sword', 'Libero', 'Magnet Pull', 'Moody', 'Neutralizing Gas', 'Parental Bond', 'Poison Heal', 'Protean',
             'Pure Power', 'Shadow Tag', 'Simple', 'Stakeout', 'Speed Boost', 'Water Bubble', 'Wonder Guard', 'King\'s Rock', 'Baton Pass',
         ],
-        onValidateSet(set) {
-            // Temporary fix until battle-only is implemented properly
-            if (this.toID(set.species) === 'zamazentacrowned' && this.toID(set.ability) !== 'dauntlessshield') {
-                return [`Zamazenta-Crowned can only use Dauntless Shield because it is a battle-only forme.`];
-            }
-            if (this.toID(set.species) === 'zaciancrowned' && this.toID(set.ability) !== 'intrepidsword') {
-                return [`Zacian-Crowned can only use Intrepid Sword because it is a battle-only forme.`];
-            }
-        },
     },
     {
         name: "[Gen 8] Mix and Mega",
@@ -850,9 +814,6 @@ exports.Formats = [
             const stat = Dex.stats.ids()[target.side.team.indexOf(target.set)];
             const newSpecies = this.dex.deepClone(species);
             let godSpecies = this.dex.species.get(god.species);
-            if (godSpecies.forme === 'Crowned') {
-                godSpecies = this.dex.species.get(godSpecies.changesFrom || godSpecies.baseSpecies);
-            }
             if (typeof godSpecies.battleOnly === 'string') {
                 godSpecies = this.dex.species.get(godSpecies.battleOnly);
             }
@@ -1723,6 +1684,17 @@ exports.Formats = [
                 }
             }
         },
+        onSwitchOut(pokemon) {
+            for (const innate of Object.keys(pokemon.volatiles).filter(i => i.startsWith('ability:'))) {
+                pokemon.removeVolatile(innate);
+            }
+        },
+        onFaint(pokemon) {
+            for (const innate of Object.keys(pokemon.volatiles).filter(i => i.startsWith('ability:'))) {
+                const innateEffect = this.dex.conditions.get(innate);
+                this.singleEvent('End', innateEffect, null, pokemon);
+            }
+        },
         onAfterMega(pokemon) {
             for (const innate of Object.keys(pokemon.volatiles).filter(i => i.startsWith('ability:'))) {
                 pokemon.removeVolatile(innate);
@@ -2099,6 +2071,17 @@ exports.Formats = [
         team: 'randomStaffBros',
         ruleset: ['Dynamax Clause', 'HP Percentage Mod', 'Cancel Mod', 'Sleep Clause Mod'],
         onBegin() {
+            if (!this.ruleTable.has('dynamaxclause')) {
+                // Old joke format we're bringing back
+                for (const side of this.sides) {
+                    side.dynamaxUsed = true;
+                }
+                this.add('message', 'Delphox only');
+                this.add('message', 'No items');
+                this.add('message', 'Final Destination');
+                return;
+            }
+            // TODO look into making an event to put this right after turn|1
             // https://discordapp.com/channels/630837856075513856/630845310033330206/716126469528485909
             // Requires client change
             this.add(`raw|<div class='broadcast-green'><b>Wondering what all these custom moves, abilities, and items do?<br />Check out the <a href="https://www.smogon.com/articles/super-staff-bros-4" target="_blank">Super Staff Bros 4 Guide</a> or use /ssb to find out!</b></div>`);
@@ -2203,7 +2186,7 @@ exports.Formats = [
         ],
         mod: 'gen7',
         team: 'random',
-        ruleset: ['Obtainable', 'Sleep Clause Mod', 'HP Percentage Mod', 'Cancel Mod'],
+        ruleset: ['Obtainable', 'Sleep Clause Mod', 'HP Percentage Mod', 'Cancel Mod', 'Mega Rayquaza Clause'],
     },
     {
         name: "[Gen 7] Random Doubles Battle",
@@ -2259,7 +2242,7 @@ exports.Formats = [
         name: "[Gen 6] Random Battle",
         mod: 'gen6',
         team: 'random',
-        ruleset: ['Obtainable', 'Sleep Clause Mod', 'HP Percentage Mod', 'Cancel Mod'],
+        ruleset: ['Obtainable', 'Sleep Clause Mod', 'HP Percentage Mod', 'Cancel Mod', 'Mega Rayquaza Clause'],
     },
     {
         name: "[Gen 6] Battle Factory",
@@ -2335,33 +2318,35 @@ exports.Formats = [
         column: 3,
     },
     {
-        name: "[Gen 6] UU",
+        name: "[Gen 7] UU",
         threads: [
-            `&bullet; <a href="https://www.smogon.com/dex/xy/formats/uu/">ORAS UU Banlist</a>`,
-            `&bullet; <a href="https://www.smogon.com/forums/threads/3598164/">ORAS UU Viability Rankings</a>`,
+            `&bullet; <a href="https://www.smogon.com/forums/threads/3621217/">USM UU Sample Teams</a>`,
+            `&bullet; <a href="https://www.smogon.com/forums/threads/3641346/">USM UU Viability Rankings</a>`,
         ],
-        mod: 'gen6',
+        mod: 'gen7',
         // searchShow: false,
-        ruleset: ['[Gen 6] OU'],
-        banlist: ['OU', 'UUBL', 'Drizzle', 'Drought'],
+        ruleset: ['[Gen 7] OU'],
+        banlist: ['OU', 'UUBL', 'Drizzle', 'Drought', 'Kommonium Z', 'Mewnium Z'],
     },
     {
-        name: "[Gen 4] Anything Goes",
-        mod: 'gen4',
+        name: "[Gen 6] ZU",
+        threads: [
+            `&bullet; <a href="https://www.smogon.com/dex/xy/formats/zu/">ORAS ZU Banlist</a>`,
+            `&bullet; <a href="https://www.smogon.com/forums/posts/8034679/">ORAS ZU Viability Rankings</a>`,
+        ],
+        mod: 'gen6',
         // searchShow: false,
-        ruleset: ['Obtainable', 'Arceus EV Limit', 'Endless Battle Clause', 'HP Percentage Mod', 'Cancel Mod'],
+        ruleset: ['[Gen 6] PU'],
+        banlist: ['PU', 'Fraxure', 'Regigigas', 'Simisear'],
     },
     {
-        name: "[Gen 7] RU",
+        name: "[Gen 1] Ubers",
         threads: [
-            `&bullet; <a href="https://www.smogon.com/forums/threads/3645338/">USM RU Sample Teams</a>`,
-            `&bullet; <a href="https://www.smogon.com/forums/threads/3645873/">USM RU Viability Rankings</a>`,
+            `&bullet; <a href="https://www.smogon.com/forums/posts/8286283/">RBY Ubers</a>`,
         ],
-        mod: 'gen7',
+        mod: 'gen1',
         // searchShow: false,
-        ruleset: ['[Gen 7] UU'],
-        banlist: ['UU', 'RUBL', 'Mimikyu', 'Aurora Veil'],
-        unbanlist: ['Drought'],
+        ruleset: ['Standard'],
     },
     // Past Gens OU
     ///////////////////////////////////////////////////////////////////
@@ -2420,7 +2405,7 @@ exports.Formats = [
         ],
         mod: 'gen3',
         ruleset: ['Standard', 'One Boost Passer Clause'],
-        banlist: ['Uber', 'Sand Veil', 'Soundproof', 'Assist', 'Baton Pass + Mean Look', 'Baton Pass + Spider Web', 'Smeargle + Ingrain'],
+        banlist: ['Uber', 'Sand Veil', 'Soundproof', 'Assist', 'Baton Pass + Block', 'Baton Pass + Mean Look', 'Baton Pass + Spider Web', 'Smeargle + Ingrain'],
     },
     {
         name: "[Gen 2] OU",
@@ -2581,15 +2566,16 @@ exports.Formats = [
         banlist: ['Baton Pass'],
     },
     {
-        name: "[Gen 7] UU",
+        name: "[Gen 7] RU",
         threads: [
-            `&bullet; <a href="https://www.smogon.com/forums/threads/3621217/">USM UU Sample Teams</a>`,
-            `&bullet; <a href="https://www.smogon.com/forums/threads/3641346/">USM UU Viability Rankings</a>`,
+            `&bullet; <a href="https://www.smogon.com/forums/threads/3645338/">USM RU Sample Teams</a>`,
+            `&bullet; <a href="https://www.smogon.com/forums/threads/3645873/">USM RU Viability Rankings</a>`,
         ],
         mod: 'gen7',
         searchShow: false,
-        ruleset: ['[Gen 7] OU'],
-        banlist: ['OU', 'UUBL', 'Drizzle', 'Drought', 'Kommonium Z', 'Mewnium Z'],
+        ruleset: ['[Gen 7] UU'],
+        banlist: ['UU', 'RUBL', 'Mimikyu', 'Aurora Veil'],
+        unbanlist: ['Drought'],
     },
     {
         name: "[Gen 7] NU",
@@ -2860,6 +2846,17 @@ exports.Formats = [
         searchShow: false,
         ruleset: ['Standard', 'Swagger Clause', 'Mega Rayquaza Clause'],
     },
+    {
+        name: "[Gen 6] UU",
+        threads: [
+            `&bullet; <a href="https://www.smogon.com/dex/xy/formats/uu/">ORAS UU Banlist</a>`,
+            `&bullet; <a href="https://www.smogon.com/forums/threads/3598164/">ORAS UU Viability Rankings</a>`,
+        ],
+        mod: 'gen6',
+        searchShow: false,
+        ruleset: ['[Gen 6] OU'],
+        banlist: ['OU', 'UUBL', 'Drizzle', 'Drought'],
+    },
     {
         name: "[Gen 6] RU",
         threads: [
@@ -2917,8 +2914,8 @@ exports.Formats = [
         searchShow: false,
         ruleset: ['Standard', 'Swagger Clause', 'Same Type Clause'],
         banlist: [
-            'Aegislash', 'Altaria-Mega', 'Arceus', 'Blaziken', 'Darkrai', 'Deoxys-Base', 'Deoxys-Attack', 'Dialga', 'Genesect', 'Gengar-Mega',
-            'Giratina', 'Giratina-Origin', 'Greninja', 'Groudon', 'Ho-Oh', 'Hoopa-Unbound', 'Kangaskhan-Mega', 'Kyogre', 'Kyurem-White',
+            'Aegislash', 'Altaria-Mega', 'Arceus', 'Blaziken', 'Darkrai', 'Deoxys-Base', 'Deoxys-Attack', 'Deoxys-Speed', 'Dialga', 'Genesect',
+            'Gengar-Mega', 'Giratina', 'Giratina-Origin', 'Greninja', 'Groudon', 'Ho-Oh', 'Hoopa-Unbound', 'Kangaskhan-Mega', 'Kyogre', 'Kyurem-White',
             'Lucario-Mega', 'Lugia', 'Mawile-Mega', 'Medicham-Mega', 'Metagross-Mega', 'Mewtwo', 'Palkia', 'Rayquaza', 'Reshiram', 'Sableye-Mega',
             'Salamence-Mega', 'Shaymin-Sky', 'Slowbro-Mega', 'Talonflame', 'Xerneas', 'Yveltal', 'Zekrom',
             'Shadow Tag', 'Bright Powder', 'Damp Rock', 'Focus Band', 'King\'s Rock', 'Lax Incense', 'Quick Claw', 'Razor Fang', 'Smooth Rock',
@@ -2941,8 +2938,8 @@ exports.Formats = [
         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', 'Grass Whistle', 'Hypnosis', 'Perish Song', 'Sing', 'Yawn',
+            'Palkia', 'Rayquaza', 'Reshiram', 'Salamence-Mega', 'Shaymin-Sky', 'Snorlax', 'Xerneas', 'Yveltal',
+            'Zekrom', 'Focus Sash', 'Soul Dew', 'Grass Whistle', 'Hypnosis', 'Perish Song', 'Sing', 'Yawn',
         ],
     },
     {
@@ -2955,17 +2952,6 @@ exports.Formats = [
         searchShow: false,
         ruleset: ['Obtainable', 'Team Preview', 'Endless Battle Clause', 'HP Percentage Mod', 'Cancel Mod'],
     },
-    {
-        name: "[Gen 6] ZU",
-        threads: [
-            `&bullet; <a href="https://www.smogon.com/dex/xy/formats/zu/">ORAS ZU Banlist</a>`,
-            `&bullet; <a href="https://www.smogon.com/forums/posts/8034679/">ORAS ZU Viability Rankings</a>`,
-        ],
-        mod: 'gen6',
-        searchShow: false,
-        ruleset: ['[Gen 6] PU'],
-        banlist: ['PU', 'Fraxure', 'Regigigas', 'Simisear'],
-    },
     {
         name: "[Gen 6] CAP",
         threads: [
@@ -3190,7 +3176,7 @@ exports.Formats = [
         searchShow: false,
         ruleset: [
             'Picked Team Size = 1', 'Max Team Size = 3',
-            'Standard', 'Baton Pass Clause', 'Swagger Clause', 'Accuracy Moves Clause',
+            'Standard', 'Baton Pass Clause', 'Swagger Clause', 'Accuracy Moves Clause', 'Sleep Moves Clause',
         ],
         banlist: ['Uber', 'Cottonee', 'Dragonite', 'Jirachi', 'Kyurem-Black', 'Mew', 'Togekiss', 'Whimsicott', 'Victini', 'Bright Powder', 'Focus Band', 'Focus Sash', 'Lax Incense', 'Quick Claw', 'Soul Dew', 'Perish Song'],
         unbanlist: ['Genesect', 'Landorus', 'Manaphy', 'Thundurus', 'Tornadus-Therian'],
@@ -3354,6 +3340,12 @@ exports.Formats = [
             'Berry Juice', 'Deep Sea Tooth', 'Dragon Rage', 'Sonic Boom', 'Swagger',
         ],
     },
+    {
+        name: "[Gen 4] Anything Goes",
+        mod: 'gen4',
+        searchShow: false,
+        ruleset: ['Obtainable', 'Arceus EV Limit', 'Endless Battle Clause', 'HP Percentage Mod', 'Cancel Mod'],
+    },
     {
         name: "[Gen 4] 1v1",
         desc: `Bring three Pok&eacute;mon to Team Preview and choose one to battle.`,
@@ -3378,11 +3370,11 @@ exports.Formats = [
         searchShow: false,
         ruleset: ['[Gen 4] PU'],
         banlist: [
-            'Ampharos', 'Armaldo', 'Bellossom', 'Dragonair', 'Gabite', 'Gastrodon', 'Glaceon', 'Glalie', 'Golduck',
-            'Gorebyss', 'Hippopotas', 'Kadabra', 'Machoke', 'Magmar', 'Mantine', 'Marowak', 'Metang', 'Misdreavus',
-            'Monferno', 'Mr. Mime', 'Muk', 'Murkrow', 'Pinsir', 'Politoed', 'Purugly', 'Quagsire', 'Raichu',
-            'Rampardos', 'Rapidash', 'Regigigas', 'Relicanth', 'Rhydon', 'Scyther', 'Sneasel', 'Snover', 'Solrock',
-            'Tangela', 'Torkoal', 'Victreebel', 'Xatu', 'Zangoose', 'Damp Rock',
+            'Ampharos', 'Armaldo', 'Bellossom', 'Dragonair', 'Electabuzz', 'Gabite', 'Gastrodon', 'Glaceon', 'Glalie',
+            'Golduck', 'Gorebyss', 'Hippopotas', 'Kadabra', 'Machoke', 'Magmar', 'Mantine', 'Marowak', 'Metang',
+            'Misdreavus', 'Monferno', 'Mr. Mime', 'Muk', 'Murkrow', 'Pinsir', 'Politoed', 'Purugly', 'Quagsire',
+            'Raichu', 'Rampardos', 'Rapidash', 'Regigigas', 'Relicanth', 'Rhydon', 'Scyther', 'Sneasel', 'Snover',
+            'Solrock', 'Tangela', 'Torkoal', 'Victreebel', 'Xatu', 'Zangoose', 'Damp Rock',
         ],
     },
     {
@@ -3590,15 +3582,6 @@ exports.Formats = [
         battle: { trunc: Math.trunc },
         ruleset: ['HP Percentage Mod', 'Cancel Mod', 'Max Team Size = 24', 'Max Move Count = 24', 'Max Level = 9999', 'Default Level = 100'],
     },
-    {
-        name: "[Gen 1] Ubers",
-        threads: [
-            `&bullet; <a href="https://www.smogon.com/forums/posts/8286283/">RBY Ubers</a>`,
-        ],
-        mod: 'gen1',
-        searchShow: false,
-        ruleset: ['Standard'],
-    },
     {
         name: "[Gen 1] UU",
         threads: [