Merge pull request #1300 from GriffinRichards/bugfix-clean

Minor BUGFIX changes, remove redundant bug fix descriptions

docs/bugs_and_glitches.md

@@ -1,7 +1,7 @@
 
 # Bugs and Glitches
 
-These are known bugs and glitches in the original Pokémon Emerald game: code that clearly does not work as intended, or that only works in limited circumstances but has the possibility to fail or crash. Defining the `BUGFIX` preprocessor variable will fix some of these automatically.
+These are known bugs and glitches in the original Pokémon Emerald game: code that clearly does not work as intended, or that only works in limited circumstances but has the possibility to fail or crash. Defining the `BUGFIX` and `UBFIX` preprocessor variables will fix some of these automatically. `UBFIX` will already be defined for MODERN builds.
 
 Fixes are written in the `diff` format. If you've used Git before, this should look familiar:
 
@@ -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):
@@ -95,21 +49,3 @@ Then edit `BagMenu_MoveCursorCallback` in [src/item_menu.c](https://github.com/p
 	if (itemIndex != LIST_CANCEL)
 	...
 ```
-
-## Pokémon that have an affine transform as part of their entry animation glitch when going in and out of Poké Balls without a screen transition in between
-
-**Fix:** Edit `sub_817F77C` in [src/pokemon_animation.c](https://github.com/pret/pokeemerald/blob/master/src/pokemon_animation.c#L1028):
-
-```diff
-    ...
--#ifdef BUGFIX
-    else
-    {
-        // FIX: Reset these back to normal after they were changed so Poké Ball catch/release
-        // animations without a screen transition in between don't break
-        sprite->affineAnimPaused = FALSE;
-        sprite->affineAnims = gUnknown_082FF694;
-    }
--#endif // BUGFIX
-}
-```

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!
+// FRLG commented this out to remove RTC, however Emerald didn't undo this!
-//static void SeedRngWithRtc(void)
+#ifdef BUGFIX
-//{
+static void SeedRngWithRtc(void)
-//    u32 seed = RtcGetMinuteCount();
+{
-//    seed = (seed >> 16) ^ (seed & 0xFFFF);
+    u32 seed = RtcGetMinuteCount();
-//    SeedRng(seed);
+    seed = (seed >> 16) ^ (seed & 0xFFFF);
-//}
+    SeedRng(seed);
+}
+#endif
 
 void InitKeys(void)
 {

src/pokemon_animation.c

@@ -6,6 +6,7 @@
 #include "task.h"
 #include "trig.h"
 #include "util.h"
+#include "data.h"
 #include "constants/battle_anim.h"
 #include "constants/rgb.h"