summaryrefslogtreecommitdiff
path: root/data/maps/objects/SaffronPokecenter.asm
diff options
context:
space:
mode:
Diffstat (limited to 'data/maps/objects/SaffronPokecenter.asm')
-rw-r--r--data/maps/objects/SaffronPokecenter.asm18
1 files changed, 9 insertions, 9 deletions
diff --git a/data/maps/objects/SaffronPokecenter.asm b/data/maps/objects/SaffronPokecenter.asm
index aa6161ca..eb03932c 100644
--- a/data/maps/objects/SaffronPokecenter.asm
+++ b/data/maps/objects/SaffronPokecenter.asm
@@ -1,16 +1,16 @@
SaffronPokecenter_Object:
db $0 ; border block
- def_warps
- warp 3, 7, 6, LAST_MAP
- warp 4, 7, 6, LAST_MAP
+ def_warp_events
+ warp_event 3, 7, LAST_MAP, 6
+ warp_event 4, 7, LAST_MAP, 6
- def_signs
+ def_bg_events
- def_objects
- object SPRITE_NURSE, 3, 1, STAY, DOWN, 1 ; person
- object SPRITE_BEAUTY, 5, 5, STAY, NONE, 2 ; person
- object SPRITE_GENTLEMAN, 8, 3, STAY, DOWN, 3 ; person
- object SPRITE_LINK_RECEPTIONIST, 11, 2, STAY, DOWN, 4 ; person
+ def_object_events
+ object_event 3, 1, SPRITE_NURSE, STAY, DOWN, 1 ; person
+ object_event 5, 5, SPRITE_BEAUTY, STAY, NONE, 2 ; person
+ object_event 8, 3, SPRITE_GENTLEMAN, STAY, DOWN, 3 ; person
+ object_event 11, 2, SPRITE_LINK_RECEPTIONIST, STAY, DOWN, 4 ; person
def_warps_to SAFFRON_POKECENTER