diff options
| author | aaaaaa123456789 <aaaaaa123456789@acidch.at> | 2020-11-02 22:02:39 -0300 |
|---|---|---|
| committer | aaaaaa123456789 <aaaaaa123456789@acidch.at> | 2020-11-02 22:02:39 -0300 |
| commit | bacc831aa91d059936bd7c852bf0a0fb44d8f27a (patch) | |
| tree | 660080b3d0dd091d8827c679f489ffbfb337d3c3 /src/match_call.c | |
| parent | 6545745e5997f48e0c853b30b144a10244e7ba20 (diff) | |
Re-apply joypad macros (minus merge conflicts)
Diffstat (limited to 'src/match_call.c')
| -rw-r--r-- | src/match_call.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/match_call.c b/src/match_call.c index c9752495a..a39739f76 100644 --- a/src/match_call.c +++ b/src/match_call.c @@ -1252,7 +1252,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); @@ -1345,7 +1345,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; |