ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-12-27 04:04:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

Removed BattleScript_EffectHit_Ret

Browse Source
This commit is contained in:
LOuroboros 2023-01-04 12:32:17 -03:00
parent 9a6bdfb74f
commit 2414283bb7
1 changed files with 44 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

71
data/battle_scripts_1.s
View File

@ -423,22 +423,62 @@ gBattleScriptsForMoveEffects::
.4byte BattleScript_EffectBarbBarrage @ EFFECT_BARB_BARRAGE .4byte BattleScript_EffectBarbBarrage @ EFFECT_BARB_BARRAGE
BattleScript_EffectStoneAxe:: BattleScript_EffectStoneAxe::
call BattleScript_EffectHit_Ret attackcanceler
accuracycheck BattleScript_PrintMoveMissed, ACC_CURR_MOVE
attackstring
ppreduce
critcalc
damagecalc
adjustdamage
attackanimation
waitanimation
effectivenesssound
hitanimation BS_TARGET
waitstate
healthbarupdate BS_TARGET
datahpupdate BS_TARGET
critmessage
waitmessage B_WAIT_TIME_LONG
resultmessage
waitmessage B_WAIT_TIME_LONG
seteffectwithchance
tryfaintmon BS_TARGET
setstealthrock BattleScript_ButItFailed setstealthrock BattleScript_ButItFailed
printstring STRINGID_POINTEDSTONESFLOAT printstring STRINGID_POINTEDSTONESFLOAT
waitmessage B_WAIT_TIME_LONG waitmessage B_WAIT_TIME_LONG
goto BattleScript_MoveEnd moveendall
end
BattleScript_EffectDireClaw:: BattleScript_EffectDireClaw::
setmoveeffect MOVE_EFFECT_DIRE_CLAW setmoveeffect MOVE_EFFECT_DIRE_CLAW
goto BattleScript_EffectHit goto BattleScript_EffectHit
BattleScript_EffectCeaselessEdge:: BattleScript_EffectCeaselessEdge::
call BattleScript_EffectHit_Ret attackcanceler
accuracycheck BattleScript_PrintMoveMissed, ACC_CURR_MOVE
attackstring
ppreduce
critcalc
damagecalc
adjustdamage
attackanimation
waitanimation
effectivenesssound
hitanimation BS_TARGET
waitstate
healthbarupdate BS_TARGET
datahpupdate BS_TARGET
critmessage
waitmessage B_WAIT_TIME_LONG
resultmessage
waitmessage B_WAIT_TIME_LONG
seteffectwithchance
tryfaintmon BS_TARGET
trysetspikes BattleScript_ButItFailedAtkStringPpReduce trysetspikes BattleScript_ButItFailedAtkStringPpReduce
printstring STRINGID_SPIKESSCATTERED printstring STRINGID_SPIKESSCATTERED
waitmessage B_WAIT_TIME_LONG waitmessage B_WAIT_TIME_LONG
goto BattleScript_MoveEnd moveendall
end
BattleScript_EffectTeatime:: BattleScript_EffectTeatime::
attackcanceler attackcanceler
@ -3151,29 +3191,6 @@ BattleScript_MoveEnd::
moveendall moveendall
end end
BattleScript_EffectHit_Ret::
attackcanceler
accuracycheck BattleScript_PrintMoveMissed, ACC_CURR_MOVE
attackstring
ppreduce
critcalc
damagecalc
adjustdamage
attackanimation
waitanimation
effectivenesssound
hitanimation BS_TARGET
waitstate
healthbarupdate BS_TARGET
datahpupdate BS_TARGET
critmessage
waitmessage B_WAIT_TIME_LONG
resultmessage
waitmessage B_WAIT_TIME_LONG
seteffectwithchance
tryfaintmon BS_TARGET
return
BattleScript_EffectNaturalGift: BattleScript_EffectNaturalGift:
attackcanceler attackcanceler
attackstring attackstring