aboutsummaryrefslogtreecommitdiffstats
path: root/data/maps/objects/Route12.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/Route12.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/Route12.asm')
-rwxr-xr-xdata/maps/objects/Route12.asm2
1 files changed, 1 insertions, 1 deletions
diff --git a/data/maps/objects/Route12.asm b/data/maps/objects/Route12.asm
index a9d84cf0..6cce9529 100755
--- a/data/maps/objects/Route12.asm
+++ b/data/maps/objects/Route12.asm
@@ -20,7 +20,7 @@ Route12_Object:
object SPRITE_FISHER2, 12, 40, STAY, LEFT, 6, OPP_FISHER, 5
object SPRITE_FISHER2, 9, 52, STAY, RIGHT, 7, OPP_FISHER, 6
object SPRITE_FISHER2, 6, 87, STAY, DOWN, 8, OPP_FISHER, 11
- object SPRITE_BALL, 14, 35, STAY, NONE, 9, TM_16
+ object SPRITE_BALL, 14, 35, STAY, NONE, 9, TM_PAY_DAY
object SPRITE_BALL, 5, 89, STAY, NONE, 10, IRON
; warp-to