From 370a93a68195100470d72cc0ec7e84a559cadaef Mon Sep 17 00:00:00 2001
From: Christopher Schmidt <schmidtc086@outlook.com>
Date: Tue, 27 Aug 2024 13:43:59 -0400
Subject: [PATCH] Refactors to async/await pattern, adds back removed
 anims/sounds from last commit

---
 src/data/ability.ts |  7 +++++-
 src/data/move.ts    | 55 +++++++++++++++++++++++----------------------
 2 files changed, 34 insertions(+), 28 deletions(-)

diff --git a/src/data/ability.ts b/src/data/ability.ts
index 6e73673dec5..e081a2e806b 100644
--- a/src/data/ability.ts
+++ b/src/data/ability.ts
@@ -2328,6 +2328,7 @@ export class PostSummonTransformAbAttr extends PostSummonAbAttr {
     if (simulated || !targets.length) {
       return simulated;
     }
+    const promises: Promise<void>[] = [];
 
     let target: Pokemon;
     if (targets.length > 1) {
@@ -2351,9 +2352,13 @@ export class PostSummonTransformAbAttr extends PostSummonAbAttr {
       return new PokemonMove(m?.moveId!, 0, ppUp);
     });
     pokemon.summonData.types = target.getTypes();
-    await pokemon.updateInfo();
+    promises.push(pokemon.updateInfo());
 
     pokemon.scene.queueMessage(i18next.t("abilityTriggers:postSummonTransform", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon), targetName: target!.name, }));
+    pokemon.scene.playSound("battle_anims/PRSFX- Transform");
+    promises.push(pokemon.loadAssets(false).then(() => pokemon.playAnim()));
+
+    await Promise.all(promises);
 
     return true;
   }
diff --git a/src/data/move.ts b/src/data/move.ts
index 258b632609a..1ddb569ad34 100644
--- a/src/data/move.ts
+++ b/src/data/move.ts
@@ -5951,35 +5951,36 @@ export class SuppressAbilitiesIfActedAttr extends MoveEffectAttr {
 }
 
 export class TransformAttr extends MoveEffectAttr {
-  apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): Promise<boolean> {
-    return new Promise(resolve => {
-      if (!super.apply(user, target, move, args)) {
-        return resolve(false);
-      }
+  async apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): Promise<boolean> {
+    if (!super.apply(user, target, move, args)) {
+      return false;
+    }
 
-      user.summonData.speciesForm = target.getSpeciesForm();
-      user.summonData.fusionSpeciesForm = target.getFusionSpeciesForm();
-      user.summonData.ability = target.getAbility().id;
-      user.summonData.gender = target.getGender();
-      user.summonData.fusionGender = target.getFusionGender();
-      user.summonData.stats = [ user.stats[Stat.HP] ].concat(target.stats.slice(1));
-      user.summonData.battleStats = target.summonData.battleStats.slice(0);
-      user.summonData.moveset = target.getMoveset().map(m => {
-        const pp = m?.getMove().pp!;
-        // if PP value is less than 5, do nothing. If greater, we need to reduce the value to 5 using a negative ppUp value.
-        const ppUp = pp <= 5 ? 0 : (5 - pp) / Math.max(Math.floor(pp / 5), 1);
-        return new PokemonMove(m?.moveId!, 0, ppUp);
-      });
-      user.summonData.types = target.getTypes();
-      user.updateInfo();
-
-      user.scene.queueMessage(i18next.t("moveTriggers:transformedIntoTarget", {pokemonName: getPokemonNameWithAffix(user), targetName: getPokemonNameWithAffix(target)}));
-
-      user.loadAssets(false).then(() => {
-        user.playAnim();
-        resolve(true);
-      });
+    const promises: Promise<void>[] = [];
+    user.summonData.speciesForm = target.getSpeciesForm();
+    user.summonData.fusionSpeciesForm = target.getFusionSpeciesForm();
+    user.summonData.ability = target.getAbility().id;
+    user.summonData.gender = target.getGender();
+    user.summonData.fusionGender = target.getFusionGender();
+    user.summonData.stats = [ user.stats[Stat.HP] ].concat(target.stats.slice(1));
+    user.summonData.battleStats = target.summonData.battleStats.slice(0);
+    user.summonData.moveset = target.getMoveset().map(m => {
+      const pp = m?.getMove().pp!;
+      // if PP value is less than 5, do nothing. If greater, we need to reduce the value to 5 using a negative ppUp value.
+      const ppUp = pp <= 5 ? 0 : (5 - pp) / Math.max(Math.floor(pp / 5), 1);
+      return new PokemonMove(m?.moveId!, 0, ppUp);
     });
+    user.summonData.types = target.getTypes();
+    promises.push(user.updateInfo());
+
+    user.scene.queueMessage(i18next.t("moveTriggers:transformedIntoTarget", {pokemonName: getPokemonNameWithAffix(user), targetName: getPokemonNameWithAffix(target)}));
+
+    promises.push(user.loadAssets(false).then(() => {
+      user.playAnim();
+    }));
+
+    await Promise.all(promises);
+    return true;
   }
 }