diff options
| author | N <71219152+PokeCodec@users.noreply.github.com> | 2021-01-16 21:09:51 -0500 |
|---|---|---|
| committer | N <71219152+PokeCodec@users.noreply.github.com> | 2021-01-16 21:09:51 -0500 |
| commit | 0159c0c1ae336ccded07a912466870eb452ba608 (patch) | |
| tree | e02d243e4d9d50ca05496da1bed47cb45fe98890 /src/task.c | |
| parent | a950167d897a46ecce0e40050fd1f5025b9c211c (diff) | |
Update task.c
Diffstat (limited to 'src/task.c')
| -rw-r--r-- | src/task.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/task.c b/src/task.c index 03ae2c6be..6c8ccdfb0 100644 --- a/src/task.c +++ b/src/task.c @@ -138,7 +138,7 @@ void TaskDummy(u8 taskId) void SetTaskFuncWithFollowupFunc(u8 taskId, TaskFunc func, TaskFunc followupFunc) { - u8 taskNum = NUM_TASKS - 2; // Should be const + u8 taskNum = NUM_TASK_DATA - 2; // Should be const gTasks[taskId].data[taskNum] = (s16)((u32)followupFunc); gTasks[taskId].data[taskNum + 1] = (s16)((u32)followupFunc >> 16); @@ -147,7 +147,7 @@ void SetTaskFuncWithFollowupFunc(u8 taskId, TaskFunc func, TaskFunc followupFunc void SwitchTaskToFollowupFunc(u8 taskId) { - u8 taskNum = NUM_TASKS - 2; // Should be const + u8 taskNum = NUM_TASK_DATA - 2; // Should be const gTasks[taskId].func = (TaskFunc)((u16)(gTasks[taskId].data[taskNum]) | (gTasks[taskId].data[taskNum + 1] << 16)); } @@ -188,7 +188,7 @@ u8 GetTaskCount(void) void SetWordTaskArg(u8 taskId, u8 dataElem, u32 value) { - if (dataElem < NUM_TASKS - 1) + if (dataElem < NUM_TASK_DATA - 1) { gTasks[taskId].data[dataElem] = value; gTasks[taskId].data[dataElem + 1] = value >> 16; @@ -197,7 +197,7 @@ void SetWordTaskArg(u8 taskId, u8 dataElem, u32 value) u32 GetWordTaskArg(u8 taskId, u8 dataElem) { - if (dataElem < NUM_TASKS - 1) + if (dataElem < NUM_TASK_DATA - 1) return (u16)gTasks[taskId].data[dataElem] | (gTasks[taskId].data[dataElem + 1] << 16); else return 0; |