summaryrefslogtreecommitdiff
path: root/data/mapObjects/route5.asm
diff options
context:
space:
mode:
authorRemy Oukaour <remy.oukaour@gmail.com>2018-01-29 02:31:32 -0500
committerRemy Oukaour <remy.oukaour@gmail.com>2018-01-29 02:31:32 -0500
commitd271d6917549074e721f3e5064b77e1ad1dbe44a (patch)
treecee0f1b9a44aa7394dbf36ee3ad3654dde08df06 /data/mapObjects/route5.asm
parentc84667c4df36918071bb7487c456d7adafb921ca (diff)
Add warp, sign, and warp_to macros for data/mapObjects definitions
Diffstat (limited to 'data/mapObjects/route5.asm')
-rwxr-xr-xdata/mapObjects/route5.asm22
1 files changed, 11 insertions, 11 deletions
diff --git a/data/mapObjects/route5.asm b/data/mapObjects/route5.asm
index 6065f599..e9048db8 100755
--- a/data/mapObjects/route5.asm
+++ b/data/mapObjects/route5.asm
@@ -2,20 +2,20 @@ Route5Object:
db $a ; border block
db $5 ; warps
- db $1d, $a, $3, ROUTE_5_GATE
- db $1d, $9, $2, ROUTE_5_GATE
- db $21, $a, $0, ROUTE_5_GATE
- db $1b, $11, $0, PATH_ENTRANCE_ROUTE_5
- db $15, $a, $0, DAYCAREM
+ warp $a, $1d, $3, ROUTE_5_GATE
+ warp $9, $1d, $2, ROUTE_5_GATE
+ warp $a, $21, $0, ROUTE_5_GATE
+ warp $11, $1b, $0, PATH_ENTRANCE_ROUTE_5
+ warp $a, $15, $0, DAYCAREM
db $1 ; signs
- db $1d, $11, $1 ; Route5Text1
+ sign $11, $1d, $1 ; Route5Text1
db $0 ; objects
; warp-to
- EVENT_DISP ROUTE_5_WIDTH, $1d, $a ; ROUTE_5_GATE
- EVENT_DISP ROUTE_5_WIDTH, $1d, $9 ; ROUTE_5_GATE
- EVENT_DISP ROUTE_5_WIDTH, $21, $a ; ROUTE_5_GATE
- EVENT_DISP ROUTE_5_WIDTH, $1b, $11 ; PATH_ENTRANCE_ROUTE_5
- EVENT_DISP ROUTE_5_WIDTH, $15, $a ; DAYCAREM
+ warp_to $a, $1d, ROUTE_5_WIDTH ; ROUTE_5_GATE
+ warp_to $9, $1d, ROUTE_5_WIDTH ; ROUTE_5_GATE
+ warp_to $a, $21, ROUTE_5_WIDTH ; ROUTE_5_GATE
+ warp_to $11, $1b, ROUTE_5_WIDTH ; PATH_ENTRANCE_ROUTE_5
+ warp_to $a, $15, ROUTE_5_WIDTH ; DAYCAREM