@pkmn/mods 0.4.24 → 0.5.2

package/src/gen8bdsp/formats-data.ts

@@ -9,7 +9,7 @@ export const FormatsData: {[k: string]: ModdedSpeciesFormatsData} = {
 		tier: "NFE",
 	},
 	venusaur: {
-		tier: "OU",
+		tier: "UU",
 		doublesTier: "DOU",
 		randomBattleMoves: ["sludgebomb", "gigadrain", "sleeppowder", "leechseed", "substitute"],
 	},
@@ -20,7 +20,7 @@ export const FormatsData: {[k: string]: ModdedSpeciesFormatsData} = {
 		tier: "NFE",
 	},
 	charizard: {
-		tier: "OU",
+		tier: "UU",
 		doublesTier: "DOU",
 		randomBattleMoves: ["fireblast", "airslash", "roost", "focusblast", "earthquake"],
 	},
@@ -31,9 +31,9 @@ export const FormatsData: {[k: string]: ModdedSpeciesFormatsData} = {
 		tier: "NFE",
 	},
 	blastoise: {
-		tier: "OU",
+		tier: "UU",
 		doublesTier: "DOU",
-		randomBattleMoves: ["scald", "rapidspin", "protect", "icebeam", "roar"],
+		randomBattleMoves: ["earthquake", "icebeam", "protect", "rapidspin", "roar", "scald", "shellsmash"],
 	},
 	caterpie: {
 		tier: "LC",
@@ -42,9 +42,9 @@ export const FormatsData: {[k: string]: ModdedSpeciesFormatsData} = {
 		tier: "NFE",
 	},
 	butterfree: {
-		tier: "OU",
+		tier: "UU",
 		doublesTier: "DOU",
-		randomBattleMoves: ["quiverdance", "bugbuzz", "airslash", "sleeppowder", "airslash", "gigadrain"],
+		randomBattleMoves: ["quiverdance", "bugbuzz", "airslash", "sleeppowder", "gigadrain"],
 	},
 	weedle: {
 		tier: "LC",
@@ -53,7 +53,7 @@ export const FormatsData: {[k: string]: ModdedSpeciesFormatsData} = {
 		tier: "NFE",
 	},
 	beedrill: {
-		tier: "OU",
+		tier: "UU",
 		doublesTier: "DOU",
 		randomBattleMoves: ["toxicspikes", "uturn", "poisonjab", "protect"],
 	},
@@ -68,9 +68,9 @@ export const FormatsData: {[k: string]: ModdedSpeciesFormatsData} = {
 		tier: "NFE",
 	},
 	pidgeot: {
-		tier: "OU",
+		tier: "UU",
 		doublesTier: "DOU",
-		randomBattleMoves: ["bravebird", "uturn", "steelwing", "gigaimpact", "quickattack"],
+		randomBattleMoves: ["bravebird", "uturn", "steelwing", "roost", "quickattack", "defog"],
 	},
 	pidgeotmega: {
 		isNonstandard: "Past",
@@ -80,23 +80,23 @@ export const FormatsData: {[k: string]: ModdedSpeciesFormatsData} = {
 		tier: "LC",
 	},
 	raticate: {
-		tier: "OU",
+		tier: "UU",
 		doublesTier: "DOU",
-		randomBattleMoves: ["facade", "swordsdance", "protect", "crunch", "suckerpunch"],
+		randomBattleMoves: ["facade", "swordsdance", "protect", "crunch", "suckerpunch", "flamewheel"],
 	},
 	spearow: {
 		tier: "LC",
 	},
 	fearow: {
-		tier: "OU",
+		tier: "UU",
 		doublesTier: "DOU",
-		randomBattleMoves: ["drillpeck", "steelwing", "uturn", "gigaimpact"],
+		randomBattleMoves: ["drillpeck", "drillrun", "uturn", "gigaimpact"],
 	},
 	ekans: {
 		tier: "LC",
 	},
 	arbok: {
-		tier: "OU",
+		tier: "UU",
 		doublesTier: "DOU",
 		randomBattleMoves: ["gunkshot", "glare", "earthquake", "suckerpunch"],
 	},
@@ -105,10 +105,10 @@ export const FormatsData: {[k: string]: ModdedSpeciesFormatsData} = {
 	},
 	pikachu: {
 		tier: "NFE",
-		randomBattleMoves: ["thunderbolt", "grassknot", "voltswitch", "surf"],
+		randomBattleMoves: ["volttackle", "grassknot", "voltswitch", "surf"],
 	},
 	raichu: {
-		tier: "OU",
+		tier: "UU",
 		doublesTier: "DOU",
 		randomBattleMoves: ["nastyplot", "thunderbolt", "grassknot", "focusblast", "surf"],
 	},
@@ -116,9 +116,9 @@ export const FormatsData: {[k: string]: ModdedSpeciesFormatsData} = {
 		tier: "LC",
 	},
 	sandslash: {
-		tier: "OU",
+		tier: "UU",
 		doublesTier: "DOU",
-		randomBattleMoves: ["stealthrock", "earthquake", "rapidspin", "xscissor", "stoneedge"],
+		randomBattleMoves: ["stealthrock", "earthquake", "rapidspin", "xscissor", "stoneedge", "swordsdance"],
 	},
 	nidoranf: {
 		tier: "LC",
@@ -127,7 +127,7 @@ export const FormatsData: {[k: string]: ModdedSpeciesFormatsData} = {
 		tier: "NFE",
 	},
 	nidoqueen: {
-		tier: "OU",
+		tier: "UU",
 		doublesTier: "DOU",
 		randomBattleMoves: ["earthpower", "sludgewave", "stealthrock", "toxicspikes", "flamethrower", "icebeam"],
 	},
@@ -138,9 +138,9 @@ export const FormatsData: {[k: string]: ModdedSpeciesFormatsData} = {
 		tier: "NFE",
 	},
 	nidoking: {
-		tier: "OU",
+		tier: "UU",
 		doublesTier: "DOU",
-		randomBattleMoves: ["earthpower", "sludgewave", "flamethrower", "icebeam"],
+		randomBattleMoves: ["earthpower", "sludgewave", "flamethrower", "icebeam", "substitute"],
 	},
 	cleffa: {
 		tier: "LC",
@@ -157,7 +157,7 @@ export const FormatsData: {[k: string]: ModdedSpeciesFormatsData} = {
 		tier: "LC",
 	},
 	ninetales: {
-		tier: "OU",
+		tier: "UU",
 		doublesTier: "DOU",
 		randomBattleMoves: ["nastyplot", "fireblast", "hypnosis", "solarbeam", "willowisp"],
 	},
@@ -168,7 +168,7 @@ export const FormatsData: {[k: string]: ModdedSpeciesFormatsData} = {
 		tier: "NFE",
 	},
 	wigglytuff: {
-		tier: "OU",
+		tier: "UU",
 		doublesTier: "DOU",
 		randomBattleMoves: ["stealthrock", "reflect", "lightscreen", "dazzlinggleam", "thunderwave", "fireblast"],
 	},
@@ -179,9 +179,9 @@ export const FormatsData: {[k: string]: ModdedSpeciesFormatsData} = {
 		tier: "NFE",
 	},
 	crobat: {
-		tier: "OU",
+		tier: "UU",
 		doublesTier: "DOU",
-		randomBattleMoves: ["airslash", "roost", "defog", "toxic", "uturn"],
+		randomBattleMoves: ["bravebird", "roost", "defog", "toxic", "uturn"],
 	},
 	oddish: {
 		tier: "LC",
@@ -190,19 +190,19 @@ export const FormatsData: {[k: string]: ModdedSpeciesFormatsData} = {
 		tier: "NFE",
 	},
 	vileplume: {
-		tier: "OU",
+		tier: "UU",
 		doublesTier: "DOU",
 		randomBattleMoves: ["strengthsap", "aromatherapy", "sludgebomb", "sleeppowder", "gigadrain"],
 	},
 	bellossom: {
-		tier: "OU",
+		tier: "UU",
 		doublesTier: "DOU",
 	},
 	paras: {
 		tier: "LC",
 	},
 	parasect: {
-		tier: "OU",
+		tier: "UU",
 		doublesTier: "DOU",
 		randomBattleMoves: ["spore", "leechseed", "xscissor", "substitute"],
 	},
@@ -210,15 +210,15 @@ export const FormatsData: {[k: string]: ModdedSpeciesFormatsData} = {
 		tier: "LC",
 	},
 	venomoth: {
-		tier: "OU",
+		tier: "UU",
 		doublesTier: "DOU",
-		randomBattleMoves: ["quiverdance", "sludgebomb", "bugbuzz", "substitute"],
+		randomBattleMoves: ["quiverdance", "sludgebomb", "bugbuzz", "substitute", "sleeppowder"],
 	},
 	diglett: {
 		tier: "LC",
 	},
 	dugtrio: {
-		tier: "OU",
+		tier: "UU",
 		doublesTier: "DOU",
 		randomBattleMoves: ["earthquake", "stoneedge", "suckerpunch", "stealthrock", "aerialace"],
 	},
@@ -226,23 +226,23 @@ export const FormatsData: {[k: string]: ModdedSpeciesFormatsData} = {
 		tier: "LC",
 	},
 	persian: {
-		tier: "OU",
+		tier: "UU",
 		doublesTier: "DOU",
-		randomBattleMoves: ["fakeout", "slash", "uturn", "shadowclaw", "aerialace"],
+		randomBattleMoves: ["fakeout", "slash", "uturn", "bite", "aerialace"],
 	},
 	psyduck: {
 		tier: "LC",
 	},
 	golduck: {
-		tier: "OU",
+		tier: "UU",
 		doublesTier: "DOU",
-		randomBattleMoves: ["calmmind", "hydropump", "icebeam", "hypnosis"],
+		randomBattleMoves: ["calmmind", "hydropump", "icebeam", "hypnosis", "focusblast", "encore"],
 	},
 	mankey: {
 		tier: "LC",
 	},
 	primeape: {
-		tier: "OU",
+		tier: "UU",
 		doublesTier: "DOU",
 		randomBattleMoves: ["closecombat", "uturn", "stoneedge", "poisonjab", "earthquake"],
 	},
@@ -250,7 +250,7 @@ export const FormatsData: {[k: string]: ModdedSpeciesFormatsData} = {
 		tier: "LC",
 	},
 	arcanine: {
-		tier: "OU",
+		tier: "UU",
 		doublesTier: "DOU",
 		randomBattleMoves: ["flareblitz", "morningsun", "willowisp", "extremespeed", "closecombat"],
 	},
@@ -261,14 +261,14 @@ export const FormatsData: {[k: string]: ModdedSpeciesFormatsData} = {
 		tier: "NFE",
 	},
 	poliwrath: {
-		tier: "OU",
+		tier: "UU",
 		doublesTier: "DOU",
-		randomBattleMoves: ["waterfall", "drainpunch", "bulkup", "substitute", "poisonjab", "raindance"],
+		randomBattleMoves: ["waterfall", "drainpunch", "bulkup", "poisonjab", "raindance"],
 	},
 	politoed: {
-		tier: "OU",
+		tier: "UU",
 		doublesTier: "DOU",
-		randomBattleMoves: ["scald", "icebeam", "rest", "sleeptalk"],
+		randomBattleMoves: ["scald", "icebeam", "rest", "encore", "hypnosis"],
 	},
 	abra: {
 		tier: "LC",
@@ -279,7 +279,7 @@ export const FormatsData: {[k: string]: ModdedSpeciesFormatsData} = {
 	alakazam: {
 		tier: "OU",
 		doublesTier: "DOU",
-		randomBattleMoves: ["nastyplot", "psychic", "focusblast", "shadowball"],
+		randomBattleMoves: ["nastyplot", "psychic", "focusblast", "shadowball", "dazzlinggleam"],
 	},
 	machop: {
 		tier: "LC",
@@ -288,9 +288,9 @@ export const FormatsData: {[k: string]: ModdedSpeciesFormatsData} = {
 		tier: "NFE",
 	},
 	machamp: {
-		tier: "OU",
+		tier: "UU",
 		doublesTier: "DOU",
-		randomBattleMoves: ["dynamicpunch", "knockoff", "stoneedge", "poisonjab", "facade", "closecombat", "bulletpunch"],
+		randomBattleMoves: ["dynamicpunch", "knockoff", "stoneedge", "facade", "closecombat", "bulletpunch"],
 	},
 	bellsprout: {
 		tier: "LC",
@@ -299,15 +299,15 @@ export const FormatsData: {[k: string]: ModdedSpeciesFormatsData} = {
 		tier: "NFE",
 	},
 	victreebel: {
-		tier: "OU",
+		tier: "UU",
 		doublesTier: "DOU",
-		randomBattleMoves: ["sunnyday", "sludgebomb", "solarbeam", "sleeppowder", "weatherball"],
+		randomBattleMoves: ["powerwhip", "poisonjab", "knockoff", "swordsdance", "sleeppowder", "strengthsap"],
 	},
 	tentacool: {
 		tier: "LC",
 	},
 	tentacruel: {
-		tier: "OU",
+		tier: "UU",
 		doublesTier: "DOU",
 		randomBattleMoves: ["scald", "rapidspin", "sludgebomb", "haze", "knockoff"],
 	},
@@ -318,7 +318,7 @@ export const FormatsData: {[k: string]: ModdedSpeciesFormatsData} = {
 		tier: "NFE",
 	},
 	golem: {
-		tier: "OU",
+		tier: "UU",
 		doublesTier: "DOU",
 		randomBattleMoves: ["stealthrock", "earthquake", "stoneedge", "explosion", "heavyslam"],
 	},
@@ -326,7 +326,7 @@ export const FormatsData: {[k: string]: ModdedSpeciesFormatsData} = {
 		tier: "LC",
 	},
 	rapidash: {
-		tier: "OU",
+		tier: "UU",
 		doublesTier: "DOU",
 		randomBattleMoves: ["flareblitz", "hypnosis", "swordsdance", "highhorsepower", "willowisp", "morningsun"],
 	},
@@ -334,12 +334,12 @@ export const FormatsData: {[k: string]: ModdedSpeciesFormatsData} = {
 		tier: "LC",
 	},
 	slowbro: {
-		tier: "OU",
+		tier: "UU",
 		doublesTier: "DOU",
-		randomBattleMoves: ["scald", "psychic", "slackoff", "icebeam", "calmmind"],
+		randomBattleMoves: ["scald", "psychic", "slackoff", "icebeam", "calmmind", "thunderwave"],
 	},
 	slowking: {
-		tier: "OU",
+		tier: "UU",
 		doublesTier: "DOU",
 		randomBattleMoves: ["psychic", "slackoff", "calmmind", "icebeam", "scald"],
 	},
@@ -355,7 +355,7 @@ export const FormatsData: {[k: string]: ModdedSpeciesFormatsData} = {
 		randomBattleMoves: ["thunderbolt", "flashcannon", "voltswitch", "mirrorcoat"],
 	},
 	farfetchd: {
-		tier: "OU",
+		tier: "UU",
 		doublesTier: "DOU",
 		randomBattleMoves: ["bravebird", "knockoff", "leafblade", "slash", "quickattack"],
 	},
@@ -363,15 +363,15 @@ export const FormatsData: {[k: string]: ModdedSpeciesFormatsData} = {
 		tier: "LC",
 	},
 	dodrio: {
-		tier: "OU",
+		tier: "UU",
 		doublesTier: "DOU",
-		randomBattleMoves: ["swordsdance", "bravebird", "steelwing", "roost", "facade"],
+		randomBattleMoves: ["swordsdance", "bravebird", "steelwing", "roost", "facade", "quickattack"],
 	},
 	seel: {
 		tier: "LC",
 	},
 	dewgong: {
-		tier: "OU",
+		tier: "UU",
 		doublesTier: "DOU",
 		randomBattleMoves: ["surf", "icebeam", "perishsong", "protect", "rest", "sleeptalk"],
 	},
@@ -379,7 +379,7 @@ export const FormatsData: {[k: string]: ModdedSpeciesFormatsData} = {
 		tier: "LC",
 	},
 	muk: {
-		tier: "OU",
+		tier: "UU",
 		doublesTier: "DOU",
 		randomBattleMoves: ["gunkshot", "curse", "shadowsneak", "brickbreak", "explosion"],
 	},
@@ -387,12 +387,12 @@ export const FormatsData: {[k: string]: ModdedSpeciesFormatsData} = {
 		tier: "LC",
 	},
 	cloyster: {
-		tier: "OU",
+		tier: "UU",
 		doublesTier: "DOU",
 		randomBattleMoves: ["shellsmash", "iciclespear", "rockblast", "hydropump"],
 	},
 	gastly: {
-		tier: "NFE",
+		tier: "LC",
 	},
 	haunter: {
 		tier: "NFE",
@@ -406,7 +406,7 @@ export const FormatsData: {[k: string]: ModdedSpeciesFormatsData} = {
 		tier: "LC",
 	},
 	steelix: {
-		tier: "OU",
+		tier: "UU",
 		doublesTier: "DOU",
 		randomBattleMoves: ["stealthrock", "gyroball", "stoneedge", "earthquake", "curse"],
 	},
@@ -414,7 +414,7 @@ export const FormatsData: {[k: string]: ModdedSpeciesFormatsData} = {
 		tier: "LC",
 	},
 	hypno: {
-		tier: "OU",
+		tier: "UU",
 		doublesTier: "DOU",
 		randomBattleMoves: ["psychic", "thunderwave", "shadowball", "focusblast"],
 	},
@@ -422,7 +422,7 @@ export const FormatsData: {[k: string]: ModdedSpeciesFormatsData} = {
 		tier: "LC",
 	},
 	kingler: {
-		tier: "OU",
+		tier: "UU",
 		doublesTier: "DOU",
 		randomBattleMoves: ["swordsdance", "agility", "razorshell", "rockslide", "xscissor"],
 	},
@@ -430,15 +430,15 @@ export const FormatsData: {[k: string]: ModdedSpeciesFormatsData} = {
 		tier: "LC",
 	},
 	electrode: {
-		tier: "OU",
+		tier: "UU",
 		doublesTier: "DOU",
-		randomBattleMoves: ["thunderbolt", "voltswitch", "explosion", "lightscreen"],
+		randomBattleMoves: ["thunderbolt", "voltswitch", "explosion", "lightscreen", "taunt"],
 	},
 	exeggcute: {
 		tier: "LC",
 	},
 	exeggutor: {
-		tier: "OU",
+		tier: "UU",
 		doublesTier: "DOU",
 		randomBattleMoves: ["sleeppowder", "gigadrain", "leechseed", "substitute", "psychic"],
 	},
@@ -446,25 +446,25 @@ export const FormatsData: {[k: string]: ModdedSpeciesFormatsData} = {
 		tier: "LC",
 	},
 	marowak: {
-		tier: "OU",
+		tier: "UU",
 		doublesTier: "DOU",
-		randomBattleMoves: ["earthquake", "stealthrock", "stoneedge", "aerialace"],
+		randomBattleMoves: ["earthquake", "stealthrock", "stoneedge", "doubleedge"],
 	},
 	tyrogue: {
 		tier: "LC",
 	},
 	hitmonlee: {
-		tier: "OU",
+		tier: "UU",
 		doublesTier: "DOU",
-		randomBattleMoves: ["closecombat", "bulkup", "stoneedge", "fakeout"],
+		randomBattleMoves: ["bulkup", "stoneedge", "bulletpunch", "highjumpkick", "earthquake"],
 	},
 	hitmonchan: {
-		tier: "OU",
+		tier: "UU",
 		doublesTier: "DOU",
-		randomBattleMoves: ["closecombat", "icepunch", "machpunch", "stoneedge"],
+		randomBattleMoves: ["drainpunch", "icepunch", "machpunch", "stoneedge", "rapidspin", "bulkup"],
 	},
 	hitmontop: {
-		tier: "OU",
+		tier: "UU",
 		doublesTier: "DOU",
 		randomBattleMoves: ["closecombat", "rapidspin", "stoneedge", "machpunch", "suckerpunch"],
 	},
@@ -472,17 +472,17 @@ export const FormatsData: {[k: string]: ModdedSpeciesFormatsData} = {
 		tier: "LC",
 	},
 	lickilicky: {
-		tier: "OU",
+		tier: "UU",
 		doublesTier: "DOU",
-		randomBattleMoves: ["bodyslam", "knockoff", "hammerarm", "powerwhip"],
+		randomBattleMoves: ["bodyslam", "knockoff", "hammerarm", "powerwhip", "swordsdance"],
 	},
 	koffing: {
 		tier: "LC",
 	},
 	weezing: {
-		tier: "OU",
+		tier: "UU",
 		doublesTier: "DOU",
-		randomBattleMoves: ["sludgebomb", "toxicspikes", "willowisp", "explosion", "fireblast"],
+		randomBattleMoves: ["sludgebomb", "toxicspikes", "willowisp", "explosion", "fireblast", "painsplit"],
 	},
 	rhyhorn: {
 		tier: "LC",
@@ -491,7 +491,7 @@ export const FormatsData: {[k: string]: ModdedSpeciesFormatsData} = {
 		tier: "NFE",
 	},
 	rhyperior: {
-		tier: "OU",
+		tier: "UU",
 		doublesTier: "DOU",
 		randomBattleMoves: ["stoneedge", "earthquake", "swordsdance", "megahorn", "firefang"],
 	},
@@ -515,7 +515,7 @@ export const FormatsData: {[k: string]: ModdedSpeciesFormatsData} = {
 		randomBattleMoves: ["powerwhip", "sleeppowder", "leechseed", "earthquake", "knockoff", "sludgebomb"],
 	},
 	kangaskhan: {
-		tier: "OU",
+		tier: "UU",
 		doublesTier: "DOU",
 		randomBattleMoves: ["doubleedge", "crunch", "hammerarm", "earthquake", "fakeout"],
 	},
@@ -526,16 +526,16 @@ export const FormatsData: {[k: string]: ModdedSpeciesFormatsData} = {
 		tier: "NFE",
 	},
 	kingdra: {
-		tier: "OU",
+		tier: "UU",
 		doublesTier: "DOU",
 	},
 	goldeen: {
 		tier: "LC",
 	},
 	seaking: {
-		tier: "OU",
+		tier: "UU",
 		doublesTier: "DOU",
-		randomBattleMoves: ["waterfall", "megahorn", "agility", "swordsdance"],
+		randomBattleMoves: ["waterfall", "megahorn", "raindance", "swordsdance"],
 	},
 	staryu: {
 		tier: "LC",
@@ -543,13 +543,13 @@ export const FormatsData: {[k: string]: ModdedSpeciesFormatsData} = {
 	starmie: {
 		tier: "OU",
 		doublesTier: "DOU",
-		randomBattleMoves: ["hydropump", "psychic", "icebeam", "thunderbolt", "recover", "rapidspin"],
+		randomBattleMoves: ["hydropump", "psychic", "icebeam", "thunderbolt", "recover", "rapidspin", "scald"],
 	},
 	mimejr: {
 		tier: "LC",
 	},
 	mrmime: {
-		tier: "OU",
+		tier: "UU",
 		doublesTier: "DOU",
 		randomBattleMoves: ["psychic", "dazzlinggleam", "focusblast", "nastyplot", "thunderbolt"],
 	},
@@ -565,7 +565,7 @@ export const FormatsData: {[k: string]: ModdedSpeciesFormatsData} = {
 		tier: "LC",
 	},
 	jynx: {
-		tier: "OU",
+		tier: "UU",
 		doublesTier: "DOU",
 		randomBattleMoves: ["lovelykiss", "icebeam", "psychic", "substitute", "nastyplot"],
 	},
@@ -576,7 +576,7 @@ export const FormatsData: {[k: string]: ModdedSpeciesFormatsData} = {
 		tier: "NFE",
 	},
 	electivire: {
-		tier: "OU",
+		tier: "UU",
 		doublesTier: "DOU",
 		randomBattleMoves: ["wildcharge", "voltswitch", "flamethrower", "earthquake", "crosschop", "icepunch"],
 	},
@@ -587,17 +587,17 @@ export const FormatsData: {[k: string]: ModdedSpeciesFormatsData} = {
 		tier: "NFE",
 	},
 	magmortar: {
-		tier: "OU",
+		tier: "UU",
 		doublesTier: "DOU",
 		randomBattleMoves: ["fireblast", "earthquake", "psychic", "thunderbolt", "taunt"],
 	},
 	pinsir: {
-		tier: "OU",
+		tier: "UU",
 		doublesTier: "DOU",
 		randomBattleMoves: ["stealthrock", "xscissor", "closecombat", "stoneedge", "earthquake"],
 	},
 	tauros: {
-		tier: "OU",
+		tier: "UU",
 		doublesTier: "DOU",
 		randomBattleMoves: ["rockclimb", "zenheadbutt", "earthquake", "rockslide"],
 	},
@@ -605,17 +605,17 @@ export const FormatsData: {[k: string]: ModdedSpeciesFormatsData} = {
 		tier: "LC",
 	},
 	gyarados: {
-		tier: "OU",
+		tier: "UU",
 		doublesTier: "DOU",
-		randomBattleMoves: ["waterfall", "dragondance", "earthquake", "stoneedge"],
+		randomBattleMoves: ["waterfall", "dragondance", "earthquake", "stoneedge", "icefang"],
 	},
 	lapras: {
-		tier: "OU",
+		tier: "UU",
 		doublesTier: "DOU",
 		randomBattleMoves: ["freezedry", "surf", "thunderbolt", "blizzard"],
 	},
 	ditto: {
-		tier: "OU",
+		tier: "UU",
 		doublesTier: "DOU",
 		randomBattleMoves: ["transform"],
 	},
@@ -623,39 +623,39 @@ export const FormatsData: {[k: string]: ModdedSpeciesFormatsData} = {
 		tier: "LC",
 	},
 	vaporeon: {
-		tier: "OU",
+		tier: "UU",
 		doublesTier: "DOU",
-		randomBattleMoves: ["scald", "rest", "sleeptalk", "icebeam"],
+		randomBattleMoves: ["scald", "wish", "protect", "icebeam", "haze"],
 	},
 	jolteon: {
-		tier: "OU",
+		tier: "UU",
 		doublesTier: "DOU",
 		randomBattleMoves: ["voltswitch", "thunderbolt", "yawn", "batonpass", "shadowball"],
 	},
 	flareon: {
-		tier: "OU",
+		tier: "UU",
 		doublesTier: "DOU",
 		randomBattleMoves: ["flareblitz", "willowisp", "facade", "quickattack"],
 	},
 	espeon: {
-		tier: "OU",
+		tier: "UU",
 		doublesTier: "DOU",
-		randomBattleMoves: ["psychic", "dazzlinggleam", "calmmind", "morningsun"],
+		randomBattleMoves: ["psychic", "dazzlinggleam", "calmmind", "morningsun", "shadowball"],
 	},
 	umbreon: {
-		tier: "OU",
+		tier: "UU",
 		doublesTier: "DOU",
 		randomBattleMoves: ["foulplay", "wish", "taunt", "protect"],
 	},
 	leafeon: {
-		tier: "OU",
+		tier: "UU",
 		doublesTier: "DOU",
-		randomBattleMoves: ["leafblade", "synthesis", "swordsdance", "xscissor"],
+		randomBattleMoves: ["leafblade", "synthesis", "swordsdance", "xscissor", "doubleedge"],
 	},
 	glaceon: {
-		tier: "OU",
+		tier: "UU",
 		doublesTier: "DOU",
-		randomBattleMoves: ["icebeam", "freezedry", "waterpulse", "roar"],
+		randomBattleMoves: ["icebeam", "freezedry", "waterpulse", "roar", "shadowball"],
 	},
 	porygon: {
 		tier: "LC",
@@ -664,7 +664,7 @@ export const FormatsData: {[k: string]: ModdedSpeciesFormatsData} = {
 		tier: "NFE",
 	},
 	porygonz: {
-		tier: "OU",
+		tier: "UU",
 		doublesTier: "DOU",
 		randomBattleMoves: ["triattack", "nastyplot", "icebeam", "thunderbolt", "darkpulse"],
 	},
@@ -672,7 +672,7 @@ export const FormatsData: {[k: string]: ModdedSpeciesFormatsData} = {
 		tier: "LC",
 	},
 	omastar: {
-		tier: "OU",
+		tier: "UU",
 		doublesTier: "DOU",
 		randomBattleMoves: ["shellsmash", "hydropump", "icebeam", "ancientpower"],
 	},
@@ -680,7 +680,7 @@ export const FormatsData: {[k: string]: ModdedSpeciesFormatsData} = {
 		tier: "LC",
 	},
 	kabutops: {
-		tier: "OU",
+		tier: "UU",
 		doublesTier: "DOU",
 		randomBattleMoves: ["liquidation", "stoneedge", "rapidspin", "swordsdance", "knockoff"],
 	},
@@ -693,22 +693,22 @@ export const FormatsData: {[k: string]: ModdedSpeciesFormatsData} = {
 		tier: "LC",
 	},
 	snorlax: {
-		tier: "OU",
+		tier: "UU",
 		doublesTier: "DOU",
 		randomBattleMoves: ["bodyslam", "curse", "rest", "sleeptalk"],
 	},
 	articuno: {
-		tier: "OU",
+		tier: "UU",
 		doublesTier: "DOU",
 		randomBattleMoves: ["icebeam", "roost", "uturn", "defog"],
 	},
 	zapdos: {
-		tier: "OU",
+		tier: "UU",
 		doublesTier: "DOU",
 		randomBattleMoves: ["discharge", "uturn", "roost", "substitute", "defog"],
 	},
 	moltres: {
-		tier: "OU",
+		tier: "UU",
 		doublesTier: "DOU",
 		randomBattleMoves: ["fireblast", "roost", "uturn", "hurricane", "willowisp"],
 	},
@@ -726,12 +726,12 @@ export const FormatsData: {[k: string]: ModdedSpeciesFormatsData} = {
 	mewtwo: {
 		tier: "Uber",
 		doublesTier: "DUber",
-		randomBattleMoves: ["psystrike", "aurasphere", "icebeam", "nastyplot", "recover"],
+		randomBattleMoves: ["psystrike", "aurasphere", "fireblast", "nastyplot", "recover", "shadowball"],
 	},
 	mew: {
-		tier: "OU",
+		tier: "UU",
 		doublesTier: "DOU",
-		randomBattleMoves: ["calmmind", "aurasphere", "psychic", "shadowball"],
+		randomBattleMoves: ["calmmind", "aurasphere", "psychic", "shadowball", "roost"],
 	},
 	chikorita: {
 		tier: "LC",
@@ -740,7 +740,7 @@ export const FormatsData: {[k: string]: ModdedSpeciesFormatsData} = {
 		tier: "NFE",
 	},
 	meganium: {
-		tier: "OU",
+		tier: "UU",
 		doublesTier: "DOU",
 		randomBattleMoves: ["gigadrain", "leechseed", "reflect", "lightscreen", "aromatherapy"],
 	},
@@ -751,7 +751,7 @@ export const FormatsData: {[k: string]: ModdedSpeciesFormatsData} = {
 		tier: "NFE",
 	},
 	typhlosion: {
-		tier: "OU",
+		tier: "UU",
 		doublesTier: "DOU",
 		randomBattleMoves: ["eruption", "fireblast", "extrasensory", "focusblast"],
 	},
@@ -764,13 +764,13 @@ export const FormatsData: {[k: string]: ModdedSpeciesFormatsData} = {
 	feraligatr: {
 		tier: "OU",
 		doublesTier: "DOU",
-		randomBattleMoves: ["dragondance", "earthquake", "waterfall", "crunch", "aquajet"],
+		randomBattleMoves: ["dragondance", "icepunch", "waterfall", "crunch", "aquajet"],
 	},
 	sentret: {
 		tier: "LC",
 	},
 	furret: {
-		tier: "OU",
+		tier: "UU",
 		doublesTier: "DOU",
 		randomBattleMoves: ["doubleedge", "suckerpunch", "uturn", "shadowclaw"],
 	},
@@ -778,7 +778,7 @@ export const FormatsData: {[k: string]: ModdedSpeciesFormatsData} = {
 		tier: "LC",
 	},
 	noctowl: {
-		tier: "OU",
+		tier: "UU",
 		doublesTier: "DOU",
 		randomBattleMoves: ["hurricane", "hypnosis", "nastyplot", "shadowball", "roost"],
 	},
@@ -786,7 +786,7 @@ export const FormatsData: {[k: string]: ModdedSpeciesFormatsData} = {
 		tier: "LC",
 	},
 	ledian: {
-		tier: "OU",
+		tier: "UU",
 		doublesTier: "DOU",
 		randomBattleMoves: ["uturn", "knockoff", "roost", "reflect", "lightscreen"],
 	},
@@ -794,7 +794,7 @@ export const FormatsData: {[k: string]: ModdedSpeciesFormatsData} = {
 		tier: "LC",
 	},
 	ariados: {
-		tier: "OU",
+		tier: "UU",
 		doublesTier: "DOU",
 		randomBattleMoves: ["poisonjab", "toxicspikes", "stickyweb", "lunge"],
 	},
@@ -802,7 +802,7 @@ export const FormatsData: {[k: string]: ModdedSpeciesFormatsData} = {
 		tier: "LC",
 	},
 	lanturn: {
-		tier: "OU",
+		tier: "UU",
 		doublesTier: "DOU",
 		randomBattleMoves: ["scald", "discharge", "voltswitch", "icebeam", "thunderwave"],
 	},
@@ -821,7 +821,7 @@ export const FormatsData: {[k: string]: ModdedSpeciesFormatsData} = {
 		tier: "LC",
 	},
 	xatu: {
-		tier: "OU",
+		tier: "UU",
 		doublesTier: "DOU",
 		randomBattleMoves: ["psychic", "roost", "teleport", "thunderwave", "airslash"],
 	},
@@ -832,9 +832,9 @@ export const FormatsData: {[k: string]: ModdedSpeciesFormatsData} = {
 		tier: "NFE",
 	},
 	ampharos: {
-		tier: "OU",
+		tier: "UU",
 		doublesTier: "DOU",
-		randomBattleMoves: ["thunderbolt", "rest", "sleeptalk", "focusblast"],
+		randomBattleMoves: ["thunderbolt", "voltswitch", "powergem", "focusblast"],
 	},
 	azurill: {
 		tier: "LC",
@@ -851,7 +851,7 @@ export const FormatsData: {[k: string]: ModdedSpeciesFormatsData} = {
 		tier: "LC",
 	},
 	sudowoodo: {
-		tier: "OU",
+		tier: "UU",
 		doublesTier: "DOU",
 		randomBattleMoves: ["headsmash", "stealthrock", "earthquake", "suckerpunch", "selfdestruct"],
 	},
@@ -862,7 +862,7 @@ export const FormatsData: {[k: string]: ModdedSpeciesFormatsData} = {
 		tier: "NFE",
 	},
 	jumpluff: {
-		tier: "OU",
+		tier: "UU",
 		doublesTier: "DOU",
 		randomBattleMoves: ["sleeppowder", "leechseed", "substitute", "acrobatics", "strengthsap"],
 	},
@@ -870,23 +870,23 @@ export const FormatsData: {[k: string]: ModdedSpeciesFormatsData} = {
 		tier: "LC",
 	},
 	ambipom: {
-		tier: "OU",
+		tier: "UU",
 		doublesTier: "DOU",
-		randomBattleMoves: ["fakeout", "uturn", "facade", "switcheroo", "brickbreak", "shadowclaw"],
+		randomBattleMoves: ["fakeout", "uturn", "doublehit", "switcheroo", "brickbreak", "thief", "aerialace"],
 	},
 	sunkern: {
 		tier: "LC",
 	},
 	sunflora: {
-		tier: "OU",
+		tier: "UU",
 		doublesTier: "DOU",
-		randomBattleMoves: ["energyball", "sludgebomb", "grassyterrain", "lightscreen"],
+		randomBattleMoves: ["energyball", "sludgebomb", "synthesis", "lightscreen"],
 	},
 	yanma: {
 		tier: "LC",
 	},
 	yanmega: {
-		tier: "OU",
+		tier: "UU",
 		doublesTier: "DOU",
 		randomBattleMoves: ["bugbuzz", "gigadrain", "airslash", "uturn", "protect"],
 	},
@@ -894,7 +894,7 @@ export const FormatsData: {[k: string]: ModdedSpeciesFormatsData} = {
 		tier: "LC",
 	},
 	quagsire: {
-		tier: "OU",
+		tier: "UU",
 		doublesTier: "DOU",
 		randomBattleMoves: ["earthquake", "recover", "scald", "toxic"],
 	},
@@ -902,18 +902,20 @@ export const FormatsData: {[k: string]: ModdedSpeciesFormatsData} = {
 		tier: "LC",
 	},
 	honchkrow: {
-		tier: "OU",
+		tier: "UU",
 		doublesTier: "DOU",
+		randomBattleMoves: ["bravebird", "suckerpunch", "roost", "taunt"],
 	},
 	misdreavus: {
 		tier: "LC",
 	},
 	mismagius: {
-		tier: "OU",
+		tier: "UU",
 		doublesTier: "DOU",
+		randomBattleMoves: ["dazzlinggleam", "destinybond", "nastyplot", "shadowball", "substitute", "painsplit", "willowisp", "thunderbolt"],
 	},
 	unown: {
-		tier: "OU",
+		tier: "UU",
 		doublesTier: "DOU",
 		randomBattleMoves: ["hiddenpowerpsychic", "hiddenpowerfighting"],
 	},
@@ -921,27 +923,27 @@ export const FormatsData: {[k: string]: ModdedSpeciesFormatsData} = {
 		tier: "LC",
 	},
 	wobbuffet: {
-		tier: "OU",
+		tier: "UU",
 		doublesTier: "DOU",
 		randomBattleMoves: ["counter", "mirrorcoat", "encore", "destinybond"],
 	},
 	girafarig: {
-		tier: "OU",
+		tier: "UU",
 		doublesTier: "DOU",
-		randomBattleMoves: ["nastyplot", "thunderbolt", "psychic", "dazzlinggleam"],
+		randomBattleMoves: ["nastyplot", "thunderbolt", "psychic", "dazzlinggleam", "shadowball"],
 	},
 	pineco: {
 		tier: "LC",
 	},
 	forretress: {
-		tier: "OU",
+		tier: "UU",
 		doublesTier: "DOU",
 		randomBattleMoves: ["voltswitch", "gyroball", "rapidspin", "spikes", "toxicspikes"],
 	},
 	dunsparce: {
-		tier: "OU",
+		tier: "UU",
 		doublesTier: "DOU",
-		randomBattleMoves: ["glare", "headbutt", "roost", "coil", "rockslide"],
+		randomBattleMoves: ["bodyslam", "bite", "roost", "coil"],
 	},
 	gligar: {
 		tier: "LC",
@@ -955,24 +957,24 @@ export const FormatsData: {[k: string]: ModdedSpeciesFormatsData} = {
 		tier: "LC",
 	},
 	granbull: {
-		tier: "OU",
+		tier: "UU",
 		doublesTier: "DOU",
 		randomBattleMoves: ["playrough", "earthquake", "crunch", "healbell", "thunderwave"],
 	},
 	qwilfish: {
-		tier: "OU",
+		tier: "UU",
 		doublesTier: "DOU",
 		randomBattleMoves: ["destinybond", "waterfall", "poisonjab", "spikes", "toxicspikes", "thunderwave"],
 	},
 	shuckle: {
-		tier: "OU",
+		tier: "UU",
 		doublesTier: "DOU",
 		randomBattleMoves: ["knockoff", "stealthrock", "stickyweb", "toxic"],
 	},
 	heracross: {
-		tier: "OU",
+		tier: "UU",
 		doublesTier: "DOU",
-		randomBattleMoves: ["facade", "megahorn", "closecombat", "nightslash", "stoneedge"],
+		randomBattleMoves: ["facade", "megahorn", "closecombat", "throatchop", "stoneedge"],
 	},
 	sneasel: {
 		tier: "LC",
@@ -986,7 +988,7 @@ export const FormatsData: {[k: string]: ModdedSpeciesFormatsData} = {
 		tier: "LC",
 	},
 	ursaring: {
-		tier: "OU",
+		tier: "UU",
 		doublesTier: "DOU",
 		randomBattleMoves: ["closecombat", "crunch", "protect", "facade", "swordsdance"],
 	},
@@ -994,7 +996,7 @@ export const FormatsData: {[k: string]: ModdedSpeciesFormatsData} = {
 		tier: "LC",
 	},
 	magcargo: {
-		tier: "OU",
+		tier: "UU",
 		doublesTier: "DOU",
 		randomBattleMoves: ["fireblast", "ancientpower", "earthpower", "shellsmash", "recover", "stealthrock", "lavaplume"],
 	},
@@ -1007,23 +1009,23 @@ export const FormatsData: {[k: string]: ModdedSpeciesFormatsData} = {
 	mamoswine: {
 		tier: "OU",
 		doublesTier: "DOU",
-		randomBattleMoves: ["earthquake", "iciclecrash", "iceshard", "stealthrock"],
+		randomBattleMoves: ["earthquake", "iciclecrash", "iceshard", "stealthrock", "stoneedge"],
 	},
 	corsola: {
-		tier: "OU",
+		tier: "UU",
 		doublesTier: "DOU",
-		randomBattleMoves: ["recover", "scald", "powergem", "stealthrock"],
+		randomBattleMoves: ["recover", "scald", "powergem", "stealthrock", "icebeam"],
 	},
 	remoraid: {
 		tier: "LC",
 	},
 	octillery: {
-		tier: "OU",
+		tier: "UU",
 		doublesTier: "DOU",
 		randomBattleMoves: ["energyball", "fireblast", "hydropump", "gunkshot", "icebeam", "protect"],
 	},
 	delibird: {
-		tier: "OU",
+		tier: "UU",
 		doublesTier: "DOU",
 		randomBattleMoves: ["destinybond", "freezedry", "rapidspin", "spikes"],
 	},
@@ -1031,20 +1033,20 @@ export const FormatsData: {[k: string]: ModdedSpeciesFormatsData} = {
 		tier: "LC",
 	},
 	mantine: {
-		tier: "OU",
+		tier: "UU",
 		doublesTier: "DOU",
-		randomBattleMoves: ["scald", "icebeam", "defog", "rest", "sleeptalk"],
+		randomBattleMoves: ["scald", "icebeam", "defog", "roost"],
 	},
 	skarmory: {
 		tier: "OU",
 		doublesTier: "DOU",
-		randomBattleMoves: ["bravebird", "roost", "spikes", "stealthrock", "whirlwind", "steelwing"],
+		randomBattleMoves: ["bravebird", "roost", "spikes", "stealthrock", "whirlwind"],
 	},
 	houndour: {
 		tier: "LC",
 	},
 	houndoom: {
-		tier: "OU",
+		tier: "UU",
 		doublesTier: "DOU",
 		randomBattleMoves: ["nastyplot", "darkpulse", "fireblast", "suckerpunch"],
 	},
@@ -1052,37 +1054,37 @@ export const FormatsData: {[k: string]: ModdedSpeciesFormatsData} = {
 		tier: "LC",
 	},
 	donphan: {
-		tier: "OU",
+		tier: "UU",
 		doublesTier: "DOU",
 		randomBattleMoves: ["stealthrock", "earthquake", "rapidspin", "stoneedge", "iceshard"],
 	},
 	stantler: {
-		tier: "OU",
+		tier: "UU",
 		doublesTier: "DOU",
 		randomBattleMoves: ["doubleedge", "megahorn", "zenheadbutt", "earthquake"],
 	},
 	smeargle: {
-		tier: "OU",
-		doublesTier: "DOU",
-		randomBattleMoves: ["stealthrock", "spikes", "spore", "toxicspikes", "stickyweb"],
+		tier: "UU",
+		doublesTier: "DUber",
+		randomBattleMoves: ["stealthrock", "spikes", "spore", "toxicspikes", "stickyweb", "whirlwind"],
 	},
 	miltank: {
-		tier: "OU",
+		tier: "UU",
 		doublesTier: "DOU",
 		randomBattleMoves: ["bodyslam", "milkdrink", "stealthrock", "curse", "earthquake"],
 	},
 	raikou: {
-		tier: "OU",
+		tier: "UU",
 		doublesTier: "DOU",
 		randomBattleMoves: ["thunderbolt", "scald", "voltswitch", "calmmind", "substitute"],
 	},
 	entei: {
-		tier: "OU",
+		tier: "UU",
 		doublesTier: "DOU",
-		randomBattleMoves: ["sacredfire", "extremespeed", "stoneedge", "irontail", "bulldoze"],
+		randomBattleMoves: ["sacredfire", "extremespeed", "stoneedge", "bulldoze"],
 	},
 	suicune: {
-		tier: "OU",
+		tier: "UU",
 		doublesTier: "DOU",
 		randomBattleMoves: ["scald", "rest", "sleeptalk", "calmmind"],
 	},
@@ -1105,12 +1107,12 @@ export const FormatsData: {[k: string]: ModdedSpeciesFormatsData} = {
 	hooh: {
 		tier: "Uber",
 		doublesTier: "DUber",
-		randomBattleMoves: ["sacredfire", "roost", "substitute", "earthquake"],
+		randomBattleMoves: ["sacredfire", "roost", "substitute", "earthquake", "thunderwave"],
 	},
 	celebi: {
 		isNonstandard: "Unobtainable",
 		tier: "Unreleased",
-		randomBattleMoves: ["nastyplot", "psychic", "leafstorm", "gigadrain", "shadowball"],
+		randomBattleMoves: ["nastyplot", "psychic", "leafstorm", "gigadrain", "dazzlinggleam", "uturn", "recover"],
 	},
 	treecko: {
 		tier: "LC",
@@ -1119,9 +1121,9 @@ export const FormatsData: {[k: string]: ModdedSpeciesFormatsData} = {
 		tier: "NFE",
 	},
 	sceptile: {
-		tier: "OU",
+		tier: "UU",
 		doublesTier: "DOU",
-		randomBattleMoves: ["substitute", "leechseed", "leafstorm", "gigadrain", "focusblast"],
+		randomBattleMoves: ["substitute", "leechseed", "leafstorm", "gigadrain", "focusblast", "earthquake", "rockslide"],
 	},
 	torchic: {
 		tier: "LC",
@@ -1130,7 +1132,7 @@ export const FormatsData: {[k: string]: ModdedSpeciesFormatsData} = {
 		tier: "NFE",
 	},
 	blaziken: {
-		tier: "OU",
+		tier: "Uber",
 		doublesTier: "DOU",
 		randomBattleMoves: ["swordsdance", "stoneedge", "closecombat", "flareblitz", "earthquake"],
 	},
@@ -1141,7 +1143,7 @@ export const FormatsData: {[k: string]: ModdedSpeciesFormatsData} = {
 		tier: "NFE",
 	},
 	swampert: {
-		tier: "OU",
+		tier: "UU",
 		doublesTier: "DOU",
 		randomBattleMoves: ["scald", "earthquake", "stealthrock", "icebeam", "stoneedge"],
 	},
@@ -1149,7 +1151,7 @@ export const FormatsData: {[k: string]: ModdedSpeciesFormatsData} = {
 		tier: "LC",
 	},
 	mightyena: {
-		tier: "OU",
+		tier: "UU",
 		doublesTier: "DOU",
 		randomBattleMoves: ["suckerpunch", "playrough", "firefang", "crunch", "irontail"],
 	},
@@ -1157,7 +1159,7 @@ export const FormatsData: {[k: string]: ModdedSpeciesFormatsData} = {
 		tier: "LC",
 	},
 	linoone: {
-		tier: "OU",
+		tier: "UU",
 		doublesTier: "DOU",
 		randomBattleMoves: ["bellydrum", "extremespeed", "shadowclaw", "irontail"],
 	},
@@ -1168,7 +1170,7 @@ export const FormatsData: {[k: string]: ModdedSpeciesFormatsData} = {
 		tier: "NFE",
 	},
 	beautifly: {
-		tier: "OU",
+		tier: "UU",
 		doublesTier: "DOU",
 		randomBattleMoves: ["quiverdance", "energyball", "bugbuzz", "roost", "aircutter"],
 	},
@@ -1176,9 +1178,9 @@ export const FormatsData: {[k: string]: ModdedSpeciesFormatsData} = {
 		tier: "NFE",
 	},
 	dustox: {
-		tier: "OU",
+		tier: "UU",
 		doublesTier: "DOU",
-		randomBattleMoves: ["quiverdance", "bugbuzz", "sludgebomb", "moonlight", "energyball", "toxic"],
+		randomBattleMoves: ["quiverdance", "bugbuzz", "sludgebomb", "roost", "energyball", "toxic"],
 	},
 	lotad: {
 		tier: "LC",
@@ -1187,9 +1189,9 @@ export const FormatsData: {[k: string]: ModdedSpeciesFormatsData} = {
 		tier: "NFE",
 	},
 	ludicolo: {
-		tier: "OU",
+		tier: "UU",
 		doublesTier: "DOU",
-		randomBattleMoves: ["leechseed", "gigadrain", "icebeam", "substitute", "hydropump", "raindance", "scald"],
+		randomBattleMoves: ["gigadrain", "icebeam", "hydropump", "raindance", "scald"],
 	},
 	seedot: {
 		tier: "LC",
@@ -1198,7 +1200,7 @@ export const FormatsData: {[k: string]: ModdedSpeciesFormatsData} = {
 		tier: "NFE",
 	},
 	shiftry: {
-		tier: "OU",
+		tier: "UU",
 		doublesTier: "DOU",
 		randomBattleMoves: ["swordsdance", "leafblade", "suckerpunch", "fakeout", "nightslash", "brickbreak"],
 	},
@@ -1206,7 +1208,7 @@ export const FormatsData: {[k: string]: ModdedSpeciesFormatsData} = {
 		tier: "LC",
 	},
 	swellow: {
-		tier: "OU",
+		tier: "UU",
 		doublesTier: "DOU",
 		randomBattleMoves: ["bravebird", "facade", "quickattack", "steelwing", "uturn", "roost"],
 	},
@@ -1214,9 +1216,9 @@ export const FormatsData: {[k: string]: ModdedSpeciesFormatsData} = {
 		tier: "LC",
 	},
 	pelipper: {
-		tier: "OU",
+		tier: "UU",
 		doublesTier: "DOU",
-		randomBattleMoves: ["scald", "roost", "defog", "hurricane", "hydropump", "uturn"],
+		randomBattleMoves: ["scald", "roost", "defog", "hurricane", "hydropump", "uturn", "icebeam"],
 	},
 	ralts: {
 		tier: "LC",
@@ -1225,20 +1227,20 @@ export const FormatsData: {[k: string]: ModdedSpeciesFormatsData} = {
 		tier: "NFE",
 	},
 	gardevoir: {
-		tier: "OU",
+		tier: "UU",
 		doublesTier: "DOU",
-		randomBattleMoves: ["calmmind", "psychic", "shadowball", "focusblast", "dazzlinggleam"],
+		randomBattleMoves: ["calmmind", "psychic", "shadowball", "focusblast", "moonblast", "substitute"],
 	},
 	gallade: {
-		tier: "OU",
+		tier: "UU",
 		doublesTier: "DOU",
-		randomBattleMoves: ["closecombat", "psychocut", "swordsdance", "poisonjab", "earthquake"],
+		randomBattleMoves: ["closecombat", "psychocut", "swordsdance", "knockoff", "earthquake"],
 	},
 	surskit: {
 		tier: "LC",
 	},
 	masquerain: {
-		tier: "OU",
+		tier: "UU",
 		doublesTier: "DOU",
 		randomBattleMoves: ["quiverdance", "scald", "stickyweb", "airslash", "bugbuzz"],
 	},
@@ -1258,22 +1260,22 @@ export const FormatsData: {[k: string]: ModdedSpeciesFormatsData} = {
 		randomBattleMoves: ["bulkup", "bodyslam", "earthquake", "slackoff", "playrough", "shadowclaw"],
 	},
 	slaking: {
-		tier: "OU",
+		tier: "UU",
 		doublesTier: "DOU",
-		randomBattleMoves: ["earthquake", "suckerpunch", "gigaimpact", "playrough", "hammerarm"],
+		randomBattleMoves: ["earthquake", "suckerpunch", "gigaimpact", "playrough", "hammerarm", "bodyslam"],
 	},
 	nincada: {
 		tier: "LC",
 	},
 	ninjask: {
-		tier: "OU",
+		tier: "UU",
 		doublesTier: "DOU",
 		randomBattleMoves: ["swordsdance", "uturn", "xscissor", "aerialace", "finalgambit"],
 	},
 	shedinja: {
-		tier: "OU",
+		tier: "UU",
 		doublesTier: "DOU",
-		randomBattleMoves: ["xscissor", "shadowclaw", "shadowsneak", "willowisp", "gust"],
+		randomBattleMoves: ["xscissor", "shadowclaw", "shadowsneak", "willowisp"],
 	},
 	whismur: {
 		tier: "LC",
@@ -1282,7 +1284,7 @@ export const FormatsData: {[k: string]: ModdedSpeciesFormatsData} = {
 		tier: "NFE",
 	},
 	exploud: {
-		tier: "OU",
+		tier: "UU",
 		doublesTier: "DOU",
 		randomBattleMoves: ["focusblast", "fireblast", "boomburst", "surf"],
 	},
@@ -1290,15 +1292,15 @@ export const FormatsData: {[k: string]: ModdedSpeciesFormatsData} = {
 		tier: "LC",
 	},
 	hariyama: {
-		tier: "OU",
+		tier: "UU",
 		doublesTier: "DOU",
-		randomBattleMoves: ["bulkup", "closecombat", "poisonjab", "stoneedge", "knockoff"],
+		randomBattleMoves: ["bulkup", "closecombat", "poisonjab", "stoneedge", "knockoff", "bulletpunch"],
 	},
 	nosepass: {
 		tier: "LC",
 	},
 	probopass: {
-		tier: "OU",
+		tier: "UU",
 		doublesTier: "DOU",
 		randomBattleMoves: ["flashcannon", "stealthrock", "bodypress", "voltswitch", "thunderwave"],
 	},
@@ -1306,17 +1308,17 @@ export const FormatsData: {[k: string]: ModdedSpeciesFormatsData} = {
 		tier: "LC",
 	},
 	delcatty: {
-		tier: "OU",
+		tier: "UU",
 		doublesTier: "DOU",
 		randomBattleMoves: ["thunderwave", "healbell", "fakeout", "doubleedge", "suckerpunch"],
 	},
 	sableye: {
-		tier: "OU",
+		tier: "UU",
 		doublesTier: "DOU",
-		randomBattleMoves: ["recover", "taunt", "willowisp", "knockoff", "shadowsneak"],
+		randomBattleMoves: ["recover", "taunt", "willowisp", "knockoff", "foulplay"],
 	},
 	mawile: {
-		tier: "OU",
+		tier: "UU",
 		doublesTier: "DOU",
 		randomBattleMoves: ["swordsdance", "suckerpunch", "ironhead", "playrough", "stealthrock"],
 	},
@@ -1327,15 +1329,15 @@ export const FormatsData: {[k: string]: ModdedSpeciesFormatsData} = {
 		tier: "NFE",
 	},
 	aggron: {
-		tier: "OU",
+		tier: "UU",
 		doublesTier: "DOU",
-		randomBattleMoves: ["headsmash", "earthquake", "stoneedge", "heavyslam"],
+		randomBattleMoves: ["headsmash", "earthquake", "superpower", "heavyslam", "rockpolish"],
 	},
 	meditite: {
 		tier: "LC",
 	},
 	medicham: {
-		tier: "OU",
+		tier: "UU",
 		doublesTier: "DOU",
 		randomBattleMoves: ["fakeout", "highjumpkick", "bulletpunch", "zenheadbutt", "recover", "icepunch"],
 	},
@@ -1343,27 +1345,27 @@ export const FormatsData: {[k: string]: ModdedSpeciesFormatsData} = {
 		tier: "LC",
 	},
 	manectric: {
-		tier: "OU",
+		tier: "UU",
 		doublesTier: "DOU",
 		randomBattleMoves: ["switcheroo", "thunderbolt", "overheat", "voltswitch"],
 	},
 	plusle: {
-		tier: "OU",
+		tier: "UU",
 		doublesTier: "DOU",
 		randomBattleMoves: ["thunderbolt", "voltswitch", "grassknot", "nastyplot", "nuzzle"],
 	},
 	minun: {
-		tier: "OU",
+		tier: "UU",
 		doublesTier: "DOU",
 		randomBattleMoves: ["thunderbolt", "voltswitch", "grassknot", "nastyplot", "nuzzle", "switcheroo"],
 	},
 	volbeat: {
-		tier: "OU",
+		tier: "UU",
 		doublesTier: "DOU",
 		randomBattleMoves: ["encore", "roost", "thunderwave", "uturn"],
 	},
 	illumise: {
-		tier: "OU",
+		tier: "UU",
 		doublesTier: "DOU",
 		randomBattleMoves: ["encore", "roost", "thunderwave", "wish", "bugbuzz"],
 	},
@@ -1374,7 +1376,7 @@ export const FormatsData: {[k: string]: ModdedSpeciesFormatsData} = {
 		tier: "NFE",
 	},
 	roserade: {
-		tier: "OU",
+		tier: "UU",
 		doublesTier: "DOU",
 		randomBattleMoves: ["gigadrain", "leafstorm", "sleeppowder", "sludgebomb", "spikes", "toxicspikes"],
 	},
@@ -1382,7 +1384,7 @@ export const FormatsData: {[k: string]: ModdedSpeciesFormatsData} = {
 		tier: "LC",
 	},
 	swalot: {
-		tier: "OU",
+		tier: "UU",
 		doublesTier: "DOU",
 		randomBattleMoves: ["gunkshot", "earthquake", "toxic", "painsplit", "encore"],
 	},
@@ -1390,28 +1392,28 @@ export const FormatsData: {[k: string]: ModdedSpeciesFormatsData} = {
 		tier: "LC",
 	},
 	sharpedo: {
-		tier: "OU",
+		tier: "UU",
 		doublesTier: "DOU",
-		randomBattleMoves: ["earthquake", "liquidation", "crunch", "aquajet"],
+		randomBattleMoves: ["earthquake", "liquidation", "crunch", "aquajet", "protect"],
 	},
 	wailmer: {
 		tier: "LC",
 	},
 	wailord: {
-		tier: "OU",
+		tier: "UU",
 		doublesTier: "DOU",
-		randomBattleMoves: ["icebeam", "hydropump", "icebeam", "waterspout"],
+		randomBattleMoves: ["icebeam", "scald", "clearsmog", "waterspout"],
 	},
 	numel: {
 		tier: "LC",
 	},
 	camerupt: {
-		tier: "OU",
+		tier: "UU",
 		doublesTier: "DOU",
 		randomBattleMoves: ["stealthrock", "earthpower", "lavaplume", "fireblast", "explosion"],
 	},
 	torkoal: {
-		tier: "OU",
+		tier: "UU",
 		doublesTier: "DOU",
 		randomBattleMoves: ["solarbeam", "stealthrock", "earthquake", "rapidspin", "lavaplume"],
 	},
@@ -1419,12 +1421,12 @@ export const FormatsData: {[k: string]: ModdedSpeciesFormatsData} = {
 		tier: "LC",
 	},
 	grumpig: {
-		tier: "OU",
+		tier: "UU",
 		doublesTier: "DOU",
 		randomBattleMoves: ["nastyplot", "psyshock", "focusblast", "shadowball"],
 	},
 	spinda: {
-		tier: "OU",
+		tier: "UU",
 		doublesTier: "DOU",
 		randomBattleMoves: ["encore", "fakeout", "rapidspin", "bodyslam", "suckerpunch"],
 	},
@@ -1435,7 +1437,7 @@ export const FormatsData: {[k: string]: ModdedSpeciesFormatsData} = {
 		tier: "NFE",
 	},
 	flygon: {
-		tier: "OU",
+		tier: "UU",
 		doublesTier: "DOU",
 		randomBattleMoves: ["earthquake", "uturn", "dragondance", "outrage", "superpower"],
 	},
@@ -1443,7 +1445,7 @@ export const FormatsData: {[k: string]: ModdedSpeciesFormatsData} = {
 		tier: "LC",
 	},
 	cacturne: {
-		tier: "OU",
+		tier: "UU",
 		doublesTier: "DOU",
 		randomBattleMoves: ["swordsdance", "suckerpunch", "seedbomb", "drainpunch", "poisonjab"],
 	},
@@ -1451,27 +1453,27 @@ export const FormatsData: {[k: string]: ModdedSpeciesFormatsData} = {
 		tier: "LC",
 	},
 	altaria: {
-		tier: "OU",
+		tier: "UU",
 		doublesTier: "DOU",
-		randomBattleMoves: ["roost", "dracometeor", "fireblast", "safeguard", "hurricane"],
+		randomBattleMoves: ["roost", "dracometeor", "fireblast", "haze", "hurricane"],
 	},
 	zangoose: {
-		tier: "OU",
+		tier: "UU",
 		doublesTier: "DOU",
 		randomBattleMoves: ["swordsdance", "closecombat", "quickattack", "facade", "shadowclaw"],
 	},
 	seviper: {
-		tier: "OU",
+		tier: "UU",
 		doublesTier: "DOU",
-		randomBattleMoves: ["swordsdance", "poisonjab", "earthquake", "glare", "crunch"],
+		randomBattleMoves: ["sludgebomb", "flamethrower", "earthquake", "glare", "crunch", "gigadrain", "switcheroo"],
 	},
 	lunatone: {
-		tier: "OU",
+		tier: "UU",
 		doublesTier: "DOU",
 		randomBattleMoves: ["nastyplot", "psyshock", "moonblast", "stealthrock", "icebeam"],
 	},
 	solrock: {
-		tier: "OU",
+		tier: "UU",
 		doublesTier: "DOU",
 		randomBattleMoves: ["earthquake", "explosion", "stoneedge", "stealthrock", "willowisp"],
 	},
@@ -1479,7 +1481,7 @@ export const FormatsData: {[k: string]: ModdedSpeciesFormatsData} = {
 		tier: "LC",
 	},
 	whiscash: {
-		tier: "OU",
+		tier: "UU",
 		doublesTier: "DOU",
 		randomBattleMoves: ["dragondance", "earthquake", "waterfall", "stoneedge"],
 	},
@@ -1495,7 +1497,7 @@ export const FormatsData: {[k: string]: ModdedSpeciesFormatsData} = {
 		tier: "LC",
 	},
 	claydol: {
-		tier: "OU",
+		tier: "UU",
 		doublesTier: "DOU",
 		randomBattleMoves: ["earthquake", "psychic", "icebeam", "rapidspin", "stealthrock"],
 	},
@@ -1503,7 +1505,7 @@ export const FormatsData: {[k: string]: ModdedSpeciesFormatsData} = {
 		tier: "LC",
 	},
 	cradily: {
-		tier: "OU",
+		tier: "UU",
 		doublesTier: "DOU",
 		randomBattleMoves: ["gigadrain", "recover", "stealthrock", "stoneedge"],
 	},
@@ -1511,7 +1513,7 @@ export const FormatsData: {[k: string]: ModdedSpeciesFormatsData} = {
 		tier: "LC",
 	},
 	armaldo: {
-		tier: "OU",
+		tier: "UU",
 		doublesTier: "DOU",
 		randomBattleMoves: ["stoneedge", "rapidspin", "stealthrock", "knockoff", "aquajet", "xscissor"],
 	},
@@ -1519,17 +1521,17 @@ export const FormatsData: {[k: string]: ModdedSpeciesFormatsData} = {
 		tier: "LC",
 	},
 	milotic: {
-		tier: "OU",
+		tier: "UU",
 		doublesTier: "DOU",
 		randomBattleMoves: ["scald", "rest", "sleeptalk", "icebeam", "dragontail"],
 	},
 	castform: {
-		tier: "OU",
+		tier: "UU",
 		doublesTier: "DOU",
 		randomBattleMoves: ["icebeam", "flamethrower", "thunderbolt", "scald"],
 	},
 	kecleon: {
-		tier: "OU",
+		tier: "UU",
 		doublesTier: "DOU",
 		randomBattleMoves: ["fakeout", "stealthrock", "drainpunch", "thunderwave", "shadowsneak"],
 	},
@@ -1537,7 +1539,7 @@ export const FormatsData: {[k: string]: ModdedSpeciesFormatsData} = {
 		tier: "LC",
 	},
 	banette: {
-		tier: "OU",
+		tier: "UU",
 		doublesTier: "DOU",
 		randomBattleMoves: ["shadowclaw", "willowisp", "destinybond", "shadowsneak", "knockoff"],
 	},
@@ -1548,12 +1550,12 @@ export const FormatsData: {[k: string]: ModdedSpeciesFormatsData} = {
 		tier: "NFE",
 	},
 	dusknoir: {
-		tier: "OU",
+		tier: "UU",
 		doublesTier: "DOU",
 		randomBattleMoves: ["shadowpunch", "icepunch", "shadowsneak", "earthquake", "willowisp", "painsplit"],
 	},
 	tropius: {
-		tier: "OU",
+		tier: "UU",
 		doublesTier: "DOU",
 		randomBattleMoves: ["dragondance", "leafblade", "aerialace", "roost", "earthquake"],
 	},
@@ -1561,12 +1563,12 @@ export const FormatsData: {[k: string]: ModdedSpeciesFormatsData} = {
 		tier: "LC",
 	},
 	chimecho: {
-		tier: "OU",
+		tier: "UU",
 		doublesTier: "DOU",
 		randomBattleMoves: ["psychic", "lightscreen", "reflect", "thunderwave", "recover", "healingwish"],
 	},
 	absol: {
-		tier: "OU",
+		tier: "UU",
 		doublesTier: "DOU",
 		randomBattleMoves: ["knockoff", "suckerpunch", "swordsdance", "playrough"],
 	},
@@ -1574,14 +1576,14 @@ export const FormatsData: {[k: string]: ModdedSpeciesFormatsData} = {
 		tier: "LC",
 	},
 	glalie: {
-		tier: "OU",
+		tier: "UU",
 		doublesTier: "DOU",
 		randomBattleMoves: ["protect", "substitute", "disable", "freezedry", "earthquake"],
 	},
 	froslass: {
-		tier: "OU",
+		tier: "UU",
 		doublesTier: "DOU",
-		randomBattleMoves: ["icebeam", "shadowball", "willowisp", "destinybond", "taunt"],
+		randomBattleMoves: ["icebeam", "shadowball", "willowisp", "destinybond", "taunt", "spikes"],
 	},
 	spheal: {
 		tier: "LC",
@@ -1590,7 +1592,7 @@ export const FormatsData: {[k: string]: ModdedSpeciesFormatsData} = {
 		tier: "NFE",
 	},
 	walrein: {
-		tier: "OU",
+		tier: "UU",
 		doublesTier: "DOU",
 		randomBattleMoves: ["surf", "icebeam", "rest", "sleeptalk"],
 	},
@@ -1598,22 +1600,22 @@ export const FormatsData: {[k: string]: ModdedSpeciesFormatsData} = {
 		tier: "LC",
 	},
 	huntail: {
-		tier: "OU",
+		tier: "UU",
 		doublesTier: "DOU",
 		randomBattleMoves: ["shellsmash", "waterfall", "crunch", "icebeam"],
 	},
 	gorebyss: {
-		tier: "OU",
+		tier: "UU",
 		doublesTier: "DOU",
 		randomBattleMoves: ["shellsmash", "hydropump", "icebeam", "psychic"],
 	},
 	relicanth: {
-		tier: "OU",
+		tier: "UU",
 		doublesTier: "DOU",
 		randomBattleMoves: ["headsmash", "stealthrock", "waterfall", "earthquake", "doubleedge", "yawn"],
 	},
 	luvdisc: {
-		tier: "OU",
+		tier: "UU",
 		doublesTier: "DOU",
 		randomBattleMoves: ["scald", "icebeam", "sweetkiss", "charm"],
 	},
@@ -1624,7 +1626,7 @@ export const FormatsData: {[k: string]: ModdedSpeciesFormatsData} = {
 		tier: "NFE",
 	},
 	salamence: {
-		tier: "OU",
+		tier: "UU",
 		doublesTier: "DOU",
 		randomBattleMoves: ["dragondance", "earthquake", "outrage", "stoneedge", "roost", "aerialace"],
 	},
@@ -1635,29 +1637,29 @@ export const FormatsData: {[k: string]: ModdedSpeciesFormatsData} = {
 		tier: "NFE",
 	},
 	metagross: {
-		tier: "OU",
+		tier: "UU",
 		doublesTier: "DOU",
-		randomBattleMoves: ["meteormash", "zenheadbutt", "agility", "earthquake", "bulletpunch"],
+		randomBattleMoves: ["meteormash", "zenheadbutt", "agility", "earthquake", "bulletpunch", "explosion"],
 	},
 	regirock: {
-		tier: "OU",
+		tier: "UU",
 		doublesTier: "DOU",
 		randomBattleMoves: ["stoneedge", "stealthrock", "earthquake", "curse", "rest", "drainpunch"],
 	},
 	regice: {
-		tier: "OU",
+		tier: "UU",
 		doublesTier: "DOU",
 		randomBattleMoves: ["icebeam", "thunderbolt", "rockpolish", "rest", "sleeptalk", "focusblast"],
 	},
 	registeel: {
-		tier: "OU",
+		tier: "UU",
 		doublesTier: "DOU",
 		randomBattleMoves: ["stealthrock", "ironhead", "curse", "rest", "sleeptalk"],
 	},
 	latias: {
 		tier: "OU",
 		doublesTier: "DOU",
-		randomBattleMoves: ["calmmind", "roost", "psychic", "dracometeor", "healingwish"],
+		randomBattleMoves: ["calmmind", "roost", "psychic", "dracometeor", "healingwish", "surf"],
 	},
 	latios: {
 		tier: "OU",
@@ -1692,12 +1694,12 @@ export const FormatsData: {[k: string]: ModdedSpeciesFormatsData} = {
 	deoxysattack: {
 		isNonstandard: "Unobtainable",
 		tier: "Unreleased",
-		randomBattleMoves: ["psychoboost", "icebeam", "thunderbolt", "focusblast"],
+		randomBattleMoves: ["psychoboost", "icebeam", "knockoff", "superpower", "extremespeed"],
 	},
 	deoxysdefense: {
 		isNonstandard: "Unobtainable",
 		tier: "Unreleased",
-		randomBattleMoves: ["psychic", "stealthrock", "toxicspikes", "recover", "knockoff", "taunt"],
+		randomBattleMoves: ["nightshade", "stealthrock", "toxicspikes", "recover", "knockoff", "taunt", "teleport"],
 	},
 	deoxysspeed: {
 		isNonstandard: "Unobtainable",
@@ -1711,7 +1713,7 @@ export const FormatsData: {[k: string]: ModdedSpeciesFormatsData} = {
 		tier: "NFE",
 	},
 	torterra: {
-		tier: "OU",
+		tier: "UU",
 		doublesTier: "DOU",
 		randomBattleMoves: ["earthquake", "stealthrock", "woodhammer", "stoneedge", "synthesis", "rockpolish"],
 	},
@@ -1735,7 +1737,7 @@ export const FormatsData: {[k: string]: ModdedSpeciesFormatsData} = {
 	empoleon: {
 		tier: "OU",
 		doublesTier: "DOU",
-		randomBattleMoves: ["scald", "stealthrock", "icebeam", "flashcannon", "agility"],
+		randomBattleMoves: ["scald", "stealthrock", "icebeam", "flashcannon", "agility", "defog"],
 	},
 	starly: {
 		tier: "LC",
@@ -1752,15 +1754,15 @@ export const FormatsData: {[k: string]: ModdedSpeciesFormatsData} = {
 		tier: "LC",
 	},
 	bibarel: {
-		tier: "OU",
+		tier: "UU",
 		doublesTier: "DOU",
-		randomBattleMoves: ["curse", "quickattack", "aquajet", "rest", "waterfall"],
+		randomBattleMoves: ["curse", "quickattack", "aquajet", "rest", "aquatail"],
 	},
 	kricketot: {
 		tier: "LC",
 	},
 	kricketune: {
-		tier: "OU",
+		tier: "UU",
 		doublesTier: "DOU",
 		randomBattleMoves: ["bugbite", "stickyweb", "nightslash", "brickbreak"],
 	},
@@ -1771,7 +1773,7 @@ export const FormatsData: {[k: string]: ModdedSpeciesFormatsData} = {
 		tier: "NFE",
 	},
 	luxray: {
-		tier: "OU",
+		tier: "UU",
 		doublesTier: "DOU",
 		randomBattleMoves: ["wildcharge", "facade", "voltswitch", "crunch"],
 	},
@@ -1779,7 +1781,7 @@ export const FormatsData: {[k: string]: ModdedSpeciesFormatsData} = {
 		tier: "LC",
 	},
 	rampardos: {
-		tier: "OU",
+		tier: "UU",
 		doublesTier: "DOU",
 		randomBattleMoves: ["headsmash", "zenheadbutt", "stealthrock", "crunch", "rockpolish"],
 	},
@@ -1787,7 +1789,7 @@ export const FormatsData: {[k: string]: ModdedSpeciesFormatsData} = {
 		tier: "LC",
 	},
 	bastiodon: {
-		tier: "OU",
+		tier: "UU",
 		doublesTier: "DOU",
 		randomBattleMoves: ["rockblast", "stealthrock", "roar", "metalburst"],
 	},
@@ -1795,22 +1797,22 @@ export const FormatsData: {[k: string]: ModdedSpeciesFormatsData} = {
 		tier: "LC",
 	},
 	wormadam: {
-		tier: "OU",
+		tier: "UU",
 		doublesTier: "DOU",
 		randomBattleMoves: ["bugbuzz", "psychic", "shadowball", "quiverdance", "leafstorm"],
 	},
 	wormadamsandy: {
-		tier: "OU",
+		tier: "UU",
 		doublesTier: "DOU",
-		randomBattleMoves: ["earthquake", "stealthrock"],
+		randomBattleMoves: ["bugbuzz", "earthquake", "rockblast", "stealthrock"],
 	},
 	wormadamtrash: {
-		tier: "OU",
+		tier: "UU",
 		doublesTier: "DOU",
-		randomBattleMoves: ["ironhead", "stealthrock"],
+		randomBattleMoves: ["bugbuzz", "gigadrain", "flashcannon", "quiverdance", "stealthrock"],
 	},
 	mothim: {
-		tier: "OU",
+		tier: "UU",
 		doublesTier: "DOU",
 		randomBattleMoves: ["quiverdance", "airslash", "bugbuzz", "roost", "energyball"],
 	},
@@ -1818,12 +1820,12 @@ export const FormatsData: {[k: string]: ModdedSpeciesFormatsData} = {
 		tier: "LC",
 	},
 	vespiquen: {
-		tier: "OU",
+		tier: "UU",
 		doublesTier: "DOU",
 		randomBattleMoves: ["attackorder", "uturn", "roost", "toxic", "substitute"],
 	},
 	pachirisu: {
-		tier: "OU",
+		tier: "UU",
 		doublesTier: "DOU",
 		randomBattleMoves: ["nuzzle", "thunderbolt", "superfang", "uturn"],
 	},
@@ -1831,7 +1833,7 @@ export const FormatsData: {[k: string]: ModdedSpeciesFormatsData} = {
 		tier: "LC",
 	},
 	floatzel: {
-		tier: "OU",
+		tier: "UU",
 		doublesTier: "DOU",
 		randomBattleMoves: ["aquajet", "waterfall", "brickbreak", "bulkup", "taunt", "substitute"],
 	},
@@ -1839,15 +1841,15 @@ export const FormatsData: {[k: string]: ModdedSpeciesFormatsData} = {
 		tier: "LC",
 	},
 	cherrim: {
-		tier: "OU",
+		tier: "UU",
 		doublesTier: "DOU",
-		randomBattleMoves: ["dazzlinggleam", "energyball", "sunnyday", "weatherball"],
+		randomBattleMoves: ["dazzlinggleam", "petaldance", "healingwish", "gigadrain"],
 	},
 	shellos: {
 		tier: "LC",
 	},
 	gastrodon: {
-		tier: "OU",
+		tier: "UU",
 		doublesTier: "DOU",
 		randomBattleMoves: ["earthquake", "scald", "recover", "icebeam"],
 	},
@@ -1855,7 +1857,7 @@ export const FormatsData: {[k: string]: ModdedSpeciesFormatsData} = {
 		tier: "LC",
 	},
 	drifblim: {
-		tier: "OU",
+		tier: "UU",
 		doublesTier: "DOU",
 		randomBattleMoves: ["calmmind", "shadowball", "strengthsap", "thunderbolt"],
 	},
@@ -1863,7 +1865,7 @@ export const FormatsData: {[k: string]: ModdedSpeciesFormatsData} = {
 		tier: "LC",
 	},
 	lopunny: {
-		tier: "OU",
+		tier: "UU",
 		doublesTier: "DOU",
 		randomBattleMoves: ["highjumpkick", "facade", "healingwish", "switcheroo"],
 	},
@@ -1871,7 +1873,7 @@ export const FormatsData: {[k: string]: ModdedSpeciesFormatsData} = {
 		tier: "LC",
 	},
 	purugly: {
-		tier: "OU",
+		tier: "UU",
 		doublesTier: "DOU",
 		randomBattleMoves: ["fakeout", "quickattack", "suckerpunch", "uturn", "bodyslam"],
 	},
@@ -1879,7 +1881,7 @@ export const FormatsData: {[k: string]: ModdedSpeciesFormatsData} = {
 		tier: "LC",
 	},
 	skuntank: {
-		tier: "OU",
+		tier: "UU",
 		doublesTier: "DOU",
 		randomBattleMoves: ["crunch", "defog", "fireblast", "suckerpunch", "taunt", "poisonjab"],
 	},
@@ -1887,17 +1889,17 @@ export const FormatsData: {[k: string]: ModdedSpeciesFormatsData} = {
 		tier: "LC",
 	},
 	bronzong: {
-		tier: "OU",
+		tier: "UU",
 		doublesTier: "DOU",
 		randomBattleMoves: ["earthquake", "gyroball", "stealthrock", "psychic"],
 	},
 	chatot: {
-		tier: "OU",
+		tier: "UU",
 		doublesTier: "DOU",
 		randomBattleMoves: ["boomburst", "chatter", "nastyplot", "uturn", "substitute"],
 	},
 	spiritomb: {
-		tier: "OU",
+		tier: "UU",
 		doublesTier: "DOU",
 		randomBattleMoves: ["calmmind", "darkpulse", "psychic", "rest", "sleeptalk", "willowisp"],
 	},
@@ -1924,7 +1926,7 @@ export const FormatsData: {[k: string]: ModdedSpeciesFormatsData} = {
 		tier: "LC",
 	},
 	hippowdon: {
-		tier: "OU",
+		tier: "UU",
 		doublesTier: "DOU",
 		randomBattleMoves: ["earthquake", "stoneedge", "stealthrock", "whirlwind", "slackoff"],
 	},
@@ -1932,7 +1934,7 @@ export const FormatsData: {[k: string]: ModdedSpeciesFormatsData} = {
 		tier: "LC",
 	},
 	drapion: {
-		tier: "OU",
+		tier: "UU",
 		doublesTier: "DOU",
 		randomBattleMoves: ["earthquake", "knockoff", "poisonjab", "swordsdance", "toxicspikes", "whirlwind", "taunt"],
 	},
@@ -1940,12 +1942,12 @@ export const FormatsData: {[k: string]: ModdedSpeciesFormatsData} = {
 		tier: "LC",
 	},
 	toxicroak: {
-		tier: "OU",
+		tier: "UU",
 		doublesTier: "DOU",
 		randomBattleMoves: ["drainpunch", "poisonjab", "suckerpunch", "swordsdance", "substitute"],
 	},
 	carnivine: {
-		tier: "OU",
+		tier: "UU",
 		doublesTier: "DOU",
 		randomBattleMoves: ["powerwhip", "swordsdance", "sleeppowder", "substitute", "crunch"],
 	},
@@ -1953,7 +1955,7 @@ export const FormatsData: {[k: string]: ModdedSpeciesFormatsData} = {
 		tier: "LC",
 	},
 	lumineon: {
-		tier: "OU",
+		tier: "UU",
 		doublesTier: "DOU",
 		randomBattleMoves: ["defog", "icebeam", "scald", "uturn"],
 	},
@@ -1961,54 +1963,54 @@ export const FormatsData: {[k: string]: ModdedSpeciesFormatsData} = {
 		tier: "LC",
 	},
 	abomasnow: {
-		tier: "OU",
+		tier: "UU",
 		doublesTier: "DOU",
 		randomBattleMoves: ["auroraveil", "earthquake", "iceshard", "woodhammer", "blizzard"],
 	},
 	rotom: {
-		tier: "OU",
+		tier: "UU",
 		doublesTier: "DOU",
-		randomBattleMoves: ["shadowball", "thunderbolt", "voltswitch", "willowisp", "trick"],
+		randomBattleMoves: ["shadowball", "thunderbolt", "voltswitch", "willowisp", "trick", "nastyplot"],
 	},
 	rotomheat: {
-		tier: "OU",
+		tier: "UU",
 		doublesTier: "DOU",
-		randomBattleMoves: ["thunderbolt", "overheat", "voltswitch", "willowisp", "trick"],
+		randomBattleMoves: ["thunderbolt", "overheat", "voltswitch", "willowisp", "trick", "nastyplot"],
 	},
 	rotomwash: {
 		tier: "OU",
 		doublesTier: "DOU",
-		randomBattleMoves: ["thunderbolt", "hydropump", "voltswitch", "willowisp", "trick"],
+		randomBattleMoves: ["thunderbolt", "hydropump", "voltswitch", "willowisp", "trick", "nastyplot"],
 	},
 	rotomfrost: {
-		tier: "OU",
+		tier: "UU",
 		doublesTier: "DOU",
-		randomBattleMoves: ["thunderbolt", "blizzard", "voltswitch", "willowisp", "trick"],
+		randomBattleMoves: ["thunderbolt", "blizzard", "voltswitch", "willowisp", "trick", "nastyplot"],
 	},
 	rotomfan: {
-		tier: "OU",
+		tier: "UU",
 		doublesTier: "DOU",
-		randomBattleMoves: ["thunderbolt", "airslash", "voltswitch", "willowisp", "trick"],
+		randomBattleMoves: ["thunderbolt", "airslash", "voltswitch", "willowisp", "trick", "nastyplot"],
 	},
 	rotommow: {
-		tier: "OU",
+		tier: "UU",
 		doublesTier: "DOU",
-		randomBattleMoves: ["thunderbolt", "leafstorm", "voltswitch", "willowisp", "trick"],
+		randomBattleMoves: ["thunderbolt", "leafstorm", "voltswitch", "willowisp", "trick", "nastyplot"],
 	},
 	uxie: {
-		tier: "OU",
+		tier: "UU",
 		doublesTier: "DOU",
 		randomBattleMoves: ["psychic", "stealthrock", "uturn", "thunderwave", "yawn"],
 	},
 	mesprit: {
-		tier: "OU",
+		tier: "UU",
 		doublesTier: "DOU",
 		randomBattleMoves: ["psychic", "icebeam", "thunderbolt", "nastyplot", "energyball", "uturn", "healingwish"],
 	},
 	azelf: {
 		tier: "OU",
 		doublesTier: "DOU",
-		randomBattleMoves: ["psychic", "nastyplot", "thunderbolt", "fireblast", "dazzlinggleam", "stealthrock", "uturn"],
+		randomBattleMoves: ["psychic", "nastyplot", "thunderbolt", "fireblast", "dazzlinggleam", "stealthrock", "uturn", "taunt"],
 	},
 	dialga: {
 		tier: "Uber",
@@ -2018,7 +2020,7 @@ export const FormatsData: {[k: string]: ModdedSpeciesFormatsData} = {
 	palkia: {
 		tier: "Uber",
 		doublesTier: "DUber",
-		randomBattleMoves: ["spacialrend", "hydropump", "fireblast", "thunderwave"],
+		randomBattleMoves: ["spacialrend", "hydropump", "fireblast", "thunderwave", "dracometeor"],
 	},
 	heatran: {
 		tier: "OU",
@@ -2026,34 +2028,34 @@ export const FormatsData: {[k: string]: ModdedSpeciesFormatsData} = {
 		randomBattleMoves: ["lavaplume", "flashcannon", "stealthrock", "roar", "earthpower", "taunt"],
 	},
 	regigigas: {
-		tier: "OU",
+		tier: "UU",
 		doublesTier: "DOU",
 		randomBattleMoves: ["rest", "sleeptalk", "strength", "knockoff"],
 	},
 	giratina: {
 		tier: "Uber",
 		doublesTier: "DUber",
-		randomBattleMoves: ["hex", "willowisp", "rest", "sleeptalk"],
+		randomBattleMoves: ["shadowball", "dragonpulse", "rest", "sleeptalk", "aurasphere", "calmmind"],
 	},
 	giratinaorigin: {
 		tier: "Uber",
 		doublesTier: "DUber",
-		randomBattleMoves: ["dracometeor", "shadowball", "aurasphere", "willowisp"],
+		randomBattleMoves: ["dracometeor", "shadowball", "aurasphere", "willowisp", "defog"],
 	},
 	cresselia: {
-		tier: "OU",
+		tier: "UU",
 		doublesTier: "DOU",
 		randomBattleMoves: ["calmmind", "psychic", "moonblast", "moonlight", "thunderwave"],
 	},
 	phione: {
-		tier: "OU",
+		tier: "UU",
 		doublesTier: "DOU",
 		randomBattleMoves: ["scald", "raindance", "rest", "icebeam"],
 	},
 	manaphy: {
 		tier: "OU",
 		doublesTier: "DOU",
-		randomBattleMoves: ["surf", "tailglow", "icebeam", "psychic", "substitute"],
+		randomBattleMoves: ["surf", "tailglow", "icebeam", "energyball", "substitute"],
 	},
 	darkrai: {
 		isNonstandard: "Unobtainable",
@@ -2063,12 +2065,12 @@ export const FormatsData: {[k: string]: ModdedSpeciesFormatsData} = {
 	shaymin: {
 		isNonstandard: "Unobtainable",
 		tier: "Unreleased",
-		randomBattleMoves: ["seedflare", "healingwish", "synthesis", "leechseed", "psychic"],
+		randomBattleMoves: ["seedflare", "healingwish", "rest", "leechseed", "psychic", "substitute"],
 	},
 	shayminsky: {
 		isNonstandard: "Unobtainable",
 		tier: "Unreleased",
-		randomBattleMoves: ["airslash", "seedflare", "substitute", "synthesis", "leechseed"],
+		randomBattleMoves: ["seedflare", "substitute", "synthesis", "leechseed", "airslash"],
 	},
 	arceus: {
 		isNonstandard: "Unobtainable",
@@ -2093,7 +2095,7 @@ export const FormatsData: {[k: string]: ModdedSpeciesFormatsData} = {
 	},
 	arceusfairy: {
 		isNonstandard: "Unobtainable",
-		randomBattleMoves: ["calmmind", "judgment", "earthpower", "defog", "recover"],
+		randomBattleMoves: ["calmmind", "judgment", "earthpower", "fireblast", "recover"],
 	},
 	arceusfighting: {
 		isNonstandard: "Unobtainable",
@@ -2101,7 +2103,7 @@ export const FormatsData: {[k: string]: ModdedSpeciesFormatsData} = {
 	},
 	arceusfire: {
 		isNonstandard: "Unobtainable",
-		randomBattleMoves: ["thunderbolt", "judgment", "fireblast", "surf", "recover"],
+		randomBattleMoves: ["thunderbolt", "judgment", "surf", "recover", "calmmind"],
 	},
 	arceusflying: {
 		isNonstandard: "Unobtainable",
@@ -2125,7 +2127,7 @@ export const FormatsData: {[k: string]: ModdedSpeciesFormatsData} = {
 	},
 	arceuspoison: {
 		isNonstandard: "Unobtainable",
-		randomBattleMoves: ["calmmind", "defog", "icebeam", "sludgebomb", "recover"],
+		randomBattleMoves: ["calmmind", "defog", "earthpower", "sludgebomb", "recover"],
 	},
 	arceuspsychic: {
 		isNonstandard: "Unobtainable",
@@ -2137,7 +2139,7 @@ export const FormatsData: {[k: string]: ModdedSpeciesFormatsData} = {
 	},
 	arceussteel: {
 		isNonstandard: "Unobtainable",
-		randomBattleMoves: ["calmmind", "judgment", "surf", "thunderbolt", "recover"],
+		randomBattleMoves: ["defog", "judgment", "surf", "willowisp", "recover", "roar", "stealthrock"],
 	},
 	arceuswater: {
 		isNonstandard: "Unobtainable",