@pkmn/sim 0.5.19 → 0.5.22

package/data/abilities.ts

@@ -642,7 +642,6 @@ export const Abilities: {[abilityid: string]: AbilityData} = {
 			if (move.auraBooster !== this.effectState.target) return;
 			return this.chainModify([move.hasAuraBreak ? 3072 : 5448, 4096]);
 		},
-		isBreakable: true,
 		name: "Dark Aura",
 		rating: 3,
 		num: 186,
@@ -956,7 +955,6 @@ export const Abilities: {[abilityid: string]: AbilityData} = {
 			if (move.auraBooster !== this.effectState.target) return;
 			return this.chainModify([move.hasAuraBreak ? 3072 : 5448, 4096]);
 		},
-		isBreakable: true,
 		name: "Fairy Aura",
 		rating: 3,
 		num: 187,
@@ -2326,7 +2324,7 @@ export const Abilities: {[abilityid: string]: AbilityData} = {
 			if (pokemon.showCure === undefined) pokemon.showCure = true;
 
 			if (pokemon.showCure) this.add('-curestatus', pokemon, pokemon.status, '[from] ability: Natural Cure');
-			pokemon.setStatus('');
+			pokemon.clearStatus();
 
 			// only reset .showCure if it's false
 			// (once you know a Pokemon has Natural Cure, its cures are always known)

package/data/aliases.ts

@@ -68,8 +68,8 @@ export const Aliases: {[alias: string]: string} = {
 	gen6ag: "[Gen 6] Anything Goes",
 	crossevo: "[Gen 8] Cross Evolution",
 	mayhem: "[Gen 8] Random Battle Mayhem",
-	omotm: "[Gen 8] Tier Shift",
-	lcotm: "[Gen 8] Inverse",
+	omotm: "[Gen 8] Broken Record",
+	lcotm: "[Gen 8] Inheritance",
 
 	// mega evos
 	fabio: "Ampharos-Mega",

package/data/conditions.ts

@@ -57,6 +57,10 @@ export const Conditions: {[k: string]: ConditionData} = {
 			// 1-3 turns
 			this.effectState.startTime = this.random(2, 5);
 			this.effectState.time = this.effectState.startTime;
+
+			if (target.removeVolatile('nightmare')) {
+				this.add('-end', target, 'Nightmare', '[silent]');
+			}
 		},
 		onBeforeMovePriority: 10,
 		onBeforeMove(pokemon, target, move) {
@@ -101,7 +105,7 @@ export const Conditions: {[k: string]: ConditionData} = {
 		onModifyMove(move, pokemon) {
 			if (move.flags['defrost']) {
 				this.add('-curestatus', pokemon, 'frz', '[from] move: ' + move);
-				pokemon.setStatus('');
+				pokemon.clearStatus();
 			}
 		},
 		onAfterMoveSecondary(target, source, move) {

package/data/formats-data.ts

@@ -949,7 +949,7 @@ export const FormatsData: {[k: string]: SpeciesFormatsData} = {
 		randomDoubleBattleMoves: ["clearsmog", "defog", "fireblast", "painsplit", "strangesteam", "toxicspikes", "willowisp"],
 		randomDoubleBattleLevel: 89,
 		tier: "RU",
-		doublesTier: "DUU",
+		doublesTier: "(DUU)",
 	},
 	rhyhorn: {
 		tier: "LC",
@@ -2153,7 +2153,7 @@ export const FormatsData: {[k: string]: SpeciesFormatsData} = {
 		randomBattleLevel: 86,
 		randomDoubleBattleMoves: ["acrobatics", "defog", "leechlife", "protect", "swordsdance"],
 		randomDoubleBattleLevel: 88,
-		tier: "PU",
+		tier: "(PU)",
 		doublesTier: "(DUU)",
 	},
 	shedinja: {
@@ -2494,7 +2494,7 @@ export const FormatsData: {[k: string]: SpeciesFormatsData} = {
 		randomDoubleBattleMoves: ["coil", "hypnosis", "muddywater", "recover"],
 		randomDoubleBattleLevel: 80,
 		tier: "RU",
-		doublesTier: "DOU",
+		doublesTier: "DUU",
 	},
 	castform: {
 		isNonstandard: "Past",
@@ -2932,7 +2932,7 @@ export const FormatsData: {[k: string]: SpeciesFormatsData} = {
 		randomBattleLevel: 84,
 		randomDoubleBattleMoves: ["clearsmog", "earthpower", "icywind", "protect", "recover", "scald", "yawn"],
 		randomDoubleBattleLevel: 80,
-		tier: "RU",
+		tier: "NU",
 		doublesTier: "DOU",
 	},
 	drifloon: {
@@ -2989,7 +2989,7 @@ export const FormatsData: {[k: string]: SpeciesFormatsData} = {
 		randomDoubleBattleMoves: ["allyswitch", "bodypress", "explosion", "ironhead", "trickroom"],
 		randomDoubleBattleLevel: 88,
 		tier: "RU",
-		doublesTier: "DUU",
+		doublesTier: "(DUU)",
 	},
 	chatot: {
 		isNonstandard: "Past",
@@ -4445,7 +4445,7 @@ export const FormatsData: {[k: string]: SpeciesFormatsData} = {
 	doublade: {
 		randomBattleMoves: ["closecombat", "ironhead", "shadowclaw", "shadowsneak", "swordsdance"],
 		randomBattleLevel: 82,
-		tier: "NU",
+		tier: "PU",
 		doublesTier: "NFE",
 	},
 	aegislash: {
@@ -4453,7 +4453,7 @@ export const FormatsData: {[k: string]: SpeciesFormatsData} = {
 		randomBattleLevel: 80,
 		randomDoubleBattleMoves: ["flashcannon", "kingsshield", "shadowball", "shadowsneak"],
 		randomDoubleBattleLevel: 84,
-		tier: "UU",
+		tier: "UUBL",
 		doublesTier: "(DUU)",
 	},
 	aegislashblade: {
@@ -4514,7 +4514,7 @@ export const FormatsData: {[k: string]: SpeciesFormatsData} = {
 		randomBattleLevel: 86,
 		randomDoubleBattleMoves: ["dracometeor", "dragonpulse", "focusblast", "protect", "sludgebomb"],
 		randomDoubleBattleLevel: 86,
-		tier: "NU",
+		tier: "NUBL",
 		doublesTier: "(DUU)",
 	},
 	clauncher: {
@@ -4962,7 +4962,7 @@ export const FormatsData: {[k: string]: SpeciesFormatsData} = {
 		randomBattleLevel: 80,
 		randomDoubleBattleMoves: ["leechlife", "liquidation", "lunge", "protect", "stickyweb", "wideguard"],
 		randomDoubleBattleLevel: 84,
-		tier: "NU",
+		tier: "PU",
 		doublesTier: "DUU",
 	},
 	araquanidtotem: {
@@ -5078,7 +5078,7 @@ export const FormatsData: {[k: string]: SpeciesFormatsData} = {
 		randomBattleLevel: 86,
 		randomDoubleBattleMoves: ["hypnosis", "protect", "scorchingsands", "shadowball", "shoreup", "stealthrock"],
 		randomDoubleBattleLevel: 88,
-		tier: "PU",
+		tier: "(PU)",
 		doublesTier: "(DUU)",
 	},
 	pyukumuku: {
@@ -5433,7 +5433,7 @@ export const FormatsData: {[k: string]: SpeciesFormatsData} = {
 		randomBattleLevel: 84,
 		randomDoubleBattleMoves: ["dracometeor", "fireblast", "knockoff", "protect", "sludgebomb"],
 		randomDoubleBattleLevel: 88,
-		tier: "NU",
+		tier: "PU",
 		doublesTier: "(DUU)",
 	},
 	necrozma: {
@@ -5594,7 +5594,7 @@ export const FormatsData: {[k: string]: SpeciesFormatsData} = {
 		randomBattleLevel: 80,
 		randomDoubleBattleMoves: ["airslash", "hydropump", "icebeam", "muddywater", "shadowball", "uturn"],
 		randomDoubleBattleLevel: 84,
-		tier: "NU",
+		tier: "PUBL",
 		doublesTier: "(DUU)",
 	},
 	inteleongmax: {
@@ -6531,6 +6531,10 @@ export const FormatsData: {[k: string]: SpeciesFormatsData} = {
 		isNonstandard: "CAP",
 		tier: "CAP",
 	},
+	saharaja: {
+		isNonstandard: "CAP",
+		tier: "CAP",
+	},
 	pokestarsmeargle: {
 		isNonstandard: "Custom",
 		tier: "Illegal",

package/data/learnsets.ts

@@ -82889,6 +82889,35 @@ export const Learnsets: {[speciesid: string]: LearnsetData} = {
 			withdraw: ["8L5"],
 		},
 	},
+	saharaja: {
+		learnset: {
+			attract: ["8M"],
+			bodypress: ["8M"],
+			diamondstorm: ["8L1"],
+			earthquake: ["8M"],
+			endure: ["8M"],
+			facade: ["8M"],
+			healbell: ["8L1"],
+			hornleech: ["8L1"],
+			leechseed: ["8L1"],
+			painsplit: ["8L1"],
+			poisonjab: ["8M"],
+			powerwhip: ["8M"],
+			protect: ["8M"],
+			rapidspin: ["8L1"],
+			rest: ["8M"],
+			rockslide: ["8M"],
+			round: ["8M"],
+			sleeptalk: ["8M"],
+			snore: ["8M"],
+			stealthrock: ["8M"],
+			substitute: ["8M"],
+			suckerpunch: ["8L1"],
+			swordsdance: ["8M"],
+			taunt: ["8M"],
+			thunderwave: ["8M"],
+		},
+	},
 	pokestarsmeargle: {
 		eventData: [
 			{generation: 5, level: 60, gender: "M", abilities: ["owntempo"], moves: ["mindreader", "guillotine", "tailwhip", "gastroacid"]},

package/data/mods/gen1/conditions.ts

@@ -68,6 +68,10 @@ export const Conditions: {[id: string]: ModdedConditionData} = {
 			// 1-7 turns
 			this.effectState.startTime = this.random(1, 8);
 			this.effectState.time = this.effectState.startTime;
+
+			if (target.removeVolatile('nightmare')) {
+				this.add('-end', target, 'Nightmare', '[silent]');
+			}
 		},
 		onBeforeMovePriority: 10,
 		onBeforeMove(pokemon, target, move) {
@@ -78,6 +82,7 @@ export const Conditions: {[id: string]: ModdedConditionData} = {
 			pokemon.lastMove = null;
 			return false;
 		},
+		onAfterMoveSelfPriority: 3,
 		onAfterMoveSelf(pokemon) {
 			if (pokemon.statusState.time <= 0) pokemon.cureStatus();
 		},
@@ -164,6 +169,9 @@ export const Conditions: {[id: string]: ModdedConditionData} = {
 	flinch: {
 		name: 'flinch',
 		duration: 1,
+		onStart(target) {
+			target.removeVolatile('mustrecharge');
+		},
 		onBeforeMovePriority: 4,
 		onBeforeMove(pokemon) {
 			if (!this.runEvent('Flinch', pokemon)) {

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

@@ -370,7 +370,7 @@ export const FormatsData: {[k: string]: ModdedSpeciesFormatsData} = {
 		randomBattleMoves: ["bodyslam", "sleeppowder", "stunspore"],
 		essentialMove: "razorleaf",
 		comboMoves: ["hyperbeam", "swordsdance"],
-		tier: "(OU)",
+		tier: "UU",
 	},
 	tentacool: {
 		randomBattleMoves: ["barrier", "hydropump", "surf"],
@@ -414,7 +414,7 @@ export const FormatsData: {[k: string]: ModdedSpeciesFormatsData} = {
 	slowbro: {
 		randomBattleMoves: ["amnesia", "surf", "thunderwave"],
 		exclusiveMoves: ["blizzard", "psychic", "rest", "rest"],
-		tier: "OU",
+		tier: "UUBL",
 	},
 	magnemite: {
 		randomBattleMoves: ["thunder", "thunderbolt", "thunderwave"],
@@ -667,7 +667,7 @@ export const FormatsData: {[k: string]: ModdedSpeciesFormatsData} = {
 		randomBattleMoves: ["bodyslam", "confuseray", "rest", "sing", "surf"],
 		essentialMove: "blizzard",
 		exclusiveMoves: ["thunderbolt", "thunderbolt"],
-		tier: "(OU)",
+		tier: "UUBL",
 	},
 	ditto: {
 		randomBattleMoves: ["transform"],

package/data/mods/gen1/moves.ts

@@ -538,15 +538,12 @@ export const Moves: {[k: string]: ModdedMoveData} = {
 			onBoost(boost, target, source, effect) {
 				if (effect.effectType === 'Move' && effect.category !== 'Status') return;
 				if (source && target !== source) {
-					let showMsg = false;
 					let i: BoostID;
 					for (i in boost) {
 						if (boost[i]! < 0) {
 							delete boost[i];
-							showMsg = true;
 						}
 					}
-					if (showMsg) this.add('-activate', target, 'move: Mist');
 				}
 			},
 		},
@@ -762,7 +759,6 @@ export const Moves: {[k: string]: ModdedMoveData} = {
 			}
 			// We only prevent when hp is less than one quarter.
 			// If you use substitute at exactly one quarter, you faint.
-			if (target.hp === target.maxhp / 4) target.faint();
 			if (target.hp < target.maxhp / 4) {
 				this.add('-fail', target, 'move: Substitute', '[weak]');
 				return null;

package/data/mods/gen2/conditions.ts

@@ -35,6 +35,10 @@ export const Conditions: {[k: string]: ModdedConditionData} = {
 			}
 			// 1-6 turns
 			this.effectState.time = this.random(2, 8);
+
+			if (target.removeVolatile('nightmare')) {
+				this.add('-end', target, 'Nightmare', '[silent]');
+			}
 		},
 		onBeforeMovePriority: 10,
 		onBeforeMove(pokemon, target, move) {

package/data/mods/gen2/learnsets.ts

@@ -7593,11 +7593,11 @@ export const Learnsets: {[k: string]: ModdedLearnsetData} = {
 			dragonrage: ["1S0"],
 			flail: ["2L30"],
 			reversal: ["2S2"],
-			splash: ["2L1", "2S2", "2S1", "1L1"],
+			splash: ["2L1", "2S2", "2S1", "1L1", "1S0"],
 			tackle: ["2L15", "1L15"],
 		},
 		eventData: [
-			{generation: 1, level: 5, moves: ["dragonrage"], japan: true},
+			{generation: 1, level: 15, moves: ["splash", "dragonrage"], japan: true},
 			{generation: 2, level: 5, shiny: 1, moves: ["splash", "bubble"]},
 			{generation: 2, level: 5, shiny: 1, moves: ["splash", "reversal"]},
 		],

package/data/mods/gen2/scripts.ts

@@ -160,6 +160,22 @@ export const Scripts: ModdedBattleScriptsData = {
 				return false;
 			}
 
+			if (move.target === 'all' || move.target === 'foeSide' || move.target === 'allySide' || move.target === 'allyTeam') {
+				if (move.target === 'all') {
+					hitResult = this.battle.runEvent('TryHitField', target, pokemon, move);
+				} else {
+					hitResult = this.battle.runEvent('TryHitSide', target, pokemon, move);
+				}
+				if (!hitResult) {
+					if (hitResult === false) {
+						this.battle.add('-fail', pokemon);
+						this.battle.attrLastMove('[still]');
+					}
+					return false;
+				}
+				return this.moveHit(target, pokemon, move);
+			}
+
 			hitResult = this.battle.runEvent('Invulnerability', target, pokemon, move);
 			if (hitResult === false) {
 				this.battle.attrLastMove('[miss]');

package/data/mods/gen3/conditions.ts

@@ -12,6 +12,10 @@ export const Conditions: {[k: string]: ModdedConditionData} = {
 			this.effectState.time = this.random(2, 6);
 			// Turns spent using Sleep Talk/Snore immediately before switching out while asleep
 			this.effectState.skippedTime = 0;
+
+			if (target.removeVolatile('nightmare')) {
+				this.add('-end', target, 'Nightmare', '[silent]');
+			}
 		},
 		onSwitchIn(target) {
 			this.effectState.time += this.effectState.skippedTime;

package/data/mods/gen4/abilities.ts

@@ -281,7 +281,7 @@ export const Abilities: {[k: string]: ModdedAbilityData} = {
 			// in gen 3-4, Natural Cure's curing is always known to both players
 
 			this.add('-curestatus', pokemon, pokemon.status, '[from] ability: Natural Cure');
-			pokemon.setStatus('');
+			pokemon.clearStatus();
 		},
 	},
 	normalize: {

package/data/mods/gen4/conditions.ts

@@ -30,6 +30,10 @@ export const Conditions: {[k: string]: ModdedConditionData} = {
 			}
 			// 1-4 turns
 			this.effectState.time = this.random(2, 6);
+
+			if (target.removeVolatile('nightmare')) {
+				this.add('-end', target, 'Nightmare', '[silent]');
+			}
 		},
 		onBeforeMovePriority: 10,
 		onBeforeMove(pokemon, target, move) {

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

@@ -882,7 +882,7 @@ export const FormatsData: {[k: string]: ModdedSpeciesFormatsData} = {
 	},
 	mamoswine: {
 		randomBattleMoves: ["earthquake", "endeavor", "iceshard", "stealthrock", "stoneedge", "superpower"],
-		tier: "OU",
+		tier: "(OU)",
 	},
 	corsola: {
 		randomBattleMoves: ["recover", "reflect", "stealthrock", "surf", "toxic"],

package/data/mods/gen4/moves.ts

@@ -759,7 +759,7 @@ export const Moves: {[k: string]: ModdedMoveData} = {
 			onSwitchIn(target) {
 				if (target.hp > 0) {
 					target.heal(target.maxhp);
-					target.setStatus('');
+					target.clearStatus();
 					this.add('-heal', target, target.getHealth, '[from] move: Healing Wish');
 					target.side.removeSlotCondition(target, 'healingwish');
 					target.lastMove = this.lastMove;
@@ -940,7 +940,7 @@ export const Moves: {[k: string]: ModdedMoveData} = {
 				}
 				if (target.hp > 0) {
 					target.heal(target.maxhp);
-					target.setStatus('');
+					target.clearStatus();
 					for (const moveSlot of target.moveSlots) {
 						moveSlot.pp = moveSlot.maxpp;
 					}
@@ -1395,6 +1395,13 @@ export const Moves: {[k: string]: ModdedMoveData} = {
 		inherit: true,
 		accuracy: 90,
 	},
+	secretpower: {
+		inherit: true,
+		secondary: {
+			chance: 30,
+			status: 'par',
+		},
+	},
 	sketch: {
 		inherit: true,
 		onHit(target, source) {

package/data/mods/gen5/moves.ts

@@ -753,13 +753,10 @@ export const Moves: {[k: string]: ModdedMoveData} = {
 	},
 	secretpower: {
 		inherit: true,
-		condition: {
-			duration: 1,
-			onAfterMoveSecondarySelf(source, target, move) {
-				if (this.randomChance(3, 10)) {
-					this.boost({accuracy: -1}, target, source);
-				}
-				source.removeVolatile('secretpower');
+		secondary: {
+			chance: 30,
+			boosts: {
+				accuracy: -1,
 			},
 		},
 	},

package/data/mods/gen5/pokedex.ts

@@ -422,6 +422,30 @@ export const Pokedex: {[k: string]: ModdedSpeciesData} = {
 		inherit: true,
 		baseStats: {hp: 85, atk: 100, def: 90, spa: 45, spd: 90, spe: 80},
 	},
+	pansage: {
+		inherit: true,
+		maleOnlyHidden: true,
+	},
+	simisage: {
+		inherit: true,
+		maleOnlyHidden: true,
+	},
+	pansear: {
+		inherit: true,
+		maleOnlyHidden: true,
+	},
+	simisear: {
+		inherit: true,
+		maleOnlyHidden: true,
+	},
+	panpour: {
+		inherit: true,
+		maleOnlyHidden: true,
+	},
+	simipour: {
+		inherit: true,
+		maleOnlyHidden: true,
+	},
 	unfezant: {
 		inherit: true,
 		baseStats: {hp: 80, atk: 105, def: 80, spa: 65, spd: 55, spe: 93},

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

@@ -3918,7 +3918,7 @@ export const FormatsData: {[k: string]: ModdedSpeciesFormatsData} = {
 	volcanion: {
 		randomBattleMoves: ["earthpower", "fireblast", "hiddenpowerice", "sludgewave", "steameruption", "substitute", "superpower"],
 		randomDoubleBattleMoves: ["earthquake", "heatwave", "protect", "rockslide", "sludgebomb", "steameruption", "substitute"],
-		tier: "(OU)",
+		tier: "OU",
 		doublesTier: "DOU",
 	},
 };

package/data/mods/gen6/learnsets.ts

@@ -172,79 +172,4 @@ export const Learnsets: {[k: string]: ModdedLearnsetData} = {
 			zenheadbutt: ["7T", "5T"],
 		},
 	},
-	crucibelle: {
-		inherit: true,
-		learnset: {
-			acidarmor: ["7L32", "6L32"],
-			astonish: ["7L1", "6L1"],
-			attract: ["7M", "6M"],
-			block: ["6T"],
-			coil: ["7E", "6E"],
-			confuseray: ["7L16", "6L16"],
-			confusion: ["7L14", "6L14"],
-			defensecurl: ["7E", "6E"],
-			doubleteam: ["7M", "6M"],
-			embargo: ["7M", "6M"],
-			endure: ["7L1", "6L1"],
-			explosion: ["7M", "7L60", "6M", "6L60"],
-			facade: ["7M", "6M"],
-			faketears: ["7L10", "6L10"],
-			frustration: ["7M", "6M"],
-			gigaimpact: ["7M", "6M"],
-			grassknot: ["7M", "6M"],
-			gravity: ["6T"],
-			gunkshot: ["7L56", "6T", "6L56"],
-			headsmash: ["6L1"],
-			helpinghand: ["6T"],
-			hex: ["7L44", "6L44"],
-			hiddenpower: ["7M", "6M"],
-			hyperbeam: ["7M", "6M"],
-			infestation: ["7M", "6M"],
-			ironhead: ["6T"],
-			lowkick: ["6T"],
-			magicroom: ["6T"],
-			payback: ["7M", "6M"],
-			poisonjab: ["7M", "6M"],
-			protect: ["7M", "7L1", "6M", "6L1"],
-			psybeam: ["7L40", "6L40"],
-			psychic: ["7M", "6M"],
-			reflect: ["7M", "7L25", "6M", "6L25"],
-			rest: ["7M", "6M"],
-			return: ["7M", "6M"],
-			rockblast: ["7L52", "6L52"],
-			rockpolish: ["7M", "6M"],
-			rockslide: ["7M", "7L36", "6M", "6L36"],
-			rocksmash: ["7M", "6M"],
-			rockthrow: ["7L5", "6L5"],
-			rocktomb: ["7M", "6M"],
-			rollout: ["7E", "6E"],
-			round: ["7M", "6M"],
-			safeguard: ["7M", "6M"],
-			sandstorm: ["7M", "6M"],
-			secretpower: ["7M"],
-			shadowball: ["7M", "6M"],
-			skillswap: ["6T"],
-			sleeptalk: ["7M", "6M"],
-			sludge: ["7L28", "6L28"],
-			sludgebomb: ["7M", "6M"],
-			sludgewave: ["7M", "6M"],
-			smackdown: ["7M", "7L23", "6M", "6L23"],
-			snatch: ["6T"],
-			snore: ["6T"],
-			stealthrock: ["6T"],
-			stoneedge: ["7M", "6M"],
-			substitute: ["7M", "6M"],
-			swagger: ["7M", "6M"],
-			torment: ["7M", "7L48", "6M", "6L48"],
-			toxic: ["7M", "7L7", "6M", "6L7"],
-			toxicspikes: ["7L19", "6L19"],
-			trick: ["6T"],
-			uturn: ["7M", "6M"],
-			venoshock: ["7M", "6M"],
-			withdraw: ["7L1", "6L1"],
-			wonderroom: ["6T"],
-			woodhammer: ["7E", "6E"],
-			zenheadbutt: ["6T"],
-		},
-	},
 };

package/data/mods/gen7/abilities.ts

@@ -8,6 +8,14 @@ export const Abilities: {[k: string]: ModdedAbilityData} = {
 			}
 		},
 	},
+	darkaura: {
+		inherit: true,
+		isBreakable: true,
+	},
+	fairyaura: {
+		inherit: true,
+		isBreakable: true,
+	},
 	innerfocus: {
 		inherit: true,
 		rating: 1,

package/data/mods/gen7/moves.ts

@@ -381,7 +381,7 @@ export const Moves: {[k: string]: ModdedMoveData} = {
 			onSwitchIn(target) {
 				if (!target.fainted) {
 					target.heal(target.maxhp);
-					target.setStatus('');
+					target.clearStatus();
 					this.add('-heal', target, target.getHealth, '[from] move: Healing Wish');
 					target.side.removeSlotCondition(target, 'healingwish');
 				}
@@ -608,7 +608,7 @@ export const Moves: {[k: string]: ModdedMoveData} = {
 			onSwitchIn(target) {
 				if (!target.fainted) {
 					target.heal(target.maxhp);
-					target.setStatus('');
+					target.clearStatus();
 					for (const moveSlot of target.moveSlots) {
 						moveSlot.pp = moveSlot.maxpp;
 					}

package/data/moves.ts

@@ -7828,7 +7828,7 @@ export const Moves: {[moveid: string]: MoveData} = {
 			onSwap(target) {
 				if (!target.fainted && (target.hp < target.maxhp || target.status)) {
 					target.heal(target.maxhp);
-					target.setStatus('');
+					target.clearStatus();
 					this.add('-heal', target, target.getHealth, '[from] move: Healing Wish');
 					target.side.removeSlotCondition(target, 'healingwish');
 				}
@@ -9081,7 +9081,12 @@ export const Moves: {[moveid: string]: MoveData} = {
 				return false;
 			}
 			this.add('-singleturn', target, 'move: Instruct', '[of] ' + source);
-			this.actions.runMove(target.lastMove.id, target, target.lastMoveTargetLoc!);
+			this.queue.prioritizeAction(this.queue.resolveAction({
+				choice: 'move',
+				pokemon: target,
+				moveid: target.lastMove.id,
+				targetLoc: target.lastMoveTargetLoc!,
+			})[0] as MoveAction);
 		},
 		secondary: null,
 		target: "normal",
@@ -9929,7 +9934,7 @@ export const Moves: {[moveid: string]: MoveData} = {
 					)
 				) {
 					target.heal(target.maxhp);
-					target.setStatus('');
+					target.clearStatus();
 					for (const moveSlot of target.moveSlots) {
 						moveSlot.pp = moveSlot.maxpp;
 					}

package/data/pokedex.ts

@@ -17419,6 +17419,18 @@ export const Pokedex: {[speciesid: string]: SpeciesData} = {
 		changesFrom: "Venomicon",
 		gen: 8,
 	},
+	saharaja: {
+		num: -68,
+		name: "Saharaja",
+		types: ["Ground"],
+		baseStats: {hp: 70, atk: 120, def: 105, spa: 65, spd: 130, spe: 90},
+		abilities: {0: "Water Absorb", 1: "Serene Grace"},
+		heightm: 2.3,
+		weightkg: 303.9,
+		color: "White",
+		eggGroups: ["Undiscovered"],
+		gen: 8,
+	},
 	// NOTE: PokeStar "formes" are not actually formes and thus do not have a formeOrder
 	pokestarsmeargle: {
 		num: -5000,