diff options
| author | Daniel Harding <33dannye@gmail.com> | 2018-02-05 10:57:14 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-05 10:57:14 -0600 |
| commit | b8aa9ec80e43257a9e3a487b46a33f99c999a940 (patch) | |
| tree | 3813e75239070dbb3d549e8c03297cc28b2551e3 /data/mapObjects/route5.asm | |
| parent | c84667c4df36918071bb7487c456d7adafb921ca (diff) | |
| parent | 819b6789099947e83b7e3f0b0e2f6d39cf901807 (diff) | |
Merge pull request #174 from Rangi42/master
Add warp, sign, and warp_to macros for data/mapObjects definitions; use base 10 numbers
Diffstat (limited to 'data/mapObjects/route5.asm')
| -rwxr-xr-x | data/mapObjects/route5.asm | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/data/mapObjects/route5.asm b/data/mapObjects/route5.asm index 6065f599..62aa6431 100755 --- a/data/mapObjects/route5.asm +++ b/data/mapObjects/route5.asm @@ -1,21 +1,21 @@ 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 + db 5 ; warps + warp 10, 29, 3, ROUTE_5_GATE + warp 9, 29, 2, ROUTE_5_GATE + warp 10, 33, 0, ROUTE_5_GATE + warp 17, 27, 0, PATH_ENTRANCE_ROUTE_5 + warp 10, 21, 0, DAYCAREM - db $1 ; signs - db $1d, $11, $1 ; Route5Text1 + db 1 ; signs + sign 17, 29, 1 ; Route5Text1 - db $0 ; objects + 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 10, 29, ROUTE_5_WIDTH ; ROUTE_5_GATE + warp_to 9, 29, ROUTE_5_WIDTH ; ROUTE_5_GATE + warp_to 10, 33, ROUTE_5_WIDTH ; ROUTE_5_GATE + warp_to 17, 27, ROUTE_5_WIDTH ; PATH_ENTRANCE_ROUTE_5 + warp_to 10, 21, ROUTE_5_WIDTH ; DAYCAREM |