From c779bd581dd43c5328859c63cd8949c3bf72a229 Mon Sep 17 00:00:00 2001
From: cooshaug <13422106+cooshaug@users.noreply.github.com>
Date: Wed, 17 Sep 2025 23:42:45 +0100
Subject: [PATCH] Hide nicknames in battle tooltip (#2508)

---------

Co-authored-by: Guangcong Luo <guangcongluo@gmail.com>
---
 play.pokemonshowdown.com/src/battle-tooltips.ts | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/play.pokemonshowdown.com/src/battle-tooltips.ts b/play.pokemonshowdown.com/src/battle-tooltips.ts
index e29c63cf6..78bcbb881 100644
--- a/play.pokemonshowdown.com/src/battle-tooltips.ts
+++ b/play.pokemonshowdown.com/src/battle-tooltips.ts
@@ -830,8 +830,10 @@ export class BattleTooltips {
 			genderBuf = ` <img src="${Dex.fxPrefix}gender-${gender.toLowerCase()}.png" alt="${gender}" width="7" height="10" class="pixelated" /> `;
 		}
 
-		let name = BattleLog.escapeHTML(pokemon.name);
-		if (pokemon.speciesForme !== pokemon.name) {
+		const ignoreNicks = this.battle.ignoreNicks || this.battle.ignoreOpponent;
+		const nickname = ignoreNicks ? Dex.species.get(pokemon.speciesForme).baseSpecies : pokemon.name;
+		let name = BattleLog.escapeHTML(nickname);
+		if (pokemon.speciesForme !== nickname) {
 			name += ` <small>(${BattleLog.escapeHTML(pokemon.speciesForme)})</small>`;
 		}