summaryrefslogtreecommitdiff
path: root/data/mapObjects/victoryroad3.asm
diff options
context:
space:
mode:
Diffstat (limited to 'data/mapObjects/victoryroad3.asm')
-rwxr-xr-xdata/mapObjects/victoryroad3.asm44
1 files changed, 22 insertions, 22 deletions
diff --git a/data/mapObjects/victoryroad3.asm b/data/mapObjects/victoryroad3.asm
index c83026ef..1bd72e51 100755
--- a/data/mapObjects/victoryroad3.asm
+++ b/data/mapObjects/victoryroad3.asm
@@ -1,28 +1,28 @@
VictoryRoad3Object:
- db $7d ; border block
+ db 125 ; border block
- db $4 ; warps
- warp $17, $7, $3, VICTORY_ROAD_2
- warp $1a, $8, $5, VICTORY_ROAD_2
- warp $1b, $f, $4, VICTORY_ROAD_2
- warp $2, $0, $6, VICTORY_ROAD_2
+ db 4 ; warps
+ warp 23, 7, 3, VICTORY_ROAD_2
+ warp 26, 8, 5, VICTORY_ROAD_2
+ warp 27, 15, 4, VICTORY_ROAD_2
+ warp 2, 0, 6, VICTORY_ROAD_2
- db $0 ; signs
+ db 0 ; signs
- db $a ; objects
- object SPRITE_BLACK_HAIR_BOY_1, $1c, $5, STAY, LEFT, $1, OPP_COOLTRAINER_M, $2
- object SPRITE_LASS, $7, $d, STAY, RIGHT, $2, OPP_COOLTRAINER_F, $2
- object SPRITE_BLACK_HAIR_BOY_1, $6, $e, STAY, LEFT, $3, OPP_COOLTRAINER_M, $3
- object SPRITE_LASS, $d, $3, STAY, RIGHT, $4, OPP_COOLTRAINER_F, $3
- object SPRITE_BALL, $1a, $5, STAY, NONE, $5, MAX_REVIVE
- object SPRITE_BALL, $7, $7, STAY, NONE, $6, TM_47
- object SPRITE_BOULDER, $16, $3, STAY, BOULDER_MOVEMENT_BYTE_2, $7 ; person
- object SPRITE_BOULDER, $d, $c, STAY, BOULDER_MOVEMENT_BYTE_2, $8 ; person
- object SPRITE_BOULDER, $18, $a, STAY, BOULDER_MOVEMENT_BYTE_2, $9 ; person
- object SPRITE_BOULDER, $16, $f, STAY, BOULDER_MOVEMENT_BYTE_2, $a ; person
+ db 10 ; objects
+ object SPRITE_BLACK_HAIR_BOY_1, 28, 5, STAY, LEFT, 1, OPP_COOLTRAINER_M, 2
+ object SPRITE_LASS, 7, 13, STAY, RIGHT, 2, OPP_COOLTRAINER_F, 2
+ object SPRITE_BLACK_HAIR_BOY_1, 6, 14, STAY, LEFT, 3, OPP_COOLTRAINER_M, 3
+ object SPRITE_LASS, 13, 3, STAY, RIGHT, 4, OPP_COOLTRAINER_F, 3
+ object SPRITE_BALL, 26, 5, STAY, NONE, 5, MAX_REVIVE
+ object SPRITE_BALL, 7, 7, STAY, NONE, 6, TM_47
+ 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
; warp-to
- warp_to $17, $7, VICTORY_ROAD_3_WIDTH ; VICTORY_ROAD_2
- warp_to $1a, $8, VICTORY_ROAD_3_WIDTH ; VICTORY_ROAD_2
- warp_to $1b, $f, VICTORY_ROAD_3_WIDTH ; VICTORY_ROAD_2
- warp_to $2, $0, VICTORY_ROAD_3_WIDTH ; VICTORY_ROAD_2
+ warp_to 23, 7, VICTORY_ROAD_3_WIDTH ; VICTORY_ROAD_2
+ warp_to 26, 8, VICTORY_ROAD_3_WIDTH ; VICTORY_ROAD_2
+ warp_to 27, 15, VICTORY_ROAD_3_WIDTH ; VICTORY_ROAD_2
+ warp_to 2, 0, VICTORY_ROAD_3_WIDTH ; VICTORY_ROAD_2