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

Merge pull request #2516 from LOuroboros/patch-1

Browse source 
Updated SetMoveEffect
This commit is contained in:
Eduardo Quezada D'Ottone 2022-12-15 18:10:08 -03:00 committed by GitHub
commit 0dca5a5230
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/battle_script_commands.c
View file

@ -3497,16 +3497,11 @@ void SetMoveEffect(bool32 primary, u32 certain)
gProtectStructs[gBattlerTarget].kingsShielded = FALSE; gProtectStructs[gBattlerTarget].kingsShielded = FALSE;
gProtectStructs[gBattlerTarget].banefulBunkered = FALSE; gProtectStructs[gBattlerTarget].banefulBunkered = FALSE;
gProtectStructs[gBattlerTarget].obstructed = FALSE; gProtectStructs[gBattlerTarget].obstructed = FALSE;
if (gCurrentMove == MOVE_FEINT) BattleScriptPush(gBattlescriptCurrInstr + 1);
{ if (gCurrentMove == MOVE_HYPERSPACE_FURY)
BattleScriptPush(gBattlescriptCurrInstr + 1);
gBattlescriptCurrInstr = BattleScript_MoveEffectFeint;
}
else if (gCurrentMove == MOVE_HYPERSPACE_FURY)
{
BattleScriptPush(gBattlescriptCurrInstr + 1);
gBattlescriptCurrInstr = BattleScript_HyperspaceFuryRemoveProtect; gBattlescriptCurrInstr = BattleScript_HyperspaceFuryRemoveProtect;
} else
gBattlescriptCurrInstr = BattleScript_MoveEffectFeint;
} }
break; break;
case MOVE_EFFECT_SPECTRAL_THIEF: case MOVE_EFFECT_SPECTRAL_THIEF: