diff options
| author | pikalaxalt <PikalaxALT@gmail.com> | 2016-05-15 21:50:31 -0400 |
|---|---|---|
| committer | pikalaxalt <PikalaxALT@gmail.com> | 2016-05-15 22:00:17 -0400 |
| commit | 87b733994bdcb85e544f99899e50193c407909c6 (patch) | |
| tree | 11007cad7c5405c26c34488899c1deabd3f7cad0 /battle/effect_commands.asm | |
| parent | a5f5418faeb2ded9ddd898851ea0716e2d6ecf09 (diff) | |
SPRITE_ANIM_FRAME_IDX 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 6cc4db94e..c585bae23 100644 --- a/battle/effect_commands.asm +++ b/battle/effect_commands.asm @@ -2832,11 +2832,11 @@ PlayerAttackDamage: ; 352e2 call GetDamageStatsCritical jr c, .thickclub - ld hl, EnemyStats + 2 + ld hl, EnemyDefense ld a, [hli] ld b, a ld c, [hl] - ld hl, PlayerStats + ld hl, PlayerAttack jr .thickclub .special @@ -2856,11 +2856,11 @@ PlayerAttackDamage: ; 352e2 call GetDamageStatsCritical jr c, .lightball - ld hl, EnemyStats + SP_DEFENSE * 2 + ld hl, EnemySpDef ld a, [hli] ld b, a ld c, [hl] - ld hl, PlayerStats + SP_ATTACK * 2 + ld hl, PlayerSpAtk .lightball ; Note: Returns player special attack at hl in hl. @@ -3098,11 +3098,11 @@ EnemyAttackDamage: ; 353f6 call GetDamageStatsCritical jr c, .thickclub - ld hl, PlayerStats + 2 + ld hl, PlayerDefense ld a, [hli] ld b, a ld c, [hl] - ld hl, EnemyStats + ld hl, EnemyAttack jr .thickclub .Special: @@ -3121,11 +3121,11 @@ EnemyAttackDamage: ; 353f6 ld hl, EnemyMonSpclAtk call GetDamageStatsCritical jr c, .lightball - ld hl, PlayerStats + 8 + ld hl, PlayerSpDef ld a, [hli] ld b, a ld c, [hl] - ld hl, EnemyStats + 6 + ld hl, EnemySpAtk .lightball call LightBallBoost |