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/route18.asm | |
| parent | c84667c4df36918071bb7487c456d7adafb921ca (diff) | |
Add warp, sign, and warp_to macros for data/mapObjects definitions
Diffstat (limited to 'data/mapObjects/route18.asm')
| -rwxr-xr-x | data/mapObjects/route18.asm | 20 |
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 |