cdnutter
/
pokerogue
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'main' of https://github.com/Flashfyre/pokemon-rogue-battle

pull/1/head
Flashfyre 2023-04-10 17:10:02 -04:00
parent caebbe182a 4ff3c55613
commit 4d6a6eac04
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/battle-phases.ts
View File

@ -1011,12 +1011,16 @@ export class AttemptCapturePhase extends BattlePhase {
this.scene.unshiftPhase(new VictoryPhase(this.scene)); this.scene.unshiftPhase(new VictoryPhase(this.scene));
this.scene.ui.showText(`${pokemon.name} was caught!`, null, () => { this.scene.ui.showText(`${pokemon.name} was caught!`, null, () => {
pokemon.hideInfo(); pokemon.hideInfo();
const newPokemon = pokemon.addToParty(); const end = () => {
this.scene.field.remove(pokemon, true);
newPokemon.loadAssets().then(() => {
this.removePb(); this.removePb();
this.end(); this.end();
}); };
const newPokemon = pokemon.addToParty();
this.scene.field.remove(pokemon, true);
if (newPokemon)
newPokemon.loadAssets().then(end);
else
end();
}, 0, true); }, 0, true);
} }

2
src/battle-scene.ts
View File

@ -163,7 +163,7 @@ export default class BattleScene extends Phaser.Scene {
// Load pokemon-related images // Load pokemon-related images
this.loadImage(`pkmn__back__sub`, 'pokemon/back', 'sub.png'); this.loadImage(`pkmn__back__sub`, 'pokemon/back', 'sub.png');
this.loadImage(`pkmn__sub`, 'pokemon', 'sub.png'); this.loadImage(`pkmn__sub`, 'pokemon', 'sub.png');
this.loadAtlas('sparkle', 'effects'); this.loadAtlas('shiny', 'effects');
this.loadImage('evo_sparkle', 'effects'); this.loadImage('evo_sparkle', 'effects');
this.load.video('evo_bg', 'images/effects/evo_bg.mp4', null, false, true); this.load.video('evo_bg', 'images/effects/evo_bg.mp4', null, false, true);