summaryrefslogtreecommitdiff
path: root/data/maps/objects/CeruleanGym.asm
diff options
context:
space:
mode:
Diffstat (limited to 'data/maps/objects/CeruleanGym.asm')
-rw-r--r--data/maps/objects/CeruleanGym.asm18
1 files changed, 9 insertions, 9 deletions
diff --git a/data/maps/objects/CeruleanGym.asm b/data/maps/objects/CeruleanGym.asm
index 26709cae..b4589efa 100644
--- a/data/maps/objects/CeruleanGym.asm
+++ b/data/maps/objects/CeruleanGym.asm
@@ -1,16 +1,16 @@
CeruleanGym_Object:
db $3 ; border block
- def_warps
- warp 4, 13, 3, LAST_MAP
- warp 5, 13, 3, LAST_MAP
+ def_warp_events
+ warp_event 4, 13, LAST_MAP, 3
+ warp_event 5, 13, LAST_MAP, 3
- def_signs
+ def_bg_events
- def_objects
- object SPRITE_BRUNETTE_GIRL, 4, 2, STAY, DOWN, 1, OPP_MISTY, 1
- object SPRITE_COOLTRAINER_F, 2, 3, STAY, RIGHT, 2, OPP_JR_TRAINER_F, 1
- object SPRITE_SWIMMER, 8, 7, STAY, LEFT, 3, OPP_SWIMMER, 1
- object SPRITE_GYM_GUIDE, 7, 10, STAY, DOWN, 4 ; person
+ def_object_events
+ object_event 4, 2, SPRITE_BRUNETTE_GIRL, STAY, DOWN, 1, OPP_MISTY, 1
+ object_event 2, 3, SPRITE_COOLTRAINER_F, STAY, RIGHT, 2, OPP_JR_TRAINER_F, 1
+ object_event 8, 7, SPRITE_SWIMMER, STAY, LEFT, 3, OPP_SWIMMER, 1
+ object_event 7, 10, SPRITE_GYM_GUIDE, STAY, DOWN, 4 ; person
def_warps_to CERULEAN_GYM