Move SeedRngWithRtc fix to BUGFIX conditional

2 files changed, 13 insertions, 55 deletions

diff --git a/docs/bugs_and_glitches.md b/docs/bugs_and_glitches.md
index 07955ecd5..94fc4314d 100644
--- a/docs/bugs_and_glitches.md
+++ b/docs/bugs_and_glitches.md
@@ -13,55 +13,9 @@ Fixes are written in the `diff` format. If you've used Git before, this should l
 
 ## Contents
 
-- [RNG does not get seeded](#rng-does-not-get-seeded)
 - [Scrolling through items in the bag causes the image to flicker](#scrolling-through-items-in-the-bag-causes-the-image-to-flicker)
 
 
-## RNG does not get seeded
-
-**Fix:** Add the following function to [src/main.c](https://github.com/pret/pokeemerald/blob/master/src/main.c):
-```diff
-+static void SeedRngWithRtc(void)
-+{
-+	u32 seed = RtcGetMinuteCount();
-+	seed = (seed >> 16) ^ (seed & 0xFFFF);
-+	SeedRng(seed);
-+}
-```
-
-And edit `AgbMain`:
-
-```diff
-	...
-	RtcInit();
-	CheckForFlashMemory();
-	InitMainCallbacks();
-	InitMapMusic();
-+	SeedRngWithRtc();
-	ClearDma3Requests();
-	...
-```
-
-This restores the code of Ruby/Sapphire.
-
-**Alternate Fix:** Edit the following function in [src/title_screen.c](https://github.com/pret/pokeemerald/blob/master/src/title_screen.c):
-
-```diff
-void CB2_InitTitleScreen(void)
-{
-	switch (gMain.state)
-	{
-	default:
-	case 0:
-		SetVBlankCallback(NULL);
-+		StartTimer1();
-		SetGpuReg(REG_OFFSET_BLDCNT, 0);
-		SetGpuReg(REG_OFFSET_BLDALPHA, 0);
-		SetGpuReg(REG_OFFSET_BLDY, 0);
-		...
-```
-This matches what FRLG does and obtains the seed differently than RS, independently of the RTC.
-
 ## Scrolling through items in the bag causes the image to flicker
 
 **Fix:** Add the following function to [src/item_menu_icons.c](https://github.com/pret/pokeemerald/blob/master/src/item_menu_icons.c):
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)
 {