aboutsummaryrefslogtreecommitdiffstats
path: root/data/mapObjects/route22gate.asm
diff options
context:
space:
mode:
authorRemy Oukaour <remy.oukaour@gmail.com>2018-01-29 11:12:59 -0500
committerRemy Oukaour <remy.oukaour@gmail.com>2018-01-29 11:12:59 -0500
commitdd4f0a0064921f74fd68750848fca87ae21c4545 (patch)
tree9b5aea440c39119121720a850a467bb5837c84da /data/mapObjects/route22gate.asm
parentAdd warp, sign, and warp_to macros for data/mapObjects definitions (diff)
downloadpokeyellow-dd4f0a0064921f74fd68750848fca87ae21c4545.tar.gz
pokeyellow-dd4f0a0064921f74fd68750848fca87ae21c4545.tar.xz
pokeyellow-dd4f0a0064921f74fd68750848fca87ae21c4545.zip
Use base 10 (note, the previous commit resolves #173)
Diffstat (limited to 'data/mapObjects/route22gate.asm')
-rwxr-xr-xdata/mapObjects/route22gate.asm26
1 files changed, 13 insertions, 13 deletions
diff --git a/data/mapObjects/route22gate.asm b/data/mapObjects/route22gate.asm
index e321d95d..6340b702 100755
--- a/data/mapObjects/route22gate.asm
+++ b/data/mapObjects/route22gate.asm
@@ -1,19 +1,19 @@
Route22GateObject:
- db $a ; border block
+ db 10 ; border block
- db $4 ; warps
- warp $4, $7, $0, $ff
- warp $5, $7, $0, $ff
- warp $4, $0, $0, $ff
- warp $5, $0, $1, $ff
+ db 4 ; warps
+ warp 4, 7, 0, -1
+ warp 5, 7, 0, -1
+ warp 4, 0, 0, -1
+ warp 5, 0, 1, -1
- db $0 ; signs
+ db 0 ; signs
- db $1 ; objects
- object SPRITE_GUARD, $6, $2, STAY, LEFT, $1 ; person
+ db 1 ; objects
+ object SPRITE_GUARD, 6, 2, STAY, LEFT, 1 ; person
; warp-to
- warp_to $4, $7, ROUTE_22_GATE_WIDTH
- warp_to $5, $7, ROUTE_22_GATE_WIDTH
- warp_to $4, $0, ROUTE_22_GATE_WIDTH
- warp_to $5, $0, ROUTE_22_GATE_WIDTH
+ warp_to 4, 7, ROUTE_22_GATE_WIDTH
+ warp_to 5, 7, ROUTE_22_GATE_WIDTH
+ warp_to 4, 0, ROUTE_22_GATE_WIDTH
+ warp_to 5, 0, ROUTE_22_GATE_WIDTH