aboutsummaryrefslogtreecommitdiffstats
path: root/data/mapObjects/CeladonMansion3F.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/CeladonMansion3F.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/CeladonMansion3F.asm')
-rwxr-xr-xdata/mapObjects/CeladonMansion3F.asm26
1 files changed, 0 insertions, 26 deletions
diff --git a/data/mapObjects/CeladonMansion3F.asm b/data/mapObjects/CeladonMansion3F.asm
deleted file mode 100755
index 32701f14..00000000
--- a/data/mapObjects/CeladonMansion3F.asm
+++ /dev/null
@@ -1,26 +0,0 @@
-CeladonMansion3F_Object:
- db $f ; border block
-
- db 4 ; warps
- warp 6, 1, 0, CELADON_MANSION_2F
- warp 7, 1, 0, CELADON_MANSION_ROOF
- warp 2, 1, 1, CELADON_MANSION_ROOF
- warp 4, 1, 3, CELADON_MANSION_2F
-
- db 4 ; signs
- sign 1, 3, 5 ; CeladonMansion3Text5
- sign 4, 3, 6 ; CeladonMansion3Text6
- sign 1, 6, 7 ; CeladonMansion3Text7
- sign 4, 9, 8 ; CeladonMansion3Text8
-
- db 4 ; objects
- object SPRITE_BIKE_SHOP_GUY, 0, 4, STAY, UP, 1 ; person
- object SPRITE_MART_GUY, 3, 4, STAY, UP, 2 ; person
- object SPRITE_BLACK_HAIR_BOY_2, 0, 7, STAY, UP, 3 ; person
- object SPRITE_LAPRAS_GIVER, 2, 3, STAY, NONE, 4 ; person
-
- ; warp-to
- warp_to 6, 1, CELADON_MANSION_3F_WIDTH ; CELADON_MANSION_2F
- warp_to 7, 1, CELADON_MANSION_3F_WIDTH ; CELADON_MANSION_ROOF
- warp_to 2, 1, CELADON_MANSION_3F_WIDTH ; CELADON_MANSION_ROOF
- warp_to 4, 1, CELADON_MANSION_3F_WIDTH ; CELADON_MANSION_2F