Merge branch 'egg-summary-2' of https://github.com/j-diefenbach/pokerogue_tinylad-fork into egg-summary-2

src/data/pokemon-species.ts

@@ -458,7 +458,6 @@ export abstract class PokemonSpeciesForm {
 
   loadAssets(scene: BattleScene, female: boolean, formIndex?: integer, shiny?: boolean, variant?: Variant, startLoad?: boolean): Promise<void> {
     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`);
@@ -499,7 +498,6 @@ export abstract class PokemonSpeciesForm {
           populateVariantColors(spriteKey).then(() => resolve());
           return;
         }
-        console.timeEnd("fetching assets " + this.speciesId);
 
         resolve();
       });

src/phases/egg-lapse-phase.ts

@@ -13,7 +13,6 @@ import { EggHatchData } from "#app/data/egg-hatch-data.js";
 export class EggLapsePhase extends Phase {
 
   private eggHatchData: EggHatchData[] = [];
-  private loadsWaiting: number;
   constructor(scene: BattleScene) {
     super(scene);
   }
@@ -29,7 +28,6 @@ export class EggLapsePhase extends Phase {
     this.eggHatchData= [];
 
     const minEggsToPromptSkip = 5;
-    this.loadsWaiting = eggsToHatch.length;
 
     if (eggsToHatchCount > 0) {
 
@@ -38,7 +36,6 @@ export class EggLapsePhase extends Phase {
           // show prompt for skip
           this.scene.ui.showText(i18next.t("battle:eggSkipPrompt"), 0);
           this.scene.ui.setModeWithoutClear(Mode.CONFIRM, () => {
-            console.time("hatch eggs");
             for (const egg of eggsToHatch) {
               this.hatchEggSilently(egg);
             }
@@ -90,11 +87,6 @@ export class EggLapsePhase extends Phase {
       pokemon.clearFusionSpecies();
     }
 
-    this.loadsWaiting--;
-    if (this.loadsWaiting === 0) {
-      console.timeEnd("hatch eggs");
-    }
-
     if (pokemon.species.subLegendary) {
       this.scene.validateAchv(achvs.HATCH_SUB_LEGENDARY);
     }

src/phases/egg-summary-phase.ts

@@ -21,11 +21,9 @@ export class EggSummaryPhase extends Phase {
 
   start() {
     super.start();
-    console.time("update egg dex");
 
     const updateNextPokemon = (i: integer) => {
       if (i >= this.eggHatchData.length) {
-        console.timeEnd("update egg dex");
 
         this.scene.ui.setModeForceTransition(Mode.EGG_HATCH_SUMMARY, this.eggHatchData).then(() => {
           this.scene.fadeOutBgm(undefined, false);

src/system/game-data.ts

@@ -1628,7 +1628,6 @@ export class GameData {
           return;
         }
         this.scene.playSound("level_up_fanfare");
-        console.log(`${species.name} has been\nadded as a starter!`);
         this.scene.ui.showText(i18next.t("battle:addedAsAStarter", { pokemonName: species.name }), null, () => checkPrevolution(), null, true);
       } else {
         checkPrevolution();

src/ui/pokemon-hatch-info-container.ts

@@ -121,8 +121,6 @@ export default class PokemonHatchInfoContainer extends PokemonInfoContainer {
    * @precondition the specific pokemon sprite has already been loaded
    */
   displayPokemon(pokemon: PlayerPokemon) {
-    console.time("display pokemon" + pokemon.name);
-    console.log("displaying pokemon", pokemon.name);
     const species = pokemon.species;
     const female = pokemon.gender === Gender.FEMALE;
     const formIndex = pokemon.formIndex;
@@ -137,7 +135,6 @@ export default class PokemonHatchInfoContainer extends PokemonInfoContainer {
       this.currentPokemonSprite.setPipelineData("variant", variant);
       this.currentPokemonSprite.setPipelineData("spriteKey", species.getSpriteKey(female, formIndex, shiny, variant));
       this.currentPokemonSprite.setVisible(true);
-      console.timeEnd("display pokemon" + pokemon.name);
     });
   }
 
@@ -147,7 +144,6 @@ export default class PokemonHatchInfoContainer extends PokemonInfoContainer {
    * @param hatchInfo The EggHatchData of the pokemon / new hatch to show
    */
   showHatchInfo(hatchInfo: EggHatchData) {
-    console.time("show hatch info" + hatchInfo.pokemon.name);
     this.pokemonEggMovesContainer.setVisible(true);
 
     const pokemon = hatchInfo.pokemon;
@@ -188,7 +184,6 @@ export default class PokemonHatchInfoContainer extends PokemonInfoContainer {
     } else {
       this.pokemonHatchedIcon.setFrame(getEggTierForSpecies(species));
     }
-    console.timeEnd("show hatch info" + hatchInfo.pokemon.name);
 
   }