port TrendyPhraseIdOld fakematch fix

This commit is contained in:
Kurausukun 2020-10-26 00:29:55 -04:00
parent e8fd0bd2c3
commit 072797844a

View file

@ -223,14 +223,17 @@ void TrendyPhraseIsOld(void)
{ {
u16 result = 0; u16 result = 0;
if (gSaveBlock1Ptr->easyChatPairs[0].unk0_0 - gSaveBlock1Ptr->easyChatPairs[1].unk0_0 < 2) do
{ {
#ifndef NONMATCHING if (gSaveBlock1Ptr->easyChatPairs[0].unk0_0 - gSaveBlock1Ptr->easyChatPairs[1].unk0_0 > 1)
asm("":::"r2"); //Force the compiler to store address of gSaveBlock1 in r3 instead of r2 break;
#endif if (gSaveBlock1Ptr->easyChatPairs[0].unk1_6)
if (!gSaveBlock1Ptr->easyChatPairs[0].unk1_6 && gSaveBlock1Ptr->easyChatPairs[1].unk1_6) break;
if (!gSaveBlock1Ptr->easyChatPairs[1].unk1_6)
break;
result = 1; result = 1;
} } while (0);
gSpecialVar_Result = result; gSpecialVar_Result = result;
} }