diff --git a/src/battle-phases.ts b/src/battle-phases.ts index f7def75bd..8878f6fad 100644 --- a/src/battle-phases.ts +++ b/src/battle-phases.ts @@ -879,6 +879,13 @@ export abstract class MovePhase extends BattlePhase { console.log(Moves[this.move.moveId]); + if (!this.canMove()) { + if (this.move.isDisabled()) + this.scene.queueMessage(`${this.move.getName()} is disabled!`); + this.end(); + return; + } + const target = this.pokemon.getOpponent(); if (!this.followUp && this.canMove()) @@ -915,13 +922,6 @@ export abstract class MovePhase extends BattlePhase { this.end(); }; - if (!this.canMove()) { - if (this.move.isDisabled()) - this.scene.queueMessage(`${this.move.getName()} is disabled!`); - this.end(); - return; - } - if (!this.followUp && this.pokemon.status && !this.pokemon.status.isPostTurn()) { this.pokemon.status.incrementTurn(); let activated = false;