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/field_player_avatar.c | |
| parent | 6545745e5997f48e0c853b30b144a10244e7ba20 (diff) | |
Re-apply joypad macros (minus merge conflicts)
Diffstat (limited to 'src/field_player_avatar.c')
| -rw-r--r-- | src/field_player_avatar.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/field_player_avatar.c b/src/field_player_avatar.c index 194f110d8..f8c4e79f1 100644 --- a/src/field_player_avatar.c +++ b/src/field_player_avatar.c @@ -1788,7 +1788,7 @@ static bool8 Fishing_ShowDots(struct Task *task) AlignFishingAnimationFrames(); task->tFrameCounter++; - if (gMain.newKeys & A_BUTTON) + if (JOY_NEW(A_BUTTON)) { task->tStep = FISHING_NO_BITE; if (task->tRoundsPlayed != 0) @@ -1877,7 +1877,7 @@ static bool8 Fishing_WaitForA(struct Task *task) task->tFrameCounter++; if (task->tFrameCounter >= reelTimeouts[task->tFishingRod]) task->tStep = FISHING_GOT_AWAY; - else if (gMain.newKeys & A_BUTTON) + else if (JOY_NEW(A_BUTTON)) task->tStep++; return FALSE; } |