From e8170a267cf0517000cc3ae19ab82296866305c0 Mon Sep 17 00:00:00 2001
From: Maruno17 <serialcolour@hotmail.com>
Date: Sun, 31 Oct 2021 20:54:53 +0000
Subject: [PATCH] Fixed Exp Candies only raising happiness for one item if
 multiple are used at once

---
 Data/Scripts/013_Items/002_Item_Effects.rb | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/Data/Scripts/013_Items/002_Item_Effects.rb b/Data/Scripts/013_Items/002_Item_Effects.rb
index 200255b2a..d96629c32 100644
--- a/Data/Scripts/013_Items/002_Item_Effects.rb
+++ b/Data/Scripts/013_Items/002_Item_Effects.rb
@@ -910,6 +910,9 @@ ItemHandlers::UseOnPokemon.add(:EXPCANDYXS, proc { |item, pkmn, scene|
      _INTL("How many {1} do you want to use?", GameData::Item.get(item).name), maximum)
   next false if qty == 0
   scene.scene.pbSetHelpText("") if scene.is_a?(PokemonPartyScreen)
+  if qty > 1
+    (qty - 1).times { pkmn.changeHappiness("vitamin") }
+  end
   pbChangeExp(pkmn, pkmn.exp + gain_amount * qty, scene)
   $bag.remove(item, qty - 1)
   scene.pbHardRefresh
@@ -928,6 +931,9 @@ ItemHandlers::UseOnPokemon.add(:EXPCANDYS, proc { |item, pkmn, scene|
      _INTL("How many {1} do you want to use?", GameData::Item.get(item).name), maximum)
   next false if qty == 0
   scene.scene.pbSetHelpText("") if scene.is_a?(PokemonPartyScreen)
+  if qty > 1
+    (qty - 1).times { pkmn.changeHappiness("vitamin") }
+  end
   pbChangeExp(pkmn, pkmn.exp + gain_amount * qty, scene)
   $bag.remove(item, qty - 1)
   scene.pbHardRefresh
@@ -946,6 +952,9 @@ ItemHandlers::UseOnPokemon.add(:EXPCANDYM, proc { |item, pkmn, scene|
      _INTL("How many {1} do you want to use?", GameData::Item.get(item).name), maximum)
   next false if qty == 0
   scene.scene.pbSetHelpText("") if scene.is_a?(PokemonPartyScreen)
+  if qty > 1
+    (qty - 1).times { pkmn.changeHappiness("vitamin") }
+  end
   pbChangeExp(pkmn, pkmn.exp + gain_amount * qty, scene)
   $bag.remove(item, qty - 1)
   scene.pbHardRefresh
@@ -964,6 +973,9 @@ ItemHandlers::UseOnPokemon.add(:EXPCANDYL, proc { |item, pkmn, scene|
      _INTL("How many {1} do you want to use?", GameData::Item.get(item).name), maximum)
   next false if qty == 0
   scene.scene.pbSetHelpText("") if scene.is_a?(PokemonPartyScreen)
+  if qty > 1
+    (qty - 1).times { pkmn.changeHappiness("vitamin") }
+  end
   pbChangeExp(pkmn, pkmn.exp + gain_amount * qty, scene)
   $bag.remove(item, qty - 1)
   scene.pbHardRefresh
@@ -982,6 +994,9 @@ ItemHandlers::UseOnPokemon.add(:EXPCANDYXL, proc { |item, pkmn, scene|
      _INTL("How many {1} do you want to use?", GameData::Item.get(item).name), maximum)
   next false if qty == 0
   scene.scene.pbSetHelpText("") if scene.is_a?(PokemonPartyScreen)
+  if qty > 1
+    (qty - 1).times { pkmn.changeHappiness("vitamin") }
+  end
   pbChangeExp(pkmn, pkmn.exp + gain_amount * qty, scene)
   $bag.remove(item, qty - 1)
   scene.pbHardRefresh