Undo PokeCodec's PRs

This commit undoes most of PokeCodec's PRs after the debate in chat. Some
harmless or completely superseded PRs have been left alone, as there is not
much benefit in attempting to undo them.

Reverts #1104, #1108, #1115, #1118, #1119, #1124, #1126, #1127, #1132, #1136,
#1137, #1139, #1140, #1144, #1148, #1149, #1150, #1153, #1155, #1177, #1179,
#1180, #1181, #1182 and #1183.

1 files changed, 27 insertions, 27 deletions

diff --git a/src/battle_factory_screen.c b/src/battle_factory_screen.c
index a3fa275c5..388881a1c 100644
--- a/src/battle_factory_screen.c
+++ b/src/battle_factory_screen.c
@@ -1478,7 +1478,7 @@ static void Task_HandleSelectionScreenYesNo(u8 taskId)
             gTasks[taskId].data[0] = 5;
             break;
         case 5:
-            if (JOY_NEW(A_BUTTON))
+            if (gMain.newKeys & A_BUTTON)
             {
                 PlaySE(SE_SELECT);
                 if (sFactorySelectScreen->yesNoCursorPos == 0)
@@ -1496,7 +1496,7 @@ static void Task_HandleSelectionScreenYesNo(u8 taskId)
                     gTasks[taskId].func = Task_HandleSelectionScreenChooseMons;
                 }
             }
-            else if (JOY_NEW(B_BUTTON))
+            else if (gMain.newKeys & B_BUTTON)
             {
                 PlaySE(SE_SELECT);
                 sub_819B958(4);
@@ -1505,12 +1505,12 @@ static void Task_HandleSelectionScreenYesNo(u8 taskId)
                 gTasks[taskId].data[0] = 1;
                 gTasks[taskId].func = Task_HandleSelectionScreenChooseMons;
             }
-            else if (JOY_REPEAT(DPAD_UP))
+            else if (gMain.newAndRepeatedKeys & DPAD_UP)
             {
                 PlaySE(SE_SELECT);
                 Select_UpdateYesNoCursorPosition(-1);
             }
-            else if (JOY_REPEAT(DPAD_DOWN))
+            else if (gMain.newAndRepeatedKeys & DPAD_DOWN)
             {
                 PlaySE(SE_SELECT);
                 Select_UpdateYesNoCursorPosition(1);
@@ -1538,7 +1538,7 @@ static void Task_HandleSelectionScreenMenu(u8 taskId)
         }
         break;
     case 3:
-        if (JOY_NEW(A_BUTTON))
+        if (gMain.newKeys & A_BUTTON)
         {
             u8 retVal;
             PlaySE(SE_SELECT);
@@ -1565,7 +1565,7 @@ static void Task_HandleSelectionScreenMenu(u8 taskId)
                 gTasks[taskId].func = Task_FromSelectScreenToSummaryScreen;
             }
         }
-        else if (JOY_NEW(B_BUTTON))
+        else if (gMain.newKeys & B_BUTTON)
         {
             PlaySE(SE_SELECT);
             sub_819F3F8(sFactorySelectScreen->unk294[1], &sFactorySelectScreen->unk2A0, FALSE);
@@ -1574,12 +1574,12 @@ static void Task_HandleSelectionScreenMenu(u8 taskId)
             gTasks[taskId].data[0] = 1;
             gTasks[taskId].func = Task_HandleSelectionScreenChooseMons;
         }
-        else if (JOY_REPEAT(DPAD_UP))
+        else if (gMain.newAndRepeatedKeys & DPAD_UP)
         {
             PlaySE(SE_SELECT);
             Select_UpdateMenuCursorPosition(-1);
         }
-        else if (JOY_REPEAT(DPAD_DOWN))
+        else if (gMain.newAndRepeatedKeys & DPAD_DOWN)
         {
             PlaySE(SE_SELECT);
             Select_UpdateMenuCursorPosition(1);
@@ -1618,21 +1618,21 @@ static void Task_HandleSelectionScreenChooseMons(u8 taskId)
             }
             break;
         case 1:
-            if (JOY_NEW(A_BUTTON))
+            if (gMain.newKeys & A_BUTTON)
             {
                 PlaySE(SE_SELECT);
                 sFactorySelectScreen->unk2A2 = FALSE;
                 gTasks[taskId].data[0] = 2;
                 gTasks[taskId].func = Task_HandleSelectionScreenMenu;
             }
-            else if (JOY_REPEAT(DPAD_LEFT))
+            else if (gMain.newAndRepeatedKeys & DPAD_LEFT)
             {
                 PlaySE(SE_SELECT);
                 Select_UpdateBallCursorPosition(-1);
                 Select_PrintMonCategory();
                 Select_PrintMonSpecies();
             }
-            else if (JOY_REPEAT(DPAD_RIGHT))
+            else if (gMain.newAndRepeatedKeys & DPAD_RIGHT)
             {
                 PlaySE(SE_SELECT);
                 Select_UpdateBallCursorPosition(1);
@@ -1641,7 +1641,7 @@ static void Task_HandleSelectionScreenChooseMons(u8 taskId)
             }
             break;
         case 11:
-            if (JOY_NEW(A_BUTTON))
+            if (gMain.newKeys & A_BUTTON)
             {
                 PlaySE(SE_SELECT);
                 sub_819F3F8(sFactorySelectScreen->unk294[1], &sFactorySelectScreen->unk2A0, FALSE);
@@ -2361,7 +2361,7 @@ static void Task_HandleSwapScreenYesNo(u8 taskId)
             gTasks[taskId].data[0] = 5;
             break;
         case 5:
-            if (JOY_NEW(A_BUTTON))
+            if (gMain.newKeys & A_BUTTON)
             {
                 PlaySE(SE_SELECT);
                 if (sFactorySwapScreen->yesNoCursorPos == 0)
@@ -2380,7 +2380,7 @@ static void Task_HandleSwapScreenYesNo(u8 taskId)
                     gTasks[taskId].func = (void*)((hiPtr << 16) | loPtr);
                 }
             }
-            else if (JOY_NEW(B_BUTTON))
+            else if (gMain.newKeys & B_BUTTON)
             {
                 PlaySE(SE_SELECT);
                 gTasks[taskId].data[1] = 0;
@@ -2389,12 +2389,12 @@ static void Task_HandleSwapScreenYesNo(u8 taskId)
                 loPtr = gTasks[taskId].data[7];
                 gTasks[taskId].func = (void*)((hiPtr << 16) | loPtr);
             }
-            else if (JOY_REPEAT(DPAD_UP))
+            else if (gMain.newAndRepeatedKeys & DPAD_UP)
             {
                 PlaySE(SE_SELECT);
                 Swap_UpdateYesNoCursorPosition(-1);
             }
-            else if (JOY_REPEAT(DPAD_DOWN))
+            else if (gMain.newAndRepeatedKeys & DPAD_DOWN)
             {
                 PlaySE(SE_SELECT);
                 Swap_UpdateYesNoCursorPosition(1);
@@ -2485,12 +2485,12 @@ static void Task_HandleSwapScreenMenu(u8 taskId)
     case 3:
         if (sFactorySwapScreen->unk30 != TRUE)
         {
-            if (JOY_NEW(A_BUTTON))
+            if (gMain.newKeys & A_BUTTON)
             {
                 PlaySE(SE_SELECT);
                 Swap_RunMenuOptionFunc(taskId);
             }
-            else if (JOY_NEW(B_BUTTON))
+            else if (gMain.newKeys & B_BUTTON)
             {
                 PlaySE(SE_SELECT);
                 sub_819F3F8(sFactorySwapScreen->unk2C, &sFactorySwapScreen->unk30, TRUE);
@@ -2501,11 +2501,11 @@ static void Task_HandleSwapScreenMenu(u8 taskId)
                 gTasks[taskId].data[5] = 1;
                 gTasks[taskId].func = sub_819D770;
             }
-            else if (JOY_REPEAT(DPAD_UP))
+            else if (gMain.newAndRepeatedKeys & DPAD_UP)
             {
                 Swap_UpdateMenuCursorPosition(-1);
             }
-            else if (JOY_REPEAT(DPAD_DOWN))
+            else if (gMain.newAndRepeatedKeys & DPAD_DOWN)
             {
                 Swap_UpdateMenuCursorPosition(1);
             }
@@ -2526,7 +2526,7 @@ static void Task_HandleSwapScreenChooseMons(u8 taskId)
         }
         break;
     case 1:
-        if (JOY_NEW(A_BUTTON))
+        if (gMain.newKeys & A_BUTTON)
         {
             PlaySE(SE_SELECT);
             sFactorySwapScreen->unk22 = FALSE;
@@ -2534,7 +2534,7 @@ static void Task_HandleSwapScreenChooseMons(u8 taskId)
             sub_819EAC0();
             Swap_RunActionFunc(taskId);
         }
-        else if (JOY_NEW(B_BUTTON))
+        else if (gMain.newKeys & B_BUTTON)
         {
             PlaySE(SE_SELECT);
             sFactorySwapScreen->unk22 = FALSE;
@@ -2546,25 +2546,25 @@ static void Task_HandleSwapScreenChooseMons(u8 taskId)
             gTasks[taskId].data[5] = 0;
             gTasks[taskId].func = sub_819D588;
         }
-        else if (JOY_REPEAT(DPAD_LEFT))
+        else if (gMain.newAndRepeatedKeys & DPAD_LEFT)
         {
             Swap_UpdateBallCursorPosition(-1);
             Swap_PrintMonCategory();
             Swap_PrintMonSpecies();
         }
-        else if (JOY_REPEAT(DPAD_RIGHT))
+        else if (gMain.newAndRepeatedKeys & DPAD_RIGHT)
         {
             Swap_UpdateBallCursorPosition(1);
             Swap_PrintMonCategory();
             Swap_PrintMonSpecies();
         }
-        else if (JOY_REPEAT(DPAD_DOWN))
+        else if (gMain.newAndRepeatedKeys & DPAD_DOWN)
         {
             Swap_UpdateActionCursorPosition(1);
             Swap_PrintMonCategory();
             Swap_PrintMonSpecies();
         }
-        else if (JOY_REPEAT(DPAD_UP))
+        else if (gMain.newAndRepeatedKeys & DPAD_UP)
         {
             Swap_UpdateActionCursorPosition(-1);
             Swap_PrintMonCategory();
@@ -3929,7 +3929,7 @@ static void Task_SwapCantHaveSameMons(u8 taskId)
         gTasks[taskId].data[0]++;
         break;
     case 1:
-        if (JOY_NEW(A_BUTTON) || JOY_NEW(B_BUTTON))
+        if (gMain.newKeys & A_BUTTON || gMain.newKeys & B_BUTTON)
         {
             PlaySE(SE_SELECT);
             sub_819F3F8(sFactorySwapScreen->unk2C, &sFactorySwapScreen->unk30, TRUE);