diff options
author | Marcus Huderle <huderlem@gmail.com> | 2019-04-02 18:29:51 -0500 |
---|---|---|
committer | Marcus Huderle <huderlem@gmail.com> | 2019-04-02 18:29:51 -0500 |
commit | 181baf9fe561e893023f71a5793a8b1ac6d644d6 (patch) | |
tree | 8ac4906fc6f70fb000fc3fbcd73a325dc6114d20 /include/main.h | |
parent | 1241700b204b9f450221299c6e837c0f522f60b2 (diff) | |
parent | d8c9f1b30fb92289e7aa4d44dfcf1b2120bea8d6 (diff) |
Merge remote-tracking branch 'upstream/master' into misc_docs
# Conflicts:
# src/field_weather_effect.c
Diffstat (limited to 'include/main.h')
-rw-r--r-- | include/main.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/main.h b/include/main.h index 6c67fbe9f..16ac31df2 100644 --- a/include/main.h +++ b/include/main.h @@ -71,6 +71,6 @@ void RestoreSerialTimer3IntrHandlers(void); void StartTimer1(void); void SeedRngAndSetTrainerId(void); u16 GetGeneratedTrainerIdLower(void); - +void sub_819789C(void); #endif // GUARD_MAIN_H |