From a5d1359dfe5854c18edb788dc34211a1316729af Mon Sep 17 00:00:00 2001
From: Maruno17 <serialcolour@hotmail.com>
Date: Sun, 10 Jan 2021 19:25:27 +0000
Subject: [PATCH] Fixing up after merge from master

---
 .../001_Battler/006_Battler_AbilityAndItem.rb        |  2 +-
 Data/Scripts/012_Battle/006_BattleHandlers.rb        |  4 ++--
 Data/Scripts/012_Battle/008_BattleHandlers_Items.rb  | 12 +++++-------
 3 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/Data/Scripts/012_Battle/001_Battler/006_Battler_AbilityAndItem.rb b/Data/Scripts/012_Battle/001_Battler/006_Battler_AbilityAndItem.rb
index b8e2a1396..577773957 100644
--- a/Data/Scripts/012_Battle/001_Battler/006_Battler_AbilityAndItem.rb
+++ b/Data/Scripts/012_Battle/001_Battler/006_Battler_AbilityAndItem.rb
@@ -129,7 +129,7 @@ class PokeBattle_Battler
     return true
   end
 
-  def canConsumePinchBerry?(_item, check_gluttony = true)
+  def canConsumePinchBerry?(check_gluttony = true)
     return false if !canConsumeBerry?
     return true if @hp <= @totalhp / 4
     return true if @hp <= @totalhp / 2 && (!check_gluttony || hasActiveAbility?(:GLUTTONY))
diff --git a/Data/Scripts/012_Battle/006_BattleHandlers.rb b/Data/Scripts/012_Battle/006_BattleHandlers.rb
index 76371ff45..3db630399 100644
--- a/Data/Scripts/012_Battle/006_BattleHandlers.rb
+++ b/Data/Scripts/012_Battle/006_BattleHandlers.rb
@@ -491,7 +491,7 @@ FINAL_DMG_MULT = 3
 
 def pbBattleConfusionBerry(battler,battle,item,forced,flavor,confuseMsg)
   return false if !forced && !battler.canHeal?
-  return false if !forced && !battler.canConsumePinchBerry?(item, (MECHANICS_GENERATION >= 7))
+  return false if !forced && !battler.canConsumePinchBerry?(MECHANICS_GENERATION >= 7)
   itemName = GameData::Item.get(item).name
   battle.pbCommonAnimation("EatBerry",battler) if !forced
   fraction_to_heal = 8   # Gens 6 and lower
@@ -517,7 +517,7 @@ def pbBattleConfusionBerry(battler,battle,item,forced,flavor,confuseMsg)
 end
 
 def pbBattleStatIncreasingBerry(battler,battle,item,forced,stat,increment=1)
-  return false if !forced && !battler.canConsumePinchBerry?(item)
+  return false if !forced && !battler.canConsumePinchBerry?
   return false if !battler.pbCanRaiseStatStage?(stat,battler)
   itemName = GameData::Item.get(item).name
   if forced
diff --git a/Data/Scripts/012_Battle/008_BattleHandlers_Items.rb b/Data/Scripts/012_Battle/008_BattleHandlers_Items.rb
index c399b9788..20c3a6b3a 100644
--- a/Data/Scripts/012_Battle/008_BattleHandlers_Items.rb
+++ b/Data/Scripts/012_Battle/008_BattleHandlers_Items.rb
@@ -97,7 +97,7 @@ BattleHandlers::HPHealItem.add(:IAPAPABERRY,
 
 BattleHandlers::HPHealItem.add(:LANSATBERRY,
   proc { |item,battler,battle,forced|
-    next false if !forced && !battler.canConsumePinchBerry?(item)
+    next false if !forced && !battler.canConsumePinchBerry?
     next false if battler.effects[PBEffects::FocusEnergy]>=2
     battle.pbCommonAnimation("EatBerry",battler) if !forced
     battler.effects[PBEffects::FocusEnergy] = 2
@@ -126,7 +126,7 @@ BattleHandlers::HPHealItem.add(:MAGOBERRY,
 
 BattleHandlers::HPHealItem.add(:MICLEBERRY,
   proc { |item,battler,battle,forced|
-    next false if !forced && !battler.canConsumePinchBerry?(item)
+    next false if !forced && !battler.canConsumePinchBerry?
     next false if !battler.effects[PBEffects::MicleBerry]
     battle.pbCommonAnimation("EatBerry",battler) if !forced
     battler.effects[PBEffects::MicleBerry] = true
@@ -145,8 +145,7 @@ BattleHandlers::HPHealItem.add(:MICLEBERRY,
 BattleHandlers::HPHealItem.add(:ORANBERRY,
   proc { |item,battler,battle,forced|
     next false if !battler.canHeal?
-    next false if !forced && !battler.canConsumeBerry?
-    next false if !forced && battler.hp>battler.totalhp/2
+    next false if !forced && !battler.canConsumePinchBerry?(false)
     battle.pbCommonAnimation("EatBerry",battler) if !forced
     battler.pbRecoverHP(10)
     itemName = GameData::Item.get(item).name
@@ -175,8 +174,7 @@ BattleHandlers::HPHealItem.add(:SALACBERRY,
 BattleHandlers::HPHealItem.add(:SITRUSBERRY,
   proc { |item,battler,battle,forced|
     next false if !battler.canHeal?
-    next false if !forced && !battler.canConsumeBerry?
-    next false if !forced && battler.hp>battler.totalhp/2
+    next false if !forced && !battler.canConsumePinchBerry?(false)
     battle.pbCommonAnimation("EatBerry",battler) if !forced
     battler.pbRecoverHP(battler.totalhp/4)
     itemName = GameData::Item.get(item).name
@@ -370,7 +368,7 @@ BattleHandlers::StatusCureItem.add(:RAWSTBERRY,
 
 BattleHandlers::PriorityBracketChangeItem.add(:CUSTAPBERRY,
   proc { |item,battler,subPri,battle|
-    next if !battler.canConsumePinchBerry?(item)
+    next if !battler.canConsumePinchBerry?
     next 1 if subPri<1
   }
 )