aboutsummaryrefslogtreecommitdiffstats
path: root/data/mapObjects/Museum2F.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/Museum2F.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/Museum2F.asm')
-rwxr-xr-xdata/mapObjects/Museum2F.asm19
1 files changed, 0 insertions, 19 deletions
diff --git a/data/mapObjects/Museum2F.asm b/data/mapObjects/Museum2F.asm
deleted file mode 100755
index 80815820..00000000
--- a/data/mapObjects/Museum2F.asm
+++ /dev/null
@@ -1,19 +0,0 @@
-Museum2F_Object:
- db $a ; border block
-
- db 1 ; warps
- warp 7, 7, 4, MUSEUM_1F
-
- db 2 ; signs
- sign 11, 2, 6 ; Museum2FText6
- sign 2, 5, 7 ; Museum2FText7
-
- db 5 ; objects
- object SPRITE_BUG_CATCHER, 1, 7, WALK, 2, 1 ; person
- object SPRITE_OLD_PERSON, 0, 5, STAY, DOWN, 2 ; person
- object SPRITE_OAK_AIDE, 7, 5, STAY, DOWN, 3 ; person
- object SPRITE_BRUNETTE_GIRL, 11, 5, STAY, NONE, 4 ; person
- object SPRITE_HIKER, 12, 5, STAY, DOWN, 5 ; person
-
- ; warp-to
- warp_to 7, 7, MUSEUM_2F_WIDTH ; MUSEUM_1F