aboutsummaryrefslogtreecommitdiffstats
path: root/engine/movie/title.asm
diff options
context:
space:
mode:
authordannye <33dannye@gmail.com>2024-09-25 00:45:00 -0500
committerdannye <33dannye@gmail.com>2024-09-25 00:45:00 -0500
commita02a98ee7ada1a658e28698484058be2796dc0df (patch)
tree945986054565bd8b5212fc755415096050d1d3a8 /engine/movie/title.asm
parentUse long option flags for rgbgfx, same as tools/gfx (diff)
parentUse `const_skip` (diff)
downloadpokeyellow-a02a98ee7ada1a658e28698484058be2796dc0df.tar.gz
pokeyellow-a02a98ee7ada1a658e28698484058be2796dc0df.tar.xz
pokeyellow-a02a98ee7ada1a658e28698484058be2796dc0df.zip
Merge branch 'master' of https://github.com/pret/pokered
Diffstat (limited to 'engine/movie/title.asm')
-rw-r--r--engine/movie/title.asm6
1 files changed, 4 insertions, 2 deletions
diff --git a/engine/movie/title.asm b/engine/movie/title.asm
index d0a97a6f..2c4b61fb 100644
--- a/engine/movie/title.asm
+++ b/engine/movie/title.asm
@@ -11,9 +11,11 @@ PrepareTitleScreen::
xor a
ldh [hWY], a
ld [wLetterPrintingDelayFlags], a
- ld hl, wd732
+ ld hl, wStatusFlags6
ld [hli], a
+ assert wStatusFlags6 + 1 == wStatusFlags7
ld [hli], a
+ assert wStatusFlags7 + 1 == wElite4Flags
ld [hl], a
ld a, BANK(Music_TitleScreen)
ld [wAudioROMBank], a
@@ -152,7 +154,7 @@ DisplayTitleScreen:
call PlaySound
.loop
xor a
- ld [wUnusedCC5B], a
+ ld [wUnusedFlag], a
ld [wTitleScreenScene], a
ld [wTitleScreenScene + 1], a
ld [wTitleScreenScene + 2], a