aboutsummaryrefslogtreecommitdiffstats
path: root/data/mapObjects/CinnabarIsland.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/CinnabarIsland.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/CinnabarIsland.asm')
-rwxr-xr-xdata/mapObjects/CinnabarIsland.asm27
1 files changed, 0 insertions, 27 deletions
diff --git a/data/mapObjects/CinnabarIsland.asm b/data/mapObjects/CinnabarIsland.asm
deleted file mode 100755
index 1932e134..00000000
--- a/data/mapObjects/CinnabarIsland.asm
+++ /dev/null
@@ -1,27 +0,0 @@
-CinnabarIsland_Object:
- db $43 ; border block
-
- db 5 ; warps
- warp 6, 3, 1, POKEMON_MANSION_1F
- warp 18, 3, 0, CINNABAR_GYM
- warp 6, 9, 0, CINNABAR_LAB
- warp 11, 11, 0, CINNABAR_POKECENTER
- warp 15, 11, 0, CINNABAR_MART
-
- db 5 ; signs
- sign 9, 5, 3 ; CinnabarIslandText3
- sign 16, 11, 4 ; MartSignText
- sign 12, 11, 5 ; PokeCenterSignText
- sign 9, 11, 6 ; CinnabarIslandText6
- sign 13, 3, 7 ; CinnabarIslandText7
-
- db 2 ; objects
- object SPRITE_GIRL, 12, 5, WALK, 2, 1 ; person
- object SPRITE_GAMBLER, 14, 6, STAY, NONE, 2 ; person
-
- ; warp-to
- warp_to 6, 3, CINNABAR_ISLAND_WIDTH ; POKEMON_MANSION_1F
- warp_to 18, 3, CINNABAR_ISLAND_WIDTH ; CINNABAR_GYM
- warp_to 6, 9, CINNABAR_ISLAND_WIDTH ; CINNABAR_LAB
- warp_to 11, 11, CINNABAR_ISLAND_WIDTH ; CINNABAR_POKECENTER
- warp_to 15, 11, CINNABAR_ISLAND_WIDTH ; CINNABAR_MART