aboutsummaryrefslogtreecommitdiffstats
path: root/data/mapObjects/viridiangym.asm
diff options
context:
space:
mode:
authorDaniel Harding <33dannye@gmail.com>2020-05-20 20:17:30 -0500
committerGitHub <noreply@github.com>2020-05-20 20:17:30 -0500
commit500d99c258145d233af8d14cdb5c6e0200dfc1d8 (patch)
tree7dbe7b152dde8a6e9b56664b5b8cdfc0d6be1253 /data/mapObjects/viridiangym.asm
parentMerge pull request #39 from TiKevin83/master (diff)
parentMerge remote-tracking branch 'pokered/master' (diff)
downloadpokeyellow-500d99c258145d233af8d14cdb5c6e0200dfc1d8.tar.gz
pokeyellow-500d99c258145d233af8d14cdb5c6e0200dfc1d8.tar.xz
pokeyellow-500d99c258145d233af8d14cdb5c6e0200dfc1d8.zip
Merge pull request #50 from dannye/master
merge pokered
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 c6ddb1d4..00000000
--- a/data/mapObjects/viridiangym.asm
+++ /dev/null
@@ -1,25 +0,0 @@
-ViridianGymObject:
- 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