diff --git a/sprites/scene-test.html b/sprites/scene-test.html index 61c6eaf92..4e4a82641 100644 --- a/sprites/scene-test.html +++ b/sprites/scene-test.html @@ -557,7 +557,7 @@ const img = e('img', {class: 'pixelated'}); img.width = 7; img.height = 10; - img.src = `${Dex.resourcePrefix}fx/gender-${gender.toLowerCase()}.png`; + img.src = `${Dex.fxPrefix}gender-${gender.toLowerCase()}.png`; strong.textContent += ' '; strong.appendChild(img); } diff --git a/src/battle-animations.ts b/src/battle-animations.ts index da7d74c1e..6602d5996 100644 --- a/src/battle-animations.ts +++ b/src/battle-animations.ts @@ -831,7 +831,7 @@ export class BattleScene implements BattleSceneStub { buf2 += '
'; const gender = pokemon.gender; if (gender === 'M' || gender === 'F') { - buf2 += `${gender} `; + buf2 += `${gender} `; } if (pokemon.level !== 100) { buf2 += 'L' + pokemon.level + ''; @@ -2643,7 +2643,7 @@ export class PokemonSprite extends Sprite { buf += `${BattleLog.escapeHTML(ignoreNick ? pokemon.speciesForme : pokemon.name)}`; const gender = pokemon.gender; if (gender === 'M' || gender === 'F') { - buf += ` ${gender}`; + buf += ` ${gender}`; } buf += (pokemon.level === 100 ? `` : ` L${pokemon.level}`); diff --git a/src/battle-dex.ts b/src/battle-dex.ts index bb165a1d8..cf7e78bc0 100644 --- a/src/battle-dex.ts +++ b/src/battle-dex.ts @@ -186,11 +186,8 @@ const Dex = new class implements ModdedDex { })(); fxPrefix = (() => { - if (window.document?.location?.protocol === 'file:') { - if (window.Replays) return `https://${window.Config ? Config.routes.client : 'play.pokemonshowdown.com'}/fx/`; - return `fx/`; - } - return `//${window.Config ? Config.routes.client : 'play.pokemonshowdown.com'}/fx/`; + const protocol = (window.document?.location?.protocol !== 'http:') ? 'https:' : ''; + return `${protocol}//${window.Config ? Config.routes.client : 'play.pokemonshowdown.com'}/fx/`; })(); loadedSpriteData = {xy: 1, bw: 0}; diff --git a/src/battle-tooltips.ts b/src/battle-tooltips.ts index 2e72eb831..755a56179 100644 --- a/src/battle-tooltips.ts +++ b/src/battle-tooltips.ts @@ -768,7 +768,7 @@ class BattleTooltips { let genderBuf = ''; const gender = pokemon.gender; if (gender === 'M' || gender === 'F') { - genderBuf = ` ${gender} `; + genderBuf = ` ${gender} `; } let name = BattleLog.escapeHTML(pokemon.name);