diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2020-12-31 00:40:45 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-31 00:40:45 -0500 |
| commit | ec85c01e7c6d15060eddcc653db33a4b317646d2 (patch) | |
| tree | 4266c43bcdc1c80c52def44e1470182d3f1c665c /src/task.c | |
| parent | 093610b46e99b517a416ccd5a572054dff09801b (diff) | |
| parent | 0c74e2097ffbe8395d6f3659c2a49fc829d69b99 (diff) | |
Merge branch 'master' into doc-factscreen
Diffstat (limited to 'src/task.c')
| -rw-r--r-- | src/task.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/task.c b/src/task.c index a2df66de8..a97496009 100644 --- a/src/task.c +++ b/src/task.c @@ -200,7 +200,7 @@ u8 GetTaskCount(void) void SetWordTaskArg(u8 taskId, u8 dataElem, u32 value) { - if (dataElem <= 14) + if (dataElem < NUM_TASK_DATA - 1) { gTasks[taskId].data[dataElem] = value; gTasks[taskId].data[dataElem + 1] = value >> 16; @@ -209,7 +209,7 @@ void SetWordTaskArg(u8 taskId, u8 dataElem, u32 value) u32 GetWordTaskArg(u8 taskId, u8 dataElem) { - if (dataElem <= 14) + if (dataElem < NUM_TASK_DATA - 1) return (u16)gTasks[taskId].data[dataElem] | (gTasks[taskId].data[dataElem + 1] << 16); else return 0; |