ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2025-01-13 07:03:40 +01:00
Code Issues 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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
docs/bugs_and_glitches.md
View File

@ -13,55 +13,9 @@ Fixes are written in the `diff` format. If you've used Git before, this should l
## Contents ## 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) - [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 ## 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): **Fix:** Add the following function to [src/item_menu_icons.c](https://github.com/pret/pokeemerald/blob/master/src/item_menu_icons.c):

22
src/main.c
View File

@ -75,7 +75,7 @@ static EWRAM_DATA u16 gTrainerId = 0;
static void UpdateLinkAndCallCallbacks(void); static void UpdateLinkAndCallCallbacks(void);
static void InitMainCallbacks(void); static void InitMainCallbacks(void);
static void CallCallbacks(void); static void CallCallbacks(void);
//static void SeedRngWithRtc(void); static void SeedRngWithRtc(void);
static void ReadKeys(void); static void ReadKeys(void);
void InitIntrHandlers(void); void InitIntrHandlers(void);
static void WaitForVBlank(void); static void WaitForVBlank(void);
@ -102,7 +102,9 @@ void AgbMain()
CheckForFlashMemory(); CheckForFlashMemory();
InitMainCallbacks(); InitMainCallbacks();
InitMapMusic(); InitMapMusic();
//SeedRngWithRtc(); see comment at SeedRngWithRtc declaration below #ifdef BUGFIX
SeedRngWithRtc(); // see comment at SeedRngWithRtc definition below
#endif
ClearDma3Requests(); ClearDma3Requests();
ResetBgs(); ResetBgs();
SetDefaultFontsPointer(); SetDefaultFontsPointer();
@ -213,13 +215,15 @@ void EnableVCountIntrAtLine150(void)
EnableInterrupts(INTR_FLAG_VCOUNT); 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) void InitKeys(void)
{ {