Merge branch 'master' into doc-union

This commit is contained in:
GriffinR
2021-10-07 16:10:35 -04:00
committed by GitHub
1136 changed files with 52228 additions and 51993 deletions
+2 -2
View File
@@ -61,7 +61,7 @@ void Task_LinkContest_Init(u8 taskId)
for (i = 0; i < CONTESTANT_COUNT; i++)
gBlockRecvBuffer[i][0] = 0xFF;
gTasks[taskId].tState = 0;
gTasks[taskId].func = Task_LinkContest_StartInitFlags;
}
@@ -99,7 +99,7 @@ bool32 LinkContest_TryLinkStandby(s16 *state)
// Skip standby for RS cabled links
if (gLinkContestFlags & LINK_CONTEST_FLAG_HAS_RS_PLAYER)
return TRUE;
switch (*state)
{
case 0: