ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2025-02-21 19:54:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

renamed taskNum to followupFuncDataIndex

Browse Source
This commit is contained in:
N 2021-01-16 21:56:49 -05:00
parent 72e8683975
commit d3259ebe2c
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/task.c
View File

@ -138,18 +138,18 @@ void TaskDummy(u8 taskId)
void SetTaskFuncWithFollowupFunc(u8 taskId, TaskFunc func, TaskFunc followupFunc) void SetTaskFuncWithFollowupFunc(u8 taskId, TaskFunc func, TaskFunc followupFunc)
{ {
u8 taskNum = NUM_TASK_DATA - 2; // Should be const. u8 followupFuncDataIndex = NUM_TASK_DATA - 2; // Should be const.
gTasks[taskId].data[taskNum] = (s16)((u32)followupFunc); gTasks[taskId].data[followupFuncDataIndex] = (s16)((u32)followupFunc);
gTasks[taskId].data[taskNum + 1] = (s16)((u32)followupFunc >> 16); gTasks[taskId].data[followupFuncDataIndex + 1] = (s16)((u32)followupFunc >> 16);
gTasks[taskId].func = func; gTasks[taskId].func = func;
} }
void SwitchTaskToFollowupFunc(u8 taskId) void SwitchTaskToFollowupFunc(u8 taskId)
{ {
u8 taskNum = NUM_TASK_DATA - 2; // Should be const. u8 followupFuncDataIndex = NUM_TASK_DATA - 2; // Should be const.
gTasks[taskId].func = (TaskFunc)((u16)(gTasks[taskId].data[taskNum]) | (gTasks[taskId].data[taskNum + 1] << 16)); gTasks[taskId].func = (TaskFunc)((u16)(gTasks[taskId].data[followupFuncDataIndex]) | (gTasks[taskId].data[followupFuncDataIndex + 1] << 16));
} }
bool8 FuncIsActiveTask(TaskFunc func) bool8 FuncIsActiveTask(TaskFunc func)