summaryrefslogtreecommitdiff
path: root/data/mapObjects/route2.asm
diff options
context:
space:
mode:
authorShakib2001 <shakibafzali@gmail.com>2020-03-27 14:31:38 -0400
committerShakib2001 <shakibafzali@gmail.com>2020-03-27 14:31:38 -0400
commit3d8e949d373a828fee370b08d005f131abb67333 (patch)
treee200b8d12dbbbcb7683560fb904b32a5c5a1c9a7 /data/mapObjects/route2.asm
parentab7c9634be9c7d26c66ebd69b2fcfe3994d627be (diff)
Added warp, warp_to and sign compatibility
Diffstat (limited to 'data/mapObjects/route2.asm')
-rwxr-xr-xdata/mapObjects/route2.asm50
1 files changed, 25 insertions, 25 deletions
diff --git a/data/mapObjects/route2.asm b/data/mapObjects/route2.asm
index a8b0a7a5..b9f7ae19 100755
--- a/data/mapObjects/route2.asm
+++ b/data/mapObjects/route2.asm
@@ -1,36 +1,36 @@
Route2Object:
db $f ; border block
- db $7 ; warps
- db $9, $c, $0, DIGLETTS_CAVE_EXIT
- db $b, $3, $1, VIRIDIAN_FOREST_EXIT
- db $13, $f, $0, ROUTE_2_HOUSE
- db $23, $10, $1, ROUTE_2_GATE
- db $27, $f, $2, ROUTE_2_GATE
- db $2b, $3, $2, VIRIDIAN_FOREST_ENTRANCE
- db $23, $11, $1, ROUTE_2_GATE
+ db 7 ; warps
+ warp 12, 9, 0, DIGLETTS_CAVE_EXIT
+ warp 3, 11, 1, VIRIDIAN_FOREST_EXIT
+ warp 15, 19, 0, ROUTE_2_HOUSE
+ warp 16, 35, 1, ROUTE_2_GATE
+ warp 15, 39, 2, ROUTE_2_GATE
+ warp 3, 43, 2, VIRIDIAN_FOREST_ENTRANCE
+ warp 17, 35, 1, ROUTE_2_GATE
- db $2 ; signs
- db $41, $5, $3 ; Route2Text3
- db $b, $b, $4 ; Route2Text4
+ db 2 ; signs
+ sign 5, 65, 3 ; Route2Text3
+ sign 11, 11, 4 ; Route2Text4
- db $2 ; objects
- object SPRITE_BALL, $d, $36, STAY, NONE, $1, MOON_STONE
- object SPRITE_BALL, $d, $2d, STAY, NONE, $2, HP_UP
+ db 2 ; objects
+ object SPRITE_BALL, 13, 54, STAY, NONE, 1, MOON_STONE
+ object SPRITE_BALL, 13, 45, STAY, NONE, 2, HP_UP
; warp-to
- EVENT_DISP ROUTE_2_WIDTH, $9, $c ; DIGLETTS_CAVE_EXIT
- EVENT_DISP ROUTE_2_WIDTH, $b, $3 ; VIRIDIAN_FOREST_EXIT
- EVENT_DISP ROUTE_2_WIDTH, $13, $f ; ROUTE_2_HOUSE
- EVENT_DISP ROUTE_2_WIDTH, $23, $10 ; ROUTE_2_GATE
- EVENT_DISP ROUTE_2_WIDTH, $27, $f ; ROUTE_2_GATE
- EVENT_DISP ROUTE_2_WIDTH, $2b, $3 ; VIRIDIAN_FOREST_ENTRANCE
- EVENT_DISP ROUTE_2_WIDTH, $23, $11 ; ROUTE_2_GATE
+ warp_to 12, 9, ROUTE_2_WIDTH ; DIGLETTS_CAVE_ROUTE_2
+ warp_to 3, 11, ROUTE_2_WIDTH ; VIRIDIAN_FOREST_NORTH_GATE
+ warp_to 15, 19, ROUTE_2_WIDTH ; ROUTE_2_TRADE_HOUSE
+ warp_to 16, 35, ROUTE_2_WIDTH ; ROUTE_2_GATE
+ warp_to 15, 39, ROUTE_2_WIDTH ; ROUTE_2_GATE
+ warp_to 3, 43, ROUTE_2_WIDTH ; VIRIDIAN_FOREST_SOUTH_GATE
+ warp_to 17, 35, ROUTE_2_WIDTH ; ROUTE_2_GATE
; unused
- EVENT_DISP $4, $7, $2
+ warp_to 2, 7, 4
dw $c712
db $9, $7
- EVENT_DISP $4, $7, $2
- EVENT_DISP $4, $7, $2
- EVENT_DISP $4, $7, $2
+ warp_to 2, 7, 4
+ warp_to 2, 7, 4
+ warp_to 2, 7, 4