Cloyir/pokeemmo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

use NATIONAL_DEX_COUNT for critical capture odds

Browse Source
This commit is contained in:
Evan 2020-11-08 14:07:43 -07:00
parent b3d1e8b5b8
commit 980f208b78
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/constants/battle_config.h
View File

@ -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. #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 // Critical Capture
#define B_CRITICAL_CAPTURE TRUE // If set to TRUE, Critical Capture will be enabled. #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_CATCHING_CHARM_BOOST 20 // % boost in Critical Capture odds if player has the Catching Charm.
// Other // Other
#define B_DOUBLE_WILD_CHANCE 0 // % chance of encountering two Pokémon in a Wild Encounter. #define B_DOUBLE_WILD_CHANCE 0 // % chance of encountering two Pokémon in a Wild Encounter.

10
src/battle_script_commands.c
View File

@ -12392,15 +12392,15 @@ static bool32 CriticalCapture(u32 odds)
#if B_CRITICAL_CAPTURE == TRUE #if B_CRITICAL_CAPTURE == TRUE
u32 numCaught = GetNationalPokedexCount(FLAG_GET_CAUGHT); u32 numCaught = GetNationalPokedexCount(FLAG_GET_CAUGHT);
if (numCaught <= (NUM_SPECIES * 30) / 650) if (numCaught <= (NATIONAL_DEX_COUNT * 30) / 650)
odds = 0; odds = 0;
else if (numCaught <= (NUM_SPECIES * 150) / 650) else if (numCaught <= (NATIONAL_DEX_COUNT * 150) / 650)
odds /= 2; odds /= 2;
else if (numCaught <= (NUM_SPECIES * 300) / 650) else if (numCaught <= (NATIONAL_DEX_COUNT * 300) / 650)
; // odds = (odds * 100) / 100; ; // odds = (odds * 100) / 100;
else if (numCaught <= (NUM_SPECIES * 450) / 650) else if (numCaught <= (NATIONAL_DEX_COUNT * 450) / 650)
odds = (odds * 150) / 100; odds = (odds * 150) / 100;
else if (numCaught <= (NUM_SPECIES * 600) / 650) else if (numCaught <= (NATIONAL_DEX_COUNT * 600) / 650)
odds *= 2; odds *= 2;
else else
odds = (odds * 250) / 100; odds = (odds * 250) / 100;