aboutsummaryrefslogtreecommitdiffstats
path: root/data/mapObjects/Route12SuperRodHouse.asm
diff options
context:
space:
mode:
authorDaniel Harding <33dannye@gmail.com>2019-01-13 22:38:16 -0600
committerGitHub <noreply@github.com>2019-01-13 22:38:16 -0600
commit725b86ebbec23bd1f53fd60bf0201c904fee951d (patch)
treea37f4d33c5b77635c7ff72b91a73fcd90c4af915 /data/mapObjects/Route12SuperRodHouse.asm
parentMerge pull request #195 from Rangi42/master (diff)
parentRename map files, labels, and constants to be consistent and work with Polish... (diff)
downloadpokeyellow-725b86ebbec23bd1f53fd60bf0201c904fee951d.tar.gz
pokeyellow-725b86ebbec23bd1f53fd60bf0201c904fee951d.tar.xz
pokeyellow-725b86ebbec23bd1f53fd60bf0201c904fee951d.zip
Merge pull request #196 from Rangi42/polishedmaps
Rename map files, labels, and constants to be consistent and work with Polished Map
Diffstat (limited to '')
-rwxr-xr-xdata/mapObjects/Route12SuperRodHouse.asm (renamed from data/mapObjects/route12house.asm)6
1 files changed, 3 insertions, 3 deletions
diff --git a/data/mapObjects/route12house.asm b/data/mapObjects/Route12SuperRodHouse.asm
index 3161ebe6..458378a2 100755
--- a/data/mapObjects/route12house.asm
+++ b/data/mapObjects/Route12SuperRodHouse.asm
@@ -1,4 +1,4 @@
-Route12HouseObject:
+Route12SuperRodHouse_Object:
db $a ; border block
db 2 ; warps
@@ -11,5 +11,5 @@ Route12HouseObject:
object SPRITE_FISHER, 2, 4, STAY, RIGHT, 1 ; person
; warp-to
- warp_to 2, 7, ROUTE_12_HOUSE_WIDTH
- warp_to 3, 7, ROUTE_12_HOUSE_WIDTH
+ warp_to 2, 7, ROUTE_12_SUPER_ROD_HOUSE_WIDTH
+ warp_to 3, 7, ROUTE_12_SUPER_ROD_HOUSE_WIDTH