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