aboutsummaryrefslogtreecommitdiffstats
path: root/data/maps/objects/PowerPlant.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/PowerPlant.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/PowerPlant.asm')
-rwxr-xr-xdata/maps/objects/PowerPlant.asm4
1 files changed, 2 insertions, 2 deletions
diff --git a/data/maps/objects/PowerPlant.asm b/data/maps/objects/PowerPlant.asm
index a8548b1c..05465325 100755
--- a/data/maps/objects/PowerPlant.asm
+++ b/data/maps/objects/PowerPlant.asm
@@ -21,8 +21,8 @@ PowerPlant_Object:
object SPRITE_BALL, 7, 25, STAY, NONE, 10, CARBOS
object SPRITE_BALL, 28, 3, STAY, NONE, 11, HP_UP
object SPRITE_BALL, 34, 3, STAY, NONE, 12, RARE_CANDY
- object SPRITE_BALL, 26, 32, STAY, NONE, 13, TM_25
- object SPRITE_BALL, 20, 32, STAY, NONE, 14, TM_33
+ object SPRITE_BALL, 26, 32, STAY, NONE, 13, TM_THUNDER
+ object SPRITE_BALL, 20, 32, STAY, NONE, 14, TM_REFLECT
; warp-to
warp_to 4, 35, POWER_PLANT_WIDTH