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, 10 insertions, 10 deletions

diff --git a/src/trade.c b/src/trade.c
index 17aaba565..3072b8585 100644
--- a/src/trade.c
+++ b/src/trade.c
@@ -1353,24 +1353,24 @@ static void SetReadyToTrade(void)
 
 static void TradeMenuProcessInput(void)
 {
-    if (JOY_REPEAT(DPAD_UP))
+    if (gMain.newAndRepeatedKeys & DPAD_UP)
     {
         TradeMenuMoveCursor(&sTradeMenuData->cursorPosition, 0);
     }
-    else if (JOY_REPEAT(DPAD_DOWN))
+    else if (gMain.newAndRepeatedKeys & DPAD_DOWN)
     {
         TradeMenuMoveCursor(&sTradeMenuData->cursorPosition, 1);
     }
-    else if (JOY_REPEAT(DPAD_LEFT))
+    else if (gMain.newAndRepeatedKeys & DPAD_LEFT)
     {
         TradeMenuMoveCursor(&sTradeMenuData->cursorPosition, 2);
     }
-    else if (JOY_REPEAT(DPAD_RIGHT))
+    else if (gMain.newAndRepeatedKeys & DPAD_RIGHT)
     {
         TradeMenuMoveCursor(&sTradeMenuData->cursorPosition, 3);
     }
 
-    if (JOY_NEW(A_BUTTON))
+    if (gMain.newKeys & A_BUTTON)
     {
         PlaySE(SE_SELECT);
 
@@ -1451,7 +1451,7 @@ static void TradeMenuProcessInput_SelectedMon(void)
 
 static void ChooseMonAfterButtonPress(void)
 {
-    if ((JOY_NEW(A_BUTTON)) || (JOY_NEW(B_BUTTON)))
+    if ((gMain.newKeys & A_BUTTON) || (gMain.newKeys & B_BUTTON))
     {
         PlaySE(SE_SELECT);
         TradeMenuChooseMon();
@@ -1626,7 +1626,7 @@ static void RedrawTradeMenuAfterPressA(void)
 {
     int i;
 
-    if (JOY_NEW(A_BUTTON))
+    if (gMain.newKeys & A_BUTTON)
     {
         PlaySE(SE_SELECT);
         rbox_fill_rectangle(0);
@@ -1698,7 +1698,7 @@ static void LinkTradeWaitForQueue(void)
 
 static void PartnersMonWasInvalid(void)
 {
-    if (JOY_NEW(A_BUTTON))
+    if (gMain.newKeys & A_BUTTON)
     {
         SetLinkData(LINKCMD_READY_CANCEL_TRADE, 0);
         sTradeMenuData->tradeMenuFunc = TRADEMENUFUNC_STANDBY;
@@ -3728,7 +3728,7 @@ static bool8 AnimateTradeSequenceCable(void)
         {
             return TRUE;
         }
-        else if (JOY_NEW(A_BUTTON))
+        else if (gMain.newKeys & A_BUTTON)
         {
             sTradeData->state++;
         }
@@ -4243,7 +4243,7 @@ static bool8 AnimateTradeSequenceWireless(void)
         {
             return TRUE;
         }
-        else if (JOY_NEW(A_BUTTON))
+        else if (gMain.newKeys & A_BUTTON)
         {
             sTradeData->state++;
         }