Cloyir/pokeemmo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

dynamax fix

Browse Source
This commit is contained in:
AlexOn1ine 2025-04-06 15:25:12 +02:00
parent e8cc3c81f8
commit b94e3298fc
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
data/battle_scripts_1.s
View File

@ -10047,7 +10047,7 @@ BattleScript_DynamaxBegins_End3:
BattleScript_DynamaxEnds::
flushtextbox
updatedynamax
playanimation BS_ATTACKER, B_ANIM_FORM_CHANGE
playanimation BS_SCRIPTING, B_ANIM_FORM_CHANGE
waitanimation
end2

3
src/battle_end_turn.c
View File

@ -836,7 +836,7 @@ static bool32 HandleEndTurnTorment(u32 battler)
gBattleStruct->turnEffectsBattlerId++;
if (gDisableStructs[battler].tormentTimer > 0 && --gDisableStructs[battler].tormentTimer == 0)
if (gDisableStructs[battler].tormentTimer == gBattleTurnCounter)
{
gBattleMons[battler].status2 &= ~STATUS2_TORMENT;
BattleScriptExecute(BattleScript_TormentEnds);
@ -1499,6 +1499,7 @@ static bool32 HandleEndTurnDynamax(u32 battler)
if (GetActiveGimmick(battler) == GIMMICK_DYNAMAX && gBattleStruct->dynamax.dynamaxTurns[battler] == gBattleTurnCounter)
{
gBattleScripting.battler = battler;
UndoDynamax(battler);
BattleScriptExecute(BattleScript_DynamaxEnds);
effect = TRUE;

2
src/battle_script_commands.c
View File

@ -18734,7 +18734,7 @@ void BS_TrySetTorment(void)
&& !IsAbilityOnSide(gBattlerTarget, ABILITY_AROMA_VEIL))
{
gBattleMons[gBattlerTarget].status2 |= STATUS2_TORMENT;
gDisableStructs[gBattlerTarget].tormentTimer = 3; // 3 turns excluding current turn
gDisableStructs[gBattlerTarget].tormentTimer = gBattleTurnCounter + 3; // 3 turns excluding current turn
gBattleCommunication[MULTISTRING_CHOOSER] = 3;
gEffectBattler = gBattlerTarget;
gBattlescriptCurrInstr = cmd->nextInstr;