Merge branch 'master' into dev

This commit is contained in:
Maruno17
2021-02-08 18:38:54 +00:00
6 changed files with 10 additions and 8 deletions

View File

@@ -273,7 +273,7 @@ end
#===============================================================================
class PokeBattle_Move_012 < PokeBattle_FlinchMove
def pbMoveFailed?(user,targets)
if user.turnCount>1 || user.lastRoundMoved>=0
if user.turnCount > 1
@battle.pbDisplay(_INTL("But it failed!"))
return true
end

View File

@@ -1556,7 +1556,7 @@ end
#===============================================================================
class PokeBattle_Move_149 < PokeBattle_Move
def pbMoveFailed?(user,targets)
if user.turnCount>1 || user.lastRoundMoved>=0
if user.turnCount > 1
@battle.pbDisplay(_INTL("But it failed!"))
return true
end
@@ -2575,7 +2575,7 @@ end
#===============================================================================
class PokeBattle_Move_174 < PokeBattle_Move
def pbMoveFailed?(user,targets)
if user.turnCount>1 || user.lastRoundMoved>=0
if user.turnCount > 1
@battle.pbDisplay(_INTL("But it failed!"))
return true
end