summaryrefslogtreecommitdiff
path: root/home/menu.asm
diff options
context:
space:
mode:
Diffstat (limited to 'home/menu.asm')
-rw-r--r--home/menu.asm21
1 files changed, 12 insertions, 9 deletions
diff --git a/home/menu.asm b/home/menu.asm
index 4395ee34..0bd39595 100644
--- a/home/menu.asm
+++ b/home/menu.asm
@@ -710,14 +710,14 @@ GetMenuDataPointerTableEntry::
ret
ClearWindowData::
- ld hl, wWindowStackPointer
- call .bytefill
+ ld hl, wMenuMetadata
+ call .ClearMenuData
ld hl, wMenuHeader
- call .bytefill
- ld hl, wMenuDataFlags
- call .bytefill
- ld hl, w2DMenuCursorInitY
- call .bytefill
+ call .ClearMenuData
+ ld hl, wMenuData
+ call .ClearMenuData
+ ld hl, wMoreMenuData
+ call .ClearMenuData
xor a
call OpenSRAM
@@ -734,8 +734,11 @@ ClearWindowData::
call CloseSRAM
ret
-.bytefill
- ld bc, $10
+.ClearMenuData:
+ ld bc, wMenuMetadataEnd - wMenuMetadata
+ assert wMenuMetadataEnd - wMenuMetadata == wMenuHeaderEnd - wMenuHeader
+ assert wMenuMetadataEnd - wMenuMetadata == wMenuDataEnd - wMenuData
+ assert wMenuMetadataEnd - wMenuMetadata == wMoreMenuDataEnd - wMoreMenuData
xor a
call ByteFill
ret