diff options
| author | Diegoisawesome <Diegoisawesome@users.noreply.github.com> | 2018-02-11 21:10:32 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-11 21:10:32 -0600 |
| commit | 98860220e9317a86b9171677086c9dc7cbeaf0f0 (patch) | |
| tree | 625ec0a6469b40573d165ceee0855e969af45929 /src/text.c | |
| parent | 14a76793e596d612efd273169c4172922c270f13 (diff) | |
| parent | ea347199a21f7a6c01a395e507db872ac1781e79 (diff) | |
Merge pull request #110 from PikalaxALT/link
Link and some RFU
Diffstat (limited to 'src/text.c')
| -rw-r--r-- | src/text.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/text.c b/src/text.c index 6a83d5d15..a2495d068 100644 --- a/src/text.c +++ b/src/text.c @@ -379,7 +379,7 @@ void GenerateFontHalfRowLookupTable(u8 fgColor, u8 bgColor, u8 shadowColor) *(current++) = (shadowColor << 12) | (shadowColor << 8) | (shadowColor << 4) | shadowColor; } #else -__attribute__((naked)) +ASM_DIRECT void GenerateFontHalfRowLookupTable(u8 fgColor, u8 bgColor, u8 shadowColor) { asm("push {r4-r7,lr}\n\ @@ -875,7 +875,7 @@ void DecompressGlyphTile(const u16 *src, u16 *dest) *(dest) = (gFontHalfRowLookupTable[gFontHalfRowOffsets[src[1] & 0xFF]] << 16) | gFontHalfRowLookupTable[gFontHalfRowOffsets[src[1] >> 8]]; } #else -__attribute__((naked)) +ASM_DIRECT void DecompressGlyphTile(const u16 *src, u16 *dest) { asm("push {r4-r7,lr}\n\ @@ -1056,7 +1056,7 @@ u8 GetLastTextColor(u8 colorType) } } -__attribute__((naked)) +ASM_DIRECT void CopyGlyphToWindow(struct TextPrinter *x) { asm("push {r4-r7,lr}\n\ @@ -2285,7 +2285,6 @@ u16 RenderText(struct TextPrinter *textPrinter) else textPrinter->subPrinter.currentX += gUnknown_03002F90[0x80]; } - return 0; case 1: // _08005C78 if (TextPrinterWait(textPrinter)) |