summaryrefslogtreecommitdiff
path: root/data/mapObjects/safarizonecenter.asm
diff options
context:
space:
mode:
Diffstat (limited to 'data/mapObjects/safarizonecenter.asm')
-rwxr-xr-xdata/mapObjects/safarizonecenter.asm48
1 files changed, 24 insertions, 24 deletions
diff --git a/data/mapObjects/safarizonecenter.asm b/data/mapObjects/safarizonecenter.asm
index b5fa0107..550f9aa4 100755
--- a/data/mapObjects/safarizonecenter.asm
+++ b/data/mapObjects/safarizonecenter.asm
@@ -1,31 +1,31 @@
SafariZoneCenterObject:
db $0 ; border block
- db $9 ; warps
- db $19, $e, $2, SAFARI_ZONE_ENTRANCE
- db $19, $f, $3, SAFARI_ZONE_ENTRANCE
- db $a, $0, $4, SAFARI_ZONE_WEST
- db $b, $0, $5, SAFARI_ZONE_WEST
- db $0, $e, $4, SAFARI_ZONE_NORTH
- db $0, $f, $5, SAFARI_ZONE_NORTH
- db $a, $1d, $2, SAFARI_ZONE_EAST
- db $b, $1d, $3, SAFARI_ZONE_EAST
- db $13, $11, $0, SAFARI_ZONE_REST_HOUSE_1
+ db 9 ; warps
+ warp 14, 25, 2, SAFARI_ZONE_ENTRANCE
+ warp 15, 25, 3, SAFARI_ZONE_ENTRANCE
+ warp 0, 10, 4, SAFARI_ZONE_WEST
+ warp 0, 11, 5, SAFARI_ZONE_WEST
+ warp 14, 0, 4, SAFARI_ZONE_NORTH
+ warp 15, 0, 5, SAFARI_ZONE_NORTH
+ warp 29, 10, 2, SAFARI_ZONE_EAST
+ warp 29, 11, 3, SAFARI_ZONE_EAST
+ warp 17, 19, 0, SAFARI_ZONE_REST_HOUSE_1
- db $2 ; signs
- db $14, $12, $2 ; SafariZoneCenterText2
- db $16, $e, $3 ; SafariZoneCenterText3
+ db 2 ; signs
+ sign 18, 20, 2 ; SafariZoneCenterText2
+ sign 14, 22, 3 ; SafariZoneCenterText3
- db $1 ; objects
- object SPRITE_BALL, $e, $a, STAY, NONE, $1, NUGGET
+ db 1 ; objects
+ object SPRITE_BALL, 14, 10, STAY, NONE, 1, NUGGET
; warp-to
- EVENT_DISP SAFARI_ZONE_CENTER_WIDTH, $19, $e ; SAFARI_ZONE_ENTRANCE
- EVENT_DISP SAFARI_ZONE_CENTER_WIDTH, $19, $f ; SAFARI_ZONE_ENTRANCE
- EVENT_DISP SAFARI_ZONE_CENTER_WIDTH, $a, $0 ; SAFARI_ZONE_WEST
- EVENT_DISP SAFARI_ZONE_CENTER_WIDTH, $b, $0 ; SAFARI_ZONE_WEST
- EVENT_DISP SAFARI_ZONE_CENTER_WIDTH, $0, $e ; SAFARI_ZONE_NORTH
- EVENT_DISP SAFARI_ZONE_CENTER_WIDTH, $0, $f ; SAFARI_ZONE_NORTH
- EVENT_DISP SAFARI_ZONE_CENTER_WIDTH, $a, $1d ; SAFARI_ZONE_EAST
- EVENT_DISP SAFARI_ZONE_CENTER_WIDTH, $b, $1d ; SAFARI_ZONE_EAST
- EVENT_DISP SAFARI_ZONE_CENTER_WIDTH, $13, $11 ; SAFARI_ZONE_REST_HOUSE_1
+ warp_to 14, 25, SAFARI_ZONE_CENTER_WIDTH ; SAFARI_ZONE_ENTRANCE
+ warp_to 15, 25, SAFARI_ZONE_CENTER_WIDTH ; SAFARI_ZONE_ENTRANCE
+ warp_to 0, 10, SAFARI_ZONE_CENTER_WIDTH ; SAFARI_ZONE_WEST
+ warp_to 0, 11, SAFARI_ZONE_CENTER_WIDTH ; SAFARI_ZONE_WEST
+ warp_to 14, 0, SAFARI_ZONE_CENTER_WIDTH ; SAFARI_ZONE_NORTH
+ warp_to 15, 0, SAFARI_ZONE_CENTER_WIDTH ; SAFARI_ZONE_NORTH
+ warp_to 29, 10, SAFARI_ZONE_CENTER_WIDTH ; SAFARI_ZONE_EAST
+ warp_to 29, 11, SAFARI_ZONE_CENTER_WIDTH ; SAFARI_ZONE_EAST
+ warp_to 17, 19, SAFARI_ZONE_CENTER_WIDTH ; SAFARI_ZONE_REST_HOUSE_1