aboutsummaryrefslogtreecommitdiffstats
path: root/data/maps/objects/FuchsiaGym.asm
diff options
context:
space:
mode:
Diffstat (limited to 'data/maps/objects/FuchsiaGym.asm')
-rwxr-xr-xdata/maps/objects/FuchsiaGym.asm10
1 files changed, 4 insertions, 6 deletions
diff --git a/data/maps/objects/FuchsiaGym.asm b/data/maps/objects/FuchsiaGym.asm
index 6687de41..0d13782f 100755
--- a/data/maps/objects/FuchsiaGym.asm
+++ b/data/maps/objects/FuchsiaGym.asm
@@ -1,13 +1,13 @@
FuchsiaGym_Object:
db $3 ; border block
- db 2 ; warps
+ def_warps
warp 4, 17, 5, LAST_MAP
warp 5, 17, 5, LAST_MAP
- db 0 ; signs
+ def_signs
- db 8 ; objects
+ 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
@@ -17,6 +17,4 @@ FuchsiaGym_Object:
object SPRITE_ROCKER, 2, 7, STAY, LEFT, 7, OPP_JUGGLER, 4
object SPRITE_GYM_GUIDE, 7, 15, STAY, DOWN, 8 ; person
- ; warp-to
- warp_to 4, 17, FUCHSIA_GYM_WIDTH
- warp_to 5, 17, FUCHSIA_GYM_WIDTH
+ def_warps_to FUCHSIA_GYM