diff options
| author | Akira Akashi <rubenru09@aol.com> | 2021-06-23 00:11:42 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-06-23 00:11:42 +0100 |
| commit | 5e61b9f18d4592bd964e238e2d3f45265f863cea (patch) | |
| tree | 4d57137cd2097018e31d2db19d72c22f51942834 /arm9/src/render_text.c | |
| parent | cec1d428f458997fe3e4c0ac4abf0dc6b36ba699 (diff) | |
| parent | 66d408a02664eabd153377fe3f4842da0da2d627 (diff) | |
Merge branch 'master' into 0202A1E0
Diffstat (limited to 'arm9/src/render_text.c')
| -rw-r--r-- | arm9/src/render_text.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/arm9/src/render_text.c b/arm9/src/render_text.c index af0218c8..34777739 100644 --- a/arm9/src/render_text.c +++ b/arm9/src/render_text.c @@ -4,6 +4,7 @@ #include "string_util.h" #include "text.h" #include "unk_0201B8B8.h" +#include "font.h" u16 unk00; @@ -11,7 +12,6 @@ TextFlags gTextFlags; const u8 UNK_020ECB50[] = { 0, 1, 2, 1 }; -extern const char *FUN_02002D94(u8, u16); extern void PlaySE(u16); THUMB_FUNC u32 RenderText(struct TextPrinter *printer) @@ -207,16 +207,16 @@ THUMB_FUNC u32 RenderText(struct TextPrinter *printer) return 3; } - const char *r5 = FUN_02002D94(subStruct->glyphId, currentChar); + struct UnkStruct_02002C14 *r5 = FUN_02002D94(subStruct->glyphId, currentChar); CopyGlyphToWindow(printer->printerTemplate.window, - r5, - r5[0x80], - r5[0x81], + r5->buf, + r5->width, + r5->height, printer->printerTemplate.currentX, printer->printerTemplate.currentY, printer->printerTemplate.unk2); - printer->printerTemplate.currentX += r5[0x80] + printer->printerTemplate.letterSpacing; + printer->printerTemplate.currentX += r5->width + printer->printerTemplate.letterSpacing; return 0; case 1: |