From 909db9802ff00ad6a67aea66bbe932094b9e35bf Mon Sep 17 00:00:00 2001
From: NightKev <34855794+DayKev@users.noreply.github.com>
Date: Sun, 9 Feb 2025 14:00:11 -0800
Subject: [PATCH] Fix merge issues

---
 src/data/battler-tags.ts | 2 +-
 src/data/move.ts         | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/data/battler-tags.ts b/src/data/battler-tags.ts
index aac9d56676e..024497a6b1b 100644
--- a/src/data/battler-tags.ts
+++ b/src/data/battler-tags.ts
@@ -1024,7 +1024,7 @@ export class EncoreTag extends MoveRestrictionBattlerTag {
       if (movesetMove) {
         const lastMove = pokemon.getLastXMoves(1)[0];
         globalScene.tryReplacePhase((m => m instanceof MovePhase && m.pokemon === pokemon),
-          new MovePhase(pokemon.scene, pokemon, lastMove.targets ?? [], movesetMove));
+          new MovePhase(pokemon, lastMove.targets ?? [], movesetMove));
       }
     }
   }
diff --git a/src/data/move.ts b/src/data/move.ts
index 3c526debc22..a7fa2202bdf 100644
--- a/src/data/move.ts
+++ b/src/data/move.ts
@@ -9200,7 +9200,7 @@ export function initMoves() {
           return 1;
         }
         const weatherTypes = [ WeatherType.SUNNY, WeatherType.RAIN, WeatherType.SANDSTORM, WeatherType.HAIL, WeatherType.SNOW, WeatherType.FOG, WeatherType.HEAVY_RAIN, WeatherType.HARSH_SUN ];
-        if (weatherTypes.includes(weather.weatherType) && !weather.isEffectSuppressed(user.scene)) {
+        if (weatherTypes.includes(weather.weatherType) && !weather.isEffectSuppressed()) {
           return 2;
         }
         return 1;
@@ -11030,7 +11030,7 @@ export function initMoves() {
         if (!weather) {
           return 1;
         }
-        return [ WeatherType.SUNNY, WeatherType.HARSH_SUN ].includes(weather.weatherType) && !weather.isEffectSuppressed(user.scene) ? 1.5 : 1;
+        return [ WeatherType.SUNNY, WeatherType.HARSH_SUN ].includes(weather.weatherType) && !weather.isEffectSuppressed() ? 1.5 : 1;
       }),
     new AttackMove(Moves.RUINATION, Type.DARK, MoveCategory.SPECIAL, -1, 90, 10, -1, 0, 9)
       .attr(TargetHalfHpDamageAttr),