Merge pull request #1141 from GriffinRichards/add-nonmatch

Wrap asm statements in NONMATCHING
2020-08-21 12:44:07 -04:00
parent 6c34effda9 0e7f634b00
commit cd895e497d
13 changed files with 59 additions and 30 deletions
--- a/src/record_mixing.c
+++ b/src/record_mixing.c
@@ -872,8 +872,12 @@ static void ReceiveDaycareMailData(struct RecordMixingDayCareMail *src, size_t r
            var2 = sub_80E7A9C(&_src->mail[1]);
            if (!var1 && var2)
            {
-                register u8 one asm("r0") = 1; // boo, a fakematch
-                sp24[j][1] = one;
+                #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))
            {