From 0ba3e52f77e83eb3a1e3f31759b7c09f647b0ae9 Mon Sep 17 00:00:00 2001
From: NightKev <34855794+DayKev@users.noreply.github.com>
Date: Wed, 18 Jun 2025 18:30:22 -0700
Subject: [PATCH] Fix merge issue

---
 src/timed-event-manager.ts | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/timed-event-manager.ts b/src/timed-event-manager.ts
index 9373b50fabc..f73c6dab1b2 100644
--- a/src/timed-event-manager.ts
+++ b/src/timed-event-manager.ts
@@ -361,18 +361,18 @@ const timedEvents: TimedEvent[] = [
     availableLangs: ["en", "de", "it", "fr", "ja", "ko", "es-ES", "es-MX", "pt-BR", "zh-CN", "zh-TW"],
     shinyMultiplier: 2,
     eventEncounters: [
-      { species: Species.CHARMANDER },
-      { species: Species.SANDILE },
-      { species: Species.FERROSEED },
-      { species: Species.FOONGUS },
-      { species: Species.CUTIEFLY },
-      { species: Species.DEWPIDER },
-      { species: Species.TYPE_NULL },
-      { species: Species.MINIOR },
-      { species: Species.SOBBLE },
-      { species: Species.INDEEDEE },
-      { species: Species.CAPSAKID },
-      { species: Species.ALOLA_MEOWTH },
+      { species: SpeciesId.CHARMANDER },
+      { species: SpeciesId.SANDILE },
+      { species: SpeciesId.FERROSEED },
+      { species: SpeciesId.FOONGUS },
+      { species: SpeciesId.CUTIEFLY },
+      { species: SpeciesId.DEWPIDER },
+      { species: SpeciesId.TYPE_NULL },
+      { species: SpeciesId.MINIOR },
+      { species: SpeciesId.SOBBLE },
+      { species: SpeciesId.INDEEDEE },
+      { species: SpeciesId.CAPSAKID },
+      { species: SpeciesId.ALOLA_MEOWTH },
     ],
     classicWaveRewards: [
       { wave: 8, type: "SHINY_CHARM" },