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 /gflib | |
| parent | da582d5258703eb52d8cadb4cbaef4ee7031b833 (diff) | |
Switch to button macros
Diffstat (limited to 'gflib')
| -rw-r--r-- | gflib/text.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/gflib/text.c b/gflib/text.c index 274ceadee..169f625bc 100644 --- a/gflib/text.c +++ b/gflib/text.c @@ -786,7 +786,7 @@ bool16 TextPrinterWaitWithDownArrow(struct TextPrinter *textPrinter) else { TextPrinterDrawDownArrow(textPrinter); - if (gMain.newKeys & (A_BUTTON | B_BUTTON)) + if (JOY_NEW(A_BUTTON | B_BUTTON)) { result = TRUE; PlaySE(SE_SELECT); @@ -802,7 +802,7 @@ bool16 TextPrinterWait(struct TextPrinter *textPrinter) { result = TextPrinterWaitAutoMode(textPrinter); } - else if (gMain.newKeys & (A_BUTTON | B_BUTTON)) + else if (JOY_NEW(A_BUTTON | B_BUTTON)) { result = TRUE; PlaySE(SE_SELECT); @@ -862,13 +862,13 @@ u16 RenderText(struct TextPrinter *textPrinter) switch (textPrinter->state) { case 0: - if ((gMain.heldKeys & (A_BUTTON | B_BUTTON)) && subStruct->hasPrintBeenSpedUp) + if ((JOY_HELD(A_BUTTON | B_BUTTON)) && subStruct->hasPrintBeenSpedUp) textPrinter->delayCounter = 0; if (textPrinter->delayCounter && textPrinter->textSpeed) { textPrinter->delayCounter--; - if (gTextFlags.canABSpeedUpPrint && (gMain.newKeys & (A_BUTTON | B_BUTTON))) + if (gTextFlags.canABSpeedUpPrint && (JOY_NEW(A_BUTTON | B_BUTTON))) { subStruct->hasPrintBeenSpedUp = TRUE; textPrinter->delayCounter = 0; |