From 3909b6408c0125fe311d49a3029a2806993615f7 Mon Sep 17 00:00:00 2001
From: nullableVoidPtr <30564701+nullableVoidPtr@users.noreply.github.com>
Date: Thu, 29 Nov 2018 19:24:28 +0800
Subject: 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

---
 src/list_menu.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'src/list_menu.c')

diff --git a/src/list_menu.c b/src/list_menu.c
index 6907a75a3..e066d1e9c 100644
--- a/src/list_menu.c
+++ b/src/list_menu.c
@@ -8,7 +8,7 @@
 #include "trig.h"
 #include "decompress.h"
 #include "palette.h"
-#include "malloc.h"
+#include "alloc.h"
 #include "strings.h"
 #include "sound.h"
 #include "constants/songs.h"
@@ -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 != 0xFF; i++)
+    for (i = 0; rect[i].palNum != INVALID_U8; i++)
     {
         PutWindowRectTilemapOverridePalette(listMenuTemplate->windowId,
                                             rect[i].x,
@@ -465,7 +465,7 @@ s32 ListMenuHandleInputGetItemId(u8 listTaskId)
     }
 }
 
-#define TASK_NONE 0xFF
+#define TASK_NONE INVALID_U8
 
 void DestroyListMenuTask(u8 listTaskId, u16 *scrollOffset, u16 *selectedRow)
 {
@@ -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 != 0xFFFF)
+    if (currItem == data->fullyUpThreshold && currItem != INVALID_U16)
         gSprites[data->topSpriteId].invisible = TRUE;
     else
         gSprites[data->topSpriteId].invisible = FALSE;
-- 
cgit v1.2.3


From f9ff7316d5c7277eb7482e30121388cd65f4ecfc Mon Sep 17 00:00:00 2001
From: nullableVoidPtr <30564701+nullableVoidPtr@users.noreply.github.com>
Date: Wed, 5 Dec 2018 22:31:01 +0800
Subject: Remove uses of INVALID_ defines, clean up some arrays with constants,
 and spaces -> tabs

---
 src/list_menu.c | 38 +++++++++++++++++++-------------------
 1 file changed, 19 insertions(+), 19 deletions(-)

(limited to 'src/list_menu.c')

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;
-- 
cgit v1.2.3