@pkmn/sim 0.5.25 → 0.5.27

package/data/formats-data.ts

@@ -70,7 +70,7 @@ export const FormatsData: {[k: string]: SpeciesFormatsData} = {
 		randomBattleLevel: 82,
 		randomDoubleBattleMoves: ["icebeam", "muddywater", "protect", "shellsmash"],
 		randomDoubleBattleLevel: 80,
-		tier: "NU",
+		tier: "NUBL",
 		doublesTier: "DUU",
 		natDexTier: "RU",
 	},
@@ -371,7 +371,6 @@ export const FormatsData: {[k: string]: SpeciesFormatsData} = {
 		randomDoubleBattleMoves: ["followme", "helpinghand", "moonblast", "protect"],
 		randomDoubleBattleLevel: 95,
 		tier: "NFE",
-		doublesTier: "DUU",
 	},
 	clefable: {
 		randomBattleMoves: ["calmmind", "fireblast", "moonblast", "softboiled", "stealthrock", "thunderwave"],
@@ -543,7 +542,7 @@ export const FormatsData: {[k: string]: SpeciesFormatsData} = {
 		randomBattleLevel: 86,
 		randomDoubleBattleMoves: ["closecombat", "fakeout", "ironhead", "lashout", "protect", "uturn"],
 		randomDoubleBattleLevel: 88,
-		tier: "PU",
+		tier: "(PU)",
 		doublesTier: "(DUU)",
 		natDexTier: "RU",
 	},
@@ -677,7 +676,7 @@ export const FormatsData: {[k: string]: SpeciesFormatsData} = {
 		randomBattleLevel: 84,
 		randomDoubleBattleMoves: ["acidspray", "icywind", "knockoff", "muddywater", "rapidspin", "sludgebomb"],
 		randomDoubleBattleLevel: 87,
-		tier: "UU",
+		tier: "RU",
 		doublesTier: "(DUU)",
 		natDexTier: "RU",
 	},
@@ -1215,9 +1214,9 @@ export const FormatsData: {[k: string]: SpeciesFormatsData} = {
 		randomBattleLevel: 81,
 		randomDoubleBattleMoves: ["brickbreak", "bugbite", "dualwingbeat", "uturn"],
 		randomDoubleBattleLevel: 84,
-		tier: "PU",
+		tier: "PUBL",
 		doublesTier: "NFE",
-		natDexTier: "NFE",
+		natDexTier: "LC",
 	},
 	scizor: {
 		randomBattleMoves: ["bulletpunch", "dualwingbeat", "knockoff", "roost", "superpower", "swordsdance", "uturn"],
@@ -1432,7 +1431,7 @@ export const FormatsData: {[k: string]: SpeciesFormatsData} = {
 		randomBattleMoves: ["discharge", "icebeam", "recover", "toxic", "triattack"],
 		randomBattleLevel: 82,
 		randomDoubleBattleMoves: ["icebeam", "protect", "recover", "thunderbolt", "toxic", "triattack"],
-		randomDoubleBattleLevel: 82,
+		randomDoubleBattleLevel: 83,
 		tier: "RU",
 		doublesTier: "DOU",
 		natDexTier: "NFE",
@@ -1518,7 +1517,7 @@ export const FormatsData: {[k: string]: SpeciesFormatsData} = {
 		randomBattleMoves: ["airslash", "calmmind", "freezingglare", "recover"],
 		randomBattleLevel: 80,
 		randomDoubleBattleMoves: ["calmmind", "freezingglare", "hurricane", "recover", "tailwind"],
-		randomDoubleBattleLevel: 80,
+		randomDoubleBattleLevel: 81,
 		randomBattleNoDynamaxMoves: ["calmmind", "freezingglare", "hurricane", "recover"],
 		tier: "PU",
 		doublesTier: "(DUU)",
@@ -1538,7 +1537,7 @@ export const FormatsData: {[k: string]: SpeciesFormatsData} = {
 		randomBattleLevel: 76,
 		randomDoubleBattleMoves: ["bravebird", "bulkup", "closecombat", "throatchop", "thunderouskick", "uturn"],
 		randomDoubleBattleLevel: 76,
-		tier: "OU",
+		tier: "UUBL",
 		doublesTier: "DUU",
 		natDexTier: "UUBL",
 	},
@@ -1778,7 +1777,7 @@ export const FormatsData: {[k: string]: SpeciesFormatsData} = {
 	},
 	sudowoodo: {
 		randomBattleMoves: ["earthquake", "headsmash", "stealthrock", "suckerpunch", "woodhammer"],
-		randomBattleLevel: 86,
+		randomBattleLevel: 87,
 		randomDoubleBattleMoves: ["bodypress", "firepunch", "headsmash", "protect", "suckerpunch", "woodhammer"],
 		randomDoubleBattleLevel: 90,
 		tier: "(PU)",
@@ -1939,7 +1938,7 @@ export const FormatsData: {[k: string]: SpeciesFormatsData} = {
 	},
 	shuckle: {
 		randomBattleMoves: ["encore", "knockoff", "stealthrock", "stickyweb", "toxic"],
-		randomBattleLevel: 86,
+		randomBattleLevel: 87,
 		randomDoubleBattleMoves: ["acupressure", "guardsplit", "helpinghand", "infestation", "knockoff", "stealthrock", "stickyweb", "toxic"],
 		randomDoubleBattleLevel: 100,
 		tier: "(PU)",
@@ -2733,7 +2732,7 @@ export const FormatsData: {[k: string]: SpeciesFormatsData} = {
 		randomBattleMoves: ["defog", "dracometeor", "earthquake", "fireblast", "roost", "toxic"],
 		randomBattleLevel: 90,
 		randomDoubleBattleMoves: ["defog", "dracometeor", "fireblast", "roost", "tailwind", "toxic"],
-		randomDoubleBattleLevel: 91,
+		randomDoubleBattleLevel: 92,
 		tier: "(PU)",
 		doublesTier: "(DUU)",
 		natDexTier: "RU",
@@ -3415,7 +3414,7 @@ export const FormatsData: {[k: string]: SpeciesFormatsData} = {
 	},
 	bronzong: {
 		randomBattleMoves: ["earthquake", "ironhead", "protect", "stealthrock", "toxic"],
-		randomBattleLevel: 82,
+		randomBattleLevel: 83,
 		randomDoubleBattleMoves: ["allyswitch", "bodypress", "explosion", "ironhead", "trickroom"],
 		randomDoubleBattleLevel: 88,
 		tier: "RU",
@@ -3446,7 +3445,7 @@ export const FormatsData: {[k: string]: SpeciesFormatsData} = {
 		randomBattleMoves: ["earthquake", "fireblast", "firefang", "outrage", "stealthrock", "stoneedge", "swordsdance"],
 		randomBattleLevel: 74,
 		randomDoubleBattleMoves: ["dragonclaw", "earthquake", "fireblast", "protect", "rockslide", "swordsdance"],
-		randomDoubleBattleLevel: 79,
+		randomDoubleBattleLevel: 80,
 		tier: "OU",
 		doublesTier: "(DUU)",
 		natDexTier: "OU",
@@ -4167,7 +4166,7 @@ export const FormatsData: {[k: string]: SpeciesFormatsData} = {
 	},
 	maractus: {
 		randomBattleMoves: ["energyball", "knockoff", "leechseed", "spikes", "spikyshield", "toxic"],
-		randomBattleLevel: 94,
+		randomBattleLevel: 95,
 		randomDoubleBattleMoves: ["acupressure", "drainpunch", "helpinghand", "leafstorm", "spikyshield", "suckerpunch"],
 		randomDoubleBattleLevel: 96, // buffed twice in the last 6 months as of Nov 2021
 		tier: "(PU)",
@@ -4219,7 +4218,7 @@ export const FormatsData: {[k: string]: SpeciesFormatsData} = {
 		randomBattleLevel: 86,
 		randomDoubleBattleMoves: ["bodypress", "irondefense", "painsplit", "shadowball", "trickroom", "willowisp"],
 		randomDoubleBattleLevel: 88,
-		tier: "PU",
+		tier: "(PU)",
 		doublesTier: "(DUU)",
 		natDexTier: "RU",
 	},
@@ -4284,7 +4283,7 @@ export const FormatsData: {[k: string]: SpeciesFormatsData} = {
 	zoroark: {
 		randomBattleMoves: ["darkpulse", "flamethrower", "nastyplot", "sludgebomb", "trick"],
 		randomDoubleBattleMoves: ["darkpulse", "flamethrower", "focusblast", "nastyplot", "protect", "sludgebomb"],
-		tier: "NU",
+		tier: "PUBL",
 		doublesTier: "(DUU)",
 		natDexTier: "RU",
 	},
@@ -5093,7 +5092,7 @@ export const FormatsData: {[k: string]: SpeciesFormatsData} = {
 		randomDoubleBattleMoves: ["knockoff", "psychocut", "rest", "superpower"],
 		randomDoubleBattleLevel: 84,
 		tier: "(PU)",
-		doublesTier: "DUU",
+		doublesTier: "(DUU)",
 		natDexTier: "RU",
 	},
 	binacle: {
@@ -5618,7 +5617,7 @@ export const FormatsData: {[k: string]: SpeciesFormatsData} = {
 		randomDoubleBattleMoves: ["leechlife", "liquidation", "lunge", "protect", "stickyweb", "wideguard"],
 		randomDoubleBattleLevel: 84,
 		tier: "PUBL",
-		doublesTier: "DUU",
+		doublesTier: "(DUU)",
 		natDexTier: "RU",
 	},
 	araquanidtotem: {
@@ -5913,7 +5912,7 @@ export const FormatsData: {[k: string]: SpeciesFormatsData} = {
 		randomBattleLevel: 84,
 		randomDoubleBattleMoves: ["flamethrower", "multiattack", "partingshot", "tailwind", "thunderbolt"],
 		randomDoubleBattleLevel: 87,
-		tier: "NU",
+		tier: "PU",
 		doublesTier: "(DUU)",
 		natDexTier: "RU",
 	},
@@ -6035,7 +6034,7 @@ export const FormatsData: {[k: string]: SpeciesFormatsData} = {
 	},
 	tapulele: {
 		randomBattleMoves: ["calmmind", "focusblast", "moonblast", "psychic", "psyshock", "shadowball"],
-		randomBattleLevel: 80,
+		randomBattleLevel: 79,
 		randomDoubleBattleMoves: ["calmmind", "dazzlinggleam", "focusblast", "moonblast", "protect", "psyshock"],
 		randomDoubleBattleLevel: 80,
 		tier: "OU",
@@ -6105,7 +6104,7 @@ export const FormatsData: {[k: string]: SpeciesFormatsData} = {
 	},
 	pheromosa: {
 		randomBattleMoves: ["closecombat", "icebeam", "poisonjab", "throatchop", "uturn"],
-		randomBattleLevel: 76,
+		randomBattleLevel: 75,
 		randomDoubleBattleMoves: ["closecombat", "icebeam", "poisonjab", "protect", "throatchop", "uturn"],
 		randomDoubleBattleLevel: 78,
 		tier: "Uber",
@@ -6160,7 +6159,7 @@ export const FormatsData: {[k: string]: SpeciesFormatsData} = {
 	},
 	necrozmaduskmane: {
 		randomBattleMoves: ["dragondance", "earthquake", "morningsun", "photongeyser", "sunsteelstrike"],
-		randomBattleLevel: 68,
+		randomBattleLevel: 67,
 		randomDoubleBattleMoves: ["dragondance", "photongeyser", "protect", "sunsteelstrike"],
 		randomDoubleBattleLevel: 72,
 		tier: "Uber",
@@ -6963,7 +6962,7 @@ export const FormatsData: {[k: string]: SpeciesFormatsData} = {
 		randomDoubleBattleMoves: ["electroweb", "extremespeed", "protect", "thundercage", "voltswitch"],
 		randomDoubleBattleLevel: 82,
 		randomBattleNoDynamaxMoves: ["explosion", "rapidspin", "thunderbolt", "voltswitch"],
-		tier: "OU",
+		tier: "UU",
 		doublesTier: "DOU",
 		natDexTier: "UU",
 	},
@@ -6981,7 +6980,7 @@ export const FormatsData: {[k: string]: SpeciesFormatsData} = {
 		randomBattleLevel: 82,
 		randomDoubleBattleMoves: ["closecombat", "highhorsepower", "iciclecrash", "protect"],
 		randomDoubleBattleLevel: 82,
-		tier: "PU",
+		tier: "(PU)",
 		doublesTier: "(DUU)",
 		natDexTier: "RU",
 	},

package/data/learnsets.ts

@@ -4722,13 +4722,13 @@ export const Learnsets: {[speciesid: string]: LearnsetData} = {
 			megapunch: ["8M", "7V", "3T"],
 			meteorbeam: ["8T"],
 			meteormash: ["8L32", "7L50", "6L50", "5L55", "4L43", "3L45"],
-			metronome: ["8M", "8L20", "8V", "7L31", "7V", "6L31", "5L34", "4L31", "3T", "3L29"],
+			metronome: ["8M", "8L20", "8V", "8S1", "7L31", "7V", "6L31", "5L34", "4L31", "3T", "3L29"],
 			mimic: ["7V", "3T"],
 			minimize: ["8L8", "8V", "7L25", "7V", "6L25", "5L19", "4L19", "3L21"],
 			mistyexplosion: ["8T"],
 			mistyterrain: ["8M"],
-			moonblast: ["8L44", "8V", "7L46", "6L46"],
-			moonlight: ["8L24", "7L43", "7V", "6L43", "5L40", "4L37", "3L37"],
+			moonblast: ["8L44", "8V", "8S1", "7L46", "6L46"],
+			moonlight: ["8L24", "8S1", "7L43", "7V", "6L43", "5L40", "4L37", "3L37"],
 			mudslap: ["7V", "4T", "3T"],
 			mysticalfire: ["8M"],
 			naturalgift: ["4M"],
@@ -4792,10 +4792,11 @@ export const Learnsets: {[speciesid: string]: LearnsetData} = {
 			wonderroom: ["8M", "7T", "6T", "5T"],
 			workup: ["8M", "7M", "5M"],
 			zapcannon: ["7V"],
-			zenheadbutt: ["8M", "7T", "6T", "5T", "4T"],
+			zenheadbutt: ["8M", "8S1", "7T", "6T", "5T", "4T"],
 		},
 		eventData: [
 			{generation: 8, level: 50, gender: "F", shiny: true, nature: "Bold", isHidden: true, ivs: {hp: 31, atk: 0, def: 31, spa: 31, spd: 31, spe: 31}, moves: ["followme", "icywind", "helpinghand", "protect"], pokeball: "cherishball"},
+			{generation: 8, level: 15, gender: "M", nature: "Modest", abilities: ["cutecharm"], moves: ["metronome", "moonblast", "zenheadbutt", "moonlight"], pokeball: "moonball"},
 		],
 		encounters: [
 			{generation: 1, level: 8},
@@ -11320,25 +11321,25 @@ export const Learnsets: {[speciesid: string]: LearnsetData} = {
 			bodyslam: ["8M"],
 			bravebird: ["8M", "8L65"],
 			brickbreak: ["8M", "8L40"],
-			brutalswing: ["8M", "8L20"],
+			brutalswing: ["8M", "8L20", "8S0"],
 			closecombat: ["8M"],
 			coaching: ["8T"],
 			defog: ["8L35"],
-			detect: ["8L25"],
+			detect: ["8L25", "8S0"],
 			dualwingbeat: ["8T"],
 			endure: ["8M"],
 			facade: ["8M"],
 			finalgambit: ["8L60"],
 			firstimpression: ["8L1"],
 			focusenergy: ["8M"],
-			furycutter: ["8L1"],
+			furycutter: ["8L1", "8S0"],
 			grassyglide: ["8T"],
 			helpinghand: ["8M"],
 			irondefense: ["8M", "8L0"],
 			knockoff: ["8L30"],
 			leafblade: ["8M", "8L55"],
 			leer: ["8L1"],
-			meteorassault: ["8L70"],
+			meteorassault: ["8L70", "8S0"],
 			peck: ["8L1"],
 			poisonjab: ["8M"],
 			protect: ["8M"],
@@ -11360,6 +11361,9 @@ export const Learnsets: {[speciesid: string]: LearnsetData} = {
 			throatchop: ["8M"],
 			workup: ["8M"],
 		},
+		eventData: [
+			{generation: 8, level: 80, gender: "M", nature: "Brave", abilities: ["steadfast"], ivs: {hp: 30, atk: 31, def: 31, spa: 30, spd: 30, spe: 31}, moves: ["meteorassault", "brutalswing", "furycutter", "detect"], pokeball: "pokeball"},
+		],
 	},
 	doduo: {
 		learnset: {
@@ -12420,7 +12424,7 @@ export const Learnsets: {[speciesid: string]: LearnsetData} = {
 			counter: ["7V", "3T"],
 			curse: ["8L20", "7L12", "7V", "6L12", "5L12", "4L12", "3L13", "3S0"],
 			darkpulse: ["8M", "8L42", "8V", "7M", "7L44", "6M", "6L44", "5T", "5L44", "4M", "4L44"],
-			dazzlinggleam: ["8M", "8V", "7M", "6M"],
+			dazzlinggleam: ["8M", "8V", "8S7", "7M", "6M"],
 			destinybond: ["8L54", "7L50", "7V", "6L50", "6S3", "5L50", "4L50", "3L39"],
 			disable: ["8V"],
 			doubleedge: ["7V", "3T"],
@@ -12490,14 +12494,14 @@ export const Learnsets: {[speciesid: string]: LearnsetData} = {
 			secretpower: ["6M", "4M", "3M"],
 			seismictoss: ["8V", "7V", "3T"],
 			selfdestruct: ["8M", "8V", "7V", "3T"],
-			shadowball: ["8M", "8L48", "8V", "7M", "7L33", "7V", "6M", "6L33", "6S3", "6S4", "5M", "5L33", "4M", "4L33", "3M", "3L45"],
+			shadowball: ["8M", "8L48", "8V", "8S7", "7M", "7L33", "7V", "6M", "6L33", "6S3", "6S4", "5M", "5L33", "4M", "4L33", "3M", "3L45"],
 			shadowclaw: ["8M", "7M", "6M", "5M", "4M"],
 			shadowpunch: ["8L1", "7L1", "6L25", "6S1", "6S2", "5L25", "4L25", "3L25"],
 			skillswap: ["8M", "7T", "6T", "5T", "4M", "3M"],
 			skittersmack: ["8T"],
 			skullbash: ["7V"],
 			sleeptalk: ["8M", "7M", "7V", "6M", "5T", "4M", "3T"],
-			sludgebomb: ["8M", "8V", "7M", "6M", "6S3", "5M", "4M", "3M"],
+			sludgebomb: ["8M", "8V", "8S7", "7M", "6M", "6S3", "5M", "4M", "3M"],
 			sludgewave: ["8M", "6S4"],
 			smog: ["8V"],
 			snatch: ["7T", "6T", "5T", "4M", "3M"],
@@ -12522,7 +12526,7 @@ export const Learnsets: {[speciesid: string]: LearnsetData} = {
 			trickroom: ["8M", "7M", "6M", "5M", "4M"],
 			uproar: ["8M", "7T", "6T", "5T", "4T"],
 			venoshock: ["8M", "7M", "6M", "5M"],
-			willowisp: ["8M", "8V", "7M", "6M", "6S3", "5M", "4M"],
+			willowisp: ["8M", "8V", "8S7", "7M", "6M", "6S3", "5M", "4M"],
 			wonderroom: ["8M", "7T", "6T", "5T"],
 			zapcannon: ["7V"],
 		},
@@ -12534,6 +12538,7 @@ export const Learnsets: {[speciesid: string]: LearnsetData} = {
 			{generation: 6, level: 25, shiny: true, moves: ["shadowball", "sludgewave", "confuseray", "astonish"], pokeball: "duskball"},
 			{generation: 6, level: 50, shiny: true, gender: "M", moves: ["meanlook", "hypnosis", "psychic", "hyperbeam"], pokeball: "cherishball"},
 			{generation: 6, level: 100, moves: ["meanlook", "hypnosis", "psychic", "hyperbeam"], pokeball: "cherishball"},
+			{generation: 8, level: 80, gender: "M", nature: "Naughty", abilities: ["cursedbody"], ivs: {hp: 30, atk: 30, def: 30, spa: 31, spd: 31, spe: 31}, moves: ["shadowball", "sludgebomb", "dazzlinggleam", "willowisp"], pokeball: "pokeball"},
 		],
 	},
 	onix: {
@@ -45841,13 +45846,13 @@ export const Learnsets: {[speciesid: string]: LearnsetData} = {
 		learnset: {
 			agility: ["8M"],
 			attract: ["8M", "7M", "6M", "5M", "4M"],
-			aurasphere: ["8M", "8L0", "7L1", "7S5", "6L1", "6S4", "5L51", "4L37", "4S0"],
+			aurasphere: ["8M", "8L0", "8S6", "7L1", "7S5", "6L1", "6S4", "5L51", "4L37", "4S0"],
 			blazekick: ["8M", "4S1"],
 			bonerush: ["8L36", "7L29", "6L29", "5L19", "4L19", "4S1"],
 			brickbreak: ["8M", "7M", "6M", "5M", "4M"],
 			bulkup: ["8M", "7M", "6M", "5M", "4M"],
 			bulldoze: ["8M", "7M", "6M", "5M"],
-			bulletpunch: ["5S2", "5S3"],
+			bulletpunch: ["8S6", "5S2", "5S3"],
 			calmmind: ["8M", "8L24", "7M", "7L47", "6M", "6L47", "5M", "5L47", "4M"],
 			captivate: ["4M"],
 			closecombat: ["8M", "8L60", "7L55", "6L1", "6S4", "5L55", "5S3", "4L42"],
@@ -45915,7 +45920,7 @@ export const Learnsets: {[speciesid: string]: LearnsetData} = {
 			retaliate: ["8M", "6M", "5M"],
 			return: ["7M", "6M", "5M", "4M"],
 			revenge: ["8M"],
-			reversal: ["8M", "8L1"],
+			reversal: ["8M", "8L1", "8S6"],
 			roar: ["7M", "6M", "5M", "4M"],
 			rockclimb: ["4M"],
 			rockslide: ["8M", "7M", "6M", "5M", "4M"],
@@ -45930,7 +45935,7 @@ export const Learnsets: {[speciesid: string]: LearnsetData} = {
 			shadowclaw: ["8M", "7M", "6M", "5M", "5S3", "4M"],
 			sleeptalk: ["8M", "7M", "6M", "5T", "4M"],
 			snore: ["8M", "7T", "6T", "5T", "4T"],
-			steelbeam: ["8T"],
+			steelbeam: ["8T", "8S6"],
 			stoneedge: ["8M", "7M", "6M", "5M", "5S3", "4M"],
 			strength: ["6M", "5M", "4M"],
 			substitute: ["8M", "7M", "6M", "5M", "4M"],
@@ -45953,6 +45958,7 @@ export const Learnsets: {[speciesid: string]: LearnsetData} = {
 			{generation: 5, level: 50, gender: "M", nature: "Naughty", ivs: {atk: 31}, isHidden: true, moves: ["bulletpunch", "closecombat", "stoneedge", "shadowclaw"], pokeball: "cherishball"},
 			{generation: 6, level: 100, nature: "Jolly", abilities: ["innerfocus"], moves: ["closecombat", "aurasphere", "flashcannon", "quickattack"], pokeball: "cherishball"},
 			{generation: 7, level: 40, gender: "M", nature: "Serious", abilities: ["steadfast"], moves: ["aurasphere", "highjumpkick", "dragonpulse", "extremespeed"], pokeball: "pokeball"},
+			{generation: 8, level: 80, gender: "M", nature: "Serious", abilities: ["innerfocus"], ivs: {hp: 31, atk: 30, def: 30, spa: 31, spd: 30, spe: 31}, moves: ["aurasphere", "bulletpunch", "reversal", "steelbeam"], pokeball: "pokeball"},
 		],
 	},
 	hippopotas: {
@@ -76822,11 +76828,11 @@ export const Learnsets: {[speciesid: string]: LearnsetData} = {
 			dragondance: ["8M", "8L24"],
 			dragonpulse: ["8M", "8L40", "8S0"],
 			dragontail: ["8L1"],
-			dynamaxcannon: ["8L56", "8S0"],
+			dynamaxcannon: ["8L56", "8S1", "8S0"],
 			endure: ["8M"],
-			eternabeam: ["8L88"],
+			eternabeam: ["8L88", "8S1"],
 			facade: ["8M"],
-			flamethrower: ["8M", "8L48", "8S0"],
+			flamethrower: ["8M", "8L48", "8S1", "8S0"],
 			flashcannon: ["8M"],
 			fly: ["8M"],
 			gigaimpact: ["8M"],
@@ -76846,7 +76852,7 @@ export const Learnsets: {[speciesid: string]: LearnsetData} = {
 			screech: ["8M"],
 			shadowball: ["8M"],
 			sleeptalk: ["8M"],
-			sludgebomb: ["8M"],
+			sludgebomb: ["8M", "8S1"],
 			sludgewave: ["8M"],
 			snore: ["8M"],
 			solarbeam: ["8M"],
@@ -76858,6 +76864,7 @@ export const Learnsets: {[speciesid: string]: LearnsetData} = {
 		},
 		eventData: [
 			{generation: 8, level: 60, perfectIVs: 3, moves: ["crosspoison", "dragonpulse", "flamethrower", "dynamaxcannon"]},
+			{generation: 8, level: 100, shiny: true, nature: "Timid", perfectIVs: 6, moves: ["eternabeam", "dynamaxcannon", "sludgebomb", "flamethrower"], pokeball: "cherishball"},
 		],
 		eventOnly: true,
 	},

package/data/mods/gen1/formats-data.ts

@@ -51,11 +51,9 @@ export const FormatsData: {[k: string]: ModdedSpeciesFormatsData} = {
 		tier: "NU",
 	},
 	caterpie: {
-		randomBattleMoves: ["stringshot", "tackle"],
 		tier: "LC",
 	},
 	metapod: {
-		randomBattleMoves: ["harden", "stringshot", "tackle"],
 		tier: "NFE",
 	},
 	butterfree: {
@@ -64,11 +62,9 @@ export const FormatsData: {[k: string]: ModdedSpeciesFormatsData} = {
 		tier: "PU",
 	},
 	weedle: {
-		randomBattleMoves: ["poisonsting", "stringshot"],
 		tier: "LC",
 	},
 	kakuna: {
-		randomBattleMoves: ["poisonsting", "stringshot"],
 		tier: "NFE",
 	},
 	beedrill: {
@@ -655,7 +651,6 @@ export const FormatsData: {[k: string]: ModdedSpeciesFormatsData} = {
 		tier: "OU",
 	},
 	magikarp: {
-		randomBattleMoves: ["splash", "tackle"],
 		tier: "LC",
 	},
 	gyarados: {

package/data/mods/gen1/moves.ts

@@ -268,30 +268,42 @@ export const Moves: {[k: string]: ModdedMoveData} = {
 		},
 	},
 	disable: {
-		inherit: true,
+		num: 50,
+		accuracy: 55,
+		basePower: 0,
+		category: "Status",
+		name: "Disable",
+		pp: 20,
+		priority: 0,
+		flags: {protect: 1, mirror: 1, bypasssub: 1},
+		volatileStatus: 'disable',
+		onTryHit(target) {
+			// This function should not return if the checks are met. Adding && undefined ensures this happens.
+			return target.moveSlots.some(ms => ms.pp > 0) &&
+				!('disable' in target.volatiles) &&
+				undefined;
+		},
 		condition: {
-			duration: 4,
-			durationCallback(target, source, effect) {
-				const duration = this.random(1, 7);
-				return duration;
-			},
 			onStart(pokemon) {
-				if (!this.queue.willMove(pokemon)) {
-					this.effectState.duration++;
-				}
-				const moves = pokemon.moves;
-				const move = this.dex.moves.get(this.sample(moves));
-				this.add('-start', pokemon, 'Disable', move.name);
-				this.effectState.move = move.id;
-				return;
+				// disable can only select moves that have pp > 0, hence the onTryHit modification
+				const moveSlot = this.sample(pokemon.moveSlots.filter(ms => ms.pp > 0));
+				this.add('-start', pokemon, 'Disable', moveSlot.move);
+				this.effectState.move = moveSlot.id;
+				// 1-8 turns (which will in effect translate to 0-7 missed turns for the target)
+				this.effectState.time = this.random(1, 9);
 			},
-			onResidualOrder: 14,
 			onEnd(pokemon) {
 				this.add('-end', pokemon, 'Disable');
 			},
-			onBeforeMove(attacker, defender, move) {
+			onBeforeMovePriority: 7,
+			onBeforeMove(pokemon, target, move) {
+				pokemon.volatiles['disable'].time--;
+				if (!pokemon.volatiles['disable'].time) {
+					pokemon.removeVolatile('disable');
+					return;
+				}
 				if (move.id === this.effectState.move) {
-					this.add('cant', attacker, 'Disable', move);
+					this.add('cant', pokemon, 'Disable', move);
 					return false;
 				}
 			},
@@ -303,6 +315,9 @@ export const Moves: {[k: string]: ModdedMoveData} = {
 				}
 			},
 		},
+		secondary: null,
+		target: "normal",
+		type: "Normal",
 	},
 	dizzypunch: {
 		inherit: true,
@@ -403,19 +418,35 @@ export const Moves: {[k: string]: ModdedMoveData} = {
 			this.add('-clearallboost', '[silent]');
 			for (const pokemon of this.getAllActive()) {
 				pokemon.clearBoosts();
-
 				if (pokemon !== source) {
 					pokemon.cureStatus(true);
 				}
 				if (pokemon.status === 'tox') {
 					pokemon.setStatus('psn');
 				}
-				for (const id of Object.keys(pokemon.volatiles)) {
-					if (id === 'residualdmg') {
-						pokemon.volatiles[id].counter = 0;
+				// should only clear a specific set of volatiles and does not clear the toxic counter
+				const silentHack = '|[silent]';
+				const silentHackVolatiles = ['disable', 'confusion'];
+				const hazeVolatiles: {[key: string]: string} = {
+					'disable': '',
+					'confusion': '',
+					'mist': 'Mist',
+					'focusenergy': 'move: Focus Energy',
+					'leechseed': 'move: Leech Seed',
+					'lightscreen': 'Light Screen',
+					'reflect': 'Reflect',
+				};
+				for (const v in hazeVolatiles) {
+					if (!pokemon.removeVolatile(v)) {
+						continue;
+					}
+					if (silentHackVolatiles.includes(v)) {
+						// these volatiles have their own onEnd method that prints, so to avoid
+						// double printing and ensure they are still silent, we need to tack on a
+						// silent attribute at the end
+						this.log[this.log.length - 1] += silentHack;
 					} else {
-						pokemon.removeVolatile(id);
-						this.add('-end', pokemon, id, '[silent]');
+						this.add('-end', pokemon, hazeVolatiles[v], '[silent]');
 					}
 				}
 			}

package/data/mods/gen2/moves.ts

@@ -402,7 +402,8 @@ export const Moves: {[k: string]: ModdedMoveData} = {
 	meanlook: {
 		inherit: true,
 		accuracy: true,
-		ignoreAccuracy: false,
+		ignoreAccuracy: undefined,
+		ignoreEvasion: undefined,
 		flags: {reflectable: 1, mirror: 1},
 	},
 	metronome: {
@@ -415,7 +416,8 @@ export const Moves: {[k: string]: ModdedMoveData} = {
 	mimic: {
 		inherit: true,
 		accuracy: true,
-		ignoreAccuracy: false,
+		ignoreAccuracy: undefined,
+		ignoreEvasion: undefined,
 		noSketch: true,
 	},
 	mindreader: {
@@ -546,7 +548,8 @@ export const Moves: {[k: string]: ModdedMoveData} = {
 	painsplit: {
 		inherit: true,
 		accuracy: true,
-		ignoreAccuracy: false,
+		ignoreAccuracy: undefined,
+		ignoreEvasion: undefined,
 	},
 	perishsong: {
 		inherit: true,
@@ -791,7 +794,8 @@ export const Moves: {[k: string]: ModdedMoveData} = {
 	spiderweb: {
 		inherit: true,
 		accuracy: true,
-		ignoreAccuracy: false,
+		ignoreAccuracy: undefined,
+		ignoreEvasion: undefined,
 		flags: {reflectable: 1, mirror: 1},
 	},
 	spikes: {
@@ -966,7 +970,8 @@ export const Moves: {[k: string]: ModdedMoveData} = {
 	vitalthrow: {
 		inherit: true,
 		accuracy: true,
-		ignoreAccuracy: false,
+		ignoreAccuracy: undefined,
+		ignoreEvasion: undefined,
 	},
 	whirlwind: {
 		inherit: true,

package/data/mods/gen3/formats-data.ts

@@ -216,7 +216,7 @@ export const FormatsData: {[k: string]: ModdedSpeciesFormatsData} = {
 	},
 	arcanine: {
 		randomBattleMoves: ["extremespeed", "fireblast", "flamethrower", "hiddenpowergrass", "rest", "sleeptalk", "toxic"],
-		tier: "UUBL",
+		tier: "UU",
 	},
 	poliwag: {
 		tier: "LC",
@@ -1033,7 +1033,7 @@ export const FormatsData: {[k: string]: ModdedSpeciesFormatsData} = {
 	},
 	ninjask: {
 		randomBattleMoves: ["aerialace", "batonpass", "hiddenpowerrock", "protect", "silverwind", "substitute", "swordsdance"],
-		tier: "UUBL",
+		tier: "UU",
 	},
 	shedinja: {
 		randomBattleMoves: ["agility", "batonpass", "hiddenpowerground", "shadowball", "silverwind", "toxic"],