aboutsummaryrefslogtreecommitdiffstats
path: root/data/mapObjects/Route15.asm
diff options
context:
space:
mode:
authorRangi <35663410+Rangi42@users.noreply.github.com>2020-07-04 16:19:15 -0400
committerGitHub <noreply@github.com>2020-07-04 16:19:15 -0400
commit2718c36065e7eb201a149938bcdd51987c4e56b6 (patch)
tree4a1c0294193a497e15ec8e6be59390eb1f84b5d3 /data/mapObjects/Route15.asm
parentMerge pull request #256 from Rangi42/master (diff)
parentUPDATE_PARTY_MENU_BLK_PACKET -> SET_PAL_PARTY_MENU_HP_BARS, and introduce SET... (diff)
downloadpokeyellow-2718c36065e7eb201a149938bcdd51987c4e56b6.tar.gz
pokeyellow-2718c36065e7eb201a149938bcdd51987c4e56b6.tar.xz
pokeyellow-2718c36065e7eb201a149938bcdd51987c4e56b6.zip
Merge pull request #257 from Rangi42/master
More reorganization
Diffstat (limited to 'data/mapObjects/Route15.asm')
-rwxr-xr-xdata/mapObjects/Route15.asm30
1 files changed, 0 insertions, 30 deletions
diff --git a/data/mapObjects/Route15.asm b/data/mapObjects/Route15.asm
deleted file mode 100755
index f52cc1b8..00000000
--- a/data/mapObjects/Route15.asm
+++ /dev/null
@@ -1,30 +0,0 @@
-Route15_Object:
- db $43 ; border block
-
- db 4 ; warps
- warp 7, 8, 0, ROUTE_15_GATE_1F
- warp 7, 9, 1, ROUTE_15_GATE_1F
- warp 14, 8, 2, ROUTE_15_GATE_1F
- warp 14, 9, 3, ROUTE_15_GATE_1F
-
- db 1 ; signs
- sign 39, 9, 12 ; Route15Text12
-
- db 11 ; objects
- object SPRITE_LASS, 41, 11, STAY, DOWN, 1, OPP_JR_TRAINER_F, 20
- object SPRITE_LASS, 53, 10, STAY, LEFT, 2, OPP_JR_TRAINER_F, 21
- object SPRITE_BLACK_HAIR_BOY_1, 31, 13, STAY, UP, 3, OPP_BIRD_KEEPER, 6
- object SPRITE_BLACK_HAIR_BOY_1, 35, 13, STAY, UP, 4, OPP_BIRD_KEEPER, 7
- object SPRITE_FOULARD_WOMAN, 53, 11, STAY, DOWN, 5, OPP_BEAUTY, 9
- object SPRITE_FOULARD_WOMAN, 41, 10, STAY, RIGHT, 6, OPP_BEAUTY, 10
- object SPRITE_BIKER, 48, 10, STAY, DOWN, 7, OPP_BIKER, 3
- object SPRITE_BIKER, 46, 10, STAY, DOWN, 8, OPP_BIKER, 4
- object SPRITE_LASS, 37, 5, STAY, RIGHT, 9, OPP_JR_TRAINER_F, 22
- object SPRITE_LASS, 18, 13, STAY, UP, 10, OPP_JR_TRAINER_F, 23
- object SPRITE_BALL, 18, 5, STAY, NONE, 11, TM_20
-
- ; warp-to
- warp_to 7, 8, ROUTE_15_WIDTH ; ROUTE_15_GATE_1F
- warp_to 7, 9, ROUTE_15_WIDTH ; ROUTE_15_GATE_1F
- warp_to 14, 8, ROUTE_15_WIDTH ; ROUTE_15_GATE_1F
- warp_to 14, 9, ROUTE_15_WIDTH ; ROUTE_15_GATE_1F