diff options
| -rw-r--r-- | engine/menus/intro_menu.asm | 10 | ||||
| -rw-r--r-- | engine/movie/title.asm | 2 | ||||
| -rw-r--r-- | wram.asm | 7 |
3 files changed, 10 insertions, 9 deletions
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 diff --git a/engine/movie/title.asm b/engine/movie/title.asm index c478c572a..982bd0873 100644 --- a/engine/movie/title.asm +++ b/engine/movie/title.asm @@ -10,7 +10,7 @@ _TitleScreen: ; Reset timing variables ld hl, wJumptableIndex ld [hli], a ; wJumptableIndex - ld [hli], a ; wIntroSceneFrameCounter + ld [hli], a ; wTitleScreenSelectedOption ld [hli], a ; wTitleScreenTimer ld [hl], a ; wTitleScreenTimer + 1 @@ -1436,13 +1436,14 @@ wcf65:: db wcf66:: db NEXTU -; intro and title data +; intro data wIntroSceneFrameCounter:: db -UNION wIntroSceneTimer:: db + NEXTU +; title data +wTitleScreenSelectedOption:: db wTitleScreenTimer:: dw -ENDU NEXTU ; credits data |