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/route11gate.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/route11gate.asm')
| -rwxr-xr-x | data/mapObjects/route11gate.asm | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/data/mapObjects/route11gate.asm b/data/mapObjects/route11gate.asm index d8e6bff1..fa627963 100755 --- a/data/mapObjects/route11gate.asm +++ b/data/mapObjects/route11gate.asm @@ -1,21 +1,21 @@ Route11GateObject: db $a ; border block - db $5 ; warps - db $4, $0, $0, $ff - db $5, $0, $1, $ff - db $4, $7, $2, $ff - db $5, $7, $3, $ff - db $8, $6, $0, ROUTE_11_GATE_2F + db 5 ; warps + warp 0, 4, 0, -1 + warp 0, 5, 1, -1 + warp 7, 4, 2, -1 + warp 7, 5, 3, -1 + warp 6, 8, 0, ROUTE_11_GATE_2F - db $0 ; signs + db 0 ; signs - db $1 ; objects - object SPRITE_GUARD, $4, $1, STAY, NONE, $1 ; person + db 1 ; objects + object SPRITE_GUARD, 4, 1, STAY, NONE, 1 ; person ; warp-to - EVENT_DISP ROUTE_11_GATE_1F_WIDTH, $4, $0 - EVENT_DISP ROUTE_11_GATE_1F_WIDTH, $5, $0 - EVENT_DISP ROUTE_11_GATE_1F_WIDTH, $4, $7 - EVENT_DISP ROUTE_11_GATE_1F_WIDTH, $5, $7 - EVENT_DISP ROUTE_11_GATE_1F_WIDTH, $8, $6 ; ROUTE_11_GATE_2F + warp_to 0, 4, ROUTE_11_GATE_1F_WIDTH + warp_to 0, 5, ROUTE_11_GATE_1F_WIDTH + warp_to 7, 4, ROUTE_11_GATE_1F_WIDTH + warp_to 7, 5, ROUTE_11_GATE_1F_WIDTH + warp_to 6, 8, ROUTE_11_GATE_1F_WIDTH ; ROUTE_11_GATE_2F |