Finish decomp of wild_encounter

This commit is contained in:
PikalaxALT
2019-10-31 17:06:06 -04:00
committed by PikalaxALT
parent b07b36c6d2
commit 079310c70b
13 changed files with 505 additions and 1065 deletions
+2
View File
@@ -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
+2
View File
@@ -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
+4 -3
View File
@@ -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