port TrendyPhraseIdOld fakematch fix

1 files changed, 11 insertions, 8 deletions

diff --git a/src/dewford_trend.c b/src/dewford_trend.c
index e3b98859c..5c7e50f16 100644
--- a/src/dewford_trend.c
+++ b/src/dewford_trend.c
@@ -222,15 +222,18 @@ void BufferTrendyPhraseString(void)
 void TrendyPhraseIsOld(void)
 {
     u16 result = 0;
-
-    if (gSaveBlock1Ptr->easyChatPairs[0].unk0_0 - gSaveBlock1Ptr->easyChatPairs[1].unk0_0 < 2)
+    
+    do
     {
-        #ifndef NONMATCHING
-            asm("":::"r2"); //Force the compiler to store address of gSaveBlock1 in r3 instead of r2
-        #endif
-        if (!gSaveBlock1Ptr->easyChatPairs[0].unk1_6 && gSaveBlock1Ptr->easyChatPairs[1].unk1_6)
-            result = 1;
-    }
+        if (gSaveBlock1Ptr->easyChatPairs[0].unk0_0 - gSaveBlock1Ptr->easyChatPairs[1].unk0_0 > 1)
+            break;
+        if (gSaveBlock1Ptr->easyChatPairs[0].unk1_6)
+            break;
+        if (!gSaveBlock1Ptr->easyChatPairs[1].unk1_6)
+            break;
+        result = 1;
+    } while (0);
+    
     gSpecialVar_Result = result;
 }