Merge branch 'master' into link

2018-02-03 09:42:19 -05:00
parent d4e8c20f84 eb6aed50e5
commit d52f52fa73
133 changed files with 14287 additions and 26107 deletions
--- a/include/main.h
+++ b/include/main.h
@@ -66,5 +66,7 @@ void InitFlashTimer(void);
 void DoSoftReset(void);
 void ClearPokemonCrySongs(void);
 void RestoreSerialTimer3IntrHandlers(void);
+void StartTimer1(void);
+void SeedRngAndSetTrainerId(void);

 #endif // GUARD_MAIN_H