summaryrefslogtreecommitdiff
path: root/data/mapObjects/safarizoneresthouse3.asm
diff options
context:
space:
mode:
Diffstat (limited to 'data/mapObjects/safarizoneresthouse3.asm')
-rwxr-xr-xdata/mapObjects/safarizoneresthouse3.asm20
1 files changed, 10 insertions, 10 deletions
diff --git a/data/mapObjects/safarizoneresthouse3.asm b/data/mapObjects/safarizoneresthouse3.asm
index ae973fa8..00623953 100755
--- a/data/mapObjects/safarizoneresthouse3.asm
+++ b/data/mapObjects/safarizoneresthouse3.asm
@@ -1,17 +1,17 @@
SafariZoneRestHouse3Object:
db $a ; border block
- db $2 ; warps
- db $7, $2, $4, SAFARI_ZONE_EAST
- db $7, $3, $4, SAFARI_ZONE_EAST
+ db 2 ; warps
+ warp 2, 7, 4, SAFARI_ZONE_EAST
+ warp 3, 7, 4, SAFARI_ZONE_EAST
- db $0 ; signs
+ db 0 ; signs
- db $3 ; objects
- object SPRITE_OAK_AIDE, $1, $3, WALK, $1, $1 ; person
- object SPRITE_ROCKER, $4, $2, STAY, NONE, $2 ; person
- object SPRITE_LAPRAS_GIVER, $5, $2, STAY, NONE, $3 ; person
+ db 3 ; objects
+ object SPRITE_OAK_AIDE, 1, 3, WALK, 1, 1 ; person
+ object SPRITE_ROCKER, 4, 2, STAY, NONE, 2 ; person
+ object SPRITE_LAPRAS_GIVER, 5, 2, STAY, NONE, 3 ; person
; warp-to
- EVENT_DISP SAFARI_ZONE_REST_HOUSE_3_WIDTH, $7, $2 ; SAFARI_ZONE_EAST
- EVENT_DISP SAFARI_ZONE_REST_HOUSE_3_WIDTH, $7, $3 ; SAFARI_ZONE_EAST
+ warp_to 2, 7, SAFARI_ZONE_REST_HOUSE_3_WIDTH ; SAFARI_ZONE_EAST
+ warp_to 3, 7, SAFARI_ZONE_REST_HOUSE_3_WIDTH ; SAFARI_ZONE_EAST