From ead103d2c6d21cd4774e5c32b9c66f9435f7adbb Mon Sep 17 00:00:00 2001 From: Rangi Date: Tue, 23 Jan 2018 16:08:43 -0500 Subject: =?UTF-8?q?MenuDataHeader=20=E2=86=92=20MenuHeader,=20MenuData2=20?= =?UTF-8?q?=E2=86=92=20MenuData=20(might=20complete=20issue=20#440)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- engine/mail.asm | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'engine/mail.asm') diff --git a/engine/mail.asm b/engine/mail.asm index d2649bdc5..b0da3580e 100755 --- a/engine/mail.asm +++ b/engine/mail.asm @@ -313,7 +313,7 @@ IsAnyMonHoldingMail: ; 44781 _PlayerMailBoxMenu: ; 0x447a0 call InitMail jr z, .nomail - call LoadStandardMenuDataHeader + call LoadStandardMenuHeader call MailboxPC jp CloseWindow @@ -388,8 +388,8 @@ MailboxPC: ; 0x44806 ld [wCurMessageIndex], a .loop call InitMail - ld hl, .TopMenuDataHeader - call CopyMenuDataHeader + ld hl, .TopMenuHeader + call CopyMenuHeader xor a ld [hBGMapMode], a call InitScrollingMenu @@ -417,8 +417,8 @@ MailboxPC: ; 0x44806 ; 0x4484a .Submenu: ; 0x4484a - ld hl, .SubMenuDataHeader - call LoadMenuDataHeader + ld hl, .SubMenuHeader + call LoadMenuHeader call VerticalMenu call ExitMenu jr c, .subexit @@ -557,13 +557,13 @@ MailboxPC: ; 0x44806 .Cancel: ret -.TopMenuDataHeader: ; 0x4494c +.TopMenuHeader: ; 0x4494c db MENU_BACKUP_TILES ; flags menu_coords 8, 1, SCREEN_WIDTH - 2, 10 - dw .TopMenuData2 + dw .TopMenuData db 1 ; default option -.TopMenuData2: +.TopMenuData: db SCROLLINGMENU_DISPLAY_ARROWS ; flags db 4, 0 ; rows/columns? db 1 ; horizontal spacing? @@ -572,13 +572,13 @@ MailboxPC: ; 0x44806 dba NULL dba NULL -.SubMenuDataHeader: ; 0x44964 +.SubMenuHeader: ; 0x44964 db MENU_BACKUP_TILES ; flags menu_coords 0, 0, 13, 9 - dw .SubMenuData2 + dw .SubMenuData db 1 ; default option -.SubMenuData2: +.SubMenuData: db STATICMENU_CURSOR ; flags db 4 ; items db "READ MAIL@" -- cgit v1.2.3