From 57bbeb1acf16abbae1eb4a3bfa4e682d815d43a7 Mon Sep 17 00:00:00 2001
From: Lylian <lylian270104@gmail.com>
Date: Thu, 10 Oct 2024 15:40:47 +0200
Subject: [PATCH] merge up to date

---
 src/data/move.ts           | 2 +-
 src/field/pokemon.ts       | 4 ++--
 src/ui/party-ui-handler.ts | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/data/move.ts b/src/data/move.ts
index e80aba9c502..7ab41768dc5 100644
--- a/src/data/move.ts
+++ b/src/data/move.ts
@@ -6245,7 +6245,7 @@ export class AbilityChangeAttr extends MoveEffectAttr {
     if (pokemon.breakIllusion()) {
       pokemon.scene.queueMessage(i18next.t("abilityTriggers:illusionBreak", { pokemonName: getPokemonNameWithAffix(pokemon) }));
     }
-    user.scene.queueMessage(i18next.t("moveTriggers:acquiredAbility", {pokemonName: getPokemonNameWithAffix(pokemon), abilityName: allAbilities[this.ability].name}));
+    user.scene.queueMessage(i18next.t("moveTriggers:acquiredAbility", { pokemonName: getPokemonNameWithAffix(pokemon), abilityName: allAbilities[this.ability].name }));
     return true;
   }
 
diff --git a/src/field/pokemon.ts b/src/field/pokemon.ts
index 84a5d78374e..e412e24b54b 100644
--- a/src/field/pokemon.ts
+++ b/src/field/pokemon.ts
@@ -438,7 +438,7 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
     } else {
       let availables: Species[] = [];
       if (this.isBoss()) {
-        availables = [Species.ENTEI, Species.RAIKOU, Species.SUICUNE];
+        availables = [ Species.ENTEI, Species.RAIKOU, Species.SUICUNE ];
       } else {
         const area: Species[] = [
           Species.HOUNDOUR, Species.SABLEYE, Species.PURRLOIN, Species.PAWNIARD, Species.NICKIT,
@@ -485,7 +485,7 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
     this.variant = this.battleData.illusion.variant!;
     this.fusionVariant = this.battleData.illusion.fusionVariant!;
     this.fusionShiny = this.battleData.illusion.fusionShiny!;
-    this.battleData.illusion = {active: false, available: false};
+    this.battleData.illusion = { active: false, available: false };
     if (this.isOnField()) {
       this.scene.playSound("PRSFX- Transform");
     }
diff --git a/src/ui/party-ui-handler.ts b/src/ui/party-ui-handler.ts
index 04bbfd4ef74..4051ac04b21 100644
--- a/src/ui/party-ui-handler.ts
+++ b/src/ui/party-ui-handler.ts
@@ -468,7 +468,7 @@ export default class PartyUiHandler extends MessageUiHandler {
           this.clearOptions();
           ui.playSelect();
           pokemon.pauseEvolutions = !pokemon.pauseEvolutions;
-          this.showText(i18next.t(pokemon.pauseEvolutions? "partyUiHandler:pausedEvolutions" : "partyUiHandler:unpausedEvolutions", { pokemonName: getPokemonNameWithAffix(pokemon, false) }), undefined, () => this.showText("", 0), null, true);
+          this.showText(i18next.t(pokemon.pauseEvolutions ? "partyUiHandler:pausedEvolutions" : "partyUiHandler:unpausedEvolutions", { pokemonName: getPokemonNameWithAffix(pokemon, false) }), undefined, () => this.showText("", 0), null, true);
         } else if (option === PartyOption.UNSPLICE) {
           this.clearOptions();
           ui.playSelect();