diff --git a/2.5DHero/2.5DHero/Pokemon/Attacks/Electric/ElectroBall.vb b/2.5DHero/2.5DHero/Pokemon/Attacks/Electric/ElectroBall.vb
index 9cec5d699..e66eb1f99 100644
Binary files a/2.5DHero/2.5DHero/Pokemon/Attacks/Electric/ElectroBall.vb and b/2.5DHero/2.5DHero/Pokemon/Attacks/Electric/ElectroBall.vb differ
diff --git a/2.5DHero/2.5DHero/Pokemon/Attacks/Steel/GyroBall.vb b/2.5DHero/2.5DHero/Pokemon/Attacks/Steel/GyroBall.vb
index 3e3b0e9f3..686223ba3 100644
--- a/2.5DHero/2.5DHero/Pokemon/Attacks/Steel/GyroBall.vb
+++ b/2.5DHero/2.5DHero/Pokemon/Attacks/Steel/GyroBall.vb
@@ -61,7 +61,10 @@
                 op = BattleScreen.OwnPokemon
             End If
 
-            Dim basepower As Integer = CInt(Math.Ceiling(25 * (op.Speed / p.Speed)))
+            Dim p_Speed As Integer = BattleCalculation.DetermineBattleSpeed(own, BattleScreen)
+            Dim op_Speed As Integer = BattleCalculation.DetermineBattleSpeed(Not own, BattleScreen)
+
+            Dim basepower As Integer = CInt(Math.Ceiling(25 * (op_Speed / p_Speed)))
 
             basepower = basepower.Clamp(1, 150)