aboutsummaryrefslogtreecommitdiffstats
path: root/data/mapObjects/Route20.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/Route20.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/Route20.asm (renamed from data/mapObjects/route20.asm)10
1 files changed, 5 insertions, 5 deletions
diff --git a/data/mapObjects/route20.asm b/data/mapObjects/Route20.asm
index 5f4d5647..7bceef97 100755
--- a/data/mapObjects/route20.asm
+++ b/data/mapObjects/Route20.asm
@@ -1,9 +1,9 @@
-Route20Object:
+Route20_Object:
db $43 ; border block
db 2 ; warps
- warp 48, 5, 0, SEAFOAM_ISLANDS_1
- warp 58, 9, 2, SEAFOAM_ISLANDS_1
+ warp 48, 5, 0, SEAFOAM_ISLANDS_1F
+ warp 58, 9, 2, SEAFOAM_ISLANDS_1F
db 2 ; signs
sign 51, 7, 11 ; Route20Text11
@@ -22,5 +22,5 @@ Route20Object:
object SPRITE_SWIMMER, 15, 8, STAY, UP, 10, OPP_BEAUTY, 8
; warp-to
- warp_to 48, 5, ROUTE_20_WIDTH ; SEAFOAM_ISLANDS_1
- warp_to 58, 9, ROUTE_20_WIDTH ; SEAFOAM_ISLANDS_1
+ warp_to 48, 5, ROUTE_20_WIDTH ; SEAFOAM_ISLANDS_1F
+ warp_to 58, 9, ROUTE_20_WIDTH ; SEAFOAM_ISLANDS_1F