Fixing up after merge from master

This commit is contained in:
Maruno17
2021-01-10 19:25:27 +00:00
parent b11bc133bd
commit a5d1359dfe
3 changed files with 8 additions and 10 deletions

View File

@@ -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))