diff --git a/arm9/include/graphics/uvcoordFont.h b/arm9/include/graphics/uvcoordFont.h index 851c553c8..a8a33f91f 100644 --- a/arm9/include/graphics/uvcoordFont.h +++ b/arm9/include/graphics/uvcoordFont.h @@ -6,7 +6,7 @@ FONT texture coordinates #ifndef FONT_H #define FONT_H -#define FONT_NUM_IMAGES 0x15A +#define FONT_NUM_IMAGES 411 // U, V, Width, Height @@ -167,190 +167,258 @@ static constexpr unsigned int fontTexcoords[] = { 288, 48, 8, TEXT_Y, // LATIN SMALL LETTER U WITH DIAERESIS 300, 48, 11, TEXT_Y, // LATIN CAPITAL LIGATURE OE 312, 48, 12, TEXT_Y, // LATIN SMALL LIGATURE OE - 324, 48, 7, TEXT_Y, // LEFT DOUBLE QUOTATION MARK - 336, 48, 7, TEXT_Y, // RIGHT DOUBLE QUOTATION MARK - 348, 48, 5, TEXT_Y, // BULLET - 360, 48, 12, TEXT_Y, // HORIZONTAL ELLIPSIS - 372, 48, 12, TEXT_Y, // DOUBLE PRIME - 384, 48, 12, TEXT_Y, // REFERENCE MARK - 396, 48, 10, TEXT_Y, // TRADE MARK SIGN - 408, 48, 12, TEXT_Y, // LEFTWARDS ARROW - 420, 48, 12, TEXT_Y, // UPWARDS ARROW - 432, 48, 12, TEXT_Y, // RIGHTWARDS ARROW - 444, 48, 12, TEXT_Y, // DOWNWARDS ARROW - 456, 48, 12, TEXT_Y, // IDEOGRAPHIC SPACE - 468, 48, 12, TEXT_Y, // IDEOGRAPHIC COMMA - 480, 48, 12, TEXT_Y, // IDEOGRAPHIC FULL STOP - 492, 48, 12, TEXT_Y, // LEFT CORNER BRACKET - 0, 64, 12, TEXT_Y, // RIGHT CORNER BRACKET - 12, 64, 12, TEXT_Y, // POSTAL MARK - 24, 64, 12, TEXT_Y, // HIRAGANA LETTER SMALL A - 36, 64, 12, TEXT_Y, // HIRAGANA LETTER A - 48, 64, 12, TEXT_Y, // HIRAGANA LETTER SMALL I - 60, 64, 12, TEXT_Y, // HIRAGANA LETTER I - 72, 64, 12, TEXT_Y, // HIRAGANA LETTER SMALL U - 84, 64, 12, TEXT_Y, // HIRAGANA LETTER U - 96, 64, 12, TEXT_Y, // HIRAGANA LETTER SMALL E - 108, 64, 12, TEXT_Y, // HIRAGANA LETTER E - 120, 64, 12, TEXT_Y, // HIRAGANA LETTER SMALL O - 132, 64, 12, TEXT_Y, // HIRAGANA LETTER O - 144, 64, 12, TEXT_Y, // HIRAGANA LETTER KA - 156, 64, 12, TEXT_Y, // HIRAGANA LETTER GA - 168, 64, 12, TEXT_Y, // HIRAGANA LETTER KI - 180, 64, 12, TEXT_Y, // HIRAGANA LETTER GI - 192, 64, 12, TEXT_Y, // HIRAGANA LETTER KU - 204, 64, 12, TEXT_Y, // HIRAGANA LETTER GU - 216, 64, 12, TEXT_Y, // HIRAGANA LETTER KE - 228, 64, 12, TEXT_Y, // HIRAGANA LETTER GE - 240, 64, 12, TEXT_Y, // HIRAGANA LETTER KO - 252, 64, 12, TEXT_Y, // HIRAGANA LETTER GO - 264, 64, 12, TEXT_Y, // HIRAGANA LETTER SA - 276, 64, 12, TEXT_Y, // HIRAGANA LETTER ZA - 288, 64, 12, TEXT_Y, // HIRAGANA LETTER SI - 300, 64, 12, TEXT_Y, // HIRAGANA LETTER ZI - 312, 64, 12, TEXT_Y, // HIRAGANA LETTER SU - 324, 64, 12, TEXT_Y, // HIRAGANA LETTER ZU - 336, 64, 12, TEXT_Y, // HIRAGANA LETTER SE - 348, 64, 12, TEXT_Y, // HIRAGANA LETTER ZE - 360, 64, 12, TEXT_Y, // HIRAGANA LETTER SO - 372, 64, 12, TEXT_Y, // HIRAGANA LETTER ZO - 384, 64, 12, TEXT_Y, // HIRAGANA LETTER TA - 396, 64, 12, TEXT_Y, // HIRAGANA LETTER DA - 408, 64, 12, TEXT_Y, // HIRAGANA LETTER TI - 420, 64, 12, TEXT_Y, // HIRAGANA LETTER DI - 432, 64, 12, TEXT_Y, // HIRAGANA LETTER SMALL TU - 444, 64, 12, TEXT_Y, // HIRAGANA LETTER TU - 456, 64, 12, TEXT_Y, // HIRAGANA LETTER DU - 468, 64, 12, TEXT_Y, // HIRAGANA LETTER TE - 480, 64, 12, TEXT_Y, // HIRAGANA LETTER DE - 492, 64, 12, TEXT_Y, // HIRAGANA LETTER TO - 0, 80, 12, TEXT_Y, // HIRAGANA LETTER DO - 12, 80, 12, TEXT_Y, // HIRAGANA LETTER NA - 24, 80, 12, TEXT_Y, // HIRAGANA LETTER NI - 36, 80, 12, TEXT_Y, // HIRAGANA LETTER NU - 48, 80, 12, TEXT_Y, // HIRAGANA LETTER NE - 60, 80, 12, TEXT_Y, // HIRAGANA LETTER NO - 72, 80, 12, TEXT_Y, // HIRAGANA LETTER HA - 84, 80, 12, TEXT_Y, // HIRAGANA LETTER BA - 96, 80, 12, TEXT_Y, // HIRAGANA LETTER PA - 108, 80, 12, TEXT_Y, // HIRAGANA LETTER HI - 120, 80, 12, TEXT_Y, // HIRAGANA LETTER BI - 132, 80, 12, TEXT_Y, // HIRAGANA LETTER PI - 144, 80, 12, TEXT_Y, // HIRAGANA LETTER HU - 156, 80, 12, TEXT_Y, // HIRAGANA LETTER BU - 168, 80, 12, TEXT_Y, // HIRAGANA LETTER PU - 180, 80, 12, TEXT_Y, // HIRAGANA LETTER HE - 192, 80, 12, TEXT_Y, // HIRAGANA LETTER BE - 204, 80, 12, TEXT_Y, // HIRAGANA LETTER PE - 216, 80, 12, TEXT_Y, // HIRAGANA LETTER HO - 228, 80, 12, TEXT_Y, // HIRAGANA LETTER BO - 240, 80, 12, TEXT_Y, // HIRAGANA LETTER PO - 252, 80, 12, TEXT_Y, // HIRAGANA LETTER MA - 264, 80, 12, TEXT_Y, // HIRAGANA LETTER MI - 276, 80, 12, TEXT_Y, // HIRAGANA LETTER MU - 288, 80, 12, TEXT_Y, // HIRAGANA LETTER ME - 300, 80, 12, TEXT_Y, // HIRAGANA LETTER MO - 312, 80, 12, TEXT_Y, // HIRAGANA LETTER SMALL YA - 324, 80, 12, TEXT_Y, // HIRAGANA LETTER YA - 336, 80, 12, TEXT_Y, // HIRAGANA LETTER SMALL YU - 348, 80, 12, TEXT_Y, // HIRAGANA LETTER YU - 360, 80, 12, TEXT_Y, // HIRAGANA LETTER SMALL YO - 372, 80, 12, TEXT_Y, // HIRAGANA LETTER YO - 384, 80, 12, TEXT_Y, // HIRAGANA LETTER RA - 396, 80, 12, TEXT_Y, // HIRAGANA LETTER RI - 408, 80, 12, TEXT_Y, // HIRAGANA LETTER RU - 420, 80, 12, TEXT_Y, // HIRAGANA LETTER RE - 432, 80, 12, TEXT_Y, // HIRAGANA LETTER RO - 444, 80, 12, TEXT_Y, // HIRAGANA LETTER SMALL WA - 456, 80, 12, TEXT_Y, // HIRAGANA LETTER WA - 468, 80, 12, TEXT_Y, // HIRAGANA LETTER WO - 480, 80, 12, TEXT_Y, // HIRAGANA LETTER N - 492, 80, 12, TEXT_Y, // KATAKANA LETTER SMALL A - 0, 96, 12, TEXT_Y, // KATAKANA LETTER A - 12, 96, 12, TEXT_Y, // KATAKANA LETTER SMALL I - 24, 96, 12, TEXT_Y, // KATAKANA LETTER I - 36, 96, 12, TEXT_Y, // KATAKANA LETTER SMALL U - 48, 96, 12, TEXT_Y, // KATAKANA LETTER U - 60, 96, 12, TEXT_Y, // KATAKANA LETTER SMALL E - 72, 96, 12, TEXT_Y, // KATAKANA LETTER E - 84, 96, 12, TEXT_Y, // KATAKANA LETTER SMALL O - 96, 96, 12, TEXT_Y, // KATAKANA LETTER O - 108, 96, 12, TEXT_Y, // KATAKANA LETTER KA - 120, 96, 12, TEXT_Y, // KATAKANA LETTER GA - 132, 96, 12, TEXT_Y, // KATAKANA LETTER KI - 144, 96, 12, TEXT_Y, // KATAKANA LETTER GI - 156, 96, 12, TEXT_Y, // KATAKANA LETTER KU - 168, 96, 12, TEXT_Y, // KATAKANA LETTER GU - 180, 96, 12, TEXT_Y, // KATAKANA LETTER KE - 192, 96, 12, TEXT_Y, // KATAKANA LETTER GE - 204, 96, 12, TEXT_Y, // KATAKANA LETTER KO - 216, 96, 12, TEXT_Y, // KATAKANA LETTER GO - 228, 96, 12, TEXT_Y, // KATAKANA LETTER SA - 240, 96, 12, TEXT_Y, // KATAKANA LETTER ZA - 252, 96, 12, TEXT_Y, // KATAKANA LETTER SI - 264, 96, 12, TEXT_Y, // KATAKANA LETTER ZI - 276, 96, 12, TEXT_Y, // KATAKANA LETTER SU - 288, 96, 12, TEXT_Y, // KATAKANA LETTER ZU - 300, 96, 12, TEXT_Y, // KATAKANA LETTER SE - 312, 96, 12, TEXT_Y, // KATAKANA LETTER ZE - 324, 96, 12, TEXT_Y, // KATAKANA LETTER SO - 336, 96, 12, TEXT_Y, // KATAKANA LETTER ZO - 348, 96, 12, TEXT_Y, // KATAKANA LETTER TA - 360, 96, 12, TEXT_Y, // KATAKANA LETTER DA - 372, 96, 12, TEXT_Y, // KATAKANA LETTER TI - 384, 96, 12, TEXT_Y, // KATAKANA LETTER DI - 396, 96, 12, TEXT_Y, // KATAKANA LETTER SMALL TU - 408, 96, 12, TEXT_Y, // KATAKANA LETTER TU - 420, 96, 12, TEXT_Y, // KATAKANA LETTER DU - 432, 96, 12, TEXT_Y, // KATAKANA LETTER TE - 444, 96, 12, TEXT_Y, // KATAKANA LETTER DE - 456, 96, 12, TEXT_Y, // KATAKANA LETTER TO - 468, 96, 12, TEXT_Y, // KATAKANA LETTER DO - 480, 96, 12, TEXT_Y, // KATAKANA LETTER NA - 492, 96, 12, TEXT_Y, // KATAKANA LETTER NI - 0, 112, 12, TEXT_Y, // KATAKANA LETTER NU - 12, 112, 12, TEXT_Y, // KATAKANA LETTER NE - 24, 112, 12, TEXT_Y, // KATAKANA LETTER NO - 36, 112, 12, TEXT_Y, // KATAKANA LETTER HA - 48, 112, 12, TEXT_Y, // KATAKANA LETTER BA - 60, 112, 12, TEXT_Y, // KATAKANA LETTER PA - 72, 112, 12, TEXT_Y, // KATAKANA LETTER HI - 84, 112, 12, TEXT_Y, // KATAKANA LETTER BI - 96, 112, 12, TEXT_Y, // KATAKANA LETTER PI - 108, 112, 12, TEXT_Y, // KATAKANA LETTER HU - 120, 112, 12, TEXT_Y, // KATAKANA LETTER BU - 132, 112, 12, TEXT_Y, // KATAKANA LETTER PU - 144, 112, 12, TEXT_Y, // KATAKANA LETTER HE - 156, 112, 12, TEXT_Y, // KATAKANA LETTER BE - 168, 112, 12, TEXT_Y, // KATAKANA LETTER PE - 180, 112, 12, TEXT_Y, // KATAKANA LETTER HO - 192, 112, 12, TEXT_Y, // KATAKANA LETTER BO - 204, 112, 12, TEXT_Y, // KATAKANA LETTER PO - 216, 112, 12, TEXT_Y, // KATAKANA LETTER MA - 228, 112, 12, TEXT_Y, // KATAKANA LETTER MI - 240, 112, 12, TEXT_Y, // KATAKANA LETTER MU - 252, 112, 12, TEXT_Y, // KATAKANA LETTER ME - 264, 112, 12, TEXT_Y, // KATAKANA LETTER MO - 276, 112, 12, TEXT_Y, // KATAKANA LETTER SMALL YA - 288, 112, 12, TEXT_Y, // KATAKANA LETTER YA - 300, 112, 12, TEXT_Y, // KATAKANA LETTER SMALL YU - 312, 112, 12, TEXT_Y, // KATAKANA LETTER YU - 324, 112, 12, TEXT_Y, // KATAKANA LETTER SMALL YO - 336, 112, 12, TEXT_Y, // KATAKANA LETTER YO - 348, 112, 12, TEXT_Y, // KATAKANA LETTER RA - 360, 112, 12, TEXT_Y, // KATAKANA LETTER RI - 372, 112, 12, TEXT_Y, // KATAKANA LETTER RU - 384, 112, 12, TEXT_Y, // KATAKANA LETTER RE - 396, 112, 12, TEXT_Y, // KATAKANA LETTER RO - 408, 112, 12, TEXT_Y, // KATAKANA LETTER SMALL WA - 420, 112, 12, TEXT_Y, // KATAKANA LETTER WA - 432, 112, 12, TEXT_Y, // KATAKANA LETTER WO - 444, 112, 12, TEXT_Y, // KATAKANA LETTER N - 456, 112, 12, TEXT_Y, // KATAKANA LETTER VU - 468, 112, 12, TEXT_Y, // KATAKANA LETTER SMALL KA - 480, 112, 12, TEXT_Y, // KATAKANA LETTER SMALL KE - 492, 112, 12, TEXT_Y, // KATAKANA-HIRAGANA PROLONGED SOUND MARK - ///////////////////// +//////////////////////////////////////////////////////////////////////////////// + 324, 48, 8, TEXT_Y, // CYRILLIC CAPITAL LETTER IO + 336, 48, 8, TEXT_Y, // CYRILLIC CAPITAL LETTER A + 348, 48, 8, TEXT_Y, // CYRILLIC CAPITAL LETTER BE + 360, 48, 8, TEXT_Y, // CYRILLIC CAPITAL LETTER VE + 372, 48, 8, TEXT_Y, // CYRILLIC CAPITAL LETTER GHE + 384, 48, 8, TEXT_Y, // CYRILLIC CAPITAL LETTER DE + 396, 48, 8, TEXT_Y, // CYRILLIC CAPITAL LETTER IE + 408, 48, 8, TEXT_Y, // CYRILLIC CAPITAL LETTER ZHE + 420, 48, 8, TEXT_Y, // CYRILLIC CAPITAL LETTER ZE + 432, 48, 8, TEXT_Y, // CYRILLIC CAPITAL LETTER I + 444, 48, 8, TEXT_Y, // CYRILLIC CAPITAL LETTER SHORT I + 456, 48, 8, TEXT_Y, // CYRILLIC CAPITAL LETTER KA + 468, 48, 8, TEXT_Y, // CYRILLIC CAPITAL LETTER EL + 480, 48, 8, TEXT_Y, // CYRILLIC CAPITAL LETTER EM + 492, 48, 8, TEXT_Y, // CYRILLIC CAPITAL LETTER EN + 0, 64, 8, TEXT_Y, // CYRILLIC CAPITAL LETTER O + 12, 64, 8, TEXT_Y, // CYRILLIC CAPITAL LETTER PE + 24, 64, 8, TEXT_Y, // CYRILLIC CAPITAL LETTER ER + 36, 64, 8, TEXT_Y, // CYRILLIC CAPITAL LETTER ES + 64, 64, 8, TEXT_Y, // CYRILLIC CAPITAL LETTER TE + 60, 64, 8, TEXT_Y, // CYRILLIC CAPITAL LETTER U + 72, 64, 8, TEXT_Y, // CYRILLIC CAPITAL LETTER EF + 84, 64, 8, TEXT_Y, // CYRILLIC CAPITAL LETTER HA + 96, 64, 8, TEXT_Y, // CYRILLIC CAPITAL LETTER TSE + 108, 64, 8, TEXT_Y, // CYRILLIC CAPITAL LETTER CHE + 120, 64, 8, TEXT_Y, // CYRILLIC CAPITAL LETTER SHA + 132, 64, 8, TEXT_Y, // CYRILLIC CAPITAL LETTER SHCHA + 144, 64, 8, TEXT_Y, // CYRILLIC CAPITAL LETTER HARD SIGN + 156, 64, 8, TEXT_Y, // CYRILLIC CAPITAL LETTER YERU + 168, 64, 8, TEXT_Y, // CYRILLIC CAPITAL LETTER SOFT SIGN + 180, 64, 8, TEXT_Y, // CYRILLIC CAPITAL LETTER E + 192, 64, 8, TEXT_Y, // CYRILLIC CAPITAL LETTER YU + 204, 64, 8, TEXT_Y, // CYRILLIC CAPITAL LETTER YA + 216, 64, 8, TEXT_Y, // CYRILLIC SMALL LETTER A + 228, 64, 8, TEXT_Y, // CYRILLIC SMALL LETTER BE + 240, 64, 8, TEXT_Y, // CYRILLIC SMALL LETTER VE + 252, 64, 8, TEXT_Y, // CYRILLIC SMALL LETTER GHE + 264, 64, 8, TEXT_Y, // CYRILLIC SMALL LETTER DE + 276, 64, 8, TEXT_Y, // CYRILLIC SMALL LETTER IE + 288, 64, 8, TEXT_Y, // CYRILLIC SMALL LETTER ZHE + 300, 64, 8, TEXT_Y, // CYRILLIC SMALL LETTER ZE + 312, 64, 8, TEXT_Y, // CYRILLIC SMALL LETTER I + 324, 64, 8, TEXT_Y, // CYRILLIC SMALL LETTER SHORT I + 336, 64, 8, TEXT_Y, // CYRILLIC SMALL LETTER KA + 348, 64, 8, TEXT_Y, // CYRILLIC SMALL LETTER EL + 360, 64, 8, TEXT_Y, // CYRILLIC SMALL LETTER EM + 372, 64, 8, TEXT_Y, // CYRILLIC SMALL LETTER EN + 384, 64, 8, TEXT_Y, // CYRILLIC SMALL LETTER O + 396, 64, 8, TEXT_Y, // CYRILLIC SMALL LETTER PE + 408, 64, 8, TEXT_Y, // CYRILLIC SMALL LETTER ER + 420, 64, 8, TEXT_Y, // CYRILLIC SMALL LETTER ES + 432, 64, 8, TEXT_Y, // CYRILLIC SMALL LETTER TE + 444, 64, 8, TEXT_Y, // CYRILLIC SMALL LETTER U + 456, 64, 8, TEXT_Y, // CYRILLIC SMALL LETTER EF + 468, 64, 8, TEXT_Y, // CYRILLIC SMALL LETTER HA + 480, 64, 8, TEXT_Y, // CYRILLIC SMALL LETTER TSE + 492, 64, 8, TEXT_Y, // CYRILLIC SMALL LETTER CHE + 0, 80, 8, TEXT_Y, // CYRILLIC SMALL LETTER SHA + 12, 80, 8, TEXT_Y, // CYRILLIC SMALL LETTER SHCHA + 24, 80, 8, TEXT_Y, // CYRILLIC SMALL LETTER HARD SIGN + 36, 80, 8, TEXT_Y, // CYRILLIC SMALL LETTER YERU + 48, 80, 8, TEXT_Y, // CYRILLIC SMALL LETTER SOFT SIGN + 60, 80, 8, TEXT_Y, // CYRILLIC SMALL LETTER E + 72, 80, 8, TEXT_Y, // CYRILLIC SMALL LETTER YU + 84, 80, 8, TEXT_Y, // CYRILLIC SMALL LETTER YA + 96, 80, 8, TEXT_Y, // CYRILLIC SMALL LETTER IO +//////////////////////////////////////////////////////////////////////////////// + 324, 80, 7, TEXT_Y, // LEFT DOUBLE QUOTATION MARK + 336, 80, 7, TEXT_Y, // RIGHT DOUBLE QUOTATION MARK + 348, 80, 5, TEXT_Y, // BULLET + 360, 80, 12, TEXT_Y, // HORIZONTAL ELLIPSIS + 372, 80, 12, TEXT_Y, // DOUBLE PRIME + 384, 80, 12, TEXT_Y, // REFERENCE MARK + 396, 80, 10, TEXT_Y, // TRADE MARK SIGN + 408, 80, 12, TEXT_Y, // LEFTWARDS ARROW + 420, 80, 12, TEXT_Y, // UPWARDS ARROW + 432, 80, 12, TEXT_Y, // RIGHTWARDS ARROW + 444, 80, 12, TEXT_Y, // DOWNWARDS ARROW + 456, 80, 12, TEXT_Y, // IDEOGRAPHIC SPACE + 468, 80, 12, TEXT_Y, // IDEOGRAPHIC COMMA + 480, 80, 12, TEXT_Y, // IDEOGRAPHIC FULL STOP + 492, 80, 12, TEXT_Y, // LEFT CORNER BRACKET + 0, 96, 12, TEXT_Y, // RIGHT CORNER BRACKET + 12, 96, 12, TEXT_Y, // POSTAL MARK + 24, 96, 12, TEXT_Y, // HIRAGANA LETTER SMALL A + 36, 96, 12, TEXT_Y, // HIRAGANA LETTER A + 48, 96, 12, TEXT_Y, // HIRAGANA LETTER SMALL I + 60, 96, 12, TEXT_Y, // HIRAGANA LETTER I + 72, 96, 12, TEXT_Y, // HIRAGANA LETTER SMALL U + 84, 96, 12, TEXT_Y, // HIRAGANA LETTER U + 96, 96, 12, TEXT_Y, // HIRAGANA LETTER SMALL E + 108, 96, 12, TEXT_Y, // HIRAGANA LETTER E + 120, 96, 12, TEXT_Y, // HIRAGANA LETTER SMALL O + 132, 96, 12, TEXT_Y, // HIRAGANA LETTER O + 144, 96, 12, TEXT_Y, // HIRAGANA LETTER KA + 156, 96, 12, TEXT_Y, // HIRAGANA LETTER GA + 168, 96, 12, TEXT_Y, // HIRAGANA LETTER KI + 180, 96, 12, TEXT_Y, // HIRAGANA LETTER GI + 192, 96, 12, TEXT_Y, // HIRAGANA LETTER KU + 204, 96, 12, TEXT_Y, // HIRAGANA LETTER GU + 216, 96, 12, TEXT_Y, // HIRAGANA LETTER KE + 228, 96, 12, TEXT_Y, // HIRAGANA LETTER GE + 240, 96, 12, TEXT_Y, // HIRAGANA LETTER KO + 252, 96, 12, TEXT_Y, // HIRAGANA LETTER GO + 264, 96, 12, TEXT_Y, // HIRAGANA LETTER SA + 276, 96, 12, TEXT_Y, // HIRAGANA LETTER ZA + 288, 96, 12, TEXT_Y, // HIRAGANA LETTER SI + 300, 96, 12, TEXT_Y, // HIRAGANA LETTER ZI + 312, 96, 12, TEXT_Y, // HIRAGANA LETTER SU + 324, 96, 12, TEXT_Y, // HIRAGANA LETTER ZU + 336, 96, 12, TEXT_Y, // HIRAGANA LETTER SE + 348, 96, 12, TEXT_Y, // HIRAGANA LETTER ZE + 360, 96, 12, TEXT_Y, // HIRAGANA LETTER SO + 372, 96, 12, TEXT_Y, // HIRAGANA LETTER ZO + 384, 96, 12, TEXT_Y, // HIRAGANA LETTER TA + 396, 96, 12, TEXT_Y, // HIRAGANA LETTER DA + 408, 96, 12, TEXT_Y, // HIRAGANA LETTER TI + 420, 96, 12, TEXT_Y, // HIRAGANA LETTER DI + 432, 96, 12, TEXT_Y, // HIRAGANA LETTER SMALL TU + 444, 96, 12, TEXT_Y, // HIRAGANA LETTER TU + 456, 96, 12, TEXT_Y, // HIRAGANA LETTER DU + 468, 96, 12, TEXT_Y, // HIRAGANA LETTER TE + 480, 96, 12, TEXT_Y, // HIRAGANA LETTER DE + 492, 96, 12, TEXT_Y, // HIRAGANA LETTER TO + 0, 112, 12, TEXT_Y, // HIRAGANA LETTER DO + 12, 112, 12, TEXT_Y, // HIRAGANA LETTER NA + 24, 112, 12, TEXT_Y, // HIRAGANA LETTER NI + 36, 112, 12, TEXT_Y, // HIRAGANA LETTER NU + 48, 112, 12, TEXT_Y, // HIRAGANA LETTER NE + 60, 112, 12, TEXT_Y, // HIRAGANA LETTER NO + 72, 112, 12, TEXT_Y, // HIRAGANA LETTER HA + 84, 112, 12, TEXT_Y, // HIRAGANA LETTER BA + 96, 112, 12, TEXT_Y, // HIRAGANA LETTER PA + 108, 112, 12, TEXT_Y, // HIRAGANA LETTER HI + 120, 112, 12, TEXT_Y, // HIRAGANA LETTER BI + 132, 112, 12, TEXT_Y, // HIRAGANA LETTER PI + 144, 112, 12, TEXT_Y, // HIRAGANA LETTER HU + 156, 112, 12, TEXT_Y, // HIRAGANA LETTER BU + 168, 112, 12, TEXT_Y, // HIRAGANA LETTER PU + 180, 112, 12, TEXT_Y, // HIRAGANA LETTER HE + 192, 112, 12, TEXT_Y, // HIRAGANA LETTER BE + 204, 112, 12, TEXT_Y, // HIRAGANA LETTER PE + 216, 112, 12, TEXT_Y, // HIRAGANA LETTER HO + 228, 112, 12, TEXT_Y, // HIRAGANA LETTER BO + 240, 112, 12, TEXT_Y, // HIRAGANA LETTER PO + 252, 112, 12, TEXT_Y, // HIRAGANA LETTER MA + 264, 112, 12, TEXT_Y, // HIRAGANA LETTER MI + 276, 112, 12, TEXT_Y, // HIRAGANA LETTER MU + 288, 112, 12, TEXT_Y, // HIRAGANA LETTER ME + 300, 112, 12, TEXT_Y, // HIRAGANA LETTER MO + 312, 112, 12, TEXT_Y, // HIRAGANA LETTER SMALL YA + 324, 112, 12, TEXT_Y, // HIRAGANA LETTER YA + 336, 112, 12, TEXT_Y, // HIRAGANA LETTER SMALL YU + 348, 112, 12, TEXT_Y, // HIRAGANA LETTER YU + 360, 112, 12, TEXT_Y, // HIRAGANA LETTER SMALL YO + 372, 112, 12, TEXT_Y, // HIRAGANA LETTER YO + 384, 112, 12, TEXT_Y, // HIRAGANA LETTER RA + 396, 112, 12, TEXT_Y, // HIRAGANA LETTER RI + 408, 112, 12, TEXT_Y, // HIRAGANA LETTER RU + 420, 112, 12, TEXT_Y, // HIRAGANA LETTER RE + 432, 112, 12, TEXT_Y, // HIRAGANA LETTER RO + 444, 112, 12, TEXT_Y, // HIRAGANA LETTER SMALL WA + 456, 112, 12, TEXT_Y, // HIRAGANA LETTER WA + 468, 112, 12, TEXT_Y, // HIRAGANA LETTER WO + 480, 112, 12, TEXT_Y, // HIRAGANA LETTER N + 492, 112, 12, TEXT_Y, // KATAKANA LETTER SMALL A + 0, 128, 12, TEXT_Y, // KATAKANA LETTER A + 12, 128, 12, TEXT_Y, // KATAKANA LETTER SMALL I + 24, 128, 12, TEXT_Y, // KATAKANA LETTER I + 36, 128, 12, TEXT_Y, // KATAKANA LETTER SMALL U + 48, 128, 12, TEXT_Y, // KATAKANA LETTER U + 60, 128, 12, TEXT_Y, // KATAKANA LETTER SMALL E + 72, 128, 12, TEXT_Y, // KATAKANA LETTER E + 84, 128, 12, TEXT_Y, // KATAKANA LETTER SMALL O + 96, 128, 12, TEXT_Y, // KATAKANA LETTER O + 108, 128, 12, TEXT_Y, // KATAKANA LETTER KA + 120, 128, 12, TEXT_Y, // KATAKANA LETTER GA + 132, 128, 12, TEXT_Y, // KATAKANA LETTER KI + 144, 128, 12, TEXT_Y, // KATAKANA LETTER GI + 156, 128, 12, TEXT_Y, // KATAKANA LETTER KU + 168, 128, 12, TEXT_Y, // KATAKANA LETTER GU + 180, 128, 12, TEXT_Y, // KATAKANA LETTER KE + 192, 128, 12, TEXT_Y, // KATAKANA LETTER GE + 204, 128, 12, TEXT_Y, // KATAKANA LETTER KO + 216, 128, 12, TEXT_Y, // KATAKANA LETTER GO + 228, 128, 12, TEXT_Y, // KATAKANA LETTER SA + 240, 128, 12, TEXT_Y, // KATAKANA LETTER ZA + 252, 128, 12, TEXT_Y, // KATAKANA LETTER SI + 264, 128, 12, TEXT_Y, // KATAKANA LETTER ZI + 276, 128, 12, TEXT_Y, // KATAKANA LETTER SU + 288, 128, 12, TEXT_Y, // KATAKANA LETTER ZU + 300, 128, 12, TEXT_Y, // KATAKANA LETTER SE + 312, 128, 12, TEXT_Y, // KATAKANA LETTER ZE + 324, 128, 12, TEXT_Y, // KATAKANA LETTER SO + 336, 128, 12, TEXT_Y, // KATAKANA LETTER ZO + 348, 128, 12, TEXT_Y, // KATAKANA LETTER TA + 360, 128, 12, TEXT_Y, // KATAKANA LETTER DA + 372, 128, 12, TEXT_Y, // KATAKANA LETTER TI + 384, 128, 12, TEXT_Y, // KATAKANA LETTER DI + 396, 128, 12, TEXT_Y, // KATAKANA LETTER SMALL TU + 408, 128, 12, TEXT_Y, // KATAKANA LETTER TU + 420, 128, 12, TEXT_Y, // KATAKANA LETTER DU + 432, 128, 12, TEXT_Y, // KATAKANA LETTER TE + 444, 128, 12, TEXT_Y, // KATAKANA LETTER DE + 456, 128, 12, TEXT_Y, // KATAKANA LETTER TO + 468, 128, 12, TEXT_Y, // KATAKANA LETTER DO + 480, 128, 12, TEXT_Y, // KATAKANA LETTER NA + 492, 128, 12, TEXT_Y, // KATAKANA LETTER NI + 0, 144, 12, TEXT_Y, // KATAKANA LETTER NU + 12, 144, 12, TEXT_Y, // KATAKANA LETTER NE + 24, 144, 12, TEXT_Y, // KATAKANA LETTER NO + 36, 144, 12, TEXT_Y, // KATAKANA LETTER HA + 48, 144, 12, TEXT_Y, // KATAKANA LETTER BA + 60, 144, 12, TEXT_Y, // KATAKANA LETTER PA + 72, 144, 12, TEXT_Y, // KATAKANA LETTER HI + 84, 144, 12, TEXT_Y, // KATAKANA LETTER BI + 96, 144, 12, TEXT_Y, // KATAKANA LETTER PI + 108, 144, 12, TEXT_Y, // KATAKANA LETTER HU + 120, 144, 12, TEXT_Y, // KATAKANA LETTER BU + 132, 144, 12, TEXT_Y, // KATAKANA LETTER PU + 144, 144, 12, TEXT_Y, // KATAKANA LETTER HE + 156, 144, 12, TEXT_Y, // KATAKANA LETTER BE + 168, 144, 12, TEXT_Y, // KATAKANA LETTER PE + 180, 144, 12, TEXT_Y, // KATAKANA LETTER HO + 192, 144, 12, TEXT_Y, // KATAKANA LETTER BO + 204, 144, 12, TEXT_Y, // KATAKANA LETTER PO + 216, 144, 12, TEXT_Y, // KATAKANA LETTER MA + 228, 144, 12, TEXT_Y, // KATAKANA LETTER MI + 240, 144, 12, TEXT_Y, // KATAKANA LETTER MU + 252, 144, 12, TEXT_Y, // KATAKANA LETTER ME + 264, 144, 12, TEXT_Y, // KATAKANA LETTER MO + 276, 144, 12, TEXT_Y, // KATAKANA LETTER SMALL YA + 288, 144, 12, TEXT_Y, // KATAKANA LETTER YA + 300, 144, 12, TEXT_Y, // KATAKANA LETTER SMALL YU + 312, 144, 12, TEXT_Y, // KATAKANA LETTER YU + 324, 144, 12, TEXT_Y, // KATAKANA LETTER SMALL YO + 336, 144, 12, TEXT_Y, // KATAKANA LETTER YO + 348, 144, 12, TEXT_Y, // KATAKANA LETTER RA + 360, 144, 12, TEXT_Y, // KATAKANA LETTER RI + 372, 144, 12, TEXT_Y, // KATAKANA LETTER RU + 384, 144, 12, TEXT_Y, // KATAKANA LETTER RE + 396, 144, 12, TEXT_Y, // KATAKANA LETTER RO + 408, 144, 12, TEXT_Y, // KATAKANA LETTER SMALL WA + 420, 144, 12, TEXT_Y, // KATAKANA LETTER WA + 432, 144, 12, TEXT_Y, // KATAKANA LETTER WO + 444, 144, 12, TEXT_Y, // KATAKANA LETTER N + 456, 144, 12, TEXT_Y, // KATAKANA LETTER VU + 468, 144, 12, TEXT_Y, // KATAKANA LETTER SMALL KA + 480, 144, 12, TEXT_Y, // KATAKANA LETTER SMALL KE + 492, 144, 12, TEXT_Y, // KATAKANA-HIRAGANA PROLONGED SOUND MARK +//////////////////////////////////////////////////////////////////////////////// 192, 0, 9, TEXT_Y, // FULLWIDTH DIGIT ZERO // Uses halfwidth graphic 204, 0, 7, TEXT_Y, // FULLWIDTH DIGIT ONE // Uses halfwidth graphic 216, 0, 9, TEXT_Y, // FULLWIDTH DIGIT TWO // Uses halfwidth graphic @@ -361,22 +429,20 @@ static constexpr unsigned int fontTexcoords[] = { 276, 0, 9, TEXT_Y, // FULLWIDTH DIGIT SEVEN // Uses halfwidth graphic 288, 0, 9, TEXT_Y, // FULLWIDTH DIGIT EIGHT // Uses halfwidth graphic 300, 0, 9, TEXT_Y, // FULLWIDTH DIGIT NINE // Uses halfwidth graphic - }; static constexpr unsigned short int fontUtf16LookupTable[] = { -0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F,0x30,0x31,0x32,0x33,0x34,0x35,0x36,0x37,0x38,0x39,0x3A,0x3B,0x3C,0x3D,0x3E,0x3F,0x40, -0x41,0x42,0x43,0x44,0x45,0x46,0x47,0x48,0x49,0x4A,0x4B,0x4C,0x4D,0x4E,0x4F,0x50,0x51,0x52,0x53,0x54,0x55,0x56,0x57,0x58,0x59,0x5A,0x5B,0x5C,0x5D,0x5E,0x5F,0x60,0x61, -0x62,0x63,0x64,0x65,0x66,0x67,0x68,0x69,0x6A,0x6B,0x6C,0x6D,0x6E,0x6F,0x70,0x71,0x72,0x73,0x74,0x75,0x76,0x77,0x78,0x79,0x7A,0x7B,0x7C,0x7D,0x7E,0xA1,0xA2,0xA3,0xA9, -0xAE,0xB0,0xB1,0xB4,0xBF,0xC0,0xC1,0xC2,0xC4,0xC7,0xC8,0xC9,0xCA,0xCB,0xCC,0xCD,0xCE,0xCF,0xD1,0xD2,0xD3,0xD4,0xD6,0xD7,0xD9,0xDA,0xDB,0xDC,0xDF,0xE0,0xE1,0xE2,0xE4, -0xE7,0xE8,0xE9,0xEA,0xEB,0xEC,0xED,0xEE,0xEF,0xF1,0xF2,0xF3,0xF4,0xF6,0xF7,0xF9,0xFA,0xFB,0xFC,0x152,0x153,0x201C,0x201D,0x2022,0x2026,0x2033,0x203B,0x2122,0x2190,0x2191,0x2192,0x2193,0x3000, -0x3001,0x3002,0x300C,0x300D,0x3012,0x3041,0x3042,0x3043,0x3044,0x3045,0x3046,0x3047,0x3048,0x3049,0x304A,0x304B,0x304C,0x304D,0x304E,0x304F,0x3050,0x3051,0x3052,0x3053,0x3054,0x3055,0x3056,0x3057,0x3058,0x3059,0x305A,0x305B,0x305C, -0x305D,0x305E,0x305F,0x3060,0x3061,0x3062,0x3063,0x3064,0x3065,0x3066,0x3067,0x3068,0x3069,0x306A,0x306B,0x306C,0x306D,0x306E,0x306F,0x3070,0x3071,0x3072,0x3073,0x3074,0x3075,0x3076,0x3077,0x3078,0x3079,0x307A,0x307B,0x307C,0x307D, -0x307E,0x307F,0x3080,0x3081,0x3082,0x3083,0x3084,0x3085,0x3086,0x3087,0x3088,0x3089,0x308A,0x308B,0x308C,0x308D,0x308E,0x308F,0x3092,0x3093,0x30A1,0x30A2,0x30A3,0x30A4,0x30A5,0x30A6,0x30A7,0x30A8,0x30A9,0x30AA,0x30AB,0x30AC,0x30AD, -0x30AE,0x30AF,0x30B0,0x30B1,0x30B2,0x30B3,0x30B4,0x30B5,0x30B6,0x30B7,0x30B8,0x30B9,0x30BA,0x30BB,0x30BC,0x30BD,0x30BE,0x30BF,0x30C0,0x30C1,0x30C2,0x30C3,0x30C4,0x30C5,0x30C6,0x30C7,0x30C8,0x30C9,0x30CA,0x30CB,0x30CC,0x30CD,0x30CE, -0x30CF,0x30D0,0x30D1,0x30D2,0x30D3,0x30D4,0x30D5,0x30D6,0x30D7,0x30D8,0x30D9,0x30DA,0x30DB,0x30DC,0x30DD,0x30DE,0x30DF,0x30E0,0x30E1,0x30E2,0x30E3,0x30E4,0x30E5,0x30E6,0x30E7,0x30E8,0x30E9,0x30EA,0x30EB,0x30EC,0x30ED,0x30EE,0x30EF, -0x30F2,0x30F3,0x30F4,0x30F5,0x30F6,0x30FC, -0xff10, 0xff11, 0xff12, 0xff13, 0xff14, 0xff15, 0xff16, 0xff17, 0xff18, 0xff19, +0x0020,0x0021,0x0022,0x0023,0x0024,0x0025,0x0026,0x0027,0x0028,0x0029,0x002A,0x002B,0x002C,0x002D,0x002E,0x002F,0x0030,0x0031,0x0032,0x0033,0x0034,0x0035,0x0036,0x0037,0x0038,0x0039,0x003A,0x003B,0x003C,0x003D,0x003E,0x003F,0x0040,0x0041,0x0042,0x0043,0x0044,0x0045,0x0046,0x0047,0x0048,0x0049, +0x004A,0x004B,0x004C,0x004D,0x004E,0x004F,0x0050,0x0051,0x0052,0x0053,0x0054,0x0055,0x0056,0x0057,0x0058,0x0059,0x005A,0x005B,0x005C,0x005D,0x005E,0x005F,0x0060,0x0061,0x0062,0x0063,0x0064,0x0065,0x0066,0x0067,0x0068,0x0069,0x006A,0x006B,0x006C,0x006D,0x006E,0x006F,0x0070,0x0071,0x0072,0x0073, +0x0074,0x0075,0x0076,0x0077,0x0078,0x0079,0x007A,0x007B,0x007C,0x007D,0x007E,0x00A1,0x00A2,0x00A3,0x00A9,0x00AE,0x00B0,0x00B1,0x00B4,0x00BF,0x00C0,0x00C1,0x00C2,0x00C4,0x00C7,0x00C8,0x00C9,0x00CA,0x00CB,0x00CC,0x00CD,0x00CE,0x00CF,0x00D1,0x00D2,0x00D3,0x00D4,0x00D6,0x00D7,0x00D9,0x00DA,0x00DB, +0x00DC,0x00DF,0x00E0,0x00E1,0x00E2,0x00E4,0x00E7,0x00E8,0x00E9,0x00EA,0x00EB,0x00EC,0x00ED,0x00EE,0x00EF,0x00F1,0x00F2,0x00F3,0x00F4,0x00F6,0x00F7,0x00F9,0x00FA,0x00FB,0x00FC,0x0152,0x0153,0x0401,0x0410,0x0411,0x0412,0x0413,0x0414,0x0415,0x0416,0x0417,0x0418,0x0419,0x041A,0x041B,0x041C,0x041D, +0x041E,0x041F,0x0420,0x0421,0x0422,0x0423,0x0424,0x0425,0x0426,0x0427,0x0428,0x0429,0x042A,0x042B,0x042C,0x042D,0x042E,0x042F,0x0430,0x0431,0x0432,0x0433,0x0434,0x0435,0x0436,0x0437,0x0438,0x0439,0x043A,0x043B,0x043C,0x043D,0x043E,0x043F,0x0440,0x0441,0x0442,0x0443,0x0444,0x0445,0x0446,0x0447, +0x0448,0x0449,0x044A,0x044B,0x044C,0x044D,0x044E,0x044F,0x0451,0x201C,0x201D,0x2022,0x2026,0x2033,0x203B,0x2122,0x2190,0x2191,0x2192,0x2193,0x3000,0x3001,0x3002,0x300C, +0x300D,0x3012,0x3041,0x3042,0x3043,0x3044,0x3045,0x3046,0x3047,0x3048,0x3049,0x304A,0x304B,0x304C,0x304D,0x304E,0x304F,0x3050,0x3051,0x3052,0x3053,0x3054,0x3055,0x3056,0x3057,0x3058,0x3059,0x305A,0x305B,0x305C,0x305D,0x305E,0x305F,0x3060,0x3061,0x3062,0x3063,0x3064,0x3065,0x3066,0x3067,0x3068, // Kana row 1 +0x3069,0x306A,0x306B,0x306C,0x306D,0x306E,0x306F,0x3070,0x3071,0x3072,0x3073,0x3074,0x3075,0x3076,0x3077,0x3078,0x3079,0x307A,0x307B,0x307C,0x307D,0x307E,0x307F,0x3080,0x3081,0x3082,0x3083,0x3084,0x3085,0x3086,0x3087,0x3088,0x3089,0x308A,0x308B,0x308C,0x308D,0x308E,0x308F,0x3092,0x3093,0x30A1, +0x30A2,0x30A3,0x30A4,0x30A5,0x30A6,0x30A7,0x30A8,0x30A9,0x30AA,0x30AB,0x30AC,0x30AD,0x30AE,0x30AF,0x30B0,0x30B1,0x30B2,0x30B3,0x30B4,0x30B5,0x30B6,0x30B7,0x30B8,0x30B9,0x30BA,0x30BB,0x30BC,0x30BD,0x30BE,0x30BF,0x30C0,0x30C1,0x30C2,0x30C3,0x30C4,0x30C5,0x30C6,0x30C7,0x30C8,0x30C9,0x30CA,0x30CB, +0x30CC,0x30CD,0x30CE,0x30CF,0x30D0,0x30D1,0x30D2,0x30D3,0x30D4,0x30D5,0x30D6,0x30D7,0x30D8,0x30D9,0x30DA,0x30DB,0x30DC,0x30DD,0x30DE,0x30DF,0x30E0,0x30E1,0x30E2,0x30E3,0x30E4,0x30E5,0x30E6,0x30E7,0x30E8,0x30E9,0x30EA,0x30EB,0x30EC,0x30ED,0x30EE,0x30EF,0x30F2,0x30F3,0x30F4,0x30F5,0x30F6,0x30FC, +0xff10,0xff11,0xff12,0xff13,0xff14,0xff15,0xff16,0xff17,0xff18,0xff19, // Full width numbers }; diff --git a/nitrofiles/graphics/font.png b/nitrofiles/graphics/font.png index 2f77777ae..7ce097e7c 100644 Binary files a/nitrofiles/graphics/font.png and b/nitrofiles/graphics/font.png differ diff --git a/resources/font.xcf b/resources/font.xcf index 45a7c7315..8e6f8cb28 100644 Binary files a/resources/font.xcf and b/resources/font.xcf differ