summaryrefslogtreecommitdiff
path: root/scripts/CeruleanCity.asm
diff options
context:
space:
mode:
authorRangi <35663410+Rangi42@users.noreply.github.com>2020-08-29 01:04:24 -0400
committerGitHub <noreply@github.com>2020-08-29 01:04:24 -0400
commit4ef305907206bdb90c3c9259f6d527a90b26629c (patch)
treeed116b29979bb2aeb3a02789aa92d3769278361a /scripts/CeruleanCity.asm
parent48da6c53be768e85b8ba47430e2fc0f3dd4de61e (diff)
parent637f38b139c43c15eb1f4a67562a78389d4f42a7 (diff)
Merge pull request #290 from Rangi42/master
Separate splash screen, intro, and credits (like pokegold/pokecrystal)
Diffstat (limited to 'scripts/CeruleanCity.asm')
-rwxr-xr-xscripts/CeruleanCity.asm4
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/CeruleanCity.asm b/scripts/CeruleanCity.asm
index eef63536..5ac75075 100755
--- a/scripts/CeruleanCity.asm
+++ b/scripts/CeruleanCity.asm
@@ -80,7 +80,7 @@ ENDC
ld a, $f0
ld [wJoyIgnore], a
ld a, [wXCoord]
- cp $14
+ cp 20
jr z, .asm_19535
ld a, $1
ldh [hSpriteIndex], a
@@ -183,7 +183,7 @@ CeruleanCityScript2:
ldh [hSpriteIndex], a
call SetSpriteMovementBytesToFF
ld a, [wXCoord]
- cp $14
+ cp 20
jr nz, .asm_195f0
ld de, CeruleanCityMovement4
jr .asm_195f3