From 432ae465700154dee811f9a04a0c8b79a8803c92 Mon Sep 17 00:00:00 2001
From: DizzyEggg <jajkodizzy@wp.pl>
Date: Mon, 27 Apr 2020 10:58:35 +0200
Subject: [PATCH] Fix Acrobatics gem boost

---
 src/battle_util.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/battle_util.c b/src/battle_util.c
index b3b0aee8ec..c48473a503 100644
--- a/src/battle_util.c
+++ b/src/battle_util.c
@@ -5519,7 +5519,9 @@ static u16 CalcMoveBasePower(u16 move, u8 battlerAtk, u8 battlerDef)
         }
         break;
     case EFFECT_ACROBATICS:
-        if (gBattleMons[battlerAtk].item == ITEM_NONE)
+        if (gBattleMons[battlerAtk].item == ITEM_NONE
+            // Edge case, because removal of items happens after damage calculation.
+            || (gSpecialStatuses[battlerAtk].gemBoost && GetBattlerHoldEffect(battlerAtk, FALSE) == HOLD_EFFECT_GEMS))
             basePower *= 2;
         break;
     case EFFECT_LOW_KICK: