diff --git a/Data/Scripts/011_Battle/001_Battle/005_Battle_ActionSwitching.rb b/Data/Scripts/011_Battle/001_Battle/005_Battle_ActionSwitching.rb
index 5dee7c8e7..df44b498f 100644
--- a/Data/Scripts/011_Battle/001_Battle/005_Battle_ActionSwitching.rb
+++ b/Data/Scripts/011_Battle/001_Battle/005_Battle_ActionSwitching.rb
@@ -413,7 +413,7 @@ class Battle
         pbDisplay(_INTL("{1} became cloaked in mystical moonlight!", battler.pbThis))
         battler.pbRecoverHP(battler.totalhp)
         battler.pbCureStatus(false)
-        battler.eachMove { |m| m.pp = m.total_pp }
+        battler.eachMove { |m| battler.pbSetPP(m, m.total_pp) }
         position.effects[PBEffects::LunarDance] = false
       elsif Settings::MECHANICS_GENERATION < 8
         position.effects[PBEffects::LunarDance] = false
diff --git a/Data/Scripts/011_Battle/002_Battler/010_Battler_UseMoveTriggerEffects.rb b/Data/Scripts/011_Battle/002_Battler/010_Battler_UseMoveTriggerEffects.rb
index 982df6037..259a6196e 100644
--- a/Data/Scripts/011_Battle/002_Battler/010_Battler_UseMoveTriggerEffects.rb
+++ b/Data/Scripts/011_Battle/002_Battler/010_Battler_UseMoveTriggerEffects.rb
@@ -68,7 +68,7 @@ class Battle::Battler
       end
       # Grudge
       if target.effects[PBEffects::Grudge] && target.fainted?
-        move.pp = 0
+        user.pbSetPP(move, 0)
         @battle.pbDisplay(_INTL("{1}'s {2} lost all of its PP due to the grudge!",
                                 user.pbThis, move.name))
       end