diff --git a/js/client-battle-tooltips.js b/js/client-battle-tooltips.js index cd0ce324e..6d812bb5b 100644 --- a/js/client-battle-tooltips.js +++ b/js/client-battle-tooltips.js @@ -1,9 +1,7 @@ var BattleTooltips = (function () { function BattleTooltips() {} - BattleTooltips.prototype.boostBasePower = function (BattleRoom, move, pokemon, target, basePower, basePowerComment) { + BattleTooltips.prototype.boostBasePower = function (BattleRoom, move, pokemon, basePower, basePowerComment) { var myPokemon = BattleRoom.myPokemon[pokemon.slot]; - var ability = Tools.getAbility(myPokemon.baseAbility).name; - var thereIsWeather = (BattleRoom.battle.weather in {'sunnyday': 1, 'desolateland': 1, 'raindance': 1, 'primordialsea': 1, 'sandstorm': 1, 'hail':1}); if (!BattleRoom.battle.hasPseudoWeather('Magic Room') && (!pokemon.volatiles || !pokemon.volatiles['embargo'])) { var item = Tools.getItem(myPokemon.item); var pos = BattleRoom.choice.choices.length; @@ -36,7 +34,7 @@ var BattleTooltips = (function () { return basePower == 0 ? basePowerComment : basePower + basePowerComment; } }; - BattleTooltips.prototype.boostBasePower_Ball = function (BattleRoom, move, pokemon, target, basePower, basePowerComment, min, max) { + BattleTooltips.prototype.boostBasePower_Ball = function (BattleRoom, move, pokemon, min, max) { var myPokemon = BattleRoom.myPokemon[pokemon.slot]; var ability = Tools.getAbility(myPokemon.baseAbility).name; var item = Tools.getItem(myPokemon.item); @@ -45,6 +43,7 @@ var BattleTooltips = (function () { var splitItemName = item.name.split(' '); var moveName = move.name; var itemCheck = false; + var basePowerComment = ''; if (!BattleRoom.battle.hasPseudoWeather('Magic Room') && (!pokemon.volatiles || !pokemon.volatiles['embargo'])) { if (splitItemName[1] == 'Gem' && moveType == splitItemName[0]) { min *= BattleRoom.battle.gen >= 6 ? 1.3 : 1.5; diff --git a/js/client-battle.js b/js/client-battle.js index fdc392cb6..ad3399999 100644 --- a/js/client-battle.js +++ b/js/client-battle.js @@ -1440,7 +1440,7 @@ basePowerComment = (min === max) ? max : min + ' to ' + max; } } else { - return Tooltips.boostBasePower_Ball(this, move, pokemon, target, basePower, basePowerComment, min, max); + return Tooltips.boostBasePower_Ball(this, move, pokemon, min, max); } } if (move.id === 'gyroball') { @@ -1461,7 +1461,7 @@ basePowerComment = (min === max) ? max : min + ' to ' + max; } } else { - return Tooltips.boostBasePower_Ball(this, move, pokemon, target, basePower, basePowerComment, min, max); + return Tooltips.boostBasePower_Ball(this, move, pokemon, min, max); } } // Movements which have base power changed due to items. @@ -1514,7 +1514,7 @@ } } if (myPokemon.item) { - return Tooltips.boostBasePower(this, move, pokemon, target, basePower, basePowerComment); + return Tooltips.boostBasePower(this, move, pokemon, basePower, basePowerComment); } else { return basePower == 0 ? basePowerComment : basePower + basePowerComment; }