diff options
| author | Remy Oukaour <remy.oukaour@gmail.com> | 2017-12-10 00:18:29 -0500 |
|---|---|---|
| committer | Remy Oukaour <remy.oukaour@gmail.com> | 2017-12-10 00:18:29 -0500 |
| commit | d554b997c590825f030bd1be71989653b16a2ae0 (patch) | |
| tree | 171c67509afba62571266bd6bebbfdb829d2a876 /engine/intro_menu.asm | |
| parent | ab7025a144605de609fed4ca67a281fb4cde8705 (diff) | |
Use correct WRAM labels for intro/title scenes
Remove outdated WRAM alias comments
Diffstat (limited to 'engine/intro_menu.asm')
| -rwxr-xr-x | engine/intro_menu.asm | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/engine/intro_menu.asm b/engine/intro_menu.asm index c576e4526..6dcda93f3 100755 --- a/engine/intro_menu.asm +++ b/engine/intro_menu.asm @@ -1051,7 +1051,7 @@ StartTitleScreen: ; 6219 ld b, SCGB_DIPLOMA call GetSGBLayout call UpdateTimePals - ld a, [wcf64] + ld a, [wIntroSceneFrameCounter] cp $5 jr c, .ok xor a @@ -1191,7 +1191,7 @@ TitleScreenTimer: ; 62f6 inc [hl] ; Start a timer - ld hl, wcf65 + ld hl, wTitleScreenTimer ld de, 73 * 60 + 36 ld [hl], e inc hl @@ -1202,7 +1202,7 @@ TitleScreenTimer: ; 62f6 TitleScreenMain: ; 6304 ; Run the timer down. - ld hl, wcf65 + ld hl, wTitleScreenTimer ld e, [hl] inc hl ld d, [hl] @@ -1268,7 +1268,7 @@ TitleScreenMain: ; 6304 ld a, 1 .done - ld [wcf64], a + ld [wIntroSceneFrameCounter], a ; Return to the intro sequence. ld hl, wJumptableIndex @@ -1287,13 +1287,13 @@ TitleScreenMain: ; 6304 ld hl, MusicFade ld [hl], 8 ; 1 second - ld hl, wcf65 + ld hl, wTitleScreenTimer inc [hl] ret .clock_reset ld a, 4 - ld [wcf64], a + ld [wIntroSceneFrameCounter], a ; Return to the intro sequence. ld hl, wJumptableIndex @@ -1305,7 +1305,7 @@ TitleScreenEnd: ; 6375 ; Wait until the music is done fading. - ld hl, wcf65 + ld hl, wTitleScreenTimer inc [hl] ld a, [MusicFade] @@ -1313,7 +1313,7 @@ TitleScreenEnd: ; 6375 ret nz ld a, 2 - ld [wcf64], a + ld [wIntroSceneFrameCounter], a ; Back to the intro. ld hl, wJumptableIndex @@ -1332,8 +1332,8 @@ ResetClock: ; 6392 ; 639b Function639b: ; unreferenced - ; If bit 0 or 1 of [wcf65] is set, we don't need to be here. - ld a, [wcf65] + ; If bit 0 or 1 of [wTitleScreenTimer] is set, we don't need to be here. + ld a, [wTitleScreenTimer] and $3 ret nz ld bc, SpriteAnim10 @@ -1345,8 +1345,8 @@ Function639b: ; unreferenced add hl, hl ld de, Data63ca add hl, de - ; If bit 2 of [wcf65] is set, get the second dw; else, get the first dw - ld a, [wcf65] + ; If bit 2 of [wTitleScreenTimer] is set, get the second dw; else, get the first dw + ld a, [wTitleScreenTimer] and %00000100 srl a srl a |