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/core.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/core.asm')
| -rw-r--r-- | battle/core.asm | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/battle/core.asm b/battle/core.asm index cb709e08d..18c06e848 100644 --- a/battle/core.asm +++ b/battle/core.asm @@ -903,7 +903,7 @@ MoveEffectPriorities: ; 3c5df db EFFECT_PROTECT, 3 db EFFECT_ENDURE, 3 db EFFECT_PRIORITY_HIT, 2 - db EFFECT_WHIRLWIND, 0 + db EFFECT_FORCE_SWITCH, 0 db EFFECT_COUNTER, 0 db EFFECT_MIRROR_COAT, 0 db -1 |