diff --git a/src/field/pokemon.ts b/src/field/pokemon.ts index 0a13be36c58..ac3b6cacd38 100644 --- a/src/field/pokemon.ts +++ b/src/field/pokemon.ts @@ -1538,9 +1538,10 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { * @returns The type damage multiplier, indicating the effectiveness of the move */ getMoveEffectiveness(source: Pokemon, move: Move, ignoreAbility: boolean = false, simulated: boolean = true, cancelled?: Utils.BooleanHolder): TypeDamageMultiplier { - if (this.turnData.moveEffectiveness !== null) { + if (!Utils.isNullOrUndefined(this.turnData.moveEffectiveness)) { return this.turnData.moveEffectiveness; } + if (move.hasAttr(TypelessAttr)) { return 1; }