diff options
Diffstat (limited to 'data/mapObjects/fuchsiacity.asm')
| -rwxr-xr-x | data/mapObjects/fuchsiacity.asm | 64 |
1 files changed, 32 insertions, 32 deletions
diff --git a/data/mapObjects/fuchsiacity.asm b/data/mapObjects/fuchsiacity.asm index bcca4004..71533132 100755 --- a/data/mapObjects/fuchsiacity.asm +++ b/data/mapObjects/fuchsiacity.asm @@ -2,31 +2,31 @@ FuchsiaCityObject: db $f ; border block db $9 ; warps - db $d, $5, $0, FUCHSIA_MART - db $1b, $b, $0, FUCHSIA_HOUSE_1 - db $1b, $13, $0, FUCHSIA_POKECENTER - db $1b, $1b, $0, FUCHSIA_HOUSE_2 - db $3, $12, $0, SAFARI_ZONE_ENTRANCE - db $1b, $5, $0, FUCHSIA_GYM - db $d, $16, $0, FUCHSIA_MEETING_ROOM - db $1b, $1f, $1, FUCHSIA_HOUSE_3 - db $18, $1f, $0, FUCHSIA_HOUSE_3 + warp $5, $d, $0, FUCHSIA_MART + warp $b, $1b, $0, FUCHSIA_HOUSE_1 + warp $13, $1b, $0, FUCHSIA_POKECENTER + warp $1b, $1b, $0, FUCHSIA_HOUSE_2 + warp $12, $3, $0, SAFARI_ZONE_ENTRANCE + warp $5, $1b, $0, FUCHSIA_GYM + warp $16, $d, $0, FUCHSIA_MEETING_ROOM + warp $1f, $1b, $1, FUCHSIA_HOUSE_3 + warp $1f, $18, $0, FUCHSIA_HOUSE_3 db $e ; signs - db $17, $f, $b ; FuchsiaCityText11 - db $f, $19, $c ; FuchsiaCityText12 - db $5, $11, $d ; FuchsiaCityText13 - db $d, $6, $e ; MartSignText - db $1b, $14, $f ; PokeCenterSignText - db $1d, $1b, $10 ; FuchsiaCityText16 - db $f, $15, $11 ; FuchsiaCityText17 - db $1d, $5, $12 ; FuchsiaCityText18 - db $7, $21, $13 ; FuchsiaCityText19 - db $7, $1b, $14 ; FuchsiaCityText20 - db $7, $d, $15 ; FuchsiaCityText21 - db $d, $1f, $16 ; FuchsiaCityText22 - db $f, $d, $17 ; FuchsiaCityText23 - db $7, $7, $18 ; FuchsiaCityText24 + sign $f, $17, $b ; FuchsiaCityText11 + sign $19, $f, $c ; FuchsiaCityText12 + sign $11, $5, $d ; FuchsiaCityText13 + sign $6, $d, $e ; MartSignText + sign $14, $1b, $f ; PokeCenterSignText + sign $1b, $1d, $10 ; FuchsiaCityText16 + sign $15, $f, $11 ; FuchsiaCityText17 + sign $5, $1d, $12 ; FuchsiaCityText18 + sign $21, $7, $13 ; FuchsiaCityText19 + sign $1b, $7, $14 ; FuchsiaCityText20 + sign $d, $7, $15 ; FuchsiaCityText21 + sign $1f, $d, $16 ; FuchsiaCityText22 + sign $d, $f, $17 ; FuchsiaCityText23 + sign $7, $7, $18 ; FuchsiaCityText24 db $a ; objects object SPRITE_BUG_CATCHER, $a, $c, WALK, $2, $1 ; person @@ -41,12 +41,12 @@ FuchsiaCityObject: object SPRITE_OMANYTE, $6, $5, STAY, NONE, $a ; person ; warp-to - EVENT_DISP FUCHSIA_CITY_WIDTH, $d, $5 ; FUCHSIA_MART - EVENT_DISP FUCHSIA_CITY_WIDTH, $1b, $b ; FUCHSIA_HOUSE_1 - EVENT_DISP FUCHSIA_CITY_WIDTH, $1b, $13 ; FUCHSIA_POKECENTER - EVENT_DISP FUCHSIA_CITY_WIDTH, $1b, $1b ; FUCHSIA_HOUSE_2 - EVENT_DISP FUCHSIA_CITY_WIDTH, $3, $12 ; SAFARI_ZONE_ENTRANCE - EVENT_DISP FUCHSIA_CITY_WIDTH, $1b, $5 ; FUCHSIA_GYM - EVENT_DISP FUCHSIA_CITY_WIDTH, $d, $16 ; FUCHSIA_MEETING_ROOM - EVENT_DISP FUCHSIA_CITY_WIDTH, $1b, $1f ; FUCHSIA_HOUSE_3 - EVENT_DISP FUCHSIA_CITY_WIDTH, $18, $1f ; FUCHSIA_HOUSE_3 + warp_to $5, $d, FUCHSIA_CITY_WIDTH ; FUCHSIA_MART + warp_to $b, $1b, FUCHSIA_CITY_WIDTH ; FUCHSIA_HOUSE_1 + warp_to $13, $1b, FUCHSIA_CITY_WIDTH ; FUCHSIA_POKECENTER + warp_to $1b, $1b, FUCHSIA_CITY_WIDTH ; FUCHSIA_HOUSE_2 + warp_to $12, $3, FUCHSIA_CITY_WIDTH ; SAFARI_ZONE_ENTRANCE + warp_to $5, $1b, FUCHSIA_CITY_WIDTH ; FUCHSIA_GYM + warp_to $16, $d, FUCHSIA_CITY_WIDTH ; FUCHSIA_MEETING_ROOM + warp_to $1f, $1b, FUCHSIA_CITY_WIDTH ; FUCHSIA_HOUSE_3 + warp_to $1f, $18, FUCHSIA_CITY_WIDTH ; FUCHSIA_HOUSE_3 |