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/main_menu.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/main_menu.asm')
| -rwxr-xr-x | engine/main_menu.asm | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/engine/main_menu.asm b/engine/main_menu.asm index 9d3d8cbdb..d83ce873b 100755 --- a/engine/main_menu.asm +++ b/engine/main_menu.asm @@ -10,12 +10,12 @@ MainMenu: ; 49cdc call GetSGBLayout call SetPalettes ld hl, wGameTimerPause - res 0, [hl] + res GAMETIMERPAUSE_TIMER_PAUSED_F, [hl] call MainMenu_GetWhichMenu ld [wWhichIndexSet], a call MainMenu_PrintCurrentTimeAndDay - ld hl, .MenuDataHeader - call LoadMenuDataHeader + ld hl, .MenuHeader + call LoadMenuHeader call MainMenuJoypadLoop call CloseWindow jr c, .quit @@ -29,14 +29,14 @@ MainMenu: ; 49cdc ret ; 49d14 -.MenuDataHeader: ; 49d14 +.MenuHeader: ; 49d14 db MENU_BACKUP_TILES ; flags menu_coords 0, 0, 16, 7 - dw .MenuData2 + dw .MenuData db 1 ; default option ; 49d1c -.MenuData2: ; 49d1c +.MenuData: ; 49d1c db STATICMENU_CURSOR ; flags db 0 ; items dw MainMenuItems @@ -166,8 +166,9 @@ MainMenu_GetWhichMenu: ; 49da4 cp -1 call CloseSRAM jr nz, .mystery_gift + ; This check makes no difference. ld a, [wStatusFlags] - bit 7, a + bit STATUSFLAGS_MAIN_MENU_MOBILE_CHOICES_F, a ld a, $1 ; Continue jr z, .ok jr .ok @@ -180,8 +181,9 @@ MainMenu_GetWhichMenu: ; 49da4 ret .mystery_gift + ; This check makes no difference. ld a, [wStatusFlags] - bit 7, a + bit STATUSFLAGS_MAIN_MENU_MOBILE_CHOICES_F, a jr z, .ok3 jr .ok3 |