diff options
author | Diegoisawesome <diego@domoreaweso.me> | 2018-01-25 15:25:35 -0600 |
---|---|---|
committer | Diegoisawesome <diego@domoreaweso.me> | 2018-01-25 15:25:35 -0600 |
commit | 7d8a2ae7f0d9edaca7770cf472909bf9197acf2a (patch) | |
tree | da6571f7582a740ae28e6f8576243915f755e22f /src/text.c | |
parent | 10037ac0e1c1737dc7cb309257369b17ccd5e028 (diff) |
Decompile new_menu_helpers.s
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 5db3ba308..50e39ab0c 100644 --- a/src/text.c +++ b/src/text.c @@ -159,7 +159,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); @@ -189,7 +189,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; @@ -3218,7 +3218,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; |