From 7051f261d1a0f5929ca73a14a60dc2402ab9370a Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Tue, 31 Dec 2019 13:33:54 +0100 Subject: [PATCH] Fix Queenly Majesty --- src/battle_util.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/src/battle_util.c b/src/battle_util.c index f03d53d27..194913178 100644 --- a/src/battle_util.c +++ b/src/battle_util.c @@ -3084,13 +3084,11 @@ u8 AbilityBattleEffects(u8 caseID, u8 battler, u8 ability, u8 special, u16 moveA gBattlescriptCurrInstr = BattleScript_SoundproofProtected; effect = 1; } - else if (((gLastUsedAbility == ABILITY_DAZZLING - || (IsBattlerAlive(battler ^= BIT_FLANK) && GetBattlerAbility(battler) == ABILITY_DAZZLING) - ) - || (gLastUsedAbility == ABILITY_QUEENLY_MAJESTY - || (IsBattlerAlive(battler ^= BIT_FLANK) && GetBattlerAbility(battler) == ABILITY_QUEENLY_MAJESTY) + else if ((((gLastUsedAbility == ABILITY_DAZZLING || gLastUsedAbility == ABILITY_QUEENLY_MAJESTY + || (IsBattlerAlive(battler ^= BIT_FLANK) + && ((GetBattlerAbility(battler) == ABILITY_DAZZLING) || GetBattlerAbility(battler) == ABILITY_QUEENLY_MAJESTY))) )) - && GetChosenMovePriority(battler) > 0 + && GetChosenMovePriority(gBattlerAttacker) > 0 && GetBattlerSide(gBattlerAttacker) != GetBattlerSide(battler)) { if (gBattleMons[gBattlerAttacker].status2 & STATUS2_MULTIPLETURNS)