summaryrefslogtreecommitdiff
path: root/data/mapObjects/safarizoneresthouse1.asm
diff options
context:
space:
mode:
Diffstat (limited to 'data/mapObjects/safarizoneresthouse1.asm')
-rwxr-xr-xdata/mapObjects/safarizoneresthouse1.asm18
1 files changed, 9 insertions, 9 deletions
diff --git a/data/mapObjects/safarizoneresthouse1.asm b/data/mapObjects/safarizoneresthouse1.asm
index 79156825..031debec 100755
--- a/data/mapObjects/safarizoneresthouse1.asm
+++ b/data/mapObjects/safarizoneresthouse1.asm
@@ -1,16 +1,16 @@
SafariZoneRestHouse1Object:
db $a ; border block
- db $2 ; warps
- db $7, $2, $8, SAFARI_ZONE_CENTER
- db $7, $3, $8, SAFARI_ZONE_CENTER
+ db 2 ; warps
+ warp 2, 7, 8, SAFARI_ZONE_CENTER
+ warp 3, 7, 8, SAFARI_ZONE_CENTER
- db $0 ; signs
+ db 0 ; signs
- db $2 ; objects
- object SPRITE_GIRL, $3, $2, STAY, DOWN, $1 ; person
- object SPRITE_OAK_AIDE, $1, $4, WALK, $1, $2 ; person
+ db 2 ; objects
+ object SPRITE_GIRL, 3, 2, STAY, DOWN, 1 ; person
+ object SPRITE_OAK_AIDE, 1, 4, WALK, 1, 2 ; person
; warp-to
- EVENT_DISP SAFARI_ZONE_REST_HOUSE_1_WIDTH, $7, $2 ; SAFARI_ZONE_CENTER
- EVENT_DISP SAFARI_ZONE_REST_HOUSE_1_WIDTH, $7, $3 ; SAFARI_ZONE_CENTER
+ warp_to 2, 7, SAFARI_ZONE_REST_HOUSE_1_WIDTH ; SAFARI_ZONE_CENTER
+ warp_to 3, 7, SAFARI_ZONE_REST_HOUSE_1_WIDTH ; SAFARI_ZONE_CENTER