pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2024-11-16 11:27:33 -08:00
Code Issues Packages Projects Releases Wiki Activity

Label BattleCommand_BeatUpFailText

Browse Source
This commit is contained in:
mid-kid 2018-04-03 12:00:24 +02:00
parent c1e3d17769
commit 800f948914
5 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
data/battle/effect_command_pointers.asm
View File

@ -171,7 +171,7 @@ BattleCommandPointers: ; 3fd28
dw BattleCommand_BideFailText ; 35165 dw BattleCommand_BideFailText ; 35165
dw BattleCommand_RaiseSubNoAnim ; 365af dw BattleCommand_RaiseSubNoAnim ; 365af
dw BattleCommand_LowerSubNoAnim ; 365c3 dw BattleCommand_LowerSubNoAnim ; 365c3
dw BattleCommanda8 ; 355b5 dw BattleCommand_BeatUpFailText ; 355b5
dw BattleCommand_ClearMissDamage ; 355d5 - a9 dw BattleCommand_ClearMissDamage ; 355d5 - a9
dw BattleCommand_MoveDelay ; 37e80 dw BattleCommand_MoveDelay ; 37e80
dw BattleCommand_HitTarget ; 34f57 dw BattleCommand_HitTarget ; 34f57

2
data/moves/effects.asm
View File

@ -2056,7 +2056,7 @@ BeatUp:
checkdestinybond checkdestinybond
buildopponentrage buildopponentrage
endloop endloop
effect0xa8 beatupfailtext
raisesub raisesub
kingsrock kingsrock
endmove endmove

2
engine/battle/effect_commands.asm
View File

@ -5714,7 +5714,7 @@ BattleCommand_EndLoop: ; 369b6
ld a, BATTLE_VARS_SUBSTATUS3 ld a, BATTLE_VARS_SUBSTATUS3
call GetBattleVarAddr call GetBattleVarAddr
res SUBSTATUS_IN_LOOP, [hl] res SUBSTATUS_IN_LOOP, [hl]
call BattleCommanda8 call BattleCommand_BeatUpFailText
jp EndMoveEffect jp EndMoveEffect
.not_triple_kick .not_triple_kick

4
engine/battle/move_effects/beat_up.asm
View File

@ -203,7 +203,9 @@ BattleCommand_BeatUp: ; 35461
; 355b5 ; 355b5
BattleCommanda8: ; 355b5 BattleCommand_BeatUpFailText: ; 355b5
; beatupfailtext
ld a, [wBeatUpHitAtLeastOnce] ld a, [wBeatUpHitAtLeastOnce]
and a and a
ret nz ret nz

2
macros/scripts/battle_commands.asm
View File

@ -172,7 +172,7 @@ ENDM
command bidefailtext ; a5 command bidefailtext ; a5
command raisesubnoanim ; a6 command raisesubnoanim ; a6
command lowersubnoanim ; a7 command lowersubnoanim ; a7
command effect0xa8 ; a8 command beatupfailtext ; a8
command clearmissdamage ; a9 command clearmissdamage ; a9
command movedelay ; aa command movedelay ; aa
command hittarget ; ab command hittarget ; ab