aboutsummaryrefslogtreecommitdiffstats
path: root/data/mapObjects/Route12.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/Route12.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/Route12.asm (renamed from data/mapObjects/route12.asm)6
1 files changed, 3 insertions, 3 deletions
diff --git a/data/mapObjects/route12.asm b/data/mapObjects/Route12.asm
index b72317d4..a9d84cf0 100755
--- a/data/mapObjects/route12.asm
+++ b/data/mapObjects/Route12.asm
@@ -1,11 +1,11 @@
-Route12Object:
+Route12_Object:
db $43 ; border block
db 4 ; warps
warp 10, 15, 0, ROUTE_12_GATE_1F
warp 11, 15, 1, ROUTE_12_GATE_1F
warp 10, 21, 2, ROUTE_12_GATE_1F
- warp 11, 77, 0, ROUTE_12_HOUSE
+ warp 11, 77, 0, ROUTE_12_SUPER_ROD_HOUSE
db 2 ; signs
sign 13, 13, 11 ; Route12Text11
@@ -27,4 +27,4 @@ Route12Object:
warp_to 10, 15, ROUTE_12_WIDTH ; ROUTE_12_GATE_1F
warp_to 11, 15, ROUTE_12_WIDTH ; ROUTE_12_GATE_1F
warp_to 10, 21, ROUTE_12_WIDTH ; ROUTE_12_GATE_1F
- warp_to 11, 77, ROUTE_12_WIDTH ; ROUTE_12_HOUSE
+ warp_to 11, 77, ROUTE_12_WIDTH ; ROUTE_12_SUPER_ROD_HOUSE