diff --git a/src/data/pokemon-species.ts b/src/data/pokemon-species.ts index 5682b93ffb5..3c77c4d5562 100644 --- a/src/data/pokemon-species.ts +++ b/src/data/pokemon-species.ts @@ -381,7 +381,7 @@ export abstract class PokemonSpeciesForm { frameRate: 12, repeat: -1 }); - let spritePath = this.getSpriteAtlasPath(female, formIndex, shiny, variant); + let spritePath = this.getSpriteAtlasPath(female, formIndex, shiny, variant).replace('variant/', '').replace(/_[1-3]$/, ''); const useExpSprite = scene.experimentalSprites && scene.hasExpSprite(spriteKey); if (useExpSprite) spritePath = `exp/${spritePath}`; diff --git a/src/field/pokemon.ts b/src/field/pokemon.ts index 57a03a308fa..ffde68f8d9e 100644 --- a/src/field/pokemon.ts +++ b/src/field/pokemon.ts @@ -309,7 +309,7 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { if (this.shiny) { const populateVariantColors = (key: string, back: boolean = false): Promise => { return new Promise(resolve => { - const battleSpritePath = this.getBattleSpriteAtlasPath(back, ignoreOverride); + const battleSpritePath = this.getBattleSpriteAtlasPath(back, ignoreOverride).replace('variant/', '').replace(/_[1-3]$/, ''); let variantSet: VariantSet; let config = variantData; battleSpritePath.split('/').map(p => config ? config = config[p] : null); @@ -326,9 +326,9 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { }); }; if (this.isPlayer()) - Promise.all([ populateVariantColors(this.getBattleSpriteKey()), populateVariantColors(this.getBattleSpriteKey(true)) ]).then(() => updateFusionPaletteAndResolve()); + Promise.all([ populateVariantColors(this.getBattleSpriteKey(false)), populateVariantColors(this.getBattleSpriteKey(true), true) ]).then(() => updateFusionPaletteAndResolve()); else - populateVariantColors(this.getBattleSpriteKey()).then(() => updateFusionPaletteAndResolve()); + populateVariantColors(this.getBattleSpriteKey(false)).then(() => updateFusionPaletteAndResolve()); } else updateFusionPaletteAndResolve(); });