From d382e2747f60f5823db2e607e7ff13faf22d072f Mon Sep 17 00:00:00 2001
From: muscode13 <mmustafafareed@hotmail.com>
Date: Mon, 28 Oct 2024 00:04:32 -0600
Subject: [PATCH] merge

---
 src/data/battler-tags.ts |  4 ++--
 src/data/berry.ts        | 10 +++++-----
 src/field/pokemon.ts     |  6 +++---
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/data/battler-tags.ts b/src/data/battler-tags.ts
index 8193d8d5c9f..3051c2061a8 100644
--- a/src/data/battler-tags.ts
+++ b/src/data/battler-tags.ts
@@ -2951,8 +2951,8 @@ export function getBattlerTag(tagType: BattlerTagType, turnCount: number, source
     case BattlerTagType.GORILLA_TACTICS:
       return new GorillaTacticsTag();
     case BattlerTagType.UNBURDEN:
-    return new UnburdenTag();
-  case BattlerTagType.SUBSTITUTE:
+      return new UnburdenTag();
+    case BattlerTagType.SUBSTITUTE:
       return new SubstituteTag(sourceMove, sourceId);
     case BattlerTagType.AUTOTOMIZED:
       return new AutotomizedTag();
diff --git a/src/data/berry.ts b/src/data/berry.ts
index 18601ef9a01..f14b3bb45f5 100644
--- a/src/data/berry.ts
+++ b/src/data/berry.ts
@@ -76,7 +76,7 @@ export function getBerryEffectFunc(berryType: BerryType): BerryEffectFunc {
         pokemon.scene.unshiftPhase(new PokemonHealPhase(pokemon.scene, pokemon.getBattlerIndex(),
           hpHealed.value, i18next.t("battle:hpHealBerry", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon), berryName: getBerryName(berryType) }), true));
         applyPostItemLostAbAttrs(PostItemLostAbAttr, pokemon, pokemon.hasPassive(), false, []);
-    };
+      };
     case BerryType.LUM:
       return (pokemon: Pokemon) => {
         if (pokemon.battleData) {
@@ -88,7 +88,7 @@ export function getBerryEffectFunc(berryType: BerryType): BerryEffectFunc {
         pokemon.resetStatus(true, true);
         pokemon.updateInfo();
         applyPostItemLostAbAttrs(PostItemLostAbAttr, pokemon, pokemon.hasPassive(), false, []);
-    };
+      };
     case BerryType.LIECHI:
     case BerryType.GANLON:
     case BerryType.PETAYA:
@@ -104,7 +104,7 @@ export function getBerryEffectFunc(berryType: BerryType): BerryEffectFunc {
         applyAbAttrs(DoubleBerryEffectAbAttr, pokemon, null, false, statStages);
         pokemon.scene.unshiftPhase(new StatStageChangePhase(pokemon.scene, pokemon.getBattlerIndex(), true, [ stat ], statStages.value));
         applyPostItemLostAbAttrs(PostItemLostAbAttr, pokemon, pokemon.hasPassive(), false, []);
-    };
+      };
     case BerryType.LANSAT:
       return (pokemon: Pokemon) => {
         if (pokemon.battleData) {
@@ -112,7 +112,7 @@ export function getBerryEffectFunc(berryType: BerryType): BerryEffectFunc {
         }
         pokemon.addTag(BattlerTagType.CRIT_BOOST);
         applyPostItemLostAbAttrs(PostItemLostAbAttr, pokemon, pokemon.hasPassive(), false, []);
-    };
+      };
     case BerryType.STARF:
       return (pokemon: Pokemon) => {
         if (pokemon.battleData) {
@@ -123,7 +123,7 @@ export function getBerryEffectFunc(berryType: BerryType): BerryEffectFunc {
         applyAbAttrs(DoubleBerryEffectAbAttr, pokemon, null, false, stages);
         pokemon.scene.unshiftPhase(new StatStageChangePhase(pokemon.scene, pokemon.getBattlerIndex(), true, [ randStat ], stages.value));
         applyPostItemLostAbAttrs(PostItemLostAbAttr, pokemon, pokemon.hasPassive(), false, []);
-    };
+      };
     case BerryType.LEPPA:
       return (pokemon: Pokemon) => {
         if (pokemon.battleData) {
diff --git a/src/field/pokemon.ts b/src/field/pokemon.ts
index 6b29ca8e259..2d9313e972a 100644
--- a/src/field/pokemon.ts
+++ b/src/field/pokemon.ts
@@ -946,9 +946,9 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
           ret >>= 1;
         }
         if (this.getTag(BattlerTagType.UNBURDEN)) {
-        ret *= 2;
-      }
-      break;
+          ret *= 2;
+        }
+        break;
     }
 
     const highestStatBoost = this.findTag(t => t instanceof HighestStatBoostTag && (t as HighestStatBoostTag).stat === stat) as HighestStatBoostTag;