From 3babd7f1306f8ff45a99a33ed72e39ea49f85aaf Mon Sep 17 00:00:00 2001
From: cawtds <38510667+cawtds@users.noreply.github.com>
Date: Sat, 6 Jul 2024 02:10:30 +0200
Subject: [PATCH] shiny roll calc as separate function

---
 include/wild_encounter.h | 1 +
 src/pokemon.c            | 2 +-
 src/wild_encounter.c     | 5 +++++
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/include/wild_encounter.h b/include/wild_encounter.h
index 733ea104e6..63289f081c 100644
--- a/include/wild_encounter.h
+++ b/include/wild_encounter.h
@@ -42,5 +42,6 @@ u16 GetLocalWaterMon(void);
 bool8 UpdateRepelCounter(void);
 bool8 TryDoDoubleWildBattle(void);
 bool8 StandardWildEncounter_Debug(void);
+u32 CalculateChainFishingShinyRolls(void);
 
 #endif // GUARD_WILD_ENCOUNTER_H
diff --git a/src/pokemon.c b/src/pokemon.c
index 81f7c3de5f..a9d0ec99da 100644
--- a/src/pokemon.c
+++ b/src/pokemon.c
@@ -1151,7 +1151,7 @@ void CreateBoxMon(struct BoxPokemon *boxMon, u16 species, u8 level, u8 fixedIV,
             if (LURE_STEP_COUNT != 0)
                 totalRerolls += 1;
             if (I_FISHING_CHAIN && gIsFishingEncounter)
-                totalRerolls += (2 * gChainFishingDexNavStreak);
+                totalRerolls += CalculateChainFishingShinyRolls();
 
             while (GET_SHINY_VALUE(value, personality) >= SHINY_ODDS && totalRerolls > 0)
             {
diff --git a/src/wild_encounter.c b/src/wild_encounter.c
index 34c221b26c..450ba2f40f 100644
--- a/src/wild_encounter.c
+++ b/src/wild_encounter.c
@@ -869,6 +869,11 @@ bool8 DoesCurrentMapHaveFishingMons(void)
         return FALSE;
 }
 
+u32 CalculateChainFishingShinyRolls(void)
+{
+    return (2 * gChainFishingDexNavStreak);
+}
+
 static void UpdateChainFishingSpeciesAndStreak(u32 species)
 {
     if (!I_FISHING_CHAIN)