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/record_mixing.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/record_mixing.c')

diff --git a/src/record_mixing.c b/src/record_mixing.c
index df4a1a720..4a4941294 100644
--- a/src/record_mixing.c
+++ b/src/record_mixing.c
@@ -1,5 +1,5 @@
 #include "global.h"
-#include "malloc.h"
+#include "alloc.h"
 #include "random.h"
 #include "constants/items.h"
 #include "text.h"
@@ -1763,7 +1763,7 @@ static void sub_80E8880(struct RankingHall1P *arg0, struct RankingHall1P *arg1)
     for (i = 0; i < 3; i++)
     {
         s32 highestWinStreak = 0;
-        s32 highestId = -1;
+        s32 highestId = INVALID_S32;
         for (j = 0; j < 6; j++)
         {
             if (arg1[j].winStreak > highestWinStreak)
@@ -1788,7 +1788,7 @@ static void sub_80E88CC(struct RankingHall2P *arg0, struct RankingHall2P *arg1)
     for (i = 0; i < 3; i++)
     {
         s32 highestWinStreak = 0;
-        s32 highestId = -1;
+        s32 highestId = INVALID_S32;
         for (j = 0; j < 6; j++)
         {
             if (arg1[j].winStreak > highestWinStreak)
-- 
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/record_mixing.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/record_mixing.c')

diff --git a/src/record_mixing.c b/src/record_mixing.c
index 4a4941294..975b51386 100644
--- a/src/record_mixing.c
+++ b/src/record_mixing.c
@@ -1763,7 +1763,7 @@ static void sub_80E8880(struct RankingHall1P *arg0, struct RankingHall1P *arg1)
     for (i = 0; i < 3; i++)
     {
         s32 highestWinStreak = 0;
-        s32 highestId = INVALID_S32;
+        s32 highestId = -1;
         for (j = 0; j < 6; j++)
         {
             if (arg1[j].winStreak > highestWinStreak)
@@ -1788,7 +1788,7 @@ static void sub_80E88CC(struct RankingHall2P *arg0, struct RankingHall2P *arg1)
     for (i = 0; i < 3; i++)
     {
         s32 highestWinStreak = 0;
-        s32 highestId = INVALID_S32;
+        s32 highestId = -1;
         for (j = 0; j < 6; j++)
         {
             if (arg1[j].winStreak > highestWinStreak)
-- 
cgit v1.2.3