From ca950a8daf6dd95ab5dacc51f250fea7b605361c Mon Sep 17 00:00:00 2001 From: aaaaaa123456789 Date: Mon, 2 Nov 2020 22:18:26 -0300 Subject: Solve merge conflicts from previous commit --- gflib/text.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gflib/text.c') diff --git a/gflib/text.c b/gflib/text.c index 30c142fa8..4cbad1376 100644 --- a/gflib/text.c +++ b/gflib/text.c @@ -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); -- cgit v1.2.3