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/secret_base.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'src/secret_base.c')

diff --git a/src/secret_base.c b/src/secret_base.c
index 8436d8520..78e6bd7d0 100644
--- a/src/secret_base.c
+++ b/src/secret_base.c
@@ -3,7 +3,7 @@
 #include "global.h"
 #include "constants/bg_event_constants.h"
 #include "constants/decorations.h"
-#include "malloc.h"
+#include "alloc.h"
 #include "main.h"
 #include "task.h"
 #include "palette.h"
@@ -1385,7 +1385,7 @@ s16 sub_80EA990(u8 secretBaseRecordId)
             return i;
         }
     }
-    return -1;
+    return INVALID_S16;
 }
 
 u8 sub_80EA9D8(void)
@@ -1427,7 +1427,7 @@ u8 sub_80EAA64(struct SecretBaseRecord *base, u32 version, u32 language)
     secretBaseRecordId = sub_80EA990(base->secretBaseId);
     if (secretBaseRecordId != 0)
     {
-        if (secretBaseRecordId != -1)
+        if (secretBaseRecordId != INVALID_S16)
         {
             if (gSaveBlock1Ptr->secretBases[secretBaseRecordId].sbr_field_1_0 == 1)
             {
@@ -1757,7 +1757,7 @@ void ReceiveSecretBasesData(void *records, size_t recordSize, u8 linkIdx)
                 gSaveBlock1Ptr->secretBases[i].sbr_field_1_6 = 0;
             }
         }
-        if (gSaveBlock1Ptr->secretBases[0].secretBaseId != 0 && gSaveBlock1Ptr->secretBases[0].sbr_field_e != 0xFFFF)
+        if (gSaveBlock1Ptr->secretBases[0].secretBaseId != 0 && gSaveBlock1Ptr->secretBases[0].sbr_field_e != INVALID_U16)
         {
             gSaveBlock1Ptr->secretBases[0].sbr_field_e ++;
         }
-- 
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/secret_base.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/secret_base.c')

diff --git a/src/secret_base.c b/src/secret_base.c
index 78e6bd7d0..4bf1709d2 100644
--- a/src/secret_base.c
+++ b/src/secret_base.c
@@ -1385,7 +1385,7 @@ s16 sub_80EA990(u8 secretBaseRecordId)
             return i;
         }
     }
-    return INVALID_S16;
+    return -1;
 }
 
 u8 sub_80EA9D8(void)
@@ -1427,7 +1427,7 @@ u8 sub_80EAA64(struct SecretBaseRecord *base, u32 version, u32 language)
     secretBaseRecordId = sub_80EA990(base->secretBaseId);
     if (secretBaseRecordId != 0)
     {
-        if (secretBaseRecordId != INVALID_S16)
+        if (secretBaseRecordId != -1)
         {
             if (gSaveBlock1Ptr->secretBases[secretBaseRecordId].sbr_field_1_0 == 1)
             {
@@ -1757,7 +1757,7 @@ void ReceiveSecretBasesData(void *records, size_t recordSize, u8 linkIdx)
                 gSaveBlock1Ptr->secretBases[i].sbr_field_1_6 = 0;
             }
         }
-        if (gSaveBlock1Ptr->secretBases[0].secretBaseId != 0 && gSaveBlock1Ptr->secretBases[0].sbr_field_e != INVALID_U16)
+        if (gSaveBlock1Ptr->secretBases[0].secretBaseId != 0 && gSaveBlock1Ptr->secretBases[0].sbr_field_e != 0xFFFF)
         {
             gSaveBlock1Ptr->secretBases[0].sbr_field_e ++;
         }
-- 
cgit v1.2.3