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

Merge pull request #188 from Slayer95/megaevo

Browse Source 
Fix Baton Pass displaying base forme for mega evos
This commit is contained in:
Guangcong Luo 2014-05-11 12:19:13 -05:00
commit 5c6ba139bb
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
js/battle.js
View File

@ -4977,6 +4977,9 @@ function Battle(frame, logFrame, noPreload) {
case 'detailschange':
if (self.waitForResult()) return;
var poke = self.getPokemon(args[1]);
poke.removeVolatile('formechange');
poke.removeVolatile('typechange');
var newSpecies;
var commaIndex = args[2].indexOf(',');
if (commaIndex === -1) {
@ -4987,11 +4990,11 @@ function Battle(frame, logFrame, noPreload) {
var template = Tools.getTemplate(newSpecies);
if (poke.sprite.sp.shiny) template.shiny = true;
poke.sprite.animTransform(template);
poke.removeVolatile('formechange');
poke.removeVolatile('typechange');
poke.sprite.oldsp = null;
poke.side.updateStatbar();
poke.species = newSpecies;
poke.spriteid = template.spriteid;
poke.details = args[2];
poke.searchid = args[1].substr(0, 2) + args[1].substr(3) + '|' + args[2];
break;
case 'teampreview':