From b9a502a675cda6ea0403e02af3b5a61d4b507afb Mon Sep 17 00:00:00 2001
From: William Burleson <72857839+Admiral-Billy@users.noreply.github.com>
Date: Mon, 20 May 2024 18:27:26 -0400
Subject: [PATCH] Move variable over to title UI handler

---
 src/overrides.ts           |  7 -------
 src/ui/title-ui-handler.ts | 15 ++++++++++-----
 2 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/src/overrides.ts b/src/overrides.ts
index 57f006a76d3..b7307ab2f7f 100644
--- a/src/overrides.ts
+++ b/src/overrides.ts
@@ -12,13 +12,6 @@ import { Stat } from './data/pokemon-stat';
 import { PokeballCounts } from './battle-scene';
 import { PokeballType } from './data/pokeball';
 
-export const MENU_MESSAGE: { active: boolean, text: string, textColor: string, backgroundColor: string } = {
-    active: true,
-    text: "Shiny event active!",
-    textColor: "#FFD700",
-    backgroundColor: "#FAFAD2"
-}
-
 /**
  * Overrides for testing different in game situations
  * if an override name starts with "STARTING", it will apply when a new run begins
diff --git a/src/ui/title-ui-handler.ts b/src/ui/title-ui-handler.ts
index d96019c2c82..968d44667d8 100644
--- a/src/ui/title-ui-handler.ts
+++ b/src/ui/title-ui-handler.ts
@@ -6,7 +6,6 @@ import * as Utils from "../utils";
 import { TextStyle, addTextObject } from "./text";
 import { getBattleCountSplashMessage, getSplashMessages } from "../data/splash-messages";
 import i18next from "i18next";
-import * as Overrides from '../overrides';
 
 export default class TitleUiHandler extends OptionSelectUiHandler {
   private titleContainer: Phaser.GameObjects.Container;
@@ -14,6 +13,12 @@ export default class TitleUiHandler extends OptionSelectUiHandler {
   private playerCountLabel: Phaser.GameObjects.Text;
   private splashMessage: string;
   private splashMessageText: Phaser.GameObjects.Text;
+  private MENU_MESSAGE: { active: boolean, text: string, textColor: string, backgroundColor: string } = {
+    active: true,
+    text: "Shiny event active!",
+    textColor: "#FFD700",
+    backgroundColor: "#FAFAD2"
+  }
 
   private titleStatsTimer: number;
 
@@ -43,11 +48,11 @@ export default class TitleUiHandler extends OptionSelectUiHandler {
     this.playerCountLabel.setOrigin(1, 0);
     this.titleContainer.add(this.playerCountLabel);
 	
-    if (Overrides.MENU_MESSAGE.active) {
-        this.menuMessage = addTextObject(this.scene, (this.scene.game.canvas.width / 6) - 2, (this.scene.game.canvas.height / 6) - 100, Overrides.MENU_MESSAGE.text, TextStyle.MESSAGE, {
+    if (this.MENU_MESSAGE.active) {
+        this.menuMessage = addTextObject(this.scene, (this.scene.game.canvas.width / 6) - 2, (this.scene.game.canvas.height / 6) - 100, this.MENU_MESSAGE.text, TextStyle.MESSAGE, {
             fontSize: '54px',
-            backgroundColor: Overrides.MENU_MESSAGE.backgroundColor,
-            color: Overrides.MENU_MESSAGE.textColor !== "" ? Overrides.MENU_MESSAGE.textColor : "#FFFFFF"
+            backgroundColor: this.MENU_MESSAGE.backgroundColor,
+            color: this.MENU_MESSAGE.textColor !== "" ? this.MENU_MESSAGE.textColor : "#FFFFFF"
         });
         this.menuMessage.setOrigin(1, 0);
         this.titleContainer.add(this.menuMessage);