ref: ac48d654987ef1df3a7ca6e5a40d8e6eab477d7f
parent: 6f30d79620e0fb1f5f96310e76230facac122c07
author: mid-kid <[email protected]>
date: Mon Aug 3 19:00:41 EDT 2020
Document wTitleScreenSelectedOption variable
--- a/engine/menus/intro_menu.asm
+++ b/engine/menus/intro_menu.asm
@@ -999,8 +999,8 @@
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 @@
ld a, 1
.done
- ld [wIntroSceneFrameCounter], a
+ ld [wTitleScreenSelectedOption], a
; Return to the intro sequence.
ld hl, wJumptableIndex
@@ -1225,7 +1225,7 @@
.clock_reset
ld a, 4
- ld [wIntroSceneFrameCounter], a
+ ld [wTitleScreenSelectedOption], a
; Return to the intro sequence.
ld hl, wJumptableIndex
@@ -1243,7 +1243,7 @@
ret nz
ld a, 2
- ld [wIntroSceneFrameCounter], a
+ ld [wTitleScreenSelectedOption], a
; Back to the intro.
ld hl, wJumptableIndex
--- a/engine/movie/title.asm
+++ b/engine/movie/title.asm
@@ -10,7 +10,7 @@
; 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
--- a/wram.asm
+++ b/wram.asm
@@ -1436,13 +1436,14 @@
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