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

"Two moves become one" message now always shows

Browse source
This commit is contained in:
Eduardo Quezada 2024-10-30 10:57:36 -03:00
parent 01f2afc346
commit 7ea1d33763
3 changed files with 12 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
data/battle_scripts_1.s
View file

@ -333,7 +333,8 @@ BattleScript_EffectPledge::
goto BattleScript_MoveEnd goto BattleScript_MoveEnd
BattleScript_EffectCombinedPledge_Water:: BattleScript_EffectCombinedPledge_Water::
call BattleScript_EffectHit_Pledge call BattleScript_EffectHit_RetFromAccCheck
tryfaintmon BS_TARGET
setpledgestatus BS_ATTACKER, SIDE_STATUS_RAINBOW setpledgestatus BS_ATTACKER, SIDE_STATUS_RAINBOW
pause B_WAIT_TIME_SHORTEST pause B_WAIT_TIME_SHORTEST
printstring STRINGID_ARAINBOWAPPEAREDONSIDE printstring STRINGID_ARAINBOWAPPEAREDONSIDE
@ -348,7 +349,8 @@ BattleScript_TheRainbowDisappeared::
end2 end2
BattleScript_EffectCombinedPledge_Fire:: BattleScript_EffectCombinedPledge_Fire::
call BattleScript_EffectHit_Pledge call BattleScript_EffectHit_RetFromAccCheck
tryfaintmon BS_TARGET
setpledgestatus BS_TARGET, SIDE_STATUS_SEA_OF_FIRE setpledgestatus BS_TARGET, SIDE_STATUS_SEA_OF_FIRE
pause B_WAIT_TIME_SHORTEST pause B_WAIT_TIME_SHORTEST
printstring STRINGID_SEAOFFIREENVELOPEDSIDE printstring STRINGID_SEAOFFIREENVELOPEDSIDE
@ -368,7 +370,8 @@ BattleScript_TheSeaOfFireDisappeared::
end2 end2
BattleScript_EffectCombinedPledge_Grass:: BattleScript_EffectCombinedPledge_Grass::
call BattleScript_EffectHit_Pledge call BattleScript_EffectHit_RetFromAccCheck
tryfaintmon BS_TARGET
setpledgestatus BS_TARGET, SIDE_STATUS_SWAMP setpledgestatus BS_TARGET, SIDE_STATUS_SWAMP
pause B_WAIT_TIME_SHORTEST pause B_WAIT_TIME_SHORTEST
printstring STRINGID_SWAMPENVELOPEDSIDE printstring STRINGID_SWAMPENVELOPEDSIDE
@ -382,12 +385,10 @@ BattleScript_TheSwampDisappeared::
waitmessage B_WAIT_TIME_LONG waitmessage B_WAIT_TIME_LONG
end2 end2
BattleScript_EffectHit_Pledge:: BattleScript_TwoMovesBecomeOne::
pause B_WAIT_TIME_MED pause B_WAIT_TIME_MED
printstring STRINGID_THETWOMOVESBECOMEONE printstring STRINGID_THETWOMOVESBECOMEONE
waitmessage B_WAIT_TIME_LONG waitmessage B_WAIT_TIME_LONG
call BattleScript_EffectHit_RetFromAccCheck
tryfaintmon BS_TARGET
return return
BattleScript_EffectSaltCure:: BattleScript_EffectSaltCure::

1
include/battle_scripts.h
View file

@ -503,6 +503,7 @@ extern const u8 BattleScript_SelectingNotAllowedCurrentMoveInPalace[];
extern const u8 BattleScript_SaltCureExtraDamage[]; extern const u8 BattleScript_SaltCureExtraDamage[];
extern const u8 BattleScript_SyrupBombEndTurn[]; extern const u8 BattleScript_SyrupBombEndTurn[];
extern const u8 BattleScript_SyrupBombActivates[]; extern const u8 BattleScript_SyrupBombActivates[];
extern const u8 BattleScript_TwoMovesBecomeOne[];
extern const u8 BattleScript_EffectCombinedPledge_Water[]; extern const u8 BattleScript_EffectCombinedPledge_Water[];
extern const u8 BattleScript_EffectCombinedPledge_Fire[]; extern const u8 BattleScript_EffectCombinedPledge_Fire[];
extern const u8 BattleScript_EffectCombinedPledge_Grass[]; extern const u8 BattleScript_EffectCombinedPledge_Grass[];

6
src/battle_script_commands.c
View file

@ -16776,13 +16776,15 @@ void BS_SetPledge(void)
{ {
if (moveType == sPledgeCombos[i].mainType && partnerMoveType == sPledgeCombos[i].subType) if (moveType == sPledgeCombos[i].mainType && partnerMoveType == sPledgeCombos[i].subType)
{ {
gBattlescriptCurrInstr = sPledgeCombos[i].battleScript; BattleScriptPush(sPledgeCombos[i].battleScript);
gBattlescriptCurrInstr = BattleScript_TwoMovesBecomeOne;
break; break;
} }
else if (moveType == sPledgeCombos[i].subType && partnerMoveType == sPledgeCombos[i].mainType) else if (moveType == sPledgeCombos[i].subType && partnerMoveType == sPledgeCombos[i].mainType)
{ {
gCurrentMove = partnerMove; gCurrentMove = partnerMove;
gBattlescriptCurrInstr = sPledgeCombos[i].battleScript; BattleScriptPush(sPledgeCombos[i].battleScript);
gBattlescriptCurrInstr = BattleScript_TwoMovesBecomeOne;
break; break;
} }
} }