ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2025-02-09 23:03:01 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix Aftermath on fainted

Browse Source
This commit is contained in:
DizzyEggg 2020-07-26 12:32:02 +02:00
parent 14daa9f4a5
commit 1ad76ff3d2
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/battle_util.c
View File

@ -3730,6 +3730,7 @@ u8 AbilityBattleEffects(u8 caseID, u8 battler, u8 ability, u8 special, u16 moveA
if (!IsAbilityOnField(ABILITY_DAMP) if (!IsAbilityOnField(ABILITY_DAMP)
&& !(gMoveResultFlags & MOVE_RESULT_NO_EFFECT) && !(gMoveResultFlags & MOVE_RESULT_NO_EFFECT)
&& gBattleMons[gBattlerTarget].hp == 0 && gBattleMons[gBattlerTarget].hp == 0
&& IsBattlerAlive(gBattlerAttacker)
&& IsMoveMakingContact(move, gBattlerAttacker)) && IsMoveMakingContact(move, gBattlerAttacker))
{ {
gBattleMoveDamage = gBattleMons[gBattlerAttacker].maxHP / 4; gBattleMoveDamage = gBattleMons[gBattlerAttacker].maxHP / 4;
@ -3742,7 +3743,8 @@ u8 AbilityBattleEffects(u8 caseID, u8 battler, u8 ability, u8 special, u16 moveA
break; break;
case ABILITY_INNARDS_OUT: case ABILITY_INNARDS_OUT:
if (!(gMoveResultFlags & MOVE_RESULT_NO_EFFECT) if (!(gMoveResultFlags & MOVE_RESULT_NO_EFFECT)
&& gBattleMons[gBattlerTarget].hp == 0) && gBattleMons[gBattlerTarget].hp == 0
&& IsBattlerAlive(gBattlerAttacker))
{ {
gBattleMoveDamage = gSpecialStatuses[gBattlerTarget].dmg; gBattleMoveDamage = gSpecialStatuses[gBattlerTarget].dmg;
BattleScriptPushCursor(); BattleScriptPushCursor();