From b07b36c6d29fbfdb8e75e343870ae8e87e9308bd Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Thu, 31 Oct 2019 14:31:21 -0400
Subject: wild_encounter through sub_8082C98

---
 include/wild_encounter.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'include')

diff --git a/include/wild_encounter.h b/include/wild_encounter.h
index 5bcab1249..6dbde30af 100644
--- a/include/wild_encounter.h
+++ b/include/wild_encounter.h
@@ -42,7 +42,7 @@ void FishingWildEncounter(u8 rod);
 u16 GetLocalWildMon(bool8 *isWaterMon);
 u16 GetLocalWaterMon(void);
 bool8 UpdateRepelCounter(void);
-void sub_8082740(u8);
+void sub_8082740(bool8 state);
 u8 GetUnownLetterByPersonalityLoByte(u32 personality);
 bool8 SweetScentWildEncounter(void);
 void sub_8083214(u16 randVal);
-- 
cgit v1.2.3


From 079310c70baecd11bd72ab493ee012f483ea2bf9 Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Thu, 31 Oct 2019 17:06:06 -0400
Subject: Finish decomp of wild_encounter

---
 include/event_scripts.h  | 2 ++
 include/fieldmap.h       | 2 ++
 include/wild_encounter.h | 7 ++++---
 3 files changed, 8 insertions(+), 3 deletions(-)

(limited to 'include')

diff --git a/include/event_scripts.h b/include/event_scripts.h
index c0f0300b1..e8fc40fa4 100644
--- a/include/event_scripts.h
+++ b/include/event_scripts.h
@@ -1186,4 +1186,6 @@ extern const u8 Text_1BCA95[];
 extern const u8 Text_1BCACB[];
 extern const u8 Text_1BCAF2[];
 
+extern const u8 EventScript_RepelWoreOff[];
+
 #endif //GUARD_EVENT_SCRIPTS_H
diff --git a/include/fieldmap.h b/include/fieldmap.h
index c3709c616..4af4342f7 100644
--- a/include/fieldmap.h
+++ b/include/fieldmap.h
@@ -28,5 +28,7 @@ struct MapConnection * GetMapConnectionAtPos(s16 x, s16 y);
 void sub_8059948(u8 a0, u8 a1);
 
 void save_serialize_map(void);
+u32 sub_8058F1C(u32 original, u8 bit);
+u32 sub_8058F48(s16 x, s16 y, u8 z);
 
 #endif //GUARD_FIELDMAP_H
diff --git a/include/wild_encounter.h b/include/wild_encounter.h
index 6dbde30af..d0420438a 100644
--- a/include/wild_encounter.h
+++ b/include/wild_encounter.h
@@ -34,7 +34,7 @@ struct WildPokemonHeader
 extern const struct WildPokemonHeader gWildMonHeaders[];
 
 void DisableWildEncounters(bool8 disabled);
-bool8 StandardWildEncounter(u16 currMetaTileBehavior, u16 previousMetaTileBehavior);
+bool8 StandardWildEncounter(u32 currMetaTileBehavior, u16 previousMetaTileBehavior);
 void ScrSpecial_RockSmashWildEncounter(void);
 bool8 SweetScentWildEncounter(void);
 bool8 DoesCurrentMapHaveFishingMons(void);
@@ -42,9 +42,10 @@ void FishingWildEncounter(u8 rod);
 u16 GetLocalWildMon(bool8 *isWaterMon);
 u16 GetLocalWaterMon(void);
 bool8 UpdateRepelCounter(void);
-void sub_8082740(bool8 state);
+void DisableWildEncounters(bool8 state);
 u8 GetUnownLetterByPersonalityLoByte(u32 personality);
 bool8 SweetScentWildEncounter(void);
-void sub_8083214(u16 randVal);
+void SeedWildEncounterRng(u16 randVal);
+void ResetEncounterRateModifiers(void);
 
 #endif // GUARD_WILD_ENCOUNTER_H
-- 
cgit v1.2.3