summaryrefslogtreecommitdiff
path: root/src/contest.c
diff options
context:
space:
mode:
authorPokeCodec <67983839+PokeCodec@users.noreply.github.com>2020-09-04 21:11:55 -0400
committerPokeCodec <67983839+PokeCodec@users.noreply.github.com>2020-09-04 21:11:55 -0400
commit28ef2fb774bf596a3e7f81055453304e0d2ce066 (patch)
tree4a67ad17888cac15c7cb33fa8aced60a2e3bf6dc /src/contest.c
parentda582d5258703eb52d8cadb4cbaef4ee7031b833 (diff)
Switch to button macros
Diffstat (limited to 'src/contest.c')
-rw-r--r--src/contest.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/contest.c b/src/contest.c
index a2f5b6f99..612d79562 100644
--- a/src/contest.c
+++ b/src/contest.c
@@ -1493,7 +1493,7 @@ static void Task_DisplayAppealNumberText(u8 taskId)
static void Task_TryShowMoveSelectScreen(u8 taskId)
{
// Wait for button press to show move select screen
- if ((gMain.newKeys & A_BUTTON) || (gMain.newKeys == B_BUTTON))
+ if ((JOY_NEW(A_BUTTON)) || (gMain.newKeys == B_BUTTON))
{
PlaySE(SE_SELECT);
if (!Contest_IsMonsTurnDisabled(gContestPlayerMonIndex))
@@ -1559,7 +1559,7 @@ static void Task_HandleMoveSelectInput(u8 taskId)
numMoves++;
}
- if (gMain.newKeys & A_BUTTON)
+ if (JOY_NEW(A_BUTTON))
{
PlaySE(SE_SELECT);
gTasks[taskId].func = Task_SelectedMove;