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/pokenav_conditions_3.c | |
| parent | da582d5258703eb52d8cadb4cbaef4ee7031b833 (diff) | |
Switch to button macros
Diffstat (limited to 'src/pokenav_conditions_3.c')
| -rw-r--r-- | src/pokenav_conditions_3.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/pokenav_conditions_3.c b/src/pokenav_conditions_3.c index eea4aa397..0c1fb08d2 100644 --- a/src/pokenav_conditions_3.c +++ b/src/pokenav_conditions_3.c @@ -170,21 +170,21 @@ static bool32 sub_81CF010(struct PokenavSub7 *structPtr) static u32 sub_81CF030(struct PokenavSub7 *structPtr) { - if (gMain.newAndRepeatedKeys & DPAD_UP) + if (JOY_REPEAT(DPAD_UP)) return 1; - else if (gMain.newAndRepeatedKeys & DPAD_DOWN) + else if (JOY_REPEAT(DPAD_DOWN)) return 2; - else if (gMain.newKeys & DPAD_LEFT) + else if (JOY_NEW(DPAD_LEFT)) return 3; - else if (gMain.newKeys & DPAD_RIGHT) + else if (JOY_NEW(DPAD_RIGHT)) return 4; - else if (gMain.newKeys & B_BUTTON) + else if (JOY_NEW(B_BUTTON)) { structPtr->unk1C = 0; structPtr->unk0 = sub_81CF0B0; return 5; } - else if (gMain.newKeys & A_BUTTON) + else if (JOY_NEW(A_BUTTON)) { structPtr->unkPtr->unk2 = GetSelectedMatchCall(); structPtr->unk1C = 1; |