aboutsummaryrefslogtreecommitdiffstats
path: root/data/mapObjects/museum1f.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/museum1f.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/museum1f.asm')
-rwxr-xr-xdata/mapObjects/museum1f.asm25
1 files changed, 0 insertions, 25 deletions
diff --git a/data/mapObjects/museum1f.asm b/data/mapObjects/museum1f.asm
deleted file mode 100755
index 3034dc74..00000000
--- a/data/mapObjects/museum1f.asm
+++ /dev/null
@@ -1,25 +0,0 @@
-Museum1FObject:
- db $a ; border block
-
- db 5 ; warps
- warp 10, 7, 0, -1
- warp 11, 7, 0, -1
- warp 16, 7, 1, -1
- warp 17, 7, 1, -1
- warp 7, 7, 0, MUSEUM_2F
-
- db 0 ; signs
-
- db 5 ; objects
- object SPRITE_OAK_AIDE, 12, 4, STAY, LEFT, 1 ; person
- object SPRITE_GAMBLER, 1, 4, STAY, NONE, 2 ; person
- object SPRITE_OAK_AIDE, 15, 2, STAY, DOWN, 3 ; person
- object SPRITE_OAK_AIDE, 17, 4, STAY, NONE, 4 ; person
- object SPRITE_OLD_AMBER, 16, 2, STAY, NONE, 5 ; person
-
- ; warp-to
- warp_to 10, 7, MUSEUM_1F_WIDTH
- warp_to 11, 7, MUSEUM_1F_WIDTH
- warp_to 16, 7, MUSEUM_1F_WIDTH
- warp_to 17, 7, MUSEUM_1F_WIDTH
- warp_to 7, 7, MUSEUM_1F_WIDTH ; MUSEUM_2F