diff --git a/include/constants/battle_config.h b/include/constants/battle_config.h
index fa358de7a8..a484b9dbcd 100644
--- a/include/constants/battle_config.h
+++ b/include/constants/battle_config.h
@@ -125,8 +125,8 @@
 #define B_SHOW_SPLIT_ICON           TRUE  // If set to TRUE, it will show an icon in the summary showing the move's category split.
 
 // Critical Capture
-#define B_CRITICAL_CAPTURE            TRUE // If set to TRUE, Critical Capture will be enabled.
-#define B_CATCHING_CHARM_BOOST        20   // % boost in Critical Capture odds if player has the Catching Charm.
+#define B_CRITICAL_CAPTURE          TRUE  // If set to TRUE, Critical Capture will be enabled.
+#define B_CATCHING_CHARM_BOOST      20    // % boost in Critical Capture odds if player has the Catching Charm.
 
 // Other
 #define B_DOUBLE_WILD_CHANCE        0     // % chance of encountering two Pokémon in a Wild Encounter.
diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c
index 2e85e667f1..1b3cb2a7f5 100644
--- a/src/battle_script_commands.c
+++ b/src/battle_script_commands.c
@@ -12392,15 +12392,15 @@ static bool32 CriticalCapture(u32 odds)
     #if B_CRITICAL_CAPTURE == TRUE
         u32 numCaught = GetNationalPokedexCount(FLAG_GET_CAUGHT);
 
-        if (numCaught <= (NUM_SPECIES * 30) / 650)
+        if (numCaught <= (NATIONAL_DEX_COUNT * 30) / 650)
             odds = 0;
-        else if (numCaught <= (NUM_SPECIES * 150) / 650)
+        else if (numCaught <= (NATIONAL_DEX_COUNT * 150) / 650)
             odds /= 2;
-        else if (numCaught <= (NUM_SPECIES * 300) / 650)
+        else if (numCaught <= (NATIONAL_DEX_COUNT * 300) / 650)
             ;   // odds = (odds * 100) / 100;
-        else if (numCaught <= (NUM_SPECIES * 450) / 650)
+        else if (numCaught <= (NATIONAL_DEX_COUNT * 450) / 650)
             odds = (odds * 150) / 100;
-        else if (numCaught <= (NUM_SPECIES * 600) / 650)
+        else if (numCaught <= (NATIONAL_DEX_COUNT * 600) / 650)
             odds *= 2;
         else
             odds = (odds * 250) / 100;