diff --git a/src/data/pokemon-species.ts b/src/data/pokemon-species.ts index db601935bfc..3c65d91eccf 100644 --- a/src/data/pokemon-species.ts +++ b/src/data/pokemon-species.ts @@ -458,6 +458,7 @@ export abstract class PokemonSpeciesForm { loadAssets(scene: BattleScene, female: boolean, formIndex?: integer, shiny?: boolean, variant?: Variant, startLoad?: boolean): Promise { return new Promise(resolve => { + console.time("fetching assets " + this.speciesId); const spriteKey = this.getSpriteKey(female, formIndex, shiny, variant); scene.loadPokemonAtlas(spriteKey, this.getSpriteAtlasPath(female, formIndex, shiny, variant)); scene.load.audio(`cry/${this.getCryKey(formIndex)}`, `audio/cry/${this.getCryKey(formIndex)}.m4a`); @@ -498,6 +499,8 @@ export abstract class PokemonSpeciesForm { populateVariantColors(spriteKey).then(() => resolve()); return; } + console.timeEnd("fetching assets " + this.speciesId); + resolve(); }); if (startLoad) { diff --git a/src/field/pokemon.ts b/src/field/pokemon.ts index 6df486aab39..0ef2bb10d2b 100644 --- a/src/field/pokemon.ts +++ b/src/field/pokemon.ts @@ -362,7 +362,9 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { loadAssets(ignoreOverride: boolean = true): Promise { return new Promise(resolve => { + console.time("total asset loading for " + this.name + (this.shiny ? "" : "shiny")); const moveIds = this.getMoveset().map(m => m!.getMove().id); // TODO: is this bang correct? + console.time("loading moves " + this.name); Promise.allSettled(moveIds.map(m => initMoveAnim(this.scene, m))) .then(() => { loadMoveAnimAssets(this.scene, moveIds); @@ -392,10 +394,13 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { } this.playAnim(); const updateFusionPaletteAndResolve = () => { + console.time("fusion loading " + this.name); this.updateFusionPalette(); if (this.summonData?.speciesForm) { this.updateFusionPalette(true); } + console.timeEnd("fusion loading " + this.name); + console.timeEnd("total asset loading for " + this.name + (this.shiny ? "" : "shiny")); resolve(); }; if (this.shiny) {