summaryrefslogtreecommitdiff
path: root/data/mapObjects/route18.asm
diff options
context:
space:
mode:
Diffstat (limited to 'data/mapObjects/route18.asm')
-rwxr-xr-xdata/mapObjects/route18.asm20
1 files changed, 10 insertions, 10 deletions
diff --git a/data/mapObjects/route18.asm b/data/mapObjects/route18.asm
index 8b36ab7c..5cfb7ddb 100755
--- a/data/mapObjects/route18.asm
+++ b/data/mapObjects/route18.asm
@@ -2,14 +2,14 @@ Route18Object:
db $43 ; border block
db $4 ; warps
- db $8, $21, $0, ROUTE_18_GATE_1F
- db $9, $21, $1, ROUTE_18_GATE_1F
- db $8, $28, $2, ROUTE_18_GATE_1F
- db $9, $28, $3, ROUTE_18_GATE_1F
+ warp $21, $8, $0, ROUTE_18_GATE_1F
+ warp $21, $9, $1, ROUTE_18_GATE_1F
+ warp $28, $8, $2, ROUTE_18_GATE_1F
+ warp $28, $9, $3, ROUTE_18_GATE_1F
db $2 ; signs
- db $7, $2b, $4 ; Route18Text4
- db $5, $21, $5 ; Route18Text5
+ sign $2b, $7, $4 ; Route18Text4
+ sign $21, $5, $5 ; Route18Text5
db $3 ; objects
object SPRITE_BLACK_HAIR_BOY_1, $24, $b, STAY, RIGHT, $1, OPP_BIRD_KEEPER, $8
@@ -17,7 +17,7 @@ Route18Object:
object SPRITE_BLACK_HAIR_BOY_1, $2a, $d, STAY, LEFT, $3, OPP_BIRD_KEEPER, $a
; warp-to
- EVENT_DISP ROUTE_18_WIDTH, $8, $21 ; ROUTE_18_GATE_1F
- EVENT_DISP ROUTE_18_WIDTH, $9, $21 ; ROUTE_18_GATE_1F
- EVENT_DISP ROUTE_18_WIDTH, $8, $28 ; ROUTE_18_GATE_1F
- EVENT_DISP ROUTE_18_WIDTH, $9, $28 ; ROUTE_18_GATE_1F
+ warp_to $21, $8, ROUTE_18_WIDTH ; ROUTE_18_GATE_1F
+ warp_to $21, $9, ROUTE_18_WIDTH ; ROUTE_18_GATE_1F
+ warp_to $28, $8, ROUTE_18_WIDTH ; ROUTE_18_GATE_1F
+ warp_to $28, $9, ROUTE_18_WIDTH ; ROUTE_18_GATE_1F