@pkmn/sim 0.5.14 → 0.5.15

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: {

package/data/mods/gen6/items.ts

@@ -25,6 +25,10 @@ export const Items: {[k: string]: ModdedItemData} = {
 		inherit: true,
 		isNonstandard: null,
 	},
+	fastball: {
+		inherit: true,
+		isNonstandard: "Unobtainable",
+	},
 	figyberry: {
 		inherit: true,
 		onUpdate(pokemon) {
@@ -39,6 +43,10 @@ export const Items: {[k: string]: ModdedItemData} = {
 			}
 		},
 	},
+	heavyball: {
+		inherit: true,
+		isNonstandard: "Unobtainable",
+	},
 	iapapaberry: {
 		inherit: true,
 		onUpdate(pokemon) {
@@ -63,6 +71,10 @@ export const Items: {[k: string]: ModdedItemData} = {
 			}
 		},
 	},
+	levelball: {
+		inherit: true,
+		isNonstandard: "Unobtainable",
+	},
 	lifeorb: {
 		inherit: true,
 		onAfterMoveSecondarySelf(source, target, move) {
@@ -71,6 +83,14 @@ export const Items: {[k: string]: ModdedItemData} = {
 			}
 		},
 	},
+	loveball: {
+		inherit: true,
+		isNonstandard: "Unobtainable",
+	},
+	lureball: {
+		inherit: true,
+		isNonstandard: "Unobtainable",
+	},
 	machobrace: {
 		inherit: true,
 		isNonstandard: null,
@@ -93,6 +113,10 @@ export const Items: {[k: string]: ModdedItemData} = {
 		inherit: true,
 		isNonstandard: null,
 	},
+	moonball: {
+		inherit: true,
+		isNonstandard: "Unobtainable",
+	},
 	nanabberry: {
 		inherit: true,
 		isNonstandard: null,

package/data/mods/gen7/abilities.ts

@@ -66,6 +66,37 @@ export const Abilities: {[k: string]: ModdedAbilityData} = {
 		inherit: true,
 		onBoost() {},
 	},
+	slowstart: {
+		inherit: true,
+		condition: {
+			duration: 5,
+			onResidualOrder: 28,
+			onResidualSubOrder: 2,
+			onStart(target) {
+				this.add('-start', target, 'ability: Slow Start');
+			},
+			onModifyAtkPriority: 5,
+			onModifyAtk(atk, pokemon, target, move) {
+				// This is because the game checks the move's category in data, rather than what it is currently, unlike e.g. Huge Power
+				if (this.dex.moves.get(move.id).category === 'Physical') {
+					return this.chainModify(0.5);
+				}
+			},
+			onModifySpAPriority: 5,
+			onModifySpA(spa, pokemon, target, move) {
+				// Ordinary Z-moves like Breakneck Blitz will halve the user's Special Attack as well
+				if (this.dex.moves.get(move.id).category === 'Physical') {
+					return this.chainModify(0.5);
+				}
+			},
+			onModifySpe(spe, pokemon) {
+				return this.chainModify(0.5);
+			},
+			onEnd(target) {
+				this.add('-end', target, 'Slow Start');
+			},
+		},
+	},
 	soundproof: {
 		inherit: true,
 		onTryHit(target, source, move) {

package/data/mods/gen7/items.ts

@@ -140,6 +140,10 @@ export const Items: {[k: string]: ModdedItemData} = {
 		inherit: true,
 		isNonstandard: null,
 	},
+	dreamball: {
+		inherit: true,
+		isNonstandard: "Unobtainable",
+	},
 	durinberry: {
 		inherit: true,
 		isNonstandard: "Unobtainable",
@@ -495,6 +499,10 @@ export const Items: {[k: string]: ModdedItemData} = {
 		inherit: true,
 		isNonstandard: null,
 	},
+	safariball: {
+		inherit: true,
+		isNonstandard: "Unobtainable",
+	},
 	sailfossil: {
 		inherit: true,
 		isNonstandard: null,
@@ -547,6 +555,10 @@ export const Items: {[k: string]: ModdedItemData} = {
 		inherit: true,
 		isNonstandard: null,
 	},
+	sportball: {
+		inherit: true,
+		isNonstandard: "Unobtainable",
+	},
 	steelgem: {
 		inherit: true,
 		isNonstandard: "Unobtainable",

package/data/mods/gen7/moves.ts

@@ -259,6 +259,20 @@ export const Moves: {[k: string]: ModdedMoveData} = {
 			return success;
 		},
 	},
+	fly: {
+		inherit: true,
+		onTryMove(attacker, defender, move) {
+			if (attacker.removeVolatile(move.id)) {
+				return;
+			}
+			this.add('-prepare', attacker, move.name);
+			if (!this.runEvent('ChargeMove', attacker, defender, move)) {
+				return;
+			}
+			attacker.addVolatile('twoturnmove', defender);
+			return null;
+		},
+	},
 	foresight: {
 		inherit: true,
 		isNonstandard: null,

package/data/moves.ts

@@ -1035,7 +1035,7 @@ export const Moves: {[moveid: string]: MoveData} = {
 		pp: 15,
 		priority: -3,
 		flags: {bullet: 1, protect: 1},
-		beforeTurnCallback(pokemon) {
+		priorityChargeCallback(pokemon) {
 			pokemon.addVolatile('beakblast');
 		},
 		condition: {
@@ -2640,7 +2640,7 @@ export const Moves: {[moveid: string]: MoveData} = {
 		beforeTurnCallback(pokemon) {
 			pokemon.addVolatile('counter');
 		},
-		onTryHit(target, source, move) {
+		onTry(source) {
 			if (!source.volatiles['counter']) return false;
 			if (source.volatiles['counter'].slot === null) return false;
 		},
@@ -3092,6 +3092,7 @@ export const Moves: {[moveid: string]: MoveData} = {
 		volatileStatus: 'defensecurl',
 		condition: {
 			noCopy: true,
+			onRestart: () => null,
 		},
 		secondary: null,
 		target: "self",
@@ -5390,6 +5391,17 @@ export const Moves: {[moveid: string]: MoveData} = {
 			if (!this.runEvent('ChargeMove', attacker, defender, move)) {
 				return;
 			}
+
+			// In SwSh, Fly's animation leaks the initial target through a camera focus
+			// The animation leak target itself isn't "accurate"; the target it reveals is as if Fly weren't a charge movee
+			// (Fly, like all other charge moves, will actually target slots on its charging turn, relevant for things like Follow Me)
+			// We use a generic single-target move to represent this
+			if (this.gameType === 'doubles' || this.gameType === 'multi') {
+				const animatedTarget = attacker.getMoveTargets(this.dex.getActiveMove('aerialace'), defender).targets[0];
+				if (animatedTarget) {
+					this.hint(`${move.name}'s animation targeted ${animatedTarget.name}`);
+				}
+			}
 			attacker.addVolatile('twoturnmove', defender);
 			return null;
 		},
@@ -5488,11 +5500,11 @@ export const Moves: {[moveid: string]: MoveData} = {
 		pp: 20,
 		priority: -3,
 		flags: {contact: 1, protect: 1, punch: 1},
-		beforeTurnCallback(pokemon) {
+		priorityChargeCallback(pokemon) {
 			pokemon.addVolatile('focuspunch');
 		},
 		beforeMoveCallback(pokemon) {
-			if (pokemon.volatiles['focuspunch'] && pokemon.volatiles['focuspunch'].lostFocus) {
+			if (pokemon.volatiles['focuspunch']?.lostFocus) {
 				this.add('cant', pokemon, 'Focus Punch', 'Focus Punch');
 				return true;
 			}
@@ -5504,7 +5516,7 @@ export const Moves: {[moveid: string]: MoveData} = {
 			},
 			onHit(pokemon, source, move) {
 				if (move.category !== 'Status') {
-					pokemon.volatiles['focuspunch'].lostFocus = true;
+					this.effectState.lostFocus = true;
 				}
 			},
 			onTryAddVolatile(status, pokemon) {
@@ -10925,7 +10937,7 @@ export const Moves: {[moveid: string]: MoveData} = {
 		pp: 10,
 		priority: 0,
 		flags: {protect: 1, mirror: 1},
-		onTryHit(target, source, move) {
+		onTry(source) {
 			const lastDamagedBy = source.getLastDamagedBy(true);
 			if (lastDamagedBy === undefined || !lastDamagedBy.thisTurn) return false;
 		},
@@ -11187,6 +11199,7 @@ export const Moves: {[moveid: string]: MoveData} = {
 		volatileStatus: 'minimize',
 		condition: {
 			noCopy: true,
+			onRestart: () => null,
 			onSourceModifyDamage(damage, source, target, move) {
 				const boostedMoves = [
 					'stomp', 'steamroller', 'bodyslam', 'flyingpress', 'dragonrush', 'heatcrash', 'heavyslam', 'maliciousmoonsault',
@@ -11264,7 +11277,7 @@ export const Moves: {[moveid: string]: MoveData} = {
 		beforeTurnCallback(pokemon) {
 			pokemon.addVolatile('mirrorcoat');
 		},
-		onTryHit(target, source, move) {
+		onTry(source) {
 			if (!source.volatiles['mirrorcoat']) return false;
 			if (source.volatiles['mirrorcoat'].slot === null) return false;
 		},
@@ -13478,7 +13491,7 @@ export const Moves: {[moveid: string]: MoveData} = {
 				let alreadyAdded = false;
 				pokemon.removeVolatile('destinybond');
 				for (const source of this.effectState.sources) {
-					if (!this.queue.cancelMove(source) || !source.hp) continue;
+					if (!source.isAdjacent(pokemon) || !this.queue.cancelMove(source) || !source.hp) continue;
 					if (!alreadyAdded) {
 						this.add('-activate', pokemon, 'move: Pursuit');
 						alreadyAdded = true;
@@ -14000,7 +14013,8 @@ export const Moves: {[moveid: string]: MoveData} = {
 			}
 		},
 		onHit(target, source, move) {
-			if (!target.setStatus('slp', source, move)) return false;
+			const result = target.setStatus('slp', source, move);
+			if (!result) return result;
 			target.statusState.time = 3;
 			target.statusState.startTime = 3;
 			this.heal(target.maxhp); // Aesthetic only as the healing happens after you fall asleep in-game
@@ -15210,7 +15224,7 @@ export const Moves: {[moveid: string]: MoveData} = {
 		pp: 5,
 		priority: -3,
 		flags: {protect: 1},
-		beforeTurnCallback(pokemon) {
+		priorityChargeCallback(pokemon) {
 			pokemon.addVolatile('shelltrap');
 		},
 		onTryMove(pokemon) {
@@ -15227,7 +15241,7 @@ export const Moves: {[moveid: string]: MoveData} = {
 			},
 			onHit(pokemon, source, move) {
 				if (!pokemon.isAlly(source) && move.category === 'Physical') {
-					pokemon.volatiles['shelltrap'].gotHit = true;
+					this.effectState.gotHit = true;
 					const action = this.queue.willMove(pokemon);
 					if (action) {
 						this.queue.prioritizeAction(action);

package/data/rulesets.ts

@@ -1,6 +1,7 @@
 // Note: These are the rules that formats use
 
 import {Utils} from "../lib";
+import {Pokemon} from "../sim/pokemon";
 
 // The list of formats is stored in config/formats.js
 export const Rulesets: {[k: string]: FormatData} = {
@@ -1604,6 +1605,75 @@ export const Rulesets: {[k: string]: FormatData} = {
 			pokemon.trapped = true;
 		},
 	},
+	crazyhouserule: {
+		effectType: 'Rule',
+		name: 'Crazyhouse Rule',
+		desc: "Pok\u00e9mon you KO are added to your team and removed from the opponent's, and vice versa.",
+		onValidateRule(value) {
+			if (this.format.gameType === 'doubles' || this.format.gameType === 'triples') {
+				throw new Error(`Crazyhouse Rule currently does not support ${this.format.gameType} battles.`);
+			}
+			const ruleTable = this.ruleTable;
+			const maxTeamSize = ruleTable.pickedTeamSize || ruleTable.maxTeamSize;
+			const numPlayers = (this.format.gameType === 'freeforall' || this.format.gameType === 'multi') ? 4 : 2;
+			const potentialMaxTeamSize = maxTeamSize * numPlayers;
+			if (potentialMaxTeamSize > 24) {
+				throw new Error(`Crazyhouse Rule cannot be added because a team can potentially have ${potentialMaxTeamSize} Pokemon on one team, which is more than the server limit of 24.`);
+			}
+		},
+		// In order to prevent a case of the clones, housekeeping is needed.
+		// This is especially needed to make sure one side doesn't end up with too many Pokemon.
+		onBeforeSwitchIn(pokemon) {
+			if (this.turn < 1 || !pokemon.side.faintedThisTurn) return;
+			pokemon.side.pokemon = pokemon.side.pokemon.filter(x => !(x.fainted && !x.m.outofplay));
+			for (let i = 0; i < pokemon.side.pokemon.length && i < 24; i++) {
+				pokemon.side.pokemon[i].position = i;
+			}
+		},
+		onFaint(target, source, effect) {
+			if (!target.m.numSwaps) {
+				target.m.numSwaps = 0;
+			}
+			target.m.numSwaps++;
+			if (effect && effect.effectType === 'Move' && source.side.pokemon.length < 24 &&
+                source.side !== target.side && target.m.numSwaps < 4) {
+				const hpCost = this.clampIntRange(Math.floor((target.baseMaxhp * target.m.numSwaps) / 4), 1);
+				// Just in case(tm) and for Shedinja
+				if (hpCost === target.baseMaxhp) {
+					target.m.outofplay = true;
+					return;
+				}
+				source.side.pokemonLeft++;
+				source.side.pokemon.length++;
+
+				// A new Pokemon is created and stuff gets aside akin to a deep clone.
+				// This is because deepClone crashes when side is called recursively.
+				// Until a refactor is made to prevent it, this is the best option to prevent crashes.
+				const newPoke = new Pokemon(target.set, source.side);
+				const newPos = source.side.pokemon.length - 1;
+
+				const doNotCarryOver = [
+					'fullname', 'side', 'fainted', 'status', 'hp', 'illusion',
+					'transformed', 'position', 'isActive', 'faintQueued',
+					'subFainted', 'getHealth', 'getDetails', 'moveSlots', 'ability',
+				];
+				for (const [key, value] of Object.entries(target)) {
+					if (doNotCarryOver.includes(key)) continue;
+					// @ts-ignore
+					newPoke[key] = value;
+				}
+				newPoke.maxhp = newPoke.baseMaxhp; // for dynamax
+				newPoke.hp = newPoke.baseMaxhp - hpCost;
+				newPoke.clearVolatile();
+				newPoke.position = newPos;
+				source.side.pokemon[newPos] = newPoke;
+				this.add('poke', source.side.pokemon[newPos].side.id, source.side.pokemon[newPos].details, '');
+				this.add('-message', `${target.name} was captured by ${newPoke.side.name}!`);
+			} else {
+				target.m.outofplay = true;
+			}
+		},
+	},
 	chimera1v1rule: {
 		effectType: 'Rule',
 		name: 'Chimera 1v1 Rule',

package/data/tags.ts

@@ -198,9 +198,9 @@ export const Tags: {[id: string]: TagData} = {
 		name: "ND UUBL",
 		speciesFilter: species => [
 			'Aerodactyl-Mega', 'Alakazam', 'Blacephalon', 'Blaziken', 'Diancie-Mega', 'Gallade-Mega', 'Gardevoir-Mega', 'Gengar', 'Gyarados',
-			'Gyarados-Mega', 'Hawlucha', 'Heracross-Mega', 'Hoopa-Unbound', 'Hydreigon', 'Jirachi', 'Latias', 'Latias-Mega', 'Latios', 'Latios-Mega',
-			'Manaphy', 'Medicham-Mega', 'Mew', 'Pinsir-Mega', 'Sableye-Mega', 'Slowbro-Mega', 'Slowking-Galar', 'Thundurus', 'Thundurus-Therian',
-			'Venusaur-Mega', 'Xurkitree', 'Zapdos-Galar',
+			'Gyarados-Mega', 'Hawlucha', 'Heracross-Mega', 'Hoopa-Unbound', 'Hydreigon', 'Jirachi', 'Latias', 'Latias-Mega', 'Latios',
+			'Latios-Mega', 'Manaphy', 'Medicham-Mega', 'Melmetal', 'Mew', 'Pinsir-Mega', 'Sableye-Mega', 'Slowbro-Mega', 'Slowking-Galar',
+			'Thundurus', 'Thundurus-Therian', 'Venusaur-Mega', 'Xurkitree', 'Zapdos-Galar',
 		].includes(species.name),
 	},