summaryrefslogtreecommitdiff
path: root/src/battle_records.c
diff options
context:
space:
mode:
authoraaaaaa123456789 <aaaaaa123456789@acidch.at>2020-11-02 22:02:39 -0300
committeraaaaaa123456789 <aaaaaa123456789@acidch.at>2020-11-02 22:02:39 -0300
commitbacc831aa91d059936bd7c852bf0a0fb44d8f27a (patch)
tree660080b3d0dd091d8827c679f489ffbfb337d3c3 /src/battle_records.c
parent6545745e5997f48e0c853b30b144a10244e7ba20 (diff)
Re-apply joypad macros (minus merge conflicts)
Diffstat (limited to 'src/battle_records.c')
-rw-r--r--src/battle_records.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/battle_records.c b/src/battle_records.c
index 680733527..a8b9ead14 100644
--- a/src/battle_records.c
+++ b/src/battle_records.c
@@ -356,7 +356,7 @@ static void Task_CloseTrainerHillRecordsOnButton(u8 taskId)
{
struct Task *task = &gTasks[taskId];
- if (gMain.newKeys & A_BUTTON || gMain.newKeys & B_BUTTON)
+ if (JOY_NEW(A_BUTTON) || JOY_NEW(B_BUTTON))
{
PlaySE(SE_SELECT);
task->func = Task_BeginPaletteFade;