diff options
Diffstat (limited to 'data/maps/objects/FuchsiaCity.asm')
| -rwxr-xr-x | data/maps/objects/FuchsiaCity.asm | 17 |
1 files changed, 4 insertions, 13 deletions
diff --git a/data/maps/objects/FuchsiaCity.asm b/data/maps/objects/FuchsiaCity.asm index c5f0ef58..adb68a15 100755 --- a/data/maps/objects/FuchsiaCity.asm +++ b/data/maps/objects/FuchsiaCity.asm @@ -1,7 +1,7 @@ FuchsiaCity_Object: db $f ; border block - db 9 ; warps + def_warps warp 5, 13, 0, FUCHSIA_MART warp 11, 27, 0, FUCHSIA_BILLS_GRANDPAS_HOUSE warp 19, 27, 0, FUCHSIA_POKECENTER @@ -12,7 +12,7 @@ FuchsiaCity_Object: warp 31, 27, 1, FUCHSIA_GOOD_ROD_HOUSE warp 31, 24, 0, FUCHSIA_GOOD_ROD_HOUSE - db 14 ; signs + def_signs sign 15, 23, 11 ; FuchsiaCityText11 sign 25, 15, 12 ; FuchsiaCityText12 sign 17, 5, 13 ; FuchsiaCityText13 @@ -28,7 +28,7 @@ FuchsiaCity_Object: sign 13, 15, 23 ; FuchsiaCityText23 sign 7, 7, 24 ; FuchsiaCityText24 - db 10 ; objects + def_objects object SPRITE_YOUNGSTER, 10, 12, WALK, LEFT_RIGHT, 1 ; person object SPRITE_GAMBLER, 28, 17, WALK, LEFT_RIGHT, 2 ; person object SPRITE_FISHER, 30, 14, STAY, DOWN, 3 ; person @@ -40,13 +40,4 @@ FuchsiaCity_Object: object SPRITE_SEEL, 8, 17, WALK, ANY_DIR, 9 ; person object SPRITE_FOSSIL, 6, 5, STAY, NONE, 10 ; person - ; warp-to - warp_to 5, 13, FUCHSIA_CITY_WIDTH ; FUCHSIA_MART - warp_to 11, 27, FUCHSIA_CITY_WIDTH ; FUCHSIA_BILLS_GRANDPAS_HOUSE - warp_to 19, 27, FUCHSIA_CITY_WIDTH ; FUCHSIA_POKECENTER - warp_to 27, 27, FUCHSIA_CITY_WIDTH ; WARDENS_HOUSE - warp_to 18, 3, FUCHSIA_CITY_WIDTH ; SAFARI_ZONE_GATE - warp_to 5, 27, FUCHSIA_CITY_WIDTH ; FUCHSIA_GYM - warp_to 22, 13, FUCHSIA_CITY_WIDTH ; FUCHSIA_MEETING_ROOM - warp_to 31, 27, FUCHSIA_CITY_WIDTH ; FUCHSIA_GOOD_ROD_HOUSE - warp_to 31, 24, FUCHSIA_CITY_WIDTH ; FUCHSIA_GOOD_ROD_HOUSE + def_warps_to FUCHSIA_CITY |