summaryrefslogtreecommitdiff
path: root/battle/moves/move_effects_pointers.asm
diff options
context:
space:
mode:
authorMarcus Huderle <huderlem@gmail.com>2017-11-21 17:15:25 -0800
committerGitHub <noreply@github.com>2017-11-21 17:15:25 -0800
commitb97287be2923a037cd9aa5f3b35887feb31b0c03 (patch)
tree87932039e558304c5c832d2146517d8be4010fe9 /battle/moves/move_effects_pointers.asm
parent88f1b8165b4e0ce0e416e26d7cb7b3105b8f8c31 (diff)
parente5f9fddb86cd005d0dbcbb0fd1d4a04d3e6fee45 (diff)
Merge pull request #397 from mid-kid/master
A few more labels and comments
Diffstat (limited to 'battle/moves/move_effects_pointers.asm')
-rw-r--r--battle/moves/move_effects_pointers.asm36
1 files changed, 18 insertions, 18 deletions
diff --git a/battle/moves/move_effects_pointers.asm b/battle/moves/move_effects_pointers.asm
index 3f364f521..2e4f1ea31 100644
--- a/battle/moves/move_effects_pointers.asm
+++ b/battle/moves/move_effects_pointers.asm
@@ -5,28 +5,28 @@
dw BurnHit
dw FreezeHit
dw ParalyzeHit
- dw Explosion
+ dw Selfdestruct
dw DreamEater
dw MirrorMove
dw AttackUp
dw DefenseUp
dw SpeedUp
- dw Growth
+ dw SpecialAttackUp
dw SpecialDefenseUp
dw AccuracyUp
dw EvasionUp
dw NormalHit
- dw Growl
+ dw AttackDown
dw DefenseDown
- dw StringShot
+ dw SpeedDown
dw SpecialAttackDown
dw SpecialDefenseDown
dw AccuracyDown
- dw SweetScent
- dw Haze
+ dw EvasionDown
+ dw ResetStats
dw Bide
dw Rampage
- dw Whirlwind
+ dw ForceSwitch
dw MultiHit
dw Conversion
dw FlinchHit
@@ -40,7 +40,7 @@
dw RazorWind
dw SuperFang
dw StaticDamage
- dw Bind
+ dw TrapTarget
dw NormalHit
dw MultiHit
dw NormalHit
@@ -48,16 +48,16 @@
dw FocusEnergy
dw RecoilHit
dw DoConfuse
- dw SwordsDance
+ dw AttackUp2
dw DefenseUp2
- dw Agility
+ dw SpeedUp2
dw SpecialAttackUp2
- dw Amnesia
+ dw SpecialDefenseUp2
dw AccuracyUp2
dw EvasionUp2
dw Transform
- dw Charm
- dw Screech
+ dw AttackDown2
+ dw DefenseDown2
dw SpeedDown2
dw SpecialAttackDown2
dw SpecialDefenseDown2
@@ -66,7 +66,7 @@
dw Reflect
dw DoPoison
dw DoParalyze
- dw AuroraBeam
+ dw AttackDownHit
dw DefenseDownHit
dw SpeedDownHit
dw SpecialAttackDownHit
@@ -75,7 +75,7 @@
dw EvasionDownHit
dw SkyAttack
dw ConfuseHit
- dw Twineedle
+ dw PoisonMultiHit
dw NormalHit
dw Substitute
dw HyperBeam
@@ -136,9 +136,9 @@
dw HiddenPower
dw RainDance
dw SunnyDay
- dw SteelWing
- dw MetalClaw
- dw Ancientpower
+ dw DefenseUpHit
+ dw AttackUpHit
+ dw AllUpHit
dw FakeOut
dw BellyDrum
dw PsychUp