aboutsummaryrefslogtreecommitdiffstats
path: root/data/mapObjects/SSAnne2F.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/SSAnne2F.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/SSAnne2F.asm')
-rwxr-xr-xdata/mapObjects/SSAnne2F.asm30
1 files changed, 0 insertions, 30 deletions
diff --git a/data/mapObjects/SSAnne2F.asm b/data/mapObjects/SSAnne2F.asm
deleted file mode 100755
index 6abd5ac4..00000000
--- a/data/mapObjects/SSAnne2F.asm
+++ /dev/null
@@ -1,30 +0,0 @@
-SSAnne2F_Object:
- db $c ; border block
-
- db 9 ; warps
- warp 9, 11, 0, SS_ANNE_2F_ROOMS
- warp 13, 11, 2, SS_ANNE_2F_ROOMS
- warp 17, 11, 4, SS_ANNE_2F_ROOMS
- warp 21, 11, 6, SS_ANNE_2F_ROOMS
- warp 25, 11, 8, SS_ANNE_2F_ROOMS
- warp 29, 11, 10, SS_ANNE_2F_ROOMS
- warp 2, 4, 8, SS_ANNE_1F
- warp 2, 12, 1, SS_ANNE_3F
- warp 36, 4, 0, SS_ANNE_CAPTAINS_ROOM
-
- db 0 ; signs
-
- db 2 ; objects
- object SPRITE_WAITER, 3, 7, WALK, 1, 1 ; person
- object SPRITE_BLUE, 36, 4, STAY, DOWN, 2, OPP_SONY1, 1
-
- ; warp-to
- warp_to 9, 11, SS_ANNE_2F_WIDTH ; SS_ANNE_2F_ROOMS
- warp_to 13, 11, SS_ANNE_2F_WIDTH ; SS_ANNE_2F_ROOMS
- warp_to 17, 11, SS_ANNE_2F_WIDTH ; SS_ANNE_2F_ROOMS
- warp_to 21, 11, SS_ANNE_2F_WIDTH ; SS_ANNE_2F_ROOMS
- warp_to 25, 11, SS_ANNE_2F_WIDTH ; SS_ANNE_2F_ROOMS
- warp_to 29, 11, SS_ANNE_2F_WIDTH ; SS_ANNE_2F_ROOMS
- warp_to 2, 4, SS_ANNE_2F_WIDTH ; SS_ANNE_1F
- warp_to 2, 12, SS_ANNE_2F_WIDTH ; SS_ANNE_3F
- warp_to 36, 4, SS_ANNE_2F_WIDTH ; SS_ANNE_CAPTAINS_ROOM