diff options
Diffstat (limited to 'data/mapObjects/ceruleancity.asm')
| -rwxr-xr-x | data/mapObjects/ceruleancity.asm | 52 |
1 files changed, 26 insertions, 26 deletions
diff --git a/data/mapObjects/ceruleancity.asm b/data/mapObjects/ceruleancity.asm index b6317e2c..a20e6252 100755 --- a/data/mapObjects/ceruleancity.asm +++ b/data/mapObjects/ceruleancity.asm @@ -2,24 +2,24 @@ CeruleanCityObject: db $f ; border block db $a ; warps - db $b, $1b, $0, TRASHED_HOUSE - db $f, $d, $0, CERULEAN_HOUSE_1 - db $11, $13, $0, CERULEAN_POKECENTER - db $13, $1e, $0, CERULEAN_GYM - db $19, $d, $0, BIKE_SHOP - db $19, $19, $0, CERULEAN_MART - db $b, $4, $0, UNKNOWN_DUNGEON_1 - db $9, $1b, $2, TRASHED_HOUSE - db $b, $9, $1, CERULEAN_HOUSE_2 - db $9, $9, $0, CERULEAN_HOUSE_2 + 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 $6 ; signs - db $13, $17, $c ; CeruleanCityText12 - db $1d, $11, $d ; CeruleanCityText13 - db $19, $1a, $e ; MartSignText - db $11, $14, $f ; PokeCenterSignText - db $19, $b, $10 ; CeruleanCityText16 - db $15, $1b, $11 ; CeruleanCityText17 + 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 $b ; objects object SPRITE_BLUE, $14, $2, STAY, DOWN, $1 ; person @@ -35,13 +35,13 @@ CeruleanCityObject: object SPRITE_GUARD, $1b, $c, STAY, DOWN, $b ; person ; warp-to - EVENT_DISP CERULEAN_CITY_WIDTH, $b, $1b ; TRASHED_HOUSE - EVENT_DISP CERULEAN_CITY_WIDTH, $f, $d ; CERULEAN_HOUSE_1 - EVENT_DISP CERULEAN_CITY_WIDTH, $11, $13 ; CERULEAN_POKECENTER - EVENT_DISP CERULEAN_CITY_WIDTH, $13, $1e ; CERULEAN_GYM - EVENT_DISP CERULEAN_CITY_WIDTH, $19, $d ; BIKE_SHOP - EVENT_DISP CERULEAN_CITY_WIDTH, $19, $19 ; CERULEAN_MART - EVENT_DISP CERULEAN_CITY_WIDTH, $b, $4 ; UNKNOWN_DUNGEON_1 - EVENT_DISP CERULEAN_CITY_WIDTH, $9, $1b ; TRASHED_HOUSE - EVENT_DISP CERULEAN_CITY_WIDTH, $b, $9 ; CERULEAN_HOUSE_2 - EVENT_DISP CERULEAN_CITY_WIDTH, $9, $9 ; CERULEAN_HOUSE_2 + 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 |