From fd14253796f9e696a00a3c757d07d2c8a2131bf0 Mon Sep 17 00:00:00 2001 From: mid-kid Date: Wed, 15 Nov 2017 16:36:13 +0100 Subject: 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 --- constants/battle_constants.asm | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'constants') diff --git a/constants/battle_constants.asm b/constants/battle_constants.asm index 793650913..523713574 100644 --- a/constants/battle_constants.asm +++ b/constants/battle_constants.asm @@ -171,7 +171,7 @@ SUBSTATUS_CURLED EQU 0 const EFFECT_BURN_HIT const EFFECT_FREEZE_HIT const EFFECT_PARALYZE_HIT - const EFFECT_EXPLOSION + const EFFECT_SELFDESTRUCT const EFFECT_DREAM_EATER const EFFECT_MIRROR_MOVE const EFFECT_ATTACK_UP @@ -189,10 +189,10 @@ SUBSTATUS_CURLED EQU 0 const EFFECT_SP_DEF_DOWN const EFFECT_ACCURACY_DOWN const EFFECT_EVASION_DOWN - const EFFECT_HAZE + const EFFECT_RESET_STATS const EFFECT_BIDE const EFFECT_RAMPAGE - const EFFECT_WHIRLWIND + const EFFECT_FORCE_SWITCH const EFFECT_MULTI_HIT const EFFECT_CONVERSION const EFFECT_FLINCH_HIT @@ -206,7 +206,7 @@ SUBSTATUS_CURLED EQU 0 const EFFECT_RAZOR_WIND const EFFECT_SUPER_FANG const EFFECT_STATIC_DAMAGE - const EFFECT_BIND + const EFFECT_TRAP_TARGET const EFFECT_UNUSED_2B const EFFECT_DOUBLE_HIT const EFFECT_JUMP_KICK @@ -241,7 +241,7 @@ SUBSTATUS_CURLED EQU 0 const EFFECT_EVASION_DOWN_HIT const EFFECT_SKY_ATTACK const EFFECT_CONFUSE_HIT - const EFFECT_TWINEEDLE + const EFFECT_POISON_MULTI_HIT const EFFECT_UNUSED_4E const EFFECT_SUBSTITUTE const EFFECT_HYPER_BEAM @@ -302,9 +302,9 @@ SUBSTATUS_CURLED EQU 0 const EFFECT_HIDDEN_POWER const EFFECT_RAIN_DANCE const EFFECT_SUNNY_DAY - const EFFECT_STEEL_WING - const EFFECT_METAL_CLAW - const EFFECT_ANCIENTPOWER + const EFFECT_DEFENSE_UP_HIT + const EFFECT_ATTACK_UP_HIT + const EFFECT_ALL_UP_HIT const EFFECT_FAKE_OUT const EFFECT_BELLY_DRUM const EFFECT_PSYCH_UP -- cgit v1.2.3