summaryrefslogtreecommitdiff
path: root/src/daycare.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/daycare.c
parent6545745e5997f48e0c853b30b144a10244e7ba20 (diff)
Re-apply joypad macros (minus merge conflicts)
Diffstat (limited to 'src/daycare.c')
-rw-r--r--src/daycare.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/daycare.c b/src/daycare.c
index d6b2e207f..a438c8e85 100644
--- a/src/daycare.c
+++ b/src/daycare.c
@@ -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);