diff options
| author | mid-kid <esteve.varela@gmail.com> | 2020-08-18 22:20:16 +0200 |
|---|---|---|
| committer | mid-kid <esteve.varela@gmail.com> | 2020-08-18 22:28:22 +0200 |
| commit | 4ea75afd563ef8304f7bb3f4662e229f156a9e6d (patch) | |
| tree | 143ae2fb8912da0d9229984153e6d84cd9fbb781 | |
| parent | a51c15a7ef24d73ab2f8b1a7e16dcd3b6e30436d (diff) | |
Add wTitleScreenSelectedOption constants
| -rw-r--r-- | engine/menus/intro_menu.asm | 23 |
1 files changed, 16 insertions, 7 deletions
diff --git a/engine/menus/intro_menu.asm b/engine/menus/intro_menu.asm index 0708d9b1..b00f72fb 100644 --- a/engine/menus/intro_menu.asm +++ b/engine/menus/intro_menu.asm @@ -839,6 +839,15 @@ Intro_PlaceChrisSprite: db 10 * 8 + 4, 9 * 8, 2 db 10 * 8 + 4, 10 * 8, 3 + + const_def + const TITLESCREENOPTION_MAIN_MENU + const TITLESCREENOPTION_DELETE_SAVE_DATA + const TITLESCREENOPTION_RESTART + const TITLESCREENOPTION_UNUSED + const TITLESCREENOPTION_RESET_CLOCK +NUM_TITLESCREENOPTIONS EQU const_value + IntroSequence: callfar Copyright_GameFreakPresents jr c, StartTitleScreen @@ -865,7 +874,7 @@ StartTitleScreen: call GetSGBLayout call UpdateTimePals ld a, [wTitleScreenSelectedOption] - cp 5 + cp NUM_TITLESCREENOPTIONS jr c, .ok xor a .ok @@ -986,7 +995,7 @@ TitleScreenMain: ld a, [hl] and D_DOWN + B_BUTTON + SELECT cp D_DOWN + B_BUTTON + SELECT - jr z, .clock_reset + jr z, .reset_clock ; Press Start or A to start the game. ld a, [hl] @@ -995,11 +1004,11 @@ TitleScreenMain: ret .incave - ld a, 0 + ld a, TITLESCREENOPTION_MAIN_MENU jr .done .delete_save_data - ld a, 1 + ld a, TITLESCREENOPTION_DELETE_SAVE_DATA .done ld [wTitleScreenSelectedOption], a @@ -1025,8 +1034,8 @@ TitleScreenMain: inc [hl] ret -.clock_reset - ld a, 4 +.reset_clock + ld a, TITLESCREENOPTION_RESET_CLOCK ld [wTitleScreenSelectedOption], a ; Return to the intro sequence. @@ -1044,7 +1053,7 @@ TitleScreenEnd: and a ret nz - ld a, 2 + ld a, TITLESCREENOPTION_RESTART ld [wTitleScreenSelectedOption], a ; Back to the intro. |