diff options
| author | PikalaxALT <PikalaxALT@gmail.com> | 2015-11-28 15:13:40 -0500 |
|---|---|---|
| committer | PikalaxALT <PikalaxALT@gmail.com> | 2015-11-28 15:13:40 -0500 |
| commit | 8612a4a531b755b1d323e834980dab5ae896499c (patch) | |
| tree | 10e38f0fb2bd99a4f7077c1d3c82662ae43b63a4 /battle/effect_commands.asm | |
| parent | 43903f543bb04344710d57862a2c5534fd3e5b4c (diff) | |
Renaming sections, further dissolving main.asm
Diffstat (limited to 'battle/effect_commands.asm')
| -rw-r--r-- | battle/effect_commands.asm | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/battle/effect_commands.asm b/battle/effect_commands.asm index 506dc9746..d5d9a78b9 100644 --- a/battle/effect_commands.asm +++ b/battle/effect_commands.asm @@ -7496,14 +7496,14 @@ endr ld a, BATTLE_VARS_MOVE_EFFECT call GetBattleVar cp EFFECT_CONFUSE_HIT - jr z, .asm_36d99 + jr z, .got_effect cp EFFECT_SNORE - jr z, .asm_36d99 + jr z, .got_effect cp EFFECT_SWAGGER - jr z, .asm_36d99 + jr z, .got_effect call AnimateCurrentMove -.asm_36d99 +.got_effect ld de, ANIM_CONFUSED call PlayOpponentBattleAnim @@ -7513,11 +7513,11 @@ endr call GetOpponentItem ld a, b cp HELD_HEAL_STATUS - jr z, .asm_36db0 + jr z, .heal_confusion cp HELD_HEAL_CONFUSION ret nz -.asm_36db0 - ld hl, HandleStatusHealingItem +.heal_confusion + ld hl, UseConfusionHealingItem jp CallBattleCore ; 36db6 |