aboutsummaryrefslogtreecommitdiffstats
path: root/data/maps/objects/Route15.asm
diff options
context:
space:
mode:
authorRangi <35663410+Rangi42@users.noreply.github.com>2020-07-06 11:52:24 -0400
committerGitHub <noreply@github.com>2020-07-06 11:52:24 -0400
commit122d715484b79aba71d79caf148bac4a2ec441a5 (patch)
treea13bdf621fa8d3f3836ecb6e8d3a269ccc5d61cc /data/maps/objects/Route15.asm
parentMerge pull request #259 from Rangi42/master (diff)
parentAvoid repeating the NUM_TMS value (diff)
downloadpokeyellow-122d715484b79aba71d79caf148bac4a2ec441a5.tar.gz
pokeyellow-122d715484b79aba71d79caf148bac4a2ec441a5.tar.xz
pokeyellow-122d715484b79aba71d79caf148bac4a2ec441a5.zip
Merge pull request #261 from Rangi42/master
Port pokecrystal's base data and tmhm structure
Diffstat (limited to 'data/maps/objects/Route15.asm')
-rwxr-xr-xdata/maps/objects/Route15.asm2
1 files changed, 1 insertions, 1 deletions
diff --git a/data/maps/objects/Route15.asm b/data/maps/objects/Route15.asm
index f52cc1b8..80257319 100755
--- a/data/maps/objects/Route15.asm
+++ b/data/maps/objects/Route15.asm
@@ -21,7 +21,7 @@ Route15_Object:
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
+ object SPRITE_BALL, 18, 5, STAY, NONE, 11, TM_RAGE
; warp-to
warp_to 7, 8, ROUTE_15_WIDTH ; ROUTE_15_GATE_1F