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_crush.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_crush.c')
| -rwxr-xr-x | src/berry_crush.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/berry_crush.c b/src/berry_crush.c index d753e603c..dbbbd20fc 100755 --- a/src/berry_crush.c +++ b/src/berry_crush.c @@ -1665,7 +1665,7 @@ static void Task_ShowBerryCrushRankings(u8 taskId) CopyWindowToVram(data[1], 3); break; case 2: - if (gMain.newKeys & (A_BUTTON | B_BUTTON)) + if (JOY_NEW(A_BUTTON | B_BUTTON)) break; else return; @@ -2498,9 +2498,9 @@ void sub_8023558(struct BerryCrushGame *r3) void sub_80236B8(struct BerryCrushGame *r5) { - if (gMain.newKeys & A_BUTTON) + if (JOY_NEW(A_BUTTON)) r5->unk5C.unk02_2 = 1; - if (gMain.heldKeys & A_BUTTON) + if (JOY_HELD(A_BUTTON)) { if (r5->unk68.as_four_players.others[r5->unk8].unk4.as_hwords[5] < r5->unk28) ++r5->unk68.as_four_players.others[r5->unk8].unk4.as_hwords[5]; @@ -2966,7 +2966,7 @@ static u32 sub_8024048(struct BerryCrushGame *r5, u8 *r6) --r5->unk138.unk0; return 0; } - if (!(gMain.newKeys & A_BUTTON)) + if (!(JOY_NEW(A_BUTTON))) return 0; PlaySE(SE_SELECT); sub_802222C(r5); |