diff options
| author | Rangi <35663410+Rangi42@users.noreply.github.com> | 2020-08-18 16:35:16 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-18 16:35:16 -0400 |
| commit | 34ad9498ea399405ddc68aea91af9dd64319417c (patch) | |
| tree | dc841f7adaaab2cdf88c0c0d6b81535c3b6ee0c0 /engine/menus/intro_menu.asm | |
| parent | 5882c99f9d2581d0378a65c4559ae2ae6e0bc137 (diff) | |
| parent | 4ea75afd563ef8304f7bb3f4662e229f156a9e6d (diff) | |
Merge pull request #60 from mid-kid/master
Rub a dub dub, thanks for the grub
Diffstat (limited to 'engine/menus/intro_menu.asm')
| -rw-r--r-- | engine/menus/intro_menu.asm | 31 |
1 files changed, 20 insertions, 11 deletions
diff --git a/engine/menus/intro_menu.asm b/engine/menus/intro_menu.asm index 3fdc42cd..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 @@ -864,8 +873,8 @@ StartTitleScreen: ld b, SCGB_DIPLOMA call GetSGBLayout call UpdateTimePals - ld a, [wIntroSceneFrameCounter] - cp $5 + ld a, [wTitleScreenSelectedOption] + 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,14 +1004,14 @@ 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 [wIntroSceneFrameCounter], a + ld [wTitleScreenSelectedOption], a ; Return to the intro sequence. ld hl, wJumptableIndex @@ -1025,9 +1034,9 @@ TitleScreenMain: inc [hl] ret -.clock_reset - ld a, 4 - ld [wIntroSceneFrameCounter], a +.reset_clock + ld a, TITLESCREENOPTION_RESET_CLOCK + ld [wTitleScreenSelectedOption], a ; Return to the intro sequence. ld hl, wJumptableIndex @@ -1044,8 +1053,8 @@ TitleScreenEnd: and a ret nz - ld a, 2 - ld [wIntroSceneFrameCounter], a + ld a, TITLESCREENOPTION_RESTART + ld [wTitleScreenSelectedOption], a ; Back to the intro. ld hl, wJumptableIndex |