diff --git a/src/phases.ts b/src/phases.ts index 7e2d8058aef..a38fff8b077 100644 --- a/src/phases.ts +++ b/src/phases.ts @@ -4468,6 +4468,10 @@ export class SwitchPhase extends BattlePhase { return super.end(); } + // Skip if the fainted party member has been revived already + if (this.isModal && !this.scene.getParty()[this.fieldIndex].isFainted()) + return super.end(); + // Check if there is any space still in field if (this.isModal && this.scene.getPlayerField().filter(p => p.isAllowedInBattle() && p.isActive(true)).length >= this.scene.currentBattle.getBattlerCount()) { return super.end();