From afa9d4ae645923e42fc8f587080c6bf3d13de2fc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Bastos=20Dias?=
 <80102738+andrebastosdias@users.noreply.github.com>
Date: Tue, 8 Sep 2026 14:46:30 +0100
Subject: [PATCH] Teambuilder: Fix header's Ability column to match whether
 abilities are shown in result rows (#2750)

---
 .../src/battle-dex-search.ts                  |  9 +++-
 .../src/battle-searchresults.tsx              | 41 +++++++++++--------
 .../style/battle-search.css                   |  3 ++
 3 files changed, 34 insertions(+), 19 deletions(-)

diff --git a/play.pokemonshowdown.com/src/battle-dex-search.ts b/play.pokemonshowdown.com/src/battle-dex-search.ts
index c1052e43d..2f9d7d8f4 100644
--- a/play.pokemonshowdown.com/src/battle-dex-search.ts
+++ b/play.pokemonshowdown.com/src/battle-dex-search.ts
@@ -90,6 +90,7 @@ export class DexSearch {
 	}
 	static unselectableResultTypes = ['header', 'html', 'sortpokemon', 'sortmove'];
 	firstPokemonColumn: 'Tier' | 'Number' = 'Number';
+	numAbilityCols: 0 | 1 | 2 = 0;
 
 	/**
 	 * Column to sort by. Default is `null`, a smart sort determined by how good
@@ -207,7 +208,13 @@ export class DexSearch {
 			this.sortCol = null;
 		}
 		this.typedSearch = this.getTypedSearch(searchType, format, speciesOrSet);
-		if (this.typedSearch) this.dex = this.typedSearch.dex;
+		this.numAbilityCols = 0;
+		if (this.typedSearch) {
+			this.dex = this.typedSearch.dex;
+			if (searchType === 'pokemon' && this.dex.gen >= 3 && this.dex.modid !== 'gen7letsgo') {
+				this.numAbilityCols = this.dex.gen < 5 ? 1 : 2;
+			}
+		}
 	}
 
 	capitalizeFirst(str: string) {
diff --git a/play.pokemonshowdown.com/src/battle-searchresults.tsx b/play.pokemonshowdown.com/src/battle-searchresults.tsx
index 7af47c832..bd943555b 100644
--- a/play.pokemonshowdown.com/src/battle-searchresults.tsx
+++ b/play.pokemonshowdown.com/src/battle-searchresults.tsx
@@ -65,18 +65,22 @@ export class PSSearchResults extends preact.Component<{
 	renderPokemonSortRowHTML(index: number) {
 		const search = this.props.search;
 		const sortCol = search.sortCol;
+		const abilityWidthClass = search.numAbilityCols === 1 ? 'singleabilitysortcol' : 'abilitysortcol';
 		return [
 			`<li class="result" value="${index}"><div class="sortrow">`,
 			`<button class="sortcol numsortcol${!sortCol ? ' cur' : ''}">`,
 			`${!sortCol ? 'Sort: ' : escapeHTML(search.firstPokemonColumn)}</button>`,
 			`<button class="sortcol pnamesortcol${sortCol === 'name' ? ' cur' : ''}" data-sort="name">Name</button>`,
 			`<button class="sortcol typesortcol${sortCol === 'type' ? ' cur' : ''}" data-sort="type">${escapeHTML(TL.term.types)}</button>`,
-			`<button class="sortcol abilitysortcol${sortCol === 'ability' ? ' cur' : ''}" data-sort="ability">${escapeHTML(TL.term.abilities)}</button>`,
+			!search.numAbilityCols ? '' :
+			`<button class="sortcol ${abilityWidthClass}${sortCol === 'ability' ? ' cur' : ''}" data-sort="ability">${escapeHTML(TL.term.abilities)}</button>`,
 			`<button class="sortcol statsortcol${sortCol === 'hp' ? ' cur' : ''}" data-sort="hp">${TL.statShort.hp}</button>`,
 			`<button class="sortcol statsortcol${sortCol === 'atk' ? ' cur' : ''}" data-sort="atk">${TL.statShort.atk}</button>`,
 			`<button class="sortcol statsortcol${sortCol === 'def' ? ' cur' : ''}" data-sort="def">${TL.statShort.def}</button>`,
-			`<button class="sortcol statsortcol${sortCol === 'spa' ? ' cur' : ''}" data-sort="spa">${TL.statShort.spa}</button>`,
-			`<button class="sortcol statsortcol${sortCol === 'spd' ? ' cur' : ''}" data-sort="spd">${TL.statShort.spd}</button>`,
+			search.dex.gen === 1 ?
+				`<button class="sortcol statsortcol${sortCol === 'spa' ? ' cur' : ''}" data-sort="spa">${TL.statShort.spc}</button>` :
+				`<button class="sortcol statsortcol${sortCol === 'spa' ? ' cur' : ''}" data-sort="spa">${TL.statShort.spa}</button>` +
+				`<button class="sortcol statsortcol${sortCol === 'spd' ? ' cur' : ''}" data-sort="spd">${TL.statShort.spd}</button>`,
 			`<button class="sortcol statsortcol${sortCol === 'spe' ? ' cur' : ''}" data-sort="spe">${TL.statShort.spe}</button>`,
 			`<button class="sortcol statsortcol${sortCol === 'bst' ? ' cur' : ''}" data-sort="bst">${TL.tag.bst}</button>`,
 			`</div></li>`,
@@ -126,27 +130,28 @@ export class PSSearchResults extends preact.Component<{
 			`<img src="${Dex.resourcePrefix}sprites/types/${type}.png" alt="${escapeHTML(search.dex.text.typeName(type))}" height="14" width="32" class="pixelated" />`
 		).join('')}</span>`;
 
-		if (search.dex.gen >= 3) {
+		if (search.numAbilityCols) {
 			const ability0 = search.dex.text.get(search.dex.abilities.get(pokemon.abilities['0'])).name;
 			const ability1 = pokemon.abilities['1'] &&
 				search.dex.text.get(search.dex.abilities.get(pokemon.abilities['1'])).name;
 			buf += pokemon.abilities['1'] ?
 				`<span class="col twoabilitycol">${escapeHTML(ability0)}<br />${escapeHTML(ability1)}</span>` :
 				`<span class="col abilitycol">${escapeHTML(ability0)}</span>`;
-		}
-		if (search.dex.gen >= 5) {
-			const hiddenAbility = pokemon.abilities['H'] &&
-				search.dex.text.get(search.dex.abilities.get(pokemon.abilities['H'])).name;
-			const specialAbility = pokemon.abilities['S'] &&
-				search.dex.text.get(search.dex.abilities.get(pokemon.abilities['S'])).name;
-			if (pokemon.abilities['S']) {
-				buf += `<span class="col twoabilitycol${pokemon.unreleasedHidden ? ' unreleasedhacol' : ''}">` +
-					`${escapeHTML(hiddenAbility || '')}<br />${escapeHTML(specialAbility)}</span>`;
-			} else if (pokemon.abilities['H']) {
-				buf += `<span class="col abilitycol${pokemon.unreleasedHidden ? ' unreleasedhacol' : ''}">` +
-					`${escapeHTML(hiddenAbility)}</span>`;
-			} else {
-				buf += `<span class="col abilitycol"></span>`;
+
+			if (search.numAbilityCols >= 2) {
+				const hiddenAbility = pokemon.abilities['H'] &&
+					search.dex.text.get(search.dex.abilities.get(pokemon.abilities['H'])).name;
+				const specialAbility = pokemon.abilities['S'] &&
+					search.dex.text.get(search.dex.abilities.get(pokemon.abilities['S'])).name;
+				if (pokemon.abilities['S']) {
+					buf += `<span class="col twoabilitycol${pokemon.unreleasedHidden ? ' unreleasedhacol' : ''}">` +
+						`${escapeHTML(hiddenAbility || '')}<br />${escapeHTML(specialAbility)}</span>`;
+				} else if (pokemon.abilities['H']) {
+					buf += `<span class="col abilitycol${pokemon.unreleasedHidden ? ' unreleasedhacol' : ''}">` +
+						`${escapeHTML(hiddenAbility)}</span>`;
+				} else {
+					buf += `<span class="col abilitycol"></span>`;
+				}
 			}
 		}
 
diff --git a/play.pokemonshowdown.com/style/battle-search.css b/play.pokemonshowdown.com/style/battle-search.css
index 1c6e4bce1..e5db847ef 100644
--- a/play.pokemonshowdown.com/style/battle-search.css
+++ b/play.pokemonshowdown.com/style/battle-search.css
@@ -334,6 +334,9 @@
 .dexlist .abilitysortcol {
 	width: 172px;
 }
+.dexlist .singleabilitysortcol {
+	width: 86px;
+}
 .dexlist .statsortcol {
 	width: 24px;
 	text-align: right;