Leahnaya/pokemon-showdown-client
1
0
Fork 0
mirror of https://github.com/smogon/pokemon-showdown-client.git synced 2026-06-02 22:09:20 -05:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Call getMoveType correctly

Browse Source
This commit is contained in:
urkerab 2015-12-29 18:38:32 +00:00
parent 24730fa2f5
commit 5ac9fdf6f8
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
js/client-battle-tooltips.js
View File

@ -4,8 +4,7 @@ var BattleTooltips = (function () {
var myPokemon = BattleRoom.myPokemon[pokemon.slot];
if (!BattleRoom.battle.hasPseudoWeather('Magic Room') && (!pokemon.volatiles || !pokemon.volatiles['embargo'])) {
var item = Tools.getItem(myPokemon.item);
var pos = BattleRoom.choice.choices.length;
var moveType = BattleRoom.getMoveType(move, BattleRoom.battle.mySide.active[pos]);
var moveType = BattleRoom.getMoveType(move, pokemon);
var splitItemName = item.name.split(' ');
var moveName = move.name;
if (basePower) {
@ -38,8 +37,7 @@ var BattleTooltips = (function () {
var myPokemon = BattleRoom.myPokemon[pokemon.slot];
var ability = Tools.getAbility(myPokemon.baseAbility).name;
var item = Tools.getItem(myPokemon.item);
var pos = BattleRoom.choice.choices.length;
var moveType = BattleRoom.getMoveType(move, BattleRoom.battle.mySide.active[pos]);
var moveType = BattleRoom.getMoveType(move, pokemon);
var splitItemName = item.name.split(' ');
var moveName = move.name;
var itemCheck = false;