aboutsummaryrefslogtreecommitdiffstats
path: root/data/mapObjects/Route10.asm
diff options
context:
space:
mode:
authorDaniel Harding <33dannye@gmail.com>2020-05-20 20:17:30 -0500
committerGitHub <noreply@github.com>2020-05-20 20:17:30 -0500
commit500d99c258145d233af8d14cdb5c6e0200dfc1d8 (patch)
tree7dbe7b152dde8a6e9b56664b5b8cdfc0d6be1253 /data/mapObjects/Route10.asm
parentMerge pull request #39 from TiKevin83/master (diff)
parentMerge remote-tracking branch 'pokered/master' (diff)
downloadpokeyellow-500d99c258145d233af8d14cdb5c6e0200dfc1d8.tar.gz
pokeyellow-500d99c258145d233af8d14cdb5c6e0200dfc1d8.tar.xz
pokeyellow-500d99c258145d233af8d14cdb5c6e0200dfc1d8.zip
Merge pull request #50 from dannye/master
merge pokered
Diffstat (limited to '')
-rwxr-xr-xdata/mapObjects/Route10.asm (renamed from data/mapObjects/route10.asm)6
1 files changed, 3 insertions, 3 deletions
diff --git a/data/mapObjects/route10.asm b/data/mapObjects/Route10.asm
index 40d5c93a..12850577 100755
--- a/data/mapObjects/route10.asm
+++ b/data/mapObjects/Route10.asm
@@ -1,10 +1,10 @@
-Route10Object:
+Route10_Object:
db $2c ; border block
db 4 ; warps
warp 11, 19, 0, ROCK_TUNNEL_POKECENTER
- warp 8, 17, 0, ROCK_TUNNEL_1
- warp 8, 53, 2, ROCK_TUNNEL_1
+ warp 8, 17, 0, ROCK_TUNNEL_1F
+ warp 8, 53, 2, ROCK_TUNNEL_1F
warp 6, 39, 0, POWER_PLANT
db 4 ; signs