diff options
| author | Daniel Harding <33dannye@gmail.com> | 2020-05-20 20:17:30 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-20 20:17:30 -0500 |
| commit | 500d99c258145d233af8d14cdb5c6e0200dfc1d8 (patch) | |
| tree | 7dbe7b152dde8a6e9b56664b5b8cdfc0d6be1253 /data/mapObjects/mansion2.asm | |
| parent | Merge pull request #39 from TiKevin83/master (diff) | |
| parent | Merge remote-tracking branch 'pokered/master' (diff) | |
| download | pokeyellow-500d99c258145d233af8d14cdb5c6e0200dfc1d8.tar.gz pokeyellow-500d99c258145d233af8d14cdb5c6e0200dfc1d8.tar.xz pokeyellow-500d99c258145d233af8d14cdb5c6e0200dfc1d8.zip | |
Merge pull request #50 from dannye/master
merge pokered
Diffstat (limited to 'data/mapObjects/mansion2.asm')
| -rwxr-xr-x | data/mapObjects/mansion2.asm | 22 |
1 files changed, 0 insertions, 22 deletions
diff --git a/data/mapObjects/mansion2.asm b/data/mapObjects/mansion2.asm deleted file mode 100755 index 6fd86b97..00000000 --- a/data/mapObjects/mansion2.asm +++ /dev/null @@ -1,22 +0,0 @@ -Mansion2Object: - db $1 ; border block - - db 4 ; warps - warp 5, 10, 4, MANSION_1 - warp 7, 10, 0, MANSION_3 - warp 25, 14, 2, MANSION_3 - warp 6, 1, 1, MANSION_3 - - db 0 ; signs - - db 4 ; objects - object SPRITE_BLACK_HAIR_BOY_2, 3, 17, WALK, 2, 1, OPP_BURGLAR, 7 - object SPRITE_BALL, 28, 7, STAY, NONE, 2, CALCIUM - object SPRITE_BOOK_MAP_DEX, 18, 2, STAY, NONE, 3 ; person - object SPRITE_BOOK_MAP_DEX, 3, 22, STAY, NONE, 4 ; person - - ; warp-to - warp_to 5, 10, MANSION_2_WIDTH ; POKEMON_MANSION_1F - warp_to 7, 10, MANSION_2_WIDTH ; POKEMON_MANSION_3F - warp_to 25, 14, MANSION_2_WIDTH ; POKEMON_MANSION_3F - warp_to 6, 1, MANSION_2_WIDTH ; POKEMON_MANSION_3F |