Using B_WAIT_TIME_LONG

This commit is contained in:
Eduardo Quezada D'Ottone 2022-08-03 16:51:02 -04:00
parent 1f9b57f1fc
commit 54097951f7

View File

@ -467,16 +467,16 @@ BattleScript_EffectCourtChange::
attackanimation attackanimation
waitanimation waitanimation
printstring STRINGID_COURTCHANGE printstring STRINGID_COURTCHANGE
waitmessage 0x40 waitmessage B_WAIT_TIME_LONG
goto BattleScript_MoveEnd goto BattleScript_MoveEnd
BattleScript_BeakBlastSetUp:: BattleScript_BeakBlastSetUp::
setbeakblast BS_ATTACKER setbeakblast BS_ATTACKER
printstring STRINGID_EMPTYSTRING3 printstring STRINGID_EMPTYSTRING3
waitmessage 0x1 waitmessage 1
playanimation BS_ATTACKER, B_ANIM_BEAK_BLAST_SETUP, NULL playanimation BS_ATTACKER, B_ANIM_BEAK_BLAST_SETUP, NULL
printstring STRINGID_HEATUPBEAK printstring STRINGID_HEATUPBEAK
waitmessage 0x40 waitmessage B_WAIT_TIME_LONG
end2 end2
BattleScript_BeakBlastBurn:: BattleScript_BeakBlastBurn::
@ -506,7 +506,7 @@ BattleScript_FirstChargingTurnMeteorBeam::
seteffectprimary seteffectprimary
copybyte cMULTISTRING_CHOOSER, sTWOTURN_STRINGID copybyte cMULTISTRING_CHOOSER, sTWOTURN_STRINGID
printfromtable gFirstTurnOfTwoStringIds printfromtable gFirstTurnOfTwoStringIds
waitmessage 0x40 waitmessage B_WAIT_TIME_LONG
setmoveeffect MOVE_EFFECT_SP_ATK_PLUS_1 | MOVE_EFFECT_AFFECTS_USER setmoveeffect MOVE_EFFECT_SP_ATK_PLUS_1 | MOVE_EFFECT_AFFECTS_USER
seteffectsecondary seteffectsecondary
return return
@ -539,24 +539,24 @@ BattleScript_ScaleShotDoMultiHit::
healthbarupdate BS_TARGET healthbarupdate BS_TARGET
datahpupdate BS_TARGET datahpupdate BS_TARGET
critmessage critmessage
waitmessage 0x40 waitmessage B_WAIT_TIME_LONG
multihitresultmessage multihitresultmessage
printstring STRINGID_EMPTYSTRING3 printstring STRINGID_EMPTYSTRING3
waitmessage 0x1 waitmessage 1
addbyte sMULTIHIT_STRING + 4, 0x1 addbyte sMULTIHIT_STRING + 4, 0x1
moveendto MOVEEND_NEXT_TARGET moveendto MOVEEND_NEXT_TARGET
jumpifbyte CMP_COMMON_BITS, gMoveResultFlags, MOVE_RESULT_FOE_ENDURED, BattleScript_ScaleShotPrintStrings jumpifbyte CMP_COMMON_BITS, gMoveResultFlags, MOVE_RESULT_FOE_ENDURED, BattleScript_ScaleShotPrintStrings
decrementmultihit BattleScript_ScaleShotLoop decrementmultihit BattleScript_ScaleShotLoop
goto BattleScript_ScaleShotPrintStrings goto BattleScript_ScaleShotPrintStrings
BattleScript_ScaleShotMultiHitNoMoreHits:: BattleScript_ScaleShotMultiHitNoMoreHits::
pause 0x20 pause B_WAIT_TIME_SHORT
BattleScript_ScaleShotPrintStrings:: BattleScript_ScaleShotPrintStrings::
resultmessage resultmessage
waitmessage 0x40 waitmessage B_WAIT_TIME_LONG
jumpifmovehadnoeffect BattleScript_ScaleShotEnd jumpifmovehadnoeffect BattleScript_ScaleShotEnd
copyarray gBattleTextBuff1, sMULTIHIT_STRING, 0x6 copyarray gBattleTextBuff1, sMULTIHIT_STRING, 0x6
printstring STRINGID_HITXTIMES printstring STRINGID_HITXTIMES
waitmessage 0x40 waitmessage B_WAIT_TIME_LONG
BattleScript_ScaleShotEnd:: BattleScript_ScaleShotEnd::
setmoveeffect MOVE_EFFECT_SCALE_SHOT | MOVE_EFFECT_AFFECTS_USER | MOVE_EFFECT_CERTAIN setmoveeffect MOVE_EFFECT_SCALE_SHOT | MOVE_EFFECT_AFFECTS_USER | MOVE_EFFECT_CERTAIN
seteffectwithchance seteffectwithchance
@ -9519,7 +9519,7 @@ BattleScript_ZMoveActivateDamaging::
printstring STRINGID_ZPOWERSURROUNDS printstring STRINGID_ZPOWERSURROUNDS
playanimation BS_ATTACKER, B_ANIM_ZMOVE_ACTIVATE, NULL playanimation BS_ATTACKER, B_ANIM_ZMOVE_ACTIVATE, NULL
printstring STRINGID_ZMOVEUNLEASHED printstring STRINGID_ZMOVEUNLEASHED
waitmessage 0x40 waitmessage B_WAIT_TIME_LONG
return return
BattleScript_ZMoveActivateStatus:: BattleScript_ZMoveActivateStatus::
@ -9533,14 +9533,14 @@ BattleScript_ZMoveActivateStatus::
BattleScript_ZEffectPrintString:: BattleScript_ZEffectPrintString::
printfromtable gZEffectStringIds printfromtable gZEffectStringIds
waitmessage 0x40 waitmessage B_WAIT_TIME_LONG
return return
BattleScript_RecoverHPZMove:: BattleScript_RecoverHPZMove::
healthbarupdate BS_SCRIPTING healthbarupdate BS_SCRIPTING
datahpupdate BS_SCRIPTING datahpupdate BS_SCRIPTING
printfromtable gZEffectStringIds printfromtable gZEffectStringIds
waitmessage 0x40 waitmessage B_WAIT_TIME_LONG
return return
BattleScript_StatUpZMove:: BattleScript_StatUpZMove::
@ -9549,16 +9549,16 @@ BattleScript_StatUpZMove::
setgraphicalstatchangevalues setgraphicalstatchangevalues
playanimation BS_ATTACKER, B_ANIM_STATS_CHANGE, sB_ANIM_ARG1 playanimation BS_ATTACKER, B_ANIM_STATS_CHANGE, sB_ANIM_ARG1
printstring STRINGID_ZMOVESTATUP printstring STRINGID_ZMOVESTATUP
waitmessage 0x40 waitmessage B_WAIT_TIME_LONG
printfromtable gStatUpStringIds printfromtable gStatUpStringIds
waitmessage 0x40 waitmessage B_WAIT_TIME_LONG
BattleScript_StatUpZMoveEnd: BattleScript_StatUpZMoveEnd:
return return
BattleScript_HealReplacementZMove:: BattleScript_HealReplacementZMove::
playanimation BS_SCRIPTING B_ANIM_WISH_HEAL 0x0 playanimation BS_SCRIPTING B_ANIM_WISH_HEAL 0x0
printfromtable gZEffectStringIds printfromtable gZEffectStringIds
waitmessage 0x40 waitmessage B_WAIT_TIME_LONG
healthbarupdate BS_SCRIPTING healthbarupdate BS_SCRIPTING
datahpupdate BS_SCRIPTING datahpupdate BS_SCRIPTING
return return
@ -9582,27 +9582,27 @@ BattleScript_ExtremeEvoboostAtk::
setstatchanger STAT_ATK, 2, FALSE setstatchanger STAT_ATK, 2, FALSE
statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_BUFF_ALLOW_PTR, BattleScript_ExtremeEvoboostDef statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_BUFF_ALLOW_PTR, BattleScript_ExtremeEvoboostDef
printfromtable gStatUpStringIds printfromtable gStatUpStringIds
waitmessage 0x40 waitmessage B_WAIT_TIME_LONG
BattleScript_ExtremeEvoboostDef:: BattleScript_ExtremeEvoboostDef::
setstatchanger STAT_DEF, 2, FALSE setstatchanger STAT_DEF, 2, FALSE
statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_BUFF_ALLOW_PTR, BattleScript_ExtremeEvoboostSpeed statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_BUFF_ALLOW_PTR, BattleScript_ExtremeEvoboostSpeed
printfromtable gStatUpStringIds printfromtable gStatUpStringIds
waitmessage 0x40 waitmessage B_WAIT_TIME_LONG
BattleScript_ExtremeEvoboostSpeed:: BattleScript_ExtremeEvoboostSpeed::
setstatchanger STAT_SPEED, 2, FALSE setstatchanger STAT_SPEED, 2, FALSE
statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_BUFF_ALLOW_PTR, BattleScript_ExtremeEvoboostSpAtk statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_BUFF_ALLOW_PTR, BattleScript_ExtremeEvoboostSpAtk
printfromtable gStatUpStringIds printfromtable gStatUpStringIds
waitmessage 0x40 waitmessage B_WAIT_TIME_LONG
BattleScript_ExtremeEvoboostSpAtk:: BattleScript_ExtremeEvoboostSpAtk::
setstatchanger STAT_SPATK, 2, FALSE setstatchanger STAT_SPATK, 2, FALSE
statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_BUFF_ALLOW_PTR, BattleScript_ExtremeEvoboostSpDef statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_BUFF_ALLOW_PTR, BattleScript_ExtremeEvoboostSpDef
printfromtable gStatUpStringIds printfromtable gStatUpStringIds
waitmessage 0x40 waitmessage B_WAIT_TIME_LONG
BattleScript_ExtremeEvoboostSpDef:: BattleScript_ExtremeEvoboostSpDef::
setstatchanger STAT_SPDEF, 2, FALSE setstatchanger STAT_SPDEF, 2, FALSE
statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_BUFF_ALLOW_PTR, BattleScript_ExtremeEvoboostEnd statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_BUFF_ALLOW_PTR, BattleScript_ExtremeEvoboostEnd
printfromtable gStatUpStringIds printfromtable gStatUpStringIds
waitmessage 0x40 waitmessage B_WAIT_TIME_LONG
BattleScript_ExtremeEvoboostEnd:: BattleScript_ExtremeEvoboostEnd::
goto BattleScript_MoveEnd goto BattleScript_MoveEnd
@ -9622,9 +9622,9 @@ BattleScript_EffectTerrainHit:
healthbarupdate BS_TARGET healthbarupdate BS_TARGET
datahpupdate BS_TARGET datahpupdate BS_TARGET
critmessage critmessage
waitmessage 0x40 waitmessage B_WAIT_TIME_LONG
resultmessage resultmessage
waitmessage 0x40 waitmessage B_WAIT_TIME_LONG
setterrain BattleScript_TryFaint setterrain BattleScript_TryFaint
playanimation BS_ATTACKER, B_ANIM_RESTORE_BG playanimation BS_ATTACKER, B_ANIM_RESTORE_BG
printfromtable gTerrainStringIds printfromtable gTerrainStringIds