aboutsummaryrefslogtreecommitdiffstats
path: root/data/mapObjects/CeladonMart2F.asm
diff options
context:
space:
mode:
authorDaniel Harding <33dannye@gmail.com>2020-05-20 20:17:30 -0500
committerGitHub <noreply@github.com>2020-05-20 20:17:30 -0500
commit500d99c258145d233af8d14cdb5c6e0200dfc1d8 (patch)
tree7dbe7b152dde8a6e9b56664b5b8cdfc0d6be1253 /data/mapObjects/CeladonMart2F.asm
parentMerge pull request #39 from TiKevin83/master (diff)
parentMerge remote-tracking branch 'pokered/master' (diff)
downloadpokeyellow-500d99c258145d233af8d14cdb5c6e0200dfc1d8.tar.gz
pokeyellow-500d99c258145d233af8d14cdb5c6e0200dfc1d8.tar.xz
pokeyellow-500d99c258145d233af8d14cdb5c6e0200dfc1d8.zip
Merge pull request #50 from dannye/master
merge pokered
Diffstat (limited to 'data/mapObjects/CeladonMart2F.asm')
-rwxr-xr-xdata/mapObjects/CeladonMart2F.asm21
1 files changed, 21 insertions, 0 deletions
diff --git a/data/mapObjects/CeladonMart2F.asm b/data/mapObjects/CeladonMart2F.asm
new file mode 100755
index 00000000..2f5f428e
--- /dev/null
+++ b/data/mapObjects/CeladonMart2F.asm
@@ -0,0 +1,21 @@
+CeladonMart2F_Object:
+ db $f ; border block
+
+ db 3 ; warps
+ warp 12, 1, 4, CELADON_MART_1F
+ warp 16, 1, 1, CELADON_MART_3F
+ warp 1, 1, 0, CELADON_MART_ELEVATOR
+
+ db 1 ; signs
+ sign 14, 1, 5 ; CeladonMart2Text5
+
+ db 4 ; objects
+ object SPRITE_MART_GUY, 5, 3, STAY, DOWN, 1 ; person
+ object SPRITE_MART_GUY, 6, 3, STAY, DOWN, 2 ; person
+ object SPRITE_FAT_BALD_GUY, 19, 5, STAY, NONE, 3 ; person
+ object SPRITE_GIRL, 14, 4, WALK, 1, 4 ; person
+
+ ; warp-to
+ warp_to 12, 1, CELADON_MART_2F_WIDTH ; CELADON_MART_1F
+ warp_to 16, 1, CELADON_MART_2F_WIDTH ; CELADON_MART_3F
+ warp_to 1, 1, CELADON_MART_2F_WIDTH ; CELADON_MART_ELEVATOR