Merge branch 'master' into link

2019-10-06 18:06:24 -04:00
parent 5620b0ed1a fb9b695f9a
commit 736b89ae3d
46 changed files with 297 additions and 430 deletions
@@ -67,6 +67,7 @@ void SetVBlankCounter1Ptr(u32 *ptr);
 void DisableVBlankCounter1(void);
 void StartTimer1(void);
 void SeedRngAndSetTrainerId(void);
+u16 GetGeneratedTrainerIdLower(void);

 extern const char RomHeaderGameCode[4];
 extern const char RomHeaderSoftwareVersion;