From 1ad76ff3d23d75dc8b678ff10569bab1fc06c9b3 Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Sun, 26 Jul 2020 12:32:02 +0200 Subject: [PATCH] Fix Aftermath on fainted --- src/battle_util.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/battle_util.c b/src/battle_util.c index 6185eff91..c4c0f2328 100644 --- a/src/battle_util.c +++ b/src/battle_util.c @@ -3730,6 +3730,7 @@ u8 AbilityBattleEffects(u8 caseID, u8 battler, u8 ability, u8 special, u16 moveA if (!IsAbilityOnField(ABILITY_DAMP) && !(gMoveResultFlags & MOVE_RESULT_NO_EFFECT) && gBattleMons[gBattlerTarget].hp == 0 + && IsBattlerAlive(gBattlerAttacker) && IsMoveMakingContact(move, gBattlerAttacker)) { gBattleMoveDamage = gBattleMons[gBattlerAttacker].maxHP / 4; @@ -3742,7 +3743,8 @@ u8 AbilityBattleEffects(u8 caseID, u8 battler, u8 ability, u8 special, u16 moveA break; case ABILITY_INNARDS_OUT: if (!(gMoveResultFlags & MOVE_RESULT_NO_EFFECT) - && gBattleMons[gBattlerTarget].hp == 0) + && gBattleMons[gBattlerTarget].hp == 0 + && IsBattlerAlive(gBattlerAttacker)) { gBattleMoveDamage = gSpecialStatuses[gBattlerTarget].dmg; BattleScriptPushCursor();