aboutsummaryrefslogtreecommitdiffstats
path: root/data/mapObjects/FuchsiaGoodRodHouse.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/FuchsiaGoodRodHouse.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/FuchsiaGoodRodHouse.asm (renamed from data/mapObjects/fuchsiahouse3.asm)8
1 files changed, 4 insertions, 4 deletions
diff --git a/data/mapObjects/fuchsiahouse3.asm b/data/mapObjects/FuchsiaGoodRodHouse.asm
index 0bed500b..390447c8 100755
--- a/data/mapObjects/fuchsiahouse3.asm
+++ b/data/mapObjects/FuchsiaGoodRodHouse.asm
@@ -1,4 +1,4 @@
-FuchsiaHouse3Object:
+FuchsiaGoodRodHouse_Object:
db $c ; border block
db 3 ; warps
@@ -12,6 +12,6 @@ FuchsiaHouse3Object:
object SPRITE_FISHER, 5, 3, STAY, RIGHT, 1 ; person
; warp-to
- warp_to 2, 0, FUCHSIA_HOUSE_3_WIDTH
- warp_to 2, 7, FUCHSIA_HOUSE_3_WIDTH
- warp_to 3, 7, FUCHSIA_HOUSE_3_WIDTH
+ warp_to 2, 0, FUCHSIA_GOOD_ROD_HOUSE_WIDTH
+ warp_to 2, 7, FUCHSIA_GOOD_ROD_HOUSE_WIDTH
+ warp_to 3, 7, FUCHSIA_GOOD_ROD_HOUSE_WIDTH