From 31382eb72f44e3f08d3b434d351db89897db9834 Mon Sep 17 00:00:00 2001 From: Sirz Benjie <142067137+SirzBenjie@users.noreply.github.com> Date: Fri, 28 Mar 2025 21:50:05 -0500 Subject: [PATCH] Fix call to getAttackDamage that was reset after merge --- src/field/pokemon.ts | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/field/pokemon.ts b/src/field/pokemon.ts index 56d1d061799..51a5a10b010 100644 --- a/src/field/pokemon.ts +++ b/src/field/pokemon.ts @@ -4133,7 +4133,7 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { ignoreAbility, ignoreSourceAbility, ignoreAllyAbility, - ignoreSourceAbility, + ignoreSourceAllyAbility, isCritical, simulated, ); @@ -4459,7 +4459,7 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { cancelled, result, damage: dmg, - } = this.getAttackDamage(source, move, false, false, isCritical, false); + } = this.getAttackDamage(source, move, false, false, false, false, isCritical, false); const typeBoost = source.findTag( t => @@ -7147,7 +7147,6 @@ export class EnemyPokemon extends Pokemon { !p.getAlly()?.battleData.abilityRevealed, false, isCritical, - true ).damage >= p.hp ); })