diff options
| author | nullableVoidPtr <30564701+nullableVoidPtr@users.noreply.github.com> | 2018-11-29 19:24:28 +0800 |
|---|---|---|
| committer | nullableVoidPtr <30564701+nullableVoidPtr@users.noreply.github.com> | 2018-12-06 09:44:08 +0800 |
| commit | 3909b6408c0125fe311d49a3029a2806993615f7 (patch) | |
| tree | a02365a6eb268dce08941968e11e319f3a7fe080 /src/script_movement.c | |
| parent | 1b33ad6c26fa83aa7b77055ddde59c61df03d0e4 (diff) | |
Fix alloc.c as per #386, define INVALID_ constants and rename malloc to alloc as per #325
Some of the INVALID_ are likely erroneously placed, due to lack of documentation
Diffstat (limited to 'src/script_movement.c')
| -rw-r--r-- | src/script_movement.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/script_movement.c b/src/script_movement.c index 9fee9e060..54e6f9995 100644 --- a/src/script_movement.c +++ b/src/script_movement.c @@ -50,7 +50,7 @@ void sub_80D338C(void) u8 taskId; taskId = sub_80D33F4(); - if (taskId != 0xFF) + if (taskId != INVALID_U8) { UnfreezeObjects(taskId); DestroyTask(taskId); @@ -65,7 +65,7 @@ static void sub_80D33AC(u8 priority) taskId = CreateTask(sub_80D3660, priority); for (i = 1; i < 16; i++) - gTasks[taskId].data[i] = 0xFFFF; + gTasks[taskId].data[i] = INVALID_U16; } static u8 sub_80D33F4(void) @@ -188,7 +188,7 @@ static void UnfreezeObjects(u8 taskId) pEventObjId = (u8 *)&gTasks[taskId].data[1]; for (i = 0; i < 16; i++, pEventObjId++) { - if (*pEventObjId != 0xFF) + if (*pEventObjId != INVALID_U8) UnfreezeEventObject(&gEventObjects[*pEventObjId]); } } @@ -201,7 +201,7 @@ static void sub_80D3660(u8 taskId) for (i = 0; i < 16; i++) { sub_80D3508(taskId, i, &var); - if (var != 0xFF) + if (var != INVALID_U8) sub_80A2490(taskId, i, var, sub_80D35CC(i)); } } |