diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2021-01-13 14:22:42 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-13 14:22:42 -0500 |
| commit | 29e59c8eef90b5d166cecae0c54f4ecdd8d51333 (patch) | |
| tree | c97d81ba6b98e0d9a3ed55108f717bc3f6eae9ed /src/main.c | |
| parent | 707441827ba44ca57d4fd654256e1c795739b826 (diff) | |
| parent | 9ed413fe8f3c5d43123368db08d90b7f069d14d3 (diff) | |
Merge pull request #1300 from GriffinRichards/bugfix-clean
Minor BUGFIX changes, remove redundant bug fix descriptions
Diffstat (limited to 'src/main.c')
| -rw-r--r-- | src/main.c | 22 |
1 files changed, 13 insertions, 9 deletions
diff --git a/src/main.c b/src/main.c index 9fd1d0a35..f0ad4ce94 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); @@ -102,7 +102,9 @@ void AgbMain() CheckForFlashMemory(); InitMainCallbacks(); InitMapMusic(); - //SeedRngWithRtc(); see comment at SeedRngWithRtc declaration below +#ifdef BUGFIX + SeedRngWithRtc(); // see comment at SeedRngWithRtc definition below +#endif ClearDma3Requests(); ResetBgs(); SetDefaultFontsPointer(); @@ -213,13 +215,15 @@ 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); -//} +// FRLG commented this out to remove RTC, however Emerald didn't undo this! +#ifdef BUGFIX +static void SeedRngWithRtc(void) +{ + u32 seed = RtcGetMinuteCount(); + seed = (seed >> 16) ^ (seed & 0xFFFF); + SeedRng(seed); +} +#endif void InitKeys(void) { |