From 9afacc7842a733770ec73893bb6c14d434c828e7 Mon Sep 17 00:00:00 2001 From: Rangi Date: Sun, 20 May 2018 17:50:53 -0400 Subject: [PATCH] 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) --- engine/items/pack.asm | 6 +++--- gfx/pack/pack_menu.png | Bin 360 -> 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 52e2bcdd5e2a6b03b05597adee0994cb9cb7d6fa..aa693cc40be5c0907ea9fa844d889547db236657 100644 GIT binary patch literal 356 zcmV-q0h|7bP);&)}Epw*NEudVCEI>%n$hti_ zD5Ihlz(N2-zjcs=7*i>khQ#9VfqTJHv6gL9$gb7x13Uw6A_Ou<4vAsW;vO1_z5%rl z+=LmpIwY(8Ghm6by*ns7>_sS=Ba$Wm3P{zyWV9+v6FfqXIJ0$H3pvkX+>v;ii0k#hBiwNvQJfB!{0^IG?D9GYrqG( zna<|EU%*BCp2dEDVK(9)2cvbRWKj;fbCavr_4JZ--0000K77W2H>>(ZPcCcLtL~a7NGGO*5P)4%7cC-m5w;VDcus_c{ z`46Mi0CeLB3~<0#PzvRwETDpGL7joqSOQCA4aY0g>fRKP>d^)UFusD;>;ybV%be)} z7b6RV6pgH@gHcfnSO_5c2Xu_7gr+{RbbPF#vZ2Cp7Xe;ja5Ev0F@nUf7>IUI3ru1? z*N#-d5@ow|sAWXaHj)}h+2Z-g-Fox_``zIO(7u7b?Vz^9orZn~wXWA(>j{@j1GoEG z$NeSay@B&x_LBdMxYx?gygt8{w;fCj@CzjE3uy8O-~wAm8NqR+grbD9$1jWKc_z1i z9>52h%z80<=LLf8*XtRXO9$!w^VJdg-43A~j-mhc$LkYuv#so&#FD}Q0000