diff options
| author | Remy Oukaour <remy.oukaour@gmail.com> | 2018-01-29 11:12:59 -0500 |
|---|---|---|
| committer | Remy Oukaour <remy.oukaour@gmail.com> | 2018-01-29 11:12:59 -0500 |
| commit | dd4f0a0064921f74fd68750848fca87ae21c4545 (patch) | |
| tree | 9b5aea440c39119121720a850a467bb5837c84da /data/mapObjects/route15gate.asm | |
| parent | Add warp, sign, and warp_to macros for data/mapObjects definitions (diff) | |
| download | pokeyellow-dd4f0a0064921f74fd68750848fca87ae21c4545.tar.gz pokeyellow-dd4f0a0064921f74fd68750848fca87ae21c4545.tar.xz pokeyellow-dd4f0a0064921f74fd68750848fca87ae21c4545.zip | |
Use base 10 (note, the previous commit resolves #173)
Diffstat (limited to 'data/mapObjects/route15gate.asm')
| -rwxr-xr-x | data/mapObjects/route15gate.asm | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/data/mapObjects/route15gate.asm b/data/mapObjects/route15gate.asm index a5902851..4d1b8736 100755 --- a/data/mapObjects/route15gate.asm +++ b/data/mapObjects/route15gate.asm @@ -1,21 +1,21 @@ Route15GateObject: - db $a ; border block + db 10 ; border block - db $5 ; warps - warp $0, $4, $0, $ff - warp $0, $5, $1, $ff - warp $7, $4, $2, $ff - warp $7, $5, $3, $ff - warp $6, $8, $0, ROUTE_15_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_15_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 - warp_to $0, $4, ROUTE_15_GATE_1F_WIDTH - warp_to $0, $5, ROUTE_15_GATE_1F_WIDTH - warp_to $7, $4, ROUTE_15_GATE_1F_WIDTH - warp_to $7, $5, ROUTE_15_GATE_1F_WIDTH - warp_to $6, $8, ROUTE_15_GATE_1F_WIDTH ; ROUTE_15_GATE_2F + warp_to 0, 4, ROUTE_15_GATE_1F_WIDTH + warp_to 0, 5, ROUTE_15_GATE_1F_WIDTH + warp_to 7, 4, ROUTE_15_GATE_1F_WIDTH + warp_to 7, 5, ROUTE_15_GATE_1F_WIDTH + warp_to 6, 8, ROUTE_15_GATE_1F_WIDTH ; ROUTE_15_GATE_2F |