dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

Move SeedRngWithRtc fix to BUGFIX conditional

Browse Source
This commit is contained in:
GriffinR
2021-01-11 10:36:53 -05:00
parent a733b211a3
commit 4a7a3df205
2 changed files with 13 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/main.c
View File

@@ -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)
{