Solve merge conflicts from previous commit

2020-11-02 22:18:26 -03:00
parent bacc831aa9
commit ca950a8daf
5 changed files with 15 additions and 15 deletions
@@ -783,7 +783,7 @@ bool16 TextPrinterWait(struct TextPrinter *textPrinter)
    }
    else
    {
-        if (gMain.newKeys & (A_BUTTON | B_BUTTON))
+        if (JOY_NEW(A_BUTTON | B_BUTTON))
        {
            result = TRUE;
            PlaySE(SE_SELECT);