diff options
author | Rangi <remy.oukaour+rangi42@gmail.com> | 2018-09-16 13:42:17 -0400 |
---|---|---|
committer | Rangi <remy.oukaour+rangi42@gmail.com> | 2018-09-16 13:42:17 -0400 |
commit | 60b09f291d22f72838e29c91cd62ff0d041e2332 (patch) | |
tree | b578baa0ab406855304ce3a8a6a2bd737fbc1fc4 /engine/battle/core.asm | |
parent | 03cb8c53f1507091f09a17235416904d5ed29a49 (diff) | |
parent | 15648960606da9b1e64c2171c5398d6a5f734b4f (diff) |
Merge branch 'master' of https://github.com/pret/pokecrystal
Diffstat (limited to 'engine/battle/core.asm')
-rw-r--r-- | engine/battle/core.asm | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/engine/battle/core.asm b/engine/battle/core.asm index 9ac99c587..6f76b6c5c 100644 --- a/engine/battle/core.asm +++ b/engine/battle/core.asm @@ -2371,8 +2371,8 @@ WinTrainerBattle: jr nz, .skip_heal predef HealParty .skip_heal - ld a, [wMonStatusFlags] - bit 0, a + ld a, [wDebugFlags] + bit DEBUG_BATTLE_F, a jr nz, .skip_win_loss_text call PrintWinLossText @@ -2921,8 +2921,8 @@ LostBattle: ld c, 40 call DelayFrames - ld a, [wMonStatusFlags] - bit 0, a + ld a, [wDebugFlags] + bit DEBUG_BATTLE_F, a jr nz, .skip_win_loss_text call PrintWinLossText .skip_win_loss_text |