diff options
author | PikalaxALT <PikalaxALT@users.noreply.github.com> | 2020-09-05 10:25:10 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-09-05 10:25:10 -0400 |
commit | 16ecbc6446f4e8d308e71aa5e649c69acb8a6b3e (patch) | |
tree | 309ee7f0dd15192ad2ead860c8a6e2cabe5b9214 /src/berry_tag_screen.c | |
parent | bb98e346e537ffa71a529db71688975b9a850cfa (diff) | |
parent | 3e25d9e5a2e0346a53b1bfdf9e14f98e14cceb21 (diff) |
Merge pull request #1177 from PokeCodec/MatchEmerald
Match All but 2 remaining naked functions
Diffstat (limited to 'src/berry_tag_screen.c')
-rw-r--r-- | src/berry_tag_screen.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/berry_tag_screen.c b/src/berry_tag_screen.c index e5c89bdb7..089228b17 100644 --- a/src/berry_tag_screen.c +++ b/src/berry_tag_screen.c @@ -536,12 +536,12 @@ static void Task_HandleInput(u8 taskId) { if (!gPaletteFade.active) { - u16 arrowKeys = gMain.newAndRepeatedKeys & DPAD_ANY; + u16 arrowKeys = JOY_REPEAT(DPAD_ANY); if (arrowKeys == DPAD_UP) TryChangeDisplayedBerry(taskId, -1); else if (arrowKeys == DPAD_DOWN) TryChangeDisplayedBerry(taskId, 1); - else if (gMain.newKeys & (A_BUTTON | B_BUTTON)) + else if (JOY_NEW(A_BUTTON | B_BUTTON)) PrepareToCloseBerryTagScreen(taskId); } } |