@pkmn/sim 0.5.23 → 0.5.26

package/data/learnsets.ts

@@ -3285,7 +3285,7 @@ export const Learnsets: {[speciesid: string]: LearnsetData} = {
 			drainingkiss: ["8M"],
 			electricterrain: ["8M"],
 			electroball: ["8M", "8L12"],
-			electroweb: ["8M", "8S0"],
+			electroweb: ["8M", "8S1", "8S0"],
 			encore: ["8M"],
 			endure: ["8M"],
 			facade: ["8M"],
@@ -3296,7 +3296,7 @@ export const Learnsets: {[speciesid: string]: LearnsetData} = {
 			grassknot: ["8M"],
 			growl: ["8L1"],
 			helpinghand: ["8M"],
-			irontail: ["8M", "8S0"],
+			irontail: ["8M", "8S1", "8S0"],
 			lightscreen: ["8M", "8L40"],
 			megakick: ["8M"],
 			megapunch: ["8M"],
@@ -3307,7 +3307,7 @@ export const Learnsets: {[speciesid: string]: LearnsetData} = {
 			playrough: ["8M"],
 			present: ["8E"],
 			protect: ["8M"],
-			quickattack: ["8L1", "8S0"],
+			quickattack: ["8L1", "8S1", "8S0"],
 			raindance: ["8M"],
 			reflect: ["8M"],
 			rest: ["8M"],
@@ -3325,7 +3325,7 @@ export const Learnsets: {[speciesid: string]: LearnsetData} = {
 			tailwhip: ["8L1"],
 			thief: ["8M"],
 			thunder: ["8M", "8L44"],
-			thunderbolt: ["8M", "8L36", "8S0"],
+			thunderbolt: ["8M", "8L36", "8S1", "8S0"],
 			thunderpunch: ["8M"],
 			thundershock: ["8L1"],
 			thunderwave: ["8M", "8L4"],
@@ -3337,7 +3337,8 @@ export const Learnsets: {[speciesid: string]: LearnsetData} = {
 			wish: ["8E"],
 		},
 		eventData: [
-			{generation: 8, level: 25, nature: "Hardy", isHidden: false, moves: ["thunderbolt", "quickattack", "irontail", "electroweb", "volttackle"], pokeball: "pokeball"},
+			{generation: 8, level: 25, nature: "Hardy", moves: ["thunderbolt", "quickattack", "irontail", "electroweb", "volttackle"], pokeball: "pokeball"},
+			{generation: 8, level: 80, nature: "Hardy", ivs: {hp: 31, atk: 30, def: 30, spa: 31, spd: 30, spe: 31}, moves: ["thunderbolt", "quickattack", "irontail", "electroweb"], pokeball: "pokeball"},
 		],
 		eventOnly: true,
 	},
@@ -4693,7 +4694,7 @@ export const Learnsets: {[speciesid: string]: LearnsetData} = {
 			flash: ["7V", "6M", "5M", "4M", "3M"],
 			fling: ["8M", "7M", "6M", "5M", "4M"],
 			focuspunch: ["7T", "6T", "4M", "3M"],
-			followme: ["8L36", "7L16", "6L16", "5L16", "4L16", "3L17"],
+			followme: ["8L36", "8S0", "7L16", "6L16", "5L16", "4L16", "3L17"],
 			frustration: ["7M", "7V", "6M", "5M", "4M", "3M"],
 			grassknot: ["8M", "7M", "6M", "5M", "4M"],
 			gravity: ["8L28", "7T", "7L49", "6T", "6L49", "5T", "5L37", "4T", "4L34"],
@@ -4701,12 +4702,12 @@ export const Learnsets: {[speciesid: string]: LearnsetData} = {
 			headbutt: ["8V", "7V", "4T"],
 			healbell: ["7T", "6T", "5T", "4T"],
 			healingwish: ["8L48", "7L55", "6L1", "5L49", "4L46"],
-			helpinghand: ["8M", "8V", "7T", "6T", "5T", "4T"],
+			helpinghand: ["8M", "8V", "8S0", "7T", "6T", "5T", "4T"],
 			hiddenpower: ["7M", "7V", "6M", "5M", "4M", "3M"],
 			hypervoice: ["8M", "7T", "6T", "5T"],
 			icebeam: ["8M", "8V", "7M", "7V", "6M", "5M", "4M", "3M"],
 			icepunch: ["8M", "8V", "7T", "7V", "6T", "5T", "4T", "3T"],
-			icywind: ["8M", "7T", "6T", "5T", "4T"],
+			icywind: ["8M", "8S0", "7T", "6T", "5T", "4T"],
 			imprison: ["8M"],
 			incinerate: ["6M", "5M"],
 			irontail: ["8M", "8V", "7T", "7V", "6T", "5T", "4M", "3M"],
@@ -4735,7 +4736,7 @@ export const Learnsets: {[speciesid: string]: LearnsetData} = {
 			playrough: ["8M", "8V"],
 			pound: ["8L1", "8V", "7L1", "7V", "6L1", "5L1", "4L1", "3L1"],
 			poweruppunch: ["6M"],
-			protect: ["8M", "8V", "7M", "7V", "6M", "5M", "4M", "3M"],
+			protect: ["8M", "8V", "8S0", "7M", "7V", "6M", "5M", "4M", "3M"],
 			psychic: ["8M", "8V", "7M", "7V", "6M", "5M", "4M", "3M"],
 			psychup: ["7M", "7V", "6M", "5M", "4M", "3T"],
 			psyshock: ["8M", "7M", "6M", "5M"],
@@ -4793,6 +4794,9 @@ export const Learnsets: {[speciesid: string]: LearnsetData} = {
 			zapcannon: ["7V"],
 			zenheadbutt: ["8M", "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"},
+		],
 		encounters: [
 			{generation: 1, level: 8},
 		],
@@ -20724,10 +20728,10 @@ export const Learnsets: {[speciesid: string]: LearnsetData} = {
 			dive: ["8M", "6M", "5M", "4T", "3M"],
 			doubleedge: ["7V", "3T"],
 			doubleteam: ["7M", "7V", "6M", "5M", "4M", "3M"],
-			dracometeor: ["8T", "7T", "6T", "5T", "4T", "4S2"],
+			dracometeor: ["8T", "8S9", "7T", "6T", "5T", "4T", "4S2"],
 			dragonbreath: ["7V"],
-			dragonclaw: ["8M", "7M", "6M", "5M", "4M", "3M"],
-			dragondance: ["8M", "8L62", "7L61", "6L61", "6S7", "5L61", "5S3", "4L53", "4S2", "3S1"],
+			dragonclaw: ["8M", "8S9", "7M", "6M", "5M", "4M", "3M"],
+			dragondance: ["8M", "8L62", "8S9", "7L61", "6L61", "6S7", "5L61", "5S3", "4L53", "4S2", "3S1"],
 			dragonpulse: ["8M", "8V", "7T", "6T", "5T", "4M"],
 			dragonrage: ["8V", "7L15", "7V", "6L15", "5L15", "4L15", "3L22"],
 			dragonrush: ["8L39", "7L47", "6L47", "5L47", "5S4", "5S5", "4L39"],
@@ -20756,7 +20760,7 @@ export const Learnsets: {[speciesid: string]: LearnsetData} = {
 			hiddenpower: ["7M", "7V", "6M", "5M", "4M", "3M"],
 			honeclaws: ["6M", "5M"],
 			horndrill: ["7V"],
-			hurricane: ["8M", "8L0", "7L1", "6L1", "6S7", "5L81"],
+			hurricane: ["8M", "8L0", "8S9", "7L1", "6L1", "6S7", "5L81"],
 			hydropump: ["8M"],
 			hyperbeam: ["8M", "8L80", "8V", "7M", "7L75", "7V", "6M", "6L75", "6S8", "5M", "5L75", "5S6", "4M", "4L73", "3M", "3L75", "3S1"],
 			icebeam: ["8M", "8V", "7M", "7V", "6M", "5M", "4M", "3M"],
@@ -20834,6 +20838,7 @@ export const Learnsets: {[speciesid: string]: LearnsetData} = {
 			{generation: 5, level: 50, gender: "M", nature: "Brave", ivs: {hp: 30, atk: 30, def: 30, spa: 30, spd: 30, spe: 30}, moves: ["fireblast", "safeguard", "outrage", "hyperbeam"], pokeball: "cherishball"},
 			{generation: 6, level: 55, gender: "M", isHidden: true, moves: ["dragondance", "outrage", "hurricane", "extremespeed"], pokeball: "cherishball"},
 			{generation: 6, level: 62, gender: "M", ivs: {hp: 31, def: 31, spa: 31, spd: 31}, moves: ["agility", "slam", "barrier", "hyperbeam"], pokeball: "cherishball"},
+			{generation: 8, level: 80, gender: "F", nature: "Jolly", abilities: ["innerfocus"], ivs: {hp: 30, atk: 31, def: 30, spa: 30, spd: 31, spe: 31}, moves: ["dragonclaw", "dracometeor", "hurricane", "dragondance"], pokeball: "pokeball"},
 		],
 		encounters: [
 			{generation: 5, level: 50},
@@ -41078,14 +41083,14 @@ export const Learnsets: {[speciesid: string]: LearnsetData} = {
 			covet: ["7T", "6T", "5T"],
 			cut: ["6M", "5M", "4M", "3M"],
 			defog: ["7T", "4M"],
-			dive: ["8M", "6M", "5M", "4T", "3M"],
+			dive: ["8M", "8S11", "6M", "5M", "4T", "3M"],
 			doubleedge: ["3T"],
 			doubleteam: ["7M", "6M", "5M", "4M", "3M"],
 			dracometeor: ["8T", "7T", "7S9", "6T", "5T", "4T"],
 			dragonbreath: ["8L25", "8S10", "7L20", "6L20", "6S6", "5L20", "4L20", "4S3", "3L20"],
 			dragonclaw: ["8M", "7M", "6M", "5M", "4M", "3M"],
 			dragondance: ["8M"],
-			dragonpulse: ["8M", "8L45", "7T", "7L56", "7S7", "7S8", "6T", "6L1", "5T", "5L80", "4M", "4L70"],
+			dragonpulse: ["8M", "8L45", "8S11", "7T", "7L56", "7S7", "7S8", "6T", "6L1", "5T", "5L80", "4M", "4L70"],
 			dreameater: ["7M", "6M", "5M", "4M", "3T"],
 			dualwingbeat: ["8T"],
 			earthquake: ["8M", "7M", "6M", "5M", "4M", "3M"],
@@ -41114,7 +41119,7 @@ export const Learnsets: {[speciesid: string]: LearnsetData} = {
 			magiccoat: ["7T", "6T", "5T", "4T"],
 			magicroom: ["8M", "7T", "6T", "5T"],
 			mimic: ["3T"],
-			mistball: ["8L35", "7L24", "7S7", "7S8", "7S9", "6L24", "6S6", "5L35", "4L35", "4S3", "4S4", "3L35", "3S0", "3S1", "3S2"],
+			mistball: ["8L35", "8S11", "7L24", "7S7", "7S8", "7S9", "6L24", "6S6", "5L35", "4L35", "4S3", "4S4", "3L35", "3S0", "3S1", "3S2"],
 			mudslap: ["4T", "3T"],
 			mysticalfire: ["8M"],
 			naturalgift: ["4M"],
@@ -41155,6 +41160,7 @@ export const Learnsets: {[speciesid: string]: LearnsetData} = {
 			sunnyday: ["8M", "7M", "6M", "5M", "4M", "3M"],
 			surf: ["8M", "8S10", "7M", "6M", "5M", "4M", "3M"],
 			swagger: ["7M", "6M", "5M", "4M", "3T"],
+			sweetkiss: ["8S11"],
 			swift: ["8M", "4T", "3T"],
 			tailwind: ["8L20", "7T", "7S9", "6T", "5T", "4T"],
 			telekinesis: ["7T", "5M"],
@@ -41184,6 +41190,7 @@ export const Learnsets: {[speciesid: string]: LearnsetData} = {
 			{generation: 7, level: 60, moves: ["mistball", "dragonpulse", "psychoshift", "wish"], pokeball: "cherishball"},
 			{generation: 7, level: 100, moves: ["mistball", "psychic", "dracometeor", "tailwind"], pokeball: "cherishball"},
 			{generation: 8, level: 70, shiny: 1, moves: ["reflecttype", "dragonbreath", "zenheadbutt", "surf"]},
+			{generation: 8, level: 70, nature: "Bashful", moves: ["mistball", "dragonpulse", "dive", "sweetkiss"], pokeball: "cherishball"},
 		],
 		eventOnly: true,
 	},
@@ -41691,7 +41698,7 @@ export const Learnsets: {[speciesid: string]: LearnsetData} = {
 			megakick: ["8M"],
 			megapunch: ["8M"],
 			meteorbeam: ["8T"],
-			meteormash: ["8L49", "5S13", "5S14", "5S15"],
+			meteormash: ["8L49", "8S23", "5S13", "5S14", "5S15"],
 			metronome: ["8M", "3T"],
 			mimic: ["3T"],
 			moonblast: ["6S17"],
@@ -41701,14 +41708,14 @@ export const Learnsets: {[speciesid: string]: LearnsetData} = {
 			playrough: ["8M", "6S19"],
 			poweruppunch: ["6M"],
 			protect: ["8M", "7M", "6M", "5M", "4M", "3M"],
-			psychic: ["8M", "8L42", "7M", "7L20", "6M", "6L20", "5M", "5L20", "5S13", "4M", "4L20", "3M", "3L20", "3S10"],
+			psychic: ["8M", "8L42", "8S23", "7M", "7L20", "6M", "6L20", "5M", "5L20", "5S13", "4M", "4L20", "3M", "3L20", "3S10"],
 			psychup: ["7M", "6M", "5M", "4M", "3T"],
 			psyshock: ["8M", "7M", "6M", "5M"],
 			raindance: ["8M", "7M", "6M", "5M", "4M", "3M"],
 			recycle: ["7T", "6T", "5T", "4M"],
 			reflect: ["8M", "7M", "6M", "5M", "4M", "3M"],
 			refresh: ["7L25", "6L25", "5L25", "4L25", "3L25", "3S10"],
-			rest: ["8M", "8L63", "7M", "7L30", "7S22", "6M", "6L5", "6S21", "5M", "5L5", "4M", "4L5", "4S11", "4S12", "3M", "3L5", "3S0", "3S1", "3S2", "3S3", "3S4", "3S5", "3S6", "3S7", "3S8", "3S9", "3S10"],
+			rest: ["8M", "8L63", "8S23", "7M", "7L30", "7S22", "6M", "6L5", "6S21", "5M", "5L5", "4M", "4L5", "4S11", "4S12", "3M", "3L5", "3S0", "3S1", "3S2", "3S3", "3S4", "3S5", "3S6", "3S7", "3S8", "3S9", "3S10"],
 			return: ["7M", "6M", "6S18", "5M", "5S16", "4M", "3M"],
 			round: ["8M", "7M", "6M", "5M"],
 			safeguard: ["8M", "7M", "6M", "5M", "4M", "3M"],
@@ -41738,7 +41745,7 @@ export const Learnsets: {[speciesid: string]: LearnsetData} = {
 			uproar: ["8M", "7T", "6T", "5T", "4T"],
 			uturn: ["8M", "7M", "6M", "5M", "4M"],
 			waterpulse: ["7T", "6T", "4M", "3M"],
-			wish: ["8L1", "7L1", "7S22", "6L1", "6S17", "6S18", "6S19", "6S20", "6S21", "5L1", "5S14", "5S15", "5S16", "4L1", "4S11", "4S12", "3L1", "3S0", "3S1", "3S2", "3S3", "3S4", "3S5", "3S6", "3S7", "3S8", "3S9"],
+			wish: ["8L1", "8S23", "7L1", "7S22", "6L1", "6S17", "6S18", "6S19", "6S20", "6S21", "5L1", "5S14", "5S15", "5S16", "4L1", "4S11", "4S12", "3L1", "3S0", "3S1", "3S2", "3S3", "3S4", "3S5", "3S6", "3S7", "3S8", "3S9"],
 			zenheadbutt: ["8M", "8L28", "7T", "7L35", "6T", "6L35", "5T", "5L35", "4T", "4L35"],
 		},
 		eventData: [
@@ -41765,6 +41772,7 @@ export const Learnsets: {[speciesid: string]: LearnsetData} = {
 			{generation: 6, level: 25, shiny: true, moves: ["wish", "confusion", "swift", "happyhour"], pokeball: "cherishball"},
 			{generation: 6, level: 100, moves: ["wish", "confusion", "rest"], pokeball: "cherishball"},
 			{generation: 7, level: 15, moves: ["swift", "wish", "healingwish", "rest"], pokeball: "cherishball"},
+			{generation: 8, level: 70, nature: "Timid", moves: ["meteormash", "psychic", "rest", "wish"], pokeball: "cherishball"},
 		],
 		eventOnly: true,
 	},
@@ -44460,13 +44468,15 @@ export const Learnsets: {[speciesid: string]: LearnsetData} = {
 	},
 	gastrodoneast: {
 		learnset: {
-			earthpower: ["8S0"],
-			icebeam: ["8S0"],
-			protect: ["8S0"],
+			earthpower: ["8S1", "8S0"],
+			icebeam: ["8S1", "8S0"],
+			protect: ["8S1", "8S0"],
 			surf: ["8S0"],
+			yawn: ["8S1"],
 		},
 		eventData: [
 			{generation: 8, level: 50, gender: "F", nature: "Quiet", abilities: ["stormdrain"], ivs: {hp: 31, atk: 2, def: 31, spa: 31, spd: 31, spe: 0}, moves: ["protect", "surf", "icebeam", "earthpower"], pokeball: "cherishball"},
+			{generation: 8, level: 50, gender: "F", nature: "Sassy", abilities: ["stormdrain"], ivs: {hp: 31, atk: 0, def: 31, spa: 31, spd: 31, spe: 0}, moves: ["protect", "yawn", "icebeam", "earthpower"], pokeball: "cherishball"},
 		],
 		encounters: [
 			{generation: 4, level: 20},
@@ -47266,7 +47276,7 @@ export const Learnsets: {[speciesid: string]: LearnsetData} = {
 			fireblast: ["8M", "7M", "6M", "5M", "4M"],
 			flamethrower: ["8M", "7M", "6M", "5M", "4M"],
 			flash: ["6M", "5M", "4M"],
-			flashcannon: ["8M", "8L32", "8S11", "7M", "7L50", "7S7", "7S8", "7S9", "7S10", "6M", "6L50", "6S5", "6S6", "5M", "5L50", "4M", "4L42"],
+			flashcannon: ["8M", "8L32", "8S12", "8S11", "7M", "7L50", "7S7", "7S8", "7S9", "7S10", "6M", "6L50", "6S5", "6S6", "5M", "5L50", "4M", "4L42"],
 			frustration: ["7M", "6M", "5M", "4M"],
 			furycutter: ["4T"],
 			gigaimpact: ["8M", "7M", "6M", "5M", "4M"],
@@ -47284,12 +47294,12 @@ export const Learnsets: {[speciesid: string]: LearnsetData} = {
 			ironhead: ["8M", "7T", "6T", "5T", "4T"],
 			irontail: ["8M", "8L80", "7T", "7L42", "7S7", "7S8", "6T", "6L42", "6S5", "5T", "5L42", "4M"],
 			magnetrise: ["7T", "6T", "5T", "4T"],
-			metalburst: ["8L64", "7L24", "6L24", "6S6", "5L24", "4L24"],
+			metalburst: ["8L64", "8S12", "7L24", "6L24", "6S6", "5L24", "4L24"],
 			metalclaw: ["8L1", "7L6", "6L6", "5L6", "4L6", "4S0"],
 			mudslap: ["4T"],
 			naturalgift: ["4M"],
 			outrage: ["8M", "7T", "6T", "5T", "4T"],
-			overheat: ["8M", "7M", "6M", "6S6", "5M", "4M"],
+			overheat: ["8M", "8S12", "7M", "6M", "6S6", "5M", "4M"],
 			powergem: ["8M", "8L56", "7L19", "6L19", "5L19", "4L19"],
 			protect: ["8M", "7M", "6M", "5M", "4M"],
 			psychup: ["7M", "6M", "5M", "4M"],
@@ -47297,7 +47307,7 @@ export const Learnsets: {[speciesid: string]: LearnsetData} = {
 			rest: ["8M", "7M", "6M", "5M", "4M"],
 			return: ["7M", "6M", "5M", "4M"],
 			roar: ["7M", "6M", "5M", "4M"],
-			roaroftime: ["8L88", "7L46", "7S7", "7S8", "7S9", "7S10", "6L46", "6S5", "6S6", "5L46", "5S4", "4L40", "4S0", "4S1"],
+			roaroftime: ["8L88", "8S12", "7L46", "7S7", "7S8", "7S9", "7S10", "6L46", "6S5", "6S6", "5L46", "5S4", "4L40", "4S0", "4S1"],
 			rockslide: ["8M", "7M", "6M", "5M", "4M"],
 			rocksmash: ["6M", "5M", "4M"],
 			rocktomb: ["8M", "7M", "6M", "5M", "4M"],
@@ -47341,6 +47351,7 @@ export const Learnsets: {[speciesid: string]: LearnsetData} = {
 			{generation: 7, level: 100, moves: ["roaroftime", "aurasphere", "dracometeor", "flashcannon"], pokeball: "cherishball"},
 			{generation: 7, level: 50, moves: ["flashcannon", "dracometeor", "roaroftime", "aurasphere"], pokeball: "cherishball"},
 			{generation: 8, level: 70, shiny: 1, moves: ["slash", "ancientpower", "flashcannon", "dragonclaw"]},
+			{generation: 8, level: 70, nature: "Bold", isHidden: true, moves: ["roaroftime", "flashcannon", "metalburst", "overheat"], pokeball: "cherishball"},
 		],
 		eventOnly: true,
 	},
@@ -47350,7 +47361,7 @@ export const Learnsets: {[speciesid: string]: LearnsetData} = {
 			ancientpower: ["8L16", "8S11", "7L10", "6L10", "5L10", "4T", "4L10", "4S0"],
 			aquaring: ["8L32", "7L24"],
 			aquatail: ["8L64", "7T", "7L24", "7S7", "7S8", "6T", "6L24", "5T", "5L24", "4T", "4L24"],
-			aurasphere: ["8M", "8L48", "7L37", "7S7", "7S8", "7S9", "7S10", "6L37", "6S5", "6S6", "5L37", "5S4", "4L37"],
+			aurasphere: ["8M", "8L48", "8S12", "7L37", "7S7", "7S8", "7S9", "7S10", "6L37", "6S5", "6S6", "5L37", "5S4", "4L37"],
 			avalanche: ["8M", "4M"],
 			blizzard: ["8M", "7M", "6M", "5M", "4M"],
 			bodypress: ["8M"],
@@ -47370,7 +47381,7 @@ export const Learnsets: {[speciesid: string]: LearnsetData} = {
 			dragonpulse: ["8M", "7T", "6T", "5T", "4M"],
 			dragontail: ["7M", "6M", "5M"],
 			dualwingbeat: ["8T"],
-			earthpower: ["8M", "8L72", "7T", "7L33", "6T", "6L33", "6S5", "6S6", "5T", "5L33", "4T", "4L33", "4S1"],
+			earthpower: ["8M", "8L72", "8S12", "7T", "7L33", "6T", "6L33", "6S5", "6S6", "5T", "5L33", "4T", "4L33", "4S1"],
 			earthquake: ["8M", "7M", "6M", "5M", "4M"],
 			echoedvoice: ["7M", "6M", "5M"],
 			endure: ["8M", "4M"],
@@ -47390,7 +47401,7 @@ export const Learnsets: {[speciesid: string]: LearnsetData} = {
 			heavyslam: ["8M"],
 			hiddenpower: ["7M", "6M", "5M", "4M"],
 			honeclaws: ["6M", "5M"],
-			hydropump: ["8M", "8L88", "7L50", "7S7", "7S8", "7S9", "7S10", "6L50", "6S5", "6S6", "5L50", "5S4", "4L42"],
+			hydropump: ["8M", "8L88", "8S12", "7L50", "7S7", "7S8", "7S9", "7S10", "6L50", "6S5", "6S6", "5L50", "5S4", "4L42"],
 			hyperbeam: ["8M", "7M", "6M", "5M", "4M"],
 			hypervoice: ["8M", "7T", "6T", "5T"],
 			icebeam: ["8M", "7M", "6M", "5M", "4M"],
@@ -47420,7 +47431,7 @@ export const Learnsets: {[speciesid: string]: LearnsetData} = {
 			slash: ["8L24", "8S11", "7L15", "6L15", "5L15", "4L15", "4S1"],
 			sleeptalk: ["8M", "7M", "6M", "5T", "4M"],
 			snore: ["8M", "7T", "6T", "5T", "4T"],
-			spacialrend: ["8L80", "7L46", "7S7", "7S8", "7S9", "7S10", "6L46", "6S5", "6S6", "5L46", "5S4", "4L40", "4S0", "4S1"],
+			spacialrend: ["8L80", "8S12", "7L46", "7S7", "7S8", "7S9", "7S10", "6L46", "6S5", "6S6", "5L46", "5S4", "4L40", "4S0", "4S1"],
 			stompingtantrum: ["8M", "7T"],
 			stoneedge: ["8M", "7M", "6M", "5M", "4M"],
 			strength: ["6M", "5M", "4M"],
@@ -47451,6 +47462,7 @@ export const Learnsets: {[speciesid: string]: LearnsetData} = {
 			{generation: 7, level: 100, moves: ["spacialrend", "aurasphere", "dracometeor", "hydropump"], pokeball: "cherishball"},
 			{generation: 7, level: 50, moves: ["hydropump", "dracometeor", "spacialrend", "aurasphere"], pokeball: "cherishball"},
 			{generation: 8, level: 70, shiny: 1, moves: ["slash", "surf", "ancientpower", "dragonclaw"]},
+			{generation: 8, level: 70, nature: "Hasty", isHidden: true, moves: ["spacialrend", "hydropump", "aurasphere", "earthpower"], pokeball: "cherishball"},
 		],
 		eventOnly: true,
 	},
@@ -48384,7 +48396,7 @@ export const Learnsets: {[speciesid: string]: LearnsetData} = {
 			firepunch: ["8M", "7T", "6T", "5T"],
 			firespin: ["8M"],
 			flameburst: ["7L41", "6L41", "5L41"],
-			flamecharge: ["8L1", "7M", "7L25", "6M", "6L25", "5M", "5L25"],
+			flamecharge: ["8L1", "8S7", "7M", "7L25", "6M", "6L25", "5M", "5L25"],
 			flamethrower: ["8M", "7M", "6M", "5M"],
 			flareblitz: ["8M", "8L77", "7L73", "6L73", "5L73"],
 			flash: ["6M", "5M"],
@@ -48455,11 +48467,11 @@ export const Learnsets: {[speciesid: string]: LearnsetData} = {
 			trickroom: ["8M", "7M", "6M", "5M"],
 			uproar: ["8M", "7T", "6T", "5T"],
 			uturn: ["8M", "7M", "6M", "5M"],
-			vcreate: ["8L1", "7S6", "6S3", "6S5", "5S1", "5S2"],
+			vcreate: ["8L1", "8S7", "7S6", "6S3", "6S5", "5S1", "5S2"],
 			wildcharge: ["8M", "7M", "6M", "5M"],
 			willowisp: ["8M", "7M", "6M", "5M"],
-			workup: ["8M", "8L7", "7M", "5M"],
-			zenheadbutt: ["8M", "8L42", "7T", "7L49", "6T", "6L49", "5T", "5L49"],
+			workup: ["8M", "8L7", "8S7", "7M", "5M"],
+			zenheadbutt: ["8M", "8L42", "8S7", "7T", "7L49", "6T", "6L49", "5T", "5L49"],
 		},
 		eventData: [
 			{generation: 5, level: 15, moves: ["quickattack", "incinerate", "confusion", "endure"]},
@@ -48469,6 +48481,7 @@ export const Learnsets: {[speciesid: string]: LearnsetData} = {
 			{generation: 6, level: 100, moves: ["incinerate", "quickattack", "endure", "confusion"], pokeball: "cherishball"},
 			{generation: 6, level: 15, moves: ["quickattack", "swagger", "vcreate"], pokeball: "cherishball"},
 			{generation: 7, level: 15, moves: ["vcreate", "reversal", "storedpower", "celebrate"], pokeball: "cherishball"},
+			{generation: 8, level: 50, nature: "Brave", perfectIVs: 6, moves: ["vcreate", "zenheadbutt", "workup", "flamecharge"], pokeball: "cherishball"},
 		],
 		eventOnly: true,
 	},
@@ -75208,6 +75221,17 @@ export const Learnsets: {[speciesid: string]: LearnsetData} = {
 			wonderroom: ["8M"],
 		},
 	},
+	sinisteaantique: {
+		learnset: {
+			aromatherapy: ["8S0"],
+			celebrate: ["8S0"],
+			memento: ["8S0"],
+			metronome: ["8S0"],
+		},
+		eventData: [
+			{generation: 8, level: 50, isHidden: true, moves: ["memento", "metronome", "aromatherapy", "celebrate"], pokeball: "cherishball"},
+		],
+	},
 	polteageist: {
 		learnset: {
 			allyswitch: ["8M"],
@@ -76341,16 +76365,16 @@ export const Learnsets: {[speciesid: string]: LearnsetData} = {
 			dracometeor: ["8T"],
 			dragonbreath: ["8L35"],
 			dragonpulse: ["8M", "8L70"],
-			dragonrush: ["8L77"],
+			dragonrush: ["8L77", "8S1"],
 			earthpower: ["8M"],
 			earthquake: ["8M"],
 			endure: ["8M"],
 			facade: ["8M"],
-			fishiousrend: ["8L63"],
+			fishiousrend: ["8L63", "8S1"],
 			gigaimpact: ["8M"],
 			hydropump: ["8M"],
 			hyperbeam: ["8M"],
-			icefang: ["8M"],
+			icefang: ["8M", "8S1"],
 			ironhead: ["8M"],
 			leechlife: ["8M"],
 			liquidation: ["8M"],
@@ -76377,12 +76401,13 @@ export const Learnsets: {[speciesid: string]: LearnsetData} = {
 			surf: ["8M"],
 			tackle: ["8L1", "8S0"],
 			waterfall: ["8M"],
-			watergun: ["8L1", "8S0"],
+			watergun: ["8L1", "8S1", "8S0"],
 			whirlpool: ["8M"],
 			zenheadbutt: ["8M"],
 		},
 		eventData: [
 			{generation: 8, level: 10, shiny: 1, perfectIVs: 3, moves: ["tackle", "watergun", "protect"], pokeball: "pokeball"},
+			{generation: 8, level: 80, nature: "Naive", abilities: ["strongjaw"], ivs: {hp: 30, atk: 31, def: 31, spa: 30, spd: 30, spe: 31}, moves: ["fishiousrend", "dragonrush", "icefang", "watergun"], pokeball: "pokeball"},
 		],
 		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

@@ -111,11 +111,6 @@ export const Moves: {[k: string]: ModdedMoveData} = {
 			},
 		},
 	},
-	block: {
-		inherit: true,
-		accuracy: true,
-		ignoreAccuracy: false,
-	},
 	counter: {
 		inherit: true,
 		damageCallback(pokemon, target) {

package/data/mods/gen2/rulesets.ts

@@ -14,12 +14,19 @@ export const Rulesets: {[k: string]: ModdedFormatData} = {
 			'Vaporeon + Tackle + Growl',
 			'Jolteon + Tackle + Growl', 'Jolteon + Focus Energy + Thunder Shock',
 			'Flareon + Tackle + Growl', 'Flareon + Focus Energy + Ember',
+
+			// https://github.com/smogon/pokemon-showdown/pull/8869
+			'Rapidash + Pay Day + Growl',
+			'Rapidash + Pay Day + Tail Whip',
+			'Fearow + Pay Day + Peck',
+			'Fearow + Pay Day + Mirror Move',
+			'Magikarp + Dragon Rage + Tackle',
 		],
 	},
 	standard: {
 		effectType: 'ValidatorRule',
 		name: 'Standard',
-		ruleset: ['Obtainable', 'Sleep Clause Mod', 'Freeze Clause Mod', 'Species Clause', 'OHKO Clause', 'Evasion Moves Clause', 'Endless battle Clause', 'HP Percentage Mod', 'Cancel Mod'],
+		ruleset: ['Obtainable', 'Sleep Clause Mod', 'Freeze Clause Mod', 'Species Clause', 'OHKO Clause', 'Evasion Items Clause', 'Evasion Moves Clause', 'Endless battle Clause', 'HP Percentage Mod', 'Cancel Mod'],
 		banlist: [
 			'Hypnosis + Mean Look',
 			'Hypnosis + Spider Web',

package/data/mods/gen3/rulesets.ts

@@ -3,6 +3,6 @@ export const Rulesets: {[k: string]: ModdedFormatData} = {
 		effectType: 'ValidatorRule',
 		name: 'Standard',
 		desc: "The standard ruleset for all offical Smogon singles tiers (Ubers, OU, etc.)",
-		ruleset: ['Obtainable', 'Sleep Clause Mod', 'Switch Priority Clause Mod', 'Species Clause', 'Nickname Clause', 'OHKO Clause', 'Evasion Moves Clause', 'Endless Battle Clause', 'HP Percentage Mod', 'Cancel Mod'],
+		ruleset: ['Obtainable', 'Sleep Clause Mod', 'Switch Priority Clause Mod', 'Species Clause', 'Nickname Clause', 'OHKO Clause', 'Evasion Items Clause', 'Evasion Moves Clause', 'Endless Battle Clause', 'HP Percentage Mod', 'Cancel Mod'],
 	},
 };

package/data/mods/gen4/rulesets.ts

@@ -1,7 +1,7 @@
 export const Rulesets: {[k: string]: ModdedFormatData} = {
 	standard: {
 		inherit: true,
-		ruleset: ['Obtainable', 'Sleep Clause Mod', 'Species Clause', 'Nickname Clause', 'OHKO Clause', 'Evasion Moves Clause', 'Endless Battle Clause', 'HP Percentage Mod', 'Cancel Mod'],
+		ruleset: ['Obtainable', 'Sleep Clause Mod', 'Species Clause', 'Nickname Clause', 'OHKO Clause', 'Evasion Items Clause', 'Evasion Moves Clause', 'Endless Battle Clause', 'HP Percentage Mod', 'Cancel Mod'],
 	},
 	flatrules: {
 		inherit: true,

package/data/mods/gen5/rulesets.ts

@@ -2,7 +2,7 @@ export const Rulesets: {[k: string]: ModdedFormatData} = {
 	standard: {
 		inherit: true,
 		ruleset: [
-			'Obtainable', 'Team Preview', 'Species Clause', 'Nickname Clause', 'OHKO Clause', 'Moody Clause', 'Evasion Moves Clause', 'Endless Battle Clause', 'HP Percentage Mod', 'Cancel Mod',
+			'Obtainable', 'Team Preview', 'Species Clause', 'Nickname Clause', 'OHKO Clause', 'Moody Clause', 'Evasion Items Clause', 'Evasion Moves Clause', 'Endless Battle Clause', 'HP Percentage Mod', 'Cancel Mod',
 		],
 	},
 	obtainablemoves: {