diff options
| author | yenatch <yenatch@gmail.com> | 2013-04-25 04:26:37 -0400 |
|---|---|---|
| committer | yenatch <yenatch@gmail.com> | 2013-04-25 04:26:37 -0400 |
| commit | 0844e3ee5948376c948a5a536bbf65fa92bb2af8 (patch) | |
| tree | 11d5020da0edb1be440f5eadb3f5fa5932510b0b /battle/effect_commands.asm | |
| parent | af990910eabcd57c6697dd1c68c705d64add2f43 (diff) | |
implement move effect constants
Diffstat (limited to 'battle/effect_commands.asm')
| -rw-r--r-- | battle/effect_commands.asm | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/battle/effect_commands.asm b/battle/effect_commands.asm index ccd3c3748..2b9ac4eab 100644 --- a/battle/effect_commands.asm +++ b/battle/effect_commands.asm @@ -2808,15 +2808,15 @@ BattleCommand0b: ; 34f60 ld [$cfca], a ld a, BATTLE_VARS_MOVE_EFFECT call CleanGetBattleVarPair - cp $1d ; multihit + cp EFFECT_MULTI_HIT jr z, .asm_34fb0 - cp $1e ; conversion + cp EFFECT_CONVERSION jr z, .asm_34fb0 - cp $2c ; double kick / bonemerang + cp EFFECT_DOUBLE_HIT jr z, .asm_34fb0 - cp $4d ; twineedle + cp EFFECT_TWINEEDLE jr z, .asm_34fb0 - cp $68 ; triple kick + cp EFFECT_TRIPLE_KICK jr z, .asm_34f96 xor a ld [$c689], a @@ -4042,7 +4042,7 @@ BattleCommand62: ; 35612 call CleanGetBattleVarPair ; Selfdestruct and Explosion halve defense. - cp $7 ; selfdestruct / explosion + cp EFFECT_EXPLOSION jr nz, .asm_35620 srl c @@ -4052,10 +4052,10 @@ BattleCommand62: ; 35612 .asm_35620 ; Variable-hit moves and Conversion can have a power of 0. - cp $1d ; multihit + cp EFFECT_MULTI_HIT jr z, .asm_3562b - cp $1e ; conversion + cp EFFECT_CONVERSION jr z, .asm_3562b ; No damage if move power is 0. |