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 | |
| parent | c1e3d17769aa3088556dcd1142944541f7f6fd0e (diff) | |
Label BattleCommand_BeatUpFailText
| -rw-r--r-- | data/battle/effect_command_pointers.asm | 2 | ||||
| -rw-r--r-- | data/moves/effects.asm | 2 | ||||
| -rw-r--r-- | engine/battle/effect_commands.asm | 2 | ||||
| -rw-r--r-- | engine/battle/move_effects/beat_up.asm | 4 | ||||
| -rw-r--r-- | macros/scripts/battle_commands.asm | 2 |
5 files changed, 7 insertions, 5 deletions
diff --git a/data/battle/effect_command_pointers.asm b/data/battle/effect_command_pointers.asm index ae780dca6..a57e08be7 100644 --- a/data/battle/effect_command_pointers.asm +++ b/data/battle/effect_command_pointers.asm @@ -171,7 +171,7 @@ BattleCommandPointers: ; 3fd28 dw BattleCommand_BideFailText ; 35165 dw BattleCommand_RaiseSubNoAnim ; 365af dw BattleCommand_LowerSubNoAnim ; 365c3 - dw BattleCommanda8 ; 355b5 + dw BattleCommand_BeatUpFailText ; 355b5 dw BattleCommand_ClearMissDamage ; 355d5 - a9 dw BattleCommand_MoveDelay ; 37e80 dw BattleCommand_HitTarget ; 34f57 diff --git a/data/moves/effects.asm b/data/moves/effects.asm index 0a52319fb..a262babe2 100644 --- a/data/moves/effects.asm +++ b/data/moves/effects.asm @@ -2056,7 +2056,7 @@ BeatUp: checkdestinybond buildopponentrage endloop - effect0xa8 + beatupfailtext raisesub kingsrock endmove 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 diff --git a/macros/scripts/battle_commands.asm b/macros/scripts/battle_commands.asm index 7802d0329..db446d9ff 100644 --- a/macros/scripts/battle_commands.asm +++ b/macros/scripts/battle_commands.asm @@ -172,7 +172,7 @@ ENDM command bidefailtext ; a5 command raisesubnoanim ; a6 command lowersubnoanim ; a7 - command effect0xa8 ; a8 + command beatupfailtext ; a8 command clearmissdamage ; a9 command movedelay ; aa command hittarget ; ab |