summaryrefslogtreecommitdiff
path: root/data/maps/objects/BluesHouse.asm
diff options
context:
space:
mode:
Diffstat (limited to 'data/maps/objects/BluesHouse.asm')
-rw-r--r--data/maps/objects/BluesHouse.asm16
1 files changed, 8 insertions, 8 deletions
diff --git a/data/maps/objects/BluesHouse.asm b/data/maps/objects/BluesHouse.asm
index 4858b785..36d96058 100644
--- a/data/maps/objects/BluesHouse.asm
+++ b/data/maps/objects/BluesHouse.asm
@@ -1,15 +1,15 @@
BluesHouse_Object:
db $a ; border block
- def_warps
- warp 2, 7, 1, LAST_MAP
- warp 3, 7, 1, LAST_MAP
+ def_warp_events
+ warp_event 2, 7, LAST_MAP, 1
+ warp_event 3, 7, LAST_MAP, 1
- def_signs
+ def_bg_events
- def_objects
- object SPRITE_DAISY, 2, 3, STAY, RIGHT, 1 ; Daisy, sitting by map
- object SPRITE_DAISY, 6, 4, WALK, UP_DOWN, 2, 0 ; Daisy, walking around
- object SPRITE_POKEDEX, 3, 3, STAY, NONE, 3, 0 ; map on table
+ def_object_events
+ object_event 2, 3, SPRITE_DAISY, STAY, RIGHT, 1 ; Daisy, sitting by map
+ object_event 6, 4, SPRITE_DAISY, WALK, UP_DOWN, 2, 0 ; Daisy, walking around
+ object_event 3, 3, SPRITE_POKEDEX, STAY, NONE, 3, 0 ; map on table
def_warps_to BLUES_HOUSE