diff --git a/play.pokemonshowdown.com/src/battle.ts b/play.pokemonshowdown.com/src/battle.ts index 78b492b68..4df5f184b 100644 --- a/play.pokemonshowdown.com/src/battle.ts +++ b/play.pokemonshowdown.com/src/battle.ts @@ -1527,11 +1527,13 @@ export class Battle { if (!fromeffect.id || callerMoveForPressure || fromeffect.id === 'pursuit') { let moveName = move.name; if (!callerMoveForPressure) { - if (move.isZ) { + const previousLine = this.stepQueue[this.currentStep - 1]; + const zPower = previousLine.startsWith('|-zpower'); + if (move.isZ && zPower) { pokemon.item = move.isZ; let item = Dex.items.get(move.isZ); if (item.zMoveFrom) moveName = item.zMoveFrom; - } else if (move.name.startsWith('Z-')) { + } else if (move.name.startsWith('Z-') && zPower) { moveName = moveName.slice(2); move = Dex.moves.get(moveName); if (window.BattleItems) {