summaryrefslogtreecommitdiff
path: root/src/text.c
diff options
context:
space:
mode:
authorGriffinR <griffin.g.richards@gmail.com>2020-08-25 03:20:53 -0400
committerGitHub <noreply@github.com>2020-08-25 03:20:53 -0400
commitc5839905a1259fd7e843c0ffa1ce2470d40b76ae (patch)
tree145189a2e8e563318172ea72707b6391114fa0b4 /src/text.c
parent2455913e392c79a311f361ca755762aa736fd04f (diff)
parentd8f858d04e1204d3a1997b0e22b02d460b098874 (diff)
Merge pull request #354 from GriffinRichards/add-nonmatch
Wrap asm statements in NONMATCHING
Diffstat (limited to 'src/text.c')
-rw-r--r--src/text.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/text.c b/src/text.c
index 7d739f564..7ccaad063 100644
--- a/src/text.c
+++ b/src/text.c
@@ -1008,7 +1008,11 @@ s32 GetStringWidth(u8 fontId, const u8 *str, s16 letterSpacing)
int minGlyphWidth;
s32 (*func)(u16 glyphId, bool32 isJapanese);
int localLetterSpacing;
- register u32 lineWidth asm("r5");
+ #ifndef NONMATCHING
+ register u32 lineWidth asm("r5");
+ #else
+ u32 lineWidth;
+ #endif
const u8 *bufferPointer;
int glyphWidth;
u32 width;