aboutsummaryrefslogtreecommitdiffstats
path: root/data/mapObjects/PokemonMansionB1F.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/PokemonMansionB1F.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/PokemonMansionB1F.asm')
-rwxr-xr-xdata/mapObjects/PokemonMansionB1F.asm20
1 files changed, 0 insertions, 20 deletions
diff --git a/data/mapObjects/PokemonMansionB1F.asm b/data/mapObjects/PokemonMansionB1F.asm
deleted file mode 100755
index ac232799..00000000
--- a/data/mapObjects/PokemonMansionB1F.asm
+++ /dev/null
@@ -1,20 +0,0 @@
-PokemonMansionB1F_Object:
- db $1 ; border block
-
- db 1 ; warps
- warp 23, 22, 5, POKEMON_MANSION_1F
-
- db 0 ; signs
-
- db 8 ; objects
- object SPRITE_BLACK_HAIR_BOY_2, 16, 23, STAY, NONE, 1, OPP_BURGLAR, 9
- object SPRITE_OAK_AIDE, 27, 11, STAY, DOWN, 2, OPP_SCIENTIST, 13
- object SPRITE_BALL, 10, 2, STAY, NONE, 3, RARE_CANDY
- object SPRITE_BALL, 1, 22, STAY, NONE, 4, FULL_RESTORE
- object SPRITE_BALL, 19, 25, STAY, NONE, 5, TM_14
- object SPRITE_BALL, 5, 4, STAY, NONE, 6, TM_22
- object SPRITE_BOOK_MAP_DEX, 16, 20, STAY, NONE, 7 ; person
- object SPRITE_BALL, 5, 13, STAY, NONE, 8, SECRET_KEY
-
- ; warp-to
- warp_to 23, 22, POKEMON_MANSION_B1F_WIDTH ; POKEMON_MANSION_1F