From e7372e7c5b601205826c7e71975cd77b8995bd28 Mon Sep 17 00:00:00 2001
From: Evan <eroelke@gmail.com>
Date: Sun, 1 Nov 2020 21:50:34 -0700
Subject: [PATCH] add B_ prefix to critical capture configs

---
 include/constants/battle_config.h | 4 ++--
 src/battle_script_commands.c      | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/include/constants/battle_config.h b/include/constants/battle_config.h
index c1b4c71c8..0d6e87872 100644
--- a/include/constants/battle_config.h
+++ b/include/constants/battle_config.h
@@ -131,8 +131,8 @@
 #define B_POWDER_GRASS              GEN_6 // In Gen6+, Grass type Pokémon are immune to powder and spore moves.
 
 // Critical Capture
-#define CRITICAL_CAPTURE            TRUE // if set to TRUE, critical capture will be enabled
-#define 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
 
 // Animation Settings
 #define B_NEW_SWORD_PARTICLE            TRUE    // If set to TRUE, it updates Swords Dance's particle.
diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c
index ed8086d7d..151d95135 100644
--- a/src/battle_script_commands.c
+++ b/src/battle_script_commands.c
@@ -12389,7 +12389,7 @@ static void Cmd_metalburstdamagecalculator(void)
 
 static bool32 CriticalCapture(u32 odds)
 {
-    #if CRITICAL_CAPTURE == TRUE
+    #if B_CRITICAL_CAPTURE == TRUE
         u16 numCaught = GetNationalPokedexCount(FLAG_GET_CAUGHT);
 
         if (numCaught <= 30)
@@ -12407,7 +12407,7 @@ static bool32 CriticalCapture(u32 odds)
 
         #ifdef ITEM_CATCHING_CHARM
         if (CheckBagHasItem(ITEM_CATCHING_CHARM, 1))
-            odds = (odds * (100 + CATCHING_CHARM_BOOST)) / 100;
+            odds = (odds * (100 + B_CATCHING_CHARM_BOOST)) / 100;
         #endif
 
         odds /= 6;