Identify scrolling menu lists in WRAM

Fixes #809
This commit is contained in:
Rangi
2021-03-08 09:41:55 -05:00
parent 9c17fb14c8
commit c1c609ec4a
6 changed files with 20 additions and 18 deletions

View File

@@ -101,9 +101,10 @@ LoadMartPointer:
ld [wMartPointer], a
ld a, d
ld [wMartPointer + 1], a
ld hl, wCurMart
ld hl, wCurMartCount
assert wCurMartCount + 1 == wCurMartItems
xor a
ld bc, wCurMartEnd - wCurMart
ld bc, 16
call ByteFill
xor a ; STANDARDMART_HOWMAYIHELPYOU
ld [wMartJumptableIndex], a
@@ -219,7 +220,7 @@ FarReadMart:
ld a, [hli]
ld h, [hl]
ld l, a
ld de, wCurMart
ld de, wCurMartCount
.CopyMart:
ld a, [wMartPointerBank]
call GetFarByte
@@ -229,7 +230,7 @@ FarReadMart:
cp -1
jr nz, .CopyMart
ld hl, wMartItem1BCD
ld de, wCurMart + 1
ld de, wCurMartItems
.ReadMartItem:
ld a, [de]
inc de
@@ -297,9 +298,9 @@ ReadMart:
; set hl to the first item
inc hl
ld bc, wMartItem1BCD
ld de, wCurMart + 1
ld de, wCurMartItems
.loop
; copy the item to wCurMart + (ItemIndex)
; copy the items to wCurMartItems
ld a, [hli]
ld [de], a
inc de
@@ -328,7 +329,7 @@ ReadMart:
.done
pop hl
ld a, [hl]
ld [wCurMart], a
ld [wCurMartCount], a
ret
INCLUDE "data/items/bargain_shop.asm"
@@ -599,7 +600,7 @@ MenuHeader_Buy:
db SCROLLINGMENU_DISPLAY_ARROWS | SCROLLINGMENU_ENABLE_FUNCTION3 ; flags
db 4, 8 ; rows, columns
db SCROLLINGMENU_ITEMS_NORMAL ; item format
dbw 0, wCurMart
dbw 0, wCurMartCount
dba PlaceMenuItemName
dba .PrintBCDPrices
dba UpdateItemDescription