aboutsummaryrefslogtreecommitdiffstats
path: root/data/mapObjects/CinnabarGym.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/CinnabarGym.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/CinnabarGym.asm')
-rwxr-xr-xdata/mapObjects/CinnabarGym.asm23
1 files changed, 23 insertions, 0 deletions
diff --git a/data/mapObjects/CinnabarGym.asm b/data/mapObjects/CinnabarGym.asm
new file mode 100755
index 00000000..1a6e96cd
--- /dev/null
+++ b/data/mapObjects/CinnabarGym.asm
@@ -0,0 +1,23 @@
+CinnabarGym_Object:
+ db $2e ; border block
+
+ db 2 ; warps
+ warp 16, 17, 1, -1
+ warp 17, 17, 1, -1
+
+ db 0 ; signs
+
+ db 9 ; objects
+ object SPRITE_MR_MASTERBALL, 3, 3, STAY, DOWN, 1, OPP_BLAINE, 1
+ object SPRITE_BLACK_HAIR_BOY_2, 17, 2, STAY, DOWN, 2, OPP_SUPER_NERD, 9
+ object SPRITE_BLACK_HAIR_BOY_2, 17, 8, STAY, DOWN, 3, OPP_BURGLAR, 4
+ object SPRITE_BLACK_HAIR_BOY_2, 11, 4, STAY, DOWN, 4, OPP_SUPER_NERD, 10
+ object SPRITE_BLACK_HAIR_BOY_2, 11, 8, STAY, DOWN, 5, OPP_BURGLAR, 5
+ object SPRITE_BLACK_HAIR_BOY_2, 11, 14, STAY, DOWN, 6, OPP_SUPER_NERD, 11
+ object SPRITE_BLACK_HAIR_BOY_2, 3, 14, STAY, DOWN, 7, OPP_BURGLAR, 6
+ object SPRITE_BLACK_HAIR_BOY_2, 3, 8, STAY, DOWN, 8, OPP_SUPER_NERD, 12
+ object SPRITE_GYM_HELPER, 16, 13, STAY, DOWN, 9 ; person
+
+ ; warp-to
+ warp_to 16, 17, CINNABAR_GYM_WIDTH
+ warp_to 17, 17, CINNABAR_GYM_WIDTH