From 329e43ad48519486125a54e534b7b6e01d4cac05 Mon Sep 17 00:00:00 2001 From: innerthunder <168692175+innerthunder@users.noreply.github.com> Date: Sat, 9 Nov 2024 10:13:12 -0800 Subject: [PATCH] [P2] Removed incorrect calls to `resetBattleData` on switchout (#4828) --- src/field/pokemon.ts | 3 +-- src/phases/switch-summon-phase.ts | 1 - 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/src/field/pokemon.ts b/src/field/pokemon.ts index e0b7bf1094f..5478a6e5aaa 100644 --- a/src/field/pokemon.ts +++ b/src/field/pokemon.ts @@ -4029,8 +4029,7 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { this.resetTurnData(); if (clearEffects) { this.destroySubstitute(); - this.resetSummonData(); - this.resetBattleData(); + this.resetSummonData(); // this also calls `resetBattleSummonData` } if (hideInfo) { this.hideInfo(); diff --git a/src/phases/switch-summon-phase.ts b/src/phases/switch-summon-phase.ts index 36db8b7a7e7..51d54315165 100644 --- a/src/phases/switch-summon-phase.ts +++ b/src/phases/switch-summon-phase.ts @@ -138,7 +138,6 @@ export class SwitchSummonPhase extends SummonPhase { switchedInPokemon.setAlpha(0.5); } } else { - switchedInPokemon.resetBattleData(); switchedInPokemon.resetSummonData(); } this.summon();