dionmoustos/Pokemon-Firered
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix GetStringWidth fakematching

Browse Source
This commit is contained in:
Kurausukun
2021-04-19 02:26:12 -04:00
parent d4a5f580c5
commit 1f194a4169
1 changed files with 17 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/text.c
+17 -28
View File
@@ -1007,16 +1007,12 @@ s32 GetStringWidth(u8 fontId, const u8 *str, s16 letterSpacing)
int minGlyphWidth; int minGlyphWidth;
s32 (*func)(u16 glyphId, bool32 isJapanese); s32 (*func)(u16 glyphId, bool32 isJapanese);
int localLetterSpacing; int localLetterSpacing;
#ifndef NONMATCHING u32 lineWidth;
register u32 lineWidth asm("r5");
#else
u32 lineWidth;
#endif
const u8 *bufferPointer; const u8 *bufferPointer;
int glyphWidth; int glyphWidth;
u32 width; u32 width;
isJapanese = 0; isJapanese = FALSE;
minGlyphWidth = 0; minGlyphWidth = 0;
func = GetFontWidthFunc(fontId); func = GetFontWidthFunc(fontId);
@@ -1024,7 +1020,7 @@ s32 GetStringWidth(u8 fontId, const u8 *str, s16 letterSpacing)
return 0; return 0;
if (letterSpacing == -1) if (letterSpacing == -1)
localLetterSpacing = GetFontAttribute(fontId, 2); localLetterSpacing = GetFontAttribute(fontId, FONTATTR_LETTER_SPACING);
else else
localLetterSpacing = letterSpacing; localLetterSpacing = letterSpacing;
@@ -1041,7 +1037,7 @@ s32 GetStringWidth(u8 fontId, const u8 *str, s16 letterSpacing)
width = lineWidth; width = lineWidth;
lineWidth = 0; lineWidth = 0;
break; break;
case PLACEHOLDER_BEGIN: case PLACEHOLDER_BEGIN:
switch (*++str) switch (*++str)
{ {
case PLACEHOLDER_ID_STRING_VAR_1: case PLACEHOLDER_ID_STRING_VAR_1:
@@ -1063,18 +1059,15 @@ s32 GetStringWidth(u8 fontId, const u8 *str, s16 letterSpacing)
{ {
glyphWidth = func(*bufferPointer++, isJapanese); glyphWidth = func(*bufferPointer++, isJapanese);
if (minGlyphWidth > 0) if (minGlyphWidth > 0)
{ lineWidth += minGlyphWidth > glyphWidth ? minGlyphWidth : glyphWidth;
if (glyphWidth < minGlyphWidth) else
glyphWidth = minGlyphWidth; lineWidth += isJapanese ? glyphWidth + localLetterSpacing : glyphWidth;
}
else if (isJapanese)
{
glyphWidth += localLetterSpacing;
}
lineWidth += glyphWidth;
} }
bufferPointer = NULL; bufferPointer = NULL;
break; break;
case CHAR_PROMPT_SCROLL:
case CHAR_PROMPT_CLEAR:
break;
case EXT_CTRL_CODE_BEGIN: case EXT_CTRL_CODE_BEGIN:
switch (*++str) switch (*++str)
{ {
@@ -1092,13 +1085,17 @@ s32 GetStringWidth(u8 fontId, const u8 *str, s16 letterSpacing)
case EXT_CTRL_CODE_SHIFT_RIGHT: case EXT_CTRL_CODE_SHIFT_RIGHT:
case EXT_CTRL_CODE_SHIFT_DOWN: case EXT_CTRL_CODE_SHIFT_DOWN:
++str; ++str;
case EXT_CTRL_CODE_RESET_FONT:
case EXT_CTRL_CODE_WAIT_BUTTON:
case EXT_CTRL_CODE_WAIT_SE:
case EXT_CTRL_CODE_FILL_WINDOW:
break; break;
case EXT_CTRL_CODE_FONT: case EXT_CTRL_CODE_FONT:
func = GetFontWidthFunc(*++str); func = GetFontWidthFunc(*++str);
if (func == NULL) if (func == NULL)
return 0; return 0;
if (letterSpacing == -1) if (letterSpacing == -1)
localLetterSpacing = GetFontAttribute(*str, 2); localLetterSpacing = GetFontAttribute(*str, FONTATTR_LETTER_SPACING);
break; break;
case EXT_CTRL_CODE_CLEAR: case EXT_CTRL_CODE_CLEAR:
glyphWidth = *++str; glyphWidth = *++str;
@@ -1115,15 +1112,10 @@ s32 GetStringWidth(u8 fontId, const u8 *str, s16 letterSpacing)
minGlyphWidth = *++str; minGlyphWidth = *++str;
break; break;
case EXT_CTRL_CODE_JPN: case EXT_CTRL_CODE_JPN:
isJapanese = 1; isJapanese = TRUE;
break; break;
case EXT_CTRL_CODE_ENG: case EXT_CTRL_CODE_ENG:
isJapanese = 0; isJapanese = FALSE;
break;
case EXT_CTRL_CODE_RESET_FONT:
case EXT_CTRL_CODE_WAIT_BUTTON:
case EXT_CTRL_CODE_WAIT_SE:
case EXT_CTRL_CODE_FILL_WINDOW:
default: default:
break; break;
} }
@@ -1146,9 +1138,6 @@ s32 GetStringWidth(u8 fontId, const u8 *str, s16 letterSpacing)
} }
lineWidth += glyphWidth; lineWidth += glyphWidth;
break; break;
case CHAR_PROMPT_SCROLL:
case CHAR_PROMPT_CLEAR:
break;
default: default:
glyphWidth = func(*str, isJapanese); glyphWidth = func(*str, isJapanese);
if (minGlyphWidth > 0) if (minGlyphWidth > 0)