ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2025-01-18 09:24:19 +01:00
Code Issues Packages Projects Releases Wiki Activity

add B_ prefix to critical capture configs

Browse Source
This commit is contained in:
Evan 2020-11-01 21:50:34 -07:00
parent 59692e8e7f
commit e7372e7c5b
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/constants/battle_config.h
View File

@ -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.

4
src/battle_script_commands.c
View File

@ -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;