summaryrefslogtreecommitdiff
path: root/data/mapObjects/victoryroad1.asm
diff options
context:
space:
mode:
Diffstat (limited to 'data/mapObjects/victoryroad1.asm')
-rwxr-xr-xdata/mapObjects/victoryroad1.asm32
1 files changed, 16 insertions, 16 deletions
diff --git a/data/mapObjects/victoryroad1.asm b/data/mapObjects/victoryroad1.asm
index 05680b9f..62309bbd 100755
--- a/data/mapObjects/victoryroad1.asm
+++ b/data/mapObjects/victoryroad1.asm
@@ -1,23 +1,23 @@
VictoryRoad1Object:
db $7d ; border block
- db $3 ; warps
- db $11, $8, $2, $ff
- db $11, $9, $2, $ff
- db $1, $1, $0, VICTORY_ROAD_2
+ db 3 ; warps
+ warp 8, 17, 2, -1
+ warp 9, 17, 2, -1
+ warp 1, 1, 0, VICTORY_ROAD_2
- db $0 ; signs
+ db 0 ; signs
- db $7 ; objects
- object SPRITE_LASS, $7, $5, STAY, RIGHT, $1, OPP_COOLTRAINER_F, $5
- object SPRITE_BLACK_HAIR_BOY_1, $3, $2, STAY, DOWN, $2, OPP_COOLTRAINER_M, $5
- object SPRITE_BALL, $b, $0, STAY, NONE, $3, TM_43
- object SPRITE_BALL, $9, $2, STAY, NONE, $4, RARE_CANDY
- object SPRITE_BOULDER, $5, $f, STAY, BOULDER_MOVEMENT_BYTE_2, $5 ; person
- object SPRITE_BOULDER, $e, $2, STAY, BOULDER_MOVEMENT_BYTE_2, $6 ; person
- object SPRITE_BOULDER, $2, $a, STAY, BOULDER_MOVEMENT_BYTE_2, $7 ; person
+ db 7 ; objects
+ object SPRITE_LASS, 7, 5, STAY, RIGHT, 1, OPP_COOLTRAINER_F, 5
+ object SPRITE_BLACK_HAIR_BOY_1, 3, 2, STAY, DOWN, 2, OPP_COOLTRAINER_M, 5
+ object SPRITE_BALL, 11, 0, STAY, NONE, 3, TM_43
+ object SPRITE_BALL, 9, 2, STAY, NONE, 4, RARE_CANDY
+ object SPRITE_BOULDER, 5, 15, STAY, BOULDER_MOVEMENT_BYTE_2, 5 ; person
+ 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
- EVENT_DISP VICTORY_ROAD_1_WIDTH, $11, $8
- EVENT_DISP VICTORY_ROAD_1_WIDTH, $11, $9
- EVENT_DISP VICTORY_ROAD_1_WIDTH, $1, $1 ; VICTORY_ROAD_2
+ warp_to 8, 17, VICTORY_ROAD_1_WIDTH
+ warp_to 9, 17, VICTORY_ROAD_1_WIDTH
+ warp_to 1, 1, VICTORY_ROAD_1_WIDTH ; VICTORY_ROAD_2