aboutsummaryrefslogtreecommitdiffstats
path: root/data/mapObjects/mansion1.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/mansion1.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/mansion1.asm')
-rwxr-xr-xdata/mapObjects/mansion1.asm29
1 files changed, 0 insertions, 29 deletions
diff --git a/data/mapObjects/mansion1.asm b/data/mapObjects/mansion1.asm
deleted file mode 100755
index 1b97c898..00000000
--- a/data/mapObjects/mansion1.asm
+++ /dev/null
@@ -1,29 +0,0 @@
-Mansion1Object:
- db $2e ; border block
-
- db 8 ; warps
- warp 4, 27, 0, -1
- warp 5, 27, 0, -1
- warp 6, 27, 0, -1
- warp 7, 27, 0, -1
- warp 5, 10, 0, MANSION_2
- warp 21, 23, 0, MANSION_4
- warp 26, 27, 0, -1
- warp 27, 27, 0, -1
-
- db 0 ; signs
-
- db 3 ; objects
- object SPRITE_OAK_AIDE, 17, 17, STAY, LEFT, 1, OPP_SCIENTIST, 4
- object SPRITE_BALL, 14, 3, STAY, NONE, 2, ESCAPE_ROPE
- object SPRITE_BALL, 18, 21, STAY, NONE, 3, CARBOS
-
- ; warp-to
- warp_to 4, 27, MANSION_1_WIDTH
- warp_to 5, 27, MANSION_1_WIDTH
- warp_to 6, 27, MANSION_1_WIDTH
- warp_to 7, 27, MANSION_1_WIDTH
- warp_to 5, 10, MANSION_1_WIDTH ; POKEMON_MANSION_2F
- warp_to 21, 23, MANSION_1_WIDTH ; POKEMON_MANSION_B1F
- warp_to 26, 27, MANSION_1_WIDTH
- warp_to 27, 27, MANSION_1_WIDTH