diff options
| author | yenatch <yenatch@gmail.com> | 2018-02-25 22:39:51 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-25 22:39:51 -0500 |
| commit | 725148443f0ed0f70af747259ef49643359e92a2 (patch) | |
| tree | 5f8ccf80489e0820934d40a732a5ce8d7f65e1e3 /engine/mail.asm | |
| parent | f44f306cfd4b438d0ba2f56b61be4b118ef3274b (diff) | |
| parent | 7453bd1aa8e55a1a9fcce7c69f62106f5e5f6e9c (diff) | |
Merge pull request #476 from Rangi42/master
Resolve some issues; rename some maps; move more tables into data/; warp_def → warp_event (ready to merge)
Diffstat (limited to 'engine/mail.asm')
| -rwxr-xr-x | engine/mail.asm | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/engine/mail.asm b/engine/mail.asm index a8e9bd2c5..b8685c0df 100755 --- a/engine/mail.asm +++ b/engine/mail.asm @@ -310,10 +310,10 @@ IsAnyMonHoldingMail: ; 44781 ret ; 447a0 -_KrisMailBoxMenu: ; 0x447a0 +_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@" |