summaryrefslogtreecommitdiff
path: root/data/maps/objects/SafariZoneWestRestHouse.asm
diff options
context:
space:
mode:
Diffstat (limited to 'data/maps/objects/SafariZoneWestRestHouse.asm')
-rw-r--r--data/maps/objects/SafariZoneWestRestHouse.asm16
1 files changed, 8 insertions, 8 deletions
diff --git a/data/maps/objects/SafariZoneWestRestHouse.asm b/data/maps/objects/SafariZoneWestRestHouse.asm
index 26bb481e..654c8913 100644
--- a/data/maps/objects/SafariZoneWestRestHouse.asm
+++ b/data/maps/objects/SafariZoneWestRestHouse.asm
@@ -1,15 +1,15 @@
SafariZoneWestRestHouse_Object:
db $a ; border block
- def_warps
- warp 2, 7, 7, SAFARI_ZONE_WEST
- warp 3, 7, 7, SAFARI_ZONE_WEST
+ def_warp_events
+ warp_event 2, 7, SAFARI_ZONE_WEST, 7
+ warp_event 3, 7, SAFARI_ZONE_WEST, 7
- def_signs
+ def_bg_events
- def_objects
- object SPRITE_SCIENTIST, 4, 4, WALK, ANY_DIR, 1 ; person
- object SPRITE_COOLTRAINER_M, 0, 2, STAY, RIGHT, 2 ; person
- object SPRITE_ERIKA, 6, 2, STAY, DOWN, 3 ; person
+ def_object_events
+ object_event 4, 4, SPRITE_SCIENTIST, WALK, ANY_DIR, 1 ; person
+ object_event 0, 2, SPRITE_COOLTRAINER_M, STAY, RIGHT, 2 ; person
+ object_event 6, 2, SPRITE_ERIKA, STAY, DOWN, 3 ; person
def_warps_to SAFARI_ZONE_WEST_REST_HOUSE