random-mirrors
/
pokerogue
mirror of https://github.com/pagefaultgames/pokerogue.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[P2] Removed incorrect calls to `resetBattleData` on switchout (#4828)

This commit is contained in:
innerthunder 2024-11-09 10:13:12 -08:00 committed by GitHub
parent c54d21c313
commit 329e43ad48
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/field/pokemon.ts
View File

@ -4029,8 +4029,7 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
this.resetTurnData(); this.resetTurnData();
if (clearEffects) { if (clearEffects) {
this.destroySubstitute(); this.destroySubstitute();
this.resetSummonData(); this.resetSummonData(); // this also calls `resetBattleSummonData`
this.resetBattleData();
} }
if (hideInfo) { if (hideInfo) {
this.hideInfo(); this.hideInfo();

1
src/phases/switch-summon-phase.ts
View File

@ -138,7 +138,6 @@ export class SwitchSummonPhase extends SummonPhase {
switchedInPokemon.setAlpha(0.5); switchedInPokemon.setAlpha(0.5);
} }
} else { } else {
switchedInPokemon.resetBattleData();
switchedInPokemon.resetSummonData(); switchedInPokemon.resetSummonData();
} }
this.summon(); this.summon();