aboutsummaryrefslogtreecommitdiffstats
path: root/scripts/CeruleanCity.asm
diff options
context:
space:
mode:
authorRangi <35663410+Rangi42@users.noreply.github.com>2020-07-16 17:00:57 -0400
committerGitHub <noreply@github.com>2020-07-16 17:00:57 -0400
commitd44c7c305c3f94b59e3e2c008408779836a0020a (patch)
tree2cdc51be4a22992701038b959d6c964e9ee8fc58 /scripts/CeruleanCity.asm
parentMerge pull request #276 from TheFakeMateo/master (diff)
parentDefine constants for audio commands (diff)
downloadpokeyellow-d44c7c305c3f94b59e3e2c008408779836a0020a.tar.gz
pokeyellow-d44c7c305c3f94b59e3e2c008408779836a0020a.tar.xz
pokeyellow-d44c7c305c3f94b59e3e2c008408779836a0020a.zip
Merge pull request #277 from Rangi42/master
Miscellaneous constant and label updates
Diffstat (limited to 'scripts/CeruleanCity.asm')
-rwxr-xr-xscripts/CeruleanCity.asm18
1 files changed, 9 insertions, 9 deletions
diff --git a/scripts/CeruleanCity.asm b/scripts/CeruleanCity.asm
index 209e29cc..4d960537 100755
--- a/scripts/CeruleanCity.asm
+++ b/scripts/CeruleanCity.asm
@@ -101,20 +101,20 @@ ENDC
ret
CeruleanCityCoords1:
- db $07,$1e
- db $09,$1e
- db $ff
+ dbmapcoord 30, 7
+ dbmapcoord 30, 9
+ db -1 ; end
CeruleanCityCoords2:
- db $06,$14
- db $06,$15
- db $ff
+ dbmapcoord 20, 6
+ dbmapcoord 21, 6
+ db -1 ; end
CeruleanCityMovement1:
db NPC_MOVEMENT_DOWN
db NPC_MOVEMENT_DOWN
db NPC_MOVEMENT_DOWN
- db $FF
+ db -1 ; end
CeruleanCityScript_1955d:
ld a, 1
@@ -205,7 +205,7 @@ CeruleanCityMovement3:
db NPC_MOVEMENT_DOWN
db NPC_MOVEMENT_DOWN
db NPC_MOVEMENT_DOWN
- db $FF
+ db -1 ; end
CeruleanCityMovement4:
db NPC_MOVEMENT_RIGHT
@@ -215,7 +215,7 @@ CeruleanCityMovement4:
db NPC_MOVEMENT_DOWN
db NPC_MOVEMENT_DOWN
db NPC_MOVEMENT_DOWN
- db $FF
+ db -1 ; end
CeruleanCityScript3:
ld a, [wd730]