aboutsummaryrefslogtreecommitdiffstats
path: root/data/mapObjects/Route16.asm
diff options
context:
space:
mode:
authorRangi <remy.oukaour+rangi42@gmail.com>2019-01-01 15:06:23 -0500
committerRangi <remy.oukaour+rangi42@gmail.com>2019-01-01 23:33:10 -0500
commitc7796024590fec48ac79756793c1a6e3b54daf8f (patch)
tree0d61caa7ebe429995a61e800d1d78c3a82aec886 /data/mapObjects/Route16.asm
parentMerge pull request #193 from luckytyphlosion/master (diff)
downloadpokeyellow-c7796024590fec48ac79756793c1a6e3b54daf8f.tar.gz
pokeyellow-c7796024590fec48ac79756793c1a6e3b54daf8f.tar.xz
pokeyellow-c7796024590fec48ac79756793c1a6e3b54daf8f.zip
Rename map files, labels, and constants to be consistent and work with Polished Map
Diffstat (limited to '')
-rwxr-xr-xdata/mapObjects/Route16.asm (renamed from data/mapObjects/route16.asm)6
1 files changed, 3 insertions, 3 deletions
diff --git a/data/mapObjects/route16.asm b/data/mapObjects/Route16.asm
index 35ffea17..fb23e6ca 100755
--- a/data/mapObjects/route16.asm
+++ b/data/mapObjects/Route16.asm
@@ -1,4 +1,4 @@
-Route16Object:
+Route16_Object:
db $f ; border block
db 9 ; warps
@@ -10,7 +10,7 @@ Route16Object:
warp 17, 5, 5, ROUTE_16_GATE_1F
warp 24, 4, 6, ROUTE_16_GATE_1F
warp 24, 5, 7, ROUTE_16_GATE_1F
- warp 7, 5, 0, ROUTE_16_HOUSE
+ warp 7, 5, 0, ROUTE_16_FLY_HOUSE
db 2 ; signs
sign 27, 11, 8 ; Route16Text8
@@ -34,4 +34,4 @@ Route16Object:
warp_to 17, 5, ROUTE_16_WIDTH ; ROUTE_16_GATE_1F
warp_to 24, 4, ROUTE_16_WIDTH ; ROUTE_16_GATE_1F
warp_to 24, 5, ROUTE_16_WIDTH ; ROUTE_16_GATE_1F
- warp_to 7, 5, ROUTE_16_WIDTH ; ROUTE_16_HOUSE
+ warp_to 7, 5, ROUTE_16_WIDTH ; ROUTE_16_FLY_HOUSE