summaryrefslogtreecommitdiff
path: root/data/mapObjects/rocktunnel2.asm
diff options
context:
space:
mode:
authorRangi <remy.oukaour+rangi42@gmail.com>2019-01-01 15:06:23 -0500
committerRangi <remy.oukaour+rangi42@gmail.com>2019-01-01 23:33:10 -0500
commitc7796024590fec48ac79756793c1a6e3b54daf8f (patch)
tree0d61caa7ebe429995a61e800d1d78c3a82aec886 /data/mapObjects/rocktunnel2.asm
parent90430e6dee9e207dc0b618d07566f83617343f60 (diff)
Rename map files, labels, and constants to be consistent and work with Polished Map
Diffstat (limited to 'data/mapObjects/rocktunnel2.asm')
-rwxr-xr-xdata/mapObjects/rocktunnel2.asm26
1 files changed, 0 insertions, 26 deletions
diff --git a/data/mapObjects/rocktunnel2.asm b/data/mapObjects/rocktunnel2.asm
deleted file mode 100755
index d60863c1..00000000
--- a/data/mapObjects/rocktunnel2.asm
+++ /dev/null
@@ -1,26 +0,0 @@
-RockTunnel2Object:
- db $3 ; border block
-
- db 4 ; warps
- warp 33, 25, 4, ROCK_TUNNEL_1
- warp 27, 3, 5, ROCK_TUNNEL_1
- warp 23, 11, 6, ROCK_TUNNEL_1
- warp 3, 3, 7, ROCK_TUNNEL_1
-
- db 0 ; signs
-
- db 8 ; objects
- object SPRITE_LASS, 11, 13, STAY, DOWN, 1, OPP_JR_TRAINER_F, 9
- object SPRITE_HIKER, 6, 10, STAY, DOWN, 2, OPP_HIKER, 9
- object SPRITE_BLACK_HAIR_BOY_2, 3, 5, STAY, DOWN, 3, OPP_POKEMANIAC, 3
- object SPRITE_BLACK_HAIR_BOY_2, 20, 21, STAY, RIGHT, 4, OPP_POKEMANIAC, 4
- object SPRITE_HIKER, 30, 10, STAY, DOWN, 5, OPP_HIKER, 10
- object SPRITE_LASS, 14, 28, STAY, RIGHT, 6, OPP_JR_TRAINER_F, 10
- object SPRITE_HIKER, 33, 5, STAY, RIGHT, 7, OPP_HIKER, 11
- object SPRITE_BLACK_HAIR_BOY_2, 26, 30, STAY, DOWN, 8, OPP_POKEMANIAC, 5
-
- ; warp-to
- warp_to 33, 25, ROCK_TUNNEL_2_WIDTH ; ROCK_TUNNEL_1
- warp_to 27, 3, ROCK_TUNNEL_2_WIDTH ; ROCK_TUNNEL_1
- warp_to 23, 11, ROCK_TUNNEL_2_WIDTH ; ROCK_TUNNEL_1
- warp_to 3, 3, ROCK_TUNNEL_2_WIDTH ; ROCK_TUNNEL_1