From 149fb15dd3aee88eb4eccb9c3443cb881db89e3c Mon Sep 17 00:00:00 2001
From: AJ Fontaine <fontbane@gmail.com>
Date: Mon, 16 Sep 2024 08:17:29 -0400
Subject: [PATCH] Fix nits

---
 src/field/pokemon.ts         | 4 ++--
 src/system/pokemon-data.ts   | 4 ++--
 src/ui/summary-ui-handler.ts | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/field/pokemon.ts b/src/field/pokemon.ts
index 64bad2e469f..ed36bcfe4b3 100644
--- a/src/field/pokemon.ts
+++ b/src/field/pokemon.ts
@@ -95,7 +95,7 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
   public metLevel: integer;
   public metBiome: Biome | -1;
   public metSpecies: Species;
-  public metWave: integer;
+  public metWave: number;
   public luck: integer;
   public pauseEvolutions: boolean;
   public pokerus: boolean;
@@ -195,7 +195,7 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
       this.luck = dataSource.luck;
       this.metBiome = dataSource.metBiome;
       this.metSpecies = dataSource.metSpecies ?? (this.metBiome !== -1 ? this.species.speciesId : this.species.getRootSpeciesId(true));
-      this.metWave = dataSource.metWave ?? (this.metBiome === -1 ? -1: 0);
+      this.metWave = dataSource.metWave ?? (this.metBiome === -1 ? -1 : 0);
       this.pauseEvolutions = dataSource.pauseEvolutions;
       this.pokerus = !!dataSource.pokerus;
       this.evoCounter = dataSource.evoCounter ?? 0;
diff --git a/src/system/pokemon-data.ts b/src/system/pokemon-data.ts
index 6a1e581cb34..0fd90e448a1 100644
--- a/src/system/pokemon-data.ts
+++ b/src/system/pokemon-data.ts
@@ -40,7 +40,7 @@ export default class PokemonData {
   public metLevel: integer;
   public metBiome: Biome | -1;        // -1 for starters
   public metSpecies: Species;
-  public metWave: integer;            // 0 for unknown (previous saves), -1 for starters
+  public metWave: number;            // 0 for unknown (previous saves), -1 for starters
   public luck: integer;
   public pauseEvolutions: boolean;
   public pokerus: boolean;
@@ -91,7 +91,7 @@ export default class PokemonData {
     this.metLevel = source.metLevel || 5;
     this.metBiome = source.metBiome !== undefined ? source.metBiome : -1;
     this.metSpecies = source.metSpecies;
-    this.metWave = source.metWave !== undefined ? source.metWave : 0;
+    this.metWave = source.metWave ?? (this.metBiome === -1 ? -1 : 0);
     this.luck = source.luck !== undefined ? source.luck : (source.shiny ? (source.variant + 1) : 0);
     if (!forHistory) {
       this.pauseEvolutions = !!source.pauseEvolutions;
diff --git a/src/ui/summary-ui-handler.ts b/src/ui/summary-ui-handler.ts
index 3c804821773..96ecbefe935 100644
--- a/src/ui/summary-ui-handler.ts
+++ b/src/ui/summary-ui-handler.ts
@@ -824,7 +824,7 @@ export default class SummaryUiHandler extends UiHandler {
         metFragment: i18next.t(`pokemonSummary:metFragment.${this.pokemon?.metBiome === -1? "apparently": "normal"}`, {
           biome: `${getBBCodeFrag(getBiomeName(this.pokemon?.metBiome!), TextStyle.SUMMARY_RED)}${closeFragment}`, // TODO: is this bang correct?
           level: `${getBBCodeFrag(this.pokemon?.metLevel.toString()!, TextStyle.SUMMARY_RED)}${closeFragment}`, // TODO: is this bang correct?
-          wave: `${getBBCodeFrag((this.pokemon?.metWave ? this.pokemon.metWave.toString()! : i18next.t("pokemonSummary:unknownTrainer")), TextStyle.SUMMARY_RED)}${closeFragment}`, // TODO: is this bang correct?
+          wave: `${getBBCodeFrag((this.pokemon?.metWave ? this.pokemon.metWave.toString()! : i18next.t("pokemonSummary:unknownTrainer")), TextStyle.SUMMARY_RED)}${closeFragment}`,
         }),
         natureFragment: i18next.t(`pokemonSummary:natureFragment.${rawNature}`, { nature: nature })
       });