ClearWindowData clears four menu data buffers, each the same size

This commit is contained in:
Rangi 2022-01-22 21:43:09 -05:00
parent 20dc31115e
commit ce16317f33
2 changed files with 16 additions and 11 deletions

View File

@ -754,14 +754,14 @@ GetMenuDataPointerTableEntry::
ret ret
ClearWindowData:: ClearWindowData::
ld hl, wWindowStackPointer ld hl, wMenuMetadata
call .bytefill call .ClearMenuData
ld hl, wMenuHeader ld hl, wMenuHeader
call .bytefill call .ClearMenuData
ld hl, wMenuDataFlags ld hl, wMenuData
call .bytefill call .ClearMenuData
ld hl, w2DMenuCursorInitY ld hl, wMoreMenuData
call .bytefill call .ClearMenuData
ldh a, [rSVBK] ldh a, [rSVBK]
push af push af
@ -781,8 +781,11 @@ ClearWindowData::
ldh [rSVBK], a ldh [rSVBK], a
ret ret
.bytefill .ClearMenuData:
ld bc, $10 ld bc, wMenuMetadataEnd - wMenuMetadata
assert wMenuMetadataEnd - wMenuMetadata == wMenuHeaderEnd - wMenuHeader
assert wMenuMetadataEnd - wMenuMetadata == wMenuDataEnd - wMenuData
assert wMenuMetadataEnd - wMenuMetadata == wMoreMenuDataEnd - wMoreMenuData
xor a xor a
call ByteFill call ByteFill
ret ret

View File

@ -1630,6 +1630,7 @@ wRequested1bppSize:: db
wRequested1bppSource:: dw wRequested1bppSource:: dw
wRequested1bppDest:: dw wRequested1bppDest:: dw
wMenuMetadata::
wWindowStackPointer:: dw wWindowStackPointer:: dw
wMenuJoypad:: db wMenuJoypad:: db
wMenuSelection:: db wMenuSelection:: db
@ -1637,8 +1638,8 @@ wMenuSelectionQuantity:: db
wWhichIndexSet:: db wWhichIndexSet:: db
wScrollingMenuCursorPosition:: db wScrollingMenuCursorPosition:: db
wWindowStackSize:: db wWindowStackSize:: db
ds 8 ds 8
wMenuMetadataEnd::
; menu header ; menu header
wMenuHeader:: wMenuHeader::
@ -1686,6 +1687,7 @@ wMenuData_ScrollingMenuFunction3:: ds 3
ENDU ENDU
wMenuDataEnd:: wMenuDataEnd::
wMoreMenuData::
w2DMenuData:: w2DMenuData::
w2DMenuCursorInitY:: db w2DMenuCursorInitY:: db
w2DMenuCursorInitX:: db w2DMenuCursorInitX:: db
@ -1710,8 +1712,8 @@ wMenuCursorY:: db
wMenuCursorX:: db wMenuCursorX:: db
wCursorOffCharacter:: db wCursorOffCharacter:: db
wCursorCurrentTile:: dw wCursorCurrentTile:: dw
ds 3 ds 3
wMoreMenuDataEnd::
wOverworldDelay:: db wOverworldDelay:: db
wTextDelayFrames:: db wTextDelayFrames:: db