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/route2gate.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/route2gate.asm')
| -rwxr-xr-x | data/mapObjects/route2gate.asm | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/data/mapObjects/route2gate.asm b/data/mapObjects/route2gate.asm index 53590f69..714b8ee6 100755 --- a/data/mapObjects/route2gate.asm +++ b/data/mapObjects/route2gate.asm @@ -1,20 +1,20 @@ Route2GateObject: db $a ; border block - db $4 ; warps - db $0, $4, $3, $ff - db $0, $5, $3, $ff - db $7, $4, $4, $ff - db $7, $5, $4, $ff + db 4 ; warps + warp 4, 0, 3, -1 + warp 5, 0, 3, -1 + warp 4, 7, 4, -1 + warp 5, 7, 4, -1 - db $0 ; signs + db 0 ; signs - db $2 ; objects - object SPRITE_OAK_AIDE, $1, $4, STAY, LEFT, $1 ; person - object SPRITE_BUG_CATCHER, $5, $4, WALK, $2, $2 ; person + db 2 ; objects + object SPRITE_OAK_AIDE, 1, 4, STAY, LEFT, 1 ; person + object SPRITE_BUG_CATCHER, 5, 4, WALK, 2, 2 ; person ; warp-to - EVENT_DISP ROUTE_2_GATE_WIDTH, $0, $4 - EVENT_DISP ROUTE_2_GATE_WIDTH, $0, $5 - EVENT_DISP ROUTE_2_GATE_WIDTH, $7, $4 - EVENT_DISP ROUTE_2_GATE_WIDTH, $7, $5 + warp_to 4, 0, ROUTE_2_GATE_WIDTH + warp_to 5, 0, ROUTE_2_GATE_WIDTH + warp_to 4, 7, ROUTE_2_GATE_WIDTH + warp_to 5, 7, ROUTE_2_GATE_WIDTH |