atiran/sovereignx
3
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #1906 from AsparagusEduardo/pret/pr2/butItFailed

Browse source 
Renamed "ButItFailed" script names
This commit is contained in:
GriffinR 2023-08-12 23:00:57 -04:00 committed by GitHub
commit c5fb5fbb5f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
data/battle_scripts_1.s
View file

@ -533,7 +533,7 @@ BattleScript_EffectEvasionDown::
setstatchanger STAT_EVASION, 1, TRUE setstatchanger STAT_EVASION, 1, TRUE
BattleScript_EffectStatDown:: BattleScript_EffectStatDown::
attackcanceler attackcanceler
jumpifstatus2 BS_TARGET, STATUS2_SUBSTITUTE, BattleScript_ButItFailedAtkStringPpReduce jumpifstatus2 BS_TARGET, STATUS2_SUBSTITUTE, BattleScript_FailedFromAtkString
accuracycheck BattleScript_PrintMoveMissed, ACC_CURR_MOVE accuracycheck BattleScript_PrintMoveMissed, ACC_CURR_MOVE
attackstring attackstring
ppreduce ppreduce
@ -1216,7 +1216,7 @@ BattleScript_EffectPsywave::
BattleScript_EffectCounter:: BattleScript_EffectCounter::
attackcanceler attackcanceler
counterdamagecalculator BattleScript_ButItFailedAtkStringPpReduce counterdamagecalculator BattleScript_FailedFromAtkString
accuracycheck BattleScript_PrintMoveMissed, ACC_CURR_MOVE accuracycheck BattleScript_PrintMoveMissed, ACC_CURR_MOVE
attackstring attackstring
ppreduce ppreduce
@ -1543,7 +1543,7 @@ BattleScript_EffectEndure::
BattleScript_EffectSpikes:: BattleScript_EffectSpikes::
attackcanceler attackcanceler
trysetspikes BattleScript_ButItFailedAtkStringPpReduce trysetspikes BattleScript_FailedFromAtkString
attackstring attackstring
ppreduce ppreduce
attackanimation attackanimation
@ -1800,7 +1800,7 @@ BattleScript_EffectPsychUp::
BattleScript_EffectMirrorCoat:: BattleScript_EffectMirrorCoat::
attackcanceler attackcanceler
mirrorcoatdamagecalculator BattleScript_ButItFailedAtkStringPpReduce mirrorcoatdamagecalculator BattleScript_FailedFromAtkString
accuracycheck BattleScript_PrintMoveMissed, ACC_CURR_MOVE accuracycheck BattleScript_PrintMoveMissed, ACC_CURR_MOVE
attackstring attackstring
ppreduce ppreduce
@ -2047,13 +2047,13 @@ BattleScript_AlreadyAtFullHp::
BattleScript_EffectFakeOut:: BattleScript_EffectFakeOut::
attackcanceler attackcanceler
jumpifnotfirstturn BattleScript_ButItFailedAtkStringPpReduce jumpifnotfirstturn BattleScript_FailedFromAtkString
setmoveeffect MOVE_EFFECT_FLINCH | MOVE_EFFECT_CERTAIN setmoveeffect MOVE_EFFECT_FLINCH | MOVE_EFFECT_CERTAIN
goto BattleScript_EffectHit goto BattleScript_EffectHit
BattleScript_ButItFailedAtkStringPpReduce:: BattleScript_FailedFromAtkString::
attackstring attackstring
BattleScript_ButItFailedPpReduce:: BattleScript_FailedFromPpReduce::
ppreduce ppreduce
BattleScript_ButItFailed:: BattleScript_ButItFailed::
pause B_WAIT_TIME_SHORT pause B_WAIT_TIME_SHORT
@ -2367,7 +2367,7 @@ BattleScript_EffectWish::
BattleScript_EffectAssist:: BattleScript_EffectAssist::
attackcanceler attackcanceler
attackstring attackstring
assistattackselect BattleScript_ButItFailedPpReduce assistattackselect BattleScript_FailedFromPpReduce
attackanimation attackanimation
waitanimation waitanimation
setbyte sB_ANIM_TURN, 0 setbyte sB_ANIM_TURN, 0
@ -2391,7 +2391,7 @@ BattleScript_EffectSuperpower::
BattleScript_EffectMagicCoat:: BattleScript_EffectMagicCoat::
attackcanceler attackcanceler
trysetmagiccoat BattleScript_ButItFailedAtkStringPpReduce trysetmagiccoat BattleScript_FailedFromAtkString
attackstring attackstring
ppreduce ppreduce
attackanimation attackanimation
@ -2542,7 +2542,7 @@ BattleScript_EffectGrudge::
BattleScript_EffectSnatch:: BattleScript_EffectSnatch::
attackcanceler attackcanceler
trysetsnatch BattleScript_ButItFailedAtkStringPpReduce trysetsnatch BattleScript_FailedFromAtkString
attackstring attackstring
ppreduce ppreduce
attackanimation attackanimation