diff options
Diffstat (limited to 'data/mapObjects/saffroncity.asm')
| -rwxr-xr-x | data/mapObjects/saffroncity.asm | 52 |
1 files changed, 26 insertions, 26 deletions
diff --git a/data/mapObjects/saffroncity.asm b/data/mapObjects/saffroncity.asm index 7275800a..6c1c9b14 100755 --- a/data/mapObjects/saffroncity.asm +++ b/data/mapObjects/saffroncity.asm @@ -2,26 +2,26 @@ SaffronCityObject: db $f ; border block db $8 ; warps - db $5, $7, $0, COPYCATS_HOUSE_1F - db $3, $1a, $0, FIGHTING_DOJO - db $3, $22, $0, SAFFRON_GYM - db $b, $d, $0, SAFFRON_HOUSE_1 - db $b, $19, $0, SAFFRON_MART - db $15, $12, $0, SILPH_CO_1F - db $1d, $9, $0, SAFFRON_POKECENTER - db $1d, $1d, $0, SAFFRON_HOUSE_2 + warp $7, $5, $0, COPYCATS_HOUSE_1F + warp $1a, $3, $0, FIGHTING_DOJO + warp $22, $3, $0, SAFFRON_GYM + warp $d, $b, $0, SAFFRON_HOUSE_1 + warp $19, $b, $0, SAFFRON_MART + warp $12, $15, $0, SILPH_CO_1F + warp $9, $1d, $0, SAFFRON_POKECENTER + warp $1d, $1d, $0, SAFFRON_HOUSE_2 db $a ; signs - db $5, $11, $10 ; SaffronCityText16 - db $5, $1b, $11 ; SaffronCityText17 - db $5, $23, $12 ; SaffronCityText18 - db $b, $1a, $13 ; MartSignText - db $13, $27, $14 ; SaffronCityText20 - db $15, $5, $15 ; SaffronCityText21 - db $15, $f, $16 ; SaffronCityText22 - db $1d, $a, $17 ; PokeCenterSignText - db $1d, $1b, $18 ; SaffronCityText24 - db $13, $1, $19 ; SaffronCityText25 + sign $11, $5, $10 ; SaffronCityText16 + sign $1b, $5, $11 ; SaffronCityText17 + sign $23, $5, $12 ; SaffronCityText18 + sign $1a, $b, $13 ; MartSignText + sign $27, $13, $14 ; SaffronCityText20 + sign $5, $15, $15 ; SaffronCityText21 + sign $f, $15, $16 ; SaffronCityText22 + sign $a, $1d, $17 ; PokeCenterSignText + sign $1b, $1d, $18 ; SaffronCityText24 + sign $1, $13, $19 ; SaffronCityText25 db $f ; objects object SPRITE_ROCKET, $7, $6, STAY, NONE, $1 ; person @@ -41,11 +41,11 @@ SaffronCityObject: object SPRITE_ROCKET, $13, $16, STAY, DOWN, $f ; person ; warp-to - EVENT_DISP SAFFRON_CITY_WIDTH, $5, $7 ; COPYCATS_HOUSE_1F - EVENT_DISP SAFFRON_CITY_WIDTH, $3, $1a ; FIGHTING_DOJO - EVENT_DISP SAFFRON_CITY_WIDTH, $3, $22 ; SAFFRON_GYM - EVENT_DISP SAFFRON_CITY_WIDTH, $b, $d ; SAFFRON_HOUSE_1 - EVENT_DISP SAFFRON_CITY_WIDTH, $b, $19 ; SAFFRON_MART - EVENT_DISP SAFFRON_CITY_WIDTH, $15, $12 ; SILPH_CO_1F - EVENT_DISP SAFFRON_CITY_WIDTH, $1d, $9 ; SAFFRON_POKECENTER - EVENT_DISP SAFFRON_CITY_WIDTH, $1d, $1d ; SAFFRON_HOUSE_2 + warp_to $7, $5, SAFFRON_CITY_WIDTH ; COPYCATS_HOUSE_1F + warp_to $1a, $3, SAFFRON_CITY_WIDTH ; FIGHTING_DOJO + warp_to $22, $3, SAFFRON_CITY_WIDTH ; SAFFRON_GYM + warp_to $d, $b, SAFFRON_CITY_WIDTH ; SAFFRON_HOUSE_1 + warp_to $19, $b, SAFFRON_CITY_WIDTH ; SAFFRON_MART + warp_to $12, $15, SAFFRON_CITY_WIDTH ; SILPH_CO_1F + warp_to $9, $1d, SAFFRON_CITY_WIDTH ; SAFFRON_POKECENTER + warp_to $1d, $1d, SAFFRON_CITY_WIDTH ; SAFFRON_HOUSE_2 |