SSB: Fix bugs (#4999)

This commit is contained in:
Lycanium Z
2018-11-28 13:06:23 -05:00
committed by HoeenHero
parent 6a29f2a9da
commit a158bdcbfe
2 changed files with 10 additions and 8 deletions

View File

@@ -143,6 +143,7 @@ let BattleAbilities = {
}
},
onAfterMove: function (pokemon, move) {
if (pokemon.template.baseSpecies !== 'Shaymin' || pokemon.transformed) return;
pokemon.formeChange('Shaymin', this.effect);
},
},

View File

@@ -529,10 +529,11 @@ let BattleStatuses = {
},
kalalokki: {
noCopy: true,
onStart: function () {
onStart: function (target) {
this.add(`c|@Kalalokki|(•_•)`);
this.add(`c|@Kalalokki|( •_•)>⌐■-■`);
this.add(`c|@Kalalokki|(⌐■_■)`);
if (target.illusion) return;
this.setWeather('raindance');
},
onFaint: function () {
@@ -1106,17 +1107,17 @@ let BattleStatuses = {
scotteh: {
noCopy: true,
onStart: function () {
this.add(`c|&Scotteh|─────▄▄████▀█▄`);
this.add(`c|&Scotteh|───▄██████████████████▄`);
this.add(`c|&Scotteh|─▄█████.▼.▼.▼.▼.▼.▼.▼`);
this.add(`c|@Scotteh|─────▄▄████▀█▄`);
this.add(`c|@Scotteh|───▄██████████████████▄`);
this.add(`c|@Scotteh|─▄█████.▼.▼.▼.▼.▼.▼.▼`);
},
onSwitchOut: function () {
this.add(`c|&Scotteh|▄███████▄.▲.▲.▲.▲.▲.▲`);
this.add(`c|&Scotteh|█████████████████████▀▀`);
this.add(`c|@Scotteh|▄███████▄.▲.▲.▲.▲.▲.▲`);
this.add(`c|@Scotteh|█████████████████████▀▀`);
},
onFaint: function () {
this.add(`c|&Scotteh|▄███████▄.▲.▲.▲.▲.▲.▲`);
this.add(`c|&Scotteh|█████████████████████▀▀`);
this.add(`c|@Scotteh|▄███████▄.▲.▲.▲.▲.▲.▲`);
this.add(`c|@Scotteh|█████████████████████▀▀`);
},
},
shiba: {