aboutsummaryrefslogtreecommitdiffstats
path: root/data/mapObjects/mansion4.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/mansion4.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/mansion4.asm')
-rwxr-xr-xdata/mapObjects/mansion4.asm20
1 files changed, 0 insertions, 20 deletions
diff --git a/data/mapObjects/mansion4.asm b/data/mapObjects/mansion4.asm
deleted file mode 100755
index bcd85206..00000000
--- a/data/mapObjects/mansion4.asm
+++ /dev/null
@@ -1,20 +0,0 @@
-Mansion4Object:
- db $1 ; border block
-
- db 1 ; warps
- warp 23, 22, 5, MANSION_1
-
- db 0 ; signs
-
- db 8 ; objects
- object SPRITE_BLACK_HAIR_BOY_2, 16, 23, STAY, NONE, 1, OPP_BURGLAR, 9
- object SPRITE_OAK_AIDE, 27, 11, STAY, DOWN, 2, OPP_SCIENTIST, 13
- object SPRITE_BALL, 10, 2, STAY, NONE, 3, RARE_CANDY
- object SPRITE_BALL, 1, 22, STAY, NONE, 4, FULL_RESTORE
- object SPRITE_BALL, 19, 25, STAY, NONE, 5, TM_14
- object SPRITE_BALL, 5, 4, STAY, NONE, 6, TM_22
- object SPRITE_BOOK_MAP_DEX, 16, 20, STAY, NONE, 7 ; person
- object SPRITE_BALL, 5, 13, STAY, NONE, 8, SECRET_KEY
-
- ; warp-to
- warp_to 23, 22, MANSION_4_WIDTH ; POKEMON_MANSION_1F