summaryrefslogtreecommitdiff
path: root/data/mapObjects/route5.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/route5.asm
parentd271d6917549074e721f3e5064b77e1ad1dbe44a (diff)
Use base 10 (note, the previous commit resolves #173)
Diffstat (limited to 'data/mapObjects/route5.asm')
-rwxr-xr-xdata/mapObjects/route5.asm30
1 files changed, 15 insertions, 15 deletions
diff --git a/data/mapObjects/route5.asm b/data/mapObjects/route5.asm
index e9048db8..445c7aab 100755
--- a/data/mapObjects/route5.asm
+++ b/data/mapObjects/route5.asm
@@ -1,21 +1,21 @@
Route5Object:
- db $a ; border block
+ db 10 ; border block
- db $5 ; warps
- warp $a, $1d, $3, ROUTE_5_GATE
- warp $9, $1d, $2, ROUTE_5_GATE
- warp $a, $21, $0, ROUTE_5_GATE
- warp $11, $1b, $0, PATH_ENTRANCE_ROUTE_5
- warp $a, $15, $0, DAYCAREM
+ db 5 ; warps
+ warp 10, 29, 3, ROUTE_5_GATE
+ warp 9, 29, 2, ROUTE_5_GATE
+ warp 10, 33, 0, ROUTE_5_GATE
+ warp 17, 27, 0, PATH_ENTRANCE_ROUTE_5
+ warp 10, 21, 0, DAYCAREM
- db $1 ; signs
- sign $11, $1d, $1 ; Route5Text1
+ db 1 ; signs
+ sign 17, 29, 1 ; Route5Text1
- db $0 ; objects
+ db 0 ; objects
; warp-to
- warp_to $a, $1d, ROUTE_5_WIDTH ; ROUTE_5_GATE
- warp_to $9, $1d, ROUTE_5_WIDTH ; ROUTE_5_GATE
- warp_to $a, $21, ROUTE_5_WIDTH ; ROUTE_5_GATE
- warp_to $11, $1b, ROUTE_5_WIDTH ; PATH_ENTRANCE_ROUTE_5
- warp_to $a, $15, ROUTE_5_WIDTH ; DAYCAREM
+ warp_to 10, 29, ROUTE_5_WIDTH ; ROUTE_5_GATE
+ warp_to 9, 29, ROUTE_5_WIDTH ; ROUTE_5_GATE
+ warp_to 10, 33, ROUTE_5_WIDTH ; ROUTE_5_GATE
+ warp_to 17, 27, ROUTE_5_WIDTH ; PATH_ENTRANCE_ROUTE_5
+ warp_to 10, 21, ROUTE_5_WIDTH ; DAYCAREM