diff --git a/include/constants/charcode.h b/include/constants/charcode.h index a35025d799..88fae76a6d 100644 --- a/include/constants/charcode.h +++ b/include/constants/charcode.h @@ -3,298 +3,294 @@ enum CharCode { CHAR_NONE = 0, - CHAR_WIDE_SPACE, - - CHAR_HIRAGANA_SMALL_A, - CHAR_HIRAGANA_A, - CHAR_HIRAGANA_SMALL_I, - CHAR_HIRAGANA_I, - CHAR_HIRAGANA_SMALL_U, - CHAR_HIRAGANA_U, - CHAR_HIRAGANA_SMALL_E, - CHAR_HIRAGANA_E, - CHAR_HIRAGANA_SMALL_O, - CHAR_HIRAGANA_O, - CHAR_HIRAGANA_KA, - CHAR_HIRAGANA_GA, - CHAR_HIRAGANA_KI, - CHAR_HIRAGANA_GI, - CHAR_HIRAGANA_KU, - CHAR_HIRAGANA_GU, - CHAR_HIRAGANA_KE, - CHAR_HIRAGANA_GE, - CHAR_HIRAGANA_KO, - CHAR_HIRAGANA_GO, - CHAR_HIRAGANA_SA, - CHAR_HIRAGANA_ZA, - CHAR_HIRAGANA_SHI, - CHAR_HIRAGANA_JI, - CHAR_HIRAGANA_SU, - CHAR_HIRAGANA_ZU, - CHAR_HIRAGANA_SE, - CHAR_HIRAGANA_ZE, - CHAR_HIRAGANA_SO, - CHAR_HIRAGANA_ZO, - CHAR_HIRAGANA_TA, - CHAR_HIRAGANA_DA, - CHAR_HIRAGANA_CHI, - CHAR_HIRAGANA_DJI, - CHAR_HIRAGANA_SOKUON, - CHAR_HIRAGANA_TSU, - CHAR_HIRAGANA_DZU, - CHAR_HIRAGANA_TE, - CHAR_HIRAGANA_DE, - CHAR_HIRAGANA_TO, - CHAR_HIRAGANA_DO, - CHAR_HIRAGANA_NA, - CHAR_HIRAGANA_NI, - CHAR_HIRAGANA_NU, - CHAR_HIRAGANA_NE, - CHAR_HIRAGANA_NO, - CHAR_HIRAGANA_HA, - CHAR_HIRAGANA_BA, - CHAR_HIRAGANA_PA, - CHAR_HIRAGANA_HI, - CHAR_HIRAGANA_BI, - CHAR_HIRAGANA_PI, - CHAR_HIRAGANA_FU, - CHAR_HIRAGANA_BU, - CHAR_HIRAGANA_PU, - CHAR_HIRAGANA_HE, - CHAR_HIRAGANA_BE, - CHAR_HIRAGANA_PE, - CHAR_HIRAGANA_HO, - CHAR_HIRAGANA_BO, - CHAR_HIRAGANA_PO, - CHAR_HIRAGANA_MA, - CHAR_HIRAGANA_MI, - CHAR_HIRAGANA_MU, - CHAR_HIRAGANA_ME, - CHAR_HIRAGANA_MO, - CHAR_HIRAGANA_SMALL_YA, - CHAR_HIRAGANA_YA, - CHAR_HIRAGANA_SMALL_YU, - CHAR_HIRAGANA_YU, - CHAR_HIRAGANA_SMALL_YO, - CHAR_HIRAGANA_YO, - CHAR_HIRAGANA_RA, - CHAR_HIRAGANA_RI, - CHAR_HIRAGANA_RU, - CHAR_HIRAGANA_RE, - CHAR_HIRAGANA_RO, - CHAR_HIRAGANA_WA, - CHAR_HIRAGANA_WO, - CHAR_HIRAGANA_N, - - CHAR_KATAKANA_SMALL_A, - CHAR_KATAKANA_A, - CHAR_KATAKANA_SMALL_I, - CHAR_KATAKANA_I, - CHAR_KATAKANA_SMALL_U, - CHAR_KATAKANA_U, - CHAR_KATAKANA_SMALL_E, - CHAR_KATAKANA_E, - CHAR_KATAKANA_SMALL_O, - CHAR_KATAKANA_O, - CHAR_KATAKANA_KA, - CHAR_KATAKANA_GA, - CHAR_KATAKANA_KI, - CHAR_KATAKANA_GI, - CHAR_KATAKANA_KU, - CHAR_KATAKANA_GU, - CHAR_KATAKANA_KE, - CHAR_KATAKANA_GE, - CHAR_KATAKANA_KO, - CHAR_KATAKANA_GO, - CHAR_KATAKANA_SA, - CHAR_KATAKANA_ZA, - CHAR_KATAKANA_SHI, - CHAR_KATAKANA_JI, - CHAR_KATAKANA_SU, - CHAR_KATAKANA_ZU, - CHAR_KATAKANA_SE, - CHAR_KATAKANA_ZE, - CHAR_KATAKANA_SO, - CHAR_KATAKANA_ZO, - CHAR_KATAKANA_TA, - CHAR_KATAKANA_DA, - CHAR_KATAKANA_CHI, - CHAR_KATAKANA_DJI, - CHAR_KATAKANA_SOKUON, - CHAR_KATAKANA_TSU, - CHAR_KATAKANA_DZU, - CHAR_KATAKANA_TE, - CHAR_KATAKANA_DE, - CHAR_KATAKANA_TO, - CHAR_KATAKANA_DO, - CHAR_KATAKANA_NA, - CHAR_KATAKANA_NI, - CHAR_KATAKANA_NU, - CHAR_KATAKANA_NE, - CHAR_KATAKANA_NO, - CHAR_KATAKANA_HA, - CHAR_KATAKANA_BA, - CHAR_KATAKANA_PA, - CHAR_KATAKANA_HI, - CHAR_KATAKANA_BI, - CHAR_KATAKANA_PI, - CHAR_KATAKANA_FU, - CHAR_KATAKANA_BU, - CHAR_KATAKANA_PU, - CHAR_KATAKANA_HE, - CHAR_KATAKANA_BE, - CHAR_KATAKANA_PE, - CHAR_KATAKANA_HO, - CHAR_KATAKANA_BO, - CHAR_KATAKANA_PO, - CHAR_KATAKANA_MA, - CHAR_KATAKANA_MI, - CHAR_KATAKANA_MU, - CHAR_KATAKANA_ME, - CHAR_KATAKANA_MO, - CHAR_KATAKANA_SMALL_YA, - CHAR_KATAKANA_YA, - CHAR_KATAKANA_SMALL_YU, - CHAR_KATAKANA_YU, - CHAR_KATAKANA_SMALL_YO, - CHAR_KATAKANA_YO, - CHAR_KATAKANA_RA, - CHAR_KATAKANA_RI, - CHAR_KATAKANA_RU, - CHAR_KATAKANA_RE, - CHAR_KATAKANA_RO, - CHAR_KATAKANA_WA, - CHAR_KATAKANA_WO, - CHAR_KATAKANA_N, - - CHAR_WIDE_0, - CHAR_WIDE_1, - CHAR_WIDE_2, - CHAR_WIDE_3, - CHAR_WIDE_4, - CHAR_WIDE_5, - CHAR_WIDE_6, - CHAR_WIDE_7, - CHAR_WIDE_8, - CHAR_WIDE_9, - CHAR_WIDE_A, - CHAR_WIDE_B, - CHAR_WIDE_C, - CHAR_WIDE_D, - CHAR_WIDE_E, - CHAR_WIDE_F, - CHAR_WIDE_G, - CHAR_WIDE_H, - CHAR_WIDE_I, - CHAR_WIDE_J, - CHAR_WIDE_K, - CHAR_WIDE_L, - CHAR_WIDE_M, - CHAR_WIDE_N, - CHAR_WIDE_O, - CHAR_WIDE_P, - CHAR_WIDE_Q, - CHAR_WIDE_R, - CHAR_WIDE_S, - CHAR_WIDE_T, - CHAR_WIDE_U, - CHAR_WIDE_V, - CHAR_WIDE_W, - CHAR_WIDE_X, - CHAR_WIDE_Y, - CHAR_WIDE_Z, - CHAR_WIDE_a, - CHAR_WIDE_b, - CHAR_WIDE_c, - CHAR_WIDE_d, - CHAR_WIDE_e, - CHAR_WIDE_f, - CHAR_WIDE_g, - CHAR_WIDE_h, - CHAR_WIDE_i, - CHAR_WIDE_j, - CHAR_WIDE_k, - CHAR_WIDE_l, - CHAR_WIDE_m, - CHAR_WIDE_n, - CHAR_WIDE_o, - CHAR_WIDE_p, - CHAR_WIDE_q, - CHAR_WIDE_r, - CHAR_WIDE_s, - CHAR_WIDE_t, - CHAR_WIDE_u, - CHAR_WIDE_v, - CHAR_WIDE_w, - CHAR_WIDE_x, - CHAR_WIDE_y, - CHAR_WIDE_z, - CHAR_WIDE_TRANSPARENT, - CHAR_WIDE_EXCLAMATION, - CHAR_WIDE_QUESTION, + CHAR_JP_SPACE, + CHAR_JP_HIRA_A_SMALL, + CHAR_JP_HIRA_A, + CHAR_JP_HIRA_I_SMALL, + CHAR_JP_HIRA_I, + CHAR_JP_HIRA_U_SMALL, + CHAR_JP_HIRA_U, + CHAR_JP_HIRA_E_SMALL, + CHAR_JP_HIRA_E, + CHAR_JP_HIRA_O_SMALL, + CHAR_JP_HIRA_O, + CHAR_JP_HIRA_KA, + CHAR_JP_HIRA_GA, + CHAR_JP_HIRA_KI, + CHAR_JP_HIRA_GI, + CHAR_JP_HIRA_KU, + CHAR_JP_HIRA_GU, + CHAR_JP_HIRA_KE, + CHAR_JP_HIRA_GE, + CHAR_JP_HIRA_KO, + CHAR_JP_HIRA_GO, + CHAR_JP_HIRA_SA, + CHAR_JP_HIRA_ZA, + CHAR_JP_HIRA_SHI, + CHAR_JP_HIRA_JI, + CHAR_JP_HIRA_SU, + CHAR_JP_HIRA_ZU, + CHAR_JP_HIRA_SE, + CHAR_JP_HIRA_ZE, + CHAR_JP_HIRA_SO, + CHAR_JP_HIRA_ZO, + CHAR_JP_HIRA_TA, + CHAR_JP_HIRA_DA, + CHAR_JP_HIRA_CHI, + CHAR_JP_HIRA_DJI, + CHAR_JP_HIRA_SOKUON, + CHAR_JP_HIRA_TSU, + CHAR_JP_HIRA_DZU, + CHAR_JP_HIRA_TE, + CHAR_JP_HIRA_DE, + CHAR_JP_HIRA_TO, + CHAR_JP_HIRA_DO, + CHAR_JP_HIRA_NA, + CHAR_JP_HIRA_NI, + CHAR_JP_HIRA_NU, + CHAR_JP_HIRA_NE, + CHAR_JP_HIRA_NO, + CHAR_JP_HIRA_HA, + CHAR_JP_HIRA_BA, + CHAR_JP_HIRA_PA, + CHAR_JP_HIRA_HI, + CHAR_JP_HIRA_BI, + CHAR_JP_HIRA_PI, + CHAR_JP_HIRA_FU, + CHAR_JP_HIRA_BU, + CHAR_JP_HIRA_PU, + CHAR_JP_HIRA_HE, + CHAR_JP_HIRA_BE, + CHAR_JP_HIRA_PE, + CHAR_JP_HIRA_HO, + CHAR_JP_HIRA_BO, + CHAR_JP_HIRA_PO, + CHAR_JP_HIRA_MA, + CHAR_JP_HIRA_MI, + CHAR_JP_HIRA_MU, + CHAR_JP_HIRA_ME, + CHAR_JP_HIRA_MO, + CHAR_JP_HIRA_YA_SMALL, + CHAR_JP_HIRA_YA, + CHAR_JP_HIRA_YU_SMALL, + CHAR_JP_HIRA_YU, + CHAR_JP_HIRA_YO_SMALL, + CHAR_JP_HIRA_YO, + CHAR_JP_HIRA_RA, + CHAR_JP_HIRA_RI, + CHAR_JP_HIRA_RU, + CHAR_JP_HIRA_RE, + CHAR_JP_HIRA_RO, + CHAR_JP_HIRA_WA, + CHAR_JP_HIRA_WO, + CHAR_JP_HIRA_N, + CHAR_JP_KATA_A_SMALL, + CHAR_JP_KATA_A, + CHAR_JP_KATA_I_SMALL, + CHAR_JP_KATA_I, + CHAR_JP_KATA_U_SMALL, + CHAR_JP_KATA_U, + CHAR_JP_KATA_E_SMALL, + CHAR_JP_KATA_E, + CHAR_JP_KATA_O_SMALL, + CHAR_JP_KATA_O, + CHAR_JP_KATA_KA, + CHAR_JP_KATA_GA, + CHAR_JP_KATA_KI, + CHAR_JP_KATA_GI, + CHAR_JP_KATA_KU, + CHAR_JP_KATA_GU, + CHAR_JP_KATA_KE, + CHAR_JP_KATA_GE, + CHAR_JP_KATA_KO, + CHAR_JP_KATA_GO, + CHAR_JP_KATA_SA, + CHAR_JP_KATA_ZA, + CHAR_JP_KATA_SHI, + CHAR_JP_KATA_JI, + CHAR_JP_KATA_SU, + CHAR_JP_KATA_ZU, + CHAR_JP_KATA_SE, + CHAR_JP_KATA_ZE, + CHAR_JP_KATA_SO, + CHAR_JP_KATA_ZO, + CHAR_JP_KATA_TA, + CHAR_JP_KATA_DA, + CHAR_JP_KATA_CHI, + CHAR_JP_KATA_DJI, + CHAR_JP_KATA_SOKUON, + CHAR_JP_KATA_TSU, + CHAR_JP_KATA_DZU, + CHAR_JP_KATA_TE, + CHAR_JP_KATA_DE, + CHAR_JP_KATA_TO, + CHAR_JP_KATA_DO, + CHAR_JP_KATA_NA, + CHAR_JP_KATA_NI, + CHAR_JP_KATA_NU, + CHAR_JP_KATA_NE, + CHAR_JP_KATA_NO, + CHAR_JP_KATA_HA, + CHAR_JP_KATA_BA, + CHAR_JP_KATA_PA, + CHAR_JP_KATA_HI, + CHAR_JP_KATA_BI, + CHAR_JP_KATA_PI, + CHAR_JP_KATA_FU, + CHAR_JP_KATA_BU, + CHAR_JP_KATA_PU, + CHAR_JP_KATA_HE, + CHAR_JP_KATA_BE, + CHAR_JP_KATA_PE, + CHAR_JP_KATA_HO, + CHAR_JP_KATA_BO, + CHAR_JP_KATA_PO, + CHAR_JP_KATA_MA, + CHAR_JP_KATA_MI, + CHAR_JP_KATA_MU, + CHAR_JP_KATA_ME, + CHAR_JP_KATA_MO, + CHAR_JP_KATA_YA_SMALL, + CHAR_JP_KATA_YA, + CHAR_JP_KATA_YU_SMALL, + CHAR_JP_KATA_YU, + CHAR_JP_KATA_YO_SMALL, + CHAR_JP_KATA_YO, + CHAR_JP_KATA_RA, + CHAR_JP_KATA_RI, + CHAR_JP_KATA_RU, + CHAR_JP_KATA_RE, + CHAR_JP_KATA_RO, + CHAR_JP_KATA_WA, + CHAR_JP_KATA_WO, + CHAR_JP_KATA_N, + CHAR_JP_0, + CHAR_JP_1, + CHAR_JP_2, + CHAR_JP_3, + CHAR_JP_4, + CHAR_JP_5, + CHAR_JP_6, + CHAR_JP_7, + CHAR_JP_8, + CHAR_JP_9, + CHAR_JP_A, + CHAR_JP_B, + CHAR_JP_C, + CHAR_JP_D, + CHAR_JP_E, + CHAR_JP_F, + CHAR_JP_G, + CHAR_JP_H, + CHAR_JP_I, + CHAR_JP_J, + CHAR_JP_K, + CHAR_JP_L, + CHAR_JP_M, + CHAR_JP_N, + CHAR_JP_O, + CHAR_JP_P, + CHAR_JP_Q, + CHAR_JP_R, + CHAR_JP_S, + CHAR_JP_T, + CHAR_JP_U, + CHAR_JP_V, + CHAR_JP_W, + CHAR_JP_X, + CHAR_JP_Y, + CHAR_JP_Z, + CHAR_JP_a, + CHAR_JP_b, + CHAR_JP_c, + CHAR_JP_d, + CHAR_JP_e, + CHAR_JP_f, + CHAR_JP_g, + CHAR_JP_h, + CHAR_JP_i, + CHAR_JP_j, + CHAR_JP_k, + CHAR_JP_l, + CHAR_JP_m, + CHAR_JP_n, + CHAR_JP_o, + CHAR_JP_p, + CHAR_JP_q, + CHAR_JP_r, + CHAR_JP_s, + CHAR_JP_t, + CHAR_JP_u, + CHAR_JP_v, + CHAR_JP_w, + CHAR_JP_x, + CHAR_JP_y, + CHAR_JP_z, + CHAR_JP_TRANSPARENT, + CHAR_JP_EMARK, + CHAR_JP_QMARK, CHAR_JP_COMMA, - CHAR_JP_PERIOD, + CHAR_JP_FULL_STOP, CHAR_JP_ELLIPSIS, CHAR_JP_DOT, - CHAR_WIDE_SLASH, + CHAR_JP_SLASH, CHAR_JP_SINGLE_QUOTE_OPEN, CHAR_JP_SINGLE_QUOTE_CLOSE, CHAR_JP_DOUBLE_QUOTE_OPEN, CHAR_JP_DOUBLE_QUOTE_CLOSE, - CHAR_JP_PAREN_OPEN, - CHAR_JP_PAREN_CLOSE, - CHAR_WIDE_MALE, - CHAR_WIDE_FEMALE, - CHAR_WIDE_PLUS, - CHAR_WIDE_MINUS, - CHAR_WIDE_MULTIPLY, - CHAR_WIDE_DIVIDE, - CHAR_WIDE_EQUALS, - CHAR_WIDE_TILDE, - CHAR_WIDE_COLON, - CHAR_WIDE_SEMICOLON, - CHAR_WIDE_PERIOD, - CHAR_WIDE_COMMA, - CHAR_WIDE_SPADE, - CHAR_WIDE_CLUB, - CHAR_WIDE_HEART, - CHAR_WIDE_DIAMOND, - CHAR_WIDE_STAR, - CHAR_WIDE_DOUBLE_CIRCLE, - CHAR_WIDE_CIRCLE, - CHAR_WIDE_SQUARE, - CHAR_WIDE_TRIANGLE, - CHAR_WIDE_DIAMOND_OPEN, - CHAR_WIDE_AT_SIGN, - CHAR_WIDE_EIGHTH_NOTE, - CHAR_WIDE_PERCENT, - CHAR_WIDE_SUN, - CHAR_WIDE_CLOUD, - CHAR_WIDE_UMBRELLA, - CHAR_WIDE_SILHOUETTE, - CHAR_WIDE_EMOTE_SMILE, - CHAR_WIDE_EMOTE_LAUGH, - CHAR_WIDE_EMOTE_UPSET, - CHAR_WIDE_EMOTE_FROWN, - CHAR_WIDE_ARROW_CURVE_UP, - CHAR_WIDE_ARROW_CURVE_DOWN, - CHAR_WIDE_ZZZ, - CHAR_YEN, + CHAR_JP_PARENTHESES_OPEN, + CHAR_JP_PARENTHESES_CLOSE, + CHAR_JP_MALE, + CHAR_JP_FEMALE, + CHAR_JP_PLUS, + CHAR_JP_MINUS, + CHAR_JP_MULTIPLY, + CHAR_JP_DIVIDE, + CHAR_JP_EQUALS, + CHAR_JP_TILDE, + CHAR_JP_HW_COLON, + CHAR_JP_HW_SEMICOLON, + CHAR_JP_HW_PERIOD, + CHAR_JP_HW_COMMA, + CHAR_JP_SPADE_SUIT, + CHAR_JP_CLUB_SUIT, + CHAR_JP_HEART_SUIT, + CHAR_JP_DIAMOND_SUIT, + CHAR_JP_STAR, + CHAR_JP_DOUBLE_CIRCLE, + CHAR_JP_CIRCLE, + CHAR_JP_SQUARE, + CHAR_JP_TRIANGLE, + CHAR_JP_DIAMOND, + CHAR_JP_AT_SIGN, + CHAR_JP_MUSIC_NOTE, + CHAR_JP_PERCENT, + CHAR_JP_SUN, + CHAR_JP_CLOUD, + CHAR_JP_UMBRELLA, + CHAR_JP_SNOWMAN, + CHAR_JP_EMOTE_SMILE, + CHAR_JP_EMOTE_LAUGH, + CHAR_JP_EMOTE_UPSET, + CHAR_JP_EMOTE_FROWN, + CHAR_JP_ARROW_CURVE_UP, + CHAR_JP_ARROW_CURVE_DOWN, + CHAR_JP_ZZZ, + CHAR_JP_CURRENCY, CHAR_POCKET_ICON_ITEMS, CHAR_POCKET_ICON_KEY_ITEMS, - CHAR_POCKET_ICON_TMS, + CHAR_POCKET_ICON_TMS_HMS, CHAR_POCKET_ICON_MAIL, CHAR_POCKET_ICON_MEDICINE, CHAR_POCKET_ICON_BERRIES, - CHAR_POCKET_ICON_POKEBALLS, + CHAR_POCKET_ICON_POKE_BALLS, CHAR_POCKET_ICON_BATTLE_ITEMS, CHAR_ARROW_LEFT, CHAR_ARROW_UP, CHAR_ARROW_DOWN, CHAR_ARROW_RIGHT, CHAR_ARROW_MENU, - CHAR_WIDE_AMPERSAND, - + CHAR_JP_AMPERSAND, CHAR_0, CHAR_1, CHAR_2, @@ -364,7 +360,7 @@ enum CharCode { CHAR_A_DIERESIS, CHAR_A_OVERDOT, CHAR_AE, - CHAR_C_OGONEK, + CHAR_C_CEDILLA, CHAR_E_GRAVE, CHAR_E_ACUTE, CHAR_E_CIRCUMFLEX, @@ -373,21 +369,21 @@ enum CharCode { CHAR_I_ACUTE, CHAR_I_CIRCUMFLEX, CHAR_I_DIERESIS, - CHAR_D_BAR, + CHAR_ETH, CHAR_N_TILDE, CHAR_O_GRAVE, CHAR_O_ACUTE, CHAR_O_CIRCUMFLEX, CHAR_O_TILDE, - CHAR_O_DIERSIS, + CHAR_O_DIERESIS, CHAR_MULTIPLY, - CHAR_NULL_SIGN, + CHAR_O_SLASH, CHAR_U_GRAVE, CHAR_U_ACUTE, CHAR_U_CIRCUMFLEX, CHAR_U_DIERESIS, CHAR_Y_ACUTE, - CHAR_UNK_P_LIKE_THING, + CHAR_THORN, CHAR_ESZETT, CHAR_a_GRAVE, CHAR_a_ACUTE, @@ -396,7 +392,7 @@ enum CharCode { CHAR_a_DIERESIS, CHAR_a_OVERDOT, CHAR_ae, - CHAR_c_OGONEK, + CHAR_c_CEDILLA, CHAR_e_GRAVE, CHAR_e_ACUTE, CHAR_e_CIRCUMFLEX, @@ -405,36 +401,36 @@ enum CharCode { CHAR_i_ACUTE, CHAR_i_CIRCUMFLEX, CHAR_i_DIERESIS, - CHAR_d_BAR, + CHAR_eth, CHAR_n_TILDE, CHAR_o_GRAVE, CHAR_o_ACUTE, CHAR_o_CIRCUMFLEX, CHAR_o_TILDE, - CHAR_o_DIERSIS, + CHAR_o_DIERESIS, CHAR_DIVIDE, - CHAR_null_SIGN, + CHAR_o_SLASH, CHAR_u_GRAVE, CHAR_u_ACUTE, CHAR_u_CIRCUMFLEX, CHAR_u_DIERESIS, CHAR_y_ACUTE, - CHAR_UNK_p_LIKE_THING, - CHAR_y_dieresis, + CHAR_thorn, + CHAR_y_DIERESIS, CHAR_OE, CHAR_oe, - CHAR_S_OGONEK, - CHAR_s_OGONEK, - CHAR_a_SUPERSCRIPT, - CHAR_o_SUPERSCRIPT, - CHAR_er_SUPERSCRIPT, - CHAR_re_SUPERSCRIPT, - CHAR_r_SUPERSCRIPT, - CHAR_POKEDOLLARS, - CHAR_EXCLAMATION_INVERTED, - CHAR_QUESTION_INVERTED, - CHAR_EXCLAMATION, - CHAR_QUESTION, + CHAR_S_CEDILLA, + CHAR_s_CEDILLA, + CHAR_a_SUPER, + CHAR_o_SUPER, + CHAR_er_SUPER, + CHAR_re_SUPER, + CHAR_r_SUPER, + CHAR_CURRENCY, // "Poké Dollar" symbol in international versions + CHAR_EMARK_INVERTED, + CHAR_QMARK_INVERTED, + CHAR_EMARK, + CHAR_QMARK, CHAR_COMMA, CHAR_PERIOD, CHAR_ELLIPSIS, @@ -445,10 +441,10 @@ enum CharCode { CHAR_DOUBLE_QUOTE_OPEN, CHAR_DOUBLE_QUOTE_CLOSE, CHAR_DOUBLE_QUOTE_CLOSE_INVERTED, - CHAR_DOUBLE_PAREN_OPEN, - CHAR_DOUBLE_PAREN_CLOSE, - CHAR_PAREN_OPEN, - CHAR_PAREN_CLOSE, + CHAR_ANGLE_QUOTE_OPEN, + CHAR_ANGLE_QUOTE_CLOSE, + CHAR_PARENTHESES_OPEN, + CHAR_PARENTHESES_CLOSE, CHAR_MALE, CHAR_FEMALE, CHAR_PLUS, @@ -460,23 +456,23 @@ enum CharCode { CHAR_TILDE, CHAR_COLON, CHAR_SEMICOLON, - CHAR_SPADE, - CHAR_CLUB, - CHAR_HEART, - CHAR_DIAMOND, + CHAR_SPADE_SUIT, + CHAR_CLUB_SUIT, + CHAR_HEART_SUIT, + CHAR_DIAMOND_SUIT, CHAR_STAR, CHAR_DOUBLE_CIRCLE, CHAR_CIRCLE, CHAR_SQUARE, CHAR_TRIANGLE, - CHAR_DIAMOND_OPEN, + CHAR_DIAMOND, CHAR_AT_SIGN, - CHAR_EIGHT_NOTE, + CHAR_MUSIC_NOTE, CHAR_PERCENT, CHAR_SUN, CHAR_CLOUD, CHAR_UMBRELLA, - CHAR_SILHOUETTE, + CHAR_SNOWMAN, CHAR_EMOTE_SMILE, CHAR_EMOTE_LAUGH, CHAR_EMOTE_UPSET, @@ -485,40 +481,32 @@ enum CharCode { CHAR_ARROW_CURVE_DOWN, CHAR_ZZZ, CHAR_SPACE, - CHAR_e_SUPERSCRIPT, + CHAR_e_SUPER, CHAR_PK, CHAR_MN, CHAR_NUM_SPACE, - CHAR_SPACE_1px, - CHAR_SPACE_2px, - CHAR_SPACE_4px, - CHAR_SPACE_8px, - CHAR_SPACE_16px, - CHAR_DEGREES, + CHAR_FILL_1PX, + CHAR_FILL_2PX, + CHAR_FILL_4PX, + CHAR_FILL_8PX, + CHAR_FILL_16PX, + CHAR_DEGREE, CHAR_UNDERSCORE, - CHAR_WIDE_UNDERSCORE, - + CHAR_UNDERSCORE_WIDE, CHAR_CONTROL_SCREEN_INDICATOR = 0x0200, CHAR_CONTROL_PAUSE, CHAR_CONTROL_CALLBACK, CHAR_CONTROL_CURSOR_X, CHAR_CONTROL_CURSOR_Y, - CHAR_CONTROL_CLEAR = 0x25BC, CHAR_CONTROL_SCROLL, - - CHAR_CR = 0xE000, - + CHAR_LINE_BREAK = 0xE000, CHAR_PLACEHOLDER_BEGIN = 0xF0FD, - CHAR_COMPRESSED_MARK = 0xF100, - CHAR_CONTROL_MOVE = 0xFE06, - CHAR_CONTROL_SET_COLOR = 0xFF00, CHAR_CONTROL_SET_SIZE, - - CHAR_FORMAT_ARG = 0xFFFE, + CHAR_CONTROL_CODE_ARG = 0xFFFE, CHAR_EOS, }; diff --git a/src/applications/naming_screen.c b/src/applications/naming_screen.c index 3c2beb0b1f..8c175d3cfa 100644 --- a/src/applications/naming_screen.c +++ b/src/applications/naming_screen.c @@ -598,8 +598,8 @@ static const charcode_t sCharCodesOthers0[] = { CHAR_PERIOD, CHAR_COLON, CHAR_SEMICOLON, - CHAR_EXCLAMATION, - CHAR_QUESTION, + CHAR_EMARK, + CHAR_QMARK, CHAR_SPACE, CHAR_SPACE, CHAR_SPACE, @@ -615,8 +615,8 @@ static const charcode_t sCharCodesOthers1[] = { CHAR_DOUBLE_QUOTE_CLOSE, CHAR_SINGLE_QUOTE_OPEN, CHAR_SINGLE_QUOTE_CLOSE, - CHAR_PAREN_OPEN, - CHAR_PAREN_CLOSE, + CHAR_PARENTHESES_OPEN, + CHAR_PARENTHESES_CLOSE, CHAR_SPACE, CHAR_SPACE, CHAR_SPACE, @@ -649,13 +649,13 @@ static const charcode_t sCharCodesOthers3[] = { CHAR_CIRCLE, CHAR_SQUARE, CHAR_TRIANGLE, - CHAR_DIAMOND_OPEN, - CHAR_SPADE, - CHAR_HEART, CHAR_DIAMOND, - CHAR_CLUB, + CHAR_SPADE_SUIT, + CHAR_HEART_SUIT, + CHAR_DIAMOND_SUIT, + CHAR_CLUB_SUIT, CHAR_STAR, - CHAR_EIGHT_NOTE, + CHAR_MUSIC_NOTE, CHAR_SPACE, CHAR_SPACE, CHAR_EOS, @@ -665,7 +665,7 @@ static const charcode_t sCharCodesOthers4[] = { CHAR_SUN, CHAR_CLOUD, CHAR_UMBRELLA, - CHAR_SILHOUETTE, + CHAR_SNOWMAN, CHAR_EMOTE_SMILE, CHAR_EMOTE_LAUGH, CHAR_EMOTE_UPSET, @@ -679,36 +679,36 @@ static const charcode_t sCharCodesOthers4[] = { }; static const charcode_t sCharCodesJpMisc0[] = { - CHAR_WIDE_0, - CHAR_WIDE_1, - CHAR_WIDE_2, - CHAR_WIDE_3, - CHAR_WIDE_4, - CHAR_WIDE_5, - CHAR_WIDE_6, - CHAR_WIDE_7, - CHAR_WIDE_8, - CHAR_WIDE_9, - CHAR_WIDE_SPACE, - CHAR_WIDE_EXCLAMATION, - CHAR_WIDE_QUESTION, + CHAR_JP_0, + CHAR_JP_1, + CHAR_JP_2, + CHAR_JP_3, + CHAR_JP_4, + CHAR_JP_5, + CHAR_JP_6, + CHAR_JP_7, + CHAR_JP_8, + CHAR_JP_9, + CHAR_JP_SPACE, + CHAR_JP_EMARK, + CHAR_JP_QMARK, CHAR_EOS, }; static const charcode_t sCharCodesJpMisc1[] = { CHAR_JP_COMMA, - CHAR_JP_PERIOD, - CHAR_WIDE_COMMA, - CHAR_WIDE_PERIOD, + CHAR_JP_FULL_STOP, + CHAR_JP_HW_COMMA, + CHAR_JP_HW_PERIOD, CHAR_JP_ELLIPSIS, CHAR_JP_DOT, - CHAR_WIDE_TILDE, - CHAR_WIDE_COLON, - CHAR_WIDE_SEMICOLON, - CHAR_WIDE_SLASH, - CHAR_WIDE_SPACE, - CHAR_WIDE_MALE, - CHAR_WIDE_FEMALE, + CHAR_JP_TILDE, + CHAR_JP_HW_COLON, + CHAR_JP_HW_SEMICOLON, + CHAR_JP_SLASH, + CHAR_JP_SPACE, + CHAR_JP_MALE, + CHAR_JP_FEMALE, CHAR_EOS, }; @@ -717,49 +717,49 @@ static const charcode_t sCharCodesJpMisc2[] = { CHAR_JP_SINGLE_QUOTE_CLOSE, CHAR_JP_DOUBLE_QUOTE_OPEN, CHAR_JP_DOUBLE_QUOTE_CLOSE, - CHAR_JP_PAREN_OPEN, - CHAR_JP_PAREN_CLOSE, - CHAR_WIDE_PLUS, - CHAR_WIDE_MINUS, - CHAR_WIDE_MULTIPLY, - CHAR_WIDE_DIVIDE, - CHAR_WIDE_EQUALS, - CHAR_WIDE_PERCENT, - CHAR_WIDE_AT_SIGN, + CHAR_JP_PARENTHESES_OPEN, + CHAR_JP_PARENTHESES_CLOSE, + CHAR_JP_PLUS, + CHAR_JP_MINUS, + CHAR_JP_MULTIPLY, + CHAR_JP_DIVIDE, + CHAR_JP_EQUALS, + CHAR_JP_PERCENT, + CHAR_JP_AT_SIGN, CHAR_EOS, }; static const charcode_t sCharCodesJpMisc3[] = { - CHAR_WIDE_DOUBLE_CIRCLE, - CHAR_WIDE_CIRCLE, - CHAR_WIDE_SQUARE, - CHAR_WIDE_TRIANGLE, - CHAR_WIDE_DIAMOND_OPEN, - CHAR_WIDE_HEART, - CHAR_WIDE_SPADE, - CHAR_WIDE_DIAMOND, - CHAR_WIDE_CLUB, - CHAR_WIDE_STAR, - CHAR_WIDE_EIGHTH_NOTE, - CHAR_WIDE_SPACE, - CHAR_WIDE_SPACE, + CHAR_JP_DOUBLE_CIRCLE, + CHAR_JP_CIRCLE, + CHAR_JP_SQUARE, + CHAR_JP_TRIANGLE, + CHAR_JP_DIAMOND, + CHAR_JP_HEART_SUIT, + CHAR_JP_SPADE_SUIT, + CHAR_JP_DIAMOND_SUIT, + CHAR_JP_CLUB_SUIT, + CHAR_JP_STAR, + CHAR_JP_MUSIC_NOTE, + CHAR_JP_SPACE, + CHAR_JP_SPACE, CHAR_EOS, }; static const charcode_t sCharCodesJpMisc4[] = { - CHAR_WIDE_SUN, - CHAR_WIDE_CLOUD, - CHAR_WIDE_UMBRELLA, - CHAR_WIDE_SILHOUETTE, - CHAR_WIDE_EMOTE_SMILE, - CHAR_WIDE_EMOTE_LAUGH, - CHAR_WIDE_EMOTE_UPSET, - CHAR_WIDE_EMOTE_FROWN, - CHAR_WIDE_ZZZ, - CHAR_WIDE_ARROW_CURVE_UP, - CHAR_WIDE_ARROW_CURVE_DOWN, - CHAR_WIDE_SPACE, - CHAR_WIDE_SPACE, + CHAR_JP_SUN, + CHAR_JP_CLOUD, + CHAR_JP_UMBRELLA, + CHAR_JP_SNOWMAN, + CHAR_JP_EMOTE_SMILE, + CHAR_JP_EMOTE_LAUGH, + CHAR_JP_EMOTE_UPSET, + CHAR_JP_EMOTE_FROWN, + CHAR_JP_ZZZ, + CHAR_JP_ARROW_CURVE_UP, + CHAR_JP_ARROW_CURVE_DOWN, + CHAR_JP_SPACE, + CHAR_JP_SPACE, CHAR_EOS, }; @@ -769,18 +769,18 @@ static const charcode_t sCharCodesNumpad0[] = { CHAR_2, CHAR_3, CHAR_4, - CHAR_WIDE_SPACE, - CHAR_WIDE_SPACE, - CHAR_WIDE_SPACE, - CHAR_WIDE_SPACE, - CHAR_WIDE_SPACE, - CHAR_WIDE_SPACE, - CHAR_WIDE_SPACE, - CHAR_WIDE_SPACE, - CHAR_WIDE_SPACE, - CHAR_WIDE_SPACE, - CHAR_WIDE_SPACE, - CHAR_WIDE_SPACE, + CHAR_JP_SPACE, + CHAR_JP_SPACE, + CHAR_JP_SPACE, + CHAR_JP_SPACE, + CHAR_JP_SPACE, + CHAR_JP_SPACE, + CHAR_JP_SPACE, + CHAR_JP_SPACE, + CHAR_JP_SPACE, + CHAR_JP_SPACE, + CHAR_JP_SPACE, + CHAR_JP_SPACE, CHAR_EOS, }; @@ -790,39 +790,39 @@ static const charcode_t sCharCodesNumpad1[] = { CHAR_7, CHAR_8, CHAR_9, - CHAR_WIDE_SPACE, - CHAR_WIDE_SPACE, - CHAR_WIDE_SPACE, - CHAR_WIDE_SPACE, - CHAR_WIDE_SPACE, - CHAR_WIDE_SPACE, - CHAR_WIDE_SPACE, - CHAR_WIDE_SPACE, - CHAR_WIDE_SPACE, - CHAR_WIDE_SPACE, - CHAR_WIDE_SPACE, - CHAR_WIDE_SPACE, + CHAR_JP_SPACE, + CHAR_JP_SPACE, + CHAR_JP_SPACE, + CHAR_JP_SPACE, + CHAR_JP_SPACE, + CHAR_JP_SPACE, + CHAR_JP_SPACE, + CHAR_JP_SPACE, + CHAR_JP_SPACE, + CHAR_JP_SPACE, + CHAR_JP_SPACE, + CHAR_JP_SPACE, CHAR_EOS, }; static const charcode_t sCharCodesNumpad345[] = { - CHAR_WIDE_SPACE, - CHAR_WIDE_SPACE, - CHAR_WIDE_SPACE, - CHAR_WIDE_SPACE, - CHAR_WIDE_SPACE, - CHAR_WIDE_SPACE, - CHAR_WIDE_SPACE, - CHAR_WIDE_SPACE, - CHAR_WIDE_SPACE, - CHAR_WIDE_SPACE, - CHAR_WIDE_SPACE, - CHAR_WIDE_SPACE, - CHAR_WIDE_SPACE, - CHAR_WIDE_SPACE, - CHAR_WIDE_SPACE, - CHAR_WIDE_SPACE, - CHAR_WIDE_SPACE, + CHAR_JP_SPACE, + CHAR_JP_SPACE, + CHAR_JP_SPACE, + CHAR_JP_SPACE, + CHAR_JP_SPACE, + CHAR_JP_SPACE, + CHAR_JP_SPACE, + CHAR_JP_SPACE, + CHAR_JP_SPACE, + CHAR_JP_SPACE, + CHAR_JP_SPACE, + CHAR_JP_SPACE, + CHAR_JP_SPACE, + CHAR_JP_SPACE, + CHAR_JP_SPACE, + CHAR_JP_SPACE, + CHAR_JP_SPACE, CHAR_EOS, }; @@ -865,116 +865,116 @@ static const charcode_t *sCharCodes[][5] = { }; static const charcode_t sJPCharConversionTable[][3] = { - { CHAR_HIRAGANA_A, CHAR_WIDE_SPACE, CHAR_HIRAGANA_SMALL_A }, - { CHAR_HIRAGANA_I, CHAR_WIDE_SPACE, CHAR_HIRAGANA_SMALL_I }, - { CHAR_HIRAGANA_U, CHAR_WIDE_SPACE, CHAR_HIRAGANA_SMALL_U }, - { CHAR_HIRAGANA_E, CHAR_WIDE_SPACE, CHAR_HIRAGANA_SMALL_E }, - { CHAR_HIRAGANA_O, CHAR_WIDE_SPACE, CHAR_HIRAGANA_SMALL_O }, - { CHAR_KATAKANA_A, CHAR_WIDE_SPACE, CHAR_KATAKANA_SMALL_A }, - { CHAR_KATAKANA_I, CHAR_WIDE_SPACE, CHAR_KATAKANA_SMALL_I }, - { CHAR_KATAKANA_U, CHAR_WIDE_SPACE, CHAR_KATAKANA_SMALL_U }, - { CHAR_KATAKANA_E, CHAR_WIDE_SPACE, CHAR_KATAKANA_SMALL_E }, - { CHAR_KATAKANA_O, CHAR_WIDE_SPACE, CHAR_KATAKANA_SMALL_O }, - { CHAR_HIRAGANA_YA, CHAR_WIDE_SPACE, CHAR_HIRAGANA_SMALL_YA }, - { CHAR_HIRAGANA_YU, CHAR_WIDE_SPACE, CHAR_HIRAGANA_SMALL_YU }, - { CHAR_HIRAGANA_YO, CHAR_WIDE_SPACE, CHAR_HIRAGANA_SMALL_YO }, - { CHAR_KATAKANA_YA, CHAR_WIDE_SPACE, CHAR_KATAKANA_SMALL_YA }, - { CHAR_KATAKANA_YU, CHAR_WIDE_SPACE, CHAR_KATAKANA_SMALL_YU }, - { CHAR_KATAKANA_YO, CHAR_WIDE_SPACE, CHAR_KATAKANA_SMALL_YO }, - { CHAR_WIDE_A, CHAR_WIDE_SPACE, CHAR_WIDE_a }, - { CHAR_WIDE_B, CHAR_WIDE_SPACE, CHAR_WIDE_b }, - { CHAR_WIDE_C, CHAR_WIDE_SPACE, CHAR_WIDE_c }, - { CHAR_WIDE_D, CHAR_WIDE_SPACE, CHAR_WIDE_d }, - { CHAR_WIDE_E, CHAR_WIDE_SPACE, CHAR_WIDE_e }, - { CHAR_WIDE_F, CHAR_WIDE_SPACE, CHAR_WIDE_f }, - { CHAR_WIDE_G, CHAR_WIDE_SPACE, CHAR_WIDE_g }, - { CHAR_WIDE_H, CHAR_WIDE_SPACE, CHAR_WIDE_h }, - { CHAR_WIDE_I, CHAR_WIDE_SPACE, CHAR_WIDE_i }, - { CHAR_WIDE_J, CHAR_WIDE_SPACE, CHAR_WIDE_j }, - { CHAR_WIDE_K, CHAR_WIDE_SPACE, CHAR_WIDE_k }, - { CHAR_WIDE_L, CHAR_WIDE_SPACE, CHAR_WIDE_l }, - { CHAR_WIDE_M, CHAR_WIDE_SPACE, CHAR_WIDE_m }, - { CHAR_WIDE_N, CHAR_WIDE_SPACE, CHAR_WIDE_n }, - { CHAR_WIDE_O, CHAR_WIDE_SPACE, CHAR_WIDE_o }, - { CHAR_WIDE_P, CHAR_WIDE_SPACE, CHAR_WIDE_p }, - { CHAR_WIDE_Q, CHAR_WIDE_SPACE, CHAR_WIDE_q }, - { CHAR_WIDE_R, CHAR_WIDE_SPACE, CHAR_WIDE_r }, - { CHAR_WIDE_S, CHAR_WIDE_SPACE, CHAR_WIDE_s }, - { CHAR_WIDE_T, CHAR_WIDE_SPACE, CHAR_WIDE_t }, - { CHAR_WIDE_U, CHAR_WIDE_SPACE, CHAR_WIDE_u }, - { CHAR_WIDE_V, CHAR_WIDE_SPACE, CHAR_WIDE_v }, - { CHAR_WIDE_W, CHAR_WIDE_SPACE, CHAR_WIDE_w }, - { CHAR_WIDE_X, CHAR_WIDE_SPACE, CHAR_WIDE_x }, - { CHAR_WIDE_Y, CHAR_WIDE_SPACE, CHAR_WIDE_y }, - { CHAR_WIDE_Z, CHAR_WIDE_SPACE, CHAR_WIDE_z }, - { CHAR_HIRAGANA_TSU, CHAR_HIRAGANA_DZU, CHAR_HIRAGANA_SOKUON }, - { CHAR_KATAKANA_TSU, CHAR_KATAKANA_DZU, CHAR_KATAKANA_SOKUON }, - { CHAR_HIRAGANA_KA, CHAR_HIRAGANA_GA, CHAR_WIDE_SPACE }, - { CHAR_HIRAGANA_KI, CHAR_HIRAGANA_GI, CHAR_WIDE_SPACE }, - { CHAR_HIRAGANA_KU, CHAR_HIRAGANA_GU, CHAR_WIDE_SPACE }, - { CHAR_HIRAGANA_KE, CHAR_HIRAGANA_GE, CHAR_WIDE_SPACE }, - { CHAR_HIRAGANA_KO, CHAR_HIRAGANA_GO, CHAR_WIDE_SPACE }, - { CHAR_HIRAGANA_SA, CHAR_HIRAGANA_ZA, CHAR_WIDE_SPACE }, - { CHAR_HIRAGANA_SHI, CHAR_HIRAGANA_JI, CHAR_WIDE_SPACE }, - { CHAR_HIRAGANA_SU, CHAR_HIRAGANA_ZU, CHAR_WIDE_SPACE }, - { CHAR_HIRAGANA_SE, CHAR_HIRAGANA_ZE, CHAR_WIDE_SPACE }, - { CHAR_HIRAGANA_SO, CHAR_HIRAGANA_ZO, CHAR_WIDE_SPACE }, - { CHAR_HIRAGANA_TA, CHAR_HIRAGANA_DA, CHAR_WIDE_SPACE }, - { CHAR_HIRAGANA_CHI, CHAR_HIRAGANA_DJI, CHAR_WIDE_SPACE }, - { CHAR_HIRAGANA_TE, CHAR_HIRAGANA_DE, CHAR_WIDE_SPACE }, - { CHAR_HIRAGANA_TO, CHAR_HIRAGANA_DO, CHAR_WIDE_SPACE }, - { CHAR_KATAKANA_KA, CHAR_KATAKANA_GA, CHAR_WIDE_SPACE }, - { CHAR_KATAKANA_KI, CHAR_KATAKANA_GI, CHAR_WIDE_SPACE }, - { CHAR_KATAKANA_KU, CHAR_KATAKANA_GU, CHAR_WIDE_SPACE }, - { CHAR_KATAKANA_KE, CHAR_KATAKANA_GE, CHAR_WIDE_SPACE }, - { CHAR_KATAKANA_KO, CHAR_KATAKANA_GO, CHAR_WIDE_SPACE }, - { CHAR_KATAKANA_SA, CHAR_KATAKANA_ZA, CHAR_WIDE_SPACE }, - { CHAR_KATAKANA_SHI, CHAR_KATAKANA_JI, CHAR_WIDE_SPACE }, - { CHAR_KATAKANA_SU, CHAR_KATAKANA_ZU, CHAR_WIDE_SPACE }, - { CHAR_KATAKANA_SE, CHAR_KATAKANA_ZE, CHAR_WIDE_SPACE }, - { CHAR_KATAKANA_SO, CHAR_KATAKANA_ZO, CHAR_WIDE_SPACE }, - { CHAR_KATAKANA_TA, CHAR_KATAKANA_DA, CHAR_WIDE_SPACE }, - { CHAR_KATAKANA_CHI, CHAR_KATAKANA_DJI, CHAR_WIDE_SPACE }, - { CHAR_KATAKANA_TE, CHAR_KATAKANA_DE, CHAR_WIDE_SPACE }, - { CHAR_KATAKANA_TO, CHAR_KATAKANA_DO, CHAR_WIDE_SPACE }, - { CHAR_HIRAGANA_HA, CHAR_HIRAGANA_BA, CHAR_HIRAGANA_PA }, - { CHAR_HIRAGANA_HI, CHAR_HIRAGANA_BI, CHAR_HIRAGANA_PI }, - { CHAR_HIRAGANA_FU, CHAR_HIRAGANA_BU, CHAR_HIRAGANA_PU }, - { CHAR_HIRAGANA_HE, CHAR_HIRAGANA_BE, CHAR_HIRAGANA_PE }, - { CHAR_HIRAGANA_HO, CHAR_HIRAGANA_BO, CHAR_HIRAGANA_PO }, - { CHAR_KATAKANA_HA, CHAR_KATAKANA_BA, CHAR_KATAKANA_PA }, - { CHAR_KATAKANA_HI, CHAR_KATAKANA_BI, CHAR_KATAKANA_PI }, - { CHAR_KATAKANA_FU, CHAR_KATAKANA_BU, CHAR_KATAKANA_PU }, - { CHAR_KATAKANA_HE, CHAR_KATAKANA_BE, CHAR_KATAKANA_PE }, - { CHAR_KATAKANA_HO, CHAR_KATAKANA_BO, CHAR_KATAKANA_PO }, + { CHAR_JP_HIRA_A, CHAR_JP_SPACE, CHAR_JP_HIRA_A_SMALL }, + { CHAR_JP_HIRA_I, CHAR_JP_SPACE, CHAR_JP_HIRA_I_SMALL }, + { CHAR_JP_HIRA_U, CHAR_JP_SPACE, CHAR_JP_HIRA_U_SMALL }, + { CHAR_JP_HIRA_E, CHAR_JP_SPACE, CHAR_JP_HIRA_E_SMALL }, + { CHAR_JP_HIRA_O, CHAR_JP_SPACE, CHAR_JP_HIRA_O_SMALL }, + { CHAR_JP_KATA_A, CHAR_JP_SPACE, CHAR_JP_KATA_A_SMALL }, + { CHAR_JP_KATA_I, CHAR_JP_SPACE, CHAR_JP_KATA_I_SMALL }, + { CHAR_JP_KATA_U, CHAR_JP_SPACE, CHAR_JP_KATA_U_SMALL }, + { CHAR_JP_KATA_E, CHAR_JP_SPACE, CHAR_JP_KATA_E_SMALL }, + { CHAR_JP_KATA_O, CHAR_JP_SPACE, CHAR_JP_KATA_O_SMALL }, + { CHAR_JP_HIRA_YA, CHAR_JP_SPACE, CHAR_JP_HIRA_YA_SMALL }, + { CHAR_JP_HIRA_YU, CHAR_JP_SPACE, CHAR_JP_HIRA_YU_SMALL }, + { CHAR_JP_HIRA_YO, CHAR_JP_SPACE, CHAR_JP_HIRA_YO_SMALL }, + { CHAR_JP_KATA_YA, CHAR_JP_SPACE, CHAR_JP_KATA_YA_SMALL }, + { CHAR_JP_KATA_YU, CHAR_JP_SPACE, CHAR_JP_KATA_YU_SMALL }, + { CHAR_JP_KATA_YO, CHAR_JP_SPACE, CHAR_JP_KATA_YO_SMALL }, + { CHAR_JP_A, CHAR_JP_SPACE, CHAR_JP_a }, + { CHAR_JP_B, CHAR_JP_SPACE, CHAR_JP_b }, + { CHAR_JP_C, CHAR_JP_SPACE, CHAR_JP_c }, + { CHAR_JP_D, CHAR_JP_SPACE, CHAR_JP_d }, + { CHAR_JP_E, CHAR_JP_SPACE, CHAR_JP_e }, + { CHAR_JP_F, CHAR_JP_SPACE, CHAR_JP_f }, + { CHAR_JP_G, CHAR_JP_SPACE, CHAR_JP_g }, + { CHAR_JP_H, CHAR_JP_SPACE, CHAR_JP_h }, + { CHAR_JP_I, CHAR_JP_SPACE, CHAR_JP_i }, + { CHAR_JP_J, CHAR_JP_SPACE, CHAR_JP_j }, + { CHAR_JP_K, CHAR_JP_SPACE, CHAR_JP_k }, + { CHAR_JP_L, CHAR_JP_SPACE, CHAR_JP_l }, + { CHAR_JP_M, CHAR_JP_SPACE, CHAR_JP_m }, + { CHAR_JP_N, CHAR_JP_SPACE, CHAR_JP_n }, + { CHAR_JP_O, CHAR_JP_SPACE, CHAR_JP_o }, + { CHAR_JP_P, CHAR_JP_SPACE, CHAR_JP_p }, + { CHAR_JP_Q, CHAR_JP_SPACE, CHAR_JP_q }, + { CHAR_JP_R, CHAR_JP_SPACE, CHAR_JP_r }, + { CHAR_JP_S, CHAR_JP_SPACE, CHAR_JP_s }, + { CHAR_JP_T, CHAR_JP_SPACE, CHAR_JP_t }, + { CHAR_JP_U, CHAR_JP_SPACE, CHAR_JP_u }, + { CHAR_JP_V, CHAR_JP_SPACE, CHAR_JP_v }, + { CHAR_JP_W, CHAR_JP_SPACE, CHAR_JP_w }, + { CHAR_JP_X, CHAR_JP_SPACE, CHAR_JP_x }, + { CHAR_JP_Y, CHAR_JP_SPACE, CHAR_JP_y }, + { CHAR_JP_Z, CHAR_JP_SPACE, CHAR_JP_z }, + { CHAR_JP_HIRA_TSU, CHAR_JP_HIRA_DZU, CHAR_JP_HIRA_SOKUON }, + { CHAR_JP_KATA_TSU, CHAR_JP_KATA_DZU, CHAR_JP_KATA_SOKUON }, + { CHAR_JP_HIRA_KA, CHAR_JP_HIRA_GA, CHAR_JP_SPACE }, + { CHAR_JP_HIRA_KI, CHAR_JP_HIRA_GI, CHAR_JP_SPACE }, + { CHAR_JP_HIRA_KU, CHAR_JP_HIRA_GU, CHAR_JP_SPACE }, + { CHAR_JP_HIRA_KE, CHAR_JP_HIRA_GE, CHAR_JP_SPACE }, + { CHAR_JP_HIRA_KO, CHAR_JP_HIRA_GO, CHAR_JP_SPACE }, + { CHAR_JP_HIRA_SA, CHAR_JP_HIRA_ZA, CHAR_JP_SPACE }, + { CHAR_JP_HIRA_SHI, CHAR_JP_HIRA_JI, CHAR_JP_SPACE }, + { CHAR_JP_HIRA_SU, CHAR_JP_HIRA_ZU, CHAR_JP_SPACE }, + { CHAR_JP_HIRA_SE, CHAR_JP_HIRA_ZE, CHAR_JP_SPACE }, + { CHAR_JP_HIRA_SO, CHAR_JP_HIRA_ZO, CHAR_JP_SPACE }, + { CHAR_JP_HIRA_TA, CHAR_JP_HIRA_DA, CHAR_JP_SPACE }, + { CHAR_JP_HIRA_CHI, CHAR_JP_HIRA_DJI, CHAR_JP_SPACE }, + { CHAR_JP_HIRA_TE, CHAR_JP_HIRA_DE, CHAR_JP_SPACE }, + { CHAR_JP_HIRA_TO, CHAR_JP_HIRA_DO, CHAR_JP_SPACE }, + { CHAR_JP_KATA_KA, CHAR_JP_KATA_GA, CHAR_JP_SPACE }, + { CHAR_JP_KATA_KI, CHAR_JP_KATA_GI, CHAR_JP_SPACE }, + { CHAR_JP_KATA_KU, CHAR_JP_KATA_GU, CHAR_JP_SPACE }, + { CHAR_JP_KATA_KE, CHAR_JP_KATA_GE, CHAR_JP_SPACE }, + { CHAR_JP_KATA_KO, CHAR_JP_KATA_GO, CHAR_JP_SPACE }, + { CHAR_JP_KATA_SA, CHAR_JP_KATA_ZA, CHAR_JP_SPACE }, + { CHAR_JP_KATA_SHI, CHAR_JP_KATA_JI, CHAR_JP_SPACE }, + { CHAR_JP_KATA_SU, CHAR_JP_KATA_ZU, CHAR_JP_SPACE }, + { CHAR_JP_KATA_SE, CHAR_JP_KATA_ZE, CHAR_JP_SPACE }, + { CHAR_JP_KATA_SO, CHAR_JP_KATA_ZO, CHAR_JP_SPACE }, + { CHAR_JP_KATA_TA, CHAR_JP_KATA_DA, CHAR_JP_SPACE }, + { CHAR_JP_KATA_CHI, CHAR_JP_KATA_DJI, CHAR_JP_SPACE }, + { CHAR_JP_KATA_TE, CHAR_JP_KATA_DE, CHAR_JP_SPACE }, + { CHAR_JP_KATA_TO, CHAR_JP_KATA_DO, CHAR_JP_SPACE }, + { CHAR_JP_HIRA_HA, CHAR_JP_HIRA_BA, CHAR_JP_HIRA_PA }, + { CHAR_JP_HIRA_HI, CHAR_JP_HIRA_BI, CHAR_JP_HIRA_PI }, + { CHAR_JP_HIRA_FU, CHAR_JP_HIRA_BU, CHAR_JP_HIRA_PU }, + { CHAR_JP_HIRA_HE, CHAR_JP_HIRA_BE, CHAR_JP_HIRA_PE }, + { CHAR_JP_HIRA_HO, CHAR_JP_HIRA_BO, CHAR_JP_HIRA_PO }, + { CHAR_JP_KATA_HA, CHAR_JP_KATA_BA, CHAR_JP_KATA_PA }, + { CHAR_JP_KATA_HI, CHAR_JP_KATA_BI, CHAR_JP_KATA_PI }, + { CHAR_JP_KATA_FU, CHAR_JP_KATA_BU, CHAR_JP_KATA_PU }, + { CHAR_JP_KATA_HE, CHAR_JP_KATA_BE, CHAR_JP_KATA_PE }, + { CHAR_JP_KATA_HO, CHAR_JP_KATA_BO, CHAR_JP_KATA_PO }, }; static const charcode_t sDakutenTable[][2] = { - { CHAR_HIRAGANA_SOKUON, CHAR_HIRAGANA_DZU }, - { CHAR_KATAKANA_SOKUON, CHAR_KATAKANA_DZU }, - { CHAR_HIRAGANA_PA, CHAR_HIRAGANA_BA }, - { CHAR_HIRAGANA_PI, CHAR_HIRAGANA_BI }, - { CHAR_HIRAGANA_PU, CHAR_HIRAGANA_BU }, - { CHAR_HIRAGANA_PE, CHAR_HIRAGANA_BE }, - { CHAR_HIRAGANA_PO, CHAR_HIRAGANA_BO }, - { CHAR_KATAKANA_PA, CHAR_KATAKANA_BA }, - { CHAR_KATAKANA_PI, CHAR_KATAKANA_BI }, - { CHAR_KATAKANA_PU, CHAR_KATAKANA_BU }, - { CHAR_KATAKANA_PE, CHAR_KATAKANA_BE }, - { CHAR_KATAKANA_PO, CHAR_KATAKANA_BO }, + { CHAR_JP_HIRA_SOKUON, CHAR_JP_HIRA_DZU }, + { CHAR_JP_KATA_SOKUON, CHAR_JP_KATA_DZU }, + { CHAR_JP_HIRA_PA, CHAR_JP_HIRA_BA }, + { CHAR_JP_HIRA_PI, CHAR_JP_HIRA_BI }, + { CHAR_JP_HIRA_PU, CHAR_JP_HIRA_BU }, + { CHAR_JP_HIRA_PE, CHAR_JP_HIRA_BE }, + { CHAR_JP_HIRA_PO, CHAR_JP_HIRA_BO }, + { CHAR_JP_KATA_PA, CHAR_JP_KATA_BA }, + { CHAR_JP_KATA_PI, CHAR_JP_KATA_BI }, + { CHAR_JP_KATA_PU, CHAR_JP_KATA_BU }, + { CHAR_JP_KATA_PE, CHAR_JP_KATA_BE }, + { CHAR_JP_KATA_PO, CHAR_JP_KATA_BO }, }; static const charcode_t sHandakutenTable[][2] = { - { CHAR_HIRAGANA_BA, CHAR_HIRAGANA_PA }, - { CHAR_HIRAGANA_BI, CHAR_HIRAGANA_PI }, - { CHAR_HIRAGANA_BU, CHAR_HIRAGANA_PU }, - { CHAR_HIRAGANA_BE, CHAR_HIRAGANA_PE }, - { CHAR_HIRAGANA_BO, CHAR_HIRAGANA_PO }, - { CHAR_KATAKANA_BA, CHAR_KATAKANA_PA }, - { CHAR_KATAKANA_BI, CHAR_KATAKANA_PI }, - { CHAR_KATAKANA_BU, CHAR_KATAKANA_PU }, - { CHAR_KATAKANA_BE, CHAR_KATAKANA_PE }, - { CHAR_KATAKANA_BO, CHAR_KATAKANA_PO }, + { CHAR_JP_HIRA_BA, CHAR_JP_HIRA_PA }, + { CHAR_JP_HIRA_BI, CHAR_JP_HIRA_PI }, + { CHAR_JP_HIRA_BU, CHAR_JP_HIRA_PU }, + { CHAR_JP_HIRA_BE, CHAR_JP_HIRA_PE }, + { CHAR_JP_HIRA_BO, CHAR_JP_HIRA_PO }, + { CHAR_JP_KATA_BA, CHAR_JP_KATA_PA }, + { CHAR_JP_KATA_BI, CHAR_JP_KATA_PI }, + { CHAR_JP_KATA_BU, CHAR_JP_KATA_PU }, + { CHAR_JP_KATA_BE, CHAR_JP_KATA_PE }, + { CHAR_JP_KATA_BO, CHAR_JP_KATA_PO }, }; static const int sUnkGXObjOffsets0[] = { @@ -992,49 +992,49 @@ static const u8 sCharsBgColor[4] = { // these need to be globals for some reason. const charcode_t gNamingScreenDummy0[] = { - CHAR_HIRAGANA_A, - CHAR_HIRAGANA_NA, - CHAR_HIRAGANA_TA, - CHAR_HIRAGANA_NO, - CHAR_WIDE_SPACE, - CHAR_HIRAGANA_NA, - CHAR_HIRAGANA_MA, - CHAR_HIRAGANA_E, - CHAR_HIRAGANA_HA, - CHAR_WIDE_QUESTION, + CHAR_JP_HIRA_A, + CHAR_JP_HIRA_NA, + CHAR_JP_HIRA_TA, + CHAR_JP_HIRA_NO, + CHAR_JP_SPACE, + CHAR_JP_HIRA_NA, + CHAR_JP_HIRA_MA, + CHAR_JP_HIRA_E, + CHAR_JP_HIRA_HA, + CHAR_JP_QMARK, CHAR_EOS, }; const charcode_t gNamingScreenDummy1[] = { - CHAR_KATAKANA_PO, - CHAR_KATAKANA_KE, - CHAR_KATAKANA_MO, - CHAR_KATAKANA_N, - CHAR_HIRAGANA_NO, - CHAR_WIDE_SPACE, - CHAR_KATAKANA_NI, - CHAR_KATAKANA_SOKUON, - CHAR_KATAKANA_KU, - CHAR_KATAKANA_NE, - CHAR_WIDE_MINUS, - CHAR_KATAKANA_MU, - CHAR_HIRAGANA_HA, - CHAR_WIDE_QUESTION, + CHAR_JP_KATA_PO, + CHAR_JP_KATA_KE, + CHAR_JP_KATA_MO, + CHAR_JP_KATA_N, + CHAR_JP_HIRA_NO, + CHAR_JP_SPACE, + CHAR_JP_KATA_NI, + CHAR_JP_KATA_SOKUON, + CHAR_JP_KATA_KU, + CHAR_JP_KATA_NE, + CHAR_JP_MINUS, + CHAR_JP_KATA_MU, + CHAR_JP_HIRA_HA, + CHAR_JP_QMARK, CHAR_EOS, }; const charcode_t gNamingScreenDummy2[] = { - CHAR_KATAKANA_BO, - CHAR_KATAKANA_SOKUON, - CHAR_KATAKANA_KU, - CHAR_KATAKANA_SU, - CHAR_HIRAGANA_NO, - CHAR_WIDE_SPACE, - CHAR_HIRAGANA_NA, - CHAR_HIRAGANA_MA, - CHAR_HIRAGANA_E, - CHAR_HIRAGANA_HA, - CHAR_WIDE_QUESTION, + CHAR_JP_KATA_BO, + CHAR_JP_KATA_SOKUON, + CHAR_JP_KATA_KU, + CHAR_JP_KATA_SU, + CHAR_JP_HIRA_NO, + CHAR_JP_SPACE, + CHAR_JP_HIRA_NA, + CHAR_JP_HIRA_MA, + CHAR_JP_HIRA_E, + CHAR_JP_HIRA_HA, + CHAR_JP_QMARK, CHAR_EOS, }; @@ -2792,17 +2792,17 @@ static void NamingScreen_PrintLastCharOfEntryBuf( case NMS_BUTTON_PAGE_JP_UNUSED_2: case NMS_BUTTON_BACK: case NMS_BUTTON_OK: - charCode = CHAR_WIDE_SPACE; + charCode = CHAR_JP_SPACE; break; } for (i = 0; i < 3; i++) { - charCodeBuf[i] = CHAR_WIDE_SPACE; + charCodeBuf[i] = CHAR_JP_SPACE; } charCodeBuf[0] = charCode; - if (charCode != CHAR_WIDE_SPACE) { + if (charCode != CHAR_JP_SPACE) { for (i = 0; i < NELEMS(sJPCharConversionTable); i++) { if (sJPCharConversionTable[i][0] == charCode) { for (j = 0; j < 3; j++) { @@ -2841,7 +2841,7 @@ static void NamingScreen_LoadKeyboardLayout(charcode_t out[][13], const int inde static int NamingScreen_ProcessCharacterInput(NamingScreen *namingScreen, charcode_t charCode, BOOL isButtonInput) { if (charCode == NMS_CONTROL_SPACE || charCode == NMS_CONTROL_SKIP) { - charCode = CHAR_WIDE_SPACE; + charCode = CHAR_JP_SPACE; } if (namingScreen->type == NAMING_SCREEN_TYPE_UNK4) { @@ -2849,7 +2849,7 @@ static int NamingScreen_ProcessCharacterInput(NamingScreen *namingScreen, charco || charCode == NMS_BUTTON_PAGE_LOWER || charCode == NMS_BUTTON_PAGE_OTHERS || charCode == NMS_BUTTON_PAGE_JP_UNUSED) { - charCode = CHAR_WIDE_SPACE; + charCode = CHAR_JP_SPACE; } } @@ -2994,7 +2994,7 @@ static int NamingScreen_ProcessCharacterInput(NamingScreen *namingScreen, charco } break; default: - if (namingScreen->currentCharsIdx == 4 && charCode == CHAR_WIDE_SPACE) { + if (namingScreen->currentCharsIdx == 4 && charCode == CHAR_JP_SPACE) { return NMS_APP_STATE_RUNNING; } @@ -3044,7 +3044,7 @@ static charcode_t NamingScreen_SearchJPConvTableForNonSpace(const charcode_t *ta { do { pos = NamingScreen_WrapAroundWithinInterval(++pos, 0, 3); - } while (table[pos] == CHAR_WIDE_SPACE); + } while (table[pos] == CHAR_JP_SPACE); return table[pos]; } @@ -3062,7 +3062,7 @@ static BOOL NamingScreen_JPFlipAlphaCase(int tableStart, int tableEnd, charcode_ for (i = tableStart; i < tableEnd; i++) { for (j = 0; j < 3; j++) { - if (sJPCharConversionTable[i][j] == charCode && charCode != CHAR_WIDE_SPACE) { + if (sJPCharConversionTable[i][j] == charCode && charCode != CHAR_JP_SPACE) { charBuf[cursorPos - 1] = NamingScreen_SearchJPConvTableForNonSpace(sJPCharConversionTable[i], j); return TRUE; } @@ -3083,7 +3083,7 @@ static BOOL NamingScreen_JPFlipDiacritic( int i; charcode_t charCode; - if (cursorPos == 0 || charBuf[cursorPos - 1] == CHAR_WIDE_SPACE) { + if (cursorPos == 0 || charBuf[cursorPos - 1] == CHAR_JP_SPACE) { return FALSE; } @@ -3121,13 +3121,13 @@ static BOOL NamingScreen_JPFlipDiacritic( } break; case NMS_BUTTON_PAGE_JP_UNUSED_2: - if (charCode == CHAR_HIRAGANA_DZU) { - charBuf[cursorPos - 1] = CHAR_HIRAGANA_SOKUON; + if (charCode == CHAR_JP_HIRA_DZU) { + charBuf[cursorPos - 1] = CHAR_JP_HIRA_SOKUON; return TRUE; } - if (charCode == CHAR_KATAKANA_DZU) { - charBuf[cursorPos - 1] = CHAR_KATAKANA_SOKUON; + if (charCode == CHAR_JP_KATA_DZU) { + charBuf[cursorPos - 1] = CHAR_JP_KATA_SOKUON; return TRUE; } break; diff --git a/src/charcode.c b/src/charcode.c index a0998f1b61..e77b5633df 100644 --- a/src/charcode.c +++ b/src/charcode.c @@ -6,9 +6,9 @@ charcode_t *CharCode_SkipFormatArg(const charcode_t *cstr) { - GF_ASSERT(*cstr == CHAR_FORMAT_ARG); + GF_ASSERT(*cstr == CHAR_CONTROL_CODE_ARG); - if (*cstr == CHAR_FORMAT_ARG) { + if (*cstr == CHAR_CONTROL_CODE_ARG) { cstr += 2; u32 skip = *cstr++; cstr += skip; @@ -19,7 +19,7 @@ charcode_t *CharCode_SkipFormatArg(const charcode_t *cstr) u32 CharCode_FormatArgType(const charcode_t *cstr) { - GF_ASSERT(*cstr == CHAR_FORMAT_ARG); + GF_ASSERT(*cstr == CHAR_CONTROL_CODE_ARG); return *(cstr + 1); } @@ -38,7 +38,7 @@ BOOL CharCode_IsFormatArg(const charcode_t *cstr) u32 CharCode_FormatArgParam(const charcode_t *cstr, u32 paramIdx) { - GF_ASSERT(*cstr == CHAR_FORMAT_ARG); + GF_ASSERT(*cstr == CHAR_CONTROL_CODE_ARG); cstr += 2; u32 skip = *cstr++; diff --git a/src/charcode_util.c b/src/charcode_util.c index a461afe39d..9445e8bc04 100644 --- a/src/charcode_util.c +++ b/src/charcode_util.c @@ -8,22 +8,22 @@ #include "charcode.h" static const charcode_t sHexadecimalDigits[] = { - CHAR_WIDE_0, - CHAR_WIDE_1, - CHAR_WIDE_2, - CHAR_WIDE_3, - CHAR_WIDE_4, - CHAR_WIDE_5, - CHAR_WIDE_6, - CHAR_WIDE_7, - CHAR_WIDE_8, - CHAR_WIDE_9, - CHAR_WIDE_A, - CHAR_WIDE_B, - CHAR_WIDE_C, - CHAR_WIDE_D, - CHAR_WIDE_E, - CHAR_WIDE_F, + CHAR_JP_0, + CHAR_JP_1, + CHAR_JP_2, + CHAR_JP_3, + CHAR_JP_4, + CHAR_JP_5, + CHAR_JP_6, + CHAR_JP_7, + CHAR_JP_8, + CHAR_JP_9, + CHAR_JP_A, + CHAR_JP_B, + CHAR_JP_C, + CHAR_JP_D, + CHAR_JP_E, + CHAR_JP_F, }; static const int sPowersOfTen[] = { @@ -129,14 +129,14 @@ charcode_t *CharCode_FromInt(charcode_t *str, s32 i, enum PaddingMode paddingMod diff = i - (j * digit); if (paddingMode == PADDING_MODE_ZEROES) { - *str = digit >= 10 ? CHAR_WIDE_QUESTION : sHexadecimalDigits[digit]; + *str = digit >= 10 ? CHAR_JP_QMARK : sHexadecimalDigits[digit]; str++; } else if (digit != 0 || j == 1) { paddingMode = PADDING_MODE_ZEROES; - *str = digit >= 10 ? CHAR_WIDE_QUESTION : sHexadecimalDigits[digit]; + *str = digit >= 10 ? CHAR_JP_QMARK : sHexadecimalDigits[digit]; str++; } else if (paddingMode == PADDING_MODE_SPACES) { - *str = CHAR_WIDE_SPACE; + *str = CHAR_JP_SPACE; str++; } diff --git a/src/font_manager.c b/src/font_manager.c index a282b9c386..b0c6a2c622 100644 --- a/src/font_manager.c +++ b/src/font_manager.c @@ -156,7 +156,7 @@ void FontManager_TryLoadGlyph(const FontManager *fontManager, charcode_t c, Text if (c <= fontManager->header.numGlyphs) { c--; } else { - c = CHAR_QUESTION - 1; + c = CHAR_QMARK - 1; } fontManager->glyphBitmapFunc(fontManager, c, outGlyph); @@ -229,7 +229,7 @@ u32 FontManager_CalcStringWidth(const FontManager *fontManager, const charcode_t u32 len = 0; while (*str != CHAR_EOS) { - if (*str == CHAR_FORMAT_ARG) { + if (*str == CHAR_CONTROL_CODE_ARG) { str = CharCode_SkipFormatArg(str); if (*str == CHAR_EOS) { break; @@ -246,7 +246,7 @@ u32 FontManager_CalcStringWidth(const FontManager *fontManager, const charcode_t BOOL FontManager_AreAllCharsValid(const FontManager *fontManager, const charcode_t *str) { while (*str != CHAR_EOS) { - if (*str == CHAR_FORMAT_ARG) { + if (*str == CHAR_CONTROL_CODE_ARG) { str = CharCode_SkipFormatArg(str); if (*str == CHAR_EOS) { return TRUE; @@ -268,7 +268,7 @@ static u8 GlyphWidthFunc_VariableWidth(const FontManager *fontManager, u32 glyph if (glyphIdx < fontManager->header.numGlyphs) { return fontManager->glyphWidths[glyphIdx]; } else { - return fontManager->glyphWidths[CHAR_QUESTION - 1]; + return fontManager->glyphWidths[CHAR_QMARK - 1]; } } @@ -282,9 +282,9 @@ u32 FontManager_CalcMaxLineWidth(const FontManager *fontManager, const charcode_ u32 maxLen = 0, lineLen = 0; while (*str != CHAR_EOS) { - if (*str == CHAR_FORMAT_ARG) { + if (*str == CHAR_CONTROL_CODE_ARG) { str = CharCode_SkipFormatArg(str); - } else if (*str == CHAR_CR) { + } else if (*str == CHAR_LINE_BREAK) { if (maxLen < lineLen - letterSpacing) { maxLen = lineLen - letterSpacing; } @@ -309,7 +309,7 @@ u32 FontManager_CalcStringWidthWithCursorControl(const FontManager *fontManager, u32 len = 0; while (*str != CHAR_EOS) { - if (*str == CHAR_FORMAT_ARG) { + if (*str == CHAR_CONTROL_CODE_ARG) { if (CharCode_FormatArgType(str) == CHAR_CONTROL_CURSOR_X) { len = CharCode_FormatArgParam(str, 0) - 12; } diff --git a/src/font_special_chars.c b/src/font_special_chars.c index 72823d6969..944a8b8aa1 100644 --- a/src/font_special_chars.c +++ b/src/font_special_chars.c @@ -116,10 +116,10 @@ void FontSpecialChars_DrawPartyScreenHPText(FontSpecialCharsContext *context, s3 CharCode_FromInt(context->charcodes, displayValue, paddingMode, digits); for (idx = 0; context->charcodes[idx] != CHAR_EOS; idx++) { - if ((context->charcodes[idx] >= CHAR_WIDE_0) && (context->charcodes[idx] <= CHAR_WIDE_9)) { + if ((context->charcodes[idx] >= CHAR_JP_0) && (context->charcodes[idx] <= CHAR_JP_9)) { Window_BlitBitmapRect( window, - (u8 *)(context->charData->pRawData) + ((context->charcodes[idx] - CHAR_WIDE_0) * TILE_SIZE_4BPP), + (u8 *)(context->charData->pRawData) + ((context->charcodes[idx] - CHAR_JP_0) * TILE_SIZE_4BPP), 0, 0, TILE_WIDTH_PIXELS, @@ -153,8 +153,8 @@ void FontSpecialChars_DrawBattleScreenText(FontSpecialCharsContext *context, s32 CharCode_FromInt(context->charcodes, displayNum, paddingMode, numDigits); for (idx = 0; context->charcodes[idx] != CHAR_EOS; idx++) { - if ((context->charcodes[idx] >= CHAR_WIDE_0) && (context->charcodes[idx] <= CHAR_WIDE_9)) { - MI_CpuCopy32((u8 *)(context->charData->pRawData) + ((context->charcodes[idx] - CHAR_WIDE_0) * TILE_SIZE_4BPP), &displayPtrBytes[idx * TILE_SIZE_4BPP], TILE_SIZE_4BPP); + if ((context->charcodes[idx] >= CHAR_JP_0) && (context->charcodes[idx] <= CHAR_JP_9)) { + MI_CpuCopy32((u8 *)(context->charData->pRawData) + ((context->charcodes[idx] - CHAR_JP_0) * TILE_SIZE_4BPP), &displayPtrBytes[idx * TILE_SIZE_4BPP], TILE_SIZE_4BPP); } else { MI_CpuFill8(&displayPtrBytes[idx * TILE_SIZE_4BPP], bgColor, TILE_SIZE_4BPP); } diff --git a/src/journal.c b/src/journal.c index 2cc39a0992..23ec7a9fd2 100644 --- a/src/journal.c +++ b/src/journal.c @@ -3,6 +3,7 @@ #include #include +#include "constants/charcode.h" #include "generated/badges.h" #include "generated/journal_location_events.h" #include "generated/journal_online_events.h" @@ -25,8 +26,6 @@ #define LOCATION_EVENT_LOCATION_ID(locationEvent) ((locationEvent >> 16) & 0xffff) #define LOCATION_EVENT_ITEM(locationEvent) ((locationEvent >> 16) & 0xffff) -#define CHAR_NONE 0xffff - #define GYM_NONE 0xff #define TRAINER_TYPE_ELITE_FOUR 8 @@ -875,11 +874,11 @@ static void JournalEntry_StringCopy(const u16 *src, u16 *dst, u32 strLength) u32 i; for (i = 0; i < strLength; i++) { - dst[i] = CHAR_NONE; + dst[i] = CHAR_EOS; } for (i = 0; i < strLength; i++) { - if (src[i] == CHAR_NONE) { + if (src[i] == CHAR_EOS) { break; } diff --git a/src/main_menu/gba_convert_string.c b/src/main_menu/gba_convert_string.c index 859ab8c6e3..c4aad4e555 100644 --- a/src/main_menu/gba_convert_string.c +++ b/src/main_menu/gba_convert_string.c @@ -11,258 +11,258 @@ // Japanese, International static const charcode_t sGBACharToDSChars[][2] = { - { CHAR_WIDE_SPACE, CHAR_WIDE_SPACE }, - { CHAR_HIRAGANA_A, CHAR_HIRAGANA_A }, - { CHAR_HIRAGANA_I, CHAR_HIRAGANA_I }, - { CHAR_HIRAGANA_U, CHAR_HIRAGANA_U }, - { CHAR_HIRAGANA_E, CHAR_HIRAGANA_E }, - { CHAR_HIRAGANA_O, CHAR_HIRAGANA_O }, - { CHAR_HIRAGANA_KA, CHAR_HIRAGANA_KA }, - { CHAR_HIRAGANA_KI, CHAR_HIRAGANA_KI }, - { CHAR_HIRAGANA_KU, CHAR_HIRAGANA_KU }, - { CHAR_HIRAGANA_KE, CHAR_HIRAGANA_KE }, - { CHAR_HIRAGANA_KO, CHAR_HIRAGANA_KO }, - { CHAR_HIRAGANA_SA, CHAR_HIRAGANA_SA }, - { CHAR_HIRAGANA_SHI, CHAR_HIRAGANA_SHI }, - { CHAR_HIRAGANA_SU, CHAR_HIRAGANA_SU }, - { CHAR_HIRAGANA_SE, CHAR_HIRAGANA_SE }, - { CHAR_HIRAGANA_SO, CHAR_HIRAGANA_SO }, - { CHAR_HIRAGANA_TA, CHAR_HIRAGANA_TA }, - { CHAR_HIRAGANA_CHI, CHAR_HIRAGANA_CHI }, - { CHAR_HIRAGANA_TSU, CHAR_HIRAGANA_TSU }, - { CHAR_HIRAGANA_TE, CHAR_HIRAGANA_TE }, - { CHAR_HIRAGANA_TO, CHAR_HIRAGANA_TO }, - { CHAR_HIRAGANA_NA, CHAR_HIRAGANA_NA }, - { CHAR_HIRAGANA_NI, CHAR_HIRAGANA_NI }, - { CHAR_HIRAGANA_NU, CHAR_HIRAGANA_NU }, - { CHAR_HIRAGANA_NE, CHAR_HIRAGANA_NE }, - { CHAR_HIRAGANA_NO, CHAR_HIRAGANA_NO }, - { CHAR_HIRAGANA_HA, CHAR_HIRAGANA_HA }, - { CHAR_HIRAGANA_HI, CHAR_HIRAGANA_HI }, - { CHAR_HIRAGANA_FU, CHAR_HIRAGANA_FU }, - { CHAR_HIRAGANA_HE, CHAR_HIRAGANA_HE }, - { CHAR_HIRAGANA_HO, CHAR_HIRAGANA_HO }, - { CHAR_HIRAGANA_MA, CHAR_HIRAGANA_MA }, - { CHAR_HIRAGANA_MI, CHAR_HIRAGANA_MI }, - { CHAR_HIRAGANA_MU, CHAR_HIRAGANA_MU }, - { CHAR_HIRAGANA_ME, CHAR_HIRAGANA_ME }, - { CHAR_HIRAGANA_MO, CHAR_HIRAGANA_MO }, - { CHAR_HIRAGANA_YA, CHAR_HIRAGANA_YA }, - { CHAR_HIRAGANA_YU, CHAR_HIRAGANA_YU }, - { CHAR_HIRAGANA_YO, CHAR_HIRAGANA_YO }, - { CHAR_HIRAGANA_RA, CHAR_HIRAGANA_RA }, - { CHAR_HIRAGANA_RI, CHAR_HIRAGANA_RI }, - { CHAR_HIRAGANA_RU, CHAR_HIRAGANA_RU }, - { CHAR_HIRAGANA_RE, CHAR_HIRAGANA_RE }, - { CHAR_HIRAGANA_RO, CHAR_HIRAGANA_RO }, - { CHAR_HIRAGANA_WA, CHAR_HIRAGANA_WA }, - { CHAR_HIRAGANA_WO, CHAR_HIRAGANA_WO }, - { CHAR_HIRAGANA_N, CHAR_HIRAGANA_N }, - { CHAR_HIRAGANA_SMALL_A, CHAR_HIRAGANA_SMALL_A }, - { CHAR_HIRAGANA_SMALL_I, CHAR_HIRAGANA_SMALL_I }, - { CHAR_HIRAGANA_SMALL_U, CHAR_HIRAGANA_SMALL_U }, - { CHAR_HIRAGANA_SMALL_E, CHAR_HIRAGANA_SMALL_E }, - { CHAR_HIRAGANA_SMALL_O, CHAR_HIRAGANA_SMALL_O }, - { CHAR_HIRAGANA_SMALL_YA, CHAR_HIRAGANA_SMALL_YA }, - { CHAR_HIRAGANA_SMALL_YU, CHAR_HIRAGANA_SMALL_YU }, - { CHAR_HIRAGANA_SMALL_YO, CHAR_HIRAGANA_SMALL_YO }, - { CHAR_HIRAGANA_GA, CHAR_HIRAGANA_GA }, - { CHAR_HIRAGANA_GI, CHAR_HIRAGANA_GI }, - { CHAR_HIRAGANA_GU, CHAR_HIRAGANA_GU }, - { CHAR_HIRAGANA_GE, CHAR_HIRAGANA_GE }, - { CHAR_HIRAGANA_GO, CHAR_HIRAGANA_GO }, - { CHAR_HIRAGANA_ZA, CHAR_HIRAGANA_ZA }, - { CHAR_HIRAGANA_JI, CHAR_HIRAGANA_JI }, - { CHAR_HIRAGANA_ZU, CHAR_HIRAGANA_ZU }, - { CHAR_HIRAGANA_ZE, CHAR_HIRAGANA_ZE }, - { CHAR_HIRAGANA_ZO, CHAR_HIRAGANA_ZO }, - { CHAR_HIRAGANA_DA, CHAR_HIRAGANA_DA }, - { CHAR_HIRAGANA_DJI, CHAR_HIRAGANA_DJI }, - { CHAR_HIRAGANA_DZU, CHAR_HIRAGANA_DZU }, - { CHAR_HIRAGANA_DE, CHAR_HIRAGANA_DE }, - { CHAR_HIRAGANA_DO, CHAR_HIRAGANA_DO }, - { CHAR_HIRAGANA_BA, CHAR_HIRAGANA_BA }, - { CHAR_HIRAGANA_BI, CHAR_HIRAGANA_BI }, - { CHAR_HIRAGANA_BU, CHAR_HIRAGANA_BU }, - { CHAR_HIRAGANA_BE, CHAR_HIRAGANA_BE }, - { CHAR_HIRAGANA_BO, CHAR_HIRAGANA_BO }, - { CHAR_HIRAGANA_PA, CHAR_HIRAGANA_PA }, - { CHAR_HIRAGANA_PI, CHAR_HIRAGANA_PI }, - { CHAR_HIRAGANA_PU, CHAR_HIRAGANA_PU }, - { CHAR_HIRAGANA_PE, CHAR_HIRAGANA_PE }, - { CHAR_HIRAGANA_PO, CHAR_HIRAGANA_PO }, - { CHAR_HIRAGANA_SOKUON, CHAR_HIRAGANA_SOKUON }, - { CHAR_KATAKANA_A, CHAR_KATAKANA_A }, - { CHAR_KATAKANA_I, CHAR_KATAKANA_I }, - { CHAR_KATAKANA_U, CHAR_KATAKANA_U }, - { CHAR_KATAKANA_E, CHAR_KATAKANA_E }, - { CHAR_KATAKANA_O, CHAR_KATAKANA_O }, - { CHAR_KATAKANA_KA, CHAR_KATAKANA_KA }, - { CHAR_KATAKANA_KI, CHAR_KATAKANA_KI }, - { CHAR_KATAKANA_KU, CHAR_KATAKANA_KU }, - { CHAR_KATAKANA_KE, CHAR_KATAKANA_KE }, - { CHAR_KATAKANA_KO, CHAR_KATAKANA_KO }, - { CHAR_KATAKANA_SA, CHAR_KATAKANA_SA }, - { CHAR_KATAKANA_SHI, CHAR_KATAKANA_SHI }, - { CHAR_KATAKANA_SU, CHAR_KATAKANA_SU }, - { CHAR_KATAKANA_SE, CHAR_KATAKANA_SE }, - { CHAR_KATAKANA_SO, CHAR_KATAKANA_SO }, - { CHAR_KATAKANA_TA, CHAR_KATAKANA_TA }, - { CHAR_KATAKANA_CHI, CHAR_KATAKANA_CHI }, - { CHAR_KATAKANA_TSU, CHAR_KATAKANA_TSU }, - { CHAR_KATAKANA_TE, CHAR_KATAKANA_TE }, - { CHAR_KATAKANA_TO, CHAR_KATAKANA_TO }, - { CHAR_KATAKANA_NA, CHAR_KATAKANA_NA }, - { CHAR_KATAKANA_NI, CHAR_KATAKANA_NI }, - { CHAR_KATAKANA_NU, CHAR_KATAKANA_NU }, - { CHAR_KATAKANA_NE, CHAR_KATAKANA_NE }, - { CHAR_KATAKANA_NO, CHAR_KATAKANA_NO }, - { CHAR_KATAKANA_HA, CHAR_KATAKANA_HA }, - { CHAR_KATAKANA_HI, CHAR_KATAKANA_HI }, - { CHAR_KATAKANA_FU, CHAR_KATAKANA_FU }, - { CHAR_KATAKANA_HE, CHAR_KATAKANA_HE }, - { CHAR_KATAKANA_HO, CHAR_KATAKANA_HO }, - { CHAR_KATAKANA_MA, CHAR_KATAKANA_MA }, - { CHAR_KATAKANA_MI, CHAR_KATAKANA_MI }, - { CHAR_KATAKANA_MU, CHAR_KATAKANA_MU }, - { CHAR_KATAKANA_ME, CHAR_KATAKANA_ME }, - { CHAR_KATAKANA_MO, CHAR_KATAKANA_MO }, - { CHAR_KATAKANA_YA, CHAR_KATAKANA_YA }, - { CHAR_KATAKANA_YU, CHAR_KATAKANA_YU }, - { CHAR_KATAKANA_YO, CHAR_KATAKANA_YO }, - { CHAR_KATAKANA_RA, CHAR_KATAKANA_RA }, - { CHAR_KATAKANA_RI, CHAR_KATAKANA_RI }, - { CHAR_KATAKANA_RU, CHAR_KATAKANA_RU }, - { CHAR_KATAKANA_RE, CHAR_KATAKANA_RE }, - { CHAR_KATAKANA_RO, CHAR_KATAKANA_RO }, - { CHAR_KATAKANA_WA, CHAR_KATAKANA_WA }, - { CHAR_KATAKANA_WO, CHAR_KATAKANA_WO }, - { CHAR_KATAKANA_N, CHAR_KATAKANA_N }, - { CHAR_KATAKANA_SMALL_A, CHAR_KATAKANA_SMALL_A }, - { CHAR_KATAKANA_SMALL_I, CHAR_KATAKANA_SMALL_I }, - { CHAR_KATAKANA_SMALL_U, CHAR_KATAKANA_SMALL_U }, - { CHAR_KATAKANA_SMALL_E, CHAR_KATAKANA_SMALL_E }, - { CHAR_KATAKANA_SMALL_O, CHAR_KATAKANA_SMALL_O }, - { CHAR_KATAKANA_SMALL_YA, CHAR_KATAKANA_SMALL_YA }, - { CHAR_KATAKANA_SMALL_YU, CHAR_KATAKANA_SMALL_YU }, - { CHAR_KATAKANA_SMALL_YO, CHAR_KATAKANA_SMALL_YO }, - { CHAR_KATAKANA_GA, CHAR_KATAKANA_GA }, - { CHAR_KATAKANA_GI, CHAR_KATAKANA_GI }, - { CHAR_KATAKANA_GU, CHAR_KATAKANA_GU }, - { CHAR_KATAKANA_GE, CHAR_KATAKANA_GE }, - { CHAR_KATAKANA_GO, CHAR_KATAKANA_GO }, - { CHAR_KATAKANA_ZA, CHAR_KATAKANA_ZA }, - { CHAR_KATAKANA_JI, CHAR_KATAKANA_JI }, - { CHAR_KATAKANA_ZU, CHAR_KATAKANA_ZU }, - { CHAR_KATAKANA_ZE, CHAR_KATAKANA_ZE }, - { CHAR_KATAKANA_ZO, CHAR_KATAKANA_ZO }, - { CHAR_KATAKANA_DA, CHAR_KATAKANA_DA }, - { CHAR_KATAKANA_DJI, CHAR_KATAKANA_DJI }, - { CHAR_KATAKANA_DZU, CHAR_KATAKANA_DZU }, - { CHAR_KATAKANA_DE, CHAR_KATAKANA_DE }, - { CHAR_KATAKANA_DO, CHAR_KATAKANA_DO }, - { CHAR_KATAKANA_BA, CHAR_KATAKANA_BA }, - { CHAR_KATAKANA_BI, CHAR_KATAKANA_BI }, - { CHAR_KATAKANA_BU, CHAR_KATAKANA_BU }, - { CHAR_KATAKANA_BE, CHAR_KATAKANA_BE }, - { CHAR_KATAKANA_BO, CHAR_KATAKANA_BO }, - { CHAR_KATAKANA_PA, CHAR_KATAKANA_PA }, - { CHAR_KATAKANA_PI, CHAR_KATAKANA_PI }, - { CHAR_KATAKANA_PU, CHAR_KATAKANA_PU }, - { CHAR_KATAKANA_PE, CHAR_KATAKANA_PE }, - { CHAR_KATAKANA_PO, CHAR_KATAKANA_PO }, - { CHAR_KATAKANA_SOKUON, CHAR_KATAKANA_SOKUON }, - { CHAR_WIDE_0, CHAR_0 }, - { CHAR_WIDE_1, CHAR_1 }, - { CHAR_WIDE_2, CHAR_2 }, - { CHAR_WIDE_3, CHAR_3 }, - { CHAR_WIDE_4, CHAR_4 }, - { CHAR_WIDE_5, CHAR_5 }, - { CHAR_WIDE_6, CHAR_6 }, - { CHAR_WIDE_7, CHAR_7 }, - { CHAR_WIDE_8, CHAR_8 }, - { CHAR_WIDE_9, CHAR_9 }, - { CHAR_WIDE_EXCLAMATION, CHAR_EXCLAMATION }, - { CHAR_WIDE_QUESTION, CHAR_QUESTION }, - { CHAR_JP_PERIOD, CHAR_PERIOD }, - { CHAR_WIDE_MINUS, CHAR_MINUS }, + { CHAR_JP_SPACE, CHAR_JP_SPACE }, + { CHAR_JP_HIRA_A, CHAR_JP_HIRA_A }, + { CHAR_JP_HIRA_I, CHAR_JP_HIRA_I }, + { CHAR_JP_HIRA_U, CHAR_JP_HIRA_U }, + { CHAR_JP_HIRA_E, CHAR_JP_HIRA_E }, + { CHAR_JP_HIRA_O, CHAR_JP_HIRA_O }, + { CHAR_JP_HIRA_KA, CHAR_JP_HIRA_KA }, + { CHAR_JP_HIRA_KI, CHAR_JP_HIRA_KI }, + { CHAR_JP_HIRA_KU, CHAR_JP_HIRA_KU }, + { CHAR_JP_HIRA_KE, CHAR_JP_HIRA_KE }, + { CHAR_JP_HIRA_KO, CHAR_JP_HIRA_KO }, + { CHAR_JP_HIRA_SA, CHAR_JP_HIRA_SA }, + { CHAR_JP_HIRA_SHI, CHAR_JP_HIRA_SHI }, + { CHAR_JP_HIRA_SU, CHAR_JP_HIRA_SU }, + { CHAR_JP_HIRA_SE, CHAR_JP_HIRA_SE }, + { CHAR_JP_HIRA_SO, CHAR_JP_HIRA_SO }, + { CHAR_JP_HIRA_TA, CHAR_JP_HIRA_TA }, + { CHAR_JP_HIRA_CHI, CHAR_JP_HIRA_CHI }, + { CHAR_JP_HIRA_TSU, CHAR_JP_HIRA_TSU }, + { CHAR_JP_HIRA_TE, CHAR_JP_HIRA_TE }, + { CHAR_JP_HIRA_TO, CHAR_JP_HIRA_TO }, + { CHAR_JP_HIRA_NA, CHAR_JP_HIRA_NA }, + { CHAR_JP_HIRA_NI, CHAR_JP_HIRA_NI }, + { CHAR_JP_HIRA_NU, CHAR_JP_HIRA_NU }, + { CHAR_JP_HIRA_NE, CHAR_JP_HIRA_NE }, + { CHAR_JP_HIRA_NO, CHAR_JP_HIRA_NO }, + { CHAR_JP_HIRA_HA, CHAR_JP_HIRA_HA }, + { CHAR_JP_HIRA_HI, CHAR_JP_HIRA_HI }, + { CHAR_JP_HIRA_FU, CHAR_JP_HIRA_FU }, + { CHAR_JP_HIRA_HE, CHAR_JP_HIRA_HE }, + { CHAR_JP_HIRA_HO, CHAR_JP_HIRA_HO }, + { CHAR_JP_HIRA_MA, CHAR_JP_HIRA_MA }, + { CHAR_JP_HIRA_MI, CHAR_JP_HIRA_MI }, + { CHAR_JP_HIRA_MU, CHAR_JP_HIRA_MU }, + { CHAR_JP_HIRA_ME, CHAR_JP_HIRA_ME }, + { CHAR_JP_HIRA_MO, CHAR_JP_HIRA_MO }, + { CHAR_JP_HIRA_YA, CHAR_JP_HIRA_YA }, + { CHAR_JP_HIRA_YU, CHAR_JP_HIRA_YU }, + { CHAR_JP_HIRA_YO, CHAR_JP_HIRA_YO }, + { CHAR_JP_HIRA_RA, CHAR_JP_HIRA_RA }, + { CHAR_JP_HIRA_RI, CHAR_JP_HIRA_RI }, + { CHAR_JP_HIRA_RU, CHAR_JP_HIRA_RU }, + { CHAR_JP_HIRA_RE, CHAR_JP_HIRA_RE }, + { CHAR_JP_HIRA_RO, CHAR_JP_HIRA_RO }, + { CHAR_JP_HIRA_WA, CHAR_JP_HIRA_WA }, + { CHAR_JP_HIRA_WO, CHAR_JP_HIRA_WO }, + { CHAR_JP_HIRA_N, CHAR_JP_HIRA_N }, + { CHAR_JP_HIRA_A_SMALL, CHAR_JP_HIRA_A_SMALL }, + { CHAR_JP_HIRA_I_SMALL, CHAR_JP_HIRA_I_SMALL }, + { CHAR_JP_HIRA_U_SMALL, CHAR_JP_HIRA_U_SMALL }, + { CHAR_JP_HIRA_E_SMALL, CHAR_JP_HIRA_E_SMALL }, + { CHAR_JP_HIRA_O_SMALL, CHAR_JP_HIRA_O_SMALL }, + { CHAR_JP_HIRA_YA_SMALL, CHAR_JP_HIRA_YA_SMALL }, + { CHAR_JP_HIRA_YU_SMALL, CHAR_JP_HIRA_YU_SMALL }, + { CHAR_JP_HIRA_YO_SMALL, CHAR_JP_HIRA_YO_SMALL }, + { CHAR_JP_HIRA_GA, CHAR_JP_HIRA_GA }, + { CHAR_JP_HIRA_GI, CHAR_JP_HIRA_GI }, + { CHAR_JP_HIRA_GU, CHAR_JP_HIRA_GU }, + { CHAR_JP_HIRA_GE, CHAR_JP_HIRA_GE }, + { CHAR_JP_HIRA_GO, CHAR_JP_HIRA_GO }, + { CHAR_JP_HIRA_ZA, CHAR_JP_HIRA_ZA }, + { CHAR_JP_HIRA_JI, CHAR_JP_HIRA_JI }, + { CHAR_JP_HIRA_ZU, CHAR_JP_HIRA_ZU }, + { CHAR_JP_HIRA_ZE, CHAR_JP_HIRA_ZE }, + { CHAR_JP_HIRA_ZO, CHAR_JP_HIRA_ZO }, + { CHAR_JP_HIRA_DA, CHAR_JP_HIRA_DA }, + { CHAR_JP_HIRA_DJI, CHAR_JP_HIRA_DJI }, + { CHAR_JP_HIRA_DZU, CHAR_JP_HIRA_DZU }, + { CHAR_JP_HIRA_DE, CHAR_JP_HIRA_DE }, + { CHAR_JP_HIRA_DO, CHAR_JP_HIRA_DO }, + { CHAR_JP_HIRA_BA, CHAR_JP_HIRA_BA }, + { CHAR_JP_HIRA_BI, CHAR_JP_HIRA_BI }, + { CHAR_JP_HIRA_BU, CHAR_JP_HIRA_BU }, + { CHAR_JP_HIRA_BE, CHAR_JP_HIRA_BE }, + { CHAR_JP_HIRA_BO, CHAR_JP_HIRA_BO }, + { CHAR_JP_HIRA_PA, CHAR_JP_HIRA_PA }, + { CHAR_JP_HIRA_PI, CHAR_JP_HIRA_PI }, + { CHAR_JP_HIRA_PU, CHAR_JP_HIRA_PU }, + { CHAR_JP_HIRA_PE, CHAR_JP_HIRA_PE }, + { CHAR_JP_HIRA_PO, CHAR_JP_HIRA_PO }, + { CHAR_JP_HIRA_SOKUON, CHAR_JP_HIRA_SOKUON }, + { CHAR_JP_KATA_A, CHAR_JP_KATA_A }, + { CHAR_JP_KATA_I, CHAR_JP_KATA_I }, + { CHAR_JP_KATA_U, CHAR_JP_KATA_U }, + { CHAR_JP_KATA_E, CHAR_JP_KATA_E }, + { CHAR_JP_KATA_O, CHAR_JP_KATA_O }, + { CHAR_JP_KATA_KA, CHAR_JP_KATA_KA }, + { CHAR_JP_KATA_KI, CHAR_JP_KATA_KI }, + { CHAR_JP_KATA_KU, CHAR_JP_KATA_KU }, + { CHAR_JP_KATA_KE, CHAR_JP_KATA_KE }, + { CHAR_JP_KATA_KO, CHAR_JP_KATA_KO }, + { CHAR_JP_KATA_SA, CHAR_JP_KATA_SA }, + { CHAR_JP_KATA_SHI, CHAR_JP_KATA_SHI }, + { CHAR_JP_KATA_SU, CHAR_JP_KATA_SU }, + { CHAR_JP_KATA_SE, CHAR_JP_KATA_SE }, + { CHAR_JP_KATA_SO, CHAR_JP_KATA_SO }, + { CHAR_JP_KATA_TA, CHAR_JP_KATA_TA }, + { CHAR_JP_KATA_CHI, CHAR_JP_KATA_CHI }, + { CHAR_JP_KATA_TSU, CHAR_JP_KATA_TSU }, + { CHAR_JP_KATA_TE, CHAR_JP_KATA_TE }, + { CHAR_JP_KATA_TO, CHAR_JP_KATA_TO }, + { CHAR_JP_KATA_NA, CHAR_JP_KATA_NA }, + { CHAR_JP_KATA_NI, CHAR_JP_KATA_NI }, + { CHAR_JP_KATA_NU, CHAR_JP_KATA_NU }, + { CHAR_JP_KATA_NE, CHAR_JP_KATA_NE }, + { CHAR_JP_KATA_NO, CHAR_JP_KATA_NO }, + { CHAR_JP_KATA_HA, CHAR_JP_KATA_HA }, + { CHAR_JP_KATA_HI, CHAR_JP_KATA_HI }, + { CHAR_JP_KATA_FU, CHAR_JP_KATA_FU }, + { CHAR_JP_KATA_HE, CHAR_JP_KATA_HE }, + { CHAR_JP_KATA_HO, CHAR_JP_KATA_HO }, + { CHAR_JP_KATA_MA, CHAR_JP_KATA_MA }, + { CHAR_JP_KATA_MI, CHAR_JP_KATA_MI }, + { CHAR_JP_KATA_MU, CHAR_JP_KATA_MU }, + { CHAR_JP_KATA_ME, CHAR_JP_KATA_ME }, + { CHAR_JP_KATA_MO, CHAR_JP_KATA_MO }, + { CHAR_JP_KATA_YA, CHAR_JP_KATA_YA }, + { CHAR_JP_KATA_YU, CHAR_JP_KATA_YU }, + { CHAR_JP_KATA_YO, CHAR_JP_KATA_YO }, + { CHAR_JP_KATA_RA, CHAR_JP_KATA_RA }, + { CHAR_JP_KATA_RI, CHAR_JP_KATA_RI }, + { CHAR_JP_KATA_RU, CHAR_JP_KATA_RU }, + { CHAR_JP_KATA_RE, CHAR_JP_KATA_RE }, + { CHAR_JP_KATA_RO, CHAR_JP_KATA_RO }, + { CHAR_JP_KATA_WA, CHAR_JP_KATA_WA }, + { CHAR_JP_KATA_WO, CHAR_JP_KATA_WO }, + { CHAR_JP_KATA_N, CHAR_JP_KATA_N }, + { CHAR_JP_KATA_A_SMALL, CHAR_JP_KATA_A_SMALL }, + { CHAR_JP_KATA_I_SMALL, CHAR_JP_KATA_I_SMALL }, + { CHAR_JP_KATA_U_SMALL, CHAR_JP_KATA_U_SMALL }, + { CHAR_JP_KATA_E_SMALL, CHAR_JP_KATA_E_SMALL }, + { CHAR_JP_KATA_O_SMALL, CHAR_JP_KATA_O_SMALL }, + { CHAR_JP_KATA_YA_SMALL, CHAR_JP_KATA_YA_SMALL }, + { CHAR_JP_KATA_YU_SMALL, CHAR_JP_KATA_YU_SMALL }, + { CHAR_JP_KATA_YO_SMALL, CHAR_JP_KATA_YO_SMALL }, + { CHAR_JP_KATA_GA, CHAR_JP_KATA_GA }, + { CHAR_JP_KATA_GI, CHAR_JP_KATA_GI }, + { CHAR_JP_KATA_GU, CHAR_JP_KATA_GU }, + { CHAR_JP_KATA_GE, CHAR_JP_KATA_GE }, + { CHAR_JP_KATA_GO, CHAR_JP_KATA_GO }, + { CHAR_JP_KATA_ZA, CHAR_JP_KATA_ZA }, + { CHAR_JP_KATA_JI, CHAR_JP_KATA_JI }, + { CHAR_JP_KATA_ZU, CHAR_JP_KATA_ZU }, + { CHAR_JP_KATA_ZE, CHAR_JP_KATA_ZE }, + { CHAR_JP_KATA_ZO, CHAR_JP_KATA_ZO }, + { CHAR_JP_KATA_DA, CHAR_JP_KATA_DA }, + { CHAR_JP_KATA_DJI, CHAR_JP_KATA_DJI }, + { CHAR_JP_KATA_DZU, CHAR_JP_KATA_DZU }, + { CHAR_JP_KATA_DE, CHAR_JP_KATA_DE }, + { CHAR_JP_KATA_DO, CHAR_JP_KATA_DO }, + { CHAR_JP_KATA_BA, CHAR_JP_KATA_BA }, + { CHAR_JP_KATA_BI, CHAR_JP_KATA_BI }, + { CHAR_JP_KATA_BU, CHAR_JP_KATA_BU }, + { CHAR_JP_KATA_BE, CHAR_JP_KATA_BE }, + { CHAR_JP_KATA_BO, CHAR_JP_KATA_BO }, + { CHAR_JP_KATA_PA, CHAR_JP_KATA_PA }, + { CHAR_JP_KATA_PI, CHAR_JP_KATA_PI }, + { CHAR_JP_KATA_PU, CHAR_JP_KATA_PU }, + { CHAR_JP_KATA_PE, CHAR_JP_KATA_PE }, + { CHAR_JP_KATA_PO, CHAR_JP_KATA_PO }, + { CHAR_JP_KATA_SOKUON, CHAR_JP_KATA_SOKUON }, + { CHAR_JP_0, CHAR_0 }, + { CHAR_JP_1, CHAR_1 }, + { CHAR_JP_2, CHAR_2 }, + { CHAR_JP_3, CHAR_3 }, + { CHAR_JP_4, CHAR_4 }, + { CHAR_JP_5, CHAR_5 }, + { CHAR_JP_6, CHAR_6 }, + { CHAR_JP_7, CHAR_7 }, + { CHAR_JP_8, CHAR_8 }, + { CHAR_JP_9, CHAR_9 }, + { CHAR_JP_EMARK, CHAR_EMARK }, + { CHAR_JP_QMARK, CHAR_QMARK }, + { CHAR_JP_FULL_STOP, CHAR_PERIOD }, + { CHAR_JP_MINUS, CHAR_MINUS }, { CHAR_JP_DOT, CHAR_DOT }, { CHAR_JP_ELLIPSIS, CHAR_ELLIPSIS }, { CHAR_JP_DOUBLE_QUOTE_OPEN, CHAR_JP_DOUBLE_QUOTE_OPEN }, { CHAR_JP_DOUBLE_QUOTE_CLOSE, CHAR_JP_DOUBLE_QUOTE_CLOSE }, { CHAR_JP_SINGLE_QUOTE_OPEN, CHAR_SINGLE_QUOTE_OPEN }, { CHAR_JP_SINGLE_QUOTE_CLOSE, CHAR_SINGLE_QUOTE_CLOSE }, - { CHAR_WIDE_MALE, CHAR_MALE }, - { CHAR_WIDE_FEMALE, CHAR_FEMALE }, - { CHAR_YEN, CHAR_YEN }, + { CHAR_JP_MALE, CHAR_MALE }, + { CHAR_JP_FEMALE, CHAR_FEMALE }, + { CHAR_JP_CURRENCY, CHAR_JP_CURRENCY }, { CHAR_JP_COMMA, CHAR_COMMA }, - { CHAR_WIDE_MULTIPLY, CHAR_MULTIPLY }, - { CHAR_WIDE_SLASH, CHAR_SLASH }, - { CHAR_WIDE_A, CHAR_A }, - { CHAR_WIDE_B, CHAR_B }, - { CHAR_WIDE_C, CHAR_C }, - { CHAR_WIDE_D, CHAR_D }, - { CHAR_WIDE_E, CHAR_E }, - { CHAR_WIDE_F, CHAR_F }, - { CHAR_WIDE_G, CHAR_G }, - { CHAR_WIDE_H, CHAR_H }, - { CHAR_WIDE_I, CHAR_I }, - { CHAR_WIDE_J, CHAR_J }, - { CHAR_WIDE_K, CHAR_K }, - { CHAR_WIDE_L, CHAR_L }, - { CHAR_WIDE_M, CHAR_M }, - { CHAR_WIDE_N, CHAR_N }, - { CHAR_WIDE_O, CHAR_O }, - { CHAR_WIDE_P, CHAR_P }, - { CHAR_WIDE_Q, CHAR_Q }, - { CHAR_WIDE_R, CHAR_R }, - { CHAR_WIDE_S, CHAR_S }, - { CHAR_WIDE_T, CHAR_T }, - { CHAR_WIDE_U, CHAR_U }, - { CHAR_WIDE_V, CHAR_V }, - { CHAR_WIDE_W, CHAR_W }, - { CHAR_WIDE_X, CHAR_X }, - { CHAR_WIDE_Y, CHAR_Y }, - { CHAR_WIDE_Z, CHAR_Z }, - { CHAR_WIDE_a, CHAR_a }, - { CHAR_WIDE_b, CHAR_b }, - { CHAR_WIDE_c, CHAR_c }, - { CHAR_WIDE_d, CHAR_d }, - { CHAR_WIDE_e, CHAR_e }, - { CHAR_WIDE_f, CHAR_f }, - { CHAR_WIDE_g, CHAR_g }, - { CHAR_WIDE_h, CHAR_h }, - { CHAR_WIDE_i, CHAR_i }, - { CHAR_WIDE_j, CHAR_j }, - { CHAR_WIDE_k, CHAR_k }, - { CHAR_WIDE_l, CHAR_l }, - { CHAR_WIDE_m, CHAR_m }, - { CHAR_WIDE_n, CHAR_n }, - { CHAR_WIDE_o, CHAR_o }, - { CHAR_WIDE_p, CHAR_p }, - { CHAR_WIDE_q, CHAR_q }, - { CHAR_WIDE_r, CHAR_r }, - { CHAR_WIDE_s, CHAR_s }, - { CHAR_WIDE_t, CHAR_t }, - { CHAR_WIDE_u, CHAR_u }, - { CHAR_WIDE_v, CHAR_v }, - { CHAR_WIDE_w, CHAR_w }, - { CHAR_WIDE_x, CHAR_x }, - { CHAR_WIDE_y, CHAR_y }, - { CHAR_WIDE_z, CHAR_z }, + { CHAR_JP_MULTIPLY, CHAR_MULTIPLY }, + { CHAR_JP_SLASH, CHAR_SLASH }, + { CHAR_JP_A, CHAR_A }, + { CHAR_JP_B, CHAR_B }, + { CHAR_JP_C, CHAR_C }, + { CHAR_JP_D, CHAR_D }, + { CHAR_JP_E, CHAR_E }, + { CHAR_JP_F, CHAR_F }, + { CHAR_JP_G, CHAR_G }, + { CHAR_JP_H, CHAR_H }, + { CHAR_JP_I, CHAR_I }, + { CHAR_JP_J, CHAR_J }, + { CHAR_JP_K, CHAR_K }, + { CHAR_JP_L, CHAR_L }, + { CHAR_JP_M, CHAR_M }, + { CHAR_JP_N, CHAR_N }, + { CHAR_JP_O, CHAR_O }, + { CHAR_JP_P, CHAR_P }, + { CHAR_JP_Q, CHAR_Q }, + { CHAR_JP_R, CHAR_R }, + { CHAR_JP_S, CHAR_S }, + { CHAR_JP_T, CHAR_T }, + { CHAR_JP_U, CHAR_U }, + { CHAR_JP_V, CHAR_V }, + { CHAR_JP_W, CHAR_W }, + { CHAR_JP_X, CHAR_X }, + { CHAR_JP_Y, CHAR_Y }, + { CHAR_JP_Z, CHAR_Z }, + { CHAR_JP_a, CHAR_a }, + { CHAR_JP_b, CHAR_b }, + { CHAR_JP_c, CHAR_c }, + { CHAR_JP_d, CHAR_d }, + { CHAR_JP_e, CHAR_e }, + { CHAR_JP_f, CHAR_f }, + { CHAR_JP_g, CHAR_g }, + { CHAR_JP_h, CHAR_h }, + { CHAR_JP_i, CHAR_i }, + { CHAR_JP_j, CHAR_j }, + { CHAR_JP_k, CHAR_k }, + { CHAR_JP_l, CHAR_l }, + { CHAR_JP_m, CHAR_m }, + { CHAR_JP_n, CHAR_n }, + { CHAR_JP_o, CHAR_o }, + { CHAR_JP_p, CHAR_p }, + { CHAR_JP_q, CHAR_q }, + { CHAR_JP_r, CHAR_r }, + { CHAR_JP_s, CHAR_s }, + { CHAR_JP_t, CHAR_t }, + { CHAR_JP_u, CHAR_u }, + { CHAR_JP_v, CHAR_v }, + { CHAR_JP_w, CHAR_w }, + { CHAR_JP_x, CHAR_x }, + { CHAR_JP_y, CHAR_y }, + { CHAR_JP_z, CHAR_z }, { CHAR_ARROW_MENU, CHAR_ARROW_MENU }, - { CHAR_WIDE_COLON, CHAR_COLON }, + { CHAR_JP_HW_COLON, CHAR_COLON }, { CHAR_A_DIERESIS, CHAR_A_DIERESIS }, - { CHAR_O_DIERSIS, CHAR_O_DIERSIS }, + { CHAR_O_DIERESIS, CHAR_O_DIERESIS }, { CHAR_U_DIERESIS, CHAR_U_DIERESIS }, { CHAR_a_DIERESIS, CHAR_a_DIERESIS }, - { CHAR_o_DIERSIS, CHAR_o_DIERSIS }, + { CHAR_o_DIERESIS, CHAR_o_DIERESIS }, { CHAR_u_DIERESIS, CHAR_u_DIERESIS } }; static u16 GetSpaceChar(u32 language) { - return (language == JAPANESE) ? CHAR_WIDE_SPACE : CHAR_SPACE; + return (language == JAPANESE) ? CHAR_JP_SPACE : CHAR_SPACE; } static u16 GetDoubleQuoteOpenChar(u32 language) @@ -276,7 +276,7 @@ static u16 GetDoubleQuoteOpenChar(u32 language) case SPANISH: return CHAR_DOUBLE_QUOTE_OPEN; case FRENCH: - return CHAR_DOUBLE_PAREN_OPEN; + return CHAR_ANGLE_QUOTE_OPEN; case GERMAN: return CHAR_DOUBLE_QUOTE_CLOSE_INVERTED; } @@ -293,7 +293,7 @@ static u16 GetDoubleQuoteCloseChar(u32 language) case SPANISH: return CHAR_DOUBLE_QUOTE_CLOSE; case FRENCH: - return CHAR_DOUBLE_PAREN_CLOSE; + return CHAR_ANGLE_QUOTE_CLOSE; case GERMAN: return CHAR_DOUBLE_QUOTE_OPEN; } @@ -314,7 +314,7 @@ BOOL GBA_ConvertStringToDS(const u8 *src, charcode_t *dst, u32 length, u32 langu int j; for (j = 0; j < invalidStrLen; j++) { - dst[j] = CHAR_QUESTION; + dst[j] = CHAR_QMARK; } dst[j] = CHAR_EOS; @@ -322,7 +322,7 @@ BOOL GBA_ConvertStringToDS(const u8 *src, charcode_t *dst, u32 length, u32 langu } switch (sGBACharToDSChars[src[i]][nonJa]) { - case CHAR_WIDE_SPACE: + case CHAR_JP_SPACE: dst[i] = GetSpaceChar(language); break; case CHAR_JP_DOUBLE_QUOTE_OPEN: diff --git a/src/render_text.c b/src/render_text.c index b1c1f4f97f..a0a8664b38 100644 --- a/src/render_text.c +++ b/src/render_text.c @@ -76,7 +76,7 @@ enum RenderResult RenderText(TextPrinter *printer) case CHAR_EOS: return RENDER_FINISH; - case CHAR_CR: + case CHAR_LINE_BREAK: printer->template.currX = printer->template.x; printer->template.currY += Font_GetAttribute(printer->template.fontID, 1) + printer->template.lineSpacing; return RENDER_REPEAT; @@ -85,7 +85,7 @@ enum RenderResult RenderText(TextPrinter *printer) printer->template.toPrint.raw++; return RENDER_REPEAT; - case CHAR_FORMAT_ARG: + case CHAR_CONTROL_CODE_ARG: printer->template.toPrint.raw--; currChar = CharCode_FormatArgType(printer->template.toPrint.raw); diff --git a/src/string_gf.c b/src/string_gf.c index d196560be3..29001173c2 100644 --- a/src/string_gf.c +++ b/src/string_gf.c @@ -88,16 +88,16 @@ void String_FormatInt(String *dst, int num, u32 maxDigits, enum PaddingMode padd 1000000000 }; static const charcode_t sDigits_JP[] = { - CHAR_WIDE_0, - CHAR_WIDE_1, - CHAR_WIDE_2, - CHAR_WIDE_3, - CHAR_WIDE_4, - CHAR_WIDE_5, - CHAR_WIDE_6, - CHAR_WIDE_7, - CHAR_WIDE_8, - CHAR_WIDE_9, + CHAR_JP_0, + CHAR_JP_1, + CHAR_JP_2, + CHAR_JP_3, + CHAR_JP_4, + CHAR_JP_5, + CHAR_JP_6, + CHAR_JP_7, + CHAR_JP_8, + CHAR_JP_9, }; static const charcode_t sDigits_EN[] = { CHAR_0, @@ -123,7 +123,7 @@ void String_FormatInt(String *dst, int num, u32 maxDigits, enum PaddingMode padd if (negative) { num *= -1; - dst->data[dst->size++] = (charsetMode == CHARSET_MODE_JP) ? CHAR_WIDE_MINUS : CHAR_MINUS; + dst->data[dst->size++] = (charsetMode == CHARSET_MODE_JP) ? CHAR_JP_MINUS : CHAR_MINUS; } u32 div = sPowersOfTen[maxDigits - 1]; @@ -132,13 +132,13 @@ void String_FormatInt(String *dst, int num, u32 maxDigits, enum PaddingMode padd num -= div * digit; if (paddingMode == PADDING_MODE_ZEROES) { - dst->data[dst->size++] = (digit < 10) ? digitSet[digit] : CHAR_WIDE_QUESTION; + dst->data[dst->size++] = (digit < 10) ? digitSet[digit] : CHAR_JP_QMARK; // If we hit a non-zero digit, flip the padding mode off } else if (digit != 0 || div == 1) { paddingMode = PADDING_MODE_ZEROES; - dst->data[dst->size++] = (digit < 10) ? digitSet[digit] : CHAR_WIDE_QUESTION; + dst->data[dst->size++] = (digit < 10) ? digitSet[digit] : CHAR_JP_QMARK; } else if (paddingMode == PADDING_MODE_SPACES) { - dst->data[dst->size++] = (charsetMode == CHARSET_MODE_JP) ? CHAR_WIDE_SPACE : CHAR_NUM_SPACE; + dst->data[dst->size++] = (charsetMode == CHARSET_MODE_JP) ? CHAR_JP_SPACE : CHAR_NUM_SPACE; } div /= 10; @@ -176,16 +176,16 @@ void String_FormatU64(String *dst, u64 num, u32 maxDigits, enum PaddingMode padd 10000000000000000000 }; static const charcode_t sDigits_JP[] = { - CHAR_WIDE_0, - CHAR_WIDE_1, - CHAR_WIDE_2, - CHAR_WIDE_3, - CHAR_WIDE_4, - CHAR_WIDE_5, - CHAR_WIDE_6, - CHAR_WIDE_7, - CHAR_WIDE_8, - CHAR_WIDE_9, + CHAR_JP_0, + CHAR_JP_1, + CHAR_JP_2, + CHAR_JP_3, + CHAR_JP_4, + CHAR_JP_5, + CHAR_JP_6, + CHAR_JP_7, + CHAR_JP_8, + CHAR_JP_9, }; static const charcode_t sDigits_EN[] = { CHAR_0, @@ -211,7 +211,7 @@ void String_FormatU64(String *dst, u64 num, u32 maxDigits, enum PaddingMode padd if (negative) { num *= -1; - dst->data[dst->size++] = (charsetMode == CHARSET_MODE_JP) ? CHAR_WIDE_MINUS : CHAR_MINUS; + dst->data[dst->size++] = (charsetMode == CHARSET_MODE_JP) ? CHAR_JP_MINUS : CHAR_MINUS; } u64 div = sPowersOfTen[maxDigits - 1]; @@ -220,12 +220,12 @@ void String_FormatU64(String *dst, u64 num, u32 maxDigits, enum PaddingMode padd num -= div * digit; if (paddingMode == PADDING_MODE_ZEROES) { - dst->data[dst->size++] = (digit < 10) ? digitSet[digit] : CHAR_WIDE_QUESTION; + dst->data[dst->size++] = (digit < 10) ? digitSet[digit] : CHAR_JP_QMARK; } else if ((digit != 0) || (div == 1)) { paddingMode = PADDING_MODE_ZEROES; - dst->data[dst->size++] = (digit < 10) ? digitSet[digit] : CHAR_WIDE_QUESTION; + dst->data[dst->size++] = (digit < 10) ? digitSet[digit] : CHAR_JP_QMARK; } else if (paddingMode == PADDING_MODE_SPACES) { - dst->data[dst->size++] = (charsetMode == CHARSET_MODE_JP) ? CHAR_WIDE_SPACE : CHAR_SPACE; + dst->data[dst->size++] = (charsetMode == CHARSET_MODE_JP) ? CHAR_JP_SPACE : CHAR_SPACE; } div /= 10; @@ -246,7 +246,7 @@ u64 String_AtoI(const String *src, BOOL *success) } for (int i = (src->size - 1); i >= 0; i--) { - u64 digit = src->data[i] - CHAR_WIDE_0; + u64 digit = src->data[i] - CHAR_JP_0; if (digit >= 10) { digit = src->data[i] - CHAR_0; @@ -291,7 +291,7 @@ u32 String_NumLines(const String *string) int i, count; for (i = 0, count = 1; i < string->size; i++) { - if (string->data[i] == CHAR_CR) { + if (string->data[i] == CHAR_LINE_BREAK) { count++; } } @@ -308,7 +308,7 @@ void String_CopyLineNum(String *dst, const String *src, u32 lineNum) if (lineNum) { for (i = 0; i < src->size; i++) { - if (src->data[i] == CHAR_CR && --lineNum == 0) { + if (src->data[i] == CHAR_LINE_BREAK && --lineNum == 0) { i++; break; } @@ -318,7 +318,7 @@ void String_CopyLineNum(String *dst, const String *src, u32 lineNum) String_Clear(dst); for (; i < src->size; i++) { - if (src->data[i] == CHAR_CR) { + if (src->data[i] == CHAR_LINE_BREAK) { break; } diff --git a/src/string_template.c b/src/string_template.c index 9ab406ec53..af31bfbc70 100644 --- a/src/string_template.c +++ b/src/string_template.c @@ -634,7 +634,7 @@ void StringTemplate_Format(const StringTemplate *template, String *dst, const St String_Clear(dst); while (*c != CHAR_EOS) { - if (*c == CHAR_FORMAT_ARG) { + if (*c == CHAR_CONTROL_CODE_ARG) { if (CharCode_IsFormatArg(c)) { u32 idx = CharCode_FormatArgParam(c, 0); GF_ASSERT(idx < template->maxArgs);