diff options
| author | golem galvanize <golemgalvanize@github.com> | 2018-02-12 14:00:47 -0500 |
|---|---|---|
| committer | golem galvanize <golemgalvanize@github.com> | 2018-02-12 14:00:47 -0500 |
| commit | 4ac064bbaf54966082a860e6b6723c5ec654c436 (patch) | |
| tree | b419b2bb1a7fe7d17c440d58e5000c21e832386c /src/text.c | |
| parent | f81c52b56e865d8ecc753a69a31a5148548320a6 (diff) | |
| parent | a4787bc06a323071d32d3e0705e9cd39d9221452 (diff) | |
Merge branch 'master' of https://github.com/pret/pokeemerald into decompile_item_menu
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)) |