diff options
| author | Daniel Harding <33dannye@gmail.com> | 2019-01-13 22:38:16 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-13 22:38:16 -0600 |
| commit | 725b86ebbec23bd1f53fd60bf0201c904fee951d (patch) | |
| tree | a37f4d33c5b77635c7ff72b91a73fcd90c4af915 /data/mapObjects/PokemonMansion2F.asm | |
| parent | Merge pull request #195 from Rangi42/master (diff) | |
| parent | Rename map files, labels, and constants to be consistent and work with Polish... (diff) | |
| download | pokeyellow-725b86ebbec23bd1f53fd60bf0201c904fee951d.tar.gz pokeyellow-725b86ebbec23bd1f53fd60bf0201c904fee951d.tar.xz pokeyellow-725b86ebbec23bd1f53fd60bf0201c904fee951d.zip | |
Merge pull request #196 from Rangi42/polishedmaps
Rename map files, labels, and constants to be consistent and work with Polished Map
Diffstat (limited to 'data/mapObjects/PokemonMansion2F.asm')
| -rwxr-xr-x | data/mapObjects/PokemonMansion2F.asm | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/data/mapObjects/PokemonMansion2F.asm b/data/mapObjects/PokemonMansion2F.asm new file mode 100755 index 00000000..6c0cc5f8 --- /dev/null +++ b/data/mapObjects/PokemonMansion2F.asm @@ -0,0 +1,22 @@ +PokemonMansion2F_Object: + db $1 ; border block + + db 4 ; warps + warp 5, 10, 4, POKEMON_MANSION_1F + warp 7, 10, 0, POKEMON_MANSION_3F + warp 25, 14, 2, POKEMON_MANSION_3F + warp 6, 1, 1, POKEMON_MANSION_3F + + 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, POKEMON_MANSION_2F_WIDTH ; POKEMON_MANSION_1F + warp_to 7, 10, POKEMON_MANSION_2F_WIDTH ; POKEMON_MANSION_3F + warp_to 25, 14, POKEMON_MANSION_2F_WIDTH ; POKEMON_MANSION_3F + warp_to 6, 1, POKEMON_MANSION_2F_WIDTH ; POKEMON_MANSION_3F |