diff options
| author | golem galvanize <golemgalvanize@github.com> | 2018-02-07 19:31:33 -0500 |
|---|---|---|
| committer | golem galvanize <golemgalvanize@github.com> | 2018-02-07 19:31:33 -0500 |
| commit | 03f8d0d6ce48a302a21d7ef99eed9825800a6394 (patch) | |
| tree | cb0240ef6e2468ee49730a3b620d440e5e88d4bc /src/text.c | |
| parent | 4a903279df847024148b823990a317e79bc23c9f (diff) | |
| parent | 250538fcae79e4d11c6efb4f4bfb34080f72bd48 (diff) | |
Merge branch 'master' of https://github.com/pret/pokeemerald into decompile_main_menu
Diffstat (limited to 'src/text.c')
| -rw-r--r-- | src/text.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/text.c b/src/text.c index 936f96798..6a83d5d15 100644 --- a/src/text.c +++ b/src/text.c @@ -164,7 +164,7 @@ u16 PrintTextOnWindow(u8 windowId, u8 fontId, const u8 *str, u8 x, u8 y, u8 spee subPrinter.letterSpacing = gFonts[fontId].letterSpacing; subPrinter.lineSpacing = gFonts[fontId].lineSpacing; subPrinter.fontColor_l = gFonts[fontId].fontColor_l; - subPrinter.fontColor_h = gFonts[fontId].fontColor_h; + subPrinter.fgColor = gFonts[fontId].fgColor; subPrinter.bgColor = gFonts[fontId].bgColor; subPrinter.shadowColor = gFonts[fontId].shadowColor; return AddTextPrinter(&subPrinter, speed, callback); @@ -194,7 +194,7 @@ bool16 AddTextPrinter(struct TextSubPrinter *textSubPrinter, u8 speed, void (*ca gTempTextPrinter.minLetterSpacing = 0; gTempTextPrinter.japanese = 0; - GenerateFontHalfRowLookupTable(textSubPrinter->fontColor_h, textSubPrinter->bgColor, textSubPrinter->shadowColor); + GenerateFontHalfRowLookupTable(textSubPrinter->fgColor, textSubPrinter->bgColor, textSubPrinter->shadowColor); if (speed != TEXT_SPEED_FF && speed != 0x0) { --gTempTextPrinter.text_speed; @@ -3518,7 +3518,7 @@ u8 GetFontAttribute(u8 fontId, u8 attributeId) result = gFontInfos[fontId].fontColor_l; break; case 5: - result = gFontInfos[fontId].fontColor_h; + result = gFontInfos[fontId].fgColor; break; case 6: result = gFontInfos[fontId].bgColor; |