summaryrefslogtreecommitdiff
path: root/data/mapObjects/route23.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/route23.asm
parentc84667c4df36918071bb7487c456d7adafb921ca (diff)
Add warp, sign, and warp_to macros for data/mapObjects definitions
Diffstat (limited to 'data/mapObjects/route23.asm')
-rwxr-xr-xdata/mapObjects/route23.asm18
1 files changed, 9 insertions, 9 deletions
diff --git a/data/mapObjects/route23.asm b/data/mapObjects/route23.asm
index 3995e510..08358bd9 100755
--- a/data/mapObjects/route23.asm
+++ b/data/mapObjects/route23.asm
@@ -2,13 +2,13 @@ Route23Object:
db $f ; border block
db $4 ; warps
- db $8b, $7, $2, ROUTE_22_GATE
- db $8b, $8, $3, ROUTE_22_GATE
- db $1f, $4, $0, VICTORY_ROAD_1
- db $1f, $e, $1, VICTORY_ROAD_2
+ warp $7, $8b, $2, ROUTE_22_GATE
+ warp $8, $8b, $3, ROUTE_22_GATE
+ warp $4, $1f, $0, VICTORY_ROAD_1
+ warp $e, $1f, $1, VICTORY_ROAD_2
db $1 ; signs
- db $21, $3, $8 ; Route23Text8
+ sign $3, $21, $8 ; Route23Text8
db $7 ; objects
object SPRITE_GUARD, $4, $23, STAY, DOWN, $1 ; person
@@ -20,7 +20,7 @@ Route23Object:
object SPRITE_GUARD, $8, $88, STAY, DOWN, $7 ; person
; warp-to
- EVENT_DISP ROUTE_23_WIDTH, $8b, $7 ; ROUTE_22_GATE
- EVENT_DISP ROUTE_23_WIDTH, $8b, $8 ; ROUTE_22_GATE
- EVENT_DISP ROUTE_23_WIDTH, $1f, $4 ; VICTORY_ROAD_1
- EVENT_DISP ROUTE_23_WIDTH, $1f, $e ; VICTORY_ROAD_2
+ warp_to $7, $8b, ROUTE_23_WIDTH ; ROUTE_22_GATE
+ warp_to $8, $8b, ROUTE_23_WIDTH ; ROUTE_22_GATE
+ warp_to $4, $1f, ROUTE_23_WIDTH ; VICTORY_ROAD_1
+ warp_to $e, $1f, ROUTE_23_WIDTH ; VICTORY_ROAD_2