diff options
| author | PikalaxALT <PikalaxALT@users.noreply.github.com> | 2019-10-31 21:05:45 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-31 21:05:45 -0400 |
| commit | 193c12d401ac5b1016d77e60c36e8d9960af9d82 (patch) | |
| tree | 83da7d0c549974e392aa3eb897fb038e889fbd20 /include | |
| parent | c6cd74fed25cbb6e2fa0296960fbcda795311b06 (diff) | |
| parent | f0a7ee8d16f40707fbec80d7224f410ae455c071 (diff) | |
Merge pull request #137 from PikalaxALT/split_835b488
Split 835b488
Diffstat (limited to 'include')
| -rw-r--r-- | include/event_scripts.h | 2 | ||||
| -rw-r--r-- | include/fieldmap.h | 2 | ||||
| -rw-r--r-- | include/wild_encounter.h | 7 |
3 files changed, 8 insertions, 3 deletions
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 5bcab1249..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(u8); +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 |