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/items/item_effects.asm | |
| parent | 99df17d57173cb82abc668714727c5dada6aac73 (diff) | |
Use constants for bit/set/res more
Diffstat (limited to 'engine/items/item_effects.asm')
| -rw-r--r-- | engine/items/item_effects.asm | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/engine/items/item_effects.asm b/engine/items/item_effects.asm index 0b5285608..597a75e47 100644 --- a/engine/items/item_effects.asm +++ b/engine/items/item_effects.asm @@ -537,7 +537,7 @@ PokeBallEffect: ; e8a2 cp BATTLETYPE_CELEBI jr nz, .not_celebi ld hl, wBattleResult - set 6, [hl] + set BATTLERESULT_CAUGHT_CELEBI, [hl] .not_celebi ld a, [wPartyCount] @@ -615,7 +615,7 @@ PokeBallEffect: ; e8a2 cp MONS_PER_BOX jr nz, .BoxNotFullYet ld hl, wBattleResult - set 7, [hl] + set BATTLERESULT_BOX_FULL, [hl] .BoxNotFullYet: ld a, [wCurItem] cp FRIEND_BALL @@ -2196,8 +2196,8 @@ PokeDollEffect: ; f48f inc a ld [wForcedSwitch], a ld a, [wBattleResult] - and $c0 - or $2 + and BATTLERESULT_BITMASK + or DRAW ld [wBattleResult], a jp UseItemText |