From 4beee4a8dcb3e27574a4915b71eb1691ed5d5742 Mon Sep 17 00:00:00 2001
From: DylanDoesProgramming664
 <120761889+DylanDoesProgramming664@users.noreply.github.com>
Date: Sat, 18 Jan 2025 00:16:24 -0500
Subject: [PATCH 01/12] TRAINER_NAME_LEN location. Naming conventions for
 ov6_02240C9C.

---
 src/overlay006/ov6_02240C9C.c | 100 +++++++++++++++++-----------------
 src/overlay006/ov6_022489E4.c |   2 +-
 2 files changed, 51 insertions(+), 51 deletions(-)

diff --git a/src/overlay006/ov6_02240C9C.c b/src/overlay006/ov6_02240C9C.c
index 35db9c5ea9..5f67030c73 100644
--- a/src/overlay006/ov6_02240C9C.c
+++ b/src/overlay006/ov6_02240C9C.c
@@ -810,131 +810,131 @@ static BOOL ov6_022418DC(FieldSystem *fieldSystem, u32 encounterRate)
     }
 }
 
-static u8 ov6_02241904(void)
+static u8 GetGrassEncounterSlot(void)
 {
-    u8 v0 = inline_020564D0(100);
+    u8 roll = inline_020564D0(100); // a common rng function
 
-    if (v0 < 20) {
+    if (roll < 20) {
         return 0;
     }
 
-    if (v0 >= 20 && v0 < 40) {
+    if (roll >= 20 && roll < 40) {
         return 1;
     }
 
-    if (v0 >= 40 && v0 < 50) {
+    if (roll >= 40 && roll < 50) {
         return 2;
     }
 
-    if (v0 >= 50 && v0 < 60) {
+    if (roll >= 50 && roll < 60) {
         return 3;
     }
 
-    if (v0 >= 60 && v0 < 70) {
+    if (roll >= 60 && roll < 70) {
         return 4;
     }
 
-    if (v0 >= 70 && v0 < 80) {
+    if (roll >= 70 && roll < 80) {
         return 5;
     }
 
-    if (v0 >= 80 && v0 < 85) {
+    if (roll >= 80 && roll < 85) {
         return 6;
     }
 
-    if (v0 >= 85 && v0 < 90) {
+    if (roll >= 85 && roll < 90) {
         return 7;
     }
 
-    if (v0 >= 90 && v0 < 94) {
+    if (roll >= 90 && roll < 94) {
         return 8;
     }
 
-    if (v0 >= 94 && v0 < 98) {
+    if (roll >= 94 && roll < 98) {
         return 9;
     }
 
-    if (v0 == 98) {
+    if (roll == 98) {
         return 10;
     }
 
     return 11;
 }
 
-static u8 ov6_022419A0(void)
+static u8 GetWaterEncounterSlot(void)
 {
-    u8 v0 = inline_020564D0(100);
+    u8 roll = inline_020564D0(100); // a common rng function
 
-    if (v0 < 60) {
+    if (roll < 60) {
         return 0;
     }
 
-    if (v0 >= 60 && v0 < 90) {
+    if (roll >= 60 && roll < 90) {
         return 1;
     }
 
-    if (v0 >= 90 && v0 < 95) {
+    if (roll >= 90 && roll < 95) {
         return 2;
     }
 
-    if (v0 >= 95 && v0 < 99) {
+    if (roll >= 95 && roll < 99) {
         return 3;
     }
 
     return 4;
 }
 
-static u8 ov6_022419EC(const int fishingRodType)
+static u8 GetRodEncounterSlot(const int fishingRodType)
 {
-    u8 v1 = 0;
+    u8 encSlot = 0;
 
-    u8 v0 = inline_020564D0(100);
+    u8 roll = inline_020564D0(100); // a common rng function
 
     switch (fishingRodType) {
     case FISHING_TYPE_OLD_ROD:
-        if (v0 < 60) {
-            v1 = 0;
-        } else if (v0 < 90) {
-            v1 = 1;
-        } else if (v0 < 95) {
-            v1 = 2;
-        } else if (v0 < 99) {
-            v1 = 3;
+        if (roll < 60) {
+            encSlot = 0;
+        } else if (roll < 90) {
+            encSlot = 1;
+        } else if (roll < 95) {
+            encSlot = 2;
+        } else if (roll < 99) {
+            encSlot = 3;
         } else {
-            v1 = 4;
+            encSlot = 4;
         }
         break;
     case FISHING_TYPE_GOOD_ROD:
-        if (v0 < 40) {
-            v1 = 0;
-        } else if (v0 < 80) {
-            v1 = 1;
-        } else if (v0 < 95) {
-            v1 = 2;
-        } else if (v0 < 99) {
-            v1 = 3;
+        if (roll < 40) {
+            encSlot = 0;
+        } else if (roll < 80) {
+            encSlot = 1;
+        } else if (roll < 95) {
+            encSlot = 2;
+        } else if (roll < 99) {
+            encSlot = 3;
         } else {
-            v1 = 4;
+            encSlot = 4;
         }
         break;
     case FISHING_TYPE_SUPER_ROD:
-        if (v0 < 40) {
-            v1 = 0;
-        } else if (v0 < 80) {
-            v1 = 1;
-        } else if (v0 < 95) {
-            v1 = 2;
-        } else if (v0 < 99) {
-            v1 = 3;
+        if (roll < 40) {
+            encSlot = 0;
+        } else if (roll < 80) {
+            encSlot = 1;
+        } else if (roll < 95) {
+            encSlot = 2;
+        } else if (roll < 99) {
+            encSlot = 3;
         } else {
-            v1 = 4;
+            encSlot = 4;
         }
         break;
     default:
         GF_ASSERT(FALSE);
     }
 
-    return v1;
+    return encSlot;
 }
 
 static void ov6_02241A90(Pokemon *mon, u8 *encounterRate)
diff --git a/src/overlay006/ov6_022489E4.c b/src/overlay006/ov6_022489E4.c
index 1c4995ab95..fcf5c2503b 100644
--- a/src/overlay006/ov6_022489E4.c
+++ b/src/overlay006/ov6_022489E4.c
@@ -264,7 +264,7 @@ BOOL ov6_02248CE8(UnkStruct_02095C48 *param0, int param1, const Strbuf *param2)
     int v0, v1;
     u8 *v2;
     BOOL v3;
-    u16 v4[8];
+    u16 v4[8]; // Possibly TRAINER_NAME_LEN + 1
 
     v0 = 8 * sizeof(u16);
     v1 = 4;

From 80b50177c6f1c9d0573be81f555239d38f9c61e3 Mon Sep 17 00:00:00 2001
From: DylanDoesProgramming
 <120761889+DylanDoesProgramming664@users.noreply.github.com>
Date: Sat, 18 Jan 2025 00:25:22 -0500
Subject: [PATCH 02/12] Update ov6_02240C9C.c

---
 src/overlay006/ov6_02240C9C.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/overlay006/ov6_02240C9C.c b/src/overlay006/ov6_02240C9C.c
index 5f67030c73..03cd12e69b 100644
--- a/src/overlay006/ov6_02240C9C.c
+++ b/src/overlay006/ov6_02240C9C.c
@@ -810,7 +810,7 @@ static BOOL ov6_022418DC(FieldSystem *fieldSystem, u32 encounterRate)
     }
 }
 
-static u8 GetGrassEncounterSlot(void)
+static u8 GetGroundEncounterSlot(void)
 {
     u8 roll = inline_020564D0(100); // a common rng function
 

From c8a7a1fb073a4d1b35172bdd900d69569973700a Mon Sep 17 00:00:00 2001
From: DylanDoesProgramming664
 <120761889+DylanDoesProgramming664@users.noreply.github.com>
Date: Sat, 18 Jan 2025 00:58:42 -0500
Subject: [PATCH 03/12] updated [ov6_02240C9C.c](src/overlay006/ov6_02240C9C)

---
 src/overlay006/ov6_02240C9C.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/overlay006/ov6_02240C9C.c b/src/overlay006/ov6_02240C9C.c
index 5f67030c73..76ec6de297 100644
--- a/src/overlay006/ov6_02240C9C.c
+++ b/src/overlay006/ov6_02240C9C.c
@@ -1113,7 +1113,7 @@ static BOOL ov6_02241DC4(Pokemon *firstPartyMon, const int fishingRodType, const
             v0 = ov6_0224222C(firstPartyMon, encounterFieldParams, param3, MAX_GRASS_ENCOUNTERS, TYPE_ELECTRIC, ABILITY_STATIC, &encounterSlot);
 
             if (!v0) {
-                encounterSlot = ov6_02241904();
+                encounterSlot = GetGroundEncounterSlot();
             }
         }
 
@@ -1125,7 +1125,7 @@ static BOOL ov6_02241DC4(Pokemon *firstPartyMon, const int fishingRodType, const
         v0 = ov6_0224222C(firstPartyMon, encounterFieldParams, param3, MAX_WATER_ENCOUNTERS, TYPE_ELECTRIC, ABILITY_STATIC, &encounterSlot);
 
         if (!v0) {
-            encounterSlot = ov6_022419A0();
+            encounterSlot = GetWaterEncounterSlot();
         }
 
         level = ov6_02241B40(&param3[encounterSlot], encounterFieldParams);
@@ -1135,7 +1135,7 @@ static BOOL ov6_02241DC4(Pokemon *firstPartyMon, const int fishingRodType, const
         v0 = ov6_0224222C(firstPartyMon, encounterFieldParams, param3, MAX_WATER_ENCOUNTERS, TYPE_ELECTRIC, ABILITY_STATIC, &encounterSlot);
 
         if (!v0) {
-            encounterSlot = ov6_022419EC(fishingRodType);
+            encounterSlot = GetRodEncounterSlot(fishingRodType);
         }
 
         level = ov6_02241B40(&param3[encounterSlot], encounterFieldParams);
@@ -1180,7 +1180,7 @@ static BOOL ov6_02241F7C(FieldSystem *fieldSystem, Pokemon *param1, const WildEn
         v0 = ov6_0224222C(param1, encounterFieldParams, param3, MAX_GRASS_ENCOUNTERS, TYPE_ELECTRIC, ABILITY_STATIC, &encounterSlot);
 
         if (v0 == 0) {
-            encounterSlot = ov6_02241904();
+            encounterSlot = GetGroundEncounterSlot();
         }
     }
 

From 63d8937befc203fa13058e13979b29e175f1f331 Mon Sep 17 00:00:00 2001
From: DylanDoesProgramming664
 <120761889+DylanDoesProgramming664@users.noreply.github.com>
Date: Sat, 18 Jan 2025 01:31:10 -0500
Subject: [PATCH 04/12] cleaned up
 [ov6_02240C9C.c](src/overlay006/ov6_02240C9C.c)

---
 include/constants/wild_encounters.h |   1 +
 src/overlay006/ov6_02240C9C.c       | 159 ++++++++++------------------
 2 files changed, 58 insertions(+), 102 deletions(-)

diff --git a/include/constants/wild_encounters.h b/include/constants/wild_encounters.h
index 24d919c1d8..fc8b9c9bd4 100644
--- a/include/constants/wild_encounters.h
+++ b/include/constants/wild_encounters.h
@@ -7,6 +7,7 @@
 #define MAX_RADAR_ENCOUNTERS     4
 #define MAX_DUAL_SLOT_ENCOUNTERS 2
 #define MAX_WATER_ENCOUNTERS     5
+#define NUM_RODS                 3
 
 enum ENCOUNTER_TYPE {
     ENCOUNTER_TYPE_GRASS = 0,
diff --git a/src/overlay006/ov6_02240C9C.c b/src/overlay006/ov6_02240C9C.c
index 5fe2673971..d25847d930 100644
--- a/src/overlay006/ov6_02240C9C.c
+++ b/src/overlay006/ov6_02240C9C.c
@@ -176,6 +176,37 @@ static const UnkStruct_ov6_02248FF0 WildEncounters_UnownTables[] = {
     { 0x2, UnownOnlyExcQue }
 };
 
+static const u8 sGroundEncounterSlotRates[MAX_GRASS_ENCOUNTERS] = {
+    20,
+    20,
+    10,
+    10,
+    10,
+    10,
+    10,
+    10,
+    5,
+    5,
+    4,
+    4,
+    1,
+    1
+};
+
+static const u8 sWaterEncounterSlotRates[MAX_WATER_ENCOUNTERS] = {
+    60,
+    30,
+    5,
+    4,
+    1
+};
+
+static const u8 sRodEncounterSlotRates[NUM_RODS][MAX_WATER_ENCOUNTERS] = {
+    {60, 30, 5, 4, 1}, //Old Rod
+    {40, 40, 15, 4, 1}, // Good Rod
+    {40, 40, 15, 4, 1}, // Super Rod
+};
+
 void WildEncounters_ReplaceTimedEncounters(const WildEncounters *encounterData, int *timedSlot1, int *timedSlot2)
 {
     int timeOfDay = GetTimeOfDay();
@@ -812,129 +843,53 @@ static BOOL ov6_022418DC(FieldSystem *fieldSystem, u32 encounterRate)
 
 static u8 GetGroundEncounterSlot(void)
 {
-    u8 roll = inline_020564D0(100); // a common rng function
-
-    if (roll < 20) {
-        return 0;
-    }
-
-    if (roll >= 20 && roll < 40) {
-        return 1;
-    }
-
-    if (roll >= 40 && roll < 50) {
-        return 2;
-    }
-
-    if (roll >= 50 && roll < 60) {
-        return 3;
-    }
+    u8 encounterSlot;
 
-    if (roll >= 60 && roll < 70) {
-        return 4;
-    }
-
-    if (roll >= 70 && roll < 80) {
-        return 5;
-    }
-
-    if (roll >= 80 && roll < 85) {
-        return 6;
-    }
-
-    if (roll >= 85 && roll < 90) {
-        return 7;
-    }
-
-    if (roll >= 90 && roll < 94) {
-        return 8;
-    }
-
-    if (roll >= 94 && roll < 98) {
-        return 9;
-    }
+    u8 roll = inline_020564D0(100); // a common rng function
 
-    if (roll == 98) {
-        return 10;
+    u8 hit = 0;
+    for (encounterSlot = 0; encounterSlot < MAX_GRASS_ENCOUNTERS; encounterSlot++) {
+        hit += sGroundEncounterSlotRates[encounterSlot];
+        if (roll < hit - 1) {
+            return encounterSlot;
+        }
     }
 
-    return 11;
+    return encounterSlot;
 }
 
 static u8 GetWaterEncounterSlot(void)
 {
-    u8 roll = inline_020564D0(100); // a common rng function
-
-    if (roll < 60) {
-        return 0;
-    }
+    u8 encounterSlot;
 
-    if (roll >= 60 && roll < 90) {
-        return 1;
-    }
-
-    if (roll >= 90 && roll < 95) {
-        return 2;
-    }
+    u8 roll = inline_020564D0(100); // a common rng function
 
-    if (roll >= 95 && roll < 99) {
-        return 3;
+    u8 hit = 0;
+    for (encounterSlot = 0; encounterSlot < MAX_WATER_ENCOUNTERS; encounterSlot++) {
+        hit += sWaterEncounterSlotRates[encounterSlot];
+        if (roll < hit) {
+            return encounterSlot;
+        }
     }
 
-    return 4;
+    return encounterSlot;
 }
 
 static u8 GetRodEncounterSlot(const int fishingRodType)
 {
-    u8 encSlot = 0;
+    u8 encounterSlot;
 
     u8 roll = inline_020564D0(100); // a common rng function
 
-    switch (fishingRodType) {
-    case FISHING_TYPE_OLD_ROD:
-        if (roll < 60) {
-            encSlot = 0;
-        } else if (roll < 90) {
-            encSlot = 1;
-        } else if (roll < 95) {
-            encSlot = 2;
-        } else if (roll < 99) {
-            encSlot = 3;
-        } else {
-            encSlot = 4;
-        }
-        break;
-    case FISHING_TYPE_GOOD_ROD:
-        if (roll < 40) {
-            encSlot = 0;
-        } else if (roll < 80) {
-            encSlot = 1;
-        } else if (roll < 95) {
-            encSlot = 2;
-        } else if (roll < 99) {
-            encSlot = 3;
-        } else {
-            encSlot = 4;
-        }
-        break;
-    case FISHING_TYPE_SUPER_ROD:
-        if (roll < 40) {
-            encSlot = 0;
-        } else if (roll < 80) {
-            encSlot = 1;
-        } else if (roll < 95) {
-            encSlot = 2;
-        } else if (roll < 99) {
-            encSlot = 3;
-        } else {
-            encSlot = 4;
+    u8 hit = 0;
+    for (encounterSlot = 0; encounterSlot < MAX_WATER_ENCOUNTERS; encounterSlot++) {
+        hit += sRodEncounterSlotRates[fishingRodType][encounterSlot];
+        if (roll < hit) {
+            return encounterSlot;
         }
-        break;
-    default:
-        GF_ASSERT(FALSE);
-    }
+    } 
 
-    return encSlot;
+    return encounterSlot;
 }
 
 static void ov6_02241A90(Pokemon *mon, u8 *encounterRate)

From 2cab19b21ca18ef72da23581033a93eeedbc09a2 Mon Sep 17 00:00:00 2001
From: DylanDoesProgramming664
 <120761889+DylanDoesProgramming664@users.noreply.github.com>
Date: Sat, 18 Jan 2025 09:34:57 -0500
Subject: [PATCH 05/12] Reverted ov6_02240C9C.c; trimmed code to if-else
 statements.

---
 src/overlay006/ov6_02240C9C.c | 137 +++++++++++++++++++---------------
 1 file changed, 78 insertions(+), 59 deletions(-)

diff --git a/src/overlay006/ov6_02240C9C.c b/src/overlay006/ov6_02240C9C.c
index d25847d930..6601aaa0a5 100644
--- a/src/overlay006/ov6_02240C9C.c
+++ b/src/overlay006/ov6_02240C9C.c
@@ -176,37 +176,6 @@ static const UnkStruct_ov6_02248FF0 WildEncounters_UnownTables[] = {
     { 0x2, UnownOnlyExcQue }
 };
 
-static const u8 sGroundEncounterSlotRates[MAX_GRASS_ENCOUNTERS] = {
-    20,
-    20,
-    10,
-    10,
-    10,
-    10,
-    10,
-    10,
-    5,
-    5,
-    4,
-    4,
-    1,
-    1
-};
-
-static const u8 sWaterEncounterSlotRates[MAX_WATER_ENCOUNTERS] = {
-    60,
-    30,
-    5,
-    4,
-    1
-};
-
-static const u8 sRodEncounterSlotRates[NUM_RODS][MAX_WATER_ENCOUNTERS] = {
-    {60, 30, 5, 4, 1}, //Old Rod
-    {40, 40, 15, 4, 1}, // Good Rod
-    {40, 40, 15, 4, 1}, // Super Rod
-};
-
 void WildEncounters_ReplaceTimedEncounters(const WildEncounters *encounterData, int *timedSlot1, int *timedSlot2)
 {
     int timeOfDay = GetTimeOfDay();
@@ -843,53 +812,103 @@ static BOOL ov6_022418DC(FieldSystem *fieldSystem, u32 encounterRate)
 
 static u8 GetGroundEncounterSlot(void)
 {
-    u8 encounterSlot;
-
     u8 roll = inline_020564D0(100); // a common rng function
 
-    u8 hit = 0;
-    for (encounterSlot = 0; encounterSlot < MAX_GRASS_ENCOUNTERS; encounterSlot++) {
-        hit += sGroundEncounterSlotRates[encounterSlot];
-        if (roll < hit - 1) {
-            return encounterSlot;
-        }
+    if (roll < 20) {
+        return 0;
+    } else if (roll < 40) {
+        return 1;
+    } else if (roll < 50) {
+        return 2;
+    } else if (roll < 60) {
+        return 3;
+    } else if (roll < 70) {
+        return 4;
+    } else if (roll < 80) {
+        return 5;
+    } else if (roll < 85) {
+        return 6;
+    } else if (roll < 90) {
+        return 7;
+    } else if (roll < 94) {
+        return 8;
+    } else if (roll < 98) {
+        return 9;
+    } else if (roll == 98) {
+        return 10;
+    } else {
+        return 11;
     }
-
-    return encounterSlot;
 }
 
 static u8 GetWaterEncounterSlot(void)
 {
-    u8 encounterSlot;
-
     u8 roll = inline_020564D0(100); // a common rng function
 
-    u8 hit = 0;
-    for (encounterSlot = 0; encounterSlot < MAX_WATER_ENCOUNTERS; encounterSlot++) {
-        hit += sWaterEncounterSlotRates[encounterSlot];
-        if (roll < hit) {
-            return encounterSlot;
-        }
+    if (roll < 60) {
+        return 0;
+    } else if (roll < 90) {
+        return 1;
+    } else if (roll < 95) {
+        return 2;
+    } else if (roll < 99) {
+        return 3;
+    } else {
+        return 4;
     }
-
-    return encounterSlot;
 }
 
 static u8 GetRodEncounterSlot(const int fishingRodType)
 {
-    u8 encounterSlot;
+    u8 encSlot = 0;
 
     u8 roll = inline_020564D0(100); // a common rng function
 
-    u8 hit = 0;
-    for (encounterSlot = 0; encounterSlot < MAX_WATER_ENCOUNTERS; encounterSlot++) {
-        hit += sRodEncounterSlotRates[fishingRodType][encounterSlot];
-        if (roll < hit) {
-            return encounterSlot;
+    switch (fishingRodType) {
+    case FISHING_TYPE_OLD_ROD:
+        if (roll < 60) {
+            encSlot = 0;
+        } else if (roll < 90) {
+            encSlot = 1;
+        } else if (roll < 95) {
+            encSlot = 2;
+        } else if (roll < 99) {
+            encSlot = 3;
+        } else {
+            encSlot = 4;
         }
-    } 
+        break;
+    case FISHING_TYPE_GOOD_ROD:
+        if (roll < 40) {
+            encSlot = 0;
+        } else if (roll < 80) {
+            encSlot = 1;
+        } else if (roll < 95) {
+            encSlot = 2;
+        } else if (roll < 99) {
+            encSlot = 3;
+        } else {
+            encSlot = 4;
+        }
+        break;
+    case FISHING_TYPE_SUPER_ROD:
+        if (roll < 40) {
+            encSlot = 0;
+        } else if (roll < 80) {
+            encSlot = 1;
+        } else if (roll < 95) {
+            encSlot = 2;
+        } else if (roll < 99) {
+            encSlot = 3;
+        } else {
+            encSlot = 4;
+        }
+        break;
+    default:
+        GF_ASSERT(FALSE);
+    }
 
-    return encounterSlot;
+    return encSlot;
 }
 
 static void ov6_02241A90(Pokemon *mon, u8 *encounterRate)

From af542b4ef2b2cb558cb94f8eee0595ecf34af52a Mon Sep 17 00:00:00 2001
From: DylanDoesProgramming
 <120761889+DylanDoesProgramming664@users.noreply.github.com>
Date: Sat, 18 Jan 2025 09:51:43 -0500
Subject: [PATCH 06/12] Update wild_encounters.h

---
 include/constants/wild_encounters.h | 1 -
 1 file changed, 1 deletion(-)

diff --git a/include/constants/wild_encounters.h b/include/constants/wild_encounters.h
index fc8b9c9bd4..24d919c1d8 100644
--- a/include/constants/wild_encounters.h
+++ b/include/constants/wild_encounters.h
@@ -7,7 +7,6 @@
 #define MAX_RADAR_ENCOUNTERS     4
 #define MAX_DUAL_SLOT_ENCOUNTERS 2
 #define MAX_WATER_ENCOUNTERS     5
-#define NUM_RODS                 3
 
 enum ENCOUNTER_TYPE {
     ENCOUNTER_TYPE_GRASS = 0,

From c86cf1547103c43f66b1811b2d5edb88f166a0f7 Mon Sep 17 00:00:00 2001
From: DylanDoesProgramming
 <120761889+DylanDoesProgramming664@users.noreply.github.com>
Date: Sat, 18 Jan 2025 09:58:24 -0500
Subject: [PATCH 07/12] Update ov6_02240C9C.c

---
 src/overlay006/ov6_02240C9C.c | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/overlay006/ov6_02240C9C.c b/src/overlay006/ov6_02240C9C.c
index 6601aaa0a5..2f24461b1e 100644
--- a/src/overlay006/ov6_02240C9C.c
+++ b/src/overlay006/ov6_02240C9C.c
@@ -816,23 +816,23 @@ static u8 GetGroundEncounterSlot(void)
 
     if (roll < 20) {
         return 0;
-    } else if (roll < 40) {
+    } else if (roll >= 20 && roll < 40) {
         return 1;
-    } else if (roll < 50) {
+    } else if (roll >= 40 && roll < 50) {
         return 2;
-    } else if (roll < 60) {
+    } else if (roll >= 50 && roll < 60) {
         return 3;
-    } else if (roll < 70) {
+    } else if (roll >= 60 && roll < 70) {
         return 4;
-    } else if (roll < 80) {
+    } else if (roll >= 70 && roll < 80) {
         return 5;
-    } else if (roll < 85) {
+    } else if (roll >= 80 && roll < 85) {
         return 6;
-    } else if (roll < 90) {
+    } else if (roll >= 85 && roll < 90) {
         return 7;
-    } else if (roll < 94) {
+    } else if (roll >= 90 && roll < 94) {
         return 8;
-    } else if (roll < 98) {
+    } else if (roll >= 94 && roll < 98) {
         return 9;
     } else if (roll == 98) {
         return 10;
@@ -847,11 +847,11 @@ static u8 GetWaterEncounterSlot(void)
 
     if (roll < 60) {
         return 0;
-    } else if (roll < 90) {
+    } else if (roll >= 60 && roll < 90) {
         return 1;
-    } else if (roll < 95) {
+    } else if (roll >= 90 && roll < 95) {
         return 2;
-    } else if (roll < 99) {
+    } else if (roll >= 95 roll < 99) {
         return 3;
     } else {
         return 4;

From bc055ad97352a8cf8bbda28851c941451dbc14a5 Mon Sep 17 00:00:00 2001
From: DylanDoesProgramming664
 <120761889+DylanDoesProgramming664@users.noreply.github.com>
Date: Sat, 18 Jan 2025 10:00:14 -0500
Subject: [PATCH 08/12] updated ov6_02240C9C.c

---
 src/overlay006/ov6_02240C9C.c | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/src/overlay006/ov6_02240C9C.c b/src/overlay006/ov6_02240C9C.c
index 6601aaa0a5..6ddcb91584 100644
--- a/src/overlay006/ov6_02240C9C.c
+++ b/src/overlay006/ov6_02240C9C.c
@@ -816,29 +816,29 @@ static u8 GetGroundEncounterSlot(void)
 
     if (roll < 20) {
         return 0;
-    } else if (roll < 40) {
+    } else if (roll >= 20 && roll < 40) {
         return 1;
-    } else if (roll < 50) {
+    } else if (roll >= 40 && roll < 50) {
         return 2;
-    } else if (roll < 60) {
+    } else if (roll >= 50 && roll < 60) {
         return 3;
-    } else if (roll < 70) {
+    } else if (roll >= 60 && roll < 70) {
         return 4;
-    } else if (roll < 80) {
+    } else if (roll >= 70 && roll < 80) {
         return 5;
-    } else if (roll < 85) {
+    } else if (roll >= 80 && roll < 85) {
         return 6;
-    } else if (roll < 90) {
+    } else if (roll >= 85 && roll < 90) {
         return 7;
-    } else if (roll < 94) {
+    } else if (roll >= 90 && roll < 94) {
         return 8;
-    } else if (roll < 98) {
+    } else if (roll >= 94 && roll < 98) {
         return 9;
     } else if (roll == 98) {
         return 10;
-    } else {
-        return 11;
     }
+    
+    return 11;
 }
 
 static u8 GetWaterEncounterSlot(void)
@@ -847,15 +847,15 @@ static u8 GetWaterEncounterSlot(void)
 
     if (roll < 60) {
         return 0;
-    } else if (roll < 90) {
+    } else if (roll >= 60 && roll < 90) {
         return 1;
-    } else if (roll < 95) {
+    } else if (roll >= 90 && roll < 95) {
         return 2;
-    } else if (roll < 99) {
+    } else if (roll >= 95 && roll < 99) {
         return 3;
-    } else {
-        return 4;
     }
+
+    return 4;
 }
 
 static u8 GetRodEncounterSlot(const int fishingRodType)

From 6eb7f3cd5ed022081521b5d72920364dee9d9422 Mon Sep 17 00:00:00 2001
From: DylanDoesProgramming664
 <120761889+DylanDoesProgramming664@users.noreply.github.com>
Date: Sat, 18 Jan 2025 10:03:59 -0500
Subject: [PATCH 09/12] fixed self merge

---
 src/overlay006/ov6_02240C9C.c | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/overlay006/ov6_02240C9C.c b/src/overlay006/ov6_02240C9C.c
index a2ca247d61..6ddcb91584 100644
--- a/src/overlay006/ov6_02240C9C.c
+++ b/src/overlay006/ov6_02240C9C.c
@@ -851,11 +851,7 @@ static u8 GetWaterEncounterSlot(void)
         return 1;
     } else if (roll >= 90 && roll < 95) {
         return 2;
-<<<<<<< HEAD
     } else if (roll >= 95 && roll < 99) {
-=======
-    } else if (roll >= 95 roll < 99) {
->>>>>>> c86cf1547103c43f66b1811b2d5edb88f166a0f7
         return 3;
     }
 

From 9b58c61215c6029a2a72492010e5125a2ee10d96 Mon Sep 17 00:00:00 2001
From: DylanDoesProgramming664
 <120761889+DylanDoesProgramming664@users.noreply.github.com>
Date: Sat, 18 Jan 2025 10:11:50 -0500
Subject: [PATCH 10/12] removed some whitespace...

---
 src/overlay006/ov6_02240C9C.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/overlay006/ov6_02240C9C.c b/src/overlay006/ov6_02240C9C.c
index 6ddcb91584..b6a0bd2602 100644
--- a/src/overlay006/ov6_02240C9C.c
+++ b/src/overlay006/ov6_02240C9C.c
@@ -837,7 +837,7 @@ static u8 GetGroundEncounterSlot(void)
     } else if (roll == 98) {
         return 10;
     }
-    
+
     return 11;
 }
 

From a4ea62fefa674220ea52039cae82d14b5ece83e3 Mon Sep 17 00:00:00 2001
From: DylanDoesProgramming
 <120761889+DylanDoesProgramming664@users.noreply.github.com>
Date: Sat, 18 Jan 2025 19:00:17 -0500
Subject: [PATCH 11/12] Update ov6_02240C9C.c

Trimmed if-else statements again
---
 src/overlay006/ov6_02240C9C.c | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/overlay006/ov6_02240C9C.c b/src/overlay006/ov6_02240C9C.c
index b6a0bd2602..35ea132173 100644
--- a/src/overlay006/ov6_02240C9C.c
+++ b/src/overlay006/ov6_02240C9C.c
@@ -816,23 +816,23 @@ static u8 GetGroundEncounterSlot(void)
 
     if (roll < 20) {
         return 0;
-    } else if (roll >= 20 && roll < 40) {
+    } else if (roll < 40) {
         return 1;
-    } else if (roll >= 40 && roll < 50) {
+    } else if (roll < 50) {
         return 2;
-    } else if (roll >= 50 && roll < 60) {
+    } else if (roll < 60) {
         return 3;
-    } else if (roll >= 60 && roll < 70) {
+    } else if (roll < 70) {
         return 4;
-    } else if (roll >= 70 && roll < 80) {
+    } else if (roll < 80) {
         return 5;
-    } else if (roll >= 80 && roll < 85) {
+    } else if (roll < 85) {
         return 6;
-    } else if (roll >= 85 && roll < 90) {
+    } else if (roll < 90) {
         return 7;
-    } else if (roll >= 90 && roll < 94) {
+    } else if (roll < 94) {
         return 8;
-    } else if (roll >= 94 && roll < 98) {
+    } else if (roll < 98) {
         return 9;
     } else if (roll == 98) {
         return 10;
@@ -847,11 +847,11 @@ static u8 GetWaterEncounterSlot(void)
 
     if (roll < 60) {
         return 0;
-    } else if (roll >= 60 && roll < 90) {
+    } else if (roll < 90) {
         return 1;
-    } else if (roll >= 90 && roll < 95) {
+    } else if (roll < 95) {
         return 2;
-    } else if (roll >= 95 && roll < 99) {
+    } else if (roll < 99) {
         return 3;
     }
 

From ab15effd287864940d53f100b473deea26f38da3 Mon Sep 17 00:00:00 2001
From: Dolos Kurosu <drmayhem101@gmail.com>
Date: Sun, 19 Jan 2025 01:49:54 +0000
Subject: [PATCH 12/12] Revert "Update ov6_02240C9C.c"

This reverts commit db4e2bbfca8462ec6585331c28cb275817994d2b.
---
 src/overlay006/ov6_02240C9C.c | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/overlay006/ov6_02240C9C.c b/src/overlay006/ov6_02240C9C.c
index 35ea132173..b6a0bd2602 100644
--- a/src/overlay006/ov6_02240C9C.c
+++ b/src/overlay006/ov6_02240C9C.c
@@ -816,23 +816,23 @@ static u8 GetGroundEncounterSlot(void)
 
     if (roll < 20) {
         return 0;
-    } else if (roll < 40) {
+    } else if (roll >= 20 && roll < 40) {
         return 1;
-    } else if (roll < 50) {
+    } else if (roll >= 40 && roll < 50) {
         return 2;
-    } else if (roll < 60) {
+    } else if (roll >= 50 && roll < 60) {
         return 3;
-    } else if (roll < 70) {
+    } else if (roll >= 60 && roll < 70) {
         return 4;
-    } else if (roll < 80) {
+    } else if (roll >= 70 && roll < 80) {
         return 5;
-    } else if (roll < 85) {
+    } else if (roll >= 80 && roll < 85) {
         return 6;
-    } else if (roll < 90) {
+    } else if (roll >= 85 && roll < 90) {
         return 7;
-    } else if (roll < 94) {
+    } else if (roll >= 90 && roll < 94) {
         return 8;
-    } else if (roll < 98) {
+    } else if (roll >= 94 && roll < 98) {
         return 9;
     } else if (roll == 98) {
         return 10;
@@ -847,11 +847,11 @@ static u8 GetWaterEncounterSlot(void)
 
     if (roll < 60) {
         return 0;
-    } else if (roll < 90) {
+    } else if (roll >= 60 && roll < 90) {
         return 1;
-    } else if (roll < 95) {
+    } else if (roll >= 90 && roll < 95) {
         return 2;
-    } else if (roll < 99) {
+    } else if (roll >= 95 && roll < 99) {
         return 3;
     }