diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2017-12-23 12:14:39 -0500 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2017-12-23 12:14:39 -0500 |
| commit | 26fcc566a4da9287ab4d3795aaadde2a9f4a2947 (patch) | |
| tree | 6fb3de63e8ec91542758fba260a1cc9adfa62d0d /src | |
| parent | 5d95618c2123657ec2623618f44198e123728792 (diff) | |
This might actually be a u32 based on how similar objects are referenced, but I'm not entirely convinced
Diffstat (limited to 'src')
| -rw-r--r-- | src/unk_text_8095904.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/unk_text_8095904.c b/src/unk_text_8095904.c index bd6e78945..4b190bdaa 100644 --- a/src/unk_text_8095904.c +++ b/src/unk_text_8095904.c @@ -8,7 +8,7 @@ // rodata -extern const u8 gFont3LatinGlyphs[]; +extern const u32 gFont3LatinGlyphs[]; // text @@ -21,7 +21,7 @@ void sub_8095904(const u8 *src, u8 *dest, u8 bgOverride, u16 width, u8 bg, u8 *b u16 i; for (i = 0; i < strlen; i++) { - const u8 *glyphs = gFont3LatinGlyphs + ((src[i] & 0xfff0) << 6) + ((src[i] & 0xf) << 5); + const u8 *glyphs = (const u8 *)(gFont3LatinGlyphs + ((src[i] & 0xfff0) * 16) + ((src[i] & 0xf) * 8)); CpuCopy16(glyphs, dest, 32); CpuCopy16(glyphs + 0x200, dest + width, 32); dest += 32; @@ -38,7 +38,7 @@ void sub_8095904(const u8 *src, u8 *dest, u8 bgOverride, u16 width, u8 bg, u8 *b u16 j; for (j = 0; j < strlen; j++) // r5 { - const u8 *glyphs = gFont3LatinGlyphs + (i * 0x200) + ((src[j] & 0xfff0) << 6) + ((src[j] & 0xf) << 5); + const u32 *glyphs = (const u8 *)(gFont3LatinGlyphs + (i * 0x80) + ((src[j] & 0xfff0) * 16) + ((src[j] & 0xf) * 8)); u16 k; // r6 for (k = 0; k < 32; k++) |