aboutsummaryrefslogtreecommitdiffstats
path: root/data/mapObjects/SSAnne1F.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/SSAnne1F.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/SSAnne1F.asm')
-rwxr-xr-xdata/mapObjects/SSAnne1F.asm34
1 files changed, 0 insertions, 34 deletions
diff --git a/data/mapObjects/SSAnne1F.asm b/data/mapObjects/SSAnne1F.asm
deleted file mode 100755
index 3e454f06..00000000
--- a/data/mapObjects/SSAnne1F.asm
+++ /dev/null
@@ -1,34 +0,0 @@
-SSAnne1F_Object:
- db $c ; border block
-
- db 11 ; warps
- warp 26, 0, 1, VERMILION_DOCK
- warp 27, 0, 1, VERMILION_DOCK
- warp 31, 8, 0, SS_ANNE_1F_ROOMS
- warp 23, 8, 1, SS_ANNE_1F_ROOMS
- warp 19, 8, 2, SS_ANNE_1F_ROOMS
- warp 15, 8, 3, SS_ANNE_1F_ROOMS
- warp 11, 8, 4, SS_ANNE_1F_ROOMS
- warp 7, 8, 5, SS_ANNE_1F_ROOMS
- warp 2, 6, 6, SS_ANNE_2F
- warp 37, 15, 5, SS_ANNE_B1F
- warp 3, 16, 0, SS_ANNE_KITCHEN
-
- db 0 ; signs
-
- db 2 ; objects
- object SPRITE_WAITER, 12, 6, WALK, 2, 1 ; person
- object SPRITE_SAILOR, 27, 5, STAY, NONE, 2 ; person
-
- ; warp-to
- warp_to 26, 0, SS_ANNE_1F_WIDTH ; VERMILION_DOCK
- warp_to 27, 0, SS_ANNE_1F_WIDTH ; VERMILION_DOCK
- warp_to 31, 8, SS_ANNE_1F_WIDTH ; SS_ANNE_1F_ROOMS
- warp_to 23, 8, SS_ANNE_1F_WIDTH ; SS_ANNE_1F_ROOMS
- warp_to 19, 8, SS_ANNE_1F_WIDTH ; SS_ANNE_1F_ROOMS
- warp_to 15, 8, SS_ANNE_1F_WIDTH ; SS_ANNE_1F_ROOMS
- warp_to 11, 8, SS_ANNE_1F_WIDTH ; SS_ANNE_1F_ROOMS
- warp_to 7, 8, SS_ANNE_1F_WIDTH ; SS_ANNE_1F_ROOMS
- warp_to 2, 6, SS_ANNE_1F_WIDTH ; SS_ANNE_2F
- warp_to 37, 15, SS_ANNE_1F_WIDTH ; SS_ANNE_B1F
- warp_to 3, 16, SS_ANNE_1F_WIDTH ; SS_ANNE_KITCHEN