aboutsummaryrefslogtreecommitdiffstats
path: root/data/mapObjects/SSAnneB1FRooms.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/SSAnneB1FRooms.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/SSAnneB1FRooms.asm')
-rwxr-xr-xdata/mapObjects/SSAnneB1FRooms.asm41
1 files changed, 0 insertions, 41 deletions
diff --git a/data/mapObjects/SSAnneB1FRooms.asm b/data/mapObjects/SSAnneB1FRooms.asm
deleted file mode 100755
index 1d31b89c..00000000
--- a/data/mapObjects/SSAnneB1FRooms.asm
+++ /dev/null
@@ -1,41 +0,0 @@
-SSAnneB1FRooms_Object:
- db $c ; border block
-
- db 10 ; warps
- warp 2, 5, 4, SS_ANNE_B1F
- warp 3, 5, 4, SS_ANNE_B1F
- warp 12, 5, 3, SS_ANNE_B1F
- warp 13, 5, 3, SS_ANNE_B1F
- warp 22, 5, 2, SS_ANNE_B1F
- warp 23, 5, 2, SS_ANNE_B1F
- warp 2, 15, 1, SS_ANNE_B1F
- warp 3, 15, 1, SS_ANNE_B1F
- warp 12, 15, 0, SS_ANNE_B1F
- warp 13, 15, 0, SS_ANNE_B1F
-
- db 0 ; signs
-
- db 11 ; objects
- object SPRITE_SAILOR, 0, 13, STAY, DOWN, 1, OPP_SAILOR, 3
- object SPRITE_SAILOR, 2, 11, STAY, DOWN, 2, OPP_SAILOR, 4
- object SPRITE_SAILOR, 12, 3, STAY, LEFT, 3, OPP_SAILOR, 5
- object SPRITE_SAILOR, 22, 2, STAY, DOWN, 4, OPP_SAILOR, 6
- object SPRITE_SAILOR, 0, 2, STAY, RIGHT, 5, OPP_SAILOR, 7
- object SPRITE_FISHER2, 0, 4, STAY, RIGHT, 6, OPP_FISHER, 2
- object SPRITE_BLACK_HAIR_BOY_2, 10, 13, STAY, RIGHT, 7 ; person
- object SPRITE_SLOWBRO, 11, 12, STAY, NONE, 8 ; person
- object SPRITE_BALL, 20, 2, STAY, NONE, 9, ETHER
- object SPRITE_BALL, 10, 2, STAY, NONE, 10, TM_44
- object SPRITE_BALL, 12, 11, STAY, NONE, 11, MAX_POTION
-
- ; warp-to
- warp_to 2, 5, SS_ANNE_B1F_ROOMS_WIDTH ; SS_ANNE_B1F
- warp_to 3, 5, SS_ANNE_B1F_ROOMS_WIDTH ; SS_ANNE_B1F
- warp_to 12, 5, SS_ANNE_B1F_ROOMS_WIDTH ; SS_ANNE_B1F
- warp_to 13, 5, SS_ANNE_B1F_ROOMS_WIDTH ; SS_ANNE_B1F
- warp_to 22, 5, SS_ANNE_B1F_ROOMS_WIDTH ; SS_ANNE_B1F
- warp_to 23, 5, SS_ANNE_B1F_ROOMS_WIDTH ; SS_ANNE_B1F
- warp_to 2, 15, SS_ANNE_B1F_ROOMS_WIDTH ; SS_ANNE_B1F
- warp_to 3, 15, SS_ANNE_B1F_ROOMS_WIDTH ; SS_ANNE_B1F
- warp_to 12, 15, SS_ANNE_B1F_ROOMS_WIDTH ; SS_ANNE_B1F
- warp_to 13, 15, SS_ANNE_B1F_ROOMS_WIDTH ; SS_ANNE_B1F