diff options
| author | aaaaaa123456789 <aaaaaa123456789@acidch.at> | 2020-11-02 22:18:26 -0300 |
|---|---|---|
| committer | aaaaaa123456789 <aaaaaa123456789@acidch.at> | 2020-11-02 22:18:26 -0300 |
| commit | ca950a8daf6dd95ab5dacc51f250fea7b605361c (patch) | |
| tree | b787e8f28ed7f957c6996b6db785c94afd7e69c3 /gflib/text.c | |
| parent | bacc831aa91d059936bd7c852bf0a0fb44d8f27a (diff) | |
Solve merge conflicts from previous commit
Diffstat (limited to 'gflib/text.c')
| -rw-r--r-- | gflib/text.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/gflib/text.c b/gflib/text.c index 30c142fa8..4cbad1376 100644 --- a/gflib/text.c +++ b/gflib/text.c @@ -783,7 +783,7 @@ bool16 TextPrinterWait(struct TextPrinter *textPrinter) } else { - if (gMain.newKeys & (A_BUTTON | B_BUTTON)) + if (JOY_NEW(A_BUTTON | B_BUTTON)) { result = TRUE; PlaySE(SE_SELECT); |