Merge branch 'fixes' of https://github.com/DylanDoesProgramming664/po…

…keplatinum into fixes
pret · Jan 18, 2025 · ee69252 · ee69252
2 parents bc055ad + c86cf15
commit ee69252
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git 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,

diff --git a/src/overlay006/ov6_02240C9C.c b/src/overlay006/ov6_02240C9C.c
@@ -851,7 +851,11 @@ 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;
     }