ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2025-02-05 02:40:56 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1399 from LOuroboros/2turn_move_tweaks

Browse Source 
Corrected the order of actions in BattleScript_FirstChargingTurn
This commit is contained in:
ultima-soul 2021-05-22 13:50:24 -07:00 committed by GitHub
commit 265824531e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
data/battle_scripts_1.s
View File

@ -2762,14 +2762,16 @@ BattleScriptFirstChargingTurn::
attackcanceler attackcanceler
printstring STRINGID_EMPTYSTRING3 printstring STRINGID_EMPTYSTRING3
ppreduce ppreduce
attackstring
pause B_WAIT_TIME_LONG
copybyte cMULTISTRING_CHOOSER, sTWOTURN_STRINGID
printfromtable gFirstTurnOfTwoStringIds
waitmessage B_WAIT_TIME_LONG
attackanimation attackanimation
waitanimation waitanimation
orword gHitMarker, HITMARKER_CHARGING orword gHitMarker, HITMARKER_CHARGING
setmoveeffect MOVE_EFFECT_CHARGING | MOVE_EFFECT_AFFECTS_USER setmoveeffect MOVE_EFFECT_CHARGING | MOVE_EFFECT_AFFECTS_USER
seteffectprimary seteffectprimary
copybyte cMULTISTRING_CHOOSER, sTWOTURN_STRINGID
printfromtable gFirstTurnOfTwoStringIds
waitmessage B_WAIT_TIME_LONG
return return
BattleScript_EffectSuperFang:: BattleScript_EffectSuperFang::