summaryrefslogtreecommitdiff
path: root/data/mapObjects/safarizoneresthouse4.asm
diff options
context:
space:
mode:
Diffstat (limited to 'data/mapObjects/safarizoneresthouse4.asm')
-rwxr-xr-xdata/mapObjects/safarizoneresthouse4.asm20
1 files changed, 10 insertions, 10 deletions
diff --git a/data/mapObjects/safarizoneresthouse4.asm b/data/mapObjects/safarizoneresthouse4.asm
index 7502732c..d3b81b4e 100755
--- a/data/mapObjects/safarizoneresthouse4.asm
+++ b/data/mapObjects/safarizoneresthouse4.asm
@@ -1,17 +1,17 @@
SafariZoneRestHouse4Object:
db $a ; border block
- db $2 ; warps
- db $7, $2, $8, SAFARI_ZONE_NORTH
- db $7, $3, $8, SAFARI_ZONE_NORTH
+ db 2 ; warps
+ warp 2, 7, 8, SAFARI_ZONE_NORTH
+ warp 3, 7, 8, SAFARI_ZONE_NORTH
- db $0 ; signs
+ db 0 ; signs
- db $3 ; objects
- object SPRITE_OAK_AIDE, $6, $3, WALK, $2, $1 ; person
- object SPRITE_WHITE_PLAYER, $3, $4, STAY, NONE, $2 ; person
- object SPRITE_GENTLEMAN, $1, $5, WALK, $1, $3 ; person
+ db 3 ; objects
+ object SPRITE_OAK_AIDE, 6, 3, WALK, 2, 1 ; person
+ object SPRITE_WHITE_PLAYER, 3, 4, STAY, NONE, 2 ; person
+ object SPRITE_GENTLEMAN, 1, 5, WALK, 1, 3 ; person
; warp-to
- EVENT_DISP SAFARI_ZONE_REST_HOUSE_4_WIDTH, $7, $2 ; SAFARI_ZONE_NORTH
- EVENT_DISP SAFARI_ZONE_REST_HOUSE_4_WIDTH, $7, $3 ; SAFARI_ZONE_NORTH
+ warp_to 2, 7, SAFARI_ZONE_REST_HOUSE_4_WIDTH ; SAFARI_ZONE_NORTH
+ warp_to 3, 7, SAFARI_ZONE_REST_HOUSE_4_WIDTH ; SAFARI_ZONE_NORTH