From 174c2c2cb62eb0478ba4e4bda7d597556380871b Mon Sep 17 00:00:00 2001 From: Temps Ray Date: Sat, 11 May 2024 23:50:02 -0400 Subject: [PATCH] Some cleanup --- src/data/ability.ts | 2 +- src/phases.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/data/ability.ts b/src/data/ability.ts index d8180eb2c5a..76b451bb736 100644 --- a/src/data/ability.ts +++ b/src/data/ability.ts @@ -2281,7 +2281,7 @@ export class PostFaintHPDamageAbAttr extends PostFaintAbAttr { } applyPostFaint(pokemon: Pokemon, passive: boolean, attacker: Pokemon, move: PokemonMove, hitResult: HitResult, args: any[]): boolean { - let damage = args[0]; + const damage = pokemon.turnData.attacksReceived[0].damage; attacker.damageAndUpdate((damage), HitResult.OTHER); attacker.turnData.damageTaken += damage; return true; diff --git a/src/phases.ts b/src/phases.ts index 3aad11de596..fc6af354a2d 100644 --- a/src/phases.ts +++ b/src/phases.ts @@ -3135,7 +3135,7 @@ export class FaintPhase extends PokemonPhase { if (pokemon.turnData?.attacksReceived?.length) { const lastAttack = pokemon.turnData.attacksReceived[0]; - applyPostFaintAbAttrs(PostFaintAbAttr, pokemon, this.scene.getPokemonById(lastAttack.sourceId), new PokemonMove(lastAttack.move), lastAttack.result, lastAttack.damage); + applyPostFaintAbAttrs(PostFaintAbAttr, pokemon, this.scene.getPokemonById(lastAttack.sourceId), new PokemonMove(lastAttack.move), lastAttack.result); } const alivePlayField = this.scene.getField(true);