summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRangi <remy.oukaour+rangi42@gmail.com>2018-05-20 17:50:53 -0400
committerRangi <remy.oukaour+rangi42@gmail.com>2018-05-20 17:50:53 -0400
commit9afacc7842a733770ec73893bb6c14d434c828e7 (patch)
tree6b7f5f74ba3f0d381a5ff7377b866bb52c7c45b8
parent03570a514e0bd4c64205b904b528b00d888a6d7f (diff)
Use REGISTERED_* constants
128px wide pack_menu.png matches BGB VRAM viewer, and rows+cols match hex tile IDs (e.g. $24 = row 3 col 5)
-rw-r--r--engine/items/pack.asm6
-rw-r--r--gfx/pack/pack_menu.pngbin360 -> 356 bytes
2 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
diff --git a/gfx/pack/pack_menu.png b/gfx/pack/pack_menu.png
index 52e2bcdd5..aa693cc40 100644
--- a/gfx/pack/pack_menu.png
+++ b/gfx/pack/pack_menu.png
Binary files differ