aboutsummaryrefslogtreecommitdiffstats
path: root/data/mapObjects/CinnabarLabTradeRoom.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/CinnabarLabTradeRoom.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 'data/mapObjects/CinnabarLabTradeRoom.asm')
-rwxr-xr-xdata/mapObjects/CinnabarLabTradeRoom.asm17
1 files changed, 17 insertions, 0 deletions
diff --git a/data/mapObjects/CinnabarLabTradeRoom.asm b/data/mapObjects/CinnabarLabTradeRoom.asm
new file mode 100755
index 00000000..449cc914
--- /dev/null
+++ b/data/mapObjects/CinnabarLabTradeRoom.asm
@@ -0,0 +1,17 @@
+CinnabarLabTradeRoom_Object:
+ db $17 ; border block
+
+ db 2 ; warps
+ warp 2, 7, 2, CINNABAR_LAB
+ warp 3, 7, 2, CINNABAR_LAB
+
+ db 0 ; signs
+
+ db 3 ; objects
+ object SPRITE_BLACK_HAIR_BOY_2, 3, 2, STAY, DOWN, 1 ; person
+ object SPRITE_OLD_PERSON, 1, 4, STAY, NONE, 2 ; person
+ object SPRITE_FOULARD_WOMAN, 5, 5, STAY, UP, 3 ; person
+
+ ; warp-to
+ warp_to 2, 7, CINNABAR_LAB_TRADE_ROOM_WIDTH ; CINNABAR_LAB
+ warp_to 3, 7, CINNABAR_LAB_TRADE_ROOM_WIDTH ; CINNABAR_LAB