aboutsummaryrefslogtreecommitdiffstats
path: root/data/mapObjects/SaffronMart.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/SaffronMart.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 'data/mapObjects/SaffronMart.asm')
-rwxr-xr-xdata/mapObjects/SaffronMart.asm17
1 files changed, 17 insertions, 0 deletions
diff --git a/data/mapObjects/SaffronMart.asm b/data/mapObjects/SaffronMart.asm
new file mode 100755
index 00000000..c376f2de
--- /dev/null
+++ b/data/mapObjects/SaffronMart.asm
@@ -0,0 +1,17 @@
+SaffronMart_Object:
+ db $0 ; border block
+
+ db 2 ; warps
+ warp 3, 7, 4, -1
+ warp 4, 7, 4, -1
+
+ db 0 ; signs
+
+ db 3 ; objects
+ object SPRITE_MART_GUY, 0, 5, STAY, RIGHT, 1 ; person
+ object SPRITE_BLACK_HAIR_BOY_2, 4, 2, STAY, NONE, 2 ; person
+ object SPRITE_LASS, 6, 5, WALK, 0, 3 ; person
+
+ ; warp-to
+ warp_to 3, 7, SAFFRON_MART_WIDTH
+ warp_to 4, 7, SAFFRON_MART_WIDTH