From 190003c3495aafe3333f4d27ffa5cbec3637bf2d Mon Sep 17 00:00:00 2001
From: James Diefenbach <z5421232@ad.unsw.edu.au>
Date: Sat, 24 Aug 2024 22:12:29 +1000
Subject: [PATCH] added i18 line, reset overrides

---
 src/locales/en/battle.json             | 1 +
 src/overrides.ts                       | 6 ++----
 src/phases/egg-lapse-phase.ts          | 2 +-
 src/ui/pokemon-hatch-info-container.ts | 2 --
 4 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/src/locales/en/battle.json b/src/locales/en/battle.json
index e5ca8f77bb1..2080a1cc7e2 100644
--- a/src/locales/en/battle.json
+++ b/src/locales/en/battle.json
@@ -61,6 +61,7 @@
   "skipItemQuestion": "Are you sure you want to skip taking an item?",
   "itemStackFull": "The stack for {{fullItemName}} is full.\nYou will receive {{itemName}} instead.",
   "eggHatching": "Oh?",
+  "eggSkipPrompt": "Skip to egg summary?",
   "ivScannerUseQuestion": "Use IV Scanner on {{pokemonName}}?",
   "wildPokemonWithAffix": "Wild {{pokemonName}}",
   "foePokemonWithAffix": "Foe {{pokemonName}}",
diff --git a/src/overrides.ts b/src/overrides.ts
index 16af33d34dd..8775821f4f8 100644
--- a/src/overrides.ts
+++ b/src/overrides.ts
@@ -29,10 +29,8 @@ import { type ModifierOverride } from "./modifier/modifier-type";
  * }
  * ```
  */
-const overrides = {
-  EGG_IMMEDIATE_HATCH_OVERRIDE: true,
-  EGG_FREE_GACHA_PULLS_OVERRIDE: true
-} satisfies Partial<InstanceType<typeof DefaultOverrides>>;
+
+const overrides = {} satisfies Partial<InstanceType<typeof DefaultOverrides>>;
 
 /**
  * If you need to add Overrides values for local testing do that inside {@linkcode overrides}
diff --git a/src/phases/egg-lapse-phase.ts b/src/phases/egg-lapse-phase.ts
index 57ce05f0b52..3210ff1fc26 100644
--- a/src/phases/egg-lapse-phase.ts
+++ b/src/phases/egg-lapse-phase.ts
@@ -30,7 +30,7 @@ export class EggLapsePhase extends Phase {
       if (eggsToHatchCount >= 5) {
         this.scene.ui.showText(i18next.t("battle:eggHatching"), 0, () => {
           // show prompt for skip
-          this.scene.ui.showText("Skip to egg summary?", 0);
+          this.scene.ui.showText(i18next.t("battle:eggSkipPrompt"), 0);
           this.scene.ui.setModeWithoutClear(Mode.CONFIRM, () => {
             for (const egg of eggsToHatch) {
               this.hatchEggSilently(egg);
diff --git a/src/ui/pokemon-hatch-info-container.ts b/src/ui/pokemon-hatch-info-container.ts
index 14025513868..e3b0dff5f3a 100644
--- a/src/ui/pokemon-hatch-info-container.ts
+++ b/src/ui/pokemon-hatch-info-container.ts
@@ -86,11 +86,9 @@ export default class PokemonHatchInfoContainer extends PokemonInfoContainer {
 
       const eggMoveBg = this.scene.add.nineslice(70, 0, "type_bgs", "unknown", 92, 14, 2, 2, 2, 2);
       eggMoveBg.setOrigin(1, 0);
-      eggMoveBg.setZ(3);
 
       const eggMoveLabel = addTextObject(this.scene, 70 -eggMoveBg.width / 2, 0, "???", TextStyle.PARTY);
       eggMoveLabel.setOrigin(0.5, 0);
-      eggMoveLabel.setZ(3);
 
       this.pokemonEggMoveBgs.push(eggMoveBg);
       this.pokemonEggMoveLabels.push(eggMoveLabel);