diff options
| author | yenatch <yenatch@gmail.com> | 2018-06-24 22:38:08 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-06-24 22:38:08 -0400 |
| commit | 91f914718a263839daef24d44eda857bfc7cca95 (patch) | |
| tree | e3aca60cfbcd77fdbb400304fc0dedbc613122b2 /engine/battle/move_effects/present.asm | |
| parent | 364854623267a8a39242243b0cdf80144e868642 (diff) | |
| parent | 6e44095c2aadd2f07a716db6dacfc3ce2fa83658 (diff) | |
Merge pull request #530 from Rangi42/master
[RTM] Finish removing address comments, split out mart_constants.asm, and other tweaks
Diffstat (limited to 'engine/battle/move_effects/present.asm')
| -rw-r--r-- | engine/battle/move_effects/present.asm | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/engine/battle/move_effects/present.asm b/engine/battle/move_effects/present.asm index 2bbea8028..f0949558f 100644 --- a/engine/battle/move_effects/present.asm +++ b/engine/battle/move_effects/present.asm @@ -32,12 +32,12 @@ BattleCommand_Present: .next ld a, [hli] cp -1 - jr z, .heal_effect ; 378a4 $11 + jr z, .heal_effect cp b - jr nc, .got_power ; 378a7 $4 + jr nc, .got_power inc c inc hl - jr .next ; 378ab $f4 + jr .next .got_power ld a, c @@ -56,12 +56,12 @@ BattleCommand_Present: ld hl, AICheckPlayerMaxHP ld a, [hBattleTurn] and a - jr z, .got_hp_fn_pointer ; 378c9 $3 + jr z, .got_hp_fn_pointer ld hl, AICheckEnemyMaxHP .got_hp_fn_pointer ld a, BANK(AICheckPlayerMaxHP) rst FarCall - jr c, .already_fully_healed ; 378d1 $20 + jr c, .already_fully_healed ld hl, GetQuarterMaxHP call CallBattleCore @@ -73,12 +73,12 @@ BattleCommand_Present: call StdBattleTextBox call BattleCommand_SwitchTurn call UpdateOpponentInParty - jr .do_animation ; 378f1 $11 + jr .do_animation .already_fully_healed call BattleCommand_SwitchTurn call _CheckBattleScene - jr nc, .do_animation ; 378f9 $9 + jr nc, .do_animation call AnimateFailedMove ld hl, RefusedGiftText call StdBattleTextBox |