diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2020-09-01 14:25:21 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-09-01 14:25:21 -0400 |
| commit | 7c8bc0fbe3606f9dac1f84a9f3a25879cb984782 (patch) | |
| tree | ba6d8050355cbe28e70f525b62256c0f776ea1d8 /gflib/text.c | |
| parent | ff9204a5ff0789ee696ea1fb9273577df01b833c (diff) | |
| parent | 5504ceada36bfdf840552e9238c81f11ed7c3581 (diff) | |
Merge pull request #1149 from PokeCodec/datatypes
gflib documenting
Diffstat (limited to 'gflib/text.c')
| -rw-r--r-- | gflib/text.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/gflib/text.c b/gflib/text.c index 636fe50a9..2f4dc4f19 100644 --- a/gflib/text.c +++ b/gflib/text.c @@ -154,7 +154,7 @@ u16 AddTextPrinterParameterized(u8 windowId, u8 fontId, const u8 *str, u8 x, u8 printerTemplate.currentY = y; printerTemplate.letterSpacing = gFonts[fontId].letterSpacing; printerTemplate.lineSpacing = gFonts[fontId].lineSpacing; - printerTemplate.unk = gFonts[fontId].unk; + printerTemplate.style = gFonts[fontId].style; printerTemplate.fgColor = gFonts[fontId].fgColor; printerTemplate.bgColor = gFonts[fontId].bgColor; printerTemplate.shadowColor = gFonts[fontId].shadowColor; @@ -484,7 +484,7 @@ u8 GetLastTextColor(u8 colorType) { \ dst = windowTiles + ((j / 8) * 32) + ((j & 7) >> 1) + ((i / 8) * widthOffset) + ((i & 7) * 4); \ bits = ((j & 1) * 4); \ - *dst = (toOrr << bits) | ((0xF0 >> bits) & *dst); \ + *dst = (toOrr << bits) | (*dst & (0xF0 >> bits)); \ } \ r5 >>= 4; \ } \ @@ -1567,7 +1567,7 @@ void SetDefaultFontsPointer(void) u8 GetFontAttribute(u8 fontId, u8 attributeId) { - int result = 0; + u8 result = 0; switch (attributeId) { case FONTATTR_MAX_LETTER_WIDTH: @@ -1582,8 +1582,8 @@ u8 GetFontAttribute(u8 fontId, u8 attributeId) case FONTATTR_LINE_SPACING: result = gFontInfos[fontId].lineSpacing; break; - case FONTATTR_UNKNOWN: - result = gFontInfos[fontId].unk; + case FONTATTR_STYLE: + result = gFontInfos[fontId].style; break; case FONTATTR_COLOR_FOREGROUND: result = gFontInfos[fontId].fgColor; |