aboutsummaryrefslogtreecommitdiffstats
path: root/engine/movie/intro.asm
diff options
context:
space:
mode:
Diffstat (limited to 'engine/movie/intro.asm')
-rw-r--r--engine/movie/intro.asm12
1 files changed, 6 insertions, 6 deletions
diff --git a/engine/movie/intro.asm b/engine/movie/intro.asm
index 33a3a134..f018d860 100644
--- a/engine/movie/intro.asm
+++ b/engine/movie/intro.asm
@@ -35,7 +35,7 @@ InitIntroNidorinoOAM:
ld [hli], a ; X
ld a, d
ld [hli], a ; tile
- ld a, OAM_BEHIND_BG
+ ld a, OAM_PRIO
ld [hli], a ; attributes
inc d
dec c
@@ -50,7 +50,7 @@ InitIntroNidorinoOAM:
IntroClearScreen:
ld hl, vBGMap1
- ld bc, BG_MAP_WIDTH * SCREEN_HEIGHT
+ ld bc, TILEMAP_WIDTH * SCREEN_HEIGHT
jr IntroClearCommon
IntroClearMiddleOfScreen:
@@ -116,8 +116,8 @@ PlayShootingStar:
call EnableLCD
ld hl, rLCDC
- res rLCDC_WINDOW_ENABLE, [hl]
- set rLCDC_BG_TILEMAP, [hl]
+ res B_LCDC_WINDOW, [hl]
+ set B_LCDC_BG_MAP, [hl]
ld c, 64
call DelayFrames
farcall AnimateShootingStar
@@ -142,10 +142,10 @@ IntroDrawBlackBars:
ld c, SCREEN_WIDTH * 4
call IntroPlaceBlackTiles
ld hl, vBGMap1
- ld c, BG_MAP_WIDTH * 4
+ ld c, TILEMAP_WIDTH * 4
call IntroPlaceBlackTiles
hlbgcoord 0, 14, vBGMap1
- ld c, BG_MAP_WIDTH * 4
+ ld c, TILEMAP_WIDTH * 4
jp IntroPlaceBlackTiles
LoadPresentsGraphic: ; unreferenced