aboutsummaryrefslogtreecommitdiffstats
path: root/data/mapObjects/PokemonMansion2F.asm
diff options
context:
space:
mode:
authorRangi <35663410+Rangi42@users.noreply.github.com>2020-07-04 16:19:15 -0400
committerGitHub <noreply@github.com>2020-07-04 16:19:15 -0400
commit2718c36065e7eb201a149938bcdd51987c4e56b6 (patch)
tree4a1c0294193a497e15ec8e6be59390eb1f84b5d3 /data/mapObjects/PokemonMansion2F.asm
parentMerge pull request #256 from Rangi42/master (diff)
parentUPDATE_PARTY_MENU_BLK_PACKET -> SET_PAL_PARTY_MENU_HP_BARS, and introduce SET... (diff)
downloadpokeyellow-2718c36065e7eb201a149938bcdd51987c4e56b6.tar.gz
pokeyellow-2718c36065e7eb201a149938bcdd51987c4e56b6.tar.xz
pokeyellow-2718c36065e7eb201a149938bcdd51987c4e56b6.zip
Merge pull request #257 from Rangi42/master
More reorganization
Diffstat (limited to 'data/mapObjects/PokemonMansion2F.asm')
-rwxr-xr-xdata/mapObjects/PokemonMansion2F.asm22
1 files changed, 0 insertions, 22 deletions
diff --git a/data/mapObjects/PokemonMansion2F.asm b/data/mapObjects/PokemonMansion2F.asm
deleted file mode 100755
index 6c0cc5f8..00000000
--- a/data/mapObjects/PokemonMansion2F.asm
+++ /dev/null
@@ -1,22 +0,0 @@
-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