aboutsummaryrefslogtreecommitdiffstats
path: root/data/mapObjects/Route7.asm
diff options
context:
space:
mode:
authordannye <33dannye@gmail.com>2020-05-20 19:40:33 -0500
committerdannye <33dannye@gmail.com>2020-05-20 20:02:53 -0500
commit10f9559eab8c93b94abb8ae8d1083704ad4e169a (patch)
tree7dbe7b152dde8a6e9b56664b5b8cdfc0d6be1253 /data/mapObjects/Route7.asm
parentMerge pull request #39 from TiKevin83/master (diff)
downloadpokeyellow-10f9559eab8c93b94abb8ae8d1083704ad4e169a.tar.gz
pokeyellow-10f9559eab8c93b94abb8ae8d1083704ad4e169a.tar.xz
pokeyellow-10f9559eab8c93b94abb8ae8d1083704ad4e169a.zip
Sync with pokered
Diffstat (limited to '')
-rwxr-xr-xdata/mapObjects/Route7.asm (renamed from data/mapObjects/route7.asm)4
1 files changed, 2 insertions, 2 deletions
diff --git a/data/mapObjects/route7.asm b/data/mapObjects/Route7.asm
index 2207bfd4..3da2fd4b 100755
--- a/data/mapObjects/route7.asm
+++ b/data/mapObjects/Route7.asm
@@ -1,4 +1,4 @@
-Route7Object:
+Route7_Object:
db $f ; border block
db 5 ; warps
@@ -6,7 +6,7 @@ Route7Object:
warp 18, 10, 2, ROUTE_7_GATE
warp 11, 9, 0, ROUTE_7_GATE
warp 11, 10, 0, ROUTE_7_GATE
- warp 5, 13, 0, PATH_ENTRANCE_ROUTE_7
+ warp 5, 13, 0, UNDERGROUND_PATH_ROUTE_7
db 1 ; signs
sign 3, 13, 1 ; Route7Text1