From 82c80b1e1170f63deb0e60c3388ee39c28ef067b Mon Sep 17 00:00:00 2001 From: Dean Date: Sun, 9 Mar 2025 23:13:13 -0700 Subject: [PATCH] Fix not passing overrideStatus to canSetStatus --- src/data/moves/move.ts | 2 +- src/field/pokemon.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/data/moves/move.ts b/src/data/moves/move.ts index 68839160540..a3eab32e59d 100644 --- a/src/data/moves/move.ts +++ b/src/data/moves/move.ts @@ -2433,7 +2433,7 @@ export class StatusEffectAttr extends MoveEffectAttr { } return false; } - if (((!pokemon. status || this.overrideStatus) || (pokemon.status.effect === this.effect && moveChance < 0)) + if (((!pokemon.status || this.overrideStatus) || (pokemon.status.effect === this.effect && moveChance < 0)) && pokemon.trySetStatus(this.effect, true, user, this.turnsRemaining, null, this.overrideStatus)) { applyPostAttackAbAttrs(ConfusionOnStatusEffectAbAttr, user, target, move, null, false, this.effect); return true; diff --git a/src/field/pokemon.ts b/src/field/pokemon.ts index 85c49581b70..ab6886b6766 100644 --- a/src/field/pokemon.ts +++ b/src/field/pokemon.ts @@ -5441,7 +5441,7 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { sourceText: string | null = null, overrideStatus?: boolean ): boolean { - if (!this.canSetStatus(effect, asPhase, false, sourcePokemon)) { + if (!this.canSetStatus(effect, asPhase, overrideStatus, sourcePokemon)) { return false; } if (this.isFainted() && effect !== StatusEffect.FAINT) {