aboutsummaryrefslogtreecommitdiffstats
path: root/data/mapObjects/CinnabarLab.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/CinnabarLab.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/CinnabarLab.asm')
-rwxr-xr-xdata/mapObjects/CinnabarLab.asm25
1 files changed, 0 insertions, 25 deletions
diff --git a/data/mapObjects/CinnabarLab.asm b/data/mapObjects/CinnabarLab.asm
deleted file mode 100755
index deb5d8ed..00000000
--- a/data/mapObjects/CinnabarLab.asm
+++ /dev/null
@@ -1,25 +0,0 @@
-CinnabarLab_Object:
- db $17 ; border block
-
- db 5 ; warps
- warp 2, 7, 2, -1
- warp 3, 7, 2, -1
- warp 8, 4, 0, CINNABAR_LAB_TRADE_ROOM
- warp 12, 4, 0, CINNABAR_LAB_METRONOME_ROOM
- warp 16, 4, 0, CINNABAR_LAB_FOSSIL_ROOM
-
- db 4 ; signs
- sign 3, 2, 2 ; Lab1Text2
- sign 9, 4, 3 ; Lab1Text3
- sign 13, 4, 4 ; Lab1Text4
- sign 17, 4, 5 ; Lab1Text5
-
- db 1 ; objects
- object SPRITE_FISHER, 1, 3, STAY, NONE, 1 ; person
-
- ; warp-to
- warp_to 2, 7, CINNABAR_LAB_WIDTH
- warp_to 3, 7, CINNABAR_LAB_WIDTH
- warp_to 8, 4, CINNABAR_LAB_WIDTH ; CINNABAR_LAB_TRADE_ROOM
- warp_to 12, 4, CINNABAR_LAB_WIDTH ; CINNABAR_LAB_METRONOME_ROOM
- warp_to 16, 4, CINNABAR_LAB_WIDTH ; CINNABAR_LAB_FOSSIL_ROOM