aboutsummaryrefslogtreecommitdiffstats
path: root/data/mapObjects/PokemonMansion2F.asm
diff options
context:
space:
mode:
authorRangi <remy.oukaour+rangi42@gmail.com>2019-01-01 15:06:23 -0500
committerRangi <remy.oukaour+rangi42@gmail.com>2019-01-01 23:33:10 -0500
commitc7796024590fec48ac79756793c1a6e3b54daf8f (patch)
tree0d61caa7ebe429995a61e800d1d78c3a82aec886 /data/mapObjects/PokemonMansion2F.asm
parentMerge pull request #193 from luckytyphlosion/master (diff)
downloadpokeyellow-c7796024590fec48ac79756793c1a6e3b54daf8f.tar.gz
pokeyellow-c7796024590fec48ac79756793c1a6e3b54daf8f.tar.xz
pokeyellow-c7796024590fec48ac79756793c1a6e3b54daf8f.zip
Rename map files, labels, and constants to be consistent and work with Polished Map
Diffstat (limited to 'data/mapObjects/PokemonMansion2F.asm')
-rwxr-xr-xdata/mapObjects/PokemonMansion2F.asm22
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