diff options
| author | Sierra A <6080951+Sierraffinity@users.noreply.github.com> | 2020-05-20 19:50:52 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-20 19:50:52 -0700 |
| commit | 02416dc79caf63cf0a43f3725db5168fd864b4fe (patch) | |
| tree | d563e97c7b5fea2d6a45b192ee5771c62025d822 /src | |
| parent | 476acc00d5f6d1cebcd89e498f6f3d09c1347432 (diff) | |
| parent | d301d438c1c48666f6d164ab53753e80cb525575 (diff) | |
Merge pull request #1053 from Sierraffinity/text-drawdownarrow-fix
Fix TextPrinterDrawDownArrow fakematch
Diffstat (limited to 'src')
| -rw-r--r-- | src/unk_text_util_2.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/unk_text_util_2.c b/src/unk_text_util_2.c index b1d2264e4..a0b1281a4 100644 --- a/src/unk_text_util_2.c +++ b/src/unk_text_util_2.c @@ -13,13 +13,13 @@ static void DecompressGlyphFont6(u16); u16 Font6Func(struct TextPrinter *textPrinter) { u16 char_; - struct TextPrinterSubStruct *sub; + struct TextPrinterSubStruct *subStruct; + subStruct = (struct TextPrinterSubStruct *)(&textPrinter->subStructFields); - sub = &textPrinter->subUnion.sub; switch (textPrinter->state) { case 0: - if (gMain.heldKeys & (A_BUTTON | B_BUTTON) && sub->hasPrintBeenSpedUp) + if (gMain.heldKeys & (A_BUTTON | B_BUTTON) && subStruct->hasPrintBeenSpedUp) { textPrinter->delayCounter = 0; } @@ -28,7 +28,7 @@ u16 Font6Func(struct TextPrinter *textPrinter) textPrinter->delayCounter --; if (gTextFlags.canABSpeedUpPrint && gMain.newKeys & (A_BUTTON | B_BUTTON)) { - sub->hasPrintBeenSpedUp = TRUE; + subStruct->hasPrintBeenSpedUp = TRUE; textPrinter->delayCounter = 0; } return 3; @@ -81,7 +81,7 @@ u16 Font6Func(struct TextPrinter *textPrinter) textPrinter->printerTemplate.currentChar++; return 2; case 6: - sub->glyphId = *textPrinter->printerTemplate.currentChar; + subStruct->glyphId = *textPrinter->printerTemplate.currentChar; textPrinter->printerTemplate.currentChar++; return 2; case 7: @@ -94,7 +94,7 @@ u16 Font6Func(struct TextPrinter *textPrinter) textPrinter->state = 1; if (gTextFlags.autoScroll) { - sub->autoScrollDelay = 0; + subStruct->autoScrollDelay = 0; } return 3; case 10: |