diff --git a/data/battle_scripts_1.s b/data/battle_scripts_1.s index 52c21dc68a..63ba181585 100644 --- a/data/battle_scripts_1.s +++ b/data/battle_scripts_1.s @@ -333,7 +333,8 @@ BattleScript_EffectPledge:: goto BattleScript_MoveEnd BattleScript_EffectCombinedPledge_Water:: - call BattleScript_EffectHit_Pledge + call BattleScript_EffectHit_RetFromAccCheck + tryfaintmon BS_TARGET setpledgestatus BS_ATTACKER, SIDE_STATUS_RAINBOW pause B_WAIT_TIME_SHORTEST printstring STRINGID_ARAINBOWAPPEAREDONSIDE @@ -348,7 +349,8 @@ BattleScript_TheRainbowDisappeared:: end2 BattleScript_EffectCombinedPledge_Fire:: - call BattleScript_EffectHit_Pledge + call BattleScript_EffectHit_RetFromAccCheck + tryfaintmon BS_TARGET setpledgestatus BS_TARGET, SIDE_STATUS_SEA_OF_FIRE pause B_WAIT_TIME_SHORTEST printstring STRINGID_SEAOFFIREENVELOPEDSIDE @@ -368,7 +370,8 @@ BattleScript_TheSeaOfFireDisappeared:: end2 BattleScript_EffectCombinedPledge_Grass:: - call BattleScript_EffectHit_Pledge + call BattleScript_EffectHit_RetFromAccCheck + tryfaintmon BS_TARGET setpledgestatus BS_TARGET, SIDE_STATUS_SWAMP pause B_WAIT_TIME_SHORTEST printstring STRINGID_SWAMPENVELOPEDSIDE @@ -382,12 +385,10 @@ BattleScript_TheSwampDisappeared:: waitmessage B_WAIT_TIME_LONG end2 -BattleScript_EffectHit_Pledge:: +BattleScript_TwoMovesBecomeOne:: pause B_WAIT_TIME_MED printstring STRINGID_THETWOMOVESBECOMEONE waitmessage B_WAIT_TIME_LONG - call BattleScript_EffectHit_RetFromAccCheck - tryfaintmon BS_TARGET return BattleScript_EffectSaltCure:: diff --git a/include/battle_scripts.h b/include/battle_scripts.h index 9e2fb84485..890438e364 100644 --- a/include/battle_scripts.h +++ b/include/battle_scripts.h @@ -503,6 +503,7 @@ extern const u8 BattleScript_SelectingNotAllowedCurrentMoveInPalace[]; extern const u8 BattleScript_SaltCureExtraDamage[]; extern const u8 BattleScript_SyrupBombEndTurn[]; extern const u8 BattleScript_SyrupBombActivates[]; +extern const u8 BattleScript_TwoMovesBecomeOne[]; extern const u8 BattleScript_EffectCombinedPledge_Water[]; extern const u8 BattleScript_EffectCombinedPledge_Fire[]; extern const u8 BattleScript_EffectCombinedPledge_Grass[]; diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c index f28d8e0e5a..e1ef29be55 100644 --- a/src/battle_script_commands.c +++ b/src/battle_script_commands.c @@ -16776,13 +16776,15 @@ void BS_SetPledge(void) { if (moveType == sPledgeCombos[i].mainType && partnerMoveType == sPledgeCombos[i].subType) { - gBattlescriptCurrInstr = sPledgeCombos[i].battleScript; + BattleScriptPush(sPledgeCombos[i].battleScript); + gBattlescriptCurrInstr = BattleScript_TwoMovesBecomeOne; break; } else if (moveType == sPledgeCombos[i].subType && partnerMoveType == sPledgeCombos[i].mainType) { gCurrentMove = partnerMove; - gBattlescriptCurrInstr = sPledgeCombos[i].battleScript; + BattleScriptPush(sPledgeCombos[i].battleScript); + gBattlescriptCurrInstr = BattleScript_TwoMovesBecomeOne; break; } }