aboutsummaryrefslogtreecommitdiffstats
path: root/data/maps/objects/VictoryRoad1F.asm
diff options
context:
space:
mode:
Diffstat (limited to 'data/maps/objects/VictoryRoad1F.asm')
-rwxr-xr-xdata/maps/objects/VictoryRoad1F.asm11
1 files changed, 4 insertions, 7 deletions
diff --git a/data/maps/objects/VictoryRoad1F.asm b/data/maps/objects/VictoryRoad1F.asm
index 271be1b8..a0179a5a 100755
--- a/data/maps/objects/VictoryRoad1F.asm
+++ b/data/maps/objects/VictoryRoad1F.asm
@@ -1,14 +1,14 @@
VictoryRoad1F_Object:
db $7d ; border block
- db 3 ; warps
+ def_warps
warp 8, 17, 2, LAST_MAP
warp 9, 17, 2, LAST_MAP
warp 1, 1, 0, VICTORY_ROAD_2F
- db 0 ; signs
+ def_signs
- db 7 ; objects
+ def_objects
object SPRITE_COOLTRAINER_F, 7, 5, STAY, RIGHT, 1, OPP_COOLTRAINER_F, 5
object SPRITE_COOLTRAINER_M, 3, 2, STAY, DOWN, 2, OPP_COOLTRAINER_M, 5
object SPRITE_POKE_BALL, 11, 0, STAY, NONE, 3, TM_SKY_ATTACK
@@ -17,7 +17,4 @@ VictoryRoad1F_Object:
object SPRITE_BOULDER, 14, 2, STAY, BOULDER_MOVEMENT_BYTE_2, 6 ; person
object SPRITE_BOULDER, 2, 10, STAY, BOULDER_MOVEMENT_BYTE_2, 7 ; person
- ; warp-to
- warp_to 8, 17, VICTORY_ROAD_1F_WIDTH
- warp_to 9, 17, VICTORY_ROAD_1F_WIDTH
- warp_to 1, 1, VICTORY_ROAD_1F_WIDTH ; VICTORY_ROAD_2F
+ def_warps_to VICTORY_ROAD_1F