Future/pokecrystal
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use correct WRAM labels for intro/title scenes

Browse Source 
Remove outdated WRAM alias comments
This commit is contained in:
Remy Oukaour
2017-12-10 00:18:29 -05:00
parent ab7025a144
commit d554b997c5
10 changed files with 39 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
engine/intro_menu.asm
View File

@@ -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