aboutsummaryrefslogtreecommitdiffstats
path: root/engine/movie
diff options
context:
space:
mode:
authorRangi <remy.oukaour+rangi42@gmail.com>2020-07-05 16:15:01 -0400
committerRangi <remy.oukaour+rangi42@gmail.com>2020-07-05 16:15:01 -0400
commita77999f7f151567a47dd69affe9a29378f298ff4 (patch)
treec8816365bfae97dfdd9250e6ca8bfe13dbb58dd5 /engine/movie
parentPort and improve hidden_object macro from pokeyellow (diff)
downloadpokeyellow-a77999f7f151567a47dd69affe9a29378f298ff4.tar.gz
pokeyellow-a77999f7f151567a47dd69affe9a29378f298ff4.tar.xz
pokeyellow-a77999f7f151567a47dd69affe9a29378f298ff4.zip
Logical spacing in data/sgb/sgb_palettes.asm
Diffstat (limited to 'engine/movie')
-rwxr-xr-xengine/movie/intro.asm6
-rwxr-xr-xengine/movie/title.asm2
2 files changed, 4 insertions, 4 deletions
diff --git a/engine/movie/intro.asm b/engine/movie/intro.asm
index a8151ab4..21f1a885 100755
--- a/engine/movie/intro.asm
+++ b/engine/movie/intro.asm
@@ -97,7 +97,7 @@ PlayIntroScene:
; hip
ld a, SFX_INTRO_HIP
call PlaySound
- ld a, (FightIntroFrontMon2 - FightIntroFrontMon) / BYTES_PER_TILE
+ ld a, (FightIntroFrontMon2 - FightIntroFrontMon) / LEN_2BPP_TILE
ld [wIntroNidorinoBaseTile], a
ld de, IntroNidorinoAnimation3
call AnimateIntroNidorino
@@ -129,7 +129,7 @@ PlayIntroScene:
call CheckForUserInterruption
ret c
- ld a, (FightIntroFrontMon2 - FightIntroFrontMon) / BYTES_PER_TILE
+ ld a, (FightIntroFrontMon2 - FightIntroFrontMon) / LEN_2BPP_TILE
ld [wIntroNidorinoBaseTile], a
ld de, IntroNidorinoAnimation6
call AnimateIntroNidorino
@@ -140,7 +140,7 @@ PlayIntroScene:
; lunge
ld a, SFX_INTRO_LUNGE
call PlaySound
- ld a, (FightIntroFrontMon3 - FightIntroFrontMon) / BYTES_PER_TILE
+ ld a, (FightIntroFrontMon3 - FightIntroFrontMon) / LEN_2BPP_TILE
ld [wIntroNidorinoBaseTile], a
ld de, IntroNidorinoAnimation7
jp AnimateIntroNidorino
diff --git a/engine/movie/title.asm b/engine/movie/title.asm
index 9cbe5494..5ee9b77f 100755
--- a/engine/movie/title.asm
+++ b/engine/movie/title.asm
@@ -189,7 +189,7 @@ ENDC
; scroll game version in from the right
call PrintGameVersionOnTitleScreen
- ld a, SCREEN_HEIGHT_PIXELS
+ ld a, SCREEN_HEIGHT_PX
ld [hWY], a
ld d, 144
.scrollTitleScreenGameVersionLoop