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

Sync script.c

Browse Source
This commit is contained in:
GriffinR
2022-08-22 20:27:23 -04:00
parent 56f8b1a47c
commit 72f76b19b3
52 changed files with 408 additions and 385 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/cable_club.c
+11 -11
View File
@@ -405,7 +405,7 @@ static void Task_Linkup_6a(u8 taskId)
if (gLinkType == LINKTYPE_BERRY_BLENDER_SETUP)
*UnusedVarNeededToMatch += 0;
DestroyLinkPlayerCountDisplayWindow(gTasks[taskId].data[5]);
EnableBothScriptContexts();
ScriptContext_Enable();
DestroyTask(taskId);
}
else
@@ -421,7 +421,7 @@ static void Task_Linkup_7(u8 taskId)
if (!gReceivedRemoteLinkPlayers)
{
DestroyLinkPlayerCountDisplayWindow(gTasks[taskId].data[5]);
EnableBothScriptContexts();
ScriptContext_Enable();
RemoveWindow(gTasks[taskId].data[5]);
DestroyTask(taskId);
}
@@ -432,7 +432,7 @@ static void Task_Linkup_Canceled(u8 taskId)
gSpecialVar_Result = 5;
DestroyLinkPlayerCountDisplayWindow(gTasks[taskId].data[5]);
HideFieldMessageBox();
EnableBothScriptContexts();
ScriptContext_Enable();
DestroyTask(taskId);
}
@@ -441,7 +441,7 @@ static void Task_Linkup_ErroredOut(u8 taskId)
gSpecialVar_Result = 6;
DestroyLinkPlayerCountDisplayWindow(gTasks[taskId].data[5]);
HideFieldMessageBox();
EnableBothScriptContexts();
ScriptContext_Enable();
DestroyTask(taskId);
}
@@ -807,7 +807,7 @@ static void Task_EnterCableClubSeat(u8 taskId)
SetLinkWaitingForScript();
sub_80F771C(TRUE);
DestroyTask(taskId);
EnableBothScriptContexts();
ScriptContext_Enable();
break;
}
}
@@ -816,7 +816,7 @@ static void CreateEnterCableClubSeatTaskWithFollowupFunc(TaskFunc followUpFunc)
{
u8 taskId = CreateTask(Task_EnterCableClubSeat, 80);
SetTaskFuncWithFollowupFunc(taskId, Task_EnterCableClubSeat, followUpFunc);
ScriptContext1_Stop();
ScriptContext_Stop();
}
static void Task_StartWiredCableClubTrade(u8 taskId)
@@ -825,7 +825,7 @@ static void Task_StartWiredCableClubTrade(u8 taskId)
switch (task->data[0])
{
case 0:
ScriptContext2_Enable();
LockPlayerFieldControls();
FadeScreen(FADE_TO_BLACK, 0);
ClearLinkCallback_2();
task->data[0]++;
@@ -857,7 +857,7 @@ static void Task_StartWirelessCableClubTrade(u8 taskId)
switch (data[0])
{
case 0:
ScriptContext2_Enable();
LockPlayerFieldControls();
FadeScreen(FADE_TO_BLACK, 0);
ClearLinkRfuCallback();
data[0]++;
@@ -899,7 +899,7 @@ static void CreateTask_StartWiredCableClubTrade(void)
void StartWiredCableClubTrade(void)
{
CreateTask_StartWiredCableClubTrade();
ScriptContext1_Stop();
ScriptContext_Stop();
}
void EnterColosseumPlayerSpot(void)
@@ -914,7 +914,7 @@ void EnterColosseumPlayerSpot(void)
static void Debug_CreateTaskEnterCableClubSeat(void)
{
CreateTask(Task_EnterCableClubSeat, 80);
ScriptContext1_Stop();
ScriptContext_Stop();
}
void Script_ShowLinkTrainerCard(void)
@@ -952,7 +952,7 @@ static void sub_8081AE4(u8 taskId)
{
if (!gReceivedRemoteLinkPlayers)
{
EnableBothScriptContexts();
ScriptContext_Enable();
DestroyTask(taskId);
}
}