diff options
| author | Rangi <35663410+Rangi42@users.noreply.github.com> | 2020-08-29 01:04:24 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-29 01:04:24 -0400 |
| commit | 4ef305907206bdb90c3c9259f6d527a90b26629c (patch) | |
| tree | ed116b29979bb2aeb3a02789aa92d3769278361a /scripts/ViridianCity.asm | |
| parent | Align warp and sign coordinates (diff) | |
| parent | Use decimal, not hex, for sprite (object) coordinates in map scripts (diff) | |
| download | pokeyellow-4ef305907206bdb90c3c9259f6d527a90b26629c.tar.gz pokeyellow-4ef305907206bdb90c3c9259f6d527a90b26629c.tar.xz pokeyellow-4ef305907206bdb90c3c9259f6d527a90b26629c.zip | |
Merge pull request #290 from Rangi42/master
Separate splash screen, intro, and credits (like pokegold/pokecrystal)
Diffstat (limited to 'scripts/ViridianCity.asm')
| -rwxr-xr-x | scripts/ViridianCity.asm | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/scripts/ViridianCity.asm b/scripts/ViridianCity.asm index 543ffa97..96e58a19 100755 --- a/scripts/ViridianCity.asm +++ b/scripts/ViridianCity.asm @@ -24,10 +24,10 @@ ViridianCityScript_1900b: ret .gym_closed ld a, [wYCoord] - cp $8 + cp 8 ret nz ld a, [wXCoord] - cp $20 + cp 32 ret nz ld a, $e ldh [hSpriteIndexOrTextID], a @@ -43,10 +43,10 @@ ViridianCityScript_1903d: CheckEvent EVENT_GOT_POKEDEX ret nz ld a, [wYCoord] - cp $9 + cp 9 ret nz ld a, [wXCoord] - cp $13 + cp 19 ret nz ld a, $5 ldh [hSpriteIndexOrTextID], a |