mirror of
https://github.com/smogon/pokemon-showdown.git
synced 2026-09-12 03:05:36 -05:00
SSB: Fix bugs (#4999)
This commit is contained in:
@@ -143,6 +143,7 @@ let BattleAbilities = {
|
||||
}
|
||||
},
|
||||
onAfterMove: function (pokemon, move) {
|
||||
if (pokemon.template.baseSpecies !== 'Shaymin' || pokemon.transformed) return;
|
||||
pokemon.formeChange('Shaymin', this.effect);
|
||||
},
|
||||
},
|
||||
|
||||
@@ -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: {
|
||||
|
||||
Reference in New Issue
Block a user