aboutsummaryrefslogtreecommitdiffstats
path: root/data/mapObjects/vermiliondock.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/vermiliondock.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/vermiliondock.asm')
-rwxr-xr-xdata/mapObjects/vermiliondock.asm16
1 files changed, 8 insertions, 8 deletions
diff --git a/data/mapObjects/vermiliondock.asm b/data/mapObjects/vermiliondock.asm
index 1c0f2f44..8ad6cc3e 100755
--- a/data/mapObjects/vermiliondock.asm
+++ b/data/mapObjects/vermiliondock.asm
@@ -1,14 +1,14 @@
VermilionDockObject:
- db $f ; border block
+ db 15 ; border block
- db $2 ; warps
- warp $e, $0, $5, $ff
- warp $e, $2, $1, SS_ANNE_1
+ db 2 ; warps
+ warp 14, 0, 5, -1
+ warp 14, 2, 1, SS_ANNE_1
- db $0 ; signs
+ db 0 ; signs
- db $0 ; objects
+ db 0 ; objects
; warp-to
- warp_to $e, $0, VERMILION_DOCK_WIDTH
- warp_to $e, $2, VERMILION_DOCK_WIDTH ; SS_ANNE_1
+ warp_to 14, 0, VERMILION_DOCK_WIDTH
+ warp_to 14, 2, VERMILION_DOCK_WIDTH ; SS_ANNE_1