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/move_relearner.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/move_relearner.c')
| -rw-r--r-- | src/move_relearner.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/move_relearner.c b/src/move_relearner.c index 3e7caf133..cd4da5835 100644 --- a/src/move_relearner.c +++ b/src/move_relearner.c @@ -732,7 +732,7 @@ static void DoMoveRelearnerMain(void) } break; case MENU_STATE_WAIT_FOR_A_BUTTON: - if (gMain.newKeys & A_BUTTON) + if (JOY_NEW(A_BUTTON)) { PlaySE(SE_SELECT); sMoveRelearnerStruct->state = MENU_STATE_FADE_AND_RETURN; @@ -778,7 +778,7 @@ static void HandleInput(bool8 showContest) switch (itemId) { case LIST_NOTHING_CHOSEN: - if (!(gMain.newKeys & (DPAD_LEFT | DPAD_RIGHT)) && !GetLRKeysPressed()) + if (!(JOY_NEW(DPAD_LEFT | DPAD_RIGHT)) && !GetLRKeysPressed()) { break; } |