diff options
author | nullableVoidPtr <30564701+nullableVoidPtr@users.noreply.github.com> | 2018-12-05 22:31:01 +0800 |
---|---|---|
committer | nullableVoidPtr <30564701+nullableVoidPtr@users.noreply.github.com> | 2018-12-06 10:38:28 +0800 |
commit | f9ff7316d5c7277eb7482e30121388cd65f4ecfc (patch) | |
tree | ee8f4a9c338f880a3585d6e9ed9ed695f27cef3d /src/list_menu.c | |
parent | 405f1bb529809b8169364737087189df0fcca1d2 (diff) |
Remove uses of INVALID_ defines, clean up some arrays with constants, and spaces -> tabs
Diffstat (limited to 'src/list_menu.c')
-rw-r--r-- | src/list_menu.c | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/src/list_menu.c b/src/list_menu.c index e066d1e9c..caf4b798d 100644 --- a/src/list_menu.c +++ b/src/list_menu.c @@ -392,7 +392,7 @@ u8 ListMenuInitInRect(struct ListMenuTemplate *listMenuTemplate, struct ListMenu s32 i; u8 taskId = ListMenuInitInternal(listMenuTemplate, scrollOffset, selectedRow); - for (i = 0; rect[i].palNum != INVALID_U8; i++) + for (i = 0; rect[i].palNum != 0xFF; i++) { PutWindowRectTilemapOverridePalette(listMenuTemplate->windowId, rect[i].x, @@ -465,7 +465,7 @@ s32 ListMenuHandleInputGetItemId(u8 listTaskId) } } -#define TASK_NONE INVALID_U8 +#define TASK_NONE 0xFF void DestroyListMenuTask(u8 listTaskId, u16 *scrollOffset, u16 *selectedRow) { @@ -953,52 +953,52 @@ void ListMenuSetUnkIndicatorsStructField(u8 taskId, u8 field, s32 value) case 0: case 1: data->field_4 = (void*)(value); - break; + break; case 2: data->field_C = value; - break; + break; case 3: data->field_E = value; - break; + break; case 4: data->field_10 = value; - break; + break; case 5: data->field_11 = value; - break; + break; case 6: data->field_12 = value; - break; + break; case 7: data->field_13 = value; - break; + break; case 8: data->field_14_0 = value; - break; + break; case 9: data->field_14_1 = value; - break; + break; case 10: data->field_15_0 = value; - break; + break; case 11: data->field_15_1 = value; - break; + break; case 12: data->field_16_0 = value; - break; + break; case 13: data->field_16_1 = value; - break; + break; case 14: data->field_16_2 = value; - break; + break; case 15: data->field_17_0 = value; - break; + break; case 16: data->field_17_1 = value; - break; + break; } } @@ -1143,7 +1143,7 @@ static void Task_ScrollIndicatorArrowPair(u8 taskId) struct ScrollIndicatorPair *data = (void*) gTasks[taskId].data; u16 currItem = (*data->scrollOffset); - if (currItem == data->fullyUpThreshold && currItem != INVALID_U16) + if (currItem == data->fullyUpThreshold && currItem != 0xFFFF) gSprites[data->topSpriteId].invisible = TRUE; else gSprites[data->topSpriteId].invisible = FALSE; |