@@ -703,9 +703,6 @@ abstract class BattleTypedSearch<T extends SearchType> {
703
703
let results : SearchRow [ ] ;
704
704
let illegalResults : SearchRow [ ] | null ;
705
705
706
- if ( this . defaultFilter ) {
707
- results = this . defaultFilter ( this . baseResults ) ;
708
- }
709
706
if ( filters ) {
710
707
results = [ ] ;
711
708
illegalResults = [ ] ;
@@ -730,6 +727,9 @@ abstract class BattleTypedSearch<T extends SearchType> {
730
727
results = [ ...this . baseResults ] ;
731
728
illegalResults = null ;
732
729
}
730
+ if ( this . defaultFilter ) {
731
+ results = this . defaultFilter ( results ) ;
732
+ }
733
733
734
734
if ( sortCol ) {
735
735
results = results . filter ( ( [ rowType ] ) => rowType === this . searchType ) ;
@@ -1309,7 +1309,7 @@ class BattleItemSearch extends BattleTypedSearch<'item'> {
1309
1309
// poisonheal: 'toxicorb',
1310
1310
// toxicboost: 'toxicorb',
1311
1311
// flareboost: 'flameorb',
1312
- } [ toID ( this . set ?. ability ) as string ]
1312
+ } [ toID ( this . set ?. ability ) as string ] ;
1313
1313
for ( const row of results ) {
1314
1314
if ( row [ 0 ] !== 'item' ) continue ;
1315
1315
const item = this . dex . items . get ( row [ 1 ] ) ;
@@ -1319,13 +1319,13 @@ class BattleItemSearch extends BattleTypedSearch<'item'> {
1319
1319
if ( speciesSpecific . length ) {
1320
1320
results . unshift (
1321
1321
[ 'header' , "Specific to " + speciesName ] ,
1322
- ...speciesSpecific ,
1322
+ ...speciesSpecific
1323
1323
) ;
1324
1324
}
1325
1325
if ( abilitySpecific . length ) {
1326
1326
results . unshift (
1327
1327
[ 'header' , "Specific to " + this . set ! . ability ] ,
1328
- ...abilitySpecific ,
1328
+ ...abilitySpecific
1329
1329
) ;
1330
1330
}
1331
1331
return results ;
0 commit comments