npm - @pkmn/mods - Versions diffs - 0.5.3 → 0.5.7 - Mend

@pkmn/mods 0.5.3 → 0.5.7

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (10) hide show

package/build/gen7letsgo/formats-data.js +94 -94
package/build/gen7letsgo/formats-data.js.map +1 -1
package/build/gen8bdsp/formats-data.js +448 -448
package/build/gen8bdsp/formats-data.js.map +1 -1
package/build/gen8bdsp/learnsets.js +1 -0
package/build/gen8bdsp/learnsets.js.map +1 -1
package/package.json +4 -4
package/src/gen7letsgo/formats-data.ts +94 -94
package/src/gen8bdsp/formats-data.ts +448 -448
package/src/gen8bdsp/learnsets.ts +1 -0

package/build/gen8bdsp/formats-data.js CHANGED Viewed

@@ -12,7 +12,7 @@ exports.FormatsData = {
     venusaur: {
         tier: "RU",
         doublesTier: "DUU",
-        randomBattleMoves: ["sludgebomb", "gigadrain", "sleeppowder", "leechseed", "substitute"],
+        randomBattleMoves: ["gigadrain", "leechseed", "sleeppowder", "sludgebomb", "substitute"],
     },
     charmander: {
         tier: "LC",
@@ -21,9 +21,9 @@ exports.FormatsData = {
         tier: "NFE",
     },
     charizard: {
-        tier: "RU",
+        tier: "NU",
         doublesTier: "DUU",
-        randomBattleMoves: ["fireblast", "airslash", "roost", "focusblast", "earthquake"],
+        randomBattleMoves: ["airslash", "earthquake", "fireblast", "focusblast", "roost"],
     },
     squirtle: {
         tier: "LC",
@@ -43,9 +43,9 @@ exports.FormatsData = {
         tier: "NFE",
     },
     butterfree: {
-        tier: "RU",
+        tier: "NU",
         doublesTier: "DUU",
-        randomBattleMoves: ["quiverdance", "bugbuzz", "airslash", "sleeppowder", "gigadrain"],
+        randomBattleMoves: ["airslash", "bugbuzz", "gigadrain", "quiverdance", "sleeppowder"],
     },
     weedle: {
         tier: "LC",
@@ -54,9 +54,9 @@ exports.FormatsData = {
         tier: "NFE",
     },
     beedrill: {
-        tier: "RU",
+        tier: "NU",
         doublesTier: "DUU",
-        randomBattleMoves: ["toxicspikes", "uturn", "poisonjab", "protect"],
+        randomBattleMoves: ["poisonjab", "protect", "toxicspikes", "uturn"],
     },
     beedrillmega: {
         isNonstandard: "Past",
@@ -69,9 +69,9 @@ exports.FormatsData = {
         tier: "NFE",
     },
     pidgeot: {
-        tier: "RU",
+        tier: "NU",
         doublesTier: "DUU",
-        randomBattleMoves: ["bravebird", "uturn", "steelwing", "roost", "quickattack", "defog"],
+        randomBattleMoves: ["bravebird", "defog", "quickattack", "roost", "steelwing", "uturn"],
     },
     pidgeotmega: {
         isNonstandard: "Past",
@@ -81,45 +81,45 @@ exports.FormatsData = {
         tier: "LC",
     },
     raticate: {
-        tier: "RU",
+        tier: "NU",
         doublesTier: "DUU",
-        randomBattleMoves: ["facade", "swordsdance", "protect", "crunch", "suckerpunch", "flamewheel"],
+        randomBattleMoves: ["crunch", "facade", "flamewheel", "protect", "suckerpunch", "swordsdance"],
     },
     spearow: {
         tier: "LC",
     },
     fearow: {
-        tier: "RU",
+        tier: "NU",
         doublesTier: "DUU",
-        randomBattleMoves: ["drillpeck", "drillrun", "uturn", "gigaimpact"],
+        randomBattleMoves: ["drillpeck", "drillrun", "gigaimpact", "uturn"],
     },
     ekans: {
         tier: "LC",
     },
     arbok: {
-        tier: "RU",
+        tier: "NU",
         doublesTier: "DUU",
-        randomBattleMoves: ["gunkshot", "glare", "earthquake", "suckerpunch"],
+        randomBattleMoves: ["earthquake", "glare", "gunkshot", "suckerpunch"],
     },
     pichu: {
         tier: "LC",
     },
     pikachu: {
         tier: "NFE",
-        randomBattleMoves: ["volttackle", "grassknot", "voltswitch", "surf"],
+        randomBattleMoves: ["grassknot", "surf", "voltswitch", "volttackle"],
     },
     raichu: {
-        tier: "RU",
-        doublesTier: "DUU",
-        randomBattleMoves: ["nastyplot", "thunderbolt", "grassknot", "focusblast", "surf"],
+        tier: "NU",
+        doublesTier: "DOU",
+        randomBattleMoves: ["focusblast", "grassknot", "nastyplot", "surf", "thunderbolt"],
     },
     sandshrew: {
         tier: "LC",
     },
     sandslash: {
-        tier: "RU",
+        tier: "NU",
         doublesTier: "DUU",
-        randomBattleMoves: ["stealthrock", "earthquake", "rapidspin", "xscissor", "stoneedge", "swordsdance"],
+        randomBattleMoves: ["earthquake", "rapidspin", "stealthrock", "stoneedge", "swordsdance", "xscissor"],
     },
     nidoranf: {
         tier: "LC",
@@ -130,7 +130,7 @@ exports.FormatsData = {
     nidoqueen: {
         tier: "RU",
         doublesTier: "DUU",
-        randomBattleMoves: ["earthpower", "sludgewave", "stealthrock", "toxicspikes", "flamethrower", "icebeam"],
+        randomBattleMoves: ["earthpower", "flamethrower", "icebeam", "sludgewave", "stealthrock", "toxicspikes"],
     },
     nidoranm: {
         tier: "LC",
@@ -141,7 +141,7 @@ exports.FormatsData = {
     nidoking: {
         tier: "UU",
         doublesTier: "DUU",
-        randomBattleMoves: ["earthpower", "sludgewave", "flamethrower", "icebeam", "substitute"],
+        randomBattleMoves: ["earthpower", "flamethrower", "icebeam", "sludgewave", "substitute"],
     },
     cleffa: {
         tier: "LC",
@@ -152,15 +152,15 @@ exports.FormatsData = {
     clefable: {
         tier: "OU",
         doublesTier: "DUU",
-        randomBattleMoves: ["calmmind", "moonblast", "fireblast", "moonlight", "stealthrock", "thunderwave"],
+        randomBattleMoves: ["calmmind", "fireblast", "moonblast", "moonlight", "stealthrock", "thunderwave"],
     },
     vulpix: {
-        tier: "LC",
+        tier: "NFE",
     },
     ninetales: {
         tier: "RU",
         doublesTier: "DUU",
-        randomBattleMoves: ["nastyplot", "fireblast", "hypnosis", "solarbeam", "willowisp"],
+        randomBattleMoves: ["fireblast", "hypnosis", "nastyplot", "solarbeam", "willowisp"],
     },
     igglybuff: {
         tier: "LC",
@@ -169,9 +169,9 @@ exports.FormatsData = {
         tier: "NFE",
     },
     wigglytuff: {
-        tier: "RU",
+        tier: "NU",
         doublesTier: "DUU",
-        randomBattleMoves: ["stealthrock", "reflect", "lightscreen", "dazzlinggleam", "thunderwave", "fireblast"],
+        randomBattleMoves: ["dazzlinggleam", "fireblast", "lightscreen", "reflect", "stealthrock", "thunderwave"],
     },
     zubat: {
         tier: "LC",
@@ -181,8 +181,8 @@ exports.FormatsData = {
     },
     crobat: {
         tier: "UU",
-        doublesTier: "DOU",
-        randomBattleMoves: ["bravebird", "roost", "defog", "toxic", "uturn"],
+        doublesTier: "DUU",
+        randomBattleMoves: ["bravebird", "defog", "roost", "toxic", "uturn"],
     },
     oddish: {
         tier: "LC",
@@ -193,52 +193,52 @@ exports.FormatsData = {
     vileplume: {
         tier: "RU",
         doublesTier: "DUU",
-        randomBattleMoves: ["strengthsap", "aromatherapy", "sludgebomb", "sleeppowder", "gigadrain"],
+        randomBattleMoves: ["aromatherapy", "gigadrain", "sleeppowder", "sludgebomb", "strengthsap"],
     },
     bellossom: {
-        tier: "RU",
-        doublesTier: "DUU",
+        tier: "NU",
+        doublesTier: "DOU",
         randomBattleMoves: ["gigadrain", "moonblast", "quiverdance", "sleeppowder", "strengthsap"],
     },
     paras: {
         tier: "LC",
     },
     parasect: {
-        tier: "RU",
+        tier: "NU",
         doublesTier: "DUU",
-        randomBattleMoves: ["spore", "leechseed", "xscissor", "substitute"],
+        randomBattleMoves: ["leechseed", "spore", "substitute", "xscissor"],
     },
     venonat: {
         tier: "LC",
     },
     venomoth: {
-        tier: "RU",
+        tier: "RUBL",
         doublesTier: "DUU",
-        randomBattleMoves: ["quiverdance", "sludgebomb", "bugbuzz", "substitute", "sleeppowder"],
+        randomBattleMoves: ["bugbuzz", "quiverdance", "sleeppowder", "sludgebomb", "substitute"],
     },
     diglett: {
         tier: "LC",
     },
     dugtrio: {
-        tier: "RU",
+        tier: "NU",
         doublesTier: "DUU",
-        randomBattleMoves: ["earthquake", "stoneedge", "suckerpunch", "stealthrock", "aerialace"],
+        randomBattleMoves: ["aerialace", "earthquake", "stoneedge", "suckerpunch"],
     },
     meowth: {
         tier: "LC",
     },
     persian: {
-        tier: "RU",
+        tier: "NU",
         doublesTier: "DUU",
-        randomBattleMoves: ["fakeout", "slash", "uturn", "bite", "aerialace"],
+        randomBattleMoves: ["aerialace", "bite", "fakeout", "covet", "uturn"],
     },
     psyduck: {
         tier: "LC",
     },
     golduck: {
-        tier: "RU",
+        tier: "NU",
         doublesTier: "DUU",
-        randomBattleMoves: ["calmmind", "hydropump", "icebeam", "hypnosis", "focusblast", "encore"],
+        randomBattleMoves: ["calmmind", "encore", "focusblast", "hydropump", "hypnosis", "icebeam"],
     },
     mankey: {
         tier: "LC",
@@ -246,15 +246,15 @@ exports.FormatsData = {
     primeape: {
         tier: "RU",
         doublesTier: "DUU",
-        randomBattleMoves: ["closecombat", "uturn", "stoneedge", "poisonjab", "earthquake"],
+        randomBattleMoves: ["closecombat", "earthquake", "poisonjab", "stoneedge", "uturn"],
     },
     growlithe: {
         tier: "LC",
     },
     arcanine: {
-        tier: "RU",
+        tier: "UU",
         doublesTier: "DOU",
-        randomBattleMoves: ["flareblitz", "morningsun", "willowisp", "extremespeed", "closecombat"],
+        randomBattleMoves: ["closecombat", "extremespeed", "flareblitz", "morningsun", "willowisp"],
     },
     poliwag: {
         tier: "LC",
@@ -263,14 +263,14 @@ exports.FormatsData = {
         tier: "NFE",
     },
     poliwrath: {
-        tier: "RU",
+        tier: "NU",
         doublesTier: "DUU",
-        randomBattleMoves: ["waterfall", "drainpunch", "bulkup", "poisonjab", "raindance"],
+        randomBattleMoves: ["bulkup", "drainpunch", "poisonjab", "raindance", "waterfall"],
     },
     politoed: {
-        tier: "RU",
+        tier: "NU",
         doublesTier: "DOU",
-        randomBattleMoves: ["scald", "icebeam", "rest", "encore", "hypnosis"],
+        randomBattleMoves: ["encore", "hypnosis", "icebeam", "rest", "scald"],
     },
     abra: {
         tier: "LC",
@@ -281,7 +281,7 @@ exports.FormatsData = {
     alakazam: {
         tier: "OU",
         doublesTier: "DUU",
-        randomBattleMoves: ["nastyplot", "psychic", "focusblast", "shadowball", "dazzlinggleam"],
+        randomBattleMoves: ["dazzlinggleam", "focusblast", "nastyplot", "psychic", "shadowball"],
     },
     machop: {
         tier: "LC",
@@ -292,7 +292,7 @@ exports.FormatsData = {
     machamp: {
         tier: "RU",
         doublesTier: "DUU",
-        randomBattleMoves: ["dynamicpunch", "knockoff", "stoneedge", "facade", "closecombat", "bulletpunch"],
+        randomBattleMoves: ["bulletpunch", "closecombat", "dynamicpunch", "facade", "knockoff", "stoneedge"],
     },
     bellsprout: {
         tier: "LC",
@@ -301,9 +301,9 @@ exports.FormatsData = {
         tier: "NFE",
     },
     victreebel: {
-        tier: "RU",
+        tier: "NU",
         doublesTier: "DUU",
-        randomBattleMoves: ["powerwhip", "poisonjab", "knockoff", "swordsdance", "sleeppowder", "strengthsap"],
+        randomBattleMoves: ["knockoff", "poisonjab", "powerwhip", "sleeppowder", "strengthsap", "swordsdance"],
     },
     tentacool: {
         tier: "LC",
@@ -311,7 +311,7 @@ exports.FormatsData = {
     tentacruel: {
         tier: "UU",
         doublesTier: "DUU",
-        randomBattleMoves: ["scald", "rapidspin", "sludgebomb", "haze", "knockoff"],
+        randomBattleMoves: ["haze", "knockoff", "rapidspin", "scald", "sludgebomb"],
     },
     geodude: {
         tier: "LC",
@@ -320,17 +320,17 @@ exports.FormatsData = {
         tier: "NFE",
     },
     golem: {
-        tier: "RU",
+        tier: "NU",
         doublesTier: "DUU",
-        randomBattleMoves: ["stealthrock", "earthquake", "stoneedge", "explosion", "heavyslam"],
+        randomBattleMoves: ["earthquake", "explosion", "heavyslam", "stealthrock", "stoneedge"],
     },
     ponyta: {
         tier: "LC",
     },
     rapidash: {
-        tier: "RU",
+        tier: "NU",
         doublesTier: "DUU",
-        randomBattleMoves: ["flareblitz", "hypnosis", "swordsdance", "highhorsepower", "willowisp", "morningsun"],
+        randomBattleMoves: ["flareblitz", "highhorsepower", "hypnosis", "morningsun", "swordsdance", "willowisp"],
     },
     slowpoke: {
         tier: "LC",
@@ -338,12 +338,12 @@ exports.FormatsData = {
     slowbro: {
         tier: "UU",
         doublesTier: "DUU",
-        randomBattleMoves: ["scald", "psychic", "slackoff", "icebeam", "calmmind", "thunderwave"],
+        randomBattleMoves: ["calmmind", "icebeam", "psychic", "scald", "slackoff", "thunderwave"],
     },
     slowking: {
         tier: "RU",
         doublesTier: "DUU",
-        randomBattleMoves: ["psychic", "slackoff", "calmmind", "icebeam", "scald"],
+        randomBattleMoves: ["calmmind", "icebeam", "psychic", "scald", "slackoff"],
     },
     magnemite: {
         tier: "LC",
@@ -355,36 +355,36 @@ exports.FormatsData = {
     magnezone: {
         tier: "OU",
         doublesTier: "DUU",
-        randomBattleMoves: ["thunderbolt", "flashcannon", "voltswitch", "mirrorcoat"],
+        randomBattleMoves: ["flashcannon", "mirrorcoat", "thunderbolt", "voltswitch"],
     },
     farfetchd: {
-        tier: "RU",
+        tier: "NU",
         doublesTier: "DUU",
-        randomBattleMoves: ["bravebird", "knockoff", "leafblade", "slash", "quickattack"],
+        randomBattleMoves: ["bravebird", "knockoff", "leafblade", "quickattack", "slash"],
     },
     doduo: {
         tier: "LC",
     },
     dodrio: {
-        tier: "RU",
+        tier: "NU",
         doublesTier: "DUU",
-        randomBattleMoves: ["swordsdance", "bravebird", "steelwing", "roost", "facade", "quickattack"],
+        randomBattleMoves: ["bravebird", "facade", "quickattack", "roost", "steelwing", "swordsdance"],
     },
     seel: {
         tier: "LC",
     },
     dewgong: {
-        tier: "RU",
+        tier: "NU",
         doublesTier: "DUU",
-        randomBattleMoves: ["surf", "icebeam", "perishsong", "protect", "rest", "sleeptalk"],
+        randomBattleMoves: ["icebeam", "perishsong", "protect", "rest", "sleeptalk", "surf"],
     },
     grimer: {
         tier: "LC",
     },
     muk: {
-        tier: "RU",
+        tier: "NU",
         doublesTier: "DUU",
-        randomBattleMoves: ["gunkshot", "curse", "shadowsneak", "brickbreak", "explosion"],
+        randomBattleMoves: ["brickbreak", "curse", "explosion", "gunkshot", "shadowsneak"],
     },
     shellder: {
         tier: "LC",
@@ -392,7 +392,7 @@ exports.FormatsData = {
     cloyster: {
         tier: "UU",
         doublesTier: "DUU",
-        randomBattleMoves: ["shellsmash", "iciclespear", "rockblast", "hydropump"],
+        randomBattleMoves: ["hydropump", "iciclespear", "rockblast", "shellsmash"],
     },
     gastly: {
         tier: "LC",
@@ -403,7 +403,7 @@ exports.FormatsData = {
     gengar: {
         tier: "OU",
         doublesTier: "DUU",
-        randomBattleMoves: ["shadowball", "sludgebomb", "nastyplot", "thunderbolt", "focusblast"],
+        randomBattleMoves: ["focusblast", "nastyplot", "shadowball", "sludgebomb", "thunderbolt"],
     },
     onix: {
         tier: "LC",
@@ -411,47 +411,47 @@ exports.FormatsData = {
     steelix: {
         tier: "RU",
         doublesTier: "DUU",
-        randomBattleMoves: ["stealthrock", "gyroball", "stoneedge", "earthquake", "curse"],
+        randomBattleMoves: ["curse", "earthquake", "gyroball", "stealthrock", "stoneedge"],
     },
     drowzee: {
         tier: "LC",
     },
     hypno: {
-        tier: "RU",
+        tier: "NU",
         doublesTier: "DUU",
-        randomBattleMoves: ["psychic", "thunderwave", "shadowball", "focusblast"],
+        randomBattleMoves: ["focusblast", "psychic", "shadowball", "thunderwave"],
     },
     krabby: {
         tier: "LC",
     },
     kingler: {
-        tier: "RU",
+        tier: "NU",
         doublesTier: "DUU",
-        randomBattleMoves: ["swordsdance", "agility", "razorshell", "rockslide", "xscissor"],
+        randomBattleMoves: ["agility", "razorshell", "rockslide", "swordsdance", "xscissor"],
     },
     voltorb: {
         tier: "LC",
     },
     electrode: {
-        tier: "RU",
+        tier: "NU",
         doublesTier: "DUU",
-        randomBattleMoves: ["thunderbolt", "voltswitch", "explosion", "lightscreen", "taunt"],
+        randomBattleMoves: ["explosion", "lightscreen", "taunt", "thunderbolt", "voltswitch"],
     },
     exeggcute: {
         tier: "LC",
     },
     exeggutor: {
-        tier: "RU",
+        tier: "NU",
         doublesTier: "DUU",
-        randomBattleMoves: ["sleeppowder", "gigadrain", "leechseed", "substitute", "psychic"],
+        randomBattleMoves: ["gigadrain", "leechseed", "psychic", "sleeppowder", "substitute"],
     },
     cubone: {
         tier: "LC",
     },
     marowak: {
-        tier: "RU",
+        tier: "NU",
         doublesTier: "DUU",
-        randomBattleMoves: ["earthquake", "stealthrock", "stoneedge", "doubleedge"],
+        randomBattleMoves: ["doubleedge", "earthquake", "stealthrock", "stoneedge"],
     },
     tyrogue: {
         tier: "LC",
@@ -459,33 +459,33 @@ exports.FormatsData = {
     hitmonlee: {
         tier: "RU",
         doublesTier: "DUU",
-        randomBattleMoves: ["bulkup", "stoneedge", "bulletpunch", "highjumpkick", "earthquake"],
+        randomBattleMoves: ["bulkup", "bulletpunch", "earthquake", "highjumpkick", "stoneedge"],
     },
     hitmonchan: {
-        tier: "RU",
+        tier: "NU",
         doublesTier: "DUU",
-        randomBattleMoves: ["drainpunch", "icepunch", "machpunch", "stoneedge", "rapidspin", "bulkup"],
+        randomBattleMoves: ["bulkup", "drainpunch", "icepunch", "machpunch", "rapidspin", "stoneedge"],
     },
     hitmontop: {
         tier: "RU",
         doublesTier: "DOU",
-        randomBattleMoves: ["closecombat", "rapidspin", "stoneedge", "machpunch", "suckerpunch"],
+        randomBattleMoves: ["closecombat", "machpunch", "rapidspin", "stoneedge", "suckerpunch"],
     },
     lickitung: {
         tier: "LC",
     },
     lickilicky: {
-        tier: "RU",
+        tier: "NU",
         doublesTier: "DUU",
-        randomBattleMoves: ["bodyslam", "knockoff", "hammerarm", "powerwhip", "swordsdance"],
+        randomBattleMoves: ["bodyslam", "hammerarm", "knockoff", "powerwhip", "swordsdance"],
     },
     koffing: {
         tier: "LC",
     },
     weezing: {
-        tier: "RU",
+        tier: "NU",
         doublesTier: "DUU",
-        randomBattleMoves: ["sludgebomb", "toxicspikes", "willowisp", "explosion", "fireblast", "painsplit"],
+        randomBattleMoves: ["explosion", "fireblast", "painsplit", "sludgebomb", "toxicspikes", "willowisp"],
     },
     rhyhorn: {
         tier: "LC",
@@ -496,31 +496,31 @@ exports.FormatsData = {
     rhyperior: {
         tier: "RU",
         doublesTier: "DUU",
-        randomBattleMoves: ["stoneedge", "earthquake", "swordsdance", "megahorn", "firefang"],
+        randomBattleMoves: ["earthquake", "firefang", "megahorn", "stoneedge", "swordsdance"],
     },
     happiny: {
         tier: "LC",
     },
     chansey: {
-        tier: "NFE",
+        tier: "RU",
     },
     blissey: {
         tier: "OU",
         doublesTier: "DUU",
-        randomBattleMoves: ["stealthrock", "seismictoss", "softboiled", "thunderwave"],
+        randomBattleMoves: ["seismictoss", "softboiled", "stealthrock", "thunderwave"],
     },
     tangela: {
-        tier: "LC",
+        tier: "NFE",
     },
     tangrowth: {
         tier: "OU",
         doublesTier: "DUU",
-        randomBattleMoves: ["powerwhip", "sleeppowder", "leechseed", "earthquake", "knockoff", "sludgebomb"],
+        randomBattleMoves: ["earthquake", "knockoff", "leechseed", "powerwhip", "sleeppowder", "sludgebomb"],
     },
     kangaskhan: {
-        tier: "RU",
+        tier: "NU",
         doublesTier: "DUU",
-        randomBattleMoves: ["doubleedge", "crunch", "hammerarm", "earthquake", "fakeout"],
+        randomBattleMoves: ["crunch", "doubleedge", "earthquake", "fakeout", "hammerarm"],
     },
     horsea: {
         tier: "LC",
@@ -529,7 +529,7 @@ exports.FormatsData = {
         tier: "NFE",
     },
     kingdra: {
-        tier: "RU",
+        tier: "RUBL",
         doublesTier: "DOU",
         randomBattleMoves: ["dracometeor", "hydropump", "icebeam", "raindance"],
     },
@@ -537,9 +537,9 @@ exports.FormatsData = {
         tier: "LC",
     },
     seaking: {
-        tier: "RU",
+        tier: "NU",
         doublesTier: "DUU",
-        randomBattleMoves: ["waterfall", "megahorn", "raindance", "swordsdance"],
+        randomBattleMoves: ["megahorn", "raindance", "swordsdance", "waterfall"],
     },
     staryu: {
         tier: "LC",
@@ -547,32 +547,32 @@ exports.FormatsData = {
     starmie: {
         tier: "OU",
         doublesTier: "DUU",
-        randomBattleMoves: ["hydropump", "psychic", "icebeam", "thunderbolt", "recover", "rapidspin", "scald"],
+        randomBattleMoves: ["hydropump", "icebeam", "psychic", "rapidspin", "recover", "scald", "thunderbolt"],
     },
     mimejr: {
         tier: "LC",
     },
     mrmime: {
-        tier: "RU",
+        tier: "NU",
         doublesTier: "DUU",
-        randomBattleMoves: ["psychic", "dazzlinggleam", "focusblast", "nastyplot", "thunderbolt"],
+        randomBattleMoves: ["dazzlinggleam", "focusblast", "nastyplot", "psychic", "thunderbolt"],
     },
     scyther: {
-        tier: "LC",
+        tier: "NFE",
         randomBattleMoves: ["aerialace", "brickbreak", "quickattack", "roost", "swordsdance", "thief", "uturn"],
     },
     scizor: {
         tier: "OU",
         doublesTier: "DOU",
-        randomBattleMoves: ["bulletpunch", "uturn", "roost", "swordsdance", "brickbreak"],
+        randomBattleMoves: ["brickbreak", "bulletpunch", "roost", "swordsdance", "uturn", "defog"],
     },
     smoochum: {
         tier: "LC",
     },
     jynx: {
-        tier: "RU",
+        tier: "NU",
         doublesTier: "DUU",
-        randomBattleMoves: ["lovelykiss", "icebeam", "psychic", "substitute", "nastyplot"],
+        randomBattleMoves: ["icebeam", "lovelykiss", "nastyplot", "psychic", "substitute"],
     },
     elekid: {
         tier: "LC",
@@ -581,9 +581,9 @@ exports.FormatsData = {
         tier: "NFE",
     },
     electivire: {
-        tier: "RU",
+        tier: "NU",
         doublesTier: "DUU",
-        randomBattleMoves: ["wildcharge", "voltswitch", "flamethrower", "earthquake", "crosschop", "icepunch"],
+        randomBattleMoves: ["crosschop", "earthquake", "flamethrower", "icepunch", "voltswitch", "wildcharge"],
     },
     magby: {
         tier: "LC",
@@ -592,19 +592,19 @@ exports.FormatsData = {
         tier: "NFE",
     },
     magmortar: {
-        tier: "RU",
+        tier: "NU",
         doublesTier: "DUU",
-        randomBattleMoves: ["fireblast", "earthquake", "psychic", "thunderbolt", "taunt"],
+        randomBattleMoves: ["earthquake", "fireblast", "psychic", "taunt", "thunderbolt"],
     },
     pinsir: {
-        tier: "RU",
+        tier: "NU",
         doublesTier: "DUU",
-        randomBattleMoves: ["stealthrock", "xscissor", "closecombat", "stoneedge", "earthquake"],
+        randomBattleMoves: ["closecombat", "earthquake", "stealthrock", "stoneedge", "xscissor"],
     },
     tauros: {
-        tier: "RU",
+        tier: "NU",
         doublesTier: "DUU",
-        randomBattleMoves: ["rockclimb", "zenheadbutt", "earthquake", "rockslide"],
+        randomBattleMoves: ["earthquake", "rockclimb", "rockslide", "zenheadbutt"],
     },
     magikarp: {
         tier: "LC",
@@ -612,12 +612,12 @@ exports.FormatsData = {
     gyarados: {
         tier: "UU",
         doublesTier: "DOU",
-        randomBattleMoves: ["waterfall", "dragondance", "earthquake", "stoneedge", "icefang"],
+        randomBattleMoves: ["dragondance", "earthquake", "icefang", "stoneedge", "waterfall"],
     },
     lapras: {
-        tier: "RU",
+        tier: "NU",
         doublesTier: "DUU",
-        randomBattleMoves: ["freezedry", "surf", "thunderbolt", "blizzard"],
+        randomBattleMoves: ["blizzard", "freezedry", "surf", "thunderbolt"],
     },
     ditto: {
         tier: "UU",
@@ -630,37 +630,37 @@ exports.FormatsData = {
     vaporeon: {
         tier: "RU",
         doublesTier: "DUU",
-        randomBattleMoves: ["scald", "wish", "protect", "icebeam", "haze"],
+        randomBattleMoves: ["haze", "icebeam", "protect", "scald", "wish"],
     },
     jolteon: {
         tier: "RU",
         doublesTier: "DUU",
-        randomBattleMoves: ["voltswitch", "thunderbolt", "yawn", "batonpass", "shadowball"],
+        randomBattleMoves: ["batonpass", "shadowball", "thunderbolt", "voltswitch", "yawn"],
     },
     flareon: {
-        tier: "RU",
+        tier: "NU",
         doublesTier: "DUU",
-        randomBattleMoves: ["flareblitz", "willowisp", "facade", "quickattack"],
+        randomBattleMoves: ["facade", "flareblitz", "quickattack", "willowisp"],
     },
     espeon: {
         tier: "UU",
         doublesTier: "DUU",
-        randomBattleMoves: ["psychic", "dazzlinggleam", "calmmind", "morningsun", "shadowball"],
+        randomBattleMoves: ["calmmind", "dazzlinggleam", "morningsun", "psychic", "shadowball"],
     },
     umbreon: {
         tier: "UU",
         doublesTier: "DUU",
-        randomBattleMoves: ["foulplay", "wish", "taunt", "protect"],
+        randomBattleMoves: ["foulplay", "protect", "taunt", "wish"],
     },
     leafeon: {
-        tier: "RU",
+        tier: "NU",
         doublesTier: "DUU",
-        randomBattleMoves: ["leafblade", "synthesis", "swordsdance", "xscissor", "doubleedge"],
+        randomBattleMoves: ["doubleedge", "leafblade", "swordsdance", "synthesis", "xscissor"],
     },
     glaceon: {
-        tier: "RU",
+        tier: "NU",
         doublesTier: "DUU",
-        randomBattleMoves: ["icebeam", "freezedry", "waterpulse", "roar", "shadowball"],
+        randomBattleMoves: ["freezedry", "icebeam", "roar", "shadowball", "waterpulse"],
     },
     porygon: {
         tier: "LC",
@@ -671,7 +671,7 @@ exports.FormatsData = {
     porygonz: {
         tier: "UU",
         doublesTier: "DUU",
-        randomBattleMoves: ["triattack", "nastyplot", "icebeam", "thunderbolt", "darkpulse"],
+        randomBattleMoves: ["darkpulse", "icebeam", "nastyplot", "thunderbolt", "triattack"],
     },
     omanyte: {
         tier: "LC",
@@ -679,7 +679,7 @@ exports.FormatsData = {
     omastar: {
         tier: "RU",
         doublesTier: "DUU",
-        randomBattleMoves: ["shellsmash", "hydropump", "icebeam", "ancientpower"],
+        randomBattleMoves: ["ancientpower", "hydropump", "icebeam", "shellsmash"],
     },
     kabuto: {
         tier: "LC",
@@ -687,12 +687,12 @@ exports.FormatsData = {
     kabutops: {
         tier: "RU",
         doublesTier: "DUU",
-        randomBattleMoves: ["liquidation", "stoneedge", "rapidspin", "swordsdance", "knockoff"],
+        randomBattleMoves: ["knockoff", "liquidation", "rapidspin", "stoneedge", "swordsdance"],
     },
     aerodactyl: {
-        tier: "UU",
+        tier: "RU",
         doublesTier: "DUU",
-        randomBattleMoves: ["stoneedge", "stealthrock", "earthquake", "roost"],
+        randomBattleMoves: ["earthquake", "roost", "stealthrock", "stoneedge", "defog"],
     },
     munchlax: {
         tier: "LC",
@@ -703,19 +703,19 @@ exports.FormatsData = {
         randomBattleMoves: ["bodyslam", "curse", "rest", "sleeptalk"],
     },
     articuno: {
-        tier: "RU",
+        tier: "(Uber)",
         doublesTier: "DUU",
-        randomBattleMoves: ["icebeam", "roost", "uturn", "defog"],
+        randomBattleMoves: ["defog", "icebeam", "roost", "uturn"],
     },
     zapdos: {
-        tier: "RU",
+        tier: "UU",
         doublesTier: "DOU",
-        randomBattleMoves: ["discharge", "uturn", "roost", "substitute", "defog"],
+        randomBattleMoves: ["defog", "discharge", "roost", "substitute", "uturn"],
     },
     moltres: {
         tier: "RU",
         doublesTier: "DUU",
-        randomBattleMoves: ["fireblast", "roost", "uturn", "hurricane", "willowisp"],
+        randomBattleMoves: ["fireblast", "hurricane", "roost", "uturn", "willowisp"],
     },
     dratini: {
         tier: "LC",
@@ -726,17 +726,17 @@ exports.FormatsData = {
     dragonite: {
         tier: "OU",
         doublesTier: "DUU",
-        randomBattleMoves: ["dragondance", "outrage", "earthquake", "extremespeed", "roost"],
+        randomBattleMoves: ["dragondance", "earthquake", "extremespeed", "outrage", "roost"],
     },
     mewtwo: {
         tier: "Uber",
         doublesTier: "DUber",
-        randomBattleMoves: ["psystrike", "aurasphere", "fireblast", "nastyplot", "recover", "shadowball"],
+        randomBattleMoves: ["aurasphere", "fireblast", "nastyplot", "psystrike", "recover", "shadowball"],
     },
     mew: {
         tier: "UU",
         doublesTier: "DUU",
-        randomBattleMoves: ["calmmind", "aurasphere", "psychic", "shadowball", "roost"],
+        randomBattleMoves: ["aurasphere", "calmmind", "psychic", "roost", "shadowball", "defog"],
     },
     chikorita: {
         tier: "LC",
@@ -745,9 +745,9 @@ exports.FormatsData = {
         tier: "NFE",
     },
     meganium: {
-        tier: "RU",
+        tier: "NU",
         doublesTier: "DUU",
-        randomBattleMoves: ["gigadrain", "leechseed", "reflect", "lightscreen", "aromatherapy"],
+        randomBattleMoves: ["aromatherapy", "gigadrain", "leechseed", "lightscreen", "reflect"],
     },
     cyndaquil: {
         tier: "LC",
@@ -756,9 +756,9 @@ exports.FormatsData = {
         tier: "NFE",
     },
     typhlosion: {
-        tier: "RU",
+        tier: "NU",
         doublesTier: "DUU",
-        randomBattleMoves: ["eruption", "fireblast", "extrasensory", "focusblast"],
+        randomBattleMoves: ["eruption", "extrasensory", "fireblast", "focusblast"],
     },
     totodile: {
         tier: "LC",
@@ -769,47 +769,47 @@ exports.FormatsData = {
     feraligatr: {
         tier: "OU",
         doublesTier: "DUU",
-        randomBattleMoves: ["dragondance", "icepunch", "waterfall", "crunch", "aquajet"],
+        randomBattleMoves: ["aquajet", "crunch", "dragondance", "icepunch", "waterfall"],
     },
     sentret: {
         tier: "LC",
     },
     furret: {
-        tier: "RU",
+        tier: "NU",
         doublesTier: "DUU",
-        randomBattleMoves: ["doubleedge", "suckerpunch", "uturn", "shadowclaw"],
+        randomBattleMoves: ["doubleedge", "shadowclaw", "suckerpunch", "uturn"],
     },
     hoothoot: {
         tier: "LC",
     },
     noctowl: {
-        tier: "RU",
+        tier: "NU",
         doublesTier: "DUU",
-        randomBattleMoves: ["hurricane", "hypnosis", "nastyplot", "shadowball", "roost"],
+        randomBattleMoves: ["hurricane", "hypnosis", "nastyplot", "roost", "shadowball", "defog"],
     },
     ledyba: {
         tier: "LC",
     },
     ledian: {
-        tier: "RU",
+        tier: "NU",
         doublesTier: "DUU",
-        randomBattleMoves: ["uturn", "knockoff", "roost", "reflect", "lightscreen"],
+        randomBattleMoves: ["knockoff", "lightscreen", "reflect", "roost", "uturn"],
     },
     spinarak: {
         tier: "LC",
     },
     ariados: {
-        tier: "RU",
+        tier: "NU",
         doublesTier: "DUU",
-        randomBattleMoves: ["poisonjab", "toxicspikes", "stickyweb", "lunge"],
+        randomBattleMoves: ["lunge", "poisonjab", "stickyweb", "toxicspikes"],
     },
     chinchou: {
         tier: "LC",
     },
     lanturn: {
-        tier: "RU",
+        tier: "NU",
         doublesTier: "DUU",
-        randomBattleMoves: ["scald", "discharge", "voltswitch", "icebeam", "thunderwave"],
+        randomBattleMoves: ["discharge", "icebeam", "scald", "thunderwave", "voltswitch"],
     },
     togepi: {
         tier: "LC",
@@ -820,7 +820,7 @@ exports.FormatsData = {
     togekiss: {
         tier: "OU",
         doublesTier: "DOU",
-        randomBattleMoves: ["airslash", "roost", "thunderwave", "aurasphere", "fireblast"],
+        randomBattleMoves: ["airslash", "aurasphere", "fireblast", "roost", "thunderwave", "defog"],
     },
     natu: {
         tier: "LC",
@@ -828,7 +828,7 @@ exports.FormatsData = {
     xatu: {
         tier: "RU",
         doublesTier: "DUU",
-        randomBattleMoves: ["psychic", "roost", "teleport", "thunderwave", "airslash"],
+        randomBattleMoves: ["airslash", "psychic", "roost", "teleport", "thunderwave"],
     },
     mareep: {
         tier: "LC",
@@ -837,9 +837,9 @@ exports.FormatsData = {
         tier: "NFE",
     },
     ampharos: {
-        tier: "RU",
+        tier: "NU",
         doublesTier: "DUU",
-        randomBattleMoves: ["thunderbolt", "voltswitch", "powergem", "focusblast"],
+        randomBattleMoves: ["focusblast", "powergem", "thunderbolt", "voltswitch"],
     },
     azurill: {
         tier: "LC",
@@ -850,15 +850,15 @@ exports.FormatsData = {
     azumarill: {
         tier: "OU",
         doublesTier: "DOU",
-        randomBattleMoves: ["bellydrum", "aquajet", "playrough", "superpower", "waterfall"],
+        randomBattleMoves: ["aquajet", "bellydrum", "playrough", "superpower", "waterfall"],
     },
     bonsly: {
         tier: "LC",
     },
     sudowoodo: {
-        tier: "RU",
+        tier: "NU",
         doublesTier: "DUU",
-        randomBattleMoves: ["headsmash", "stealthrock", "earthquake", "suckerpunch", "selfdestruct"],
+        randomBattleMoves: ["earthquake", "headsmash", "selfdestruct", "stealthrock", "suckerpunch"],
     },
     hoppip: {
         tier: "LC",
@@ -867,9 +867,9 @@ exports.FormatsData = {
         tier: "NFE",
     },
     jumpluff: {
-        tier: "RU",
+        tier: "NU",
         doublesTier: "DUU",
-        randomBattleMoves: ["sleeppowder", "leechseed", "substitute", "acrobatics", "strengthsap"],
+        randomBattleMoves: ["acrobatics", "leechseed", "sleeppowder", "strengthsap", "substitute"],
     },
     aipom: {
         tier: "LC",
@@ -877,23 +877,23 @@ exports.FormatsData = {
     ambipom: {
         tier: "UU",
         doublesTier: "DUU",
-        randomBattleMoves: ["fakeout", "uturn", "doublehit", "switcheroo", "brickbreak", "thief", "aerialace"],
+        randomBattleMoves: ["aerialace", "brickbreak", "doublehit", "fakeout", "switcheroo", "thief", "uturn"],
     },
     sunkern: {
         tier: "LC",
     },
     sunflora: {
-        tier: "RU",
+        tier: "NU",
         doublesTier: "DUU",
-        randomBattleMoves: ["energyball", "sludgebomb", "synthesis", "lightscreen"],
+        randomBattleMoves: ["energyball", "lightscreen", "sludgebomb", "synthesis"],
     },
     yanma: {
-        tier: "LC",
+        tier: "NFE",
     },
     yanmega: {
         tier: "UU",
         doublesTier: "DUU",
-        randomBattleMoves: ["bugbuzz", "gigadrain", "airslash", "uturn", "protect"],
+        randomBattleMoves: ["airslash", "bugbuzz", "gigadrain", "protect", "uturn"],
     },
     wooper: {
         tier: "LC",
@@ -904,38 +904,38 @@ exports.FormatsData = {
         randomBattleMoves: ["earthquake", "recover", "scald", "toxic"],
     },
     murkrow: {
-        tier: "LC",
+        tier: "NFE",
     },
     honchkrow: {
         tier: "UU",
         doublesTier: "DUU",
-        randomBattleMoves: ["bravebird", "suckerpunch", "roost", "taunt"],
+        randomBattleMoves: ["bravebird", "roost", "suckerpunch", "taunt"],
     },
     misdreavus: {
-        tier: "LC",
+        tier: "NFE",
     },
     mismagius: {
         tier: "UU",
         doublesTier: "DUU",
-        randomBattleMoves: ["dazzlinggleam", "destinybond", "nastyplot", "shadowball", "substitute", "painsplit", "willowisp", "thunderbolt"],
+        randomBattleMoves: ["dazzlinggleam", "destinybond", "nastyplot", "painsplit", "shadowball", "substitute", "thunderbolt", "willowisp"],
     },
     unown: {
-        tier: "RU",
+        tier: "NU",
         doublesTier: "DUU",
-        randomBattleMoves: ["hiddenpowerpsychic", "hiddenpowerfighting"],
+        randomBattleMoves: ["hiddenpowerfighting", "hiddenpowerpsychic"],
     },
     wynaut: {
         tier: "LC",
     },
     wobbuffet: {
-        tier: "RU",
+        tier: "NU",
         doublesTier: "DUU",
-        randomBattleMoves: ["counter", "mirrorcoat", "encore", "destinybond"],
+        randomBattleMoves: ["counter", "destinybond", "encore", "mirrorcoat"],
     },
     girafarig: {
-        tier: "RU",
+        tier: "NU",
         doublesTier: "DUU",
-        randomBattleMoves: ["nastyplot", "thunderbolt", "psychic", "dazzlinggleam", "shadowball"],
+        randomBattleMoves: ["dazzlinggleam", "nastyplot", "psychic", "shadowball", "thunderbolt"],
     },
     pineco: {
         tier: "LC",
@@ -943,67 +943,67 @@ exports.FormatsData = {
     forretress: {
         tier: "UU",
         doublesTier: "DUU",
-        randomBattleMoves: ["voltswitch", "gyroball", "rapidspin", "spikes", "toxicspikes"],
+        randomBattleMoves: ["gyroball", "rapidspin", "spikes", "toxicspikes", "voltswitch"],
     },
     dunsparce: {
-        tier: "RU",
+        tier: "NU",
         doublesTier: "DUU",
-        randomBattleMoves: ["bodyslam", "bite", "roost", "coil"],
+        randomBattleMoves: ["bite", "bodyslam", "coil", "roost"],
     },
     gligar: {
-        tier: "LC",
+        tier: "NFE",
     },
     gliscor: {
         tier: "OU",
         doublesTier: "DUU",
-        randomBattleMoves: ["earthquake", "stealthrock", "roost", "knockoff", "uturn", "taunt"],
+        randomBattleMoves: ["earthquake", "icefang", "knockoff", "roost", "stealthrock", "swordsdance", "taunt", "uturn", "defog"],
     },
     snubbull: {
         tier: "LC",
     },
     granbull: {
-        tier: "UU",
+        tier: "RU",
         doublesTier: "DUU",
-        randomBattleMoves: ["playrough", "earthquake", "crunch", "healbell", "thunderwave"],
+        randomBattleMoves: ["crunch", "earthquake", "healbell", "playrough", "thunderwave"],
     },
     qwilfish: {
-        tier: "RU",
+        tier: "NU",
         doublesTier: "DUU",
-        randomBattleMoves: ["destinybond", "waterfall", "poisonjab", "spikes", "toxicspikes", "thunderwave"],
+        randomBattleMoves: ["destinybond", "poisonjab", "spikes", "thunderwave", "toxicspikes", "waterfall"],
     },
     shuckle: {
-        tier: "RU",
+        tier: "NU",
         doublesTier: "DUU",
         randomBattleMoves: ["knockoff", "stealthrock", "stickyweb", "toxic"],
     },
     heracross: {
         tier: "UU",
         doublesTier: "DUU",
-        randomBattleMoves: ["facade", "megahorn", "closecombat", "throatchop", "stoneedge"],
+        randomBattleMoves: ["closecombat", "facade", "megahorn", "stoneedge", "throatchop"],
     },
     sneasel: {
-        tier: "LC",
+        tier: "NFE",
     },
     weavile: {
         tier: "OU",
-        doublesTier: "DOU",
-        randomBattleMoves: ["fakeout", "iciclecrash", "throatchop", "swordsdance", "iceshard", "brickbreak"],
+        doublesTier: "DUU",
+        randomBattleMoves: ["brickbreak", "iceshard", "iciclecrash", "swordsdance", "throatchop"],
     },
     teddiursa: {
         tier: "LC",
     },
     ursaring: {
-        tier: "RU",
+        tier: "NU",
         doublesTier: "DUU",
-        randomBattleMoves: ["closecombat", "crunch", "protect", "facade", "swordsdance"],
+        randomBattleMoves: ["closecombat", "crunch", "facade", "protect", "swordsdance"],
     },
     slugma: {
         tier: "LC",
     },
     magcargo: {
-        tier: "RU",
+        tier: "NU",
         doublesTier: "DUU",
-        randomBattleMoves: ["fireblast", "ancientpower", "earthpower", "shellsmash", "recover", "stealthrock", "lavaplume"],
+        randomBattleMoves: ["ancientpower", "earthpower", "fireblast", "lavaplume", "recover", "shellsmash", "stealthrock"],
     },
     swinub: {
         tier: "LC",
@@ -1014,23 +1014,23 @@ exports.FormatsData = {
     mamoswine: {
         tier: "OU",
         doublesTier: "DOU",
-        randomBattleMoves: ["earthquake", "iciclecrash", "iceshard", "stealthrock", "stoneedge"],
+        randomBattleMoves: ["earthquake", "iceshard", "iciclecrash", "stealthrock", "stoneedge"],
     },
     corsola: {
-        tier: "RU",
+        tier: "NU",
         doublesTier: "DUU",
-        randomBattleMoves: ["recover", "scald", "powergem", "stealthrock", "icebeam"],
+        randomBattleMoves: ["icebeam", "powergem", "recover", "scald", "stealthrock"],
     },
     remoraid: {
         tier: "LC",
     },
     octillery: {
-        tier: "RU",
+        tier: "NU",
         doublesTier: "DUU",
-        randomBattleMoves: ["energyball", "fireblast", "hydropump", "gunkshot", "icebeam", "protect"],
+        randomBattleMoves: ["energyball", "fireblast", "gunkshot", "hydropump", "icebeam", "protect"],
     },
     delibird: {
-        tier: "RU",
+        tier: "NU",
         doublesTier: "DUU",
         randomBattleMoves: ["destinybond", "freezedry", "rapidspin", "spikes"],
     },
@@ -1040,12 +1040,12 @@ exports.FormatsData = {
     mantine: {
         tier: "RU",
         doublesTier: "DUU",
-        randomBattleMoves: ["scald", "icebeam", "defog", "roost"],
+        randomBattleMoves: ["defog", "icebeam", "roost", "scald"],
     },
     skarmory: {
         tier: "OU",
         doublesTier: "DUU",
-        randomBattleMoves: ["bravebird", "roost", "spikes", "stealthrock", "whirlwind"],
+        randomBattleMoves: ["bravebird", "roost", "spikes", "stealthrock", "whirlwind", "defog"],
     },
     houndour: {
         tier: "LC",
@@ -1053,7 +1053,7 @@ exports.FormatsData = {
     houndoom: {
         tier: "RU",
         doublesTier: "DUU",
-        randomBattleMoves: ["nastyplot", "darkpulse", "fireblast", "suckerpunch"],
+        randomBattleMoves: ["darkpulse", "fireblast", "nastyplot", "suckerpunch"],
     },
     phanpy: {
         tier: "LC",
@@ -1061,37 +1061,37 @@ exports.FormatsData = {
     donphan: {
         tier: "OU",
         doublesTier: "DUU",
-        randomBattleMoves: ["stealthrock", "earthquake", "rapidspin", "stoneedge", "iceshard", "knockoff"],
+        randomBattleMoves: ["earthquake", "iceshard", "knockoff", "rapidspin", "stealthrock", "stoneedge"],
     },
     stantler: {
-        tier: "RU",
+        tier: "NU",
         doublesTier: "DUU",
-        randomBattleMoves: ["doubleedge", "megahorn", "zenheadbutt", "earthquake"],
+        randomBattleMoves: ["doubleedge", "earthquake", "megahorn", "zenheadbutt"],
     },
     smeargle: {
-        tier: "RU",
+        tier: "NU",
         doublesTier: "DUber",
-        randomBattleMoves: ["stealthrock", "spikes", "spore", "toxicspikes", "stickyweb", "whirlwind"],
+        randomBattleMoves: ["spikes", "spore", "stealthrock", "stickyweb", "toxicspikes", "whirlwind"],
     },
     miltank: {
-        tier: "RU",
+        tier: "NU",
         doublesTier: "DUU",
-        randomBattleMoves: ["bodyslam", "milkdrink", "stealthrock", "curse", "earthquake"],
+        randomBattleMoves: ["bodyslam", "curse", "earthquake", "milkdrink", "stealthrock"],
     },
     raikou: {
         tier: "UU",
         doublesTier: "DOU",
-        randomBattleMoves: ["thunderbolt", "scald", "voltswitch", "calmmind", "substitute"],
+        randomBattleMoves: ["calmmind", "scald", "substitute", "thunderbolt", "voltswitch"],
     },
     entei: {
         tier: "UU",
         doublesTier: "DOU",
-        randomBattleMoves: ["sacredfire", "extremespeed", "stoneedge", "bulldoze"],
+        randomBattleMoves: ["bulldoze", "extremespeed", "sacredfire", "stoneedge"],
     },
     suicune: {
         tier: "UU",
         doublesTier: "DOU",
-        randomBattleMoves: ["scald", "rest", "sleeptalk", "calmmind"],
+        randomBattleMoves: ["calmmind", "rest", "scald", "sleeptalk"],
     },
     larvitar: {
         tier: "LC",
@@ -1102,22 +1102,22 @@ exports.FormatsData = {
     tyranitar: {
         tier: "OU",
         doublesTier: "DOU",
-        randomBattleMoves: ["dragondance", "crunch", "stoneedge", "earthquake", "stealthrock"],
+        randomBattleMoves: ["crunch", "dragondance", "earthquake", "stealthrock", "stoneedge"],
     },
     lugia: {
         tier: "Uber",
         doublesTier: "DUber",
-        randomBattleMoves: ["psychic", "roost", "whirlwind", "substitute", "aeroblast"],
+        randomBattleMoves: ["aeroblast", "psychic", "roost", "substitute", "whirlwind"],
     },
     hooh: {
         tier: "Uber",
         doublesTier: "DUber",
-        randomBattleMoves: ["sacredfire", "roost", "substitute", "earthquake", "thunderwave"],
+        randomBattleMoves: ["earthquake", "roost", "sacredfire", "substitute", "thunderwave"],
     },
     celebi: {
         isNonstandard: "Unobtainable",
         tier: "Unreleased",
-        randomBattleMoves: ["nastyplot", "psychic", "leafstorm", "gigadrain", "dazzlinggleam", "uturn", "recover"],
+        randomBattleMoves: ["dazzlinggleam", "gigadrain", "leafstorm", "nastyplot", "psychic", "recover", "uturn"],
     },
     treecko: {
         tier: "LC",
@@ -1126,9 +1126,9 @@ exports.FormatsData = {
         tier: "NFE",
     },
     sceptile: {
-        tier: "RU",
+        tier: "NU",
         doublesTier: "DUU",
-        randomBattleMoves: ["substitute", "leechseed", "leafstorm", "gigadrain", "focusblast", "earthquake", "rockslide"],
+        randomBattleMoves: ["earthquake", "focusblast", "gigadrain", "leafstorm", "leechseed", "rockslide", "substitute"],
     },
     torchic: {
         tier: "LC",
@@ -1139,7 +1139,7 @@ exports.FormatsData = {
     blaziken: {
         tier: "Uber",
         doublesTier: "DUU",
-        randomBattleMoves: ["swordsdance", "stoneedge", "closecombat", "flareblitz", "earthquake"],
+        randomBattleMoves: ["closecombat", "earthquake", "flareblitz", "stoneedge", "swordsdance"],
     },
     mudkip: {
         tier: "LC",
@@ -1150,23 +1150,23 @@ exports.FormatsData = {
     swampert: {
         tier: "UU",
         doublesTier: "DUU",
-        randomBattleMoves: ["scald", "earthquake", "stealthrock", "icebeam", "stoneedge"],
+        randomBattleMoves: ["earthquake", "icebeam", "scald", "stealthrock", "stoneedge"],
     },
     poochyena: {
         tier: "LC",
     },
     mightyena: {
-        tier: "RU",
+        tier: "NU",
         doublesTier: "DUU",
-        randomBattleMoves: ["suckerpunch", "playrough", "firefang", "crunch", "irontail"],
+        randomBattleMoves: ["crunch", "firefang", "irontail", "playrough", "suckerpunch"],
     },
     zigzagoon: {
         tier: "LC",
     },
     linoone: {
-        tier: "RU",
+        tier: "NU",
         doublesTier: "DUU",
-        randomBattleMoves: ["bellydrum", "extremespeed", "shadowclaw", "irontail"],
+        randomBattleMoves: ["bellydrum", "extremespeed", "irontail", "shadowclaw"],
     },
     wurmple: {
         tier: "LC",
@@ -1175,17 +1175,17 @@ exports.FormatsData = {
         tier: "NFE",
     },
     beautifly: {
-        tier: "RU",
+        tier: "NU",
         doublesTier: "DUU",
-        randomBattleMoves: ["quiverdance", "energyball", "bugbuzz", "roost", "aircutter"],
+        randomBattleMoves: ["aircutter", "bugbuzz", "energyball", "quiverdance", "roost"],
     },
     cascoon: {
         tier: "NFE",
     },
     dustox: {
-        tier: "RU",
+        tier: "NU",
         doublesTier: "DUU",
-        randomBattleMoves: ["quiverdance", "bugbuzz", "sludgebomb", "roost", "energyball", "toxic"],
+        randomBattleMoves: ["bugbuzz", "roost", "sludgebomb", "toxic", "uturn", "defog"],
     },
     lotad: {
         tier: "LC",
@@ -1194,9 +1194,9 @@ exports.FormatsData = {
         tier: "NFE",
     },
     ludicolo: {
-        tier: "RU",
+        tier: "NU",
         doublesTier: "DOU",
-        randomBattleMoves: ["gigadrain", "icebeam", "hydropump", "raindance", "scald"],
+        randomBattleMoves: ["gigadrain", "hydropump", "icebeam", "raindance", "scald"],
     },
     seedot: {
         tier: "LC",
@@ -1205,9 +1205,9 @@ exports.FormatsData = {
         tier: "NFE",
     },
     shiftry: {
-        tier: "RU",
+        tier: "NU",
         doublesTier: "DUU",
-        randomBattleMoves: ["swordsdance", "leafblade", "suckerpunch", "fakeout", "nightslash", "brickbreak"],
+        randomBattleMoves: ["brickbreak", "fakeout", "leafblade", "nightslash", "suckerpunch", "swordsdance"],
     },
     taillow: {
         tier: "LC",
@@ -1215,15 +1215,15 @@ exports.FormatsData = {
     swellow: {
         tier: "RU",
         doublesTier: "DUU",
-        randomBattleMoves: ["bravebird", "facade", "quickattack", "steelwing", "uturn", "roost"],
+        randomBattleMoves: ["bravebird", "facade", "quickattack", "roost", "steelwing", "uturn"],
     },
     wingull: {
         tier: "LC",
     },
     pelipper: {
-        tier: "RU",
+        tier: "NU",
         doublesTier: "DOU",
-        randomBattleMoves: ["scald", "roost", "defog", "hurricane", "hydropump", "uturn", "icebeam"],
+        randomBattleMoves: ["defog", "hurricane", "hydropump", "icebeam", "roost", "scald", "uturn"],
     },
     ralts: {
         tier: "LC",
@@ -1234,20 +1234,20 @@ exports.FormatsData = {
     gardevoir: {
         tier: "UU",
         doublesTier: "DOU",
-        randomBattleMoves: ["calmmind", "psychic", "shadowball", "focusblast", "moonblast", "substitute"],
+        randomBattleMoves: ["calmmind", "focusblast", "moonblast", "psychic", "shadowball", "substitute"],
     },
     gallade: {
         tier: "RU",
         doublesTier: "DUU",
-        randomBattleMoves: ["closecombat", "psychocut", "swordsdance", "knockoff", "earthquake"],
+        randomBattleMoves: ["closecombat", "earthquake", "knockoff", "psychocut", "swordsdance"],
     },
     surskit: {
         tier: "LC",
     },
     masquerain: {
-        tier: "RU",
+        tier: "NU",
         doublesTier: "DUU",
-        randomBattleMoves: ["quiverdance", "scald", "stickyweb", "airslash", "bugbuzz"],
+        randomBattleMoves: ["airslash", "bugbuzz", "quiverdance", "scald", "stickyweb"],
     },
     shroomish: {
         tier: "LC",
@@ -1255,32 +1255,32 @@ exports.FormatsData = {
     breloom: {
         tier: "OU",
         doublesTier: "DOU",
-        randomBattleMoves: ["spore", "rocktomb", "swordsdance", "bulletseed", "machpunch"],
+        randomBattleMoves: ["bulletseed", "focuspunch", "machpunch", "rocktomb", "spore", "substitute", "swordsdance"],
     },
     slakoth: {
         tier: "LC",
     },
     vigoroth: {
         tier: "NFE",
-        randomBattleMoves: ["bulkup", "bodyslam", "earthquake", "slackoff", "playrough", "shadowclaw"],
+        randomBattleMoves: ["bodyslam", "bulkup", "earthquake", "playrough", "shadowclaw", "slackoff"],
     },
     slaking: {
-        tier: "RU",
+        tier: "NU",
         doublesTier: "DUU",
-        randomBattleMoves: ["earthquake", "suckerpunch", "gigaimpact", "playrough", "hammerarm", "bodyslam"],
+        randomBattleMoves: ["bodyslam", "earthquake", "gigaimpact", "hammerarm", "playrough", "suckerpunch"],
     },
     nincada: {
         tier: "LC",
     },
     ninjask: {
-        tier: "RU",
+        tier: "NU",
         doublesTier: "DUU",
-        randomBattleMoves: ["swordsdance", "uturn", "xscissor", "aerialace", "finalgambit"],
+        randomBattleMoves: ["aerialace", "finalgambit", "swordsdance", "uturn", "xscissor"],
     },
     shedinja: {
-        tier: "RU",
+        tier: "NU",
         doublesTier: "DUU",
-        randomBattleMoves: ["xscissor", "shadowclaw", "shadowsneak", "willowisp"],
+        randomBattleMoves: ["shadowclaw", "shadowsneak", "willowisp", "xscissor"],
     },
     whismur: {
         tier: "LC",
@@ -1291,7 +1291,7 @@ exports.FormatsData = {
     exploud: {
         tier: "RU",
         doublesTier: "DUU",
-        randomBattleMoves: ["focusblast", "fireblast", "boomburst", "surf"],
+        randomBattleMoves: ["boomburst", "fireblast", "focusblast", "surf"],
     },
     makuhita: {
         tier: "LC",
@@ -1299,33 +1299,33 @@ exports.FormatsData = {
     hariyama: {
         tier: "RU",
         doublesTier: "DOU",
-        randomBattleMoves: ["bulkup", "closecombat", "poisonjab", "stoneedge", "knockoff", "bulletpunch"],
+        randomBattleMoves: ["bulkup", "bulletpunch", "closecombat", "knockoff", "poisonjab", "stoneedge"],
     },
     nosepass: {
         tier: "LC",
     },
     probopass: {
-        tier: "RU",
+        tier: "NU",
         doublesTier: "DUU",
-        randomBattleMoves: ["flashcannon", "stealthrock", "bodypress", "voltswitch", "thunderwave"],
+        randomBattleMoves: ["bodypress", "flashcannon", "stealthrock", "thunderwave", "voltswitch"],
     },
     skitty: {
         tier: "LC",
     },
     delcatty: {
-        tier: "RU",
+        tier: "NU",
         doublesTier: "DUU",
-        randomBattleMoves: ["thunderwave", "healbell", "fakeout", "doubleedge", "suckerpunch"],
+        randomBattleMoves: ["doubleedge", "fakeout", "healbell", "suckerpunch", "thunderwave"],
     },
     sableye: {
         tier: "RU",
         doublesTier: "DOU",
-        randomBattleMoves: ["recover", "taunt", "willowisp", "knockoff", "foulplay"],
+        randomBattleMoves: ["foulplay", "knockoff", "recover", "taunt", "willowisp"],
     },
     mawile: {
-        tier: "RU",
+        tier: "NU",
         doublesTier: "DUU",
-        randomBattleMoves: ["swordsdance", "suckerpunch", "ironhead", "playrough", "stealthrock"],
+        randomBattleMoves: ["ironhead", "playrough", "stealthrock", "suckerpunch", "swordsdance"],
     },
     aron: {
         tier: "LC",
@@ -1336,43 +1336,43 @@ exports.FormatsData = {
     aggron: {
         tier: "RU",
         doublesTier: "DUU",
-        randomBattleMoves: ["headsmash", "earthquake", "superpower", "heavyslam", "rockpolish"],
+        randomBattleMoves: ["earthquake", "headsmash", "heavyslam", "rockpolish", "superpower"],
     },
     meditite: {
-        tier: "LC",
+        tier: "NFE",
     },
     medicham: {
         tier: "RU",
         doublesTier: "DUU",
-        randomBattleMoves: ["fakeout", "highjumpkick", "bulletpunch", "zenheadbutt", "recover", "icepunch"],
+        randomBattleMoves: ["bulletpunch", "fakeout", "highjumpkick", "icepunch", "recover", "zenheadbutt"],
     },
     electrike: {
         tier: "LC",
     },
     manectric: {
-        tier: "RU",
+        tier: "NU",
         doublesTier: "DUU",
-        randomBattleMoves: ["switcheroo", "thunderbolt", "overheat", "voltswitch"],
+        randomBattleMoves: ["overheat", "switcheroo", "thunderbolt", "voltswitch"],
     },
     plusle: {
-        tier: "RU",
+        tier: "NU",
         doublesTier: "DUU",
-        randomBattleMoves: ["thunderbolt", "voltswitch", "grassknot", "nastyplot", "nuzzle"],
+        randomBattleMoves: ["grassknot", "nastyplot", "nuzzle", "thunderbolt", "voltswitch"],
     },
     minun: {
-        tier: "RU",
+        tier: "NU",
         doublesTier: "DUU",
-        randomBattleMoves: ["thunderbolt", "voltswitch", "grassknot", "nastyplot", "nuzzle", "switcheroo"],
+        randomBattleMoves: ["grassknot", "nastyplot", "nuzzle", "switcheroo", "thunderbolt", "voltswitch"],
     },
     volbeat: {
-        tier: "RU",
+        tier: "NU",
         doublesTier: "DUU",
         randomBattleMoves: ["encore", "roost", "thunderwave", "uturn"],
     },
     illumise: {
-        tier: "RU",
+        tier: "NU",
         doublesTier: "DUU",
-        randomBattleMoves: ["encore", "roost", "thunderwave", "wish", "bugbuzz"],
+        randomBattleMoves: ["bugbuzz", "encore", "roost", "thunderwave", "wish"],
     },
     budew: {
         tier: "LC",
@@ -1389,9 +1389,9 @@ exports.FormatsData = {
         tier: "LC",
     },
     swalot: {
-        tier: "RU",
+        tier: "NU",
         doublesTier: "DUU",
-        randomBattleMoves: ["gunkshot", "earthquake", "toxic", "painsplit", "encore"],
+        randomBattleMoves: ["earthquake", "encore", "gunkshot", "icebeam", "painsplit", "toxic"],
     },
     carvanha: {
         tier: "LC",
@@ -1399,41 +1399,41 @@ exports.FormatsData = {
     sharpedo: {
         tier: "RU",
         doublesTier: "DUU",
-        randomBattleMoves: ["earthquake", "liquidation", "crunch", "aquajet", "protect"],
+        randomBattleMoves: ["aquajet", "crunch", "earthquake", "liquidation", "protect"],
     },
     wailmer: {
         tier: "LC",
     },
     wailord: {
-        tier: "RU",
+        tier: "NU",
         doublesTier: "DUU",
-        randomBattleMoves: ["icebeam", "scald", "clearsmog", "waterspout"],
+        randomBattleMoves: ["clearsmog", "icebeam", "scald", "waterspout"],
     },
     numel: {
         tier: "LC",
     },
     camerupt: {
-        tier: "RU",
+        tier: "NU",
         doublesTier: "DUU",
-        randomBattleMoves: ["stealthrock", "earthpower", "lavaplume", "fireblast", "explosion"],
+        randomBattleMoves: ["earthpower", "explosion", "fireblast", "lavaplume", "stealthrock"],
     },
     torkoal: {
-        tier: "UU",
+        tier: "RU",
         doublesTier: "DOU",
-        randomBattleMoves: ["solarbeam", "stealthrock", "earthquake", "rapidspin", "lavaplume"],
+        randomBattleMoves: ["earthquake", "lavaplume", "rapidspin", "solarbeam", "stealthrock"],
     },
     spoink: {
         tier: "LC",
     },
     grumpig: {
-        tier: "RU",
+        tier: "NU",
         doublesTier: "DUU",
-        randomBattleMoves: ["nastyplot", "psyshock", "focusblast", "shadowball"],
+        randomBattleMoves: ["focusblast", "nastyplot", "psyshock", "shadowball"],
     },
     spinda: {
-        tier: "RU",
+        tier: "NU",
         doublesTier: "DUU",
-        randomBattleMoves: ["encore", "fakeout", "rapidspin", "bodyslam", "suckerpunch"],
+        randomBattleMoves: ["bodyslam", "encore", "fakeout", "rapidspin", "suckerpunch"],
     },
     trapinch: {
         tier: "LC",
@@ -1444,51 +1444,51 @@ exports.FormatsData = {
     flygon: {
         tier: "UU",
         doublesTier: "DUU",
-        randomBattleMoves: ["earthquake", "uturn", "dragondance", "outrage", "superpower"],
+        randomBattleMoves: ["defog", "dragondance", "earthquake", "outrage", "superpower", "uturn", "roost"],
     },
     cacnea: {
         tier: "LC",
     },
     cacturne: {
-        tier: "RU",
+        tier: "NU",
         doublesTier: "DUU",
-        randomBattleMoves: ["swordsdance", "suckerpunch", "seedbomb", "drainpunch", "poisonjab"],
+        randomBattleMoves: ["drainpunch", "poisonjab", "seedbomb", "suckerpunch", "swordsdance"],
     },
     swablu: {
         tier: "LC",
     },
     altaria: {
-        tier: "RU",
+        tier: "NU",
         doublesTier: "DUU",
-        randomBattleMoves: ["roost", "dracometeor", "fireblast", "haze", "hurricane"],
+        randomBattleMoves: ["dracometeor", "fireblast", "haze", "hurricane", "roost"],
     },
     zangoose: {
-        tier: "RU",
+        tier: "NU",
         doublesTier: "DUU",
-        randomBattleMoves: ["swordsdance", "closecombat", "quickattack", "facade", "shadowclaw"],
+        randomBattleMoves: ["closecombat", "facade", "quickattack", "shadowclaw", "swordsdance"],
     },
     seviper: {
-        tier: "RU",
+        tier: "NU",
         doublesTier: "DUU",
-        randomBattleMoves: ["sludgebomb", "flamethrower", "earthquake", "glare", "crunch", "gigadrain", "switcheroo"],
+        randomBattleMoves: ["crunch", "earthquake", "flamethrower", "gigadrain", "glare", "sludgebomb", "switcheroo"],
     },
     lunatone: {
-        tier: "RU",
+        tier: "NU",
         doublesTier: "DUU",
-        randomBattleMoves: ["nastyplot", "psyshock", "moonblast", "stealthrock", "icebeam"],
+        randomBattleMoves: ["icebeam", "moonblast", "nastyplot", "psyshock", "stealthrock"],
     },
     solrock: {
-        tier: "RU",
+        tier: "NU",
         doublesTier: "DUU",
-        randomBattleMoves: ["earthquake", "explosion", "stoneedge", "stealthrock", "willowisp"],
+        randomBattleMoves: ["earthquake", "explosion", "stealthrock", "stoneedge", "willowisp"],
     },
     barboach: {
         tier: "LC",
     },
     whiscash: {
-        tier: "RU",
+        tier: "NU",
         doublesTier: "DUU",
-        randomBattleMoves: ["dragondance", "earthquake", "waterfall", "stoneedge"],
+        randomBattleMoves: ["dragondance", "earthquake", "stoneedge", "waterfall"],
     },
     corphish: {
         tier: "LC",
@@ -1496,7 +1496,7 @@ exports.FormatsData = {
     crawdaunt: {
         tier: "OU",
         doublesTier: "DUU",
-        randomBattleMoves: ["knockoff", "dragondance", "superpower", "crabhammer", "aquajet"],
+        randomBattleMoves: ["aquajet", "crabhammer", "dragondance", "knockoff", "superpower"],
     },
     baltoy: {
         tier: "LC",
@@ -1504,23 +1504,23 @@ exports.FormatsData = {
     claydol: {
         tier: "RU",
         doublesTier: "DUU",
-        randomBattleMoves: ["earthquake", "psychic", "icebeam", "rapidspin", "stealthrock"],
+        randomBattleMoves: ["earthquake", "icebeam", "psychic", "rapidspin", "stealthrock"],
     },
     lileep: {
         tier: "LC",
     },
     cradily: {
         tier: "RU",
-        doublesTier: "DUU",
+        doublesTier: "DOU",
         randomBattleMoves: ["gigadrain", "recover", "stealthrock", "stoneedge"],
     },
     anorith: {
         tier: "LC",
     },
     armaldo: {
-        tier: "RU",
+        tier: "NU",
         doublesTier: "DUU",
-        randomBattleMoves: ["stoneedge", "rapidspin", "stealthrock", "knockoff", "aquajet", "xscissor"],
+        randomBattleMoves: ["aquajet", "knockoff", "rapidspin", "stealthrock", "stoneedge", "xscissor"],
     },
     feebas: {
         tier: "LC",
@@ -1528,25 +1528,25 @@ exports.FormatsData = {
     milotic: {
         tier: "UU",
         doublesTier: "DOU",
-        randomBattleMoves: ["scald", "rest", "sleeptalk", "icebeam", "dragontail"],
+        randomBattleMoves: ["dragontail", "icebeam", "rest", "scald", "sleeptalk"],
     },
     castform: {
-        tier: "RU",
+        tier: "NU",
         doublesTier: "DUU",
-        randomBattleMoves: ["icebeam", "flamethrower", "thunderbolt", "scald"],
+        randomBattleMoves: ["flamethrower", "icebeam", "scald", "thunderbolt"],
     },
     kecleon: {
-        tier: "RU",
+        tier: "NU",
         doublesTier: "DUU",
-        randomBattleMoves: ["fakeout", "stealthrock", "drainpunch", "thunderwave", "shadowsneak"],
+        randomBattleMoves: ["drainpunch", "fakeout", "shadowsneak", "stealthrock", "thunderwave"],
     },
     shuppet: {
         tier: "LC",
     },
     banette: {
-        tier: "RU",
+        tier: "NU",
         doublesTier: "DUU",
-        randomBattleMoves: ["shadowclaw", "willowisp", "destinybond", "shadowsneak", "knockoff"],
+        randomBattleMoves: ["destinybond", "knockoff", "shadowclaw", "shadowsneak", "willowisp"],
     },
     duskull: {
         tier: "LC",
@@ -1555,40 +1555,40 @@ exports.FormatsData = {
         tier: "NFE",
     },
     dusknoir: {
-        tier: "RU",
+        tier: "NU",
         doublesTier: "DUU",
-        randomBattleMoves: ["shadowpunch", "icepunch", "shadowsneak", "earthquake", "willowisp", "painsplit"],
+        randomBattleMoves: ["earthquake", "icepunch", "painsplit", "shadowpunch", "shadowsneak", "willowisp"],
     },
     tropius: {
-        tier: "RU",
+        tier: "NU",
         doublesTier: "DUU",
-        randomBattleMoves: ["dragondance", "leafblade", "aerialace", "roost", "earthquake"],
+        randomBattleMoves: ["defog", "substitute", "leechseed", "airslash"],
     },
     chingling: {
         tier: "LC",
     },
     chimecho: {
-        tier: "RU",
+        tier: "NU",
         doublesTier: "DUU",
-        randomBattleMoves: ["psychic", "lightscreen", "reflect", "thunderwave", "recover", "healingwish"],
+        randomBattleMoves: ["healingwish", "lightscreen", "psychic", "recover", "reflect", "thunderwave"],
     },
     absol: {
         tier: "RU",
         doublesTier: "DUU",
-        randomBattleMoves: ["knockoff", "suckerpunch", "swordsdance", "playrough"],
+        randomBattleMoves: ["knockoff", "playrough", "suckerpunch", "swordsdance"],
     },
     snorunt: {
         tier: "LC",
     },
     glalie: {
-        tier: "RU",
+        tier: "NU",
         doublesTier: "DUU",
-        randomBattleMoves: ["protect", "substitute", "disable", "freezedry", "earthquake"],
+        randomBattleMoves: ["disable", "earthquake", "freezedry", "protect", "substitute"],
     },
     froslass: {
-        tier: "RU",
+        tier: "UU",
         doublesTier: "DUU",
-        randomBattleMoves: ["icebeam", "shadowball", "willowisp", "destinybond", "taunt", "spikes"],
+        randomBattleMoves: ["destinybond", "icebeam", "shadowball", "spikes", "taunt", "willowisp"],
     },
     spheal: {
         tier: "LC",
@@ -1597,32 +1597,32 @@ exports.FormatsData = {
         tier: "NFE",
     },
     walrein: {
-        tier: "RU",
+        tier: "NU",
         doublesTier: "DUU",
-        randomBattleMoves: ["surf", "icebeam", "rest", "sleeptalk"],
+        randomBattleMoves: ["icebeam", "rest", "sleeptalk", "surf"],
     },
     clamperl: {
         tier: "LC",
     },
     huntail: {
-        tier: "RU",
+        tier: "NU",
         doublesTier: "DUU",
-        randomBattleMoves: ["shellsmash", "waterfall", "crunch", "icebeam"],
+        randomBattleMoves: ["crunch", "icebeam", "shellsmash", "waterfall"],
     },
     gorebyss: {
-        tier: "RU",
+        tier: "NU",
         doublesTier: "DUU",
-        randomBattleMoves: ["shellsmash", "hydropump", "icebeam", "psychic"],
+        randomBattleMoves: ["hydropump", "icebeam", "psychic", "shellsmash"],
     },
     relicanth: {
-        tier: "RU",
+        tier: "NU",
         doublesTier: "DUU",
-        randomBattleMoves: ["headsmash", "stealthrock", "waterfall", "earthquake", "doubleedge", "yawn"],
+        randomBattleMoves: ["doubleedge", "earthquake", "headsmash", "stealthrock", "waterfall", "yawn"],
     },
     luvdisc: {
-        tier: "RU",
+        tier: "NU",
         doublesTier: "DUU",
-        randomBattleMoves: ["scald", "icebeam", "sweetkiss", "charm"],
+        randomBattleMoves: ["charm", "icebeam", "scald", "sweetkiss"],
     },
     bagon: {
         tier: "LC",
@@ -1633,7 +1633,7 @@ exports.FormatsData = {
     salamence: {
         tier: "UUBL",
         doublesTier: "DOU",
-        randomBattleMoves: ["dragondance", "earthquake", "outrage", "stoneedge", "roost", "aerialace"],
+        randomBattleMoves: ["aerialace", "dragondance", "earthquake", "outrage", "roost", "stoneedge"],
     },
     beldum: {
         tier: "LC",
@@ -1644,72 +1644,72 @@ exports.FormatsData = {
     metagross: {
         tier: "UU",
         doublesTier: "DUU",
-        randomBattleMoves: ["meteormash", "zenheadbutt", "agility", "earthquake", "bulletpunch", "explosion"],
+        randomBattleMoves: ["agility", "bulletpunch", "earthquake", "explosion", "meteormash", "zenheadbutt"],
     },
     regirock: {
-        tier: "RU",
+        tier: "NU",
         doublesTier: "DUU",
-        randomBattleMoves: ["stoneedge", "stealthrock", "earthquake", "curse", "rest", "drainpunch"],
+        randomBattleMoves: ["curse", "drainpunch", "earthquake", "rest", "stealthrock", "stoneedge"],
     },
     regice: {
-        tier: "RU",
+        tier: "NU",
         doublesTier: "DUU",
-        randomBattleMoves: ["icebeam", "thunderbolt", "rockpolish", "rest", "sleeptalk", "focusblast"],
+        randomBattleMoves: ["focusblast", "icebeam", "rest", "rockpolish", "sleeptalk", "thunderbolt"],
     },
     registeel: {
         tier: "UU",
         doublesTier: "DUU",
-        randomBattleMoves: ["stealthrock", "ironhead", "curse", "rest", "sleeptalk"],
+        randomBattleMoves: ["curse", "ironhead", "rest", "sleeptalk"],
     },
     latias: {
         tier: "OU",
         doublesTier: "DUU",
-        randomBattleMoves: ["calmmind", "roost", "psychic", "dracometeor", "healingwish", "surf"],
+        randomBattleMoves: ["calmmind", "dracometeor", "healingwish", "psychic", "roost", "surf"],
     },
     latios: {
         tier: "OU",
         doublesTier: "DOU",
-        randomBattleMoves: ["calmmind", "roost", "psychic", "dracometeor"],
+        randomBattleMoves: ["calmmind", "dracometeor", "psychic", "roost"],
     },
     kyogre: {
         tier: "Uber",
         doublesTier: "DUber",
-        randomBattleMoves: ["waterspout", "thunder", "icebeam", "originpulse", "calmmind"],
+        randomBattleMoves: ["calmmind", "icebeam", "originpulse", "thunder", "waterspout"],
     },
     groudon: {
         tier: "Uber",
         doublesTier: "DUber",
-        randomBattleMoves: ["precipiceblades", "stoneedge", "rockpolish", "swordsdance"],
+        randomBattleMoves: ["precipiceblades", "rockpolish", "stoneedge", "swordsdance"],
     },
     rayquaza: {
         tier: "Uber",
         doublesTier: "DUber",
-        randomBattleMoves: ["dragondance", "outrage", "extremespeed", "earthquake", "dragonascent"],
+        randomBattleMoves: ["dragonascent", "dragondance", "earthquake", "extremespeed", "outrage"],
     },
     jirachi: {
         tier: "OU",
         doublesTier: "DUU",
-        randomBattleMoves: ["uturn", "stealthrock", "thunderwave", "healingwish", "zenheadbutt"],
+        randomBattleMoves: ["healingwish", "stealthrock", "thunderwave", "uturn", "zenheadbutt"],
     },
     deoxys: {
         isNonstandard: "Unobtainable",
         tier: "Unreleased",
-        randomBattleMoves: ["stealthrock", "toxicspikes", "icebeam", "psychoboost", "knockoff", "focusblast"],
+        randomBattleMoves: ["superpower", "icebeam", "knockoff", "psychoboost", "stealthrock", "toxicspikes"],
     },
     deoxysattack: {
         isNonstandard: "Unobtainable",
         tier: "Unreleased",
-        randomBattleMoves: ["psychoboost", "icebeam", "knockoff", "superpower", "extremespeed"],
+        randomBattleMoves: ["extremespeed", "icebeam", "knockoff", "psychoboost", "superpower"],
     },
     deoxysdefense: {
         isNonstandard: "Unobtainable",
         tier: "Unreleased",
-        randomBattleMoves: ["nightshade", "stealthrock", "toxicspikes", "recover", "knockoff", "taunt", "teleport"],
+        randomBattleMoves: ["knockoff", "nightshade", "recover", "stealthrock", "taunt", "teleport", "toxicspikes"],
     },
     deoxysspeed: {
         isNonstandard: "Unobtainable",
         tier: "Unreleased",
-        randomBattleMoves: ["psychic", "stealthrock", "toxicspikes", "knockoff", "taunt"],
+        randomBattleMoves: ["knockoff", "psychic", "stealthrock", "taunt", "toxicspikes"],
     },
     turtwig: {
         tier: "LC",
@@ -1720,7 +1720,7 @@ exports.FormatsData = {
     torterra: {
         tier: "RU",
         doublesTier: "DUU",
-        randomBattleMoves: ["earthquake", "stealthrock", "woodhammer", "stoneedge", "synthesis", "rockpolish"],
+        randomBattleMoves: ["earthquake", "rockpolish", "stealthrock", "stoneedge", "synthesis", "woodhammer"],
     },
     chimchar: {
         tier: "LC",
@@ -1731,7 +1731,7 @@ exports.FormatsData = {
     infernape: {
         tier: "OU",
         doublesTier: "DOU",
-        randomBattleMoves: ["closecombat", "flareblitz", "swordsdance", "machpunch", "stoneedge", "uturn", "stealthrock"],
+        randomBattleMoves: ["closecombat", "flareblitz", "machpunch", "stealthrock", "stoneedge", "swordsdance", "uturn"],
     },
     piplup: {
         tier: "LC",
@@ -1740,9 +1740,9 @@ exports.FormatsData = {
         tier: "NFE",
     },
     empoleon: {
-        tier: "OU",
+        tier: "UU",
         doublesTier: "DUU",
-        randomBattleMoves: ["scald", "stealthrock", "icebeam", "flashcannon", "agility", "defog"],
+        randomBattleMoves: ["agility", "defog", "flashcannon", "icebeam", "scald", "stealthrock"],
     },
     starly: {
         tier: "LC",
@@ -1753,23 +1753,23 @@ exports.FormatsData = {
     staraptor: {
         tier: "OU",
         doublesTier: "DUU",
-        randomBattleMoves: ["bravebird", "doubleedge", "closecombat", "uturn", "quickattack"],
+        randomBattleMoves: ["bravebird", "closecombat", "doubleedge", "quickattack", "uturn"],
     },
     bidoof: {
         tier: "LC",
     },
     bibarel: {
-        tier: "RU",
+        tier: "NU",
         doublesTier: "DUU",
-        randomBattleMoves: ["curse", "quickattack", "aquajet", "rest", "aquatail"],
+        randomBattleMoves: ["aquajet", "aquatail", "curse", "quickattack", "rest"],
     },
     kricketot: {
         tier: "LC",
     },
     kricketune: {
-        tier: "RU",
+        tier: "NU",
         doublesTier: "DUU",
-        randomBattleMoves: ["bugbite", "stickyweb", "nightslash", "brickbreak"],
+        randomBattleMoves: ["brickbreak", "bugbite", "nightslash", "stickyweb"],
     },
     shinx: {
         tier: "LC",
@@ -1778,77 +1778,77 @@ exports.FormatsData = {
         tier: "NFE",
     },
     luxray: {
-        tier: "RU",
+        tier: "NU",
         doublesTier: "DUU",
-        randomBattleMoves: ["wildcharge", "facade", "voltswitch", "crunch"],
+        randomBattleMoves: ["crunch", "facade", "voltswitch", "wildcharge"],
     },
     cranidos: {
         tier: "LC",
     },
     rampardos: {
-        tier: "RU",
+        tier: "NU",
         doublesTier: "DUU",
-        randomBattleMoves: ["headsmash", "zenheadbutt", "stealthrock", "crunch", "rockpolish", "earthquake"],
+        randomBattleMoves: ["crunch", "earthquake", "headsmash", "rockpolish", "zenheadbutt"],
     },
     shieldon: {
         tier: "LC",
     },
     bastiodon: {
-        tier: "RU",
+        tier: "NU",
         doublesTier: "DUU",
-        randomBattleMoves: ["rockblast", "stealthrock", "roar", "metalburst"],
+        randomBattleMoves: ["metalburst", "roar", "rockblast", "stealthrock"],
     },
     burmy: {
         tier: "LC",
     },
     wormadam: {
-        tier: "RU",
+        tier: "NU",
         doublesTier: "DUU",
-        randomBattleMoves: ["bugbuzz", "psychic", "shadowball", "quiverdance", "leafstorm"],
+        randomBattleMoves: ["bugbuzz", "leafstorm", "psychic", "quiverdance", "shadowball"],
     },
     wormadamsandy: {
-        tier: "RU",
+        tier: "NU",
         doublesTier: "DUU",
         randomBattleMoves: ["bugbuzz", "earthquake", "rockblast", "stealthrock"],
     },
     wormadamtrash: {
-        tier: "RU",
+        tier: "NU",
         doublesTier: "DUU",
-        randomBattleMoves: ["bugbuzz", "gigadrain", "flashcannon", "quiverdance", "stealthrock"],
+        randomBattleMoves: ["bugbuzz", "flashcannon", "gigadrain", "quiverdance", "stealthrock"],
     },
     mothim: {
-        tier: "RU",
+        tier: "NU",
         doublesTier: "DUU",
-        randomBattleMoves: ["quiverdance", "airslash", "bugbuzz", "roost", "energyball"],
+        randomBattleMoves: ["airslash", "bugbuzz", "energyball", "quiverdance", "roost"],
     },
     combee: {
         tier: "LC",
     },
     vespiquen: {
-        tier: "RU",
+        tier: "NU",
         doublesTier: "DUU",
-        randomBattleMoves: ["attackorder", "uturn", "roost", "toxic", "substitute"],
+        randomBattleMoves: ["attackorder", "roost", "substitute", "toxic", "uturn"],
     },
     pachirisu: {
-        tier: "RU",
+        tier: "NU",
         doublesTier: "DUU",
-        randomBattleMoves: ["nuzzle", "thunderbolt", "superfang", "uturn"],
+        randomBattleMoves: ["nuzzle", "superfang", "thunderbolt", "uturn"],
     },
     buizel: {
         tier: "LC",
     },
     floatzel: {
-        tier: "RU",
+        tier: "NU",
         doublesTier: "DUU",
-        randomBattleMoves: ["aquajet", "waterfall", "brickbreak", "bulkup", "taunt", "substitute"],
+        randomBattleMoves: ["aquajet", "brickbreak", "bulkup", "substitute", "taunt", "waterfall"],
     },
     cherubi: {
         tier: "LC",
     },
     cherrim: {
-        tier: "RU",
+        tier: "NU",
         doublesTier: "DUU",
-        randomBattleMoves: ["dazzlinggleam", "petaldance", "healingwish", "gigadrain"],
+        randomBattleMoves: ["dazzlinggleam", "gigadrain", "healingwish", "petaldance"],
     },
     shellos: {
         tier: "LC",
@@ -1856,13 +1856,13 @@ exports.FormatsData = {
     gastrodon: {
         tier: "RU",
         doublesTier: "DOU",
-        randomBattleMoves: ["earthquake", "scald", "recover", "icebeam"],
+        randomBattleMoves: ["earthquake", "icebeam", "recover", "scald"],
     },
     drifloon: {
         tier: "LC",
     },
     drifblim: {
-        tier: "RU",
+        tier: "NU",
         doublesTier: "DUU",
         randomBattleMoves: ["calmmind", "shadowball", "strengthsap", "thunderbolt"],
     },
@@ -1870,25 +1870,25 @@ exports.FormatsData = {
         tier: "LC",
     },
     lopunny: {
-        tier: "RU",
+        tier: "NU",
         doublesTier: "DUU",
-        randomBattleMoves: ["highjumpkick", "facade", "healingwish", "switcheroo"],
+        randomBattleMoves: ["facade", "healingwish", "highjumpkick", "switcheroo"],
     },
     glameow: {
         tier: "LC",
     },
     purugly: {
-        tier: "RU",
+        tier: "NU",
         doublesTier: "DUU",
-        randomBattleMoves: ["fakeout", "quickattack", "suckerpunch", "uturn", "bodyslam"],
+        randomBattleMoves: ["bodyslam", "fakeout", "quickattack", "suckerpunch", "uturn"],
     },
     stunky: {
         tier: "LC",
     },
     skuntank: {
-        tier: "RU",
+        tier: "NU",
         doublesTier: "DUU",
-        randomBattleMoves: ["crunch", "defog", "fireblast", "suckerpunch", "taunt", "poisonjab"],
+        randomBattleMoves: ["crunch", "defog", "fireblast", "poisonjab", "suckerpunch", "taunt"],
     },
     bronzor: {
         tier: "LC",
@@ -1896,12 +1896,12 @@ exports.FormatsData = {
     bronzong: {
         tier: "UU",
         doublesTier: "DOU",
-        randomBattleMoves: ["earthquake", "gyroball", "stealthrock", "psychic"],
+        randomBattleMoves: ["earthquake", "gyroball", "psychic", "stealthrock"],
     },
     chatot: {
-        tier: "RU",
+        tier: "NU",
         doublesTier: "DUU",
-        randomBattleMoves: ["boomburst", "chatter", "nastyplot", "uturn", "substitute"],
+        randomBattleMoves: ["boomburst", "chatter", "nastyplot", "substitute", "uturn"],
     },
     spiritomb: {
         tier: "RU",
@@ -1925,7 +1925,7 @@ exports.FormatsData = {
     lucario: {
         tier: "OU",
         doublesTier: "DUU",
-        randomBattleMoves: ["closecombat", "meteormash", "stoneedge", "extremespeed", "swordsdance"],
+        randomBattleMoves: ["closecombat", "extremespeed", "meteormash", "stoneedge", "swordsdance"],
     },
     hippopotas: {
         tier: "LC",
@@ -1933,7 +1933,7 @@ exports.FormatsData = {
     hippowdon: {
         tier: "UU",
         doublesTier: "DUU",
-        randomBattleMoves: ["earthquake", "stoneedge", "stealthrock", "whirlwind", "slackoff"],
+        randomBattleMoves: ["earthquake", "slackoff", "stealthrock", "stoneedge", "whirlwind"],
     },
     skorupi: {
         tier: "LC",
@@ -1941,26 +1941,26 @@ exports.FormatsData = {
     drapion: {
         tier: "UU",
         doublesTier: "DUU",
-        randomBattleMoves: ["earthquake", "knockoff", "poisonjab", "swordsdance", "toxicspikes", "whirlwind", "taunt"],
+        randomBattleMoves: ["earthquake", "knockoff", "poisonjab", "swordsdance", "taunt", "toxicspikes", "whirlwind"],
     },
     croagunk: {
         tier: "LC",
     },
     toxicroak: {
-        tier: "RU",
+        tier: "NU",
         doublesTier: "DUU",
-        randomBattleMoves: ["drainpunch", "poisonjab", "suckerpunch", "swordsdance", "substitute"],
+        randomBattleMoves: ["drainpunch", "poisonjab", "substitute", "suckerpunch", "swordsdance"],
     },
     carnivine: {
-        tier: "RU",
+        tier: "NU",
         doublesTier: "DUU",
-        randomBattleMoves: ["powerwhip", "swordsdance", "sleeppowder", "substitute", "crunch"],
+        randomBattleMoves: ["crunch", "powerwhip", "sleeppowder", "substitute", "swordsdance"],
     },
     finneon: {
         tier: "LC",
     },
     lumineon: {
-        tier: "RU",
+        tier: "NU",
         doublesTier: "DUU",
         randomBattleMoves: ["defog", "icebeam", "scald", "uturn"],
     },
@@ -1968,187 +1968,187 @@ exports.FormatsData = {
         tier: "LC",
     },
     abomasnow: {
-        tier: "RU",
+        tier: "NU",
         doublesTier: "DOU",
-        randomBattleMoves: ["auroraveil", "earthquake", "iceshard", "woodhammer", "blizzard"],
+        randomBattleMoves: ["auroraveil", "blizzard", "earthquake", "iceshard", "woodhammer"],
     },
     rotom: {
         tier: "RU",
         doublesTier: "DUU",
-        randomBattleMoves: ["shadowball", "thunderbolt", "voltswitch", "willowisp", "trick", "nastyplot"],
+        randomBattleMoves: ["nastyplot", "shadowball", "thunderbolt", "trick", "voltswitch", "willowisp"],
     },
     rotomheat: {
         tier: "UU",
-        doublesTier: "DOU",
-        randomBattleMoves: ["thunderbolt", "overheat", "voltswitch", "willowisp", "trick", "nastyplot"],
+        doublesTier: "DUU",
+        randomBattleMoves: ["nastyplot", "overheat", "thunderbolt", "trick", "voltswitch", "willowisp"],
     },
     rotomwash: {
         tier: "OU",
         doublesTier: "DOU",
-        randomBattleMoves: ["thunderbolt", "hydropump", "voltswitch", "willowisp", "trick", "nastyplot"],
+        randomBattleMoves: ["hydropump", "nastyplot", "thunderbolt", "trick", "voltswitch", "willowisp"],
     },
     rotomfrost: {
-        tier: "RU",
+        tier: "NU",
         doublesTier: "DUU",
-        randomBattleMoves: ["thunderbolt", "blizzard", "voltswitch", "willowisp", "trick", "nastyplot"],
+        randomBattleMoves: ["blizzard", "nastyplot", "thunderbolt", "trick", "voltswitch", "willowisp"],
     },
     rotomfan: {
-        tier: "RU",
+        tier: "NU",
         doublesTier: "DUU",
-        randomBattleMoves: ["thunderbolt", "airslash", "voltswitch", "willowisp", "trick", "nastyplot"],
+        randomBattleMoves: ["airslash", "nastyplot", "thunderbolt", "trick", "voltswitch", "willowisp"],
     },
     rotommow: {
         tier: "UU",
         doublesTier: "DUU",
-        randomBattleMoves: ["thunderbolt", "leafstorm", "voltswitch", "willowisp", "trick", "nastyplot"],
+        randomBattleMoves: ["leafstorm", "nastyplot", "thunderbolt", "trick", "voltswitch", "willowisp"],
     },
     uxie: {
         tier: "RU",
         doublesTier: "DUU",
-        randomBattleMoves: ["psychic", "stealthrock", "uturn", "thunderwave", "yawn"],
+        randomBattleMoves: ["psychic", "stealthrock", "thunderwave", "uturn", "yawn"],
     },
     mesprit: {
         tier: "RU",
         doublesTier: "DUU",
-        randomBattleMoves: ["psychic", "icebeam", "thunderbolt", "nastyplot", "energyball", "uturn", "healingwish"],
+        randomBattleMoves: ["energyball", "healingwish", "icebeam", "nastyplot", "psychic", "thunderbolt", "uturn"],
     },
     azelf: {
         tier: "OU",
         doublesTier: "DUU",
-        randomBattleMoves: ["psychic", "nastyplot", "thunderbolt", "fireblast", "dazzlinggleam", "stealthrock", "uturn", "taunt"],
+        randomBattleMoves: ["dazzlinggleam", "fireblast", "nastyplot", "psychic", "stealthrock", "taunt", "thunderbolt", "uturn"],
     },
     dialga: {
         tier: "Uber",
         doublesTier: "DUber",
-        randomBattleMoves: ["dracometeor", "flashcannon", "stealthrock", "thunderbolt", "fireblast"],
+        randomBattleMoves: ["dracometeor", "fireblast", "flashcannon", "stealthrock", "thunderbolt"],
     },
     palkia: {
         tier: "Uber",
         doublesTier: "DUber",
-        randomBattleMoves: ["spacialrend", "hydropump", "fireblast", "thunderwave", "dracometeor"],
+        randomBattleMoves: ["dracometeor", "fireblast", "hydropump", "spacialrend", "thunderwave"],
     },
     heatran: {
         tier: "OU",
         doublesTier: "DOU",
-        randomBattleMoves: ["lavaplume", "flashcannon", "stealthrock", "roar", "earthpower", "taunt"],
+        randomBattleMoves: ["earthpower", "flashcannon", "lavaplume", "roar", "stealthrock", "taunt"],
     },
     regigigas: {
-        tier: "RU",
+        tier: "NU",
         doublesTier: "DUU",
-        randomBattleMoves: ["rest", "sleeptalk", "strength", "knockoff"],
+        randomBattleMoves: ["knockoff", "rest", "sleeptalk", "strength"],
     },
     giratina: {
         tier: "Uber",
         doublesTier: "DUber",
-        randomBattleMoves: ["shadowball", "dragonpulse", "rest", "sleeptalk", "aurasphere", "calmmind"],
+        randomBattleMoves: ["aurasphere", "calmmind", "dragonpulse", "rest", "shadowball", "sleeptalk"],
     },
     giratinaorigin: {
         tier: "Uber",
         doublesTier: "DUber",
-        randomBattleMoves: ["dracometeor", "shadowball", "aurasphere", "willowisp", "defog"],
+        randomBattleMoves: ["aurasphere", "defog", "dracometeor", "shadowball", "willowisp"],
     },
     cresselia: {
         tier: "UU",
         doublesTier: "DOU",
-        randomBattleMoves: ["calmmind", "psychic", "moonblast", "moonlight", "thunderwave"],
+        randomBattleMoves: ["calmmind", "moonblast", "moonlight", "psychic", "thunderwave"],
     },
     phione: {
-        tier: "RU",
+        tier: "NU",
         doublesTier: "DUU",
-        randomBattleMoves: ["scald", "raindance", "rest", "icebeam"],
+        randomBattleMoves: ["icebeam", "raindance", "rest", "scald"],
     },
     manaphy: {
-        tier: "OU",
+        tier: "Uber",
         doublesTier: "DUU",
-        randomBattleMoves: ["surf", "tailglow", "icebeam", "energyball", "substitute"],
+        randomBattleMoves: ["energyball", "icebeam", "substitute", "surf", "tailglow"],
     },
     darkrai: {
         isNonstandard: "Unobtainable",
         tier: "Unreleased",
-        randomBattleMoves: ["darkpulse", "nastyplot", "hypnosis", "focusblast"],
+        randomBattleMoves: ["darkpulse", "focusblast", "hypnosis", "nastyplot"],
     },
     shaymin: {
         isNonstandard: "Unobtainable",
         tier: "Unreleased",
-        randomBattleMoves: ["seedflare", "healingwish", "rest", "leechseed", "psychic", "substitute"],
+        randomBattleMoves: ["healingwish", "leechseed", "psychic", "rest", "seedflare", "substitute"],
     },
     shayminsky: {
         isNonstandard: "Unobtainable",
         tier: "Unreleased",
-        randomBattleMoves: ["seedflare", "substitute", "synthesis", "leechseed", "airslash"],
+        randomBattleMoves: ["airslash", "leechseed", "seedflare", "substitute", "synthesis"],
     },
     arceus: {
         isNonstandard: "Unobtainable",
         tier: "Unreleased",
-        randomBattleMoves: ["swordsdance", "recover", "extremespeed", "earthquake", "shadowclaw"],
+        randomBattleMoves: ["earthquake", "extremespeed", "recover", "shadowclaw", "swordsdance"],
     },
     arceusbug: {
         isNonstandard: "Unobtainable",
-        randomBattleMoves: ["swordsdance", "recover", "extremespeed", "earthquake", "stoneedge", "xscissor"],
+        randomBattleMoves: ["earthquake", "extremespeed", "recover", "stoneedge", "swordsdance", "xscissor"],
     },
     arceusdark: {
         isNonstandard: "Unobtainable",
-        randomBattleMoves: ["calmmind", "judgment", "fireblast", "sludgebomb", "recover"],
+        randomBattleMoves: ["calmmind", "fireblast", "judgment", "recover", "sludgebomb"],
     },
     arceusdragon: {
         isNonstandard: "Unobtainable",
-        randomBattleMoves: ["calmmind", "judgment", "fireblast", "sludgebomb", "recover"],
+        randomBattleMoves: ["calmmind", "fireblast", "judgment", "recover", "sludgebomb"],
     },
     arceuselectric: {
         isNonstandard: "Unobtainable",
-        randomBattleMoves: ["calmmind", "judgment", "icebeam", "earthpower", "recover"],
+        randomBattleMoves: ["calmmind", "earthpower", "icebeam", "judgment", "recover"],
     },
     arceusfairy: {
         isNonstandard: "Unobtainable",
-        randomBattleMoves: ["calmmind", "judgment", "earthpower", "fireblast", "recover"],
+        randomBattleMoves: ["calmmind", "earthpower", "fireblast", "judgment", "recover"],
     },
     arceusfighting: {
         isNonstandard: "Unobtainable",
-        randomBattleMoves: ["calmmind", "judgment", "icebeam", "shadowball", "recover"],
+        randomBattleMoves: ["calmmind", "icebeam", "judgment", "recover", "shadowball"],
     },
     arceusfire: {
         isNonstandard: "Unobtainable",
-        randomBattleMoves: ["thunderbolt", "judgment", "surf", "recover", "calmmind"],
+        randomBattleMoves: ["calmmind", "judgment", "recover", "surf", "thunderbolt"],
     },
     arceusflying: {
         isNonstandard: "Unobtainable",
-        randomBattleMoves: ["calmmind", "judgment", "icebeam", "earthpower", "recover", "fireblast"],
+        randomBattleMoves: ["calmmind", "earthpower", "fireblast", "icebeam", "judgment", "recover"],
     },
     arceusghost: {
         isNonstandard: "Unobtainable",
-        randomBattleMoves: ["swordsdance", "shadowclaw", "brickbreak", "extremespeed", "recover"],
+        randomBattleMoves: ["brickbreak", "extremespeed", "recover", "shadowclaw", "swordsdance"],
     },
     arceusgrass: {
         isNonstandard: "Unobtainable",
-        randomBattleMoves: ["calmmind", "judgment", "fireblast", "icebeam", "recover"],
+        randomBattleMoves: ["calmmind", "fireblast", "icebeam", "judgment", "recover"],
     },
     arceusground: {
         isNonstandard: "Unobtainable",
-        randomBattleMoves: ["swordsdance", "earthquake", "stoneedge", "extremespeed", "recover"],
+        randomBattleMoves: ["earthquake", "extremespeed", "recover", "stoneedge", "swordsdance"],
     },
     arceusice: {
         isNonstandard: "Unobtainable",
-        randomBattleMoves: ["calmmind", "judgment", "fireblast", "thunderbolt", "recover"],
+        randomBattleMoves: ["calmmind", "fireblast", "judgment", "recover", "thunderbolt"],
     },
     arceuspoison: {
         isNonstandard: "Unobtainable",
-        randomBattleMoves: ["calmmind", "defog", "earthpower", "sludgebomb", "recover"],
+        randomBattleMoves: ["calmmind", "defog", "earthpower", "recover", "sludgebomb"],
     },
     arceuspsychic: {
         isNonstandard: "Unobtainable",
-        randomBattleMoves: ["calmmind", "judgment", "fireblast", "icebeam", "recover"],
+        randomBattleMoves: ["calmmind", "fireblast", "icebeam", "judgment", "recover"],
     },
     arceusrock: {
         isNonstandard: "Unobtainable",
-        randomBattleMoves: ["swordsdance", "earthquake", "stoneedge", "extremespeed", "recover"],
+        randomBattleMoves: ["earthquake", "extremespeed", "recover", "stoneedge", "swordsdance"],
     },
     arceussteel: {
         isNonstandard: "Unobtainable",
-        randomBattleMoves: ["defog", "judgment", "surf", "willowisp", "recover", "roar", "stealthrock"],
+        randomBattleMoves: ["defog", "judgment", "recover", "roar", "stealthrock", "surf", "willowisp"],
     },
     arceuswater: {
         isNonstandard: "Unobtainable",
-        randomBattleMoves: ["roar", "judgment", "defog", "icebeam", "recover"],
+        randomBattleMoves: ["defog", "icebeam", "judgment", "recover", "roar"],
     },
     // Because it's marked as Unobtainable in the main file for some reason
     eternatuseternamax: {