diff --git a/2.5DHero/2.5DHero/Battle/BattleSystemV2/Battle.vb b/2.5DHero/2.5DHero/Battle/BattleSystemV2/Battle.vb
index 9a4b70a64..05968df70 100644
--- a/2.5DHero/2.5DHero/Battle/BattleSystemV2/Battle.vb
+++ b/2.5DHero/2.5DHero/Battle/BattleSystemV2/Battle.vb
@@ -340,16 +340,19 @@
             If BattleScreen.IsRemoteBattle AndAlso BattleScreen.IsHost Then
                 BattleScreen.OppStatistics.Turns += 1
                 BattleScreen.OwnStatistics.Turns += 1
-                If BattleScreen.ReceivedInput.StartsWith("MOVE|") Then
+                If BattleScreen.ReceivedInput.StartsWith("MOVE|") OrElse BattleScreen.ReceivedInput.StartsWith("MEGA|") Then
                     BattleScreen.OppStatistics.Moves += 1
+                    If BattleScreen.ReceivedInput.StartsWith("MEGA|") Then
+                        BattleScreen.IsMegaEvolvingOpp = True
+                    End If
                     Dim moveID As Integer = CInt(BattleScreen.ReceivedInput.Remove(0, 5))
-                    Return New RoundConst() With {.StepType = RoundConst.StepTypes.Move, .Argument = GetPokemonMoveFromID(BattleScreen.OppPokemon, moveID)}
-                ElseIf BattleScreen.ReceivedInput.StartsWith("SWITCH|") Then
-                    BattleScreen.OppStatistics.Switches += 1
-                    Dim switchID As Integer = CInt(BattleScreen.ReceivedInput.Remove(0, 7))
-                    Return New RoundConst() With {.StepType = RoundConst.StepTypes.Switch, .Argument = switchID.ToString()}
-                ElseIf BattleScreen.ReceivedInput.StartsWith("TEXT|") Then
-                    Dim text As String = BattleScreen.ReceivedInput.Remove(0, 5)
+                        Return New RoundConst() With {.StepType = RoundConst.StepTypes.Move, .Argument = GetPokemonMoveFromID(BattleScreen.OppPokemon, moveID)}
+                    ElseIf BattleScreen.ReceivedInput.StartsWith("SWITCH|") Then
+                        BattleScreen.OppStatistics.Switches += 1
+                        Dim switchID As Integer = CInt(BattleScreen.ReceivedInput.Remove(0, 7))
+                        Return New RoundConst() With {.StepType = RoundConst.StepTypes.Switch, .Argument = switchID.ToString()}
+                    ElseIf BattleScreen.ReceivedInput.StartsWith("TEXT|") Then
+                        Dim text As String = BattleScreen.ReceivedInput.Remove(0, 5)
                     Return New RoundConst() With {.StepType = RoundConst.StepTypes.Text, .Argument = text}
                 End If
             End If
diff --git a/2.5DHero/2.5DHero/Battle/BattleSystemV2/BattleMenu.vb b/2.5DHero/2.5DHero/Battle/BattleSystemV2/BattleMenu.vb
index d7be67ffa..3667041f6 100644
--- a/2.5DHero/2.5DHero/Battle/BattleSystemV2/BattleMenu.vb
+++ b/2.5DHero/2.5DHero/Battle/BattleSystemV2/BattleMenu.vb
@@ -821,7 +821,11 @@
                 BattleScreen.BattleQuery.Clear()
                 BattleScreen.BattleQuery.Add(BattleScreen.FocusBattle())
                 BattleScreen.BattleQuery.Insert(0, New ToggleMenuQueryObject(True))
-                BattleScreen.SendClientCommand("MOVE|" & BattleScreen.OwnPokemon.Attacks(_moveMenuIndex).ID.ToString())
+                If BattleScreen.IsMegaEvolvingOwn Then
+                    BattleScreen.SendClientCommand("MEGA|" & BattleScreen.OwnPokemon.Attacks(_moveMenuIndex).ID.ToString())
+                Else
+                    BattleScreen.SendClientCommand("MOVE|" & BattleScreen.OwnPokemon.Attacks(_moveMenuIndex).ID.ToString())
+                End If
             Else
                 BattleScreen.OwnStatistics.Moves += 1
                 BattleScreen.BattleQuery.Clear()