Re-apply joypad macros (minus merge conflicts)

2020-11-02 22:02:39 -03:00
parent 6545745e59
commit bacc831aa9
71 changed files with 651 additions and 648 deletions
@@ -1236,7 +1236,7 @@ static void Task_HandleDaycareLevelMenuInput(u8 taskId)
 {
    u32 input = ListMenu_ProcessInput(gTasks[taskId].tMenuListTaskId);

-    if (gMain.newKeys & A_BUTTON)
+    if (JOY_NEW(A_BUTTON))
    {
        switch (input)
        {
@@ -1254,7 +1254,7 @@ static void Task_HandleDaycareLevelMenuInput(u8 taskId)
        DestroyTask(taskId);
        EnableBothScriptContexts();
    }
-    else if (gMain.newKeys & B_BUTTON)
+    else if (JOY_NEW(B_BUTTON))
    {
        gSpecialVar_Result = DAYCARE_EXITED_LEVEL_MENU;
        DestroyListMenuTask(gTasks[taskId].tMenuListTaskId, NULL, NULL);