diff options
| author | yenatch <yenatch@gmail.com> | 2018-04-09 21:30:24 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-09 21:30:24 -0400 |
| commit | 40b537d45b4b8937038126f7e5d2d21ccee460c0 (patch) | |
| tree | 881a090b80b2c22985fc6d1231b03c6721a83462 /engine/items | |
| parent | e4b41fad4fd3787ca2e61adb5377ba8f68fca7ef (diff) | |
| parent | 53ff57ca663dc5bf9c3731022b0eb0dc73f2207f (diff) | |
Merge pull request #503 from Rangi42/master
Factor wMisc into meaningful parts; move most code out of home.asm
Diffstat (limited to 'engine/items')
| -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 |