From 54a573b8154a4c19d4ce1823747f9d8c2d67af20 Mon Sep 17 00:00:00 2001
From: fish <elitemagikarp@proton.me>
Date: Mon, 16 Mar 2026 03:03:42 -0400
Subject: [PATCH] Fix tooltips for Crystal Free Z-Moves (#2575)

---
 play.pokemonshowdown.com/src/battle.ts | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

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