Merge 37ff766d3e into 3b36ab17e4

src/field/pokemon.ts

@@ -4558,17 +4558,8 @@ export abstract class Pokemon extends Phaser.GameObjects.Container {
     }
 
     const key = this.species.getCryKey(this.formIndex);
-    const crySoundConfig = { rate: 0.85, detune: 0 };
-    if (this.isPlayer()) {
-      // If fainting is permanent, emphasize impact
-      const preventRevive = new BooleanHolder(false);
-      applyChallenges(ChallengeType.PREVENT_REVIVE, preventRevive);
-      if (preventRevive.value) {
-        crySoundConfig.detune = -100;
-        crySoundConfig.rate = 0.7;
-      }
-    }
-    const cry = globalScene.playSound(key, crySoundConfig) as AnySound;
+    let rate = 0.85;
+    const cry = globalScene.playSound(key, { rate: rate }) as AnySound;
     if (!cry || globalScene.fieldVolume === 0) {
       callback();
       return;
@@ -4587,7 +4578,7 @@ export abstract class Pokemon extends Phaser.GameObjects.Container {
       delay: fixedInt(delay),
       repeat: -1,
       callback: () => {
-        frameThreshold = sprite.anims.msPerFrame / crySoundConfig.rate;
+        frameThreshold = sprite.anims.msPerFrame / rate;
         frameProgress += delay;
         while (frameProgress > frameThreshold) {
           if (sprite.anims.duration) {
@@ -4597,7 +4588,8 @@ export abstract class Pokemon extends Phaser.GameObjects.Container {
           frameProgress -= frameThreshold;
         }
         if (cry && !cry.pendingRemove) {
-          cry.setRate(crySoundConfig.rate * 0.99);
+          rate *= 0.99;
+          cry.setRate(rate);
         } else {
           faintCryTimer?.destroy();
           faintCryTimer = null;