diff --git a/mods/ssb/abilities.js b/mods/ssb/abilities.js index 14c3c05312..c950590134 100644 --- a/mods/ssb/abilities.js +++ b/mods/ssb/abilities.js @@ -143,6 +143,7 @@ let BattleAbilities = { } }, onAfterMove: function (pokemon, move) { + if (pokemon.template.baseSpecies !== 'Shaymin' || pokemon.transformed) return; pokemon.formeChange('Shaymin', this.effect); }, }, diff --git a/mods/ssb/statuses.js b/mods/ssb/statuses.js index bcaaed520a..d9f29be689 100644 --- a/mods/ssb/statuses.js +++ b/mods/ssb/statuses.js @@ -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: {