diff options
| author | garak <garakmon@gmail.com> | 2018-12-16 20:05:31 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-12-16 20:05:31 -0500 |
| commit | e292d0ca8375a8c54907d6bcf404e2e084344156 (patch) | |
| tree | b9c59449d47bf73d98d3e38fa26804a163d871ab /src/text.c | |
| parent | 10237e8d13b35474ea999b4e9139f9a48a80c53d (diff) | |
| parent | d1e6e705ccf05f93933ae4494b1d388550d81d26 (diff) | |
Merge branch 'master' into fldeff
Diffstat (limited to 'src/text.c')
| -rw-r--r-- | src/text.c | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/src/text.c b/src/text.c index ecd3a3095..07c15596e 100644 --- a/src/text.c +++ b/src/text.c @@ -1539,7 +1539,7 @@ u16 RenderText(struct TextPrinter *textPrinter) subStruct->glyphId = *textPrinter->printerTemplate.currentChar; textPrinter->printerTemplate.currentChar++; return 2; - case 7: + case EXT_CTRL_CODE_UNKNOWN_7: return 2; case 8: textPrinter->delayCounter = *textPrinter->printerTemplate.currentChar; @@ -1591,7 +1591,7 @@ u16 RenderText(struct TextPrinter *textPrinter) case 24: m4aMPlayContinue(&gMPlayInfo_BGM); return 2; - case 17: + case EXT_CTRL_CODE_CLEAR: width = *textPrinter->printerTemplate.currentChar; textPrinter->printerTemplate.currentChar++; if (width > 0) @@ -1622,10 +1622,10 @@ u16 RenderText(struct TextPrinter *textPrinter) case 20: textPrinter->minLetterSpacing = *textPrinter->printerTemplate.currentChar++; return 2; - case 21: + case EXT_CTRL_CODE_JPN: textPrinter->japanese = 1; return 2; - case 22: + case EXT_CTRL_CODE_ENG: textPrinter->japanese = 0; return 2; } @@ -1810,12 +1810,12 @@ u32 GetStringWidthFixedWidthFont(const u8 *str, u8 fontId, u8 letterSpacing) case 0x14: ++strPos; break; - case 0x7: + case EXT_CTRL_CODE_UNKNOWN_7: case 0x9: case 0xA: case 0xF: - case 0x15: - case 0x16: + case EXT_CTRL_CODE_JPN: + case EXT_CTRL_CODE_ENG: default: break; } @@ -1970,13 +1970,13 @@ u32 GetStringWidth(u8 fontId, const u8 *str, s16 letterSpacing) case 0x14: minGlyphWidth = *++str; break; - case 0x15: + case EXT_CTRL_CODE_JPN: isJapanese = 1; break; - case 0x16: + case EXT_CTRL_CODE_ENG: isJapanese = 0; break; - case 0x7: + case EXT_CTRL_CODE_UNKNOWN_7: case 0x9: case 0xA: case 0xF: @@ -2096,12 +2096,12 @@ u8 RenderTextFont9(u8 *pixels, u8 fontId, u8 *str) case 0x14: ++strPos; break; - case 0x7: + case EXT_CTRL_CODE_UNKNOWN_7: case 0x9: case 0xA: case 0xF: - case 0x15: - case 0x16: + case EXT_CTRL_CODE_JPN: + case EXT_CTRL_CODE_ENG: default: continue; } |