atiran/sovereignx
3
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #2392 from gruxor/wait-fix

Browse source 
Replaced busy-wait loops
This commit is contained in:
Eduardo Quezada D'Ottone 2022-10-17 15:34:22 -03:00 committed by GitHub
commit c57ab9e529
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/main.c
View file

@ -408,9 +408,7 @@ static void IntrDummy(void)
static void WaitForVBlank(void) static void WaitForVBlank(void)
{ {
gMain.intrCheck &= ~INTR_FLAG_VBLANK; gMain.intrCheck &= ~INTR_FLAG_VBLANK;
VBlankIntrWait();
while (!(gMain.intrCheck & INTR_FLAG_VBLANK))
;
} }
void SetTrainerHillVBlankCounter(u32 *counter) void SetTrainerHillVBlankCounter(u32 *counter)

6
src/pokemon_debug.c
View file

@ -1380,7 +1380,7 @@ static void UpdateSubmenuOneOptionValue(u8 taskId, bool8 increment)
UpdateBattlerValue(data); UpdateBattlerValue(data);
ReloadPokemonSprites(data); ReloadPokemonSprites(data);
while (!(gMain.intrCheck & INTR_FLAG_VBLANK)); VBlankIntrWait();
PlaySE(SE_DEX_SCROLL); PlaySE(SE_DEX_SCROLL);
} }
break; break;
@ -1499,7 +1499,7 @@ static void Handle_Input_Debug_Pokemon(u8 taskId)
PrintDigitChars(data); PrintDigitChars(data);
UpdateBattlerValue(data); UpdateBattlerValue(data);
ReloadPokemonSprites(data); ReloadPokemonSprites(data);
while (!(gMain.intrCheck & INTR_FLAG_VBLANK)); VBlankIntrWait();
PlaySE(SE_DEX_SCROLL); PlaySE(SE_DEX_SCROLL);
} }
@ -1531,7 +1531,7 @@ static void Handle_Input_Debug_Pokemon(u8 taskId)
ResetOffsetSpriteValues(data); ResetOffsetSpriteValues(data);
} }
PlaySE(SE_DEX_SCROLL); PlaySE(SE_DEX_SCROLL);
while (!(gMain.intrCheck & INTR_FLAG_VBLANK)); VBlankIntrWait();
} }
else if (JOY_NEW(DPAD_UP)) else if (JOY_NEW(DPAD_UP))
{ {