summaryrefslogtreecommitdiff
path: root/data/mapObjects/safarizonenorth.asm
diff options
context:
space:
mode:
Diffstat (limited to 'data/mapObjects/safarizonenorth.asm')
-rwxr-xr-xdata/mapObjects/safarizonenorth.asm58
1 files changed, 29 insertions, 29 deletions
diff --git a/data/mapObjects/safarizonenorth.asm b/data/mapObjects/safarizonenorth.asm
index 421cd4e2..0fb2c68f 100755
--- a/data/mapObjects/safarizonenorth.asm
+++ b/data/mapObjects/safarizonenorth.asm
@@ -1,35 +1,35 @@
SafariZoneNorthObject:
- db $0 ; border block
+ db 0 ; border block
- db $9 ; warps
- warp $2, $23, $0, SAFARI_ZONE_WEST
- warp $3, $23, $1, SAFARI_ZONE_WEST
- warp $8, $23, $2, SAFARI_ZONE_WEST
- warp $9, $23, $3, SAFARI_ZONE_WEST
- warp $14, $23, $4, SAFARI_ZONE_CENTER
- warp $15, $23, $5, SAFARI_ZONE_CENTER
- warp $27, $1e, $0, SAFARI_ZONE_EAST
- warp $27, $1f, $1, SAFARI_ZONE_EAST
- warp $23, $3, $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
- sign $24, $4, $3 ; SafariZoneNorthText3
- sign $4, $19, $4 ; SafariZoneNorthText4
- sign $d, $1f, $5 ; SafariZoneNorthText5
- sign $13, $21, $6 ; SafariZoneNorthText6
- sign $1a, $1c, $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
- warp_to $2, $23, SAFARI_ZONE_NORTH_WIDTH ; SAFARI_ZONE_WEST
- warp_to $3, $23, SAFARI_ZONE_NORTH_WIDTH ; SAFARI_ZONE_WEST
- warp_to $8, $23, SAFARI_ZONE_NORTH_WIDTH ; SAFARI_ZONE_WEST
- warp_to $9, $23, SAFARI_ZONE_NORTH_WIDTH ; SAFARI_ZONE_WEST
- warp_to $14, $23, SAFARI_ZONE_NORTH_WIDTH ; SAFARI_ZONE_CENTER
- warp_to $15, $23, SAFARI_ZONE_NORTH_WIDTH ; SAFARI_ZONE_CENTER
- warp_to $27, $1e, SAFARI_ZONE_NORTH_WIDTH ; SAFARI_ZONE_EAST
- warp_to $27, $1f, SAFARI_ZONE_NORTH_WIDTH ; SAFARI_ZONE_EAST
- warp_to $23, $3, SAFARI_ZONE_NORTH_WIDTH ; 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