summaryrefslogtreecommitdiff
path: root/data/maps/objects/FuchsiaGym.asm
diff options
context:
space:
mode:
Diffstat (limited to 'data/maps/objects/FuchsiaGym.asm')
-rw-r--r--data/maps/objects/FuchsiaGym.asm26
1 files changed, 13 insertions, 13 deletions
diff --git a/data/maps/objects/FuchsiaGym.asm b/data/maps/objects/FuchsiaGym.asm
index a48794ff..9b884a68 100644
--- a/data/maps/objects/FuchsiaGym.asm
+++ b/data/maps/objects/FuchsiaGym.asm
@@ -1,20 +1,20 @@
FuchsiaGym_Object:
db $3 ; border block
- def_warps
- warp 4, 17, 5, LAST_MAP
- warp 5, 17, 5, LAST_MAP
+ def_warp_events
+ warp_event 4, 17, LAST_MAP, 5
+ warp_event 5, 17, LAST_MAP, 5
- def_signs
+ def_bg_events
- def_objects
- object SPRITE_KOGA, 4, 10, STAY, DOWN, 1, OPP_KOGA, 1
- object SPRITE_ROCKER, 8, 13, STAY, DOWN, 2, OPP_JUGGLER, 7
- object SPRITE_ROCKER, 7, 8, STAY, RIGHT, 3, OPP_JUGGLER, 3
- object SPRITE_ROCKER, 1, 12, STAY, DOWN, 4, OPP_JUGGLER, 8
- object SPRITE_ROCKER, 3, 5, STAY, UP, 5, OPP_TAMER, 1
- object SPRITE_ROCKER, 8, 2, STAY, DOWN, 6, OPP_TAMER, 2
- object SPRITE_ROCKER, 2, 7, STAY, LEFT, 7, OPP_JUGGLER, 4
- object SPRITE_GYM_GUIDE, 7, 15, STAY, DOWN, 8 ; person
+ def_object_events
+ object_event 4, 10, SPRITE_KOGA, STAY, DOWN, 1, OPP_KOGA, 1
+ object_event 8, 13, SPRITE_ROCKER, STAY, DOWN, 2, OPP_JUGGLER, 7
+ object_event 7, 8, SPRITE_ROCKER, STAY, RIGHT, 3, OPP_JUGGLER, 3
+ object_event 1, 12, SPRITE_ROCKER, STAY, DOWN, 4, OPP_JUGGLER, 8
+ object_event 3, 5, SPRITE_ROCKER, STAY, UP, 5, OPP_TAMER, 1
+ object_event 8, 2, SPRITE_ROCKER, STAY, DOWN, 6, OPP_TAMER, 2
+ object_event 2, 7, SPRITE_ROCKER, STAY, LEFT, 7, OPP_JUGGLER, 4
+ object_event 7, 15, SPRITE_GYM_GUIDE, STAY, DOWN, 8 ; person
def_warps_to FUCHSIA_GYM