Merge branch 'master' into link

include/main.h

@@ -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;