port ReceiveDaycareMailData fakematch fix

1 files changed, 6 insertions, 11 deletions

diff --git a/src/record_mixing.c b/src/record_mixing.c
index 6c0a02d8c..7bb3df807 100644
--- a/src/record_mixing.c
+++ b/src/record_mixing.c
@@ -870,23 +870,18 @@ static void ReceiveDaycareMailData(struct RecordMixingDayCareMail *src, size_t r
             sp24[j][0] = i;
             var1 = sub_80E7A9C(&_src->mail[0]);
             var2 = sub_80E7A9C(&_src->mail[1]);
-            if (!var1 && var2)
+            if (!(var1 || var2) || (var1 && var2))
             {
-                #ifndef NONMATCHING
-                    register u8 one asm("r0") = 1; // boo, a fakematch
-                    sp24[j][1] = one;
-                #else
-                    sp24[j][1] = 1;
-                #endif
-            }
-            else if ((var1 && var2) || (!var1 && !var2))
-            {
-                 sp24[j][1] = Random2() % 2;
+                sp24[j][1] = Random2() % 2;
             }
             else if (var1 && !var2)
             {
                 sp24[j][1] = 0;
             }
+            else if (!var1 && var2)
+            {
+                 sp24[j][1] = 1;
+            }
             j++;
         }
     }