From 2bf8022673a7754135097215bc16bebcf6aa0d3b Mon Sep 17 00:00:00 2001 From: LOuroboros Date: Fri, 15 Oct 2021 07:09:27 -0300 Subject: [PATCH] Changed how SIDE_STATUS_RETALIATE is cleared --- src/battle_main.c | 1 + src/battle_util.c | 3 --- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/src/battle_main.c b/src/battle_main.c index 055ec9bbe8..f3f86d58f4 100644 --- a/src/battle_main.c +++ b/src/battle_main.c @@ -3583,6 +3583,7 @@ static void HandleEndTurn_ContinueBattle(void) gBattleMons[i].status2 &= ~(STATUS2_FLINCHED); if ((gBattleMons[i].status1 & STATUS1_SLEEP) && (gBattleMons[i].status2 & STATUS2_MULTIPLETURNS)) CancelMultiTurnMoves(i); + gSideStatuses[GET_BATTLER_SIDE(i)] &= ~SIDE_STATUS_RETALIATE; } gBattleStruct->turnEffectsTracker = 0; gBattleStruct->turnEffectsBattlerId = 0; diff --git a/src/battle_util.c b/src/battle_util.c index e3bec35080..3bf34afd5c 100644 --- a/src/battle_util.c +++ b/src/battle_util.c @@ -7935,10 +7935,7 @@ static u32 CalcMoveBasePowerAfterModifiers(u16 move, u8 battlerAtk, u8 battlerDe break; case EFFECT_RETALIATE: if (gSideStatuses[atkSide] & SIDE_STATUS_RETALIATE) - { MulModifier(&modifier, UQ_4_12(2.0)); - gSideStatuses[atkSide] &= ~SIDE_STATUS_RETALIATE; - } break; case EFFECT_SOLARBEAM: if (WEATHER_HAS_EFFECT && gBattleWeather & (WEATHER_HAIL_ANY | WEATHER_SANDSTORM_ANY | WEATHER_RAIN_ANY))