dionmoustos/Pokemon-Firered
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/pret/pokefirered into sync-cableclub

Browse Source
This commit is contained in:
GriffinR
2022-09-03 14:19:50 -04:00
parent 321f5371d8 097fc309f6
commit 76ec1837aa
197 changed files with 9544 additions and 9398 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/cable_club.c
+11 -11
View File
@@ -441,7 +441,7 @@ static void Task_LinkupAwaitTrainerCardData(u8 taskId)
if (gLinkType == LINKTYPE_BERRY_BLENDER_SETUP)
*UnusedVarNeededToMatch += 0;
ClearLinkPlayerCountWindow(gTasks[taskId].tWindowId);
EnableBothScriptContexts();
ScriptContext_Enable();
DestroyTask(taskId);
}
else
@@ -456,7 +456,7 @@ static void Task_StopLinkup(u8 taskId)
if (!gReceivedRemoteLinkPlayers)
{
ClearLinkPlayerCountWindow(gTasks[taskId].tWindowId);
EnableBothScriptContexts();
ScriptContext_Enable();
RemoveWindow(gTasks[taskId].tWindowId);
DestroyTask(taskId);
}
@@ -467,7 +467,7 @@ static void Task_LinkupFailed(u8 taskId)
gSpecialVar_Result = LINKUP_FAILED;
ClearLinkPlayerCountWindow(gTasks[taskId].tWindowId);
HideFieldMessageBox();
EnableBothScriptContexts();
ScriptContext_Enable();
DestroyTask(taskId);
}
@@ -476,7 +476,7 @@ static void Task_LinkupConnectionError(u8 taskId)
gSpecialVar_Result = LINKUP_CONNECTION_ERROR;
ClearLinkPlayerCountWindow(gTasks[taskId].tWindowId);
HideFieldMessageBox();
EnableBothScriptContexts();
ScriptContext_Enable();
DestroyTask(taskId);
}
@@ -860,7 +860,7 @@ static void Task_EnterCableClubSeat(u8 taskId)
SetLinkWaitingForScript();
EraseFieldMessageBox(TRUE);
DestroyTask(taskId);
EnableBothScriptContexts();
ScriptContext_Enable();
break;
}
}
@@ -869,7 +869,7 @@ static void CreateTask_EnterCableClubSeat(TaskFunc followUpFunc)
{
u8 taskId = CreateTask(Task_EnterCableClubSeat, 80);
SetTaskFuncWithFollowupFunc(taskId, Task_EnterCableClubSeat, followUpFunc);
ScriptContext1_Stop();
ScriptContext_Stop();
}
static void Task_StartWiredTrade(u8 taskId)
@@ -878,7 +878,7 @@ static void Task_StartWiredTrade(u8 taskId)
switch (task->tState)
{
case 0:
ScriptContext2_Enable();
LockPlayerFieldControls();
FadeScreen(FADE_TO_BLACK, 0);
ClearLinkCallback_2();
task->tState++;
@@ -910,7 +910,7 @@ static void Task_StartWirelessTrade(u8 taskId)
switch (tState)
{
case 0:
ScriptContext2_Enable();
LockPlayerFieldControls();
FadeScreen(FADE_TO_BLACK, 0);
ClearLinkRfuCallback();
tState++;
@@ -952,7 +952,7 @@ static void CreateTask_StartWiredTrade(void)
void StartWiredCableClubTrade(void)
{
CreateTask_StartWiredTrade();
ScriptContext1_Stop();
ScriptContext_Stop();
}
void EnterColosseumPlayerSpot(void)
@@ -968,7 +968,7 @@ void EnterColosseumPlayerSpot(void)
static void CreateTask_EnterCableClubSeatNoFollowup(void)
{
CreateTask(Task_EnterCableClubSeat, 80);
ScriptContext1_Stop();
ScriptContext_Stop();
}
void Script_ShowLinkTrainerCard(void)
@@ -1010,7 +1010,7 @@ static void Task_WaitExitToScript(u8 taskId)
{
if (!gReceivedRemoteLinkPlayers)
{
EnableBothScriptContexts();
ScriptContext_Enable();
DestroyTask(taskId);
}
}