summaryrefslogtreecommitdiff
path: root/gflib/text.c
diff options
context:
space:
mode:
authorPikalaxALT <PikalaxALT@users.noreply.github.com>2020-08-21 12:44:07 -0400
committerGitHub <noreply@github.com>2020-08-21 12:44:07 -0400
commitcd895e497d68bf9adbaa067dc411cc99a3bd1a4b (patch)
treead8bed728bb939cf08fbb8b9fd7d4c009a06459e /gflib/text.c
parent6c34effda93c67a37895e79b684b31b3cb9a2a88 (diff)
parent0e7f634b00f904ac29088f3b7fdac0c51999be2d (diff)
Merge pull request #1141 from GriffinRichards/add-nonmatch
Wrap asm statements in NONMATCHING
Diffstat (limited to 'gflib/text.c')
-rw-r--r--gflib/text.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/gflib/text.c b/gflib/text.c
index 07fd23109..636fe50a9 100644
--- a/gflib/text.c
+++ b/gflib/text.c
@@ -475,15 +475,15 @@ u8 GetLastTextColor(u8 colorType)
\
for (; i < toY; i++) \
{ \
- asm("":::"sl"); \
+ asm("":::"sl"); /* NONMATCHING */ \
r5 = *(ptr++); \
for (j = fromX; j < toX; j++) \
{ \
const u32 toOrr = r5 & 0xF; \
if (toOrr) \
{ \
- dst = windowTiles + ((j / 8) * 32) + ((j & 7) >> 1) + ((i / 8) * widthOffset) + ((i & 7) * 4); \
- bits = ((j & 1) * 4); \
+ dst = windowTiles + ((j / 8) * 32) + ((j & 7) >> 1) + ((i / 8) * widthOffset) + ((i & 7) * 4); \
+ bits = ((j & 1) * 4); \
*dst = (toOrr << bits) | ((0xF0 >> bits) & *dst); \
} \
r5 >>= 4; \