@pkmn/sim 0.5.12 → 0.5.15

package/data/items.ts

@@ -752,6 +752,7 @@ export const Items: {[itemid: string]: ItemData} = {
 		num: 16,
 		gen: 4,
 		isPokeball: true,
+		isNonstandard: "Unobtainable",
 	},
 	chestoberry: {
 		name: "Chesto Berry",
@@ -2904,7 +2905,7 @@ export const Items: {[itemid: string]: ItemData} = {
 			return this.chainModify([5324, 4096]);
 		},
 		onAfterMoveSecondarySelf(source, target, move) {
-			if (source && source !== target && move && move.category !== 'Status') {
+			if (source && source !== target && move && move.category !== 'Status' && !source.forceSwitchFlag) {
 				this.damage(source.baseMaxhp / 10, source, source, this.dex.items.get('lifeorb'));
 			}
 		},
@@ -3773,6 +3774,7 @@ export const Items: {[itemid: string]: ItemData} = {
 		num: 500,
 		gen: 4,
 		isPokeball: true,
+		isNonstandard: "Unobtainable",
 	},
 	passhoberry: {
 		name: "Passho Berry",
@@ -4877,7 +4879,7 @@ export const Items: {[itemid: string]: ItemData} = {
 		},
 		onAfterMoveSecondarySelfPriority: -1,
 		onAfterMoveSecondarySelf(pokemon, target, move) {
-			if (move.totalDamage) {
+			if (move.totalDamage && !pokemon.forceSwitchFlag) {
 				this.heal(move.totalDamage / 8, pokemon);
 			}
 		},

package/data/learnsets.ts

@@ -20480,20 +20480,20 @@ export const Learnsets: {[speciesid: string]: LearnsetData} = {
 			dualwingbeat: ["8T"],
 			endure: ["8M", "8L60"],
 			facade: ["8M"],
-			fierywrath: ["8L45", "8S0"],
+			fierywrath: ["8L45", "8S0", "8S1"],
 			fly: ["8M"],
 			foulplay: ["8M"],
 			gigaimpact: ["8M"],
 			gust: ["8L1"],
 			hex: ["8M"],
-			hurricane: ["8M", "8L55", "8S0"],
+			hurricane: ["8M", "8L55", "8S0", "8S1"],
 			hyperbeam: ["8M"],
 			hypervoice: ["8M"],
 			imprison: ["8M"],
 			lashout: ["8T"],
 			leer: ["8L1"],
 			memento: ["8L65"],
-			nastyplot: ["8M", "8L50", "8S0"],
+			nastyplot: ["8M", "8L50", "8S0", "8S1"],
 			payback: ["8M", "8L5"],
 			protect: ["8M"],
 			rest: ["8M"],
@@ -20507,7 +20507,7 @@ export const Learnsets: {[speciesid: string]: LearnsetData} = {
 			snore: ["8M"],
 			steelwing: ["8M"],
 			substitute: ["8M"],
-			suckerpunch: ["8L30", "8S0"],
+			suckerpunch: ["8L30", "8S0", "8S1"],
 			swift: ["8M"],
 			taunt: ["8M"],
 			uturn: ["8M"],
@@ -20515,6 +20515,7 @@ export const Learnsets: {[speciesid: string]: LearnsetData} = {
 		},
 		eventData: [
 			{generation: 8, level: 70, moves: ["fierywrath", "hurricane", "suckerpunch", "nastyplot"]},
+			{generation: 8, level: 70, shiny: true, moves: ["fierywrath", "hurricane", "suckerpunch", "nastyplot"], pokeball: "cherishball"},
 		],
 		eventOnly: true,
 	},

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

@@ -61,7 +61,7 @@ export const FormatsData: {[k: string]: ModdedSpeciesFormatsData} = {
 	butterfree: {
 		randomBattleMoves: ["psychic", "sleeppowder", "stunspore"],
 		exclusiveMoves: ["megadrain", "psywave"],
-		tier: "NU",
+		tier: "PU",
 	},
 	weedle: {
 		randomBattleMoves: ["poisonsting", "stringshot"],
@@ -75,25 +75,27 @@ export const FormatsData: {[k: string]: ModdedSpeciesFormatsData} = {
 		randomBattleMoves: ["megadrain", "swordsdance", "twineedle"],
 		exclusiveMoves: ["doubleedge", "doubleedge", "hyperbeam"],
 		comboMoves: ["agility", "hyperbeam", "swordsdance", "twineedle"],
-		tier: "NU",
+		tier: "PU",
 	},
 	pidgey: {
 		randomBattleMoves: ["agility", "doubleedge", "skyattack"],
-		exclusiveMoves: ["mimic", "mirrormove", "reflect", "sandattack", "substitute", "toxic"],
+		exclusiveMoves: ["mimic", "mirrormove", "reflect", "sandattack", "substitute", "quickattack", "toxic"],
 		tier: "LC",
 	},
 	pidgeotto: {
 		randomBattleMoves: ["agility", "doubleedge", "skyattack"],
-		exclusiveMoves: ["mimic", "mirrormove", "reflect", "sandattack", "substitute", "toxic"],
+		exclusiveMoves: ["mimic", "mirrormove", "reflect", "sandattack", "substitute", "quickattack", "toxic"],
 		tier: "NFE",
 	},
 	pidgeot: {
 		randomBattleMoves: ["agility", "doubleedge", "hyperbeam"],
-		exclusiveMoves: ["mimic", "mirrormove", "reflect", "sandattack", "skyattack", "skyattack", "substitute", "toxic"],
-		tier: "NU",
+		exclusiveMoves: ["mimic", "mirrormove", "reflect", "sandattack", "skyattack", "skyattack", "substitute", "quickattack", "toxic"],
+		tier: "PU",
 	},
 	rattata: {
-		randomBattleMoves: ["blizzard", "bodyslam", "thunderbolt"],
+		randomBattleMoves: ["blizzard", "bodyslam"],
+		// The two Thunderbolts are not a mistake, but specifically requested
+		exclusiveMoves: ["thunderbolt", "thunderbolt", "quickattack"],
 		essentialMove: "superfang",
 		tier: "LC",
 	},
@@ -109,7 +111,7 @@ export const FormatsData: {[k: string]: ModdedSpeciesFormatsData} = {
 	},
 	fearow: {
 		randomBattleMoves: ["agility", "doubleedge", "drillpeck", "hyperbeam"],
-		tier: "NU",
+		tier: "PU",
 	},
 	ekans: {
 		randomBattleMoves: ["bodyslam", "earthquake", "glare", "rockslide"],
@@ -118,7 +120,7 @@ export const FormatsData: {[k: string]: ModdedSpeciesFormatsData} = {
 	arbok: {
 		randomBattleMoves: ["earthquake", "glare", "hyperbeam"],
 		exclusiveMoves: ["bodyslam", "rockslide"],
-		tier: "NU",
+		tier: "PU",
 	},
 	pikachu: {
 		randomBattleMoves: ["surf", "thunderwave"],
@@ -140,7 +142,7 @@ export const FormatsData: {[k: string]: ModdedSpeciesFormatsData} = {
 	sandslash: {
 		randomBattleMoves: ["bodyslam", "rockslide", "swordsdance"],
 		essentialMove: "earthquake",
-		tier: "NU",
+		tier: "PU",
 	},
 	nidoranf: {
 		randomBattleMoves: ["blizzard", "bodyslam", "thunderbolt"],
@@ -155,7 +157,7 @@ export const FormatsData: {[k: string]: ModdedSpeciesFormatsData} = {
 	nidoqueen: {
 		randomBattleMoves: ["blizzard", "bodyslam", "thunderbolt"],
 		essentialMove: "earthquake",
-		tier: "NU",
+		tier: "PU",
 	},
 	nidoranm: {
 		randomBattleMoves: ["blizzard", "bodyslam", "thunderbolt"],
@@ -211,7 +213,7 @@ export const FormatsData: {[k: string]: ModdedSpeciesFormatsData} = {
 	},
 	golbat: {
 		randomBattleMoves: ["confuseray", "doubleedge", "hyperbeam", "megadrain"],
-		tier: "NU",
+		tier: "PU",
 	},
 	oddish: {
 		randomBattleMoves: ["doubleedge", "sleeppowder"],
@@ -228,7 +230,7 @@ export const FormatsData: {[k: string]: ModdedSpeciesFormatsData} = {
 	vileplume: {
 		randomBattleMoves: ["bodyslam", "sleeppowder", "stunspore", "swordsdance"],
 		essentialMove: "megadrain",
-		tier: "NU",
+		tier: "PU",
 	},
 	paras: {
 		randomBattleMoves: ["bodyslam", "megadrain"],
@@ -240,7 +242,7 @@ export const FormatsData: {[k: string]: ModdedSpeciesFormatsData} = {
 		randomBattleMoves: ["bodyslam", "megadrain"],
 		essentialMove: "spore",
 		exclusiveMoves: ["growth", "hyperbeam", "slash", "stunspore", "stunspore", "swordsdance"],
-		tier: "NU",
+		tier: "PU",
 	},
 	venonat: {
 		randomBattleMoves: ["psychic", "sleeppowder", "stunspore"],
@@ -294,7 +296,7 @@ export const FormatsData: {[k: string]: ModdedSpeciesFormatsData} = {
 	primeape: {
 		randomBattleMoves: ["bodyslam", "rockslide", "submission"],
 		exclusiveMoves: ["counter", "hyperbeam", "hyperbeam"],
-		tier: "NU",
+		tier: "PU",
 	},
 	growlithe: {
 		randomBattleMoves: ["bodyslam", "fireblast", "flamethrower", "reflect"],
@@ -303,7 +305,7 @@ export const FormatsData: {[k: string]: ModdedSpeciesFormatsData} = {
 	arcanine: {
 		randomBattleMoves: ["bodyslam", "fireblast", "hyperbeam"],
 		exclusiveMoves: ["flamethrower", "reflect"],
-		tier: "NU",
+		tier: "PU",
 	},
 	poliwag: {
 		randomBattleMoves: ["blizzard", "surf"],
@@ -315,7 +317,7 @@ export const FormatsData: {[k: string]: ModdedSpeciesFormatsData} = {
 		randomBattleMoves: ["blizzard", "surf"],
 		essentialMove: "amnesia",
 		exclusiveMoves: ["counter", "hypnosis", "hypnosis", "psychic"],
-		tier: "NFE",
+		tier: "NU",
 	},
 	poliwrath: {
 		randomBattleMoves: ["blizzard", "bodyslam", "earthquake", "submission"],
@@ -352,7 +354,7 @@ export const FormatsData: {[k: string]: ModdedSpeciesFormatsData} = {
 	machamp: {
 		randomBattleMoves: ["bodyslam", "earthquake", "submission"],
 		exclusiveMoves: ["counter", "hyperbeam", "rockslide", "rockslide"],
-		tier: "NU",
+		tier: "PU",
 	},
 	bellsprout: {
 		randomBattleMoves: ["doubleedge", "sleeppowder", "stunspore", "swordsdance"],
@@ -400,7 +402,7 @@ export const FormatsData: {[k: string]: ModdedSpeciesFormatsData} = {
 	},
 	rapidash: {
 		randomBattleMoves: ["agility", "bodyslam", "fireblast", "hyperbeam"],
-		tier: "NU",
+		tier: "PU",
 	},
 	slowpoke: {
 		randomBattleMoves: ["earthquake", "surf"],
@@ -422,12 +424,12 @@ export const FormatsData: {[k: string]: ModdedSpeciesFormatsData} = {
 	magneton: {
 		randomBattleMoves: ["thunder", "thunderbolt", "thunderwave"],
 		exclusiveMoves: ["doubleedge", "hyperbeam", "hyperbeam", "mimic", "substitute", "toxic"],
-		tier: "NU",
+		tier: "PU",
 	},
 	farfetchd: {
 		randomBattleMoves: ["agility", "bodyslam", "swordsdance"],
 		essentialMove: "slash",
-		tier: "NU",
+		tier: "PU",
 	},
 	doduo: {
 		randomBattleMoves: ["agility", "bodyslam", "doubleedge", "drillpeck"],
@@ -457,7 +459,7 @@ export const FormatsData: {[k: string]: ModdedSpeciesFormatsData} = {
 		randomBattleMoves: ["bodyslam", "sludge"],
 		essentialMove: "explosion",
 		exclusiveMoves: ["fireblast", "hyperbeam", "megadrain", "megadrain"],
-		tier: "NU",
+		tier: "PU",
 	},
 	shellder: {
 		randomBattleMoves: ["blizzard", "doubleedge", "explosion", "surf"],
@@ -488,7 +490,7 @@ export const FormatsData: {[k: string]: ModdedSpeciesFormatsData} = {
 	},
 	onix: {
 		randomBattleMoves: ["bodyslam", "earthquake", "explosion", "rockslide"],
-		tier: "NU",
+		tier: "PU",
 	},
 	drowzee: {
 		randomBattleMoves: ["hypnosis", "psychic", "thunderwave"],
@@ -516,13 +518,13 @@ export const FormatsData: {[k: string]: ModdedSpeciesFormatsData} = {
 	electrode: {
 		randomBattleMoves: ["explosion", "thunderbolt", "thunderwave"],
 		exclusiveMoves: ["hyperbeam", "screech", "thunder", "toxic"],
-		tier: "NU",
+		tier: "PU",
 	},
 	exeggcute: {
 		randomBattleMoves: ["sleeppowder", "stunspore"],
 		essentialMove: "psychic",
 		exclusiveMoves: ["doubleedge", "explosion", "explosion"],
-		tier: "LC",
+		tier: "NU",
 	},
 	exeggutor: {
 		randomBattleMoves: ["explosion", "psychic", "sleeppowder"],
@@ -535,23 +537,23 @@ export const FormatsData: {[k: string]: ModdedSpeciesFormatsData} = {
 	},
 	marowak: {
 		randomBattleMoves: ["blizzard", "bodyslam", "earthquake", "seismictoss"],
-		tier: "NU",
+		tier: "PU",
 	},
 	hitmonlee: {
 		randomBattleMoves: ["bodyslam", "highjumpkick", "seismictoss"],
 		exclusiveMoves: ["counter", "counter", "meditate"],
-		tier: "NU",
+		tier: "PU",
 	},
 	hitmonchan: {
 		randomBattleMoves: ["bodyslam", "seismictoss", "submission"],
 		exclusiveMoves: ["agility", "counter", "counter"],
-		tier: "NU",
+		tier: "PU",
 	},
 	lickitung: {
 		randomBattleMoves: ["hyperbeam", "swordsdance"],
 		essentialMove: "bodyslam",
 		exclusiveMoves: ["blizzard", "earthquake", "earthquake", "earthquake"],
-		tier: "NU",
+		tier: "PU",
 	},
 	koffing: {
 		randomBattleMoves: ["explosion", "fireblast", "sludge", "thunderbolt"],
@@ -559,7 +561,7 @@ export const FormatsData: {[k: string]: ModdedSpeciesFormatsData} = {
 	},
 	weezing: {
 		randomBattleMoves: ["explosion", "fireblast", "sludge", "thunderbolt"],
-		tier: "NU",
+		tier: "PU",
 	},
 	rhyhorn: {
 		randomBattleMoves: ["bodyslam", "earthquake", "rockslide", "substitute"],
@@ -606,7 +608,7 @@ export const FormatsData: {[k: string]: ModdedSpeciesFormatsData} = {
 	seaking: {
 		randomBattleMoves: ["blizzard", "doubleedge", "surf"],
 		exclusiveMoves: ["agility", "agility", "hyperbeam"],
-		tier: "NU",
+		tier: "PU",
 	},
 	staryu: {
 		randomBattleMoves: ["blizzard", "thunderbolt", "thunderwave"],
@@ -626,7 +628,7 @@ export const FormatsData: {[k: string]: ModdedSpeciesFormatsData} = {
 	},
 	scyther: {
 		randomBattleMoves: ["agility", "hyperbeam", "slash", "swordsdance"],
-		tier: "NU",
+		tier: "PU",
 	},
 	jynx: {
 		randomBattleMoves: ["blizzard", "lovelykiss", "psychic"],
@@ -640,12 +642,12 @@ export const FormatsData: {[k: string]: ModdedSpeciesFormatsData} = {
 	magmar: {
 		randomBattleMoves: ["bodyslam", "confuseray", "fireblast"],
 		exclusiveMoves: ["hyperbeam", "psychic"],
-		tier: "NU",
+		tier: "PU",
 	},
 	pinsir: {
 		randomBattleMoves: ["bodyslam", "hyperbeam", "swordsdance"],
 		exclusiveMoves: ["seismictoss", "submission", "submission"],
-		tier: "NU",
+		tier: "PU",
 	},
 	tauros: {
 		randomBattleMoves: ["bodyslam", "earthquake", "hyperbeam"],
@@ -669,7 +671,7 @@ export const FormatsData: {[k: string]: ModdedSpeciesFormatsData} = {
 	},
 	ditto: {
 		randomBattleMoves: ["transform"],
-		tier: "NU",
+		tier: "PU",
 	},
 	eevee: {
 		randomBattleMoves: ["doubleedge", "quickattack", "reflect"],
@@ -690,7 +692,7 @@ export const FormatsData: {[k: string]: ModdedSpeciesFormatsData} = {
 	},
 	flareon: {
 		randomBattleMoves: ["bodyslam", "fireblast", "hyperbeam", "quickattack"],
-		tier: "NU",
+		tier: "PU",
 	},
 	porygon: {
 		randomBattleMoves: ["blizzard", "thunderwave"],

package/data/mods/gen1/scripts.ts

@@ -662,7 +662,7 @@ export const Scripts: ModdedBattleScriptsData = {
 			if (!isCrit) {
 				// In gen 1, the critical chance is based on speed.
 				// First, we get the base speed, divide it by 2 and floor it. This is our current crit chance.
-				let critChance = Math.floor(source.species.baseStats['spe'] / 2);
+				let critChance = Math.floor(this.dex.species.get(source.set.species).baseStats['spe'] / 2);
 
 				// Now we check for focus energy volatile.
 				if (source.volatiles['focusenergy']) {

package/data/mods/gen2/items.ts

@@ -50,6 +50,10 @@ export const Items: {[k: string]: ModdedItemData} = {
 			}
 		},
 	},
+	fastball: {
+		inherit: true,
+		isNonstandard: null,
+	},
 	focusband: {
 		inherit: true,
 		onDamage(damage, target, source, effect) {
@@ -68,6 +72,10 @@ export const Items: {[k: string]: ModdedItemData} = {
 			}
 		},
 	},
+	heavyball: {
+		inherit: true,
+		isNonstandard: null,
+	},
 	kingsrock: {
 		inherit: true,
 		onModifyMove(move) {
@@ -91,11 +99,19 @@ export const Items: {[k: string]: ModdedItemData} = {
 		onResidualOrder: 5,
 		onResidualSubOrder: 1,
 	},
+	levelball: {
+		inherit: true,
+		isNonstandard: null,
+	},
 	lightball: {
 		inherit: true,
 		// In Gen 2 this happens in stat calculation directly.
 		onModifySpA() {},
 	},
+	loveball: {
+		inherit: true,
+		isNonstandard: null,
+	},
 	luckypunch: {
 		inherit: true,
 		onModifyCritRatioPriority: -1,
@@ -105,6 +121,10 @@ export const Items: {[k: string]: ModdedItemData} = {
 			}
 		},
 	},
+	lureball: {
+		inherit: true,
+		isNonstandard: null,
+	},
 	magnet: {
 		inherit: true,
 		onModifySpA() {},
@@ -138,6 +158,10 @@ export const Items: {[k: string]: ModdedItemData} = {
 			}
 		},
 	},
+	moonball: {
+		inherit: true,
+		isNonstandard: null,
+	},
 	mysticwater: {
 		inherit: true,
 		onModifySpA() {},
@@ -201,6 +225,10 @@ export const Items: {[k: string]: ModdedItemData} = {
 			}
 		},
 	},
+	sportball: {
+		inherit: true,
+		isNonstandard: null,
+	},
 	stick: {
 		inherit: true,
 		onModifyCritRatioPriority: -1,

package/data/mods/gen2/moves.ts

@@ -129,7 +129,7 @@ export const Moves: {[k: string]: ModdedMoveData} = {
 			return false;
 		},
 		beforeTurnCallback() {},
-		onTryHit() {},
+		onTry() {},
 		condition: {},
 		priority: -1,
 	},
@@ -446,7 +446,7 @@ export const Moves: {[k: string]: ModdedMoveData} = {
 			return false;
 		},
 		beforeTurnCallback() {},
-		onTryHit() {},
+		onTry() {},
 		condition: {},
 		priority: -1,
 	},

package/data/mods/gen3/items.ts

@@ -83,6 +83,10 @@ export const Items: {[k: string]: ModdedItemData} = {
 		gen: 3,
 		isNonstandard: "Unobtainable",
 	},
+	fastball: {
+		inherit: true,
+		isNonstandard: "Unobtainable",
+	},
 	figyberry: {
 		inherit: true,
 		onUpdate() {},
@@ -115,6 +119,10 @@ export const Items: {[k: string]: ModdedItemData} = {
 			}
 		},
 	},
+	heavyball: {
+		inherit: true,
+		isNonstandard: "Unobtainable",
+	},
 	iapapaberry: {
 		inherit: true,
 		onUpdate() {},
@@ -160,6 +168,10 @@ export const Items: {[k: string]: ModdedItemData} = {
 			return accuracy * 0.95;
 		},
 	},
+	levelball: {
+		inherit: true,
+		isNonstandard: "Unobtainable",
+	},
 	liechiberry: {
 		inherit: true,
 		onUpdate() {},
@@ -180,6 +192,14 @@ export const Items: {[k: string]: ModdedItemData} = {
 		},
 		onBasePower() {},
 	},
+	loveball: {
+		inherit: true,
+		isNonstandard: "Unobtainable",
+	},
+	lureball: {
+		inherit: true,
+		isNonstandard: "Unobtainable",
+	},
 	magnet: {
 		inherit: true,
 		onBasePower() {},
@@ -221,6 +241,10 @@ export const Items: {[k: string]: ModdedItemData} = {
 			}
 		},
 	},
+	moonball: {
+		inherit: true,
+		isNonstandard: "Unobtainable",
+	},
 	mysticwater: {
 		inherit: true,
 		onBasePower() {},
@@ -363,6 +387,10 @@ export const Items: {[k: string]: ModdedItemData} = {
 			}
 		},
 	},
+	sportball: {
+		inherit: true,
+		isNonstandard: "Unobtainable",
+	},
 	starfberry: {
 		inherit: true,
 		onUpdate() {},

package/data/mods/gen4/abilities.ts

@@ -160,6 +160,16 @@ export const Abilities: {[k: string]: ModdedAbilityData} = {
 			this.add('-activate', pokemon, 'ability: Forewarn', warnMove);
 		},
 	},
+	frisk: {
+		inherit: true,
+		onStart(pokemon) {
+			for (const target of pokemon.foes()) {
+				if (target.item && !target.itemState.knockedOff) {
+					this.add('-item', target, target.getItem().name, '[from] ability: Frisk', '[of] ' + pokemon, '[identify]');
+				}
+			}
+		},
+	},
 	hustle: {
 		inherit: true,
 		onSourceModifyAccuracyPriority: 7,
@@ -504,6 +514,16 @@ export const Abilities: {[k: string]: ModdedAbilityData} = {
 			}
 		},
 	},
+	unburden: {
+		inherit: true,
+		condition: {
+			onModifySpe(spe, pokemon) {
+				if ((!pokemon.item || pokemon.itemState.knockedOff) && !pokemon.ignoringAbility()) {
+					return this.chainModify(2);
+				}
+			},
+		},
+	},
 	vitalspirit: {
 		inherit: true,
 		rating: 2.5,

package/data/mods/gen4/items.ts

@@ -113,6 +113,10 @@ export const Items: {[k: string]: ModdedItemData} = {
 			}
 		},
 	},
+	fastball: {
+		inherit: true,
+		isNonstandard: null,
+	},
 	flameorb: {
 		inherit: true,
 		onResidualOrder: 10,
@@ -148,6 +152,10 @@ export const Items: {[k: string]: ModdedItemData} = {
 			}
 		},
 	},
+	heavyball: {
+		inherit: true,
+		isNonstandard: null,
+	},
 	ironball: {
 		inherit: true,
 		onEffectiveness() {},
@@ -181,6 +189,10 @@ export const Items: {[k: string]: ModdedItemData} = {
 		onResidualOrder: 10,
 		onResidualSubOrder: 4,
 	},
+	levelball: {
+		inherit: true,
+		isNonstandard: null,
+	},
 	lifeorb: {
 		inherit: true,
 		onModifyDamage() {},
@@ -214,6 +226,10 @@ export const Items: {[k: string]: ModdedItemData} = {
 			}
 		},
 	},
+	loveball: {
+		inherit: true,
+		isNonstandard: null,
+	},
 	luckypunch: {
 		inherit: true,
 		onModifyCritRatio(critRatio, user) {
@@ -222,6 +238,10 @@ export const Items: {[k: string]: ModdedItemData} = {
 			}
 		},
 	},
+	lureball: {
+		inherit: true,
+		isNonstandard: null,
+	},
 	lustrousorb: {
 		inherit: true,
 		onBasePower(basePower, user, target, move) {
@@ -286,6 +306,10 @@ export const Items: {[k: string]: ModdedItemData} = {
 			},
 		},
 	},
+	moonball: {
+		inherit: true,
+		isNonstandard: null,
+	},
 	razorfang: {
 		inherit: true,
 		onModifyMove(move) {
@@ -301,6 +325,10 @@ export const Items: {[k: string]: ModdedItemData} = {
 			}
 		},
 	},
+	sportball: {
+		inherit: true,
+		isNonstandard: null,
+	},
 	stick: {
 		inherit: true,
 		onModifyCritRatio(critRatio, user) {

package/data/mods/gen4/moves.ts

@@ -541,12 +541,16 @@ export const Moves: {[k: string]: ModdedMoveData} = {
 	},
 	focuspunch: {
 		inherit: true,
-		beforeMoveCallback() { },
+		priorityChargeCallback() {},
+		beforeTurnCallback(pokemon) {
+			pokemon.addVolatile('focuspunch');
+		},
+		beforeMoveCallback() {},
 		onTry(pokemon) {
-			if (pokemon.volatiles['focuspunch'] && pokemon.volatiles['focuspunch'].lostFocus) {
+			if (pokemon.volatiles['focuspunch']?.lostFocus) {
 				this.attrLastMove('[still]');
 				this.add('cant', pokemon, 'Focus Punch', 'Focus Punch');
-				return false;
+				return null;
 			}
 		},
 	},
@@ -829,10 +833,13 @@ export const Moves: {[k: string]: ModdedMoveData} = {
 	},
 	knockoff: {
 		inherit: true,
-		onAfterHit(target, source) {
-			const item = target.takeItem();
-			if (item) {
-				this.add('-enditem', target, item.name, '[from] move: Knock Off', '[of] ' + source);
+		onAfterHit(target, source, move) {
+			if (!target.item || target.itemState.knockedOff) return;
+			const item = target.getItem();
+			if (this.singleEvent('TakeItem', item, target.itemState, target, target, move, item)) {
+				target.itemState.knockedOff = true;
+				this.add('-enditem', target, item.name, '[from] move: Knock Off');
+				this.hint("In Gens 3-4, Knock Off only makes the target's item unusable; it cannot obtain a new item.", true);
 			}
 		},
 	},

package/data/mods/gen5/items.ts

@@ -299,10 +299,6 @@ export const Items: {[k: string]: ModdedItemData} = {
 			type: "Dragon",
 		},
 	},
-	normalgem: {
-		inherit: true,
-		isNonstandard: null,
-	},
 	occaberry: {
 		inherit: true,
 		naturalGift: {