Skip to content

Commit

Permalink
Update mega evolution message
Browse files Browse the repository at this point in the history
Original implementation did not take Illusion into account.
  • Loading branch information
TheImmortal committed Dec 20, 2014
1 parent fe94fdf commit a88cfad
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions js/battle.js
Original file line number Diff line number Diff line change
Expand Up @@ -4057,13 +4057,13 @@ var Battle = (function () {
break;
case '-mega':
var poke = this.getPokemon(args[1]);
var item = Tools.getItem(args[2]);
if (poke.baseSpecies === 'Rayquaza') {
var item = Tools.getItem(args[3]);
if (args[2] === 'Rayquaza') {
actions += "" + Tools.escapeHTML(poke.side.name) + "'s fervent wish has reached " + poke.getLowerName() + "!";
} else {
actions += "" + poke.getName() + "'s " + item.name + " is reacting to " + Tools.escapeHTML(poke.side.name) + "'s Mega Bracelet!";
}
actions += "<br />" + poke.getName() + " has Mega Evolved into Mega " + poke.baseSpecies + "!";
actions += "<br />" + poke.getName() + " has Mega Evolved into Mega " + args[2] + "!";
break;

case '-start':
Expand Down

0 comments on commit a88cfad

Please sign in to comment.