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

Merge branch 'master' into doc-menu

Browse Source
This commit is contained in:
GriffinR
2021-11-04 12:11:31 -04:00
committed by GitHub
parent 17b657d83a 7940f121f6
commit be7d0bd3b0
53 changed files with 842 additions and 899 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/pokeblock.c
View File

@@ -505,11 +505,11 @@ static void CB2_InitPokeblockMenu(void)
{
while (1)
{
if (MenuHelpers_CallLinkSomething() == TRUE)
if (MenuHelpers_ShouldWaitForLinkRecv() == TRUE)
break;
if (InitPokeblockMenu() == TRUE)
break;
if (MenuHelpers_LinkSomething() == TRUE)
if (MenuHelpers_IsLinkActive() == TRUE)
break;
}
}
@@ -1004,7 +1004,7 @@ static void Task_HandlePokeblockMenuInput(u8 taskId)
{
s16 *data = gTasks[taskId].data;
if (!gPaletteFade.active && MenuHelpers_CallLinkSomething() != TRUE)
if (!gPaletteFade.active && MenuHelpers_ShouldWaitForLinkRecv() != TRUE)
{
if (JOY_NEW(SELECT_BUTTON))
{
@@ -1057,7 +1057,7 @@ static void Task_HandlePokeblocksSwapInput(u8 taskId)
{
s16 *data = gTasks[taskId].data;
if (MenuHelpers_CallLinkSomething() == TRUE)
if (MenuHelpers_ShouldWaitForLinkRecv() == TRUE)
return;
if (JOY_NEW(SELECT_BUTTON))
@@ -1161,7 +1161,7 @@ static void Task_HandlePokeblockActionsInput(u8 taskId)
{
s8 itemId;
if (MenuHelpers_CallLinkSomething() == TRUE)
if (MenuHelpers_ShouldWaitForLinkRecv() == TRUE)
return;
itemId = Menu_ProcessInputNoWrap();