summaryrefslogtreecommitdiff
path: root/engine/items/pack.asm
diff options
context:
space:
mode:
authormid-kid <esteve.varela@gmail.com>2018-06-04 11:05:53 +0200
committermid-kid <esteve.varela@gmail.com>2018-06-04 11:05:53 +0200
commit5e9c785b3f5c4638e61a0e58a11b79566a054636 (patch)
tree681ea4c043ed2c4d001ced844303151e66e3dcbf /engine/items/pack.asm
parent17087489c6b2466b1d4b2d22d7760604d3e755f8 (diff)
parentd596a0c83bfbb97bff5cdb5b3bba925d3f798fa1 (diff)
Merge branch 'master' of https://github.com/pret/pokecrystal
Diffstat (limited to 'engine/items/pack.asm')
-rw-r--r--engine/items/pack.asm6
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