dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

port ReceiveDaycareMailData fakematch fix

Browse Source
This commit is contained in:
Kurausukun
2020-10-26 00:10:30 -04:00
parent 9d067dfe0d
commit af0a1cb7bf
1 changed files with 6 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/record_mixing.c
+5 -10
View File
@@ -870,16 +870,7 @@ static void ReceiveDaycareMailData(struct RecordMixingDayCareMail *src, size_t r
sp24[j][0] = i; sp24[j][0] = i;
var1 = sub_80E7A9C(&_src->mail[0]); var1 = sub_80E7A9C(&_src->mail[0]);
var2 = sub_80E7A9C(&_src->mail[1]); 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;
} }
@@ -887,6 +878,10 @@ static void ReceiveDaycareMailData(struct RecordMixingDayCareMail *src, size_t r
{ {
sp24[j][1] = 0; sp24[j][1] = 0;
} }
else if (!var1 && var2)
{
sp24[j][1] = 1;
}
j++; j++;
} }
} }