summaryrefslogtreecommitdiff
path: root/data/mapObjects/ceruleancity.asm
diff options
context:
space:
mode:
Diffstat (limited to 'data/mapObjects/ceruleancity.asm')
-rwxr-xr-xdata/mapObjects/ceruleancity.asm82
1 files changed, 41 insertions, 41 deletions
diff --git a/data/mapObjects/ceruleancity.asm b/data/mapObjects/ceruleancity.asm
index a20e6252..bdff2047 100755
--- a/data/mapObjects/ceruleancity.asm
+++ b/data/mapObjects/ceruleancity.asm
@@ -1,47 +1,47 @@
CeruleanCityObject:
- db $f ; border block
+ db 15 ; border block
- db $a ; warps
- warp $1b, $b, $0, TRASHED_HOUSE
- warp $d, $f, $0, CERULEAN_HOUSE_1
- warp $13, $11, $0, CERULEAN_POKECENTER
- warp $1e, $13, $0, CERULEAN_GYM
- warp $d, $19, $0, BIKE_SHOP
- warp $19, $19, $0, CERULEAN_MART
- warp $4, $b, $0, UNKNOWN_DUNGEON_1
- warp $1b, $9, $2, TRASHED_HOUSE
- warp $9, $b, $1, CERULEAN_HOUSE_2
- warp $9, $9, $0, CERULEAN_HOUSE_2
+ db 10 ; warps
+ warp 27, 11, 0, TRASHED_HOUSE
+ warp 13, 15, 0, CERULEAN_HOUSE_1
+ warp 19, 17, 0, CERULEAN_POKECENTER
+ warp 30, 19, 0, CERULEAN_GYM
+ warp 13, 25, 0, BIKE_SHOP
+ warp 25, 25, 0, CERULEAN_MART
+ warp 4, 11, 0, UNKNOWN_DUNGEON_1
+ warp 27, 9, 2, TRASHED_HOUSE
+ warp 9, 11, 1, CERULEAN_HOUSE_2
+ warp 9, 9, 0, CERULEAN_HOUSE_2
- db $6 ; signs
- sign $17, $13, $c ; CeruleanCityText12
- sign $11, $1d, $d ; CeruleanCityText13
- sign $1a, $19, $e ; MartSignText
- sign $14, $11, $f ; PokeCenterSignText
- sign $b, $19, $10 ; CeruleanCityText16
- sign $1b, $15, $11 ; CeruleanCityText17
+ db 6 ; signs
+ sign 23, 19, 12 ; CeruleanCityText12
+ sign 17, 29, 13 ; CeruleanCityText13
+ sign 26, 25, 14 ; MartSignText
+ sign 20, 17, 15 ; PokeCenterSignText
+ sign 11, 25, 16 ; CeruleanCityText16
+ sign 27, 21, 17 ; CeruleanCityText17
- db $b ; objects
- object SPRITE_BLUE, $14, $2, STAY, DOWN, $1 ; person
- object SPRITE_ROCKET, $1e, $8, STAY, NONE, $2, OPP_ROCKET, $5
- object SPRITE_BLACK_HAIR_BOY_1, $1f, $14, STAY, DOWN, $3 ; person
- object SPRITE_BLACK_HAIR_BOY_2, $f, $12, WALK, $1, $4 ; person
- object SPRITE_BLACK_HAIR_BOY_2, $9, $15, WALK, $2, $5 ; person
- object SPRITE_GUARD, $1c, $c, STAY, DOWN, $6 ; person
- object SPRITE_LASS, $1d, $1a, STAY, LEFT, $7 ; person
- object SPRITE_SLOWBRO, $1c, $1a, STAY, DOWN, $8 ; person
- object SPRITE_LASS, $9, $1b, WALK, $2, $9 ; person
- object SPRITE_BLACK_HAIR_BOY_2, $4, $c, STAY, DOWN, $a ; person
- object SPRITE_GUARD, $1b, $c, STAY, DOWN, $b ; person
+ db 11 ; objects
+ object SPRITE_BLUE, 20, 2, STAY, DOWN, 1 ; person
+ object SPRITE_ROCKET, 30, 8, STAY, NONE, 2, OPP_ROCKET, 5
+ object SPRITE_BLACK_HAIR_BOY_1, 31, 20, STAY, DOWN, 3 ; person
+ object SPRITE_BLACK_HAIR_BOY_2, 15, 18, WALK, 1, 4 ; person
+ object SPRITE_BLACK_HAIR_BOY_2, 9, 21, WALK, 2, 5 ; person
+ object SPRITE_GUARD, 28, 12, STAY, DOWN, 6 ; person
+ object SPRITE_LASS, 29, 26, STAY, LEFT, 7 ; person
+ object SPRITE_SLOWBRO, 28, 26, STAY, DOWN, 8 ; person
+ object SPRITE_LASS, 9, 27, WALK, 2, 9 ; person
+ object SPRITE_BLACK_HAIR_BOY_2, 4, 12, STAY, DOWN, 10 ; person
+ object SPRITE_GUARD, 27, 12, STAY, DOWN, 11 ; person
; warp-to
- warp_to $1b, $b, CERULEAN_CITY_WIDTH ; TRASHED_HOUSE
- warp_to $d, $f, CERULEAN_CITY_WIDTH ; CERULEAN_HOUSE_1
- warp_to $13, $11, CERULEAN_CITY_WIDTH ; CERULEAN_POKECENTER
- warp_to $1e, $13, CERULEAN_CITY_WIDTH ; CERULEAN_GYM
- warp_to $d, $19, CERULEAN_CITY_WIDTH ; BIKE_SHOP
- warp_to $19, $19, CERULEAN_CITY_WIDTH ; CERULEAN_MART
- warp_to $4, $b, CERULEAN_CITY_WIDTH ; UNKNOWN_DUNGEON_1
- warp_to $1b, $9, CERULEAN_CITY_WIDTH ; TRASHED_HOUSE
- warp_to $9, $b, CERULEAN_CITY_WIDTH ; CERULEAN_HOUSE_2
- warp_to $9, $9, CERULEAN_CITY_WIDTH ; CERULEAN_HOUSE_2
+ warp_to 27, 11, CERULEAN_CITY_WIDTH ; TRASHED_HOUSE
+ warp_to 13, 15, CERULEAN_CITY_WIDTH ; CERULEAN_HOUSE_1
+ warp_to 19, 17, CERULEAN_CITY_WIDTH ; CERULEAN_POKECENTER
+ warp_to 30, 19, CERULEAN_CITY_WIDTH ; CERULEAN_GYM
+ warp_to 13, 25, CERULEAN_CITY_WIDTH ; BIKE_SHOP
+ warp_to 25, 25, CERULEAN_CITY_WIDTH ; CERULEAN_MART
+ warp_to 4, 11, CERULEAN_CITY_WIDTH ; UNKNOWN_DUNGEON_1
+ warp_to 27, 9, CERULEAN_CITY_WIDTH ; TRASHED_HOUSE
+ warp_to 9, 11, CERULEAN_CITY_WIDTH ; CERULEAN_HOUSE_2
+ warp_to 9, 9, CERULEAN_CITY_WIDTH ; CERULEAN_HOUSE_2