From e765b3a455e1ead3e7bd51167422c69a479d6bf7 Mon Sep 17 00:00:00 2001
From: ImperialSympathizer <110984302+ben-lear@users.noreply.github.com>
Date: Fri, 19 Jul 2024 19:25:02 -0400
Subject: [PATCH 1/2] Update
 src/data/mystery-encounters/encounters/fiery-fallout-encounter.ts

Co-authored-by: flx-sta <50131232+flx-sta@users.noreply.github.com>
---
 .../mystery-encounters/encounters/fiery-fallout-encounter.ts  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/data/mystery-encounters/encounters/fiery-fallout-encounter.ts b/src/data/mystery-encounters/encounters/fiery-fallout-encounter.ts
index b99a7092902..8fad5e69a6c 100644
--- a/src/data/mystery-encounters/encounters/fiery-fallout-encounter.ts
+++ b/src/data/mystery-encounters/encounters/fiery-fallout-encounter.ts
@@ -202,8 +202,8 @@ export const FieryFalloutEncounter: IMysteryEncounter =
     .withOption(
       new MysteryEncounterOptionBuilder()
         .withOptionMode(EncounterOptionMode.DISABLED_OR_SPECIAL)
-        .withPrimaryPokemonRequirement(new TypeRequirement(Type.FIRE, true,1)) // Will set option3PrimaryName dialogue token automatically
-        .withSecondaryPokemonRequirement(new TypeRequirement(Type.FIRE, true,1)) // Will set option3SecondaryName dialogue token automatically
+        .withPrimaryPokemonRequirement(new TypeRequirement(Type.FIRE, true, 1)) // Will set option3PrimaryName dialogue token automatically
+        .withSecondaryPokemonRequirement(new TypeRequirement(Type.FIRE, true, 1)) // Will set option3SecondaryName dialogue token automatically
         .withDialogue({
           buttonLabel: `${namespace}:option:3:label`,
           buttonTooltip: `${namespace}:option:3:tooltip`,

From 88141759062b543fd74ce858e60d56329100405c Mon Sep 17 00:00:00 2001
From: ImperialSympathizer <110984302+ben-lear@users.noreply.github.com>
Date: Fri, 19 Jul 2024 19:56:55 -0400
Subject: [PATCH 2/2] Apply suggestions from code review

Co-authored-by: flx-sta <50131232+flx-sta@users.noreply.github.com>
---
 src/data/mystery-encounters/utils/encounter-phase-utils.ts | 6 +++---
 src/test/utils/overridesHelper.ts                          | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/data/mystery-encounters/utils/encounter-phase-utils.ts b/src/data/mystery-encounters/utils/encounter-phase-utils.ts
index 9c569775f38..b98a6597414 100644
--- a/src/data/mystery-encounters/utils/encounter-phase-utils.ts
+++ b/src/data/mystery-encounters/utils/encounter-phase-utils.ts
@@ -636,11 +636,11 @@ export function transitionMysteryEncounterIntroVisuals(scene: BattleScene, hide:
       // Transition
       scene.tweens.add({
         targets: introVisuals,
-        x: hide ? "+=16" : "-=16",
-        y: hide ? "-=16" : "+=16",
+        x: `${hide? "+" : "-"}=16`,
+        y: `${hide ? "-" : "+"}=16`,
         alpha: hide ? 0 : 1,
         ease: "Sine.easeInOut",
-        duration: duration,
+        duration,
         onComplete: () => {
           if (hide && destroy) {
             scene.field.remove(introVisuals);
diff --git a/src/test/utils/overridesHelper.ts b/src/test/utils/overridesHelper.ts
index 257ec523399..4116810be5d 100644
--- a/src/test/utils/overridesHelper.ts
+++ b/src/test/utils/overridesHelper.ts
@@ -45,7 +45,7 @@ export class OverridesHelper {
    * @param encounterType
    * @returns spy instance
    */
-  mysteryEncounter(encounterType: MysteryEncounterType): MockInstance {
+  mysteryEncounter(encounterType: MysteryEncounterType) {
     const spy = vi.spyOn(overrides, "MYSTERY_ENCOUNTER_OVERRIDE", "get").mockReturnValue(encounterType);
     this.log(`Mystery encounter override set to ${encounterType}!`);
     return spy;