From 43d6340b92fe2204b207eb02b584c58f03039dfb Mon Sep 17 00:00:00 2001 From: LOuroboros Date: Mon, 8 Feb 2021 17:40:37 -0300 Subject: [PATCH 1/3] Corrected the order of actions in BattleScript_FirstChargingTurn --- data/battle_scripts_1.s | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/data/battle_scripts_1.s b/data/battle_scripts_1.s index b7be70429..a8a46677f 100644 --- a/data/battle_scripts_1.s +++ b/data/battle_scripts_1.s @@ -2757,14 +2757,16 @@ BattleScriptFirstChargingTurn:: attackcanceler printstring STRINGID_EMPTYSTRING3 ppreduce + attackstring + pause 0x40 + copybyte cMULTISTRING_CHOOSER, sTWOTURN_STRINGID + printfromtable gFirstTurnOfTwoStringIds + waitmessage 0x40 attackanimation waitanimation orword gHitMarker, HITMARKER_CHARGING setmoveeffect MOVE_EFFECT_CHARGING | MOVE_EFFECT_AFFECTS_USER seteffectprimary - copybyte cMULTISTRING_CHOOSER, sTWOTURN_STRINGID - printfromtable gFirstTurnOfTwoStringIds - waitmessage 0x40 return BattleScript_EffectSuperFang:: From 8cbdde3fbab06eb80a8fe9f91e3a3c7785445dea Mon Sep 17 00:00:00 2001 From: LOuroboros Date: Fri, 21 May 2021 20:22:04 -0300 Subject: [PATCH 2/3] waitmessage 0x40 -> waitmessage B_WAIT_TIME_LONG --- data/battle_scripts_1.s | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/battle_scripts_1.s b/data/battle_scripts_1.s index ef7fcd11a..10b307535 100644 --- a/data/battle_scripts_1.s +++ b/data/battle_scripts_1.s @@ -2766,7 +2766,7 @@ BattleScriptFirstChargingTurn:: pause 0x40 copybyte cMULTISTRING_CHOOSER, sTWOTURN_STRINGID printfromtable gFirstTurnOfTwoStringIds - waitmessage 0x40 + waitmessage B_WAIT_TIME_LONG attackanimation waitanimation orword gHitMarker, HITMARKER_CHARGING From 9b46b6fb45f1ddfe04b829e1f6be25b4a50fceba Mon Sep 17 00:00:00 2001 From: LOuroboros Date: Sat, 22 May 2021 16:34:39 -0300 Subject: [PATCH 3/3] pause 0x40 -> pause B_WAIT_TIME_LONG Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com> --- data/battle_scripts_1.s | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/battle_scripts_1.s b/data/battle_scripts_1.s index 10b307535..77eddc8ab 100644 --- a/data/battle_scripts_1.s +++ b/data/battle_scripts_1.s @@ -2763,7 +2763,7 @@ BattleScriptFirstChargingTurn:: printstring STRINGID_EMPTYSTRING3 ppreduce attackstring - pause 0x40 + pause B_WAIT_TIME_LONG copybyte cMULTISTRING_CHOOSER, sTWOTURN_STRINGID printfromtable gFirstTurnOfTwoStringIds waitmessage B_WAIT_TIME_LONG