summaryrefslogtreecommitdiff
path: root/data/maps/objects/CeruleanCity.asm
diff options
context:
space:
mode:
Diffstat (limited to 'data/maps/objects/CeruleanCity.asm')
-rw-r--r--data/maps/objects/CeruleanCity.asm10
1 files changed, 5 insertions, 5 deletions
diff --git a/data/maps/objects/CeruleanCity.asm b/data/maps/objects/CeruleanCity.asm
index 9b15c1c5..2d155e25 100644
--- a/data/maps/objects/CeruleanCity.asm
+++ b/data/maps/objects/CeruleanCity.asm
@@ -1,9 +1,9 @@
CeruleanCity_Object:
- db $f ; border block
+ db $a ; border block
def_warps
warp 27, 11, 0, CERULEAN_TRASHED_HOUSE
- warp 13, 15, 0, CERULEAN_TRADE_HOUSE
+ warp 13, 15, 0, CERULEAN_MELANIES_HOUSE
warp 19, 17, 0, CERULEAN_POKECENTER
warp 30, 19, 0, CERULEAN_GYM
warp 13, 25, 0, BIKE_SHOP
@@ -27,11 +27,11 @@ CeruleanCity_Object:
object SPRITE_COOLTRAINER_M, 31, 20, STAY, DOWN, 3 ; person
object SPRITE_SUPER_NERD, 15, 18, WALK, UP_DOWN, 4 ; person
object SPRITE_SUPER_NERD, 9, 21, WALK, LEFT_RIGHT, 5 ; person
- object SPRITE_GUARD, 28, 12, STAY, DOWN, 6 ; person
+ object SPRITE_OFFICER_JENNY, 28, 12, STAY, DOWN, 6 ; person
object SPRITE_COOLTRAINER_F, 29, 26, STAY, LEFT, 7 ; person
- object SPRITE_MONSTER, 28, 26, STAY, DOWN, 8 ; person
+ object SPRITE_POKE_BALL, 28, 26, STAY, DOWN, 8 ; person
object SPRITE_COOLTRAINER_F, 9, 27, WALK, LEFT_RIGHT, 9 ; person
object SPRITE_SUPER_NERD, 4, 12, STAY, DOWN, 10 ; person
- object SPRITE_GUARD, 27, 12, STAY, DOWN, 11 ; person
+ object SPRITE_OFFICER_JENNY, 27, 12, STAY, DOWN, 11 ; person
def_warps_to CERULEAN_CITY