diff options
| author | mid-kid <esteve.varela@gmail.com> | 2017-11-15 16:36:13 +0100 |
|---|---|---|
| committer | mid-kid <esteve.varela@gmail.com> | 2017-11-15 16:36:13 +0100 |
| commit | fd14253796f9e696a00a3c757d07d2c8a2131bf0 (patch) | |
| tree | 8fed5d8dff63841e9a0742f1d3b954da0ad913be /battle/moves/move_effects_pointers.asm | |
| parent | 6bb7df7e29a846eb28b9a43361fc4f98c0a9e010 (diff) | |
Clean up labels in battle/moves/move_effects.asm
There were a lot of unused labels in there, and a few confusing
misnomers around move_effects_pointers.asm. They now match up exactly
with the names in battle_constants.asm.
Also renamed a few effects, to make their purpose clearer, and to match
up with their respective event script commands:
EFFECT_EXPLOSION -> EFFECT_SELFDESCTRUCT
EFFECT_HAZE -> EFFECT_RESET_STATS
EFFECT_WHIRLWIND -> EFFECT_FORCE_SWITCH
EFFECT_BIND -> EFFECT_TRAP_TARGET
EFFECT_TWINEEDLE -> EFFECT_POISON_MULTI_HIT
EFFECT_STEEL_WING -> EFFECT_DEFENSE_UP_HIT
EFFECT_METAL_CLAW -> EFFECT_ATTACK_UP_HIT
EFFECT_ANCIENTPOWER -> EFFECT_ALL_UP_HIT
Diffstat (limited to 'battle/moves/move_effects_pointers.asm')
| -rw-r--r-- | battle/moves/move_effects_pointers.asm | 36 |
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 |