summaryrefslogtreecommitdiff
path: root/data/maps/objects/VermilionMart.asm
diff options
context:
space:
mode:
Diffstat (limited to 'data/maps/objects/VermilionMart.asm')
-rw-r--r--data/maps/objects/VermilionMart.asm16
1 files changed, 8 insertions, 8 deletions
diff --git a/data/maps/objects/VermilionMart.asm b/data/maps/objects/VermilionMart.asm
index c473b5d1..7f6b4404 100644
--- a/data/maps/objects/VermilionMart.asm
+++ b/data/maps/objects/VermilionMart.asm
@@ -1,15 +1,15 @@
VermilionMart_Object:
db $0 ; border block
- def_warps
- warp 3, 7, 2, LAST_MAP
- warp 4, 7, 2, LAST_MAP
+ def_warp_events
+ warp_event 3, 7, LAST_MAP, 2
+ warp_event 4, 7, LAST_MAP, 2
- def_signs
+ def_bg_events
- def_objects
- object SPRITE_CLERK, 0, 5, STAY, RIGHT, 1 ; person
- object SPRITE_COOLTRAINER_M, 5, 6, STAY, NONE, 2 ; person
- object SPRITE_COOLTRAINER_F, 3, 3, WALK, LEFT_RIGHT, 3 ; person
+ def_object_events
+ object_event 0, 5, SPRITE_CLERK, STAY, RIGHT, 1 ; person
+ object_event 5, 6, SPRITE_COOLTRAINER_M, STAY, NONE, 2 ; person
+ object_event 3, 3, SPRITE_COOLTRAINER_F, WALK, LEFT_RIGHT, 3 ; person
def_warps_to VERMILION_MART