diff --git a/data/formats-data.js b/data/formats-data.js index bd212cc613..4f8cb278bb 100644 --- a/data/formats-data.js +++ b/data/formats-data.js @@ -3781,7 +3781,7 @@ exports.BattleFormatsData = { tier: "OU" }, regigigas: { - randomBattleMoves: ["thunderwave","substitute","return","drainpunch","earthquake","confuseray"], + randomBattleMoves: ["thunderwave","confuseray","substitute","return","knockoff","drainpunch"], randomDoubleBattleMoves: ["thunderwave","substitute","return","icywind","rockslide","earthquake","knockoff","wideguard"], eventPokemon: [ {"generation":4,"level":100,"moves":["ironhead","rockslide","icywind","crushgrip"],"pokeball":"cherishball"} diff --git a/data/scripts.js b/data/scripts.js index c7f7983a69..0a8c8ce0d4 100644 --- a/data/scripts.js +++ b/data/scripts.js @@ -1357,6 +1357,9 @@ exports.BattleScripts = { case 'explosion': if (counter.setupType || hasMove['wish']) rejected = true; break; + case 'hiddenpower': + if (hasMove['rest'] && hasMove['sleeptalk']) rejected = true; + break; case 'hypervoice': if (hasMove['naturepower'] || hasMove['return']) rejected = true; break; @@ -1411,6 +1414,7 @@ exports.BattleScripts = { if (hasMove['rest'] && hasMove['sleeptalk']) rejected = true; break; case 'toxic': + if (hasMove['flamecharge']) rejected = true; if (hasMove['hypnosis'] || hasMove['sleeppowder'] || hasMove['stunspore'] || hasMove['thunderwave'] || hasMove['willowisp'] || hasMove['yawn']) rejected = true; if (hasMove['rest'] && hasMove['sleeptalk']) rejected = true; break;