summaryrefslogtreecommitdiff
path: root/src/text.c
diff options
context:
space:
mode:
authorDiegoisawesome <diego@domoreaweso.me>2018-05-11 17:24:32 -0500
committerDiegoisawesome <diego@domoreaweso.me>2018-05-11 17:24:32 -0500
commit23b050a99e9603d038743dc14a36c808a822423f (patch)
tree7463de4a9c999351a3e07a24edbc4555d2c0d592 /src/text.c
parent4e2886db8179072badaad0a3ff131b95dd0a7e94 (diff)
Update naked attribute and ASM_DIRECT to NAKED macro
Diffstat (limited to 'src/text.c')
-rw-r--r--src/text.c8
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\