summaryrefslogtreecommitdiff
path: root/src/diploma.c
diff options
context:
space:
mode:
authoraaaaaa123456789 <aaaaaa123456789@acidch.at>2020-11-02 22:02:39 -0300
committeraaaaaa123456789 <aaaaaa123456789@acidch.at>2020-11-02 22:02:39 -0300
commitbacc831aa91d059936bd7c852bf0a0fb44d8f27a (patch)
tree660080b3d0dd091d8827c679f489ffbfb337d3c3 /src/diploma.c
parent6545745e5997f48e0c853b30b144a10244e7ba20 (diff)
Re-apply joypad macros (minus merge conflicts)
Diffstat (limited to 'src/diploma.c')
-rw-r--r--src/diploma.c2
1 files changed, 1 insertions, 1 deletions
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;