From 58b45443e8fa22d027d14e6c991da9ee4c30d3f3 Mon Sep 17 00:00:00 2001 From: mid-kid Date: Mon, 3 Aug 2020 22:55:50 +0200 Subject: Minor title screen fixes --- engine/menus/intro_menu.asm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'engine/menus/intro_menu.asm') diff --git a/engine/menus/intro_menu.asm b/engine/menus/intro_menu.asm index 31809be46..be0e3a188 100644 --- a/engine/menus/intro_menu.asm +++ b/engine/menus/intro_menu.asm @@ -969,7 +969,7 @@ IntroSequence: StartTitleScreen: ldh a, [rSVBK] push af - ld a, BANK(wBGPals1) + ld a, BANK(wLYOverrides) ldh [rSVBK], a call .TitleScreen -- cgit v1.2.3 From ac48d654987ef1df3a7ca6e5a40d8e6eab477d7f Mon Sep 17 00:00:00 2001 From: mid-kid Date: Mon, 3 Aug 2020 23:00:41 +0200 Subject: Document wTitleScreenSelectedOption variable --- engine/menus/intro_menu.asm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'engine/menus/intro_menu.asm') diff --git a/engine/menus/intro_menu.asm b/engine/menus/intro_menu.asm index be0e3a188..6126cb1b9 100644 --- a/engine/menus/intro_menu.asm +++ b/engine/menus/intro_menu.asm @@ -999,8 +999,8 @@ StartTitleScreen: ld b, SCGB_DIPLOMA call GetSGBLayout call UpdateTimePals - ld a, [wIntroSceneFrameCounter] - cp $5 + ld a, [wTitleScreenSelectedOption] + cp 5 jr c, .ok xor a .ok @@ -1200,7 +1200,7 @@ TitleScreenMain: ld a, 1 .done - ld [wIntroSceneFrameCounter], a + ld [wTitleScreenSelectedOption], a ; Return to the intro sequence. ld hl, wJumptableIndex @@ -1225,7 +1225,7 @@ TitleScreenMain: .clock_reset ld a, 4 - ld [wIntroSceneFrameCounter], a + ld [wTitleScreenSelectedOption], a ; Return to the intro sequence. ld hl, wJumptableIndex @@ -1243,7 +1243,7 @@ TitleScreenEnd: ret nz ld a, 2 - ld [wIntroSceneFrameCounter], a + ld [wTitleScreenSelectedOption], a ; Back to the intro. ld hl, wJumptableIndex -- cgit v1.2.3 From 315d6c665ea0ee4e103f6d8b9dbfb531659ae381 Mon Sep 17 00:00:00 2001 From: mid-kid Date: Tue, 18 Aug 2020 22:20:16 +0200 Subject: Add wTitleScreenSelectedOption constants --- engine/menus/intro_menu.asm | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-) (limited to 'engine/menus/intro_menu.asm') diff --git a/engine/menus/intro_menu.asm b/engine/menus/intro_menu.asm index 6126cb1b9..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 @@ -1000,7 +1009,7 @@ StartTitleScreen: call GetSGBLayout call UpdateTimePals ld a, [wTitleScreenSelectedOption] - cp 5 + 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,11 +1202,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 @@ -1223,8 +1232,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. @@ -1242,7 +1251,7 @@ TitleScreenEnd: and a ret nz - ld a, 2 + ld a, TITLESCREENOPTION_RESTART ld [wTitleScreenSelectedOption], a ; Back to the intro. -- cgit v1.2.3