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/PokemonMansion1F.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/PokemonMansion1F.asm')
| -rwxr-xr-x | data/mapObjects/PokemonMansion1F.asm | 29 |
1 files changed, 29 insertions, 0 deletions
diff --git a/data/mapObjects/PokemonMansion1F.asm b/data/mapObjects/PokemonMansion1F.asm new file mode 100755 index 00000000..109b5b8e --- /dev/null +++ b/data/mapObjects/PokemonMansion1F.asm @@ -0,0 +1,29 @@ +PokemonMansion1F_Object: + 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, POKEMON_MANSION_2F + warp 21, 23, 0, POKEMON_MANSION_B1F + 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, POKEMON_MANSION_1F_WIDTH + warp_to 5, 27, POKEMON_MANSION_1F_WIDTH + warp_to 6, 27, POKEMON_MANSION_1F_WIDTH + warp_to 7, 27, POKEMON_MANSION_1F_WIDTH + warp_to 5, 10, POKEMON_MANSION_1F_WIDTH ; POKEMON_MANSION_2F + warp_to 21, 23, POKEMON_MANSION_1F_WIDTH ; POKEMON_MANSION_B1F + warp_to 26, 27, POKEMON_MANSION_1F_WIDTH + warp_to 27, 27, POKEMON_MANSION_1F_WIDTH |