Future/pokecrystal
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Clean up labels in battle/moves/move_effects.asm

Browse Source 
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
This commit is contained in:
mid-kid
2017-11-15 16:36:13 +01:00
parent 6bb7df7e29
commit fd14253796
7 changed files with 63 additions and 229 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
battle/effect_commands.asm
View File

@@ -2167,7 +2167,7 @@ BattleCommand_HitTargetNoSub: ; 34f60
jr z, .conversion
cp EFFECT_DOUBLE_HIT
jr z, .doublehit
cp EFFECT_TWINEEDLE
cp EFFECT_POISON_MULTI_HIT
jr z, .twineedle
cp EFFECT_TRIPLE_KICK
jr z, .triplekick
@@ -2315,7 +2315,7 @@ BattleCommand_FailureText: ; 35023
jr z, .multihit
cp EFFECT_DOUBLE_HIT
jr z, .multihit
cp EFFECT_TWINEEDLE
cp EFFECT_POISON_MULTI_HIT
jr z, .multihit
jp EndMoveEffect
@@ -2661,7 +2661,7 @@ BattleCommand_CheckDestinyBond: ; 351c0
jr z, .multiple_hit_raise_sub
cp EFFECT_DOUBLE_HIT
jr z, .multiple_hit_raise_sub
cp EFFECT_TWINEEDLE
cp EFFECT_POISON_MULTI_HIT
jr z, .multiple_hit_raise_sub
cp EFFECT_TRIPLE_KICK
jr z, .multiple_hit_raise_sub
@@ -3434,14 +3434,14 @@ BattleCommand_DamageCalc: ; 35612
call GetBattleVar
; Selfdestruct and Explosion halve defense.
cp EFFECT_EXPLOSION
jr nz, .dont_explode
cp EFFECT_SELFDESTRUCT
jr nz, .dont_selfdestruct
srl c
jr nz, .dont_explode
jr nz, .dont_selfdestruct
inc c
.dont_explode
.dont_selfdestruct
; Variable-hit moves and Conversion can have a power of 0.
cp EFFECT_MULTI_HIT
@@ -4919,7 +4919,7 @@ SelfInflictDamageToSubstitute: ; 35de0
jr z, .ok
cp EFFECT_DOUBLE_HIT
jr z, .ok
cp EFFECT_TWINEEDLE
cp EFFECT_POISON_MULTI_HIT
jr z, .ok
cp EFFECT_TRIPLE_KICK
jr z, .ok
@@ -6999,7 +6999,7 @@ BattleCommand_EndLoop: ; 369b6
ld a, BATTLE_VARS_MOVE_EFFECT
call GetBattleVarAddr
ld a, [hl]
cp EFFECT_TWINEEDLE
cp EFFECT_POISON_MULTI_HIT
jr z, .twineedle
cp EFFECT_DOUBLE_HIT
ld a, 1