From 2328ca5c67f896443f0ef1086fa1a844d585006b Mon Sep 17 00:00:00 2001
From: JappaWakka <jjlspeelman@outlook.com>
Date: Sat, 31 Dec 2022 13:16:32 +0100
Subject: [PATCH] Fixed EndRound custom move effect

---
 P3D/Pokemon/Attacks/AttackSpecialFunctions.vb | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/P3D/Pokemon/Attacks/AttackSpecialFunctions.vb b/P3D/Pokemon/Attacks/AttackSpecialFunctions.vb
index 4542f7a2f..c17e07e9f 100644
--- a/P3D/Pokemon/Attacks/AttackSpecialFunctions.vb
+++ b/P3D/Pokemon/Attacks/AttackSpecialFunctions.vb
@@ -160,6 +160,11 @@
                                 End If
                                 BattleScreen.Battle.SwitchOutOwn(BattleScreen, SwitchTo, -1, Message)
                             End If
+                        Case Else
+                            fSub = CInt(f.GetSplit(1, ",")).Clamp(0, 100).ToString
+                    End Select
+                Else
+                    Select Case f.ToLower()
                         Case "endround"
                             BattleScreen.Battle.DeleteHostQuery(BattleScreen)
                             Dim cq1 As ScreenFadeQueryObject = New ScreenFadeQueryObject(ScreenFadeQueryObject.FadeTypes.Vertical, Color.Black, True, 16)
@@ -167,11 +172,6 @@
                             cq2.PassThis = True
                             BattleScreen.BattleQuery.AddRange({cq1, cq2})
                             BattleScreen.Battle.StartRound(BattleScreen)
-                        Case Else
-                            fSub = CInt(f.GetSplit(1, ",")).Clamp(0, 100).ToString
-                    End Select
-                Else
-                    Select Case f.ToLower()
                         Case "freeze"
                             fSub = "15"
                         Case "poison"