aboutsummaryrefslogtreecommitdiffstats
path: root/data/maps/objects/SafariZoneWestRestHouse.asm
diff options
context:
space:
mode:
authordannye <33dannye@gmail.com>2020-11-04 00:06:44 -0600
committerdannye <33dannye@gmail.com>2020-11-04 00:06:44 -0600
commit5647ca687b92954dcf37a6ea6bfbc9a341c32de4 (patch)
treedde1937a1bfdb3a835f4155e1c2eb8f1aaf86f63 /data/maps/objects/SafariZoneWestRestHouse.asm
parentMerge pull request #55 from Deokishisu/patch-1 (diff)
downloadpokeyellow-5647ca687b92954dcf37a6ea6bfbc9a341c32de4.tar.gz
pokeyellow-5647ca687b92954dcf37a6ea6bfbc9a341c32de4.tar.xz
pokeyellow-5647ca687b92954dcf37a6ea6bfbc9a341c32de4.zip
Sync with pokered
Diffstat (limited to 'data/maps/objects/SafariZoneWestRestHouse.asm')
-rwxr-xr-xdata/maps/objects/SafariZoneWestRestHouse.asm15
1 files changed, 15 insertions, 0 deletions
diff --git a/data/maps/objects/SafariZoneWestRestHouse.asm b/data/maps/objects/SafariZoneWestRestHouse.asm
new file mode 100755
index 00000000..26bb481e
--- /dev/null
+++ b/data/maps/objects/SafariZoneWestRestHouse.asm
@@ -0,0 +1,15 @@
+SafariZoneWestRestHouse_Object:
+ db $a ; border block
+
+ def_warps
+ warp 2, 7, 7, SAFARI_ZONE_WEST
+ warp 3, 7, 7, SAFARI_ZONE_WEST
+
+ def_signs
+
+ def_objects
+ object SPRITE_SCIENTIST, 4, 4, WALK, ANY_DIR, 1 ; person
+ object SPRITE_COOLTRAINER_M, 0, 2, STAY, RIGHT, 2 ; person
+ object SPRITE_ERIKA, 6, 2, STAY, DOWN, 3 ; person
+
+ def_warps_to SAFARI_ZONE_WEST_REST_HOUSE