ref: 800f9489145dc7c82edb3fa86fc24a5ff7411533
parent: c1e3d17769aa3088556dcd1142944541f7f6fd0e
author: mid-kid <esteve.varela@gmail.com>
date: Tue Apr 3 08:00:24 EDT 2018
Label BattleCommand_BeatUpFailText
--- a/data/battle/effect_command_pointers.asm
+++ b/data/battle/effect_command_pointers.asm
@@ -171,7 +171,7 @@
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
--- a/data/moves/effects.asm
+++ b/data/moves/effects.asm
@@ -2056,7 +2056,7 @@
checkdestinybond
buildopponentrage
endloop
- effect0xa8
+ beatupfailtext
raisesub
kingsrock
endmove
--- a/engine/battle/effect_commands.asm
+++ b/engine/battle/effect_commands.asm
@@ -5714,7 +5714,7 @@
ld a, BATTLE_VARS_SUBSTATUS3
call GetBattleVarAddr
res SUBSTATUS_IN_LOOP, [hl]
- call BattleCommanda8
+ call BattleCommand_BeatUpFailText
jp EndMoveEffect
.not_triple_kick
--- a/engine/battle/move_effects/beat_up.asm
+++ b/engine/battle/move_effects/beat_up.asm
@@ -203,7 +203,9 @@
; 355b5
-BattleCommanda8: ; 355b5
+BattleCommand_BeatUpFailText: ; 355b5
+; beatupfailtext
+
ld a, [wBeatUpHitAtLeastOnce]
and a
ret nz
--- a/macros/scripts/battle_commands.asm
+++ b/macros/scripts/battle_commands.asm
@@ -172,7 +172,7 @@
command bidefailtext ; a5
command raisesubnoanim ; a6
command lowersubnoanim ; a7
- command effect0xa8 ; a8
+ command beatupfailtext ; a8
command clearmissdamage ; a9
command movedelay ; aa
command hittarget ; ab