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

More minor fixes

Browse Source
This commit is contained in:
Phlosioneer
2019-03-01 01:49:11 -05:00
parent 99bfd8c80f
commit a7e5852f1d
15 changed files with 99 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/main.c
View File

@@ -163,7 +163,7 @@ static void UpdateLinkAndCallCallbacks(void)
static void InitMainCallbacks(void)
{
gMain.vblankCounter1 = 0;
gVBlankCounterPointer = NULL;
gTrainerHillVBlankCounter = NULL;
gMain.vblankCounter2 = 0;
gMain.callback1 = NULL;
SetMainCallback2(CB2_InitCopyrightScreenAfterBootup);
@@ -324,8 +324,8 @@ static void VBlankIntr(void)
gMain.vblankCounter1++;
if (gVBlankCounterPointer && *gVBlankCounterPointer < 0xFFFFFFFF)
(*gVBlankCounterPointer)++;
if (gTrainerHillVBlankCounter && *gTrainerHillVBlankCounter < 0xFFFFFFFF)
(*gTrainerHillVBlankCounter)++;
if (gMain.vblankCallback)
gMain.vblankCallback();
@@ -393,14 +393,14 @@ static void WaitForVBlank(void)
;
}
void SetVBlankCounterPointer(u32 *var)
void SetTrainerHillVBlankCounter(u32 *counter)
{
gVBlankCounterPointer = var;
gTrainerHillVBlankCounter = counter;
}
void ClearVBlankCounterPointer(void)
void ClearTrainerHillVBlankCounter(void)
{
gVBlankCounterPointer = NULL;
gTrainerHillVBlankCounter = NULL;
}
void DoSoftReset(void)