summaryrefslogtreecommitdiff
path: root/data/maps/objects/VermilionGym.asm
diff options
context:
space:
mode:
Diffstat (limited to 'data/maps/objects/VermilionGym.asm')
-rwxr-xr-xdata/maps/objects/VermilionGym.asm10
1 files changed, 4 insertions, 6 deletions
diff --git a/data/maps/objects/VermilionGym.asm b/data/maps/objects/VermilionGym.asm
index f5cc7b87..1c2699d3 100755
--- a/data/maps/objects/VermilionGym.asm
+++ b/data/maps/objects/VermilionGym.asm
@@ -1,19 +1,17 @@
VermilionGym_Object:
db $3 ; border block
- db 2 ; warps
+ def_warps
warp 4, 17, 3, LAST_MAP
warp 5, 17, 3, LAST_MAP
- db 0 ; signs
+ def_signs
- db 5 ; objects
+ def_objects
object SPRITE_ROCKER, 5, 1, STAY, DOWN, 1, OPP_LT_SURGE, 1
object SPRITE_GENTLEMAN, 9, 6, STAY, LEFT, 2, OPP_GENTLEMAN, 3
object SPRITE_SUPER_NERD, 3, 8, STAY, LEFT, 3, OPP_ROCKER, 1
object SPRITE_SAILOR, 0, 10, STAY, RIGHT, 4, OPP_SAILOR, 8
object SPRITE_GYM_GUIDE, 4, 14, STAY, DOWN, 5 ; person
- ; warp-to
- warp_to 4, 17, VERMILION_GYM_WIDTH
- warp_to 5, 17, VERMILION_GYM_WIDTH
+ def_warps_to VERMILION_GYM