diff options
| author | yenatch <yenatch@gmail.com> | 2018-06-04 00:47:16 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-06-04 00:47:16 -0400 |
| commit | d596a0c83bfbb97bff5cdb5b3bba925d3f798fa1 (patch) | |
| tree | 5bc4cbdd09186fbdf2f7e2294fdde443ff8900bd /engine/items | |
| parent | 53bcd8f46ca4f78381af70f55d03f3180be277de (diff) | |
| parent | c7bb2d15cfb32a5e965933b90e0acb497c7bf7b2 (diff) | |
Merge pull request #514 from Rangi42/master
[Ready to merge] Named constants for sprite movement data bit flags + other minor fixes
Diffstat (limited to 'engine/items')
| -rw-r--r-- | engine/items/pack.asm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/engine/items/pack.asm b/engine/items/pack.asm index ea3a051ac..9f0e82f66 100644 --- a/engine/items/pack.asm +++ b/engine/items/pack.asm @@ -571,11 +571,11 @@ RegisterItem: ; 103c2 ld a, [wCurrPocket] rrca rrca - and $c0 + and REGISTERED_POCKET ld b, a ld a, [wCurItemQuantity] inc a - and $3f + and REGISTERED_NUMBER or b ld [wWhichRegisteredItem], a ld a, [wCurItem] @@ -1283,7 +1283,7 @@ DrawPackGFX: ; 1089d ld a, [wCurrPocket] maskbits NUM_POCKETS ld e, a - ld d, $0 + ld d, 0 ld a, [wBattleType] cp BATTLETYPE_TUTORIAL jr z, .male_dude |