diff --git a/Data/Scripts/011_Battle/006_Other battle code/008_Battle_AbilityEffects.rb b/Data/Scripts/011_Battle/006_Other battle code/008_Battle_AbilityEffects.rb index b2b11bf71..36df96eda 100644 --- a/Data/Scripts/011_Battle/006_Other battle code/008_Battle_AbilityEffects.rb +++ b/Data/Scripts/011_Battle/006_Other battle code/008_Battle_AbilityEffects.rb @@ -496,6 +496,12 @@ Battle::AbilityEffects::StatusImmunityFromAlly.add(:FLOWERVEIL, } ) +Battle::AbilityEffects::StatusImmunityFromAlly.add(:PASTELVEIL, + proc { |ability, battler, status| + next true if status == :POISON + } +) + Battle::AbilityEffects::StatusImmunityFromAlly.add(:SWEETVEIL, proc { |ability, battler, status| next true if status == :SLEEP @@ -561,6 +567,8 @@ Battle::AbilityEffects::StatusCure.add(:IMMUNITY, } ) +Battle::AbilityEffects::StatusCure.copy(:IMMUNITY, :PASTELVEIL) + Battle::AbilityEffects::StatusCure.add(:INSOMNIA, proc { |ability, battler| next if battler.status != :SLEEP diff --git a/Data/Scripts/013_Items/004_Item_Phone.rb b/Data/Scripts/013_Items/004_Item_Phone.rb index bf28e6581..306536de8 100644 --- a/Data/Scripts/013_Items/004_Item_Phone.rb +++ b/Data/Scripts/013_Items/004_Item_Phone.rb @@ -3,6 +3,8 @@ # window in start_message and end_message). # TODO: Look at the "ready to rematch" timers to see if they can be improved? # Should they be limited to one trainer becoming ready every ~5 minutes? +# Should a rematch-ready contact become unready again after some time if +# they haven't told the player they're ready? # TODO: See if incoming phone calls can be made optional somehow. Maybe just # interrupt as normal with the start of the call and ask if the player # wants to answer? Wait for a couple of seconds before asking to make sure