summaryrefslogtreecommitdiff
path: root/data/maps/objects/VictoryRoad3F.asm
diff options
context:
space:
mode:
Diffstat (limited to 'data/maps/objects/VictoryRoad3F.asm')
-rw-r--r--data/maps/objects/VictoryRoad3F.asm34
1 files changed, 17 insertions, 17 deletions
diff --git a/data/maps/objects/VictoryRoad3F.asm b/data/maps/objects/VictoryRoad3F.asm
index fcab3e74..2479ab5b 100644
--- a/data/maps/objects/VictoryRoad3F.asm
+++ b/data/maps/objects/VictoryRoad3F.asm
@@ -1,24 +1,24 @@
VictoryRoad3F_Object:
db $7d ; border block
- def_warps
- warp 23, 7, 3, VICTORY_ROAD_2F
- warp 26, 8, 5, VICTORY_ROAD_2F
- warp 27, 15, 4, VICTORY_ROAD_2F
- warp 2, 0, 6, VICTORY_ROAD_2F
+ def_warp_events
+ warp_event 23, 7, VICTORY_ROAD_2F, 3
+ warp_event 26, 8, VICTORY_ROAD_2F, 5
+ warp_event 27, 15, VICTORY_ROAD_2F, 4
+ warp_event 2, 0, VICTORY_ROAD_2F, 6
- def_signs
+ def_bg_events
- def_objects
- object SPRITE_COOLTRAINER_M, 28, 5, STAY, LEFT, 1, OPP_COOLTRAINER_M, 2
- object SPRITE_COOLTRAINER_F, 7, 13, STAY, RIGHT, 2, OPP_COOLTRAINER_F, 2
- object SPRITE_COOLTRAINER_M, 6, 14, STAY, LEFT, 3, OPP_COOLTRAINER_M, 3
- object SPRITE_COOLTRAINER_F, 13, 3, STAY, RIGHT, 4, OPP_COOLTRAINER_F, 3
- object SPRITE_POKE_BALL, 26, 5, STAY, NONE, 5, MAX_REVIVE
- object SPRITE_POKE_BALL, 7, 7, STAY, NONE, 6, TM_EXPLOSION
- object SPRITE_BOULDER, 22, 3, STAY, BOULDER_MOVEMENT_BYTE_2, 7 ; person
- object SPRITE_BOULDER, 13, 12, STAY, BOULDER_MOVEMENT_BYTE_2, 8 ; person
- object SPRITE_BOULDER, 24, 10, STAY, BOULDER_MOVEMENT_BYTE_2, 9 ; person
- object SPRITE_BOULDER, 22, 15, STAY, BOULDER_MOVEMENT_BYTE_2, 10 ; person
+ def_object_events
+ object_event 28, 5, SPRITE_COOLTRAINER_M, STAY, LEFT, 1, OPP_COOLTRAINER_M, 2
+ object_event 7, 13, SPRITE_COOLTRAINER_F, STAY, RIGHT, 2, OPP_COOLTRAINER_F, 2
+ object_event 6, 14, SPRITE_COOLTRAINER_M, STAY, LEFT, 3, OPP_COOLTRAINER_M, 3
+ object_event 13, 3, SPRITE_COOLTRAINER_F, STAY, RIGHT, 4, OPP_COOLTRAINER_F, 3
+ object_event 26, 5, SPRITE_POKE_BALL, STAY, NONE, 5, MAX_REVIVE
+ object_event 7, 7, SPRITE_POKE_BALL, STAY, NONE, 6, TM_EXPLOSION
+ object_event 22, 3, SPRITE_BOULDER, STAY, BOULDER_MOVEMENT_BYTE_2, 7 ; person
+ object_event 13, 12, SPRITE_BOULDER, STAY, BOULDER_MOVEMENT_BYTE_2, 8 ; person
+ object_event 24, 10, SPRITE_BOULDER, STAY, BOULDER_MOVEMENT_BYTE_2, 9 ; person
+ object_event 22, 15, SPRITE_BOULDER, STAY, BOULDER_MOVEMENT_BYTE_2, 10 ; person
def_warps_to VICTORY_ROAD_3F