summaryrefslogtreecommitdiff
path: root/src/match_call.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/match_call.c
parentda582d5258703eb52d8cadb4cbaef4ee7031b833 (diff)
Switch to button macros
Diffstat (limited to 'src/match_call.c')
-rw-r--r--src/match_call.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/match_call.c b/src/match_call.c
index c02cc6c39..1899eabf0 100644
--- a/src/match_call.c
+++ b/src/match_call.c
@@ -1253,7 +1253,7 @@ static bool32 sub_81962D8(u8 taskId)
static bool32 sub_8196330(u8 taskId)
{
s16 *taskData = gTasks[taskId].data;
- if (!ExecuteMatchCallTextPrinter(taskData[2]) && !IsSEPlaying() && gMain.newKeys & (A_BUTTON | B_BUTTON))
+ if (!ExecuteMatchCallTextPrinter(taskData[2]) && !IsSEPlaying() && JOY_NEW(A_BUTTON | B_BUTTON))
{
FillWindowPixelBuffer(taskData[2], PIXEL_FILL(8));
CopyWindowToVram(taskData[2], 2);
@@ -1346,7 +1346,7 @@ static void InitMatchCallTextPrinter(int windowId, const u8 *str)
static bool32 ExecuteMatchCallTextPrinter(int windowId)
{
- if (gMain.heldKeys & A_BUTTON)
+ if (JOY_HELD(A_BUTTON))
gTextFlags.canABSpeedUpPrint = 1;
else
gTextFlags.canABSpeedUpPrint = 0;