diff options
Diffstat (limited to 'data/mapObjects/celadoncity.asm')
| -rwxr-xr-x | data/mapObjects/celadoncity.asm | 70 |
1 files changed, 35 insertions, 35 deletions
diff --git a/data/mapObjects/celadoncity.asm b/data/mapObjects/celadoncity.asm index c2a7fd78..536b46ee 100755 --- a/data/mapObjects/celadoncity.asm +++ b/data/mapObjects/celadoncity.asm @@ -2,30 +2,30 @@ CeladonCityObject: db $f ; border block db $d ; warps - db $d, $8, $0, CELADON_MART_1 - db $d, $a, $2, CELADON_MART_1 - db $9, $18, $0, CELADON_MANSION_1 - db $3, $18, $2, CELADON_MANSION_1 - db $3, $19, $2, CELADON_MANSION_1 - db $9, $29, $0, CELADON_POKECENTER - db $1b, $c, $0, CELADON_GYM - db $13, $1c, $0, GAME_CORNER - db $13, $27, $0, CELADON_MART_5 ; beta warp! no longer used - db $13, $21, $0, CELADON_PRIZE_ROOM - db $1b, $1f, $0, CELADON_DINER - db $1b, $23, $0, CELADON_HOUSE - db $1b, $2b, $0, CELADON_HOTEL + warp $8, $d, $0, CELADON_MART_1 + warp $a, $d, $2, CELADON_MART_1 + warp $18, $9, $0, CELADON_MANSION_1 + warp $18, $3, $2, CELADON_MANSION_1 + warp $19, $3, $2, CELADON_MANSION_1 + warp $29, $9, $0, CELADON_POKECENTER + warp $c, $1b, $0, CELADON_GYM + warp $1c, $13, $0, GAME_CORNER + warp $27, $13, $0, CELADON_MART_5 ; beta warp! no longer used + warp $21, $13, $0, CELADON_PRIZE_ROOM + warp $1f, $1b, $0, CELADON_DINER + warp $23, $1b, $0, CELADON_HOUSE + warp $2b, $1b, $0, CELADON_HOTEL db $9 ; signs - db $f, $1b, $a ; CeladonCityText10 - db $f, $13, $b ; CeladonCityText11 - db $9, $2a, $c ; PokeCenterSignText - db $1d, $d, $d ; CeladonCityText13 - db $9, $15, $e ; CeladonCityText14 - db $d, $c, $f ; CeladonCityText15 - db $15, $27, $10 ; CeladonCityText16 - db $15, $21, $11 ; CeladonCityText17 - db $15, $1b, $12 ; CeladonCityText18 + sign $1b, $f, $a ; CeladonCityText10 + sign $13, $f, $b ; CeladonCityText11 + sign $2a, $9, $c ; PokeCenterSignText + sign $d, $1d, $d ; CeladonCityText13 + sign $15, $9, $e ; CeladonCityText14 + sign $c, $d, $f ; CeladonCityText15 + sign $27, $15, $10 ; CeladonCityText16 + sign $21, $15, $11 ; CeladonCityText17 + sign $1b, $15, $12 ; CeladonCityText18 db $9 ; objects object SPRITE_LITTLE_GIRL, $8, $11, WALK, $0, $1 ; person @@ -39,16 +39,16 @@ CeladonCityObject: object SPRITE_ROCKET, $2a, $e, WALK, $2, $9 ; person ; warp-to - EVENT_DISP CELADON_CITY_WIDTH, $d, $8 ; CELADON_MART_1 - EVENT_DISP CELADON_CITY_WIDTH, $d, $a ; CELADON_MART_1 - EVENT_DISP CELADON_CITY_WIDTH, $9, $18 ; CELADON_MANSION_1 - EVENT_DISP CELADON_CITY_WIDTH, $3, $18 ; CELADON_MANSION_1 - EVENT_DISP CELADON_CITY_WIDTH, $3, $19 ; CELADON_MANSION_1 - EVENT_DISP CELADON_CITY_WIDTH, $9, $29 ; CELADON_POKECENTER - EVENT_DISP CELADON_CITY_WIDTH, $1b, $c ; CELADON_GYM - EVENT_DISP CELADON_CITY_WIDTH, $13, $1c ; GAME_CORNER - EVENT_DISP CELADON_CITY_WIDTH, $13, $27 ; CELADON_MART_5 - EVENT_DISP CELADON_CITY_WIDTH, $13, $21 ; CELADON_PRIZE_ROOM - EVENT_DISP CELADON_CITY_WIDTH, $1b, $1f ; CELADON_DINER - EVENT_DISP CELADON_CITY_WIDTH, $1b, $23 ; CELADON_HOUSE - EVENT_DISP CELADON_CITY_WIDTH, $1b, $2b ; CELADON_HOTEL + warp_to $8, $d, CELADON_CITY_WIDTH ; CELADON_MART_1 + warp_to $a, $d, CELADON_CITY_WIDTH ; CELADON_MART_1 + warp_to $18, $9, CELADON_CITY_WIDTH ; CELADON_MANSION_1 + warp_to $18, $3, CELADON_CITY_WIDTH ; CELADON_MANSION_1 + warp_to $19, $3, CELADON_CITY_WIDTH ; CELADON_MANSION_1 + warp_to $29, $9, CELADON_CITY_WIDTH ; CELADON_POKECENTER + warp_to $c, $1b, CELADON_CITY_WIDTH ; CELADON_GYM + warp_to $1c, $13, CELADON_CITY_WIDTH ; GAME_CORNER + warp_to $27, $13, CELADON_CITY_WIDTH ; CELADON_MART_5 + warp_to $21, $13, CELADON_CITY_WIDTH ; CELADON_PRIZE_ROOM + warp_to $1f, $1b, CELADON_CITY_WIDTH ; CELADON_DINER + warp_to $23, $1b, CELADON_CITY_WIDTH ; CELADON_HOUSE + warp_to $2b, $1b, CELADON_CITY_WIDTH ; CELADON_HOTEL |