diff options
| author | PikalaxALT <PikalaxALT@users.noreply.github.com> | 2020-05-19 13:31:41 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-19 13:31:41 -0400 |
| commit | 7c248947f4c8a6b3cf366cb54e3f517ade71490b (patch) | |
| tree | 82c2ddf8fbd1e2d840ad413968e930238dde3ba3 /src/main.c | |
| parent | 3c4b9dfaccae3ce4e821721b1b8870b9750f1143 (diff) | |
| parent | 468793e34a7f533db62520f179fa37c2286f524a (diff) | |
Merge pull request #1038 from ProjectRevoTPP/master
restore SeedRngWithRtc comment and declaration of GF oversight.
Diffstat (limited to 'src/main.c')
| -rw-r--r-- | src/main.c | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/src/main.c b/src/main.c index f488e7f6d..cf19f39b3 100644 --- a/src/main.c +++ b/src/main.c @@ -75,7 +75,7 @@ static EWRAM_DATA u16 gTrainerId = 0; static void UpdateLinkAndCallCallbacks(void); static void InitMainCallbacks(void); static void CallCallbacks(void); -static void SeedRngWithRtc(void); +//static void SeedRngWithRtc(void); static void ReadKeys(void); void InitIntrHandlers(void); static void WaitForVBlank(void); @@ -118,6 +118,7 @@ void AgbMain() CheckForFlashMemory(); InitMainCallbacks(); InitMapMusic(); + //SeedRngWithRtc(); see comment at SeedRngWithRtc declaration below ClearDma3Requests(); ResetBgs(); SetDefaultFontsPointer(); @@ -228,6 +229,14 @@ void EnableVCountIntrAtLine150(void) 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) { gKeyRepeatContinueDelay = 5; |