@pkmn/sim 0.5.20 → 0.5.23

package/build/config/formats.js

@@ -218,8 +218,9 @@ exports.Formats = [
         mod: 'gen8',
         ruleset: ['[Gen 8] PU'],
         banlist: [
-            'PU', 'Arctovish', 'Aurorus', 'Basculin', 'Centiskorch', 'Drampa', 'Exeggutor-Alola', 'Gallade', 'Haunter', 'Magmortar', 'Magneton', 'Malamar',
-            'Omastar', 'Rotom-Frost', 'Turtonator', 'Vanilluxe', 'Vikavolt', 'Silvally-Dragon', 'Silvally-Ground', 'Sneasel', 'Damp Rock', 'Grassy Seed',
+            'PU', 'Arctovish', 'Aurorus', 'Basculin', 'Centiskorch', 'Drampa', 'Exeggutor-Alola', 'Gallade', 'Haunter', 'Magmortar', 'Magneton',
+            'Malamar', 'Ninjask', 'Omastar', 'Rotom-Frost', 'Turtonator', 'Vanilluxe', 'Vikavolt', 'Silvally-Dragon', 'Silvally-Ground', 'Sneasel',
+            'Damp Rock', 'Grassy Seed',
         ],
     },
     {
@@ -233,8 +234,8 @@ exports.Formats = [
         banlist: [
             // LC OU
             'Abra', 'Carvanha', 'Diglett-Base', 'Dwebble', 'Ferroseed', 'Foongus', 'Frillish', 'Grookey', 'Koffing',
-            'Larvesta', 'Magby', 'Magnemite', 'Mareanie', 'Mienfoo', 'Mudbray', 'Munchlax', 'Natu', 'Onix', 'Pawniard',
-            'Ponyta', 'Ponyta-Galar', 'Porygon', 'Slowpoke-Base', 'Staryu', 'Timburr', 'Trapinch', 'Tyrunt',
+            'Larvesta', 'Magby', 'Magnemite', 'Mareanie', 'Mienfoo', 'Mudbray', 'Natu', 'Onix', 'Pawniard',
+            'Ponyta-Base', 'Porygon', 'Slowpoke-Base', 'Staryu', 'Timburr', 'Trapinch', 'Tyrunt',
             // LC UUBL
             'Archen', 'Farfetch\u2019d-Galar', 'Scorbunny', 'Shellder', 'Wingull',
         ],
@@ -269,12 +270,14 @@ exports.Formats = [
         restricted: ['Restricted Legendary'],
     },
     {
-        name: "[Gen 8] Single Battle Cup",
+        name: "[Gen 8] I Choose 'Chu!",
         threads: [
-            `&bullet; <a href="https://www.pokemon.com/us/pokemon-news/register-now-for-the-single-battle-cup-competition/">Single Battle Cup</a>`,
+            `&bullet; <a href="https://www.smogon.com/forums/threads/3705481/">I Choose 'Chu! Discussion</a>`,
         ],
         mod: 'gen8',
         ruleset: ['Flat Rules', '!! Adjust Level = 50', 'Min Source Gen = 8'],
+        banlist: ['All Pokemon', 'Raichu-Alola + Sing'],
+        unbanlist: ['Pichu', 'Pikachu', 'Raichu'],
     },
     {
         name: "[Gen 8] Custom Game",
@@ -379,10 +382,10 @@ exports.Formats = [
             'Standard Doubles', 'Accuracy Moves Clause', 'Dynamax Clause', 'Sleep Clause Mod',
         ],
         banlist: [
-            'Calyrex-Ice', 'Calyrex-Shadow', 'Dialga', 'Eternatus', 'Giratina', 'Giratina-Origin', 'Groudon', 'Ho-Oh', 'Jirachi', 'Kyogre', 'Kyurem-White',
-            'Lugia', 'Lunala', 'Magearna', 'Marshadow', 'Melmetal', 'Mewtwo', 'Necrozma-Dawn-Wings', 'Necrozma-Dusk-Mane', 'Palkia', 'Rayquaza', 'Reshiram',
-            'Solgaleo', 'Tornadus-Base', 'Urshifu-Base', 'Urshifu-Rapid-Strike', 'Whimsicott', 'Xerneas', 'Yveltal', 'Zacian', 'Zacian-Crowned', 'Zamazenta',
-            'Zamazenta-Crowned', 'Zekrom', 'Moody', 'Power Construct', 'Focus Sash', 'Ally Switch', 'Final Gambit', 'Perish Song', 'Swagger',
+            'Calyrex-Ice', 'Calyrex-Shadow', 'Cottonee', 'Dialga', 'Eternatus', 'Giratina', 'Giratina-Origin', 'Groudon', 'Ho-Oh', 'Jirachi', 'Kyogre',
+            'Kyurem-White', 'Lugia', 'Lunala', 'Magearna', 'Marshadow', 'Melmetal', 'Mewtwo', 'Necrozma-Dawn-Wings', 'Necrozma-Dusk-Mane', 'Palkia', 'Rayquaza',
+            'Reshiram', 'Solgaleo', 'Tornadus-Base', 'Urshifu-Base', 'Urshifu-Rapid-Strike', 'Whimsicott', 'Xerneas', 'Yveltal', 'Zacian', 'Zacian-Crowned',
+            'Zamazenta', 'Zamazenta-Crowned', 'Zekrom', 'Moody', 'Power Construct', 'Focus Sash', 'Ally Switch', 'Final Gambit', 'Perish Song', 'Swagger',
         ],
     },
     {
@@ -578,36 +581,42 @@ exports.Formats = [
         column: 2,
     },
     {
-        name: "[Gen 8] Tier Shift",
-        desc: `Pok&eacute;mon get a +10 boost to each stat, barring HP, per tier below OU they are in.`,
+        name: "[Gen 8] Re-Evolution",
+        desc: `Pok&eacute;mon gain the stat changes they would gain from evolving again.`,
         threads: [
-            `&bullet; <a href="https://www.smogon.com/forums/threads/3662165/">Tier Shift</a>`,
+            `&bullet; <a href="https://www.smogon.com/forums/threads/3703643/">Re-Evolution</a>`,
         ],
         mod: 'gen8',
-        ruleset: ['Standard', 'Tier Shift Mod', 'Dynamax Clause'],
+        ruleset: ['Standard', 'Re-Evolution Mod', 'Evasion Abilities Clause', 'Dynamax Clause'],
         banlist: [
-            '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',
+            'Darmanitan-Galar', 'Gyarados', 'Lunala', 'Milotic', 'Naganadel', 'Solgaleo', 'Urshifu-Base', 'Volcarona',
+            'Zacian-Crowned', 'Arena Trap', 'Moody', 'Shadow Tag', 'Bright Powder', 'King\'s Rock', 'Lax Incense', 'Baton Pass',
         ],
     },
     {
-        name: "[Gen 8] Inverse",
-        desc: `Weaknesses become resistances, while resistances and immunities become weaknesses.`,
+        name: "[Gen 8] Category Swap",
+        desc: `All physical moves become special, and all special moves become physical.`,
         threads: [
-            `&bullet; <a href="https://www.smogon.com/forums/threads/3666858/">Inverse</a>`,
+            `&bullet; <a href="https://www.smogon.com/forums/threads/3702709/">Category Swap</a>`,
         ],
         mod: 'gen8',
-        ruleset: ['Standard', 'Inverse Mod', 'Dynamax Clause'],
+        ruleset: ['Standard', 'Dynamax Clause'],
         banlist: [
-            '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',
+            'Calyrex-Ice', 'Calyrex-Shadow', 'Darmanitan-Galar', 'Dialga', 'Dracovish', 'Eternatus', 'Genesect', 'Giratina', 'Giratina-Origin', 'Groudon',
+            'Ho-Oh', 'Kyogre', 'Kyurem', 'Kyurem-Black', 'Kyurem-White', 'Landorus-Base', 'Lugia', 'Lunala', 'Mewtwo', 'Necrozma-Dawn-Wings', 'Necrozma-Dusk-Mane',
+            'Palkia', 'Pheromosa', 'Rayquaza', 'Reshiram', 'Solgaleo', 'Xerneas', 'Yveltal', 'Zacian', 'Zacian-Crowned', 'Zamazenta', 'Zamazenta-Crowned',
+            'Zekrom', 'Arena Trap', 'Moody', 'Power Construct', 'Shadow Tag', 'King\'s Rock', 'Baton Pass', 'Draco Meteor', 'Overheat',
         ],
+        onModifyMove(move) {
+            if (move.category === 'Status')
+                return;
+            if (move.category === 'Special') {
+                move.category = 'Physical';
+            }
+            else {
+                move.category = 'Special';
+            }
+        },
     },
     // Other Metagames
     ///////////////////////////////////////////////////////////////////
@@ -628,8 +637,8 @@ exports.Formats = [
             'Calyrex-Shadow', 'Cramorant-Gorging', 'Darmanitan-Galar-Zen', 'Eternatus-Eternamax', 'Shedinja', 'Zacian-Crowned',
             'Arena Trap', 'Contrary', 'Gorilla Tactics', 'Huge Power', 'Illusion', 'Innards Out', 'Intrepid Sword', 'Libero',
             'Magnet Pull', 'Moody', 'Neutralizing Gas', 'Parental Bond', 'Protean', 'Pure Power', 'Shadow Tag', 'Stakeout',
-            'Water Bubble', 'Wonder Guard', 'Comatose + Sleep Talk', 'Rusted Sword', 'Court Change', 'Bolt Beak', 'Double Iron Bash',
-            'Octolock', 'Shell Smash',
+            'Water Bubble', 'Wonder Guard', 'Comatose + Sleep Talk', 'Rusted Sword', 'Belly Drum', 'Bolt Beak', 'Court Change',
+            'Double Iron Bash', 'Octolock', 'Shell Smash',
         ],
     },
     {
@@ -740,9 +749,9 @@ exports.Formats = [
             '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', 'Thunderous Kick', 'V-create',
-            'Wicked Blow',
+            'Acupressure', 'Astral Barrage', 'Belly Drum', 'Bolt Beak', 'Clangorous Soul', 'Double Iron Bash', 'Electrify', 'Extreme Speed', 'Final Gambit',
+            'Fishious Rend', 'Geomancy', 'Glacial Lance', 'Oblivion Wing', 'Precipice Blades', 'Shell Smash', 'Shift Gear', 'Thousand Arrows', 'Thunderous Kick',
+            'V-create', 'Wicked Blow',
         ],
     },
     {
@@ -768,8 +777,8 @@ exports.Formats = [
         mod: 'gen8',
         ruleset: ['Standard', 'Dynamax Clause', 'Sleep Moves Clause'],
         banlist: [
-            'Blissey', 'Calyrex-Shadow', 'Chansey', 'Crawdaunt', 'Dragapult', 'Eternatus', 'Hawlucha', 'Marowak-Alola', 'Melmetal',
-            'Pikachu', 'Toxapex', 'Xerneas', 'Zacian', 'Zacian-Crowned', 'Uber > 1', 'AG ++ Uber > 1', 'Arena Trap', 'Huge Power',
+            'Blissey', 'Calyrex-Shadow', 'Chansey', 'Crawdaunt', 'Dragapult', 'Eternatus', 'Hawlucha', 'Marowak-Alola', 'Melmetal', 'Nidoking',
+            'Nidoqueen', 'Pikachu', 'Toxapex', 'Xerneas', 'Zacian', 'Zacian-Crowned', 'Uber > 1', 'AG ++ Uber > 1', 'Arena Trap', 'Huge Power',
             'Moody', 'Pure Power', 'Shadow Tag', 'Swift Swim', 'Bright Powder', 'Focus Band', 'King\'s Rock', 'Lax Incense', 'Quick Claw',
             'Baton Pass',
         ],
@@ -929,7 +938,7 @@ exports.Formats = [
         ],
         mod: 'gen8bdsp',
         ruleset: ['Little Cup', 'Standard'],
-        banlist: ['Gligar', 'Meditite', 'Misdreavus', 'Murkrow', 'Scyther', 'Sneasel', 'Tangela', 'Vulpix', 'Yanma', 'Moody', 'Baton Pass', 'Sticky Web'],
+        banlist: ['Gligar', 'Meditite', 'Misdreavus', 'Munchlax', 'Murkrow', 'Scyther', 'Sneasel', 'Tangela', 'Vulpix', 'Yanma', 'Moody', 'Baton Pass', 'Sticky Web'],
     },
     {
         name: "[Gen 8 BDSP] Monotype",
@@ -976,16 +985,6 @@ exports.Formats = [
         gameType: 'doubles',
         ruleset: ['Flat Rules', 'Min Source Gen = 8'],
     },
-    {
-        name: "[Gen 8 BDSP] Pure Hackmons",
-        desc: `Anything that can be hacked in-game and is usable in local battles is allowed.`,
-        threads: [
-            `&bullet; <a href="https://www.smogon.com/forums/threads/3693868/">Pure Hackmons</a>`,
-        ],
-        mod: 'gen8bdsp',
-        searchShow: false,
-        ruleset: ['-Nonexistent', 'Team Preview', 'HP Percentage Mod', 'Cancel Mod', 'Endless Battle Clause'],
-    },
     {
         section: "Challengeable OMs",
         column: 2,
@@ -1165,15 +1164,16 @@ exports.Formats = [
         ],
         mod: 'gen8',
         searchShow: false,
-        ruleset: ['Standard', '2 Ability Clause', 'Dynamax Clause'],
+        ruleset: ['Standard', '!Sleep Clause Mod', 'Sleep Moves Clause', '2 Ability Clause', 'Dynamax Clause'],
         banlist: [
-            'Blacephalon', 'Blaziken', 'Butterfree', 'Calyrex-Ice', 'Calyrex-Shadow', 'Chansey', 'Combusken', 'Cresselia', 'Darmanitan-Galar', 'Dialga', 'Dracovish',
-            'Eternatus', 'Giratina', 'Giratina-Origin', 'Groudon', 'Ho-Oh', 'Kartana', 'Kyogre', 'Kyurem-Black', 'Kyurem-White', 'Landorus-Base', 'Lugia', 'Lunala',
-            'Magearna', 'Marshadow', 'Melmetal', 'Mewtwo', 'Natu', 'Necrozma-Dawn-Wings', 'Necrozma-Dusk-Mane', 'Palkia', 'Pheromosa', 'Rayquaza', 'Regieleki',
-            'Regigigas', 'Reshiram', 'Sableye', 'Shedinja', 'Solgaleo', 'Spectrier', 'Tapu Koko', 'Toxtricity', 'Torkoal', 'Urshifu-Base', 'Xatu', 'Xerneas', 'Yveltal',
-            'Zacian', 'Zacian-Crowned', 'Zamazenta', 'Zamazenta-Crowned', 'Zeraora', 'Zekrom', 'Arena Trap', 'Contrary', 'Drizzle', 'Huge Power', 'Imposter', 'Innards Out',
-            'Libero', 'Moody', 'Power Construct', 'Pure Power', 'Quick Draw', 'Shadow Tag', 'Sheer Force', 'Simple', 'Unaware', 'Unburden', 'Water Bubble', 'King\'s Rock',
-            'Quick Claw', 'Baton Pass', 'Bolt Beak', 'Fishious Rend', 'Shell Smash', 'Thousand Arrows',
+            'Blacephalon', 'Blaziken', 'Butterfree', 'Calyrex-Ice', 'Calyrex-Shadow', 'Chansey', 'Combusken', 'Cresselia', 'Darmanitan-Galar', 'Dialga',
+            'Dracovish', 'Eternatus', 'Giratina', 'Giratina-Origin', 'Groudon', 'Ho-Oh', 'Kartana', 'Kyogre', 'Kyurem-Black', 'Kyurem-White', 'Lugia',
+            'Lunala', 'Magearna', 'Marshadow', 'Melmetal', 'Mewtwo', 'Natu', 'Necrozma-Dawn-Wings', 'Necrozma-Dusk-Mane', 'Palkia', 'Pheromosa', 'Rayquaza',
+            'Regieleki', 'Regigigas', 'Reshiram', 'Sableye', 'Shedinja', 'Solgaleo', 'Spectrier', 'Tapu Koko', 'Toxtricity', 'Torkoal', 'Urshifu-Base',
+            'Xatu', 'Xerneas', 'Yveltal', 'Zacian', 'Zacian-Crowned', 'Zamazenta', 'Zamazenta-Crowned', 'Zeraora', 'Zekrom', 'Arena Trap', 'Contrary',
+            'Drizzle', 'Huge Power', 'Imposter', 'Innards Out', 'Libero', 'Moody', 'Power Construct', 'Pure Power', 'Quick Draw', 'Shadow Tag', 'Sheer Force',
+            'Simple', 'Unaware', 'Unburden', 'Water Bubble', 'King\'s Rock', 'Quick Claw', 'Baton Pass', 'Bolt Beak', 'Fishious Rend', 'Shell Smash',
+            'Thousand Arrows',
         ],
         getEvoFamily(speciesid) {
             let species = Dex.species.get(speciesid);
@@ -1710,6 +1710,16 @@ exports.Formats = [
             pokemon.m.innates = undefined;
         },
     },
+    {
+        name: "[Gen 8] Pure Hackmons",
+        desc: `Anything that can be hacked in-game and is usable in local battles is allowed.`,
+        threads: [
+            `&bullet; <a href="https://www.smogon.com/forums/threads/3656851/">Pure Hackmons</a>`,
+        ],
+        mod: 'gen8',
+        searchShow: false,
+        ruleset: ['-Nonexistent', 'Team Preview', 'HP Percentage Mod', 'Cancel Mod', 'Endless Battle Clause'],
+    },
     {
         name: "[Gen 8] Shared Power",
         desc: `Once a Pok&eacute;mon switches in, its ability is shared with the rest of the team.`,
@@ -2326,35 +2336,36 @@ exports.Formats = [
         column: 3,
     },
     {
-        name: "[Gen 7] UU",
+        name: "[Gen 3] Ubers",
         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/posts/8286280/">ADV Ubers</a>`,
         ],
-        mod: 'gen7',
+        mod: 'gen3',
         // searchShow: false,
-        ruleset: ['[Gen 7] OU'],
-        banlist: ['OU', 'UUBL', 'Drizzle', 'Drought', 'Kommonium Z', 'Mewnium Z'],
+        ruleset: ['Standard', 'Deoxys Camouflage Clause', 'One Baton Pass Clause'],
+        banlist: ['Wobbuffet + Leftovers'],
     },
     {
-        name: "[Gen 6] ZU",
+        name: "[Gen 5] RU",
         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>`,
+            `&bullet; <a href="https://www.smogon.com/forums/posts/6431094/">BW2 Sample Teams</a>`,
+            `&bullet; <a href="https://www.smogon.com/forums/threads/3473124/">BW2 RU Viability Rankings</a>`,
         ],
-        mod: 'gen6',
+        mod: 'gen5',
         // searchShow: false,
-        ruleset: ['[Gen 6] PU'],
-        banlist: ['PU', 'Fraxure', 'Regigigas', 'Simisear'],
+        ruleset: ['[Gen 5] UU', 'Baton Pass Clause', '!Sleep Clause Mod', 'Sleep Moves Clause'],
+        banlist: ['UU', 'RUBL', 'Shadow Tag', 'Shell Smash + Baton Pass'],
+        unbanlist: ['Prankster + Assist', 'Prankster + Copycat', 'Baton Pass'],
     },
     {
-        name: "[Gen 1] Ubers",
+        name: "[Gen 7 Let's Go] UU",
         threads: [
-            `&bullet; <a href="https://www.smogon.com/forums/posts/8286283/">RBY Ubers</a>`,
+            `&bullet; <a href="https://www.smogon.com/forums/threads/3659882/">LGPE UU Metagame Discussion &amp; Resources</a>`,
         ],
-        mod: 'gen1',
+        mod: 'gen7letsgo',
         // searchShow: false,
-        ruleset: ['Standard'],
+        ruleset: ['[Gen 7 Let\'s Go] OU'],
+        banlist: ['OU', 'UUBL'],
     },
     // Past Gens OU
     ///////////////////////////////////////////////////////////////////
@@ -2391,7 +2402,7 @@ exports.Formats = [
             `&bullet; <a href="https://www.smogon.com/forums/threads/3668699/">BW2 OU Viability Rankings</a>`,
         ],
         mod: 'gen5',
-        ruleset: ['Standard', 'Evasion Abilities Clause', 'Sleep Moves Clause', 'Swagger Clause'],
+        ruleset: ['Standard', 'Evasion Abilities Clause', 'Sleep Moves Clause', 'Swagger Clause', 'Gems Clause'],
         banlist: ['Uber', 'Arena Trap', 'Drizzle ++ Swift Swim', 'Drought ++ Chlorophyll', 'Sand Rush', 'Shadow Tag', 'King\'s Rock', 'Razor Fang', 'Soul Dew', 'Assist', 'Baton Pass'],
     },
     {
@@ -2402,7 +2413,7 @@ exports.Formats = [
             `&bullet; <a href="https://www.smogon.com/forums/threads/3683332/">DPP OU Viability Rankings</a>`,
         ],
         mod: 'gen4',
-        ruleset: ['Standard'],
+        ruleset: ['Standard', 'Freeze Clause Mod'],
         banlist: ['AG', 'Uber', 'Arena Trap', 'Sand Veil', 'Swinub + Snow Cloak', 'Piloswine + Snow Cloak', 'Mamoswine + Snow Cloak', 'Soul Dew', 'Baton Pass', 'Swagger'],
     },
     {
@@ -2412,7 +2423,7 @@ exports.Formats = [
             `&bullet; <a href="https://www.smogon.com/forums/threads/3503019/">ADV OU Viability Rankings</a>`,
         ],
         mod: 'gen3',
-        ruleset: ['Standard', 'One Boost Passer Clause'],
+        ruleset: ['Standard', 'One Boost Passer Clause', 'Freeze Clause Mod'],
         banlist: ['Uber', 'Sand Veil', 'Soundproof', 'Assist', 'Baton Pass + Block', 'Baton Pass + Mean Look', 'Baton Pass + Spider Web', 'Smeargle + Ingrain'],
     },
     {
@@ -2423,7 +2434,7 @@ exports.Formats = [
         ],
         mod: 'gen2',
         ruleset: ['Standard'],
-        banlist: ['Uber'],
+        banlist: ['Uber', 'Mean Look + Baton Pass', 'Spider Web + Baton Pass'],
     },
     {
         name: "[Gen 1] OU",
@@ -2573,6 +2584,17 @@ exports.Formats = [
         ruleset: ['Standard', 'Mega Rayquaza Clause'],
         banlist: ['Baton Pass'],
     },
+    {
+        name: "[Gen 7] UU",
+        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>`,
+        ],
+        mod: 'gen7',
+        searchShow: false,
+        ruleset: ['[Gen 7] OU'],
+        banlist: ['OU', 'UUBL', 'Drizzle', 'Drought', 'Kommonium Z', 'Mewnium Z'],
+    },
     {
         name: "[Gen 7] RU",
         threads: [
@@ -2657,7 +2679,7 @@ exports.Formats = [
             'Arceus', 'Darkrai', 'Deoxys-Base', 'Deoxys-Attack', 'Deoxys-Defense', 'Dialga', 'Giratina', 'Giratina-Origin', 'Groudon', 'Ho-Oh', 'Kangaskhan-Mega',
             'Kyogre', 'Kyurem-Black', 'Kyurem-White', 'Lugia', 'Lunala', 'Marshadow', 'Mewtwo', 'Mimikyu', 'Necrozma-Dawn-Wings', 'Necrozma-Dusk-Mane',
             'Palkia', 'Rayquaza', 'Reshiram', 'Salamence-Mega', 'Shaymin-Sky', 'Snorlax', 'Solgaleo', 'Tapu Koko', 'Xerneas', 'Yveltal', 'Zekrom',
-            'Moody', 'Focus Sash', 'Perish Song', 'Detect + Fightinium Z',
+            'Moody', 'Focus Sash', 'Grass Whistle', 'Hypnosis', 'Perish Song', 'Sing', 'Detect + Fightinium Z',
         ],
     },
     {
@@ -2960,6 +2982,17 @@ 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: [
@@ -2970,7 +3003,7 @@ exports.Formats = [
         mod: 'gen6',
         searchShow: false,
         ruleset: ['[Gen 6] OU', '+CAP'],
-        banlist: ['Aurumoth', 'Cawmodore', 'Crucibelle-Mega'],
+        banlist: ['Aurumoth', 'Cawmodore'],
     },
     {
         name: "[Gen 6] Battle Spot Singles",
@@ -3117,18 +3150,6 @@ exports.Formats = [
         ruleset: ['Standard', 'Evasion Abilities Clause', 'Swagger Clause', 'Sleep Clause Mod'],
         banlist: ['Uber', 'OU', 'UUBL', 'Arena Trap', 'Drought', 'Sand Stream', 'Snow Warning', 'Prankster + Assist', 'Prankster + Copycat', 'Baton Pass'],
     },
-    {
-        name: "[Gen 5] RU",
-        threads: [
-            `&bullet; <a href="https://www.smogon.com/forums/posts/6431094/">BW2 Sample Teams</a>`,
-            `&bullet; <a href="https://www.smogon.com/forums/threads/3473124/">BW2 RU Viability Rankings</a>`,
-        ],
-        mod: 'gen5',
-        searchShow: false,
-        ruleset: ['[Gen 5] UU', 'Baton Pass Clause', '!Sleep Clause Mod', 'Sleep Moves Clause'],
-        banlist: ['UU', 'RUBL', 'Shadow Tag', 'Shell Smash + Baton Pass'],
-        unbanlist: ['Prankster + Assist', 'Prankster + Copycat', 'Baton Pass'],
-    },
     {
         name: "[Gen 5] NU",
         threads: [
@@ -3148,7 +3169,7 @@ exports.Formats = [
         mod: 'gen5',
         searchShow: false,
         ruleset: ['[Gen 5] NU', 'Sleep Moves Clause'],
-        banlist: ['NU', 'PUBL'],
+        banlist: ['NU', 'PUBL', 'Damp Rock'],
     },
     {
         name: "[Gen 5] LC",
@@ -3172,7 +3193,7 @@ exports.Formats = [
         ],
         mod: 'gen5',
         searchShow: false,
-        ruleset: ['[Gen 5] OU', 'Same Type Clause'],
+        ruleset: ['[Gen 5] OU', 'Same Type Clause', '!Gems Clause'],
     },
     {
         name: "[Gen 5] 1v1",
@@ -3198,6 +3219,7 @@ exports.Formats = [
         searchShow: false,
         ruleset: ['[Gen 5] PU'],
         banlist: ['PU', 'Articuno', 'Dragonair', 'Glalie', 'Machoke', 'Marowak', 'Omanyte', 'Regigigas', 'Trubbish', 'Whirlipede', 'Baton Pass'],
+        unbanlist: ['Damp Rock'],
     },
     {
         name: "[Gen 5] GBU Singles",
@@ -3302,7 +3324,7 @@ exports.Formats = [
         ],
         mod: 'gen4',
         searchShow: false,
-        ruleset: ['[Gen 4] OU'],
+        ruleset: ['[Gen 4] OU', '!Freeze Clause Mod'],
         banlist: ['OU', 'UUBL'],
         unbanlist: ['Arena Trap', 'Swagger'],
     },
@@ -3364,7 +3386,7 @@ exports.Formats = [
         searchShow: false,
         ruleset: [
             'Picked Team Size = 1', 'Max Team Size = 3',
-            '[Gen 4] OU', 'Accuracy Moves Clause', 'Sleep Moves Clause', 'Team Preview',
+            '[Gen 4] OU', 'Accuracy Moves Clause', 'Sleep Moves Clause', 'Team Preview', '!Freeze Clause Mod',
         ],
         banlist: ['Latias', 'Machamp', 'Porygon-Z', 'Shaymin', 'Snorlax', 'Togekiss', 'Focus Sash', 'Destiny Bond', 'Explosion', 'Perish Song', 'Self-Destruct'],
         unbanlist: ['Wobbuffet', 'Wynaut', 'Sand Veil', 'Swagger'],
@@ -3379,7 +3401,7 @@ exports.Formats = [
         ruleset: ['[Gen 4] PU'],
         banlist: [
             'Ampharos', 'Armaldo', 'Bellossom', 'Dragonair', 'Electabuzz', 'Gabite', 'Gastrodon', 'Glaceon', 'Glalie',
-            'Golduck', 'Gorebyss', 'Hippopotas', 'Kadabra', 'Machoke', 'Magmar', 'Mantine', 'Marowak', 'Metang',
+            'Golduck', 'Gorebyss', 'Hippopotas', 'Kadabra', 'Lapras', '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',
@@ -3406,7 +3428,7 @@ exports.Formats = [
         mod: 'gen4',
         gameType: 'doubles',
         searchShow: false,
-        ruleset: ['[Gen 4] OU'],
+        ruleset: ['[Gen 4] OU', '!Freeze Clause Mod'],
         banlist: ['Explosion'],
         unbanlist: ['Garchomp', 'Latias', 'Latios', 'Manaphy', 'Mew', 'Salamence', 'Wobbuffet', 'Wynaut', 'Swagger'],
     },
@@ -3443,16 +3465,6 @@ exports.Formats = [
         section: "Past Generations",
         column: 5,
     },
-    {
-        name: "[Gen 3] Ubers",
-        threads: [
-            `&bullet; <a href="https://www.smogon.com/forums/posts/8286280/">ADV Ubers</a>`,
-        ],
-        mod: 'gen3',
-        searchShow: false,
-        ruleset: ['Standard', 'Deoxys Camouflage Clause', 'One Baton Pass Clause'],
-        banlist: ['Wobbuffet + Leftovers'],
-    },
     {
         name: "[Gen 3] UU",
         threads: [
@@ -3461,9 +3473,8 @@ exports.Formats = [
         ],
         mod: 'gen3',
         searchShow: false,
-        ruleset: ['Standard', 'NFE Clause'],
-        banlist: ['Uber', 'OU', 'UUBL', 'Smeargle + Ingrain', 'Baton Pass'],
-        unbanlist: ['Scyther'],
+        ruleset: ['Standard'],
+        banlist: ['Uber', 'OU', 'UUBL', 'Smeargle + Ingrain', 'Arena Trap', 'Bright Powder', 'Lax Incense', 'Baton Pass', 'Swagger'],
     },
     {
         name: "[Gen 3] NU",
@@ -3472,21 +3483,8 @@ exports.Formats = [
         ],
         mod: 'gen3',
         searchShow: false,
-        ruleset: ['[Gen 3] UU', '!NFE Clause'],
-        banlist: ['UU'],
-        unbanlist: ['Baton Pass'],
-    },
-    {
-        name: "[Gen 3] Doubles OU",
-        threads: [
-            `&bullet; <a href="https://www.smogon.com/forums/threads/3666831/">ADV Doubles OU</a>`,
-        ],
-        mod: 'gen3',
-        searchShow: false,
-        gameType: 'doubles',
-        ruleset: ['Standard', '!Sleep Clause Mod', '!Switch Priority Clause Mod'],
-        banlist: ['Uber'],
-        unbanlist: ['Deoxys-Speed', 'Wobbuffet', 'Wynaut'],
+        ruleset: ['Standard'],
+        banlist: ['Uber', 'OU', 'UUBL', 'UU', 'Smeargle + Ingrain'],
     },
     {
         name: "[Gen 3] 1v1",
@@ -3498,11 +3496,26 @@ exports.Formats = [
         searchShow: false,
         ruleset: [
             'Picked Team Size = 1', 'Max Team Size = 3',
-            '[Gen 3] OU', 'Accuracy Moves Clause', 'Sleep Moves Clause', 'Team Preview',
+            '[Gen 3] OU', 'Accuracy Moves Clause', 'Sleep Moves Clause', 'Team Preview', '!Freeze Clause Mod',
+        ],
+        banlist: [
+            'Clefable', 'Slaking', 'Snorlax', 'Suicune', 'Zapdos', 'Destiny Bond', 'Explosion', 'Ingrain', 'Perish Song',
+            'Self-Destruct', 'Bright Powder', 'Focus Band', 'King\'s Rock', 'Lax Incense', 'Quick Claw',
         ],
-        banlist: ['Clefable', 'Slaking', 'Snorlax', 'Suicune', 'Destiny Bond', 'Explosion', 'Ingrain', 'Perish Song', 'Self-Destruct', 'Bright Powder', 'Focus Band', 'King\'s Rock', 'Lax Incense', 'Quick Claw'],
         unbanlist: ['Mr. Mime', 'Wobbuffet', 'Wynaut', 'Sand Veil'],
     },
+    {
+        name: "[Gen 3] Doubles OU",
+        threads: [
+            `&bullet; <a href="https://www.smogon.com/forums/threads/3666831/">ADV Doubles OU</a>`,
+        ],
+        mod: 'gen3',
+        searchShow: false,
+        gameType: 'doubles',
+        ruleset: ['Standard', '!Sleep Clause Mod', '!Switch Priority Clause Mod'],
+        banlist: ['Uber'],
+        unbanlist: ['Deoxys-Speed', 'Wobbuffet', 'Wynaut'],
+    },
     {
         name: "[Gen 3] Custom Game",
         mod: 'gen3',
@@ -3535,6 +3548,7 @@ exports.Formats = [
         searchShow: false,
         ruleset: ['[Gen 2] OU'],
         banlist: ['OU', 'UUBL'],
+        unbanlist: ['Mean Look + Baton Pass', 'Spider Web + Baton Pass'],
     },
     {
         name: "[Gen 2] NU",
@@ -3590,6 +3604,15 @@ 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: [
@@ -3598,7 +3621,7 @@ exports.Formats = [
         ],
         mod: 'gen1',
         searchShow: false,
-        ruleset: ['[Gen 1] OU'],
+        ruleset: ['[Gen 1] OU', 'APT Clause'],
         banlist: ['OU', 'UUBL'],
     },
     {
@@ -3608,7 +3631,7 @@ exports.Formats = [
         ],
         mod: 'gen1',
         searchShow: false,
-        ruleset: ['[Gen 1] UU'],
+        ruleset: ['[Gen 1] UU', '!APT Clause'],
         banlist: ['UU', 'NUBL'],
     },
     {