Merge branch 'master' of https://github.com/P3D-Legacy/P3D-Legacy

P3D/Battle/BattleSystemV2/Battle.vb

@@ -1243,6 +1243,34 @@
                 Exit Sub
             End If
 
+            If own = True Then
+                If Not p.Item Is Nothing Then
+                    If p.Item.Name.ToLower() = "choice band" Or p.Item.Name.ToLower() = "choice specs" Or p.Item.Name.ToLower() = "choice scarf" Then
+                        If Not BattleScreen.FieldEffects.OwnChoiceMove Is Nothing Then
+                            If Not moveUsed Is BattleScreen.FieldEffects.OwnChoiceMove Then
+                                BattleScreen.BattleQuery.Add(New TextQueryObject(p.GetDisplayName() & "'s move was prevented due to " & p.Item.Name & "!"))
+                                Exit Sub
+                            End If
+                        Else
+                            BattleScreen.FieldEffects.OwnChoiceMove = moveUsed
+                        End If
+                    End If
+                End If
+            Else
+                If Not p.Item Is Nothing Then
+                    If p.Item.Name.ToLower() = "choice band" Or p.Item.Name.ToLower() = "choice specs" Or p.Item.Name.ToLower() = "choice scarf" Then
+                        If Not BattleScreen.FieldEffects.OppChoiceMove Is Nothing Then
+                            If Not moveUsed Is BattleScreen.FieldEffects.OppChoiceMove Then
+                                BattleScreen.BattleQuery.Add(New TextQueryObject(p.GetDisplayName() & "'s move was prevented due to " & p.Item.Name & "!"))
+                                Exit Sub
+                            End If
+                        Else
+                            BattleScreen.FieldEffects.OppChoiceMove = moveUsed
+                        End If
+                    End If
+                End If
+            End If
+
             Dim imprisoned As Integer = BattleScreen.FieldEffects.OwnImprison
             If own = False Then
                 imprisoned = BattleScreen.FieldEffects.OppImprison
@@ -1338,7 +1366,7 @@
             End If
             If taunt > 0 Then
                 If moveUsed.Category = Attack.Categories.Status Then
-                    BattleScreen.BattleQuery.Add(New TextQueryObject(p.GetDisplayName() & " move was prevented due to Taunt!"))
+                    BattleScreen.BattleQuery.Add(New TextQueryObject(p.GetDisplayName() & "'s move was prevented due to Taunt!"))
                     Exit Sub
                 End If
             End If
@@ -1346,7 +1374,7 @@
             Dim gravity As Integer = BattleScreen.FieldEffects.Gravity
             If gravity > 0 Then
                 If moveUsed.DisabledWhileGravity = True Then
-                    BattleScreen.BattleQuery.Add(New TextQueryObject(p.GetDisplayName() & " move was prevented due to Gravity!"))
+                    BattleScreen.BattleQuery.Add(New TextQueryObject(p.GetDisplayName() & "'s move was prevented due to Gravity!"))
                     Exit Sub
                 End If
             End If

P3D/P3D.vbproj

@@ -26242,6 +26242,9 @@
     <Compile Include="Pokemon\Items\Machines\TM173.vb" />
     <Compile Include="Pokemon\Items\Medicine\PewterCrunchies.vb" />
     <Compile Include="Pokemon\Items\GemItem.vb" />
+    <Compile Include="Pokemon\Items\Standard\ChoiceBand.vb" />
+    <Compile Include="Pokemon\Items\Standard\ChoiceScarf.vb" />
+    <Compile Include="Pokemon\Items\Standard\ChoiceSpecs.vb" />
     <Compile Include="Pokemon\Items\Standard\PsychicSeed.vb" />
     <Compile Include="Pokemon\Items\Standard\MistySeed.vb" />
     <Compile Include="Pokemon\Items\Standard\GrassySeed.vb" />

P3D/Pokemon/Items/Standard/ChoiceBand.vb

@@ -0,0 +1,19 @@
+Namespace Items.Standard
+
+    <Item(578, "Choice Band")>
+    Public Class ChoiceBand
+
+        Inherits Item
+
+        Public Overrides ReadOnly Property Description As String = "Boosts Attack by 50%, but only allows the use of the first move selected."
+        Public Overrides ReadOnly Property PokeDollarPrice As Integer = 4000
+        Public Overrides ReadOnly Property CanBeUsedInBattle As Boolean = False
+        Public Overrides ReadOnly Property CanBeUsed As Boolean = False
+
+        Public Sub New()
+            _textureRectangle = New Rectangle(0, 288, 24, 24)
+        End Sub
+
+    End Class
+
+End Namespace

P3D/Pokemon/Items/Standard/ChoiceScarf.vb

@@ -0,0 +1,19 @@
+Namespace Items.Standard
+
+    <Item(579, "Choice Scarf")>
+    Public Class ChoiceScarf
+
+        Inherits Item
+
+        Public Overrides ReadOnly Property Description As String = "Boosts Speed by 50%, but only allows the use of the first move selected."
+        Public Overrides ReadOnly Property PokeDollarPrice As Integer = 4000
+        Public Overrides ReadOnly Property CanBeUsedInBattle As Boolean = False
+        Public Overrides ReadOnly Property CanBeUsed As Boolean = False
+
+        Public Sub New()
+            _textureRectangle = New Rectangle(24, 288, 24, 24)
+        End Sub
+
+    End Class
+
+End Namespace

P3D/Pokemon/Items/Standard/ChoiceSpecs.vb

@@ -0,0 +1,19 @@
+Namespace Items.Standard
+
+    <Item(580, "Choice Specs")>
+    Public Class ChoiceSpecs
+
+        Inherits Item
+
+        Public Overrides ReadOnly Property Description As String = "Boosts Special Attack by 50%, but only allows the use of the first move selected."
+        Public Overrides ReadOnly Property PokeDollarPrice As Integer = 4000
+        Public Overrides ReadOnly Property CanBeUsedInBattle As Boolean = False
+        Public Overrides ReadOnly Property CanBeUsed As Boolean = False
+
+        Public Sub New()
+            _textureRectangle = New Rectangle(48, 288, 24, 24)
+        End Sub
+
+    End Class
+
+End Namespace