Merge branch 'master' into dev

This commit is contained in:
Maruno17
2021-01-10 19:11:26 +00:00
7 changed files with 60 additions and 44 deletions

View File

@@ -238,7 +238,7 @@ class PokeBattle_Battle
elsif battler.hp<=battler.totalhp/2
pbDisplayBrief(_INTL("OK, {1}! Come back!",battler.name))
elsif battler.turnCount>=5
pbDisplayBrief(_INTL("{1}, thats enough! Come back!",battler.name))
pbDisplayBrief(_INTL("{1}, that's enough! Come back!",battler.name))
elsif battler.turnCount>=2
pbDisplayBrief(_INTL("{1}, come back!",battler.name))
else