Switch to button macros

1 files changed, 11 insertions, 11 deletions

diff --git a/src/union_room.c b/src/union_room.c
index f886d0383..05bd8cfb0 100644
--- a/src/union_room.c
+++ b/src/union_room.c
@@ -445,7 +445,7 @@ static void Task_TryBecomeLinkLeader(u8 taskId)
         break;
     case LL_STATE_AWAIT_PLAYERS:
         Leader_SetStateIfMemberListChanged(data, LL_STATE_ACCEPT_NEW_MEMBER_PROMPT, LL_STATE_MEMBER_LEFT);
-        if (gMain.newKeys & B_BUTTON)
+        if (JOY_NEW(B_BUTTON))
         {
             if (data->playerCount == 1)
                 data->state = LL_STATE_SHUTDOWN_AND_FAIL;
@@ -458,7 +458,7 @@ static void Task_TryBecomeLinkLeader(u8 taskId)
             && data->playerCount > GROUP_MIN(sPlayerActivityGroupSize) - 1
             && GROUP_MAX(sPlayerActivityGroupSize) != 0
             && sub_8012240()
-            && gMain.newKeys & START_BUTTON)
+            && JOY_NEW(START_BUTTON))
         {
             data->state = LL_STATE_MEMBERS_OK_PROMPT;
             LinkRfu_StopManagerAndFinalizeSlots();
@@ -1005,7 +1005,7 @@ static void Task_TryJoinLinkGroup(u8 taskId)
             break;
         case 0:
             id = ListMenu_ProcessInput(data->listTaskId);
-            if (gMain.newKeys & A_BUTTON && id != -1)
+            if (JOY_NEW(A_BUTTON) && id != -1)
             {
                 // this unused variable along with the assignment is needed to match
                 u32 activity = data->field_0->arr[id].gname_uname.gname.activity;
@@ -1032,7 +1032,7 @@ static void Task_TryJoinLinkGroup(u8 taskId)
                     PlaySE(SE_WALL_HIT);
                 }
             }
-            else if (gMain.newKeys & B_BUTTON)
+            else if (JOY_NEW(B_BUTTON))
             {
                 data->state = LG_STATE_CANCEL_CHOOSE_LEADER;
             }
@@ -1135,7 +1135,7 @@ static void Task_TryJoinLinkGroup(u8 taskId)
             break;
         }
 
-        if (RfuGetStatus() == RFU_STATUS_OK && gMain.newKeys & B_BUTTON)
+        if (RfuGetStatus() == RFU_STATUS_OK && JOY_NEW(B_BUTTON))
             data->state = LG_STATE_ASK_LEAVE_GROUP;
         break;
     case LG_STATE_ASK_LEAVE_GROUP:
@@ -1889,7 +1889,7 @@ static void Task_MEvent_Leader(u8 taskId)
         break;
     case 4:
         Leader_SetStateIfMemberListChanged(data, 5, 6);
-        if (gMain.newKeys & B_BUTTON)
+        if (JOY_NEW(B_BUTTON))
         {
             data->state = 13;
             DestroyWirelessStatusIndicatorSprite();
@@ -2104,7 +2104,7 @@ static void Task_CardOrNewsWithFriend(u8 taskId)
             break;
         case 0:
             id = ListMenu_ProcessInput(data->listTaskId);
-            if (gMain.newKeys & A_BUTTON && id != -1)
+            if (JOY_NEW(A_BUTTON) && id != -1)
             {
                 // this unused variable along with the assignment is needed to match
                 u32 unusedVar;
@@ -2126,7 +2126,7 @@ static void Task_CardOrNewsWithFriend(u8 taskId)
                     PlaySE(SE_WALL_HIT);
                 }
             }
-            else if (gMain.newKeys & B_BUTTON)
+            else if (JOY_NEW(B_BUTTON))
             {
                 data->state = 6;
             }
@@ -2289,7 +2289,7 @@ static void Task_CardOrNewsOverWireless(u8 taskId)
                     }
                 }
             }
-            else if (gMain.newKeys & B_BUTTON)
+            else if (JOY_NEW(B_BUTTON))
             {
                 data->state = 6;
                 data->refreshTimer = 0;
@@ -2547,7 +2547,7 @@ static void Task_RunUnionRoom(u8 taskId)
         }
         else if (ScriptContext2_IsEnabled() != TRUE)
         {
-            if (gMain.newKeys & A_BUTTON)
+            if (JOY_NEW(A_BUTTON))
             {
                 if (TryInteractWithUnionRoomMember(uroom->field_0, &taskData[0], &taskData[1], uroom->spriteIds))
                 {
@@ -2881,7 +2881,7 @@ static void Task_RunUnionRoom(u8 taskId)
         break;
     case UR_STATE_HANDLE_CONTACT_DATA:
         ReceiveUnionRoomActivityPacket(uroom);
-        if (UnionRoom_HandleContactFromOtherPlayer(uroom) && gMain.newKeys & B_BUTTON)
+        if (UnionRoom_HandleContactFromOtherPlayer(uroom) && JOY_NEW(B_BUTTON))
         {
             sub_8011DE0(1);
             StringCopy(gStringVar4, sText_ChatEnded);