diff options
Diffstat (limited to 'src/battle_util.c')
| -rw-r--r-- | src/battle_util.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/battle_util.c b/src/battle_util.c index 251a545c9..4c9ef75d9 100644 --- a/src/battle_util.c +++ b/src/battle_util.c @@ -1192,7 +1192,7 @@ bool8 HandleWishPerishSongOnTurnEnd(void) // fall through case 2: if ((gBattleTypeFlags & BATTLE_TYPE_ARENA) - && gBattleStruct->field_DA == 2 + && gBattleStruct->arenaTurnCounter == 2 && gBattleMons[0].hp != 0 && gBattleMons[1].hp != 0) { s32 i; @@ -1238,7 +1238,7 @@ bool8 HandleFaintedMonActions(void) { gBattlerFainted = gBattlerTarget = gBattleStruct->faintedActionsBattlerId; if (gBattleMons[gBattleStruct->faintedActionsBattlerId].hp == 0 - && !(gBattleStruct->field_DF & gBitTable[gBattlerPartyIndexes[gBattleStruct->faintedActionsBattlerId]]) + && !(gBattleStruct->givenExpMons & gBitTable[gBattlerPartyIndexes[gBattleStruct->faintedActionsBattlerId]]) && !(gAbsentBattlerFlags & gBitTable[gBattleStruct->faintedActionsBattlerId])) { BattleScriptExecute(BattleScript_GiveExp); |