diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2020-03-05 16:14:40 -0500 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2020-03-05 16:14:40 -0500 |
| commit | 2e8d5d6279088ac5a2aad108f9ce895b2619e3bb (patch) | |
| tree | f05b0cdb3e31020ea0d1c9025b922972f8a4eb51 | |
| parent | 3dc2acc32db7194d37b8ffae5971e492152dbaad (diff) | |
Address remaining review comments
| -rw-r--r-- | src/dodrio_berry_picking.c | 2 | ||||
| -rw-r--r-- | 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] |