diff --git a/src/battle-phases.ts b/src/battle-phases.ts index 2ed7c84ae9a..d5c2f896be6 100644 --- a/src/battle-phases.ts +++ b/src/battle-phases.ts @@ -1011,12 +1011,16 @@ export class AttemptCapturePhase extends BattlePhase { this.scene.unshiftPhase(new VictoryPhase(this.scene)); this.scene.ui.showText(`${pokemon.name} was caught!`, null, () => { pokemon.hideInfo(); - const newPokemon = pokemon.addToParty(); - this.scene.field.remove(pokemon, true); - newPokemon.loadAssets().then(() => { + const end = () => { this.removePb(); this.end(); - }); + }; + const newPokemon = pokemon.addToParty(); + this.scene.field.remove(pokemon, true); + if (newPokemon) + newPokemon.loadAssets().then(end); + else + end(); }, 0, true); } diff --git a/src/battle-scene.ts b/src/battle-scene.ts index 744c03b274c..d8925fc67ff 100644 --- a/src/battle-scene.ts +++ b/src/battle-scene.ts @@ -163,7 +163,7 @@ export default class BattleScene extends Phaser.Scene { // Load pokemon-related images this.loadImage(`pkmn__back__sub`, 'pokemon/back', 'sub.png'); this.loadImage(`pkmn__sub`, 'pokemon', 'sub.png'); - this.loadAtlas('sparkle', 'effects'); + this.loadAtlas('shiny', 'effects'); this.loadImage('evo_sparkle', 'effects'); this.load.video('evo_bg', 'images/effects/evo_bg.mp4', null, false, true);