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/route7gate.asm | |
| parent | Add pokegold and pokefirered. (diff) | |
| parent | INCBIN don't start with tabs (diff) | |
| download | pokeyellow-b8aa9ec80e43257a9e3a487b46a33f99c999a940.tar.gz pokeyellow-b8aa9ec80e43257a9e3a487b46a33f99c999a940.tar.xz pokeyellow-b8aa9ec80e43257a9e3a487b46a33f99c999a940.zip | |
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/route7gate.asm')
| -rwxr-xr-x | data/mapObjects/route7gate.asm | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/data/mapObjects/route7gate.asm b/data/mapObjects/route7gate.asm index 3aea6a88..0b726fd3 100755 --- a/data/mapObjects/route7gate.asm +++ b/data/mapObjects/route7gate.asm @@ -1,19 +1,19 @@ Route7GateObject: db $a ; border block - db $4 ; warps - db $3, $0, $3, $ff - db $4, $0, $3, $ff - db $3, $5, $0, $ff - db $4, $5, $1, $ff + db 4 ; warps + warp 0, 3, 3, -1 + warp 0, 4, 3, -1 + warp 5, 3, 0, -1 + warp 5, 4, 1, -1 - db $0 ; signs + db 0 ; signs - db $1 ; objects - object SPRITE_GUARD, $3, $1, STAY, DOWN, $1 ; person + db 1 ; objects + object SPRITE_GUARD, 3, 1, STAY, DOWN, 1 ; person ; warp-to - EVENT_DISP ROUTE_7_GATE_WIDTH, $3, $0 - EVENT_DISP ROUTE_7_GATE_WIDTH, $4, $0 - EVENT_DISP ROUTE_7_GATE_WIDTH, $3, $5 - EVENT_DISP ROUTE_7_GATE_WIDTH, $4, $5 + warp_to 0, 3, ROUTE_7_GATE_WIDTH + warp_to 0, 4, ROUTE_7_GATE_WIDTH + warp_to 5, 3, ROUTE_7_GATE_WIDTH + warp_to 5, 4, ROUTE_7_GATE_WIDTH |