diff options
| author | garak <garakmon@gmail.com> | 2018-11-27 13:31:07 -0500 |
|---|---|---|
| committer | garak <garakmon@gmail.com> | 2018-11-27 13:31:07 -0500 |
| commit | 50f00b0827a4952a12f90009bd992f23c80a56af (patch) | |
| tree | 6a5f78b04b42c162ed95cfc66c91a8b24f4051b2 /include/text.h | |
| parent | f02cb667bbddf4f4a1152c86cbf9616468e7f0d2 (diff) | |
| parent | c909aa92dee0a8d202d9195d80d0cc96b0d1ebc8 (diff) | |
Merge remote-tracking branch 'upstream/master' into fldeff
Diffstat (limited to 'include/text.h')
| -rw-r--r-- | include/text.h | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/include/text.h b/include/text.h index 4946f1c5f..27a6364bb 100644 --- a/include/text.h +++ b/include/text.h @@ -109,7 +109,8 @@ #define TEXT_SPEED_FF 0xFF -enum { +enum +{ FONTATTR_MAX_LETTER_WIDTH, FONTATTR_MAX_LETTER_HEIGHT, FONTATTR_LETTER_SPACING, @@ -205,21 +206,16 @@ typedef struct { struct Struct_03002F90 { - u8 unk0[0x20]; - u8 unk20[0x20]; - u8 unk40[0x20]; - u8 unk60[0x20]; + u32 unk0[8]; + u32 unk20[8]; + u32 unk40[8]; + u32 unk60[8]; u8 unk80; u8 unk81; }; extern TextFlags gTextFlags; -extern u8 gStringVar1[]; -extern u8 gStringVar2[]; -extern u8 gStringVar3[]; -extern u8 gStringVar4[]; - extern u8 gUnknown_03002F84; extern struct Struct_03002F90 gUnknown_03002F90; @@ -233,7 +229,7 @@ u32 RenderFont(struct TextPrinter *textPrinter); void GenerateFontHalfRowLookupTable(u8 fgColor, u8 bgColor, u8 shadowColor); void SaveTextColors(u8 *fgColor, u8 *bgColor, u8 *shadowColor); void RestoreTextColors(u8 *fgColor, u8 *bgColor, u8 *shadowColor); -void DecompressGlyphTile(const u16 *src, u16 *dest); +void DecompressGlyphTile(const void *src_, void *dest_); u8 GetLastTextColor(u8 colorType); void CopyGlyphToWindow(struct TextPrinter *x); void ClearTextSpan(struct TextPrinter *textPrinter, u32 width); |