diff --git a/js/battle.js b/js/battle.js
index dd8850f9a..878bd23be 100644
--- a/js/battle.js
+++ b/js/battle.js
@@ -1392,18 +1392,21 @@ var Side = (function () {
};
Side.prototype.updateSidebar = function () {
var pokemonhtml = '';
+ var noShow = this.battle.hardcoreMode && this.battle.gen < 7;
for (var i = 0; i < 6; i++) {
var poke = this.pokemon[i];
if (i >= this.totalPokemon) {
pokemonhtml += '';
- } else if (this.battle.hardcoreMode && poke && poke.fainted) {
+ } else if (noShow && poke && poke.fainted) {
pokemonhtml += '';
- } else if (this.battle.hardcoreMode && poke && poke.status) {
+ } else if (noShow && poke && poke.status) {
pokemonhtml += '';
- } else if (this.battle.hardcoreMode) {
+ } else if (noShow) {
pokemonhtml += '';
} else if (!poke) {
pokemonhtml += '';
+ } else if (!poke.ident && this.battle.teamPreviewCount && this.battle.teamPreviewCount < this.pokemon.length) {
+ pokemonhtml += '';
} else {
pokemonhtml += '';
}
diff --git a/js/battledata.js b/js/battledata.js
index 2db532579..11905c1ac 100644
--- a/js/battledata.js
+++ b/js/battledata.js
@@ -1312,7 +1312,7 @@ var Tools = {
} else if (pokemon === 'pokeball-statused') {
return 'background:transparent url(' + Tools.resourcePrefix + 'sprites/smicons-pokeball-sheet.png) no-repeat scroll -40px 4px';
} else if (pokemon === 'pokeball-fainted') {
- return 'background:transparent url(' + Tools.resourcePrefix + 'sprites/smicons-pokeball-sheet.png) no-repeat scroll -80px 4px';
+ return 'background:transparent url(' + Tools.resourcePrefix + 'sprites/smicons-pokeball-sheet.png) no-repeat scroll -80px 4px;opacity:.4;filter:contrast(0)';
} else if (pokemon === 'pokeball-none') {
return 'background:transparent url(' + Tools.resourcePrefix + 'sprites/smicons-pokeball-sheet.png) no-repeat scroll -80px 4px';
}
@@ -1640,7 +1640,7 @@ var Tools = {
var top = Math.floor(num / 12) * 30;
var left = (num % 12) * 40;
- var fainted = (pokemon && pokemon.fainted ? ';opacity:.4' : '');
+ var fainted = (pokemon && pokemon.fainted ? ';opacity:.7;filter:contrast(0)' : '');
return 'background:transparent url(' + Tools.resourcePrefix + 'sprites/smicons-sheet.png?a1) no-repeat scroll -' + left + 'px -' + top + 'px' + fainted;
},
diff --git a/style/battle.css b/style/battle.css
index 48c1b8cf6..c7a2480f3 100644
--- a/style/battle.css
+++ b/style/battle.css
@@ -314,7 +314,7 @@ License: GPLv2
.trainer div {
width: 86px;
height: 90px;
- opacity: .7;
+ opacity: .8;
margin: 0 auto;
background: transparent none no-repeat scroll center top;
}