From ccb05dc509163b8f7b29fbf5041704a0b7089803 Mon Sep 17 00:00:00 2001
From: chardub <pkmninfinitefusion@gmail.com>
Date: Thu, 6 Mar 2025 11:55:30 -0500
Subject: [PATCH] Fixes critical capture (based on
 https://github.com/kurayamiblackheart/kurayshinyrevamp/commit/70bc2480f46ec5ea81294c3c772d8792f7fcfd1f)

---
 .../003_Battle/001_PokeBattle_BattleCommon.rb |  21 ++----------------
 Data/System.rxdata                            | Bin 31697 -> 31698 bytes
 2 files changed, 2 insertions(+), 19 deletions(-)

diff --git a/Data/Scripts/011_Battle/003_Battle/001_PokeBattle_BattleCommon.rb b/Data/Scripts/011_Battle/003_Battle/001_PokeBattle_BattleCommon.rb
index a31c8886d..1fc2b4994 100644
--- a/Data/Scripts/011_Battle/003_Battle/001_PokeBattle_BattleCommon.rb
+++ b/Data/Scripts/011_Battle/003_Battle/001_PokeBattle_BattleCommon.rb
@@ -247,27 +247,10 @@ module PokeBattle_BattleCommon
     echoln isOnLastBall
     # Critical capture check
     if isOnLastBall
-      c = 0
-      numOwned = $Trainer.pokedex.owned_count
-      if numOwned > 600;
-        c = x * 5 / 12
-      elsif numOwned > 450;
-        c = x * 4 / 12
-      elsif numOwned > 300;
-        c = x * 3 / 12
-      else
-        c = x * 2 / 12
-      end
-      # elsif numOwned > 150;
-      #   c = x * 2 / 12
-      # elsif numOwned > 30;
-      #   c = x / 12
-      # end
-      # Calculate the number of shakes
+      c = x * 6 / 12
       if c > 0 && pbRandom(256) < c
         @criticalCapture = true
-        return 4 if pbRandom(65536) < y
-        return 0
+        return 4
       end
     end
     # Calculate the number of shakes
diff --git a/Data/System.rxdata b/Data/System.rxdata
index 6787688385001e53c25a4106d5623778ead8a463..2ae67d064e008977504d7d9d7f5b497937e61d6c 100644
GIT binary patch
delta 20
ccmccko$=Cl#tn~USXr(vD`wvOT;^3A0C1ZMI{*Lx

delta 19
bcmccgo$=y##tn~USeP#a$8UZi^C}JiW?l))