diff options
Diffstat (limited to 'data/maps/objects/SafariZoneNorth.asm')
| -rwxr-xr-x | data/maps/objects/SafariZoneNorth.asm | 17 |
1 files changed, 4 insertions, 13 deletions
diff --git a/data/maps/objects/SafariZoneNorth.asm b/data/maps/objects/SafariZoneNorth.asm index 06563243..df5ee294 100755 --- a/data/maps/objects/SafariZoneNorth.asm +++ b/data/maps/objects/SafariZoneNorth.asm @@ -1,7 +1,7 @@ SafariZoneNorth_Object: db $0 ; border block - db 9 ; warps + def_warps warp 2, 35, 0, SAFARI_ZONE_WEST warp 3, 35, 1, SAFARI_ZONE_WEST warp 8, 35, 2, SAFARI_ZONE_WEST @@ -12,24 +12,15 @@ SafariZoneNorth_Object: warp 39, 31, 1, SAFARI_ZONE_EAST warp 35, 3, 0, SAFARI_ZONE_NORTH_REST_HOUSE - db 5 ; signs + def_signs sign 36, 4, 3 ; SafariZoneNorthText3 sign 4, 25, 4 ; SafariZoneNorthText4 sign 13, 31, 5 ; SafariZoneNorthText5 sign 19, 33, 6 ; SafariZoneNorthText6 sign 26, 28, 7 ; SafariZoneNorthText7 - db 2 ; objects + def_objects object SPRITE_POKE_BALL, 25, 1, STAY, NONE, 1, PROTEIN object SPRITE_POKE_BALL, 19, 7, STAY, NONE, 2, TM_SKULL_BASH - ; warp-to - warp_to 2, 35, SAFARI_ZONE_NORTH_WIDTH ; SAFARI_ZONE_WEST - warp_to 3, 35, SAFARI_ZONE_NORTH_WIDTH ; SAFARI_ZONE_WEST - warp_to 8, 35, SAFARI_ZONE_NORTH_WIDTH ; SAFARI_ZONE_WEST - warp_to 9, 35, SAFARI_ZONE_NORTH_WIDTH ; SAFARI_ZONE_WEST - warp_to 20, 35, SAFARI_ZONE_NORTH_WIDTH ; SAFARI_ZONE_CENTER - warp_to 21, 35, SAFARI_ZONE_NORTH_WIDTH ; SAFARI_ZONE_CENTER - warp_to 39, 30, SAFARI_ZONE_NORTH_WIDTH ; SAFARI_ZONE_EAST - warp_to 39, 31, SAFARI_ZONE_NORTH_WIDTH ; SAFARI_ZONE_EAST - warp_to 35, 3, SAFARI_ZONE_NORTH_WIDTH ; SAFARI_ZONE_NORTH_REST_HOUSE + def_warps_to SAFARI_ZONE_NORTH |