Address remaining review comments

src/dodrio_berry_picking.c

@@ -2350,7 +2350,7 @@ static void Task_ShowDodrioBerryPickingRecords(u8 taskId)
             data[0]++;
         break;
     case 2:
-        if (gMain.newKeys & (A_BUTTON | B_BUTTON))
+        if (JOY_NEW(A_BUTTON | B_BUTTON))
         {
             rbox_fill_rectangle(data[1]);
             CopyWindowToVram(data[1], 1);

src/dodrio_berry_picking_2.c

@@ -671,7 +671,7 @@ static void sub_81543C4(u8 spriteId)
 
 // Gamefreak made a mistake there and goes out of bounds for the data array as it holds 8 elements
 // in turn overwriting sprite's subpriority and subsprites fields.
-#if defined(NONMATCHING)
+#if defined(BUGFIX)
 #define sKeepPosX data[1]
 #else
 #define sKeepPosX data[10]