diff options
| author | PokeCodec <67983839+PokeCodec@users.noreply.github.com> | 2020-09-04 21:11:55 -0400 |
|---|---|---|
| committer | PokeCodec <67983839+PokeCodec@users.noreply.github.com> | 2020-09-04 21:11:55 -0400 |
| commit | 28ef2fb774bf596a3e7f81055453304e0d2ce066 (patch) | |
| tree | 4a67ad17888cac15c7cb33fa8aced60a2e3bf6dc /src/berry_crush.c | |
| parent | da582d5258703eb52d8cadb4cbaef4ee7031b833 (diff) | |
Switch to button macros
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); |