Fix tooltips getting cleared when using switch moves

smogon · May 21, 2024 · 07ad30a · 07ad30a
1 parent bc98615
commit 07ad30a
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/play.pokemonshowdown.com/src/battle.ts b/play.pokemonshowdown.com/src/battle.ts
@@ -835,6 +835,7 @@ export class Side {
 		const effect = Dex.getEffect(kwArgs.from);
 		if (['batonpass', 'zbatonpass', 'shedtail'].includes(effect.id)) {
 			pokemon.copyVolatileFrom(this.lastPokemon!, effect.id === 'shedtail' ? 'shedtail' : false);
+			this.lastPokemon = null;
 		}
 
 		this.battle.scene.animSummon(pokemon, slot);
@@ -901,7 +902,11 @@ export class Side {
 		}
 		pokemon.statusData.toxicTurns = 0;
 		if (this.battle.gen === 5) pokemon.statusData.sleepTurns = 0;
-		this.lastPokemon = pokemon;
+		if (effect.id && !['batonpass', 'zbatonpass', 'shedtail'].includes(effect.id)) {
+			this.lastPokemon = null;
+		} else {
+			this.lastPokemon = pokemon;
+		}
 		this.active[slot] = null;
 
 		this.battle.scene.animUnsummon(pokemon);