From bacc831aa91d059936bd7c852bf0a0fb44d8f27a Mon Sep 17 00:00:00 2001
From: aaaaaa123456789 <aaaaaa123456789@acidch.at>
Date: Mon, 2 Nov 2020 22:02:39 -0300
Subject: Re-apply joypad macros (minus merge conflicts)

---
 src/diploma.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/diploma.c')

diff --git a/src/diploma.c b/src/diploma.c
index 7eb3b0e81..f243d09f9 100644
--- a/src/diploma.c
+++ b/src/diploma.c
@@ -107,7 +107,7 @@ static void Task_DiplomaFadeIn(u8 taskId)
 
 static void Task_DiplomaWaitForKeyPress(u8 taskId)
 {
-    if (gMain.newKeys & (A_BUTTON | B_BUTTON))
+    if (JOY_NEW(A_BUTTON | B_BUTTON))
     {
         BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB_BLACK);
         gTasks[taskId].func = Task_DiplomaFadeOut;
-- 
cgit v1.2.3