From 2e8d5d6279088ac5a2aad108f9ce895b2619e3bb Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Thu, 5 Mar 2020 16:14:40 -0500
Subject: [PATCH] Address remaining review comments

---
 src/dodrio_berry_picking.c   | 2 +-
 src/dodrio_berry_picking_2.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/dodrio_berry_picking.c b/src/dodrio_berry_picking.c
index 6c3cb2b08..ea6d46df2 100644
--- a/src/dodrio_berry_picking.c
+++ b/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);
diff --git a/src/dodrio_berry_picking_2.c b/src/dodrio_berry_picking_2.c
index dc4296d17..e170ac903 100644
--- a/src/dodrio_berry_picking_2.c
+++ b/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]