atiran/sovereignx
3
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix fishing encounter rolls

Browse source
This commit is contained in:
cawtds 2024-07-03 16:51:16 +02:00
parent d1ca1f667f
commit 26395fe600
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/pokemon.c
View file

@ -1150,7 +1150,7 @@ void CreateBoxMon(struct BoxPokemon *boxMon, u16 species, u8 level, u8 fixedIV,
totalRerolls += I_SHINY_CHARM_ADDITIONAL_ROLLS; totalRerolls += I_SHINY_CHARM_ADDITIONAL_ROLLS;
if (LURE_STEP_COUNT != 0) if (LURE_STEP_COUNT != 0)
totalRerolls += 1; totalRerolls += 1;
if (IsCurrentEncounterFishing()) if (I_FISHING_CHAIN && IsCurrentEncounterFishing())
totalRerolls += CalculateChainFishingShinyRolls(); totalRerolls += CalculateChainFishingShinyRolls();
while (GET_SHINY_VALUE(value, personality) >= SHINY_ODDS && totalRerolls > 0) while (GET_SHINY_VALUE(value, personality) >= SHINY_ODDS && totalRerolls > 0)

2
src/wild_encounter.c
View file

@ -919,7 +919,7 @@ static void SetEncounterFishing(void)
u32 CalculateChainFishingShinyRolls(void) u32 CalculateChainFishingShinyRolls(void)
{ {
return (1 + (2 * GetCurrentChainFishingDexNavStreak())); return 2 * GetCurrentChainFishingDexNavStreak();
} }
static void SetLastFishingSpecies(u32 species) static void SetLastFishingSpecies(u32 species)