pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2024-11-16 11:27:33 -08:00
Code Issues Packages Projects Releases Wiki Activity

Document wTitleScreenSelectedOption variable

Browse Source
This commit is contained in:
mid-kid 2020-08-03 23:00:41 +02:00
parent 6f30d79620
commit ac48d65498
3 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
engine/menus/intro_menu.asm
View File

@ -999,8 +999,8 @@ StartTitleScreen:
ld b, SCGB_DIPLOMA ld b, SCGB_DIPLOMA
call GetSGBLayout call GetSGBLayout
call UpdateTimePals call UpdateTimePals
ld a, [wIntroSceneFrameCounter] ld a, [wTitleScreenSelectedOption]
cp $5 cp 5
jr c, .ok jr c, .ok
xor a xor a
.ok .ok
@ -1200,7 +1200,7 @@ TitleScreenMain:
ld a, 1 ld a, 1
.done .done
ld [wIntroSceneFrameCounter], a ld [wTitleScreenSelectedOption], a
; Return to the intro sequence. ; Return to the intro sequence.
ld hl, wJumptableIndex ld hl, wJumptableIndex
@ -1225,7 +1225,7 @@ TitleScreenMain:
.clock_reset .clock_reset
ld a, 4 ld a, 4
ld [wIntroSceneFrameCounter], a ld [wTitleScreenSelectedOption], a
; Return to the intro sequence. ; Return to the intro sequence.
ld hl, wJumptableIndex ld hl, wJumptableIndex
@ -1243,7 +1243,7 @@ TitleScreenEnd:
ret nz ret nz
ld a, 2 ld a, 2
ld [wIntroSceneFrameCounter], a ld [wTitleScreenSelectedOption], a
; Back to the intro. ; Back to the intro.
ld hl, wJumptableIndex ld hl, wJumptableIndex

2
engine/movie/title.asm
View File

@ -10,7 +10,7 @@ _TitleScreen:
; Reset timing variables ; Reset timing variables
ld hl, wJumptableIndex ld hl, wJumptableIndex
ld [hli], a ; wJumptableIndex ld [hli], a ; wJumptableIndex
ld [hli], a ; wIntroSceneFrameCounter ld [hli], a ; wTitleScreenSelectedOption
ld [hli], a ; wTitleScreenTimer ld [hli], a ; wTitleScreenTimer
ld [hl], a ; wTitleScreenTimer + 1 ld [hl], a ; wTitleScreenTimer + 1

7
wram.asm
View File

@ -1436,13 +1436,14 @@ wcf65:: db
wcf66:: db wcf66:: db
NEXTU NEXTU
; intro and title data ; intro data
wIntroSceneFrameCounter:: db wIntroSceneFrameCounter:: db
UNION
wIntroSceneTimer:: db wIntroSceneTimer:: db
NEXTU NEXTU
; title data
wTitleScreenSelectedOption:: db
wTitleScreenTimer:: dw wTitleScreenTimer:: dw
ENDU
NEXTU NEXTU
; credits data ; credits data