From ff81fea1b9928e9fa1f62da378cc8df15db21c59 Mon Sep 17 00:00:00 2001
From: TheOmegaGhost <theomegaghost@gmail.com>
Date: Sat, 23 Nov 2019 03:29:31 -0200
Subject: [PATCH] Updated Dream Ball and Pinch Berries

---
 P3D/Battle/BattleSystemV2/Battle.vb     | 10 +++++-----
 P3D/Screens/Battle/BattleCatchScreen.vb |  4 ++++
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/P3D/Battle/BattleSystemV2/Battle.vb b/P3D/Battle/BattleSystemV2/Battle.vb
index c87da41f7..9f84c457c 100644
--- a/P3D/Battle/BattleSystemV2/Battle.vb
+++ b/P3D/Battle/BattleSystemV2/Battle.vb
@@ -4055,31 +4055,31 @@
                 Case "sitrus"
                     GainHP(CInt(p.MaxHP / 4), own, own, BattleScreen, "The Sitrus Berry filled up " & p.GetDisplayName() & "'s HP!", "berry:sitrus")
                 Case "figy"
-                    Dim healHP As Integer = CInt(Math.Ceiling(p.MaxHP / 2))
+                    Dim healHP As Integer = CInt(Math.Ceiling(p.MaxHP / 3))
                     GainHP(healHP, own, own, BattleScreen, "The Figy Berry filled up " & p.GetDisplayName() & "'s HP!", "berry:figy")
                     If berry.PokemonLikes(p) = False Then
                         InflictConfusion(own, own, BattleScreen, p.GetDisplayName() & " disliked the Figy Berry!", "berry:figy")
                     End If
                 Case "wiki"
-                    Dim healHP As Integer = CInt(Math.Ceiling(p.MaxHP / 2))
+                    Dim healHP As Integer = CInt(Math.Ceiling(p.MaxHP / 3))
                     GainHP(healHP, own, own, BattleScreen, "The Wiki Berry filled up " & p.GetDisplayName() & "'s HP!", "berry:wiki")
                     If berry.PokemonLikes(p) = False Then
                         InflictConfusion(own, own, BattleScreen, p.GetDisplayName() & " disliked the Wiki Berry!", "berry:wiki")
                     End If
                 Case "mago"
-                    Dim healHP As Integer = CInt(Math.Ceiling(p.MaxHP / 2))
+                    Dim healHP As Integer = CInt(Math.Ceiling(p.MaxHP / 3))
                     GainHP(healHP, own, own, BattleScreen, "The Mago Berry filled up " & p.GetDisplayName() & "'s HP!", "berry:mago")
                     If berry.PokemonLikes(p) = False Then
                         InflictConfusion(own, own, BattleScreen, p.GetDisplayName() & " disliked the Mago Berry!", "mago")
                     End If
                 Case "aguav"
-                    Dim healHP As Integer = CInt(Math.Ceiling(p.MaxHP / 2))
+                    Dim healHP As Integer = CInt(Math.Ceiling(p.MaxHP / 3))
                     GainHP(healHP, own, own, BattleScreen, "The Aguav Berry filled up " & p.GetDisplayName() & "'s HP!", "berry:aguav")
                     If berry.PokemonLikes(p) = False Then
                         InflictConfusion(own, own, BattleScreen, p.GetDisplayName() & " disliked the Aguav Berry!", "aguav")
                     End If
                 Case "iapapa"
-                    Dim healHP As Integer = CInt(Math.Ceiling(p.MaxHP / 2))
+                    Dim healHP As Integer = CInt(Math.Ceiling(p.MaxHP / 3))
                     GainHP(healHP, own, own, BattleScreen, "The Iapapa Berry filled up " & p.GetDisplayName() & "'s HP!", "berry:iapapa")
                     If berry.PokemonLikes(p) = False Then
                         InflictConfusion(own, own, BattleScreen, p.GetDisplayName() & " disliked the Iapapa Berry!", "berry:iapapa")
diff --git a/P3D/Screens/Battle/BattleCatchScreen.vb b/P3D/Screens/Battle/BattleCatchScreen.vb
index 166f66f3d..f798c5905 100644
--- a/P3D/Screens/Battle/BattleCatchScreen.vb
+++ b/P3D/Screens/Battle/BattleCatchScreen.vb
@@ -379,6 +379,10 @@
                 End If
             Case "timer ball"
                 BallRate = CInt(1 + BattleScreen.FieldEffects.Rounds * 0.3).Clamp(1, 4)
+            Case "dream ball"
+                If cp.Status = Pokemon.StatusProblems.Sleep Then
+                    BallRate = 3.0F
+                End If
         End Select
 
         Dim Status As Single = 1.0F