diff options
| author | Rangi <remy.oukaour+rangi42@gmail.com> | 2018-04-05 11:44:02 -0400 |
|---|---|---|
| committer | Rangi <remy.oukaour+rangi42@gmail.com> | 2018-04-05 11:44:02 -0400 |
| commit | 7307fc8dce605823fbdf8e5ec8530d7aaf675cfa (patch) | |
| tree | 63a1d741812989026ac3a22806f7677525c3512c /engine/battle/link_result.asm | |
| parent | 99df17d57173cb82abc668714727c5dada6aac73 (diff) | |
Use constants for bit/set/res more
Diffstat (limited to 'engine/battle/link_result.asm')
| -rw-r--r-- | engine/battle/link_result.asm | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/engine/battle/link_result.asm b/engine/battle/link_result.asm index 8f456da9b..1dbc40aa9 100644 --- a/engine/battle/link_result.asm +++ b/engine/battle/link_result.asm @@ -41,20 +41,20 @@ DetermineLinkBattleResult: ; 2b930 .victory ld a, [wBattleResult] and $f0 - ld [wBattleResult], a + ld [wBattleResult], a ; WIN ret .defeat ld a, [wBattleResult] and $f0 - add $1 + add LOSE ld [wBattleResult], a ret .drawn ld a, [wBattleResult] and $f0 - add $2 + add DRAW ld [wBattleResult], a ret @@ -123,16 +123,16 @@ DetermineLinkBattleResult: ; 2b930 jr nz, .finish ; we have a pokemon that's neither fainted nor at full health ld hl, wOTPartyMon1HP call .CheckFaintedOrFullHealth - ld e, $1 + ld e, $1 ; victory ret .finish ld hl, wOTPartyMon1HP call .CheckFaintedOrFullHealth - ld e, $0 + ld e, $0 ; drawn ret nz ; we both have pokemon that are neither fainted nor at full health - ld e, $2 - ld a, $1 + ld e, $2 ; defeat + ld a, $1 ; not drawn and a ret |