diff --git a/Data/Scripts/011_Battle/006_Other battle code/010_Battle_PokeBallEffects.rb b/Data/Scripts/011_Battle/006_Other battle code/010_Battle_PokeBallEffects.rb
index 755aa4d4c..29ccd76cc 100644
--- a/Data/Scripts/011_Battle/006_Other battle code/010_Battle_PokeBallEffects.rb	
+++ b/Data/Scripts/011_Battle/006_Other battle code/010_Battle_PokeBallEffects.rb	
@@ -191,5 +191,5 @@ Battle::PokeBallEffects::OnCatch.add(:HEALBALL, proc { |ball, battle, pkmn|
 })
 
 Battle::PokeBallEffects::OnCatch.add(:FRIENDBALL, proc { |ball, battle, pkmn|
-  pkmn.happiness = 200
+  pkmn.happiness = (Settings::APPLY_HAPPINESS_SOFT_CAP) ? 150 : 200
 })
diff --git a/Data/Scripts/014_Pokemon/001_Pokemon.rb b/Data/Scripts/014_Pokemon/001_Pokemon.rb
index 9ce374827..186bf4250 100644
--- a/Data/Scripts/014_Pokemon/001_Pokemon.rb
+++ b/Data/Scripts/014_Pokemon/001_Pokemon.rb
@@ -962,7 +962,7 @@ class Pokemon
       gain += 1 if @poke_ball == :LUXURYBALL
       gain = (gain * 1.5).floor if hasItem?(:SOOTHEBELL)
       if Settings::APPLY_HAPPINESS_SOFT_CAP && method != "evberry"
-        gain = gain.clamp(0, 179 - @happiness)
+        gain = (@happiness >= 179) ? 0 : gain.clamp(0, 179 - @happiness)
       end
     end
     @happiness = (@happiness + gain).clamp(0, 255)