aboutsummaryrefslogtreecommitdiffstats
path: root/data/mapObjects/Route25.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/Route25.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/Route25.asm')
-rwxr-xr-xdata/mapObjects/Route25.asm23
1 files changed, 0 insertions, 23 deletions
diff --git a/data/mapObjects/Route25.asm b/data/mapObjects/Route25.asm
deleted file mode 100755
index a85f85ca..00000000
--- a/data/mapObjects/Route25.asm
+++ /dev/null
@@ -1,23 +0,0 @@
-Route25_Object:
- db $2c ; border block
-
- db 1 ; warps
- warp 45, 3, 0, BILLS_HOUSE
-
- db 1 ; signs
- sign 43, 3, 11 ; Route25Text11
-
- db 10 ; objects
- object SPRITE_BUG_CATCHER, 14, 2, STAY, DOWN, 1, OPP_YOUNGSTER, 5
- object SPRITE_BUG_CATCHER, 18, 5, STAY, UP, 2, OPP_YOUNGSTER, 6
- object SPRITE_BLACK_HAIR_BOY_1, 24, 4, STAY, DOWN, 3, OPP_JR_TRAINER_M, 2
- object SPRITE_LASS, 18, 8, STAY, RIGHT, 4, OPP_LASS, 9
- object SPRITE_BUG_CATCHER, 32, 3, STAY, LEFT, 5, OPP_YOUNGSTER, 7
- object SPRITE_LASS, 37, 4, STAY, DOWN, 6, OPP_LASS, 10
- object SPRITE_HIKER, 8, 4, STAY, RIGHT, 7, OPP_HIKER, 2
- object SPRITE_HIKER, 23, 9, STAY, UP, 8, OPP_HIKER, 3
- object SPRITE_HIKER, 13, 7, STAY, RIGHT, 9, OPP_HIKER, 4
- object SPRITE_BALL, 22, 2, STAY, NONE, 10, TM_19
-
- ; warp-to
- warp_to 45, 3, ROUTE_25_WIDTH ; BILLS_HOUSE