diff options
| author | mid-kid <esteve.varela@gmail.com> | 2020-08-03 23:00:41 +0200 |
|---|---|---|
| committer | mid-kid <esteve.varela@gmail.com> | 2020-08-05 16:02:23 +0200 |
| commit | 6b2a0b288966a7c25d953545b9bb085d8dc3de58 (patch) | |
| tree | 536d638629e0e7dbd492921282b16e277eb06cc8 | |
| parent | 908b2565faadc7efbfce7d9afb2bbb89188ae2df (diff) | |
Document wTitleScreenSelectedOption variable
| -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 3fdc42cd..0708d9b1 100644 --- a/engine/menus/intro_menu.asm +++ b/engine/menus/intro_menu.asm @@ -864,8 +864,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 @@ -1002,7 +1002,7 @@ TitleScreenMain: ld a, 1 .done - ld [wIntroSceneFrameCounter], a + ld [wTitleScreenSelectedOption], a ; Return to the intro sequence. ld hl, wJumptableIndex @@ -1027,7 +1027,7 @@ TitleScreenMain: .clock_reset ld a, 4 - ld [wIntroSceneFrameCounter], a + ld [wTitleScreenSelectedOption], a ; Return to the intro sequence. ld hl, wJumptableIndex @@ -1045,7 +1045,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 cfcf8c62..af095f3a 100644 --- a/engine/movie/title.asm +++ b/engine/movie/title.asm @@ -64,7 +64,7 @@ TitleScreen: xor a ld hl, wJumptableIndex ld [hli], a ; wJumptableIndex - ld [hli], a ; wIntroSceneFrameCounter + ld [hli], a ; wTitleScreenSelectedOption ld [hli], a ; wTitleScreenTimer ld [hl], a ; wTitleScreenTimer + 1 @@ -1151,13 +1151,14 @@ wce65:: db wce66:: db NEXTU -; gfpresents, title, and intro menu timers +; intro data wIntroSceneFrameCounter:: db -UNION wIntroSceneTimer:: db + NEXTU +; title data +wTitleScreenSelectedOption:: db wTitleScreenTimer:: dw -ENDU NEXTU ; credits data |