From 3b2fb87917e8f75c8fe51177808fdec32e7b6f7f Mon Sep 17 00:00:00 2001
From: AJ Fontaine <fontbane@gmail.com>
Date: Mon, 4 Nov 2024 13:35:36 -0500
Subject: [PATCH] Skip first shake check for critical captures

---
 src/phases/attempt-capture-phase.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/phases/attempt-capture-phase.ts b/src/phases/attempt-capture-phase.ts
index 96709e9e0b2..6e3c2c5a331 100644
--- a/src/phases/attempt-capture-phase.ts
+++ b/src/phases/attempt-capture-phase.ts
@@ -122,8 +122,8 @@ export class AttemptCapturePhase extends PokemonPhase {
                     shakeCounter.stop();
                     this.failCatch(shakeCount);
                   } else if (shakeCount++ < (isCritical ? 1 : 3)) {
-                    // Shake check
-                    if (pokeballMultiplier === -1 || pokemon.randSeedInt(65536) < shakeProbability) {
+                    // Shake check (skip the first for critical captures)
+                    if (pokeballMultiplier === -1 || isCritical && shakeCount === 1 || pokemon.randSeedInt(65536) < shakeProbability) {
                       this.scene.playSound("se/pb_move");
                     } else {
                       shakeCounter.stop();