aboutsummaryrefslogtreecommitdiffstats
path: root/data/mapObjects/celadongym.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/celadongym.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/celadongym.asm')
-rwxr-xr-xdata/mapObjects/celadongym.asm22
1 files changed, 0 insertions, 22 deletions
diff --git a/data/mapObjects/celadongym.asm b/data/mapObjects/celadongym.asm
deleted file mode 100755
index b087153b..00000000
--- a/data/mapObjects/celadongym.asm
+++ /dev/null
@@ -1,22 +0,0 @@
-CeladonGymObject:
- db $3 ; border block
-
- db 2 ; warps
- warp 4, 17, 6, -1
- warp 5, 17, 6, -1
-
- db 0 ; signs
-
- db 8 ; objects
- object SPRITE_ERIKA, 4, 3, STAY, DOWN, 1, OPP_ERIKA, 1
- object SPRITE_LASS, 2, 11, STAY, RIGHT, 2, OPP_LASS, 17
- object SPRITE_FOULARD_WOMAN, 7, 10, STAY, LEFT, 3, OPP_BEAUTY, 1
- object SPRITE_LASS, 9, 5, STAY, DOWN, 4, OPP_JR_TRAINER_F, 11
- object SPRITE_FOULARD_WOMAN, 1, 5, STAY, DOWN, 5, OPP_BEAUTY, 2
- object SPRITE_LASS, 6, 3, STAY, DOWN, 6, OPP_LASS, 18
- object SPRITE_FOULARD_WOMAN, 3, 3, STAY, DOWN, 7, OPP_BEAUTY, 3
- object SPRITE_LASS, 5, 3, STAY, DOWN, 8, OPP_COOLTRAINER_F, 1
-
- ; warp-to
- warp_to 4, 17, CELADON_GYM_WIDTH
- warp_to 5, 17, CELADON_GYM_WIDTH