Merge errors cleanup

pret · Jan 19, 2025 · cc8fcca · cc8fcca
1 parent 935c662
commit cc8fcca
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/overlay006/great_marsh_binoculars.c b/src/overlay006/great_marsh_binoculars.c
@@ -31,7 +31,7 @@ int GreatMarshBinoculars_GetMonSpecies(FieldSystem *fieldSystem)
         encounterTable[i] = encounterData->grassEncounters.encounters[i].species;
     }
 
-    BOOL natDexObtained = Pokedex_IsNationalDexObtained(SaveData_PokedexData(FieldSystem_GetSaveData(fieldSystem)));
+    BOOL natDexObtained = Pokedex_IsNationalDexObtained(SaveData_GetPokedex(FieldSystem_GetSaveData(fieldSystem)));
 
     ReplaceGreatMarshDailyEncounters(SpecialEncounter_GetDailyMon(SaveData_GetSpecialEncounters(fieldSystem->saveData), DAILY_MARSH), natDexObtained, fieldSystem->location->mapId, &encounterTable[6], &encounterTable[7]);
     WildEncounters_ReplaceTimedEncounters(encounterData, &encounterTable[2], &encounterTable[3]);

diff --git a/src/overlay006/ov6_02240C9C.c b/src/overlay006/ov6_02240C9C.c
@@ -812,7 +812,7 @@ static BOOL ov6_022418DC(FieldSystem *fieldSystem, u32 encounterRate)
 
 static u8 GetGroundEncounterSlot(void)
 {
-    u8 v0 = LCRNG_RandMod(100);
+    u8 roll = LCRNG_RandMod(100);
 
     if (roll < 20) {
         return 0;
@@ -843,7 +843,7 @@ static u8 GetGroundEncounterSlot(void)
 
 static u8 GetWaterEncounterSlot(void)
 {
-    u8 v0 = LCRNG_RandMod(100);
+    u8 roll = LCRNG_RandMod(100);
 
     if (roll < 60) {
         return 0;
@@ -862,7 +862,7 @@ static u8 GetRodEncounterSlot(const int fishingRodType)
 {
     u8 encSlot = 0;
 
-    u8 v0 = LCRNG_RandMod(100);
+    u8 roll = LCRNG_RandMod(100);
 
     switch (fishingRodType) {
     case FISHING_TYPE_OLD_ROD: