From 37151e4a2daff354f2fa3008bc8d459c8e1f64b1 Mon Sep 17 00:00:00 2001 From: LOuroboros Date: Wed, 14 Dec 2022 10:34:45 -0300 Subject: [PATCH 1/2] Updated SetMoveEffect --- src/battle_script_commands.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c index 6838fcf9ef..b9f702a294 100644 --- a/src/battle_script_commands.c +++ b/src/battle_script_commands.c @@ -3497,16 +3497,11 @@ void SetMoveEffect(bool32 primary, u32 certain) gProtectStructs[gBattlerTarget].kingsShielded = FALSE; gProtectStructs[gBattlerTarget].banefulBunkered = FALSE; gProtectStructs[gBattlerTarget].obstructed = FALSE; + BattleScriptPush(gBattlescriptCurrInstr + 1); if (gCurrentMove == MOVE_FEINT) - { - BattleScriptPush(gBattlescriptCurrInstr + 1); gBattlescriptCurrInstr = BattleScript_MoveEffectFeint; - } else if (gCurrentMove == MOVE_HYPERSPACE_FURY) - { - BattleScriptPush(gBattlescriptCurrInstr + 1); gBattlescriptCurrInstr = BattleScript_HyperspaceFuryRemoveProtect; - } } break; case MOVE_EFFECT_SPECTRAL_THIEF: From af6ea91e7299bba66f1432cfbe8680cf01080ab2 Mon Sep 17 00:00:00 2001 From: LOuroboros Date: Wed, 14 Dec 2022 10:48:12 -0300 Subject: [PATCH 2/2] Applied Eduardo's suggestion --- src/battle_script_commands.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c index b9f702a294..29b4d89aa5 100644 --- a/src/battle_script_commands.c +++ b/src/battle_script_commands.c @@ -3498,10 +3498,10 @@ void SetMoveEffect(bool32 primary, u32 certain) gProtectStructs[gBattlerTarget].banefulBunkered = FALSE; gProtectStructs[gBattlerTarget].obstructed = FALSE; BattleScriptPush(gBattlescriptCurrInstr + 1); - if (gCurrentMove == MOVE_FEINT) - gBattlescriptCurrInstr = BattleScript_MoveEffectFeint; - else if (gCurrentMove == MOVE_HYPERSPACE_FURY) + if (gCurrentMove == MOVE_HYPERSPACE_FURY) gBattlescriptCurrInstr = BattleScript_HyperspaceFuryRemoveProtect; + else + gBattlescriptCurrInstr = BattleScript_MoveEffectFeint; } break; case MOVE_EFFECT_SPECTRAL_THIEF: