aboutsummaryrefslogtreecommitdiffstats
path: root/data/maps/objects/BeachHouse.asm
diff options
context:
space:
mode:
authorRangi <remy.oukaour+rangi42@gmail.com>2020-11-04 15:16:20 -0500
committerRangi <remy.oukaour+rangi42@gmail.com>2020-11-04 19:44:31 -0500
commitaae999f72bd81a3156c7e00da4ebf499f52da5a6 (patch)
tree32fef70a31af3a0b5ad2b0d34042c312574fb42d /data/maps/objects/BeachHouse.asm
parentMerge branch 'master' of https://github.com/pret/pokered (diff)
downloadpokeyellow-aae999f72bd81a3156c7e00da4ebf499f52da5a6.tar.gz
pokeyellow-aae999f72bd81a3156c7e00da4ebf499f52da5a6.tar.xz
pokeyellow-aae999f72bd81a3156c7e00da4ebf499f52da5a6.zip
Start reorganizing pokeyellow
Diffstat (limited to '')
-rw-r--r--data/maps/objects/SummerBeachHouse.asm (renamed from data/maps/objects/BeachHouse.asm)4
1 files changed, 2 insertions, 2 deletions
diff --git a/data/maps/objects/BeachHouse.asm b/data/maps/objects/SummerBeachHouse.asm
index 1ba99f87..c503b8a7 100644
--- a/data/maps/objects/BeachHouse.asm
+++ b/data/maps/objects/SummerBeachHouse.asm
@@ -1,4 +1,4 @@
-BeachHouse_Object:
+SummerBeachHouse_Object:
db $a ; border block
def_warps
@@ -15,4 +15,4 @@ BeachHouse_Object:
object SPRITE_FISHING_GURU, 2, 3, STAY, DOWN, 1 ; surfin' dude
object SPRITE_PIKACHU, 5, 3, WALK, 1, 2 ; pikachu
- def_warps_to BEACH_HOUSE
+ def_warps_to SUMMER_BEACH_HOUSE