Merge branch 'dev' into ai

This commit is contained in:
Maruno17
2023-03-09 18:31:30 +00:00
30 changed files with 8535 additions and 8488 deletions

View File

@@ -256,8 +256,6 @@ class Battle::Battler
@battle.pbShowAbilitySplash(self, true)
@battle.pbHideAbilitySplash(self)
pbChangeForm(newForm, _INTL("{1} deactivated!", abilityName))
elsif !endOfRound
@battle.pbDisplay(_INTL("{1} deactivated!", abilityName))
end
elsif @form < 7 # Turn into Core form
@battle.pbShowAbilitySplash(self, true)