diff options
author | Phlosioneer <mattmdrr2@gmail.com> | 2019-03-02 17:35:44 -0500 |
---|---|---|
committer | Phlosioneer <mattmdrr2@gmail.com> | 2019-03-02 17:35:44 -0500 |
commit | 9372731c3ef1ac5f7ed59a85b071bde7b87d2460 (patch) | |
tree | 3122377a548140355ae1a3350212cc52827bc9ac /include/main.h | |
parent | 3716da5430a976d05afecdf82f43f14fc2584949 (diff) | |
parent | 043071ae12aa6854119a44304a5facbd58fa3624 (diff) |
Merge branch 'master' into main-menu-state-machine
Diffstat (limited to 'include/main.h')
-rw-r--r-- | include/main.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/main.h b/include/main.h index 728064288..2c241bf97 100644 --- a/include/main.h +++ b/include/main.h @@ -61,8 +61,8 @@ void SetHBlankCallback(IntrCallback callback); void SetVCountCallback(IntrCallback callback); void SetSerialCallback(IntrCallback callback); void InitFlashTimer(void); -void sub_80008DC(u32 *var); -void sub_80008E8(void); +void SetTrainerHillVBlankCounter(u32 *var); +void ClearTrainerHillVBlankCounter(void); void DoSoftReset(void); void ClearPokemonCrySongs(void); void RestoreSerialTimer3IntrHandlers(void); |