summaryrefslogtreecommitdiff
path: root/data/mapObjects/safarizonenorth.asm
diff options
context:
space:
mode:
Diffstat (limited to 'data/mapObjects/safarizonenorth.asm')
-rwxr-xr-xdata/mapObjects/safarizonenorth.asm56
1 files changed, 28 insertions, 28 deletions
diff --git a/data/mapObjects/safarizonenorth.asm b/data/mapObjects/safarizonenorth.asm
index d0305507..6cbe51f6 100755
--- a/data/mapObjects/safarizonenorth.asm
+++ b/data/mapObjects/safarizonenorth.asm
@@ -1,35 +1,35 @@
SafariZoneNorthObject:
db $0 ; border block
- db $9 ; warps
- db $23, $2, $0, SAFARI_ZONE_WEST
- db $23, $3, $1, SAFARI_ZONE_WEST
- db $23, $8, $2, SAFARI_ZONE_WEST
- db $23, $9, $3, SAFARI_ZONE_WEST
- db $23, $14, $4, SAFARI_ZONE_CENTER
- db $23, $15, $5, SAFARI_ZONE_CENTER
- db $1e, $27, $0, SAFARI_ZONE_EAST
- db $1f, $27, $1, SAFARI_ZONE_EAST
- db $3, $23, $0, SAFARI_ZONE_REST_HOUSE_4
+ db 9 ; warps
+ warp 2, 35, 0, SAFARI_ZONE_WEST
+ warp 3, 35, 1, SAFARI_ZONE_WEST
+ warp 8, 35, 2, SAFARI_ZONE_WEST
+ warp 9, 35, 3, SAFARI_ZONE_WEST
+ warp 20, 35, 4, SAFARI_ZONE_CENTER
+ warp 21, 35, 5, SAFARI_ZONE_CENTER
+ warp 39, 30, 0, SAFARI_ZONE_EAST
+ warp 39, 31, 1, SAFARI_ZONE_EAST
+ warp 35, 3, 0, SAFARI_ZONE_REST_HOUSE_4
- db $5 ; signs
- db $4, $24, $3 ; SafariZoneNorthText3
- db $19, $4, $4 ; SafariZoneNorthText4
- db $1f, $d, $5 ; SafariZoneNorthText5
- db $21, $13, $6 ; SafariZoneNorthText6
- db $1c, $1a, $7 ; SafariZoneNorthText7
+ db 5 ; 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
- object SPRITE_BALL, $19, $1, STAY, NONE, $1, PROTEIN
- object SPRITE_BALL, $13, $7, STAY, NONE, $2, TM_40
+ db 2 ; objects
+ object SPRITE_BALL, 25, 1, STAY, NONE, 1, PROTEIN
+ object SPRITE_BALL, 19, 7, STAY, NONE, 2, TM_40
; warp-to
- EVENT_DISP SAFARI_ZONE_NORTH_WIDTH, $23, $2 ; SAFARI_ZONE_WEST
- EVENT_DISP SAFARI_ZONE_NORTH_WIDTH, $23, $3 ; SAFARI_ZONE_WEST
- EVENT_DISP SAFARI_ZONE_NORTH_WIDTH, $23, $8 ; SAFARI_ZONE_WEST
- EVENT_DISP SAFARI_ZONE_NORTH_WIDTH, $23, $9 ; SAFARI_ZONE_WEST
- EVENT_DISP SAFARI_ZONE_NORTH_WIDTH, $23, $14 ; SAFARI_ZONE_CENTER
- EVENT_DISP SAFARI_ZONE_NORTH_WIDTH, $23, $15 ; SAFARI_ZONE_CENTER
- EVENT_DISP SAFARI_ZONE_NORTH_WIDTH, $1e, $27 ; SAFARI_ZONE_EAST
- EVENT_DISP SAFARI_ZONE_NORTH_WIDTH, $1f, $27 ; SAFARI_ZONE_EAST
- EVENT_DISP SAFARI_ZONE_NORTH_WIDTH, $3, $23 ; SAFARI_ZONE_REST_HOUSE_4
+ 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_REST_HOUSE_4