diff --git a/P3D/Battle/BattleSystemV2/Battle.vb b/P3D/Battle/BattleSystemV2/Battle.vb
index 182e09621..ff24efb2d 100644
--- a/P3D/Battle/BattleSystemV2/Battle.vb
+++ b/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
diff --git a/P3D/P3D.vbproj b/P3D/P3D.vbproj
index dd9da8942..e2fa9b424 100644
--- a/P3D/P3D.vbproj
+++ b/P3D/P3D.vbproj
@@ -26224,6 +26224,9 @@
+
+
+
diff --git a/P3D/Pokemon/Items/Standard/ChoiceBand.vb b/P3D/Pokemon/Items/Standard/ChoiceBand.vb
new file mode 100644
index 000000000..6017a0f4e
--- /dev/null
+++ b/P3D/Pokemon/Items/Standard/ChoiceBand.vb
@@ -0,0 +1,19 @@
+Namespace Items.Standard
+
+ -
+ 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
diff --git a/P3D/Pokemon/Items/Standard/ChoiceScarf.vb b/P3D/Pokemon/Items/Standard/ChoiceScarf.vb
new file mode 100644
index 000000000..9e27843c0
--- /dev/null
+++ b/P3D/Pokemon/Items/Standard/ChoiceScarf.vb
@@ -0,0 +1,19 @@
+Namespace Items.Standard
+
+
-
+ 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
diff --git a/P3D/Pokemon/Items/Standard/ChoiceSpecs.vb b/P3D/Pokemon/Items/Standard/ChoiceSpecs.vb
new file mode 100644
index 000000000..716c4c6cf
--- /dev/null
+++ b/P3D/Pokemon/Items/Standard/ChoiceSpecs.vb
@@ -0,0 +1,19 @@
+Namespace Items.Standard
+
+
-
+ 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
diff --git a/P3D/Pokemon/Items/_itemList.txt b/P3D/Pokemon/Items/_itemList.txt
index 81a6b552c..f9cad498b 100644
Binary files a/P3D/Pokemon/Items/_itemList.txt and b/P3D/Pokemon/Items/_itemList.txt differ