Rooba
/
pokeemerald
mirror of https://github.com/pret/pokeemerald.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1038 from ProjectRevoTPP/master 

restore SeedRngWithRtc comment and declaration of GF oversight.
This commit is contained in:
PikalaxALT 2020-05-19 13:31:41 -04:00 committed by GitHub
parent 3c4b9dfacc 468793e34a
commit 7c248947f4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/main.c
View File

@ -75,7 +75,7 @@ static EWRAM_DATA u16 gTrainerId = 0;
static void UpdateLinkAndCallCallbacks(void); static void UpdateLinkAndCallCallbacks(void);
static void InitMainCallbacks(void); static void InitMainCallbacks(void);
static void CallCallbacks(void); static void CallCallbacks(void);
static void SeedRngWithRtc(void); //static void SeedRngWithRtc(void);
static void ReadKeys(void); static void ReadKeys(void);
void InitIntrHandlers(void); void InitIntrHandlers(void);
static void WaitForVBlank(void); static void WaitForVBlank(void);
@ -118,6 +118,7 @@ void AgbMain()
CheckForFlashMemory(); CheckForFlashMemory();
InitMainCallbacks(); InitMainCallbacks();
InitMapMusic(); InitMapMusic();
//SeedRngWithRtc(); see comment at SeedRngWithRtc declaration below
ClearDma3Requests(); ClearDma3Requests();
ResetBgs(); ResetBgs();
SetDefaultFontsPointer(); SetDefaultFontsPointer();
@ -228,6 +229,14 @@ void EnableVCountIntrAtLine150(void)
EnableInterrupts(INTR_FLAG_VCOUNT); EnableInterrupts(INTR_FLAG_VCOUNT);
} }
// oops! FRLG commented this out to remove RTC, however Emerald didnt undo this!
//static void SeedRngWithRtc(void)
//{
// u32 seed = RtcGetMinuteCount();
// seed = (seed >> 16) ^ (seed & 0xFFFF);
// SeedRng(seed);
//}
void InitKeys(void) void InitKeys(void)
{ {
gKeyRepeatContinueDelay = 5; gKeyRepeatContinueDelay = 5;