aboutsummaryrefslogtreecommitdiffstats
path: root/data/mapObjects/ViridianGym.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/ViridianGym.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/ViridianGym.asm')
-rwxr-xr-xdata/mapObjects/ViridianGym.asm25
1 files changed, 0 insertions, 25 deletions
diff --git a/data/mapObjects/ViridianGym.asm b/data/mapObjects/ViridianGym.asm
deleted file mode 100755
index e3fd17bd..00000000
--- a/data/mapObjects/ViridianGym.asm
+++ /dev/null
@@ -1,25 +0,0 @@
-ViridianGym_Object:
- db $3 ; border block
-
- db 2 ; warps
- warp 16, 17, 4, -1
- warp 17, 17, 4, -1
-
- db 0 ; signs
-
- db 11 ; objects
- object SPRITE_GIOVANNI, 2, 1, STAY, DOWN, 1, OPP_GIOVANNI, 3
- object SPRITE_BLACK_HAIR_BOY_1, 12, 7, STAY, DOWN, 2, OPP_COOLTRAINER_M, 9
- object SPRITE_HIKER, 11, 11, STAY, UP, 3, OPP_BLACKBELT, 6
- object SPRITE_ROCKER, 10, 7, STAY, DOWN, 4, OPP_TAMER, 3
- object SPRITE_HIKER, 3, 7, STAY, LEFT, 5, OPP_BLACKBELT, 7
- object SPRITE_BLACK_HAIR_BOY_1, 13, 5, STAY, RIGHT, 6, OPP_COOLTRAINER_M, 10
- object SPRITE_HIKER, 10, 1, STAY, DOWN, 7, OPP_BLACKBELT, 8
- object SPRITE_ROCKER, 2, 16, STAY, RIGHT, 8, OPP_TAMER, 4
- object SPRITE_BLACK_HAIR_BOY_1, 6, 5, STAY, DOWN, 9, OPP_COOLTRAINER_M, 1
- object SPRITE_GYM_HELPER, 16, 15, STAY, DOWN, 10 ; person
- object SPRITE_BALL, 16, 9, STAY, NONE, 11, REVIVE
-
- ; warp-to
- warp_to 16, 17, VIRIDIAN_GYM_WIDTH
- warp_to 17, 17, VIRIDIAN_GYM_WIDTH