diff options
| author | Remy Oukaour <remy.oukaour@gmail.com> | 2018-01-29 02:31:32 -0500 |
|---|---|---|
| committer | Remy Oukaour <remy.oukaour@gmail.com> | 2018-01-29 02:31:32 -0500 |
| commit | d271d6917549074e721f3e5064b77e1ad1dbe44a (patch) | |
| tree | cee0f1b9a44aa7394dbf36ee3ad3654dde08df06 /data/mapObjects/route15.asm | |
| parent | c84667c4df36918071bb7487c456d7adafb921ca (diff) | |
Add warp, sign, and warp_to macros for data/mapObjects definitions
Diffstat (limited to 'data/mapObjects/route15.asm')
| -rwxr-xr-x | data/mapObjects/route15.asm | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/data/mapObjects/route15.asm b/data/mapObjects/route15.asm index 1d83b20d..38fbae4d 100755 --- a/data/mapObjects/route15.asm +++ b/data/mapObjects/route15.asm @@ -2,13 +2,13 @@ Route15Object: db $43 ; border block db $4 ; warps - db $8, $7, $0, ROUTE_15_GATE_1F - db $9, $7, $1, ROUTE_15_GATE_1F - db $8, $e, $2, ROUTE_15_GATE_1F - db $9, $e, $3, ROUTE_15_GATE_1F + warp $7, $8, $0, ROUTE_15_GATE_1F + warp $7, $9, $1, ROUTE_15_GATE_1F + warp $e, $8, $2, ROUTE_15_GATE_1F + warp $e, $9, $3, ROUTE_15_GATE_1F db $1 ; signs - db $9, $27, $c ; Route15Text12 + sign $27, $9, $c ; Route15Text12 db $b ; objects object SPRITE_LASS, $29, $b, STAY, DOWN, $1, OPP_JR_TRAINER_F, $14 @@ -24,7 +24,7 @@ Route15Object: object SPRITE_BALL, $12, $5, STAY, NONE, $b, TM_20 ; warp-to - EVENT_DISP ROUTE_15_WIDTH, $8, $7 ; ROUTE_15_GATE_1F - EVENT_DISP ROUTE_15_WIDTH, $9, $7 ; ROUTE_15_GATE_1F - EVENT_DISP ROUTE_15_WIDTH, $8, $e ; ROUTE_15_GATE_1F - EVENT_DISP ROUTE_15_WIDTH, $9, $e ; ROUTE_15_GATE_1F + warp_to $7, $8, ROUTE_15_WIDTH ; ROUTE_15_GATE_1F + warp_to $7, $9, ROUTE_15_WIDTH ; ROUTE_15_GATE_1F + warp_to $e, $8, ROUTE_15_WIDTH ; ROUTE_15_GATE_1F + warp_to $e, $9, ROUTE_15_WIDTH ; ROUTE_15_GATE_1F |