summaryrefslogtreecommitdiff
path: root/data/mapObjects/safarizonewest.asm
diff options
context:
space:
mode:
Diffstat (limited to 'data/mapObjects/safarizonewest.asm')
-rwxr-xr-xdata/mapObjects/safarizonewest.asm40
1 files changed, 20 insertions, 20 deletions
diff --git a/data/mapObjects/safarizonewest.asm b/data/mapObjects/safarizonewest.asm
index 64ed0876..6a667fcc 100755
--- a/data/mapObjects/safarizonewest.asm
+++ b/data/mapObjects/safarizonewest.asm
@@ -2,20 +2,20 @@ SafariZoneWestObject:
db $0 ; border block
db $8 ; warps
- db $0, $14, $0, SAFARI_ZONE_NORTH
- db $0, $15, $1, SAFARI_ZONE_NORTH
- db $0, $1a, $2, SAFARI_ZONE_NORTH
- db $0, $1b, $3, SAFARI_ZONE_NORTH
- db $16, $1d, $2, SAFARI_ZONE_CENTER
- db $17, $1d, $3, SAFARI_ZONE_CENTER
- db $3, $3, $0, SAFARI_ZONE_SECRET_HOUSE
- db $b, $b, $0, SAFARI_ZONE_REST_HOUSE_2
+ warp $14, $0, $0, SAFARI_ZONE_NORTH
+ warp $15, $0, $1, SAFARI_ZONE_NORTH
+ warp $1a, $0, $2, SAFARI_ZONE_NORTH
+ warp $1b, $0, $3, SAFARI_ZONE_NORTH
+ warp $1d, $16, $2, SAFARI_ZONE_CENTER
+ warp $1d, $17, $3, SAFARI_ZONE_CENTER
+ warp $3, $3, $0, SAFARI_ZONE_SECRET_HOUSE
+ warp $b, $b, $0, SAFARI_ZONE_REST_HOUSE_2
db $4 ; signs
- db $c, $c, $5 ; SafariZoneWestText5
- db $3, $11, $6 ; SafariZoneWestText6
- db $4, $1a, $7 ; SafariZoneWestText7
- db $16, $18, $8 ; SafariZoneWestText8
+ sign $c, $c, $5 ; SafariZoneWestText5
+ sign $11, $3, $6 ; SafariZoneWestText6
+ sign $1a, $4, $7 ; SafariZoneWestText7
+ sign $18, $16, $8 ; SafariZoneWestText8
db $4 ; objects
object SPRITE_BALL, $8, $14, STAY, NONE, $1, MAX_POTION
@@ -24,11 +24,11 @@ SafariZoneWestObject:
object SPRITE_BALL, $13, $7, STAY, NONE, $4, GOLD_TEETH
; warp-to
- EVENT_DISP SAFARI_ZONE_WEST_WIDTH, $0, $14 ; SAFARI_ZONE_NORTH
- EVENT_DISP SAFARI_ZONE_WEST_WIDTH, $0, $15 ; SAFARI_ZONE_NORTH
- EVENT_DISP SAFARI_ZONE_WEST_WIDTH, $0, $1a ; SAFARI_ZONE_NORTH
- EVENT_DISP SAFARI_ZONE_WEST_WIDTH, $0, $1b ; SAFARI_ZONE_NORTH
- EVENT_DISP SAFARI_ZONE_WEST_WIDTH, $16, $1d ; SAFARI_ZONE_CENTER
- EVENT_DISP SAFARI_ZONE_WEST_WIDTH, $17, $1d ; SAFARI_ZONE_CENTER
- EVENT_DISP SAFARI_ZONE_WEST_WIDTH, $3, $3 ; SAFARI_ZONE_SECRET_HOUSE
- EVENT_DISP SAFARI_ZONE_WEST_WIDTH, $b, $b ; SAFARI_ZONE_REST_HOUSE_2
+ warp_to $14, $0, SAFARI_ZONE_WEST_WIDTH ; SAFARI_ZONE_NORTH
+ warp_to $15, $0, SAFARI_ZONE_WEST_WIDTH ; SAFARI_ZONE_NORTH
+ warp_to $1a, $0, SAFARI_ZONE_WEST_WIDTH ; SAFARI_ZONE_NORTH
+ warp_to $1b, $0, SAFARI_ZONE_WEST_WIDTH ; SAFARI_ZONE_NORTH
+ warp_to $1d, $16, SAFARI_ZONE_WEST_WIDTH ; SAFARI_ZONE_CENTER
+ warp_to $1d, $17, SAFARI_ZONE_WEST_WIDTH ; SAFARI_ZONE_CENTER
+ warp_to $3, $3, SAFARI_ZONE_WEST_WIDTH ; SAFARI_ZONE_SECRET_HOUSE
+ warp_to $b, $b, SAFARI_ZONE_WEST_WIDTH ; SAFARI_ZONE_REST_HOUSE_2