Fixed X-Items functionality

2.5DHero/2.5DHero/Pokemon/Items/XItems/DireHit.vb

@@ -16,11 +16,11 @@ Namespace Items.XItems
             Dim foundBattleScreen As Boolean = True
             Dim s As Screen = Core.CurrentScreen
             While s.Identification <> Screen.Identifications.BattleScreen
-                s = s.PreScreen
                 If s.PreScreen Is Nothing Then
                     foundBattleScreen = False
                     Exit While
                 End If
+                s = s.PreScreen
             End While
 
             If foundBattleScreen = True Then

2.5DHero/2.5DHero/Pokemon/Items/XItems/GuardSpec.vb

@@ -16,11 +16,11 @@ Namespace Items.XItems
             Dim foundBattleScreen As Boolean = True
             Dim s As Screen = Core.CurrentScreen
             While s.Identification <> Screen.Identifications.BattleScreen
-                s = s.PreScreen
                 If s.PreScreen Is Nothing Then
                     foundBattleScreen = False
                     Exit While
                 End If
+                s = s.PreScreen
             End While
 
             If foundBattleScreen = True Then

2.5DHero/2.5DHero/Pokemon/Items/XItems/XAccuracy.vb

@@ -16,11 +16,11 @@ Namespace Items.XItems
             Dim foundBattleScreen As Boolean = True
             Dim s As Screen = Core.CurrentScreen
             While s.Identification <> Screen.Identifications.BattleScreen
-                s = s.PreScreen
                 If s.PreScreen Is Nothing Then
                     foundBattleScreen = False
                     Exit While
                 End If
+                s = s.PreScreen
             End While
 
             If foundBattleScreen = True Then

2.5DHero/2.5DHero/Pokemon/Items/XItems/XAttack.vb

@@ -16,11 +16,11 @@ Namespace Items.XItems
             Dim foundBattleScreen As Boolean = True
             Dim s As Screen = Core.CurrentScreen
             While s.Identification <> Screen.Identifications.BattleScreen
-                s = s.PreScreen
                 If s.PreScreen Is Nothing Then
                     foundBattleScreen = False
                     Exit While
                 End If
+                s = s.PreScreen
             End While
 
             If foundBattleScreen = True Then

2.5DHero/2.5DHero/Pokemon/Items/XItems/XDefend.vb

@@ -16,11 +16,11 @@ Namespace Items.XItems
             Dim foundBattleScreen As Boolean = True
             Dim s As Screen = Core.CurrentScreen
             While s.Identification <> Screen.Identifications.BattleScreen
-                s = s.PreScreen
                 If s.PreScreen Is Nothing Then
                     foundBattleScreen = False
                     Exit While
                 End If
+                s = s.PreScreen
             End While
 
             If foundBattleScreen = True Then

2.5DHero/2.5DHero/Pokemon/Items/XItems/XItem.vb

@@ -4,7 +4,7 @@
         Inherits Item
 
         Public Overrides ReadOnly Property CanBeUsed As Boolean = False
-        Public Overrides ReadOnly Property BattleSelectPokemon As Boolean = True
+        Public Overrides ReadOnly Property BattleSelectPokemon As Boolean = False
         Public Overrides ReadOnly Property ItemType As ItemTypes = ItemTypes.BattleItems
 
     End Class

2.5DHero/2.5DHero/Pokemon/Items/XItems/XSpAtk.vb

@@ -16,11 +16,11 @@ Namespace Items.XItems
             Dim foundBattleScreen As Boolean = True
             Dim s As Screen = Core.CurrentScreen
             While s.Identification <> Screen.Identifications.BattleScreen
-                s = s.PreScreen
                 If s.PreScreen Is Nothing Then
                     foundBattleScreen = False
                     Exit While
                 End If
+                s = s.PreScreen
             End While
 
             If foundBattleScreen = True Then

2.5DHero/2.5DHero/Pokemon/Items/XItems/XSpDef.vb

@@ -16,11 +16,11 @@ Namespace Items.XItems
             Dim foundBattleScreen As Boolean = True
             Dim s As Screen = Core.CurrentScreen
             While s.Identification <> Screen.Identifications.BattleScreen
-                s = s.PreScreen
                 If s.PreScreen Is Nothing Then
                     foundBattleScreen = False
                     Exit While
                 End If
+                s = s.PreScreen
             End While
 
             If foundBattleScreen = True Then

2.5DHero/2.5DHero/Pokemon/Items/XItems/XSpeed.vb

@@ -16,11 +16,11 @@ Namespace Items.XItems
             Dim foundBattleScreen As Boolean = True
             Dim s As Screen = Core.CurrentScreen
             While s.Identification <> Screen.Identifications.BattleScreen
-                s = s.PreScreen
                 If s.PreScreen Is Nothing Then
                     foundBattleScreen = False
                     Exit While
                 End If
+                s = s.PreScreen
             End While
 
             If foundBattleScreen = True Then