aboutsummaryrefslogtreecommitdiffstats
path: root/engine/movie/intro.asm
diff options
context:
space:
mode:
authorRangi <remy.oukaour+rangi42@gmail.com>2020-07-17 13:44:28 -0400
committerRangi <remy.oukaour+rangi42@gmail.com>2020-07-17 13:47:33 -0400
commit3c1cdbc4d00e27484bdaa77890c2a4ca9cee7884 (patch)
tree26df5e2e78812193f6945896021476a0f6dbdf7e /engine/movie/intro.asm
parentSONY -> RIVAL (diff)
downloadpokeyellow-3c1cdbc4d00e27484bdaa77890c2a4ca9cee7884.tar.gz
pokeyellow-3c1cdbc4d00e27484bdaa77890c2a4ca9cee7884.tar.xz
pokeyellow-3c1cdbc4d00e27484bdaa77890c2a4ca9cee7884.zip
Identify remaining tilemap IDs
Diffstat (limited to 'engine/movie/intro.asm')
-rwxr-xr-xengine/movie/intro.asm15
1 files changed, 5 insertions, 10 deletions
diff --git a/engine/movie/intro.asm b/engine/movie/intro.asm
index c5896ecb..d8ec8e6e 100755
--- a/engine/movie/intro.asm
+++ b/engine/movie/intro.asm
@@ -1,15 +1,10 @@
-const_value = -1
+ const_def -1
const MOVE_NIDORINO_RIGHT
const MOVE_GENGAR_RIGHT
const MOVE_GENGAR_LEFT
ANIMATION_END EQU 80
-const_value = 3
- const GENGAR_INTRO_TILES1
- const GENGAR_INTRO_TILES2
- const GENGAR_INTRO_TILES3
-
PlayIntro:
xor a
ldh [hJoyHeld], a
@@ -34,7 +29,7 @@ PlayIntroScene:
ldh [rOBP1], a
xor a
ldh [hSCX], a
- ld b, GENGAR_INTRO_TILES1
+ ld b, TILEMAP_GENGAR_INTRO_1
call IntroCopyTiles
ld a, 0
ld [wBaseCoordX], a
@@ -77,7 +72,7 @@ PlayIntroScene:
ret c
; raise
- ld b, GENGAR_INTRO_TILES2
+ ld b, TILEMAP_GENGAR_INTRO_2
call IntroCopyTiles
ld a, SFX_INTRO_RAISE
call PlaySound
@@ -88,7 +83,7 @@ PlayIntroScene:
ret c
; slash
- ld b, GENGAR_INTRO_TILES3
+ ld b, TILEMAP_GENGAR_INTRO_3
call IntroCopyTiles
ld a, SFX_INTRO_CRASH
call PlaySound
@@ -107,7 +102,7 @@ PlayIntroScene:
lb de, 8 / 2, MOVE_GENGAR_LEFT
call IntroMoveMon
- ld b, GENGAR_INTRO_TILES1
+ ld b, TILEMAP_GENGAR_INTRO_1
call IntroCopyTiles
ld c, 60
call CheckForUserInterruption