Fix merge issue

This commit is contained in:
NightKev 2025-06-18 18:30:22 -07:00
parent 560ebbaee2
commit 0ba3e52f77

View File

@ -361,18 +361,18 @@ const timedEvents: TimedEvent[] = [
availableLangs: ["en", "de", "it", "fr", "ja", "ko", "es-ES", "es-MX", "pt-BR", "zh-CN", "zh-TW"], availableLangs: ["en", "de", "it", "fr", "ja", "ko", "es-ES", "es-MX", "pt-BR", "zh-CN", "zh-TW"],
shinyMultiplier: 2, shinyMultiplier: 2,
eventEncounters: [ eventEncounters: [
{ species: Species.CHARMANDER }, { species: SpeciesId.CHARMANDER },
{ species: Species.SANDILE }, { species: SpeciesId.SANDILE },
{ species: Species.FERROSEED }, { species: SpeciesId.FERROSEED },
{ species: Species.FOONGUS }, { species: SpeciesId.FOONGUS },
{ species: Species.CUTIEFLY }, { species: SpeciesId.CUTIEFLY },
{ species: Species.DEWPIDER }, { species: SpeciesId.DEWPIDER },
{ species: Species.TYPE_NULL }, { species: SpeciesId.TYPE_NULL },
{ species: Species.MINIOR }, { species: SpeciesId.MINIOR },
{ species: Species.SOBBLE }, { species: SpeciesId.SOBBLE },
{ species: Species.INDEEDEE }, { species: SpeciesId.INDEEDEE },
{ species: Species.CAPSAKID }, { species: SpeciesId.CAPSAKID },
{ species: Species.ALOLA_MEOWTH }, { species: SpeciesId.ALOLA_MEOWTH },
], ],
classicWaveRewards: [ classicWaveRewards: [
{ wave: 8, type: "SHINY_CHARM" }, { wave: 8, type: "SHINY_CHARM" },