diff options
| author | Diegoisawesome <Diegoisawesome@users.noreply.github.com> | 2018-05-11 17:36:11 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-05-11 17:36:11 -0500 |
| commit | d1df98361f2144b286472e239b2f4bd1ada7dedd (patch) | |
| tree | df5a7f6a47f1e9400fe2eac6fa2ab02f9c6904ee /src/text.c | |
| parent | 3e93615e38842643b8dd115c1fd2e0b4a0dbcd01 (diff) | |
| parent | ce5fc0277a2155e12475de2f3dfcb5e72adc1a6e (diff) | |
Merge pull request #252 from Diegoisawesome/master
Fix sym_common end, rename ASM_DIRECT to NAKED
Diffstat (limited to 'src/text.c')
| -rw-r--r-- | src/text.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/text.c b/src/text.c index eacfd2a1f..f7c68f549 100644 --- a/src/text.c +++ b/src/text.c @@ -375,7 +375,7 @@ void GenerateFontHalfRowLookupTable(u8 fgColor, u8 bgColor, u8 shadowColor) *(current++) = (shadowColor << 12) | (shadowColor << 8) | (shadowColor << 4) | shadowColor; } #else -ASM_DIRECT +NAKED void GenerateFontHalfRowLookupTable(u8 fgColor, u8 bgColor, u8 shadowColor) { asm("push {r4-r7,lr}\n\ @@ -871,7 +871,7 @@ void DecompressGlyphTile(const u16 *src, u16 *dest) *(dest) = (gFontHalfRowLookupTable[gFontHalfRowOffsets[src[1] & 0xFF]] << 16) | gFontHalfRowLookupTable[gFontHalfRowOffsets[src[1] >> 8]]; } #else -ASM_DIRECT +NAKED void DecompressGlyphTile(const u16 *src, u16 *dest) { asm("push {r4-r7,lr}\n\ @@ -1052,7 +1052,7 @@ u8 GetLastTextColor(u8 colorType) } } -ASM_DIRECT +NAKED void CopyGlyphToWindow(struct TextPrinter *x) { asm("push {r4-r7,lr}\n\ @@ -2341,7 +2341,7 @@ u16 RenderText(struct TextPrinter *textPrinter) return 1; } #else -__attribute__((naked)) +NAKED u16 RenderText(struct TextPrinter *textPrinter) { asm("push {r4-r6,lr}\n\ |