diff options
| author | Rangi <35663410+Rangi42@users.noreply.github.com> | 2020-08-18 16:35:15 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-18 16:35:15 -0400 |
| commit | 0b31d12daceb9f431387951ee275e6147285cffd (patch) | |
| tree | b91ae6167e4afa49cb70b1a163a6344f7e924a2c /engine/menus/intro_menu.asm | |
| parent | b577e4e179711e96f8e059b42c7115e7103a4a69 (diff) | |
| parent | 315d6c665ea0ee4e103f6d8b9dbfb531659ae381 (diff) | |
Merge pull request #756 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 | 33 |
1 files changed, 21 insertions, 12 deletions
diff --git a/engine/menus/intro_menu.asm b/engine/menus/intro_menu.asm index 31809be46..754a5ac86 100644 --- a/engine/menus/intro_menu.asm +++ b/engine/menus/intro_menu.asm @@ -959,6 +959,15 @@ Intro_PlacePlayerSprite: 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 @@ -969,7 +978,7 @@ IntroSequence: StartTitleScreen: ldh a, [rSVBK] push af - ld a, BANK(wBGPals1) + ld a, BANK(wLYOverrides) ldh [rSVBK], a call .TitleScreen @@ -999,8 +1008,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 @@ -1183,7 +1192,7 @@ TitleScreenMain: ld a, [hl] and D_LEFT + D_UP cp D_LEFT + D_UP - jr z, .clock_reset + jr z, .reset_clock ; Press Start or A to start the game. .check_start @@ -1193,14 +1202,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 @@ -1223,9 +1232,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 @@ -1242,8 +1251,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 |