aboutsummaryrefslogtreecommitdiffstats
path: root/data/mapObjects/CinnabarGym.asm
diff options
context:
space:
mode:
authorRangi <remy.oukaour+rangi42@gmail.com>2020-07-03 18:19:56 -0400
committerRangi <remy.oukaour+rangi42@gmail.com>2020-07-03 18:19:56 -0400
commit55bb99580eeccc92106437c4ad86edb8ca89ecda (patch)
tree5aa22f9fc5526c2d1461f01f5859de7dd573c2f3 /data/mapObjects/CinnabarGym.asm
parentFactor out graphics INCBINs from main.asm to gfx/*.asm (diff)
downloadpokeyellow-55bb99580eeccc92106437c4ad86edb8ca89ecda.tar.gz
pokeyellow-55bb99580eeccc92106437c4ad86edb8ca89ecda.tar.xz
pokeyellow-55bb99580eeccc92106437c4ad86edb8ca89ecda.zip
data/mapHeaders -> data/maps/headers; data/mapObjects -> data/maps/objects
To do: Polished Map support for loading the objects
Diffstat (limited to 'data/mapObjects/CinnabarGym.asm')
-rwxr-xr-xdata/mapObjects/CinnabarGym.asm23
1 files changed, 0 insertions, 23 deletions
diff --git a/data/mapObjects/CinnabarGym.asm b/data/mapObjects/CinnabarGym.asm
deleted file mode 100755
index ab204d43..00000000
--- a/data/mapObjects/CinnabarGym.asm
+++ /dev/null
@@ -1,23 +0,0 @@
-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_FAT_BALD_GUY, 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