diff options
| author | mid-kid <esteve.varela@gmail.com> | 2018-04-03 12:00:24 +0200 |
|---|---|---|
| committer | mid-kid <esteve.varela@gmail.com> | 2018-04-04 22:40:35 +0200 |
| commit | 800f9489145dc7c82edb3fa86fc24a5ff7411533 (patch) | |
| tree | 5ceb02885a4e79d67c588067703e8481ddb7ce7f /engine/battle | |
| parent | c1e3d17769aa3088556dcd1142944541f7f6fd0e (diff) | |
Label BattleCommand_BeatUpFailText
Diffstat (limited to 'engine/battle')
| -rw-r--r-- | engine/battle/effect_commands.asm | 2 | ||||
| -rw-r--r-- | engine/battle/move_effects/beat_up.asm | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/engine/battle/effect_commands.asm b/engine/battle/effect_commands.asm index 16b3cea9a..b9a7382c0 100644 --- a/engine/battle/effect_commands.asm +++ b/engine/battle/effect_commands.asm @@ -5714,7 +5714,7 @@ BattleCommand_EndLoop: ; 369b6 ld a, BATTLE_VARS_SUBSTATUS3 call GetBattleVarAddr res SUBSTATUS_IN_LOOP, [hl] - call BattleCommanda8 + call BattleCommand_BeatUpFailText jp EndMoveEffect .not_triple_kick diff --git a/engine/battle/move_effects/beat_up.asm b/engine/battle/move_effects/beat_up.asm index 2f326e362..8ea308d90 100644 --- a/engine/battle/move_effects/beat_up.asm +++ b/engine/battle/move_effects/beat_up.asm @@ -203,7 +203,9 @@ BattleCommand_BeatUp: ; 35461 ; 355b5 -BattleCommanda8: ; 355b5 +BattleCommand_BeatUpFailText: ; 355b5 +; beatupfailtext + ld a, [wBeatUpHitAtLeastOnce] and a ret nz |