diff --git a/include/constants/charcode.h b/include/constants/charcode.h index 25b26894a6..ab227a9e6d 100644 --- a/include/constants/charcode.h +++ b/include/constants/charcode.h @@ -1,505 +1,504 @@ #ifndef POKEHEARTGOLD_CONSTANTS_CHARCODE_H #define POKEHEARTGOLD_CONSTANTS_CHARCODE_H -#define CHAR_NUL 0 -#define CHAR_JP_SPACE 1 -#define CHAR_JP_HIRA_A_SMALL 2 -#define CHAR_JP_HIRA_A 3 -#define CHAR_JP_HIRA_I_SMALL 4 -#define CHAR_JP_HIRA_I 5 -#define CHAR_JP_HIRA_U_SMALL 6 -#define CHAR_JP_HIRA_U 7 -#define CHAR_JP_HIRA_E_SMALL 8 -#define CHAR_JP_HIRA_E 9 -#define CHAR_JP_HIRA_O_SMALL 10 -#define CHAR_JP_HIRA_O 11 -#define CHAR_JP_HIRA_KA 12 -#define CHAR_JP_HIRA_GA 13 -#define CHAR_JP_HIRA_KI 14 -#define CHAR_JP_HIRA_GI 15 -#define CHAR_JP_HIRA_KU 16 -#define CHAR_JP_HIRA_GU 17 -#define CHAR_JP_HIRA_KE 18 -#define CHAR_JP_HIRA_GE 19 -#define CHAR_JP_HIRA_KO 20 -#define CHAR_JP_HIRA_GO 21 -#define CHAR_JP_HIRA_SA 22 -#define CHAR_JP_HIRA_ZA 23 -#define CHAR_JP_HIRA_SI 24 -#define CHAR_JP_HIRA_ZI 25 -#define CHAR_JP_HIRA_SU 26 -#define CHAR_JP_HIRA_ZU 27 -#define CHAR_JP_HIRA_SE 28 -#define CHAR_JP_HIRA_ZE 29 -#define CHAR_JP_HIRA_SO 30 -#define CHAR_JP_HIRA_ZO 31 -#define CHAR_JP_HIRA_TA 32 -#define CHAR_JP_HIRA_DA 33 -#define CHAR_JP_HIRA_TI 34 -#define CHAR_JP_HIRA_DI 35 -#define CHAR_JP_HIRA_TU_SMALL 36 -#define CHAR_JP_HIRA_TU 37 -#define CHAR_JP_HIRA_DU 38 -#define CHAR_JP_HIRA_TE 39 -#define CHAR_JP_HIRA_DE 40 -#define CHAR_JP_HIRA_TO 41 -#define CHAR_JP_HIRA_DO 42 -#define CHAR_JP_HIRA_NA 43 -#define CHAR_JP_HIRA_NI 44 -#define CHAR_JP_HIRA_NU 45 -#define CHAR_JP_HIRA_NE 46 -#define CHAR_JP_HIRA_NO 47 -#define CHAR_JP_HIRA_HA 48 -#define CHAR_JP_HIRA_BA 49 -#define CHAR_JP_HIRA_PA 50 -#define CHAR_JP_HIRA_HI 51 -#define CHAR_JP_HIRA_BI 52 -#define CHAR_JP_HIRA_PI 53 -#define CHAR_JP_HIRA_HU 54 -#define CHAR_JP_HIRA_BU 55 -#define CHAR_JP_HIRA_PU 56 -#define CHAR_JP_HIRA_HE 57 -#define CHAR_JP_HIRA_BE 58 -#define CHAR_JP_HIRA_PE 59 -#define CHAR_JP_HIRA_HO 60 -#define CHAR_JP_HIRA_BO 61 -#define CHAR_JP_HIRA_PO 62 -#define CHAR_JP_HIRA_MA 63 -#define CHAR_JP_HIRA_MI 64 -#define CHAR_JP_HIRA_MU 65 -#define CHAR_JP_HIRA_ME 66 -#define CHAR_JP_HIRA_MO 67 -#define CHAR_JP_HIRA_YA_SMALL 68 -#define CHAR_JP_HIRA_YA 69 -#define CHAR_JP_HIRA_YU_SMALL 70 -#define CHAR_JP_HIRA_YU 71 -#define CHAR_JP_HIRA_YO_SMALL 72 -#define CHAR_JP_HIRA_YO 73 -#define CHAR_JP_HIRA_RA 74 -#define CHAR_JP_HIRA_RI 75 -#define CHAR_JP_HIRA_RU 76 -#define CHAR_JP_HIRA_RE 77 -#define CHAR_JP_HIRA_RO 78 -#define CHAR_JP_HIRA_WA 79 -#define CHAR_JP_HIRA_WO 80 -#define CHAR_JP_HIRA_N_ 81 -#define CHAR_JP_KATA_A_SMALL 82 -#define CHAR_JP_KATA_A 83 -#define CHAR_JP_KATA_I_SMALL 84 -#define CHAR_JP_KATA_I 85 -#define CHAR_JP_KATA_U_SMALL 86 -#define CHAR_JP_KATA_U 87 -#define CHAR_JP_KATA_E_SMALL 88 -#define CHAR_JP_KATA_E 89 -#define CHAR_JP_KATA_O_SMALL 90 -#define CHAR_JP_KATA_O 91 -#define CHAR_JP_KATA_KA 92 -#define CHAR_JP_KATA_GA 93 -#define CHAR_JP_KATA_KI 94 -#define CHAR_JP_KATA_GI 95 -#define CHAR_JP_KATA_KU 96 -#define CHAR_JP_KATA_GU 97 -#define CHAR_JP_KATA_KE 98 -#define CHAR_JP_KATA_GE 99 -#define CHAR_JP_KATA_KO 100 -#define CHAR_JP_KATA_GO 101 -#define CHAR_JP_KATA_SA 102 -#define CHAR_JP_KATA_ZA 103 -#define CHAR_JP_KATA_SI 104 -#define CHAR_JP_KATA_ZI 105 -#define CHAR_JP_KATA_SU 106 -#define CHAR_JP_KATA_ZU 107 -#define CHAR_JP_KATA_SE 108 -#define CHAR_JP_KATA_ZE 109 -#define CHAR_JP_KATA_SO 110 -#define CHAR_JP_KATA_ZO 111 -#define CHAR_JP_KATA_TA 112 -#define CHAR_JP_KATA_DA 113 -#define CHAR_JP_KATA_TI 114 -#define CHAR_JP_KATA_DI 115 -#define CHAR_JP_KATA_TU_SMALL 116 -#define CHAR_JP_KATA_TU 117 -#define CHAR_JP_KATA_DU 118 -#define CHAR_JP_KATA_TE 119 -#define CHAR_JP_KATA_DE 120 -#define CHAR_JP_KATA_TO 121 -#define CHAR_JP_KATA_DO 122 -#define CHAR_JP_KATA_NA 123 -#define CHAR_JP_KATA_NI 124 -#define CHAR_JP_KATA_NU 125 -#define CHAR_JP_KATA_NE 126 -#define CHAR_JP_KATA_NO 127 -#define CHAR_JP_KATA_HA 128 -#define CHAR_JP_KATA_BA 129 -#define CHAR_JP_KATA_PA 130 -#define CHAR_JP_KATA_HI 131 -#define CHAR_JP_KATA_BI 132 -#define CHAR_JP_KATA_PI 133 -#define CHAR_JP_KATA_HU 134 -#define CHAR_JP_KATA_BU 135 -#define CHAR_JP_KATA_PU 136 -#define CHAR_JP_KATA_HE 137 -#define CHAR_JP_KATA_BE 138 -#define CHAR_JP_KATA_PE 139 -#define CHAR_JP_KATA_HO 140 -#define CHAR_JP_KATA_BO 141 -#define CHAR_JP_KATA_PO 142 -#define CHAR_JP_KATA_MA 143 -#define CHAR_JP_KATA_MI 144 -#define CHAR_JP_KATA_MU 145 -#define CHAR_JP_KATA_ME 146 -#define CHAR_JP_KATA_MO 147 -#define CHAR_JP_KATA_YA_SMALL 148 -#define CHAR_JP_KATA_YA 149 -#define CHAR_JP_KATA_YU_SMALL 150 -#define CHAR_JP_KATA_YU 151 -#define CHAR_JP_KATA_YO_SMALL 152 -#define CHAR_JP_KATA_YO 153 -#define CHAR_JP_KATA_RA 154 -#define CHAR_JP_KATA_RI 155 -#define CHAR_JP_KATA_RU 156 -#define CHAR_JP_KATA_RE 157 -#define CHAR_JP_KATA_RO 158 -#define CHAR_JP_KATA_WA 159 -#define CHAR_JP_KATA_WO 160 -#define CHAR_JP_KATA_N_ 161 -#define CHAR_JP_0 162 -#define CHAR_JP_1 163 -#define CHAR_JP_2 164 -#define CHAR_JP_3 165 -#define CHAR_JP_4 166 -#define CHAR_JP_5 167 -#define CHAR_JP_6 168 -#define CHAR_JP_7 169 -#define CHAR_JP_8 170 -#define CHAR_JP_9 171 -#define CHAR_JP_A 172 -#define CHAR_JP_B 173 -#define CHAR_JP_C 174 -#define CHAR_JP_D 175 -#define CHAR_JP_E 176 -#define CHAR_JP_F 177 -#define CHAR_JP_G 178 -#define CHAR_JP_H 179 -#define CHAR_JP_I 180 -#define CHAR_JP_J 181 -#define CHAR_JP_K 182 -#define CHAR_JP_L 183 -#define CHAR_JP_M 184 -#define CHAR_JP_N 185 -#define CHAR_JP_O 186 -#define CHAR_JP_P 187 -#define CHAR_JP_Q 188 -#define CHAR_JP_R 189 -#define CHAR_JP_S 190 -#define CHAR_JP_T 191 -#define CHAR_JP_U 192 -#define CHAR_JP_V 193 -#define CHAR_JP_W 194 -#define CHAR_JP_X 195 -#define CHAR_JP_Y 196 -#define CHAR_JP_Z 197 -#define CHAR_JP_a 198 -#define CHAR_JP_b 199 -#define CHAR_JP_c 200 -#define CHAR_JP_d 201 -#define CHAR_JP_e 202 -#define CHAR_JP_f 203 -#define CHAR_JP_g 204 -#define CHAR_JP_h 205 -#define CHAR_JP_i 206 -#define CHAR_JP_j 207 -#define CHAR_JP_k 208 -#define CHAR_JP_l 209 -#define CHAR_JP_m 210 -#define CHAR_JP_n 211 -#define CHAR_JP_o 212 -#define CHAR_JP_p 213 -#define CHAR_JP_q 214 -#define CHAR_JP_r 215 -#define CHAR_JP_s 216 -#define CHAR_JP_t 217 -#define CHAR_JP_u 218 -#define CHAR_JP_v 219 -#define CHAR_JP_w 220 -#define CHAR_JP_x 221 -#define CHAR_JP_y 222 -#define CHAR_JP_z 223 -#define CHAR_INVALID_E0 224 -#define CHAR_JP_EXCLAM_MARK 225 -#define CHAR_JP_QUESTION_MARK 226 -#define CHAR_JP_COMMA 227 -#define CHAR_JP_FULLSTOP 228 -#define CHAR_JP_ELLIPSIS 229 -#define CHAR_JP_CENTER_DOT 230 -#define CHAR_JP_SLASH 231 -#define CHAR_JP_OPEN_QUOT 232 -#define CHAR_JP_CLOSE_QUOT 233 -#define CHAR_JP_OPEN_DQUOT 234 -#define CHAR_JP_CLOSE_DQUOT 235 -#define CHAR_JP_OPEN_PAREN 236 -#define CHAR_JP_CLOSE_PAREN 237 -#define CHAR_JP_OTOKO 238 -#define CHAR_JP_ONNA 239 -#define CHAR_JP_PLUS 240 -#define CHAR_JP_HYPHEN 241 -#define CHAR_JP_MULT 242 -#define CHAR_JP_DIV 243 -#define CHAR_JP_EQUAL 244 -#define CHAR_JP_TILDE 245 -#define CHAR_JP_HW_COLON 246 -#define CHAR_JP_HW_SEMICOLON 247 -#define CHAR_JP_HW_PERIOD 248 -#define CHAR_JP_HW_COMMA 249 -#define CHAR_JP_SPADE_SUIT 250 -#define CHAR_JP_CLUB_SUIT 251 -#define CHAR_JP_HEART_SUIT 252 -#define CHAR_JP_DIAMOND_SUIT 253 -#define CHAR_JP_STAR 254 -#define CHAR_JP_CIRCLE_DOT 255 -#define CHAR_JP_CIRCLE 256 -#define CHAR_JP_SQUARE 257 -#define CHAR_JP_TRIANGLE 258 -#define CHAR_JP_DIAMOND 259 -#define CHAR_JP_AT 260 -#define CHAR_JP_MUSIC_NOTE 261 -#define CHAR_JP_PERCENT 262 -#define CHAR_JP_SUN 263 -#define CHAR_JP_TREBLE_CLEF 264 -#define CHAR_JP_UMBRELLA 265 -#define CHAR_JP_SNOWMAN 266 -#define CHAR_JP_SMILEY 267 -#define CHAR_JP_LAUGHING 268 -#define CHAR_JP_ANGUISH 269 -#define CHAR_JP_ANGRY 270 -#define CHAR_JP_UP_ARROW 271 -#define CHAR_JP_DOWN_ARROW 272 -#define CHAR_JP_SNORING 273 -#define CHAR_JP_YEN 274 -#define CHAR_JP_ITEMS 275 -#define CHAR_JP_KEY_ITEMS 276 -#define CHAR_JP_TMHM 277 -#define CHAR_JP_MAIL 278 -#define CHAR_JP_MEDICINE 279 -#define CHAR_JP_BERRIES 280 -#define CHAR_JP_BALLS 281 -#define CHAR_JP_BATTLE_ITEMS 282 -#define CHAR_JP_DIR_LEFT 283 -#define CHAR_JP_DIR_UP 284 -#define CHAR_JP_DIR_DOWN 285 -#define CHAR_JP_DIR_RIGHT 286 -#define CHAR_JP_CONTINUE_ARROW 287 -#define CHAR_JP_AMPERSAND 288 -#define CHAR_0 289 -#define CHAR_1 290 -#define CHAR_2 291 -#define CHAR_3 292 -#define CHAR_4 293 -#define CHAR_5 294 -#define CHAR_6 295 -#define CHAR_7 296 -#define CHAR_8 297 -#define CHAR_9 298 -#define CHAR_A 299 -#define CHAR_B 300 -#define CHAR_C 301 -#define CHAR_D 302 -#define CHAR_E 303 -#define CHAR_F 304 -#define CHAR_G 305 -#define CHAR_H 306 -#define CHAR_I 307 -#define CHAR_J 308 -#define CHAR_K 309 -#define CHAR_L 310 -#define CHAR_M 311 -#define CHAR_N 312 -#define CHAR_O 313 -#define CHAR_P 314 -#define CHAR_Q 315 -#define CHAR_R 316 -#define CHAR_S 317 -#define CHAR_T 318 -#define CHAR_U 319 -#define CHAR_V 320 -#define CHAR_W 321 -#define CHAR_X 322 -#define CHAR_Y 323 -#define CHAR_Z 324 -#define CHAR_a 325 -#define CHAR_b 326 -#define CHAR_c 327 -#define CHAR_d 328 -#define CHAR_e 329 -#define CHAR_f 330 -#define CHAR_g 331 -#define CHAR_h 332 -#define CHAR_i 333 -#define CHAR_j 334 -#define CHAR_k 335 -#define CHAR_l 336 -#define CHAR_m 337 -#define CHAR_n 338 -#define CHAR_o 339 -#define CHAR_p 340 -#define CHAR_q 341 -#define CHAR_r 342 -#define CHAR_s 343 -#define CHAR_t 344 -#define CHAR_u 345 -#define CHAR_v 346 -#define CHAR_w 347 -#define CHAR_x 348 -#define CHAR_y 349 -#define CHAR_z 350 -#define CHAR_Agrave 351 -#define CHAR_Aacute 352 -#define CHAR_Acarat 353 -#define CHAR_Atilde 354 -#define CHAR_Aumlaut 355 -#define CHAR_Aring 356 -#define CHAR_AE 357 -#define CHAR_Ccedilla 358 -#define CHAR_Egrave 359 -#define CHAR_Eacute 360 -#define CHAR_Ecarat 361 -#define CHAR_Eumlaut 362 -#define CHAR_Igrave 363 -#define CHAR_Iacute 364 -#define CHAR_Icarat 365 -#define CHAR_Iumlaut 366 -#define CHAR_ETH 367 -#define CHAR_Ntilde 368 -#define CHAR_Ograve 369 -#define CHAR_Oacute 370 -#define CHAR_Ocarat 371 -#define CHAR_Otilde 372 -#define CHAR_Oumlaut 373 -#define CHAR_MULT 374 -#define CHAR_Oslash 375 -#define CHAR_Ugrave 376 -#define CHAR_Uacute 377 -#define CHAR_Ucarat 378 -#define CHAR_Uumlaut 379 -#define CHAR_Yacute 380 -#define CHAR_THORN 381 -#define CHAR_ESZETT 382 -#define CHAR_agrave 383 -#define CHAR_aacute 384 -#define CHAR_acarat 385 -#define CHAR_atilde 386 -#define CHAR_aumlaut 387 -#define CHAR_aring 388 -#define CHAR_ae 389 -#define CHAR_ccedilla 390 -#define CHAR_egrave 391 -#define CHAR_eacute 392 -#define CHAR_ecarat 393 -#define CHAR_eumlaut 394 -#define CHAR_igrave 395 -#define CHAR_iacute 396 -#define CHAR_icarat 397 -#define CHAR_iumlaut 398 -#define CHAR_eth 399 -#define CHAR_ntilde 400 -#define CHAR_ograve 401 -#define CHAR_oacute 402 -#define CHAR_ocarat 403 -#define CHAR_otilde 404 -#define CHAR_oumlaut 405 -#define CHAR_div 406 -#define CHAR_oslash 407 -#define CHAR_ugrave 408 -#define CHAR_uacute 409 -#define CHAR_ucarat 410 -#define CHAR_uumlaut 411 -#define CHAR_yacute 412 -#define CHAR_thorm 413 -#define CHAR_eszett 414 -#define CHAR_OE 415 -#define CHAR_oe 416 -#define CHAR_Scedilla 417 -#define CHAR_scedilla 418 -#define CHAR_super_a 419 // latin f ordinal -#define CHAR_super_o 420 // latin m ordinal -#define CHAR_super_er 421 -#define CHAR_super_re 422 -#define CHAR_super_r 423 -#define CHAR_POKEMONEY 424 -#define CHAR_UPSIDEDOWN_EXCL 425 -#define CHAR_UPSIDEDOWN_QMARK 426 -#define CHAR_EXCL 427 -#define CHAR_QMARK 428 -#define CHAR_COMMA 429 -#define CHAR_PERIOD 430 -#define CHAR_ELLIPSIS 431 -#define CHAR_CTRDOT 432 -#define CHAR_SLASH 433 -#define CHAR_LAPOST 434 // left single quote -#define CHAR_RAPOST 435 // right single quote (apostrophe) -#define CHAR_LDQUOT 436 // left double quote -#define CHAR_RDQUOT 437 // right double quote -#define CHAR_LOW_RDQUOT 438 -#define CHAR_FR_LQUOT 439 -#define CHAR_FR_RQUOT 440 -#define CHAR_LPAREN 441 -#define CHAR_RPAREN 442 -#define CHAR_MALE 443 -#define CHAR_FEMALE 444 -#define CHAR_PLUS 445 -#define CHAR_HYPHEN 446 -#define CHAR_ASTERISK 447 -#define CHAR_HASH 448 -#define CHAR_EQUALS 449 -#define CHAR_AMPERSAND 450 -#define CHAR_TILDE 451 -#define CHAR_COLON 452 -#define CHAR_SEMICOLON 453 -#define CHAR_SPADE_SUIT 454 -#define CHAR_CLUB_SUIT 455 -#define CHAR_HEART_SUIT 456 -#define CHAR_DIAMOND_SUIT 457 -#define CHAR_STAR 458 -#define CHAR_CIRCLE_DOT 459 -#define CHAR_CIRCLE 460 -#define CHAR_SQUARE 461 -#define CHAR_TRIANGLE 462 -#define CHAR_DIAMOND 463 -#define CHAR_AT 464 -#define CHAR_MUSIC_NOTE 465 -#define CHAR_PERCENT 466 -#define CHAR_SUN 467 -#define CHAR_TREBLE_CLEF 468 -#define CHAR_UMBRELLA 469 -#define CHAR_SNOWMAN 470 -#define CHAR_SMILEY 471 -#define CHAR_LAUGHING 472 -#define CHAR_ANGUISH 473 -#define CHAR_ANGRY 474 -#define CHAR_UP_ARROW 475 -#define CHAR_DOWN_ARROW 476 -#define CHAR_SNORING 477 -#define CHAR_SPACE 478 -#define CHAR_super_e 479 -#define CHAR_PK 480 -#define CHAR_MN 481 -#define CHAR_NARROW_SPACE 482 -#define CHAR_FILL1PX 483 -#define CHAR_FILL2PX 484 -#define CHAR_FILL4PX 485 -#define CHAR_FILL8PX 486 -#define CHAR_FILL16PX 487 -#define CHAR_DEGREE 488 -#define CHAR_UNDERSCORE 489 -#define CHAR_UNDERSCORE2 490 -#define CHAR_ONE_DOT 491 -#define CHAR_TWO_DOTS 492 - -#define CHAR_LF 0xE000 -#define TRNAMECODE 0xF100 -#define EXT_CTRL_CODE_BEGIN 0xFFFE -#define EOS 0xFFFF // _EOM -#define TRNAME_MASK 0x1FF -#define EOS_TRNAME 0x1FF +#define CHAR_NONE 0 +#define CHAR_JP_SPACE 1 +#define CHAR_JP_HIRA_A_SMALL 2 +#define CHAR_JP_HIRA_A 3 +#define CHAR_JP_HIRA_I_SMALL 4 +#define CHAR_JP_HIRA_I 5 +#define CHAR_JP_HIRA_U_SMALL 6 +#define CHAR_JP_HIRA_U 7 +#define CHAR_JP_HIRA_E_SMALL 8 +#define CHAR_JP_HIRA_E 9 +#define CHAR_JP_HIRA_O_SMALL 10 +#define CHAR_JP_HIRA_O 11 +#define CHAR_JP_HIRA_KA 12 +#define CHAR_JP_HIRA_GA 13 +#define CHAR_JP_HIRA_KI 14 +#define CHAR_JP_HIRA_GI 15 +#define CHAR_JP_HIRA_KU 16 +#define CHAR_JP_HIRA_GU 17 +#define CHAR_JP_HIRA_KE 18 +#define CHAR_JP_HIRA_GE 19 +#define CHAR_JP_HIRA_KO 20 +#define CHAR_JP_HIRA_GO 21 +#define CHAR_JP_HIRA_SA 22 +#define CHAR_JP_HIRA_ZA 23 +#define CHAR_JP_HIRA_SHI 24 +#define CHAR_JP_HIRA_JI 25 +#define CHAR_JP_HIRA_SU 26 +#define CHAR_JP_HIRA_ZU 27 +#define CHAR_JP_HIRA_SE 28 +#define CHAR_JP_HIRA_ZE 29 +#define CHAR_JP_HIRA_SO 30 +#define CHAR_JP_HIRA_ZO 31 +#define CHAR_JP_HIRA_TA 32 +#define CHAR_JP_HIRA_DA 33 +#define CHAR_JP_HIRA_CHI 34 +#define CHAR_JP_HIRA_DJI 35 +#define CHAR_JP_HIRA_SOKUON 36 +#define CHAR_JP_HIRA_TSU 37 +#define CHAR_JP_HIRA_DZU 38 +#define CHAR_JP_HIRA_TE 39 +#define CHAR_JP_HIRA_DE 40 +#define CHAR_JP_HIRA_TO 41 +#define CHAR_JP_HIRA_DO 42 +#define CHAR_JP_HIRA_NA 43 +#define CHAR_JP_HIRA_NI 44 +#define CHAR_JP_HIRA_NU 45 +#define CHAR_JP_HIRA_NE 46 +#define CHAR_JP_HIRA_NO 47 +#define CHAR_JP_HIRA_HA 48 +#define CHAR_JP_HIRA_BA 49 +#define CHAR_JP_HIRA_PA 50 +#define CHAR_JP_HIRA_HI 51 +#define CHAR_JP_HIRA_BI 52 +#define CHAR_JP_HIRA_PI 53 +#define CHAR_JP_HIRA_FU 54 +#define CHAR_JP_HIRA_BU 55 +#define CHAR_JP_HIRA_PU 56 +#define CHAR_JP_HIRA_HE 57 +#define CHAR_JP_HIRA_BE 58 +#define CHAR_JP_HIRA_PE 59 +#define CHAR_JP_HIRA_HO 60 +#define CHAR_JP_HIRA_BO 61 +#define CHAR_JP_HIRA_PO 62 +#define CHAR_JP_HIRA_MA 63 +#define CHAR_JP_HIRA_MI 64 +#define CHAR_JP_HIRA_MU 65 +#define CHAR_JP_HIRA_ME 66 +#define CHAR_JP_HIRA_MO 67 +#define CHAR_JP_HIRA_YA_SMALL 68 +#define CHAR_JP_HIRA_YA 69 +#define CHAR_JP_HIRA_YU_SMALL 70 +#define CHAR_JP_HIRA_YU 71 +#define CHAR_JP_HIRA_YO_SMALL 72 +#define CHAR_JP_HIRA_YO 73 +#define CHAR_JP_HIRA_RA 74 +#define CHAR_JP_HIRA_RI 75 +#define CHAR_JP_HIRA_RU 76 +#define CHAR_JP_HIRA_RE 77 +#define CHAR_JP_HIRA_RO 78 +#define CHAR_JP_HIRA_WA 79 +#define CHAR_JP_HIRA_WO 80 +#define CHAR_JP_HIRA_N 81 +#define CHAR_JP_KATA_A_SMALL 82 +#define CHAR_JP_KATA_A 83 +#define CHAR_JP_KATA_I_SMALL 84 +#define CHAR_JP_KATA_I 85 +#define CHAR_JP_KATA_U_SMALL 86 +#define CHAR_JP_KATA_U 87 +#define CHAR_JP_KATA_E_SMALL 88 +#define CHAR_JP_KATA_E 89 +#define CHAR_JP_KATA_O_SMALL 90 +#define CHAR_JP_KATA_O 91 +#define CHAR_JP_KATA_KA 92 +#define CHAR_JP_KATA_GA 93 +#define CHAR_JP_KATA_KI 94 +#define CHAR_JP_KATA_GI 95 +#define CHAR_JP_KATA_KU 96 +#define CHAR_JP_KATA_GU 97 +#define CHAR_JP_KATA_KE 98 +#define CHAR_JP_KATA_GE 99 +#define CHAR_JP_KATA_KO 100 +#define CHAR_JP_KATA_GO 101 +#define CHAR_JP_KATA_SA 102 +#define CHAR_JP_KATA_ZA 103 +#define CHAR_JP_KATA_SHI 104 +#define CHAR_JP_KATA_JI 105 +#define CHAR_JP_KATA_SU 106 +#define CHAR_JP_KATA_ZU 107 +#define CHAR_JP_KATA_SE 108 +#define CHAR_JP_KATA_ZE 109 +#define CHAR_JP_KATA_SO 110 +#define CHAR_JP_KATA_ZO 111 +#define CHAR_JP_KATA_TA 112 +#define CHAR_JP_KATA_DA 113 +#define CHAR_JP_KATA_CHI 114 +#define CHAR_JP_KATA_DJI 115 +#define CHAR_JP_KATA_SOKUON 116 +#define CHAR_JP_KATA_TSU 117 +#define CHAR_JP_KATA_DZU 118 +#define CHAR_JP_KATA_TE 119 +#define CHAR_JP_KATA_DE 120 +#define CHAR_JP_KATA_TO 121 +#define CHAR_JP_KATA_DO 122 +#define CHAR_JP_KATA_NA 123 +#define CHAR_JP_KATA_NI 124 +#define CHAR_JP_KATA_NU 125 +#define CHAR_JP_KATA_NE 126 +#define CHAR_JP_KATA_NO 127 +#define CHAR_JP_KATA_HA 128 +#define CHAR_JP_KATA_BA 129 +#define CHAR_JP_KATA_PA 130 +#define CHAR_JP_KATA_HI 131 +#define CHAR_JP_KATA_BI 132 +#define CHAR_JP_KATA_PI 133 +#define CHAR_JP_KATA_FU 134 +#define CHAR_JP_KATA_BU 135 +#define CHAR_JP_KATA_PU 136 +#define CHAR_JP_KATA_HE 137 +#define CHAR_JP_KATA_BE 138 +#define CHAR_JP_KATA_PE 139 +#define CHAR_JP_KATA_HO 140 +#define CHAR_JP_KATA_BO 141 +#define CHAR_JP_KATA_PO 142 +#define CHAR_JP_KATA_MA 143 +#define CHAR_JP_KATA_MI 144 +#define CHAR_JP_KATA_MU 145 +#define CHAR_JP_KATA_ME 146 +#define CHAR_JP_KATA_MO 147 +#define CHAR_JP_KATA_YA_SMALL 148 +#define CHAR_JP_KATA_YA 149 +#define CHAR_JP_KATA_YU_SMALL 150 +#define CHAR_JP_KATA_YU 151 +#define CHAR_JP_KATA_YO_SMALL 152 +#define CHAR_JP_KATA_YO 153 +#define CHAR_JP_KATA_RA 154 +#define CHAR_JP_KATA_RI 155 +#define CHAR_JP_KATA_RU 156 +#define CHAR_JP_KATA_RE 157 +#define CHAR_JP_KATA_RO 158 +#define CHAR_JP_KATA_WA 159 +#define CHAR_JP_KATA_WO 160 +#define CHAR_JP_KATA_N 161 +#define CHAR_JP_0 162 +#define CHAR_JP_1 163 +#define CHAR_JP_2 164 +#define CHAR_JP_3 165 +#define CHAR_JP_4 166 +#define CHAR_JP_5 167 +#define CHAR_JP_6 168 +#define CHAR_JP_7 169 +#define CHAR_JP_8 170 +#define CHAR_JP_9 171 +#define CHAR_JP_A 172 +#define CHAR_JP_B 173 +#define CHAR_JP_C 174 +#define CHAR_JP_D 175 +#define CHAR_JP_E 176 +#define CHAR_JP_F 177 +#define CHAR_JP_G 178 +#define CHAR_JP_H 179 +#define CHAR_JP_I 180 +#define CHAR_JP_J 181 +#define CHAR_JP_K 182 +#define CHAR_JP_L 183 +#define CHAR_JP_M 184 +#define CHAR_JP_N 185 +#define CHAR_JP_O 186 +#define CHAR_JP_P 187 +#define CHAR_JP_Q 188 +#define CHAR_JP_R 189 +#define CHAR_JP_S 190 +#define CHAR_JP_T 191 +#define CHAR_JP_U 192 +#define CHAR_JP_V 193 +#define CHAR_JP_W 194 +#define CHAR_JP_X 195 +#define CHAR_JP_Y 196 +#define CHAR_JP_Z 197 +#define CHAR_JP_a 198 +#define CHAR_JP_b 199 +#define CHAR_JP_c 200 +#define CHAR_JP_d 201 +#define CHAR_JP_e 202 +#define CHAR_JP_f 203 +#define CHAR_JP_g 204 +#define CHAR_JP_h 205 +#define CHAR_JP_i 206 +#define CHAR_JP_j 207 +#define CHAR_JP_k 208 +#define CHAR_JP_l 209 +#define CHAR_JP_m 210 +#define CHAR_JP_n 211 +#define CHAR_JP_o 212 +#define CHAR_JP_p 213 +#define CHAR_JP_q 214 +#define CHAR_JP_r 215 +#define CHAR_JP_s 216 +#define CHAR_JP_t 217 +#define CHAR_JP_u 218 +#define CHAR_JP_v 219 +#define CHAR_JP_w 220 +#define CHAR_JP_x 221 +#define CHAR_JP_y 222 +#define CHAR_JP_z 223 +#define CHAR_JP_TRANSPARENT 224 +#define CHAR_JP_EMARK 225 +#define CHAR_JP_QMARK 226 +#define CHAR_JP_COMMA 227 +#define CHAR_JP_FULL_STOP 228 +#define CHAR_JP_ELLIPSIS 229 +#define CHAR_JP_DOT 230 +#define CHAR_JP_SLASH 231 +#define CHAR_JP_SINGLE_QUOTE_OPEN 232 +#define CHAR_JP_SINGLE_QUOTE_CLOSE 233 +#define CHAR_JP_DOUBLE_QUOTE_OPEN 234 +#define CHAR_JP_DOUBLE_QUOTE_CLOSE 235 +#define CHAR_JP_PARENTHESES_OPEN 236 +#define CHAR_JP_PARENTHESES_CLOSE 237 +#define CHAR_JP_MALE 238 +#define CHAR_JP_FEMALE 239 +#define CHAR_JP_PLUS 240 +#define CHAR_JP_MINUS 241 +#define CHAR_JP_MULTIPLY 242 +#define CHAR_JP_DIVIDE 243 +#define CHAR_JP_EQUALS 244 +#define CHAR_JP_TILDE 245 +#define CHAR_JP_HW_COLON 246 +#define CHAR_JP_HW_SEMICOLON 247 +#define CHAR_JP_HW_PERIOD 248 +#define CHAR_JP_HW_COMMA 249 +#define CHAR_JP_SPADE_SUIT 250 +#define CHAR_JP_CLUB_SUIT 251 +#define CHAR_JP_HEART_SUIT 252 +#define CHAR_JP_DIAMOND_SUIT 253 +#define CHAR_JP_STAR 254 +#define CHAR_JP_DOUBLE_CIRCLE 255 +#define CHAR_JP_CIRCLE 256 +#define CHAR_JP_SQUARE 257 +#define CHAR_JP_TRIANGLE 258 +#define CHAR_JP_DIAMOND 259 +#define CHAR_JP_AT_SIGN 260 +#define CHAR_JP_MUSIC_NOTE 261 +#define CHAR_JP_PERCENT 262 +#define CHAR_JP_SUN 263 +#define CHAR_JP_CLOUD 264 +#define CHAR_JP_UMBRELLA 265 +#define CHAR_JP_SNOWMAN 266 +#define CHAR_JP_EMOTE_SMILE 267 +#define CHAR_JP_EMOTE_LAUGH 268 +#define CHAR_JP_EMOTE_UPSET 269 +#define CHAR_JP_EMOTE_FROWN 270 +#define CHAR_JP_ARROW_CURVE_UP 271 +#define CHAR_JP_ARROW_CURVE_DOWN 272 +#define CHAR_JP_ZZZ 273 +#define CHAR_JP_CURRENCY 274 +#define CHAR_POCKET_ICON_ITEMS 275 +#define CHAR_POCKET_ICON_KEY_ITEMS 276 +#define CHAR_POCKET_ICON_TMS_HMS 277 +#define CHAR_POCKET_ICON_MAIL 278 +#define CHAR_POCKET_ICON_MEDICINE 279 +#define CHAR_POCKET_ICON_BERRIES 280 +#define CHAR_POCKET_ICON_POKE_BALLS 281 +#define CHAR_POCKET_ICON_BATTLE_ITEMS 282 +#define CHAR_ARROW_LEFT 283 +#define CHAR_ARROW_UP 284 +#define CHAR_ARROW_DOWN 285 +#define CHAR_ARROW_RIGHT 286 +#define CHAR_ARROW_MENU 287 +#define CHAR_JP_AMPERSAND 288 +#define CHAR_0 289 +#define CHAR_1 290 +#define CHAR_2 291 +#define CHAR_3 292 +#define CHAR_4 293 +#define CHAR_5 294 +#define CHAR_6 295 +#define CHAR_7 296 +#define CHAR_8 297 +#define CHAR_9 298 +#define CHAR_A 299 +#define CHAR_B 300 +#define CHAR_C 301 +#define CHAR_D 302 +#define CHAR_E 303 +#define CHAR_F 304 +#define CHAR_G 305 +#define CHAR_H 306 +#define CHAR_I 307 +#define CHAR_J 308 +#define CHAR_K 309 +#define CHAR_L 310 +#define CHAR_M 311 +#define CHAR_N 312 +#define CHAR_O 313 +#define CHAR_P 314 +#define CHAR_Q 315 +#define CHAR_R 316 +#define CHAR_S 317 +#define CHAR_T 318 +#define CHAR_U 319 +#define CHAR_V 320 +#define CHAR_W 321 +#define CHAR_X 322 +#define CHAR_Y 323 +#define CHAR_Z 324 +#define CHAR_a 325 +#define CHAR_b 326 +#define CHAR_c 327 +#define CHAR_d 328 +#define CHAR_e 329 +#define CHAR_f 330 +#define CHAR_g 331 +#define CHAR_h 332 +#define CHAR_i 333 +#define CHAR_j 334 +#define CHAR_k 335 +#define CHAR_l 336 +#define CHAR_m 337 +#define CHAR_n 338 +#define CHAR_o 339 +#define CHAR_p 340 +#define CHAR_q 341 +#define CHAR_r 342 +#define CHAR_s 343 +#define CHAR_t 344 +#define CHAR_u 345 +#define CHAR_v 346 +#define CHAR_w 347 +#define CHAR_x 348 +#define CHAR_y 349 +#define CHAR_z 350 +#define CHAR_A_GRAVE 351 +#define CHAR_A_ACUTE 352 +#define CHAR_A_CIRCUMFLEX 353 +#define CHAR_A_TILDE 354 +#define CHAR_A_DIERESIS 355 +#define CHAR_A_OVERDOT 356 +#define CHAR_AE 357 +#define CHAR_C_CEDILLA 358 +#define CHAR_E_GRAVE 359 +#define CHAR_E_ACUTE 360 +#define CHAR_E_CIRCUMFLEX 361 +#define CHAR_E_DIERESIS 362 +#define CHAR_I_GRAVE 363 +#define CHAR_I_ACUTE 364 +#define CHAR_I_CIRCUMFLEX 365 +#define CHAR_I_DIERESIS 366 +#define CHAR_ETH 367 +#define CHAR_N_TILDE 368 +#define CHAR_O_GRAVE 369 +#define CHAR_O_ACUTE 370 +#define CHAR_O_CIRCUMFLEX 371 +#define CHAR_O_TILDE 372 +#define CHAR_O_DIERESIS 373 +#define CHAR_MULTIPLY 374 +#define CHAR_O_SLASH 375 +#define CHAR_U_GRAVE 376 +#define CHAR_U_ACUTE 377 +#define CHAR_U_CIRCUMFLEX 378 +#define CHAR_U_DIERESIS 379 +#define CHAR_Y_ACUTE 380 +#define CHAR_THORN 381 +#define CHAR_ESZETT 382 +#define CHAR_a_GRAVE 383 +#define CHAR_a_ACUTE 384 +#define CHAR_a_CIRCUMFLEX 385 +#define CHAR_a_TILDE 386 +#define CHAR_a_DIERESIS 387 +#define CHAR_a_OVERDOT 388 +#define CHAR_ae 389 +#define CHAR_c_CEDILLA 390 +#define CHAR_e_GRAVE 391 +#define CHAR_e_ACUTE 392 +#define CHAR_e_CIRCUMFLEX 393 +#define CHAR_e_DIERESIS 394 +#define CHAR_i_GRAVE 395 +#define CHAR_i_ACUTE 396 +#define CHAR_i_CIRCUMFLEX 397 +#define CHAR_i_DIERESIS 398 +#define CHAR_eth 399 +#define CHAR_n_TILDE 400 +#define CHAR_o_GRAVE 401 +#define CHAR_o_ACUTE 402 +#define CHAR_o_CIRCUMFLEX 403 +#define CHAR_o_TILDE 404 +#define CHAR_o_DIERESIS 405 +#define CHAR_DIVIDE 406 +#define CHAR_o_SLASH 407 +#define CHAR_u_GRAVE 408 +#define CHAR_u_ACUTE 409 +#define CHAR_u_CIRCUMFLEX 410 +#define CHAR_u_DIERESIS 411 +#define CHAR_y_ACUTE 412 +#define CHAR_thorn 413 +#define CHAR_y_DIERESIS 414 +#define CHAR_OE 415 +#define CHAR_oe 416 +#define CHAR_S_CEDILLA 417 +#define CHAR_s_CEDILLA 418 +#define CHAR_a_SUPER 419 +#define CHAR_o_SUPER 420 +#define CHAR_er_SUPER 421 +#define CHAR_re_SUPER 422 +#define CHAR_r_SUPER 423 +#define CHAR_CURRENCY 424 // "Poké Dollar" symbol in international versions +#define CHAR_EMARK_INVERTED 425 +#define CHAR_QMARK_INVERTED 426 +#define CHAR_EMARK 427 +#define CHAR_QMARK 428 +#define CHAR_COMMA 429 +#define CHAR_PERIOD 430 +#define CHAR_ELLIPSIS 431 +#define CHAR_DOT 432 +#define CHAR_SLASH 433 +#define CHAR_SINGLE_QUOTE_OPEN 434 // left single quote +#define CHAR_SINGLE_QUOTE_CLOSE 435 // right single quote (apostrophe) +#define CHAR_DOUBLE_QUOTE_OPEN 436 // left double quote +#define CHAR_DOUBLE_QUOTE_CLOSE 437 // right double quote +#define CHAR_DOUBLE_QUOTE_CLOSE_LOW 438 +#define CHAR_ANGLE_QUOTE_OPEN 439 +#define CHAR_ANGLE_QUOTE_CLOSE 440 +#define CHAR_PARENTHESES_OPEN 441 +#define CHAR_PARENTHESES_CLOSE 442 +#define CHAR_MALE 443 +#define CHAR_FEMALE 444 +#define CHAR_PLUS 445 +#define CHAR_MINUS 446 +#define CHAR_ASTERISK 447 +#define CHAR_HASH 448 +#define CHAR_EQUALS 449 +#define CHAR_AMPERSAND 450 +#define CHAR_TILDE 451 +#define CHAR_COLON 452 +#define CHAR_SEMICOLON 453 +#define CHAR_SPADE_SUIT 454 +#define CHAR_CLUB_SUIT 455 +#define CHAR_HEART_SUIT 456 +#define CHAR_DIAMOND_SUIT 457 +#define CHAR_STAR 458 +#define CHAR_DOUBLE_CIRCLE 459 +#define CHAR_CIRCLE 460 +#define CHAR_SQUARE 461 +#define CHAR_TRIANGLE 462 +#define CHAR_DIAMOND 463 +#define CHAR_AT_SIGN 464 +#define CHAR_MUSIC_NOTE 465 +#define CHAR_PERCENT 466 +#define CHAR_SUN 467 +#define CHAR_CLOUD 468 +#define CHAR_UMBRELLA 469 +#define CHAR_SNOWMAN 470 +#define CHAR_EMOTE_SMILE 471 +#define CHAR_EMOTE_LAUGH 472 +#define CHAR_EMOTE_UPSET 473 +#define CHAR_EMOTE_FROWN 474 +#define CHAR_ARROW_CURVE_UP 475 +#define CHAR_ARROW_CURVE_DOWN 476 +#define CHAR_ZZZ 477 +#define CHAR_SPACE 478 +#define CHAR_e_SUPER 479 +#define CHAR_PK 480 +#define CHAR_MN 481 +#define CHAR_NUM_SPACE 482 +#define CHAR_FILL_1PX 483 +#define CHAR_FILL_2PX 484 +#define CHAR_FILL_4PX 485 +#define CHAR_FILL_8PX 486 +#define CHAR_FILL_16PX 487 +#define CHAR_DEGREE 488 +#define CHAR_UNDERSCORE 489 +#define CHAR_UNDERSCORE_WIDE 490 +#define CHAR_ONE_DOT 491 +#define CHAR_TWO_DOTS 492 +#define CHAR_LINE_BREAK 0xE000 +#define CHAR_COMPRESSED_MARK 0xF100 +#define CHAR_CONTROL_CODE_ARG 0xFFFE +#define CHAR_EOS 0xFFFF // _EOM +#define TRNAME_MASK 0x1FF +#define EOS_TRNAME 0x1FF #endif // POKEHEARTGOLD_CONSTANTS_CHARCODE_H diff --git a/include/constants/global.h b/include/constants/global.h index b674c75b4a..e40d055a71 100644 --- a/include/constants/global.h +++ b/include/constants/global.h @@ -1,7 +1,6 @@ #ifndef POKEHEARTGOLD_CONSTANTS_GLOBAL_H #define POKEHEARTGOLD_CONSTANTS_GLOBAL_H -#include "constants/charcode.h" #include "constants/global_fieldmap.h" #include "constants/gx.h" #include "constants/sdk_extras.h" diff --git a/src/ascii_util.c b/src/ascii_util.c index 780159f955..17e50af63f 100644 --- a/src/ascii_util.c +++ b/src/ascii_util.c @@ -2,6 +2,8 @@ #include "global.h" +#include "constants/charcode.h" + s32 Ascii_StrLen(const s8 *str) { s32 i = 0; while (str[i] != 0) { diff --git a/src/daycare.c b/src/daycare.c index 9860db3573..2ba6c7005e 100644 --- a/src/daycare.c +++ b/src/daycare.c @@ -85,8 +85,8 @@ void DaycareMon_Extras_Init(DaycareMail *mail) { mail->nickname[i] = 0; } - mail->ot_name[0] = EOS; - mail->nickname[0] = EOS; + mail->ot_name[0] = CHAR_EOS; + mail->nickname[0] = CHAR_EOS; } void DaycareMon_Init(DaycareMon *mon) { diff --git a/src/font_data.c b/src/font_data.c index 232818fe81..cd8989ccea 100644 --- a/src/font_data.c +++ b/src/font_data.c @@ -210,10 +210,10 @@ static void DecompressGlyphTiles_LazyFromNarc(struct FontData *fontData, u16 gly u32 GetStringWidth(struct FontData *fontData, const u16 *string, u32 letterSpacing) { u32 ret = 0; - while (*string != EOS) { - if (*string == EXT_CTRL_CODE_BEGIN) { + while (*string != CHAR_EOS) { + if (*string == CHAR_CONTROL_CODE_ARG) { string = MsgArray_SkipControlCode(string); - if (*string != EOS) { + if (*string != CHAR_EOS) { continue; } break; @@ -228,10 +228,10 @@ u32 GetStringWidth(struct FontData *fontData, const u16 *string, u32 letterSpaci u32 GetStringWidthFirstLine(struct FontData *fontData, const u16 *string, u32 letterSpacing) { u32 ret = 0; - while (*string != EOS && *string != CHAR_LF) { - if (*string == EXT_CTRL_CODE_BEGIN) { + while (*string != CHAR_EOS && *string != CHAR_LINE_BREAK) { + if (*string == CHAR_CONTROL_CODE_ARG) { string = MsgArray_SkipControlCode(string); - if (*string != EOS && *string != CHAR_LF) { + if (*string != CHAR_EOS && *string != CHAR_LINE_BREAK) { continue; } break; @@ -244,10 +244,10 @@ u32 GetStringWidthFirstLine(struct FontData *fontData, const u16 *string, u32 le } BOOL StringAllCharsValid(struct FontData *fontData, const u16 *string) { - while (*string != EOS) { - if (*string == EXT_CTRL_CODE_BEGIN) { + while (*string != CHAR_EOS) { + if (*string == CHAR_CONTROL_CODE_ARG) { string = MsgArray_SkipControlCode(string); - if (*string == EOS) { + if (*string == CHAR_EOS) { return TRUE; } // bug: if multiple ext ctrl codes in tandem, @@ -276,10 +276,10 @@ static u32 GetGlyphWidth_FixedWidth(struct FontData *fontData, int glyphId) { u32 GetStringWidthMultiline(struct FontData *fontData, const u16 *string, u32 letterSpacing) { u32 cur = 0, ret = 0; - while (*string != EOS) { - if (*string == EXT_CTRL_CODE_BEGIN) { + while (*string != CHAR_EOS) { + if (*string == CHAR_CONTROL_CODE_ARG) { string = MsgArray_SkipControlCode(string); - } else if (*string == CHAR_LF) { + } else if (*string == CHAR_LINE_BREAK) { if (ret < cur - letterSpacing) { ret = cur - letterSpacing; } diff --git a/src/hall_of_fame.c b/src/hall_of_fame.c index 63e6c009c4..08702f33fb 100644 --- a/src/hall_of_fame.c +++ b/src/hall_of_fame.c @@ -55,8 +55,8 @@ void Save_HOF_RecordParty(HallOfFame *hof, Party *party, RTCDate *date) { GetMonData(mon, MON_DATA_OT_NAME_STRING, string); CopyStringToU16Array(string, team->party[j].otname, PLAYER_NAME_LENGTH + 1); } else { - team->party[j].nickname[0] = EOS; - team->party[j].otname[0] = EOS; + team->party[j].nickname[0] = CHAR_EOS; + team->party[j].otname[0] = CHAR_EOS; } j++; } diff --git a/src/link_ruleset_data.c b/src/link_ruleset_data.c index c9c163e930..69b5287ce8 100644 --- a/src/link_ruleset_data.c +++ b/src/link_ruleset_data.c @@ -23,7 +23,7 @@ static u8 sRulesetIndexes[] = { }; static LinkBattleRuleset sDefaultRuleset = { - .name = { EOS }, + .name = { CHAR_EOS }, .totalLevel = 0, .partyCount = 6, .maxLevel = 100, @@ -38,7 +38,7 @@ static LinkBattleRuleset sDefaultRuleset = { static LinkBattleRuleset sAlternateRulesets[] = { [STD_RULESET_STANDARD] = { - .name = { EOS }, + .name = { CHAR_EOS }, .totalLevel = 0, .partyCount = 3, .maxLevel = 50, @@ -51,7 +51,7 @@ static LinkBattleRuleset sAlternateRulesets[] = { .dragonRageClause = FALSE, }, [STD_RULESET_FANCY] = { - .name = { EOS }, + .name = { CHAR_EOS }, .totalLevel = 80, .partyCount = 3, .maxLevel = 30, @@ -64,7 +64,7 @@ static LinkBattleRuleset sAlternateRulesets[] = { .dragonRageClause = FALSE, }, [STD_RULESET_LITTLE] = { - .name = { EOS }, + .name = { CHAR_EOS }, .totalLevel = 0, .partyCount = 3, .maxLevel = 5, @@ -77,7 +77,7 @@ static LinkBattleRuleset sAlternateRulesets[] = { .dragonRageClause = TRUE, }, [STD_RULESET_LIGHT] = { - .name = { EOS }, + .name = { CHAR_EOS }, .totalLevel = 0, .partyCount = 3, .maxLevel = 50, @@ -90,7 +90,7 @@ static LinkBattleRuleset sAlternateRulesets[] = { .dragonRageClause = FALSE, }, [STD_RULESET_DOUBLE] = { - .name = { EOS }, + .name = { CHAR_EOS }, .totalLevel = 0, .partyCount = 4, .maxLevel = 50, @@ -103,7 +103,7 @@ static LinkBattleRuleset sAlternateRulesets[] = { .dragonRageClause = FALSE, }, [STD_RULESET_STANDARD_2] = { - .name = { EOS }, + .name = { CHAR_EOS }, .totalLevel = 0, .partyCount = 3, .maxLevel = 100, @@ -116,7 +116,7 @@ static LinkBattleRuleset sAlternateRulesets[] = { .dragonRageClause = FALSE, }, [STD_RULESET_LIGHT_2] = { - .name = { EOS }, + .name = { CHAR_EOS }, .totalLevel = 0, .partyCount = 3, .maxLevel = 100, @@ -129,7 +129,7 @@ static LinkBattleRuleset sAlternateRulesets[] = { .dragonRageClause = FALSE, }, [STD_RULESET_DOUBLE_2] = { - .name = { EOS }, + .name = { CHAR_EOS }, .totalLevel = 0, .partyCount = 4, .maxLevel = 100, @@ -142,7 +142,7 @@ static LinkBattleRuleset sAlternateRulesets[] = { .dragonRageClause = FALSE, }, [STD_RULESET_DOUBLE_3] = { - .name = { EOS }, + .name = { CHAR_EOS }, .totalLevel = 0, .partyCount = 4, .maxLevel = 200, @@ -155,7 +155,7 @@ static LinkBattleRuleset sAlternateRulesets[] = { .dragonRageClause = FALSE, }, [STD_RULESET_GS] = { - .name = { EOS }, + .name = { CHAR_EOS }, .totalLevel = 0 | FLAG_RULESET_BAN_SOUL_DEW, .partyCount = 4, .maxLevel = 100, diff --git a/src/mail_message.c b/src/mail_message.c index 04546ead53..962f7ace23 100644 --- a/src/mail_message.c +++ b/src/mail_message.c @@ -113,8 +113,8 @@ u32 MailMsg_NumFields(u16 msg_bank, u16 msg_no) { msg = ReadMsgData_NewNarc_NewString(NARC_msgdata_msg, sMessageBanks[msg_bank], msg_no, HEAP_ID_DEFAULT); msg_cstr = String_cstr(msg); ret = 0; - while (*msg_cstr != EOS) { - if (*msg_cstr == EXT_CTRL_CODE_BEGIN) { + while (*msg_cstr != CHAR_EOS) { + if (*msg_cstr == CHAR_CONTROL_CODE_ARG) { if (MsgArray_ControlCodeIsStrVar(msg_cstr)) { ret++; } diff --git a/src/message_format.c b/src/message_format.c index 5de7385197..bcbb70dd27 100644 --- a/src/message_format.c +++ b/src/message_format.c @@ -658,8 +658,8 @@ void BufferDeptStoreFloorNo(MessageFormat *msgFmt, u32 fieldno, u32 floor) { void StringExpandPlaceholders(MessageFormat *msgFmt, String *dest, String *src) { const u16 *cstr = String_cstr(src); String_SetEmpty(dest); - while (*cstr != EOS) { - if (*cstr == EXT_CTRL_CODE_BEGIN) { + while (*cstr != CHAR_EOS) { + if (*cstr == CHAR_CONTROL_CODE_ARG) { if (MsgArray_ControlCodeIsStrVar(cstr)) { u32 idx = MsgArray_ControlCodeGetField(cstr, 0); GF_ASSERT(idx < msgFmt->count); diff --git a/src/message_printer.c b/src/message_printer.c index c6606f2b2a..51c44d155d 100644 --- a/src/message_printer.c +++ b/src/message_printer.c @@ -2,6 +2,8 @@ #include "global.h" +#include "constants/charcode.h" + #include "filesystem_files_def.h" #include "gf_gfx_loader.h" @@ -73,7 +75,7 @@ void sub_0200CDAC(MessagePrinter *messagePrinter, u8 glyphId, Window *window, u3 void PrintUIntOnWindow(MessagePrinter *messagePrinter, u32 num, u32 ndigits, PrintingMode mode, Window *window, u32 x, u32 y) { ConvertUIntToDecimalString(messagePrinter->string, num, mode, ndigits); u32 i; - for (i = 0; messagePrinter->string[i] != EOS; i++) { + for (i = 0; messagePrinter->string[i] != CHAR_EOS; i++) { if (messagePrinter->string[i] >= CHAR_JP_0 && messagePrinter->string[i] <= CHAR_JP_9) { BlitBitmapRectToWindow(window, messagePrinter->ppCharData->pRawData + (messagePrinter->string[i] - CHAR_JP_0) * 32, 0, 0, 8, 8, x, y, 8, 8); } else { diff --git a/src/naming_screen.c b/src/naming_screen.c index 19586db135..ef88110d1f 100644 --- a/src/naming_screen.c +++ b/src/naming_screen.c @@ -251,51 +251,51 @@ static const u8 sHomeRowCursorAnimIDs[] = { 0x29, // OK }; -static const u16 sKeyboardRow_Upper_1[] = { CHAR_A, CHAR_B, CHAR_C, CHAR_D, CHAR_E, CHAR_F, CHAR_G, CHAR_H, CHAR_I, CHAR_J, CHAR_SPACE, CHAR_COMMA, CHAR_PERIOD, EOS }; +static const u16 sKeyboardRow_Upper_1[] = { CHAR_A, CHAR_B, CHAR_C, CHAR_D, CHAR_E, CHAR_F, CHAR_G, CHAR_H, CHAR_I, CHAR_J, CHAR_SPACE, CHAR_COMMA, CHAR_PERIOD, CHAR_EOS }; -static const u16 sKeyboardRow_Upper_2[] = { CHAR_K, CHAR_L, CHAR_M, CHAR_N, CHAR_O, CHAR_P, CHAR_Q, CHAR_R, CHAR_S, CHAR_T, CHAR_SPACE, CHAR_RAPOST, CHAR_HYPHEN, EOS }; +static const u16 sKeyboardRow_Upper_2[] = { CHAR_K, CHAR_L, CHAR_M, CHAR_N, CHAR_O, CHAR_P, CHAR_Q, CHAR_R, CHAR_S, CHAR_T, CHAR_SPACE, CHAR_SINGLE_QUOTE_CLOSE, CHAR_MINUS, CHAR_EOS }; -static const u16 sKeyboardRow_Upper_3[] = { CHAR_U, CHAR_V, CHAR_W, CHAR_X, CHAR_Y, CHAR_Z, CHAR_SPACE, CHAR_SPACE, CHAR_SPACE, CHAR_SPACE, CHAR_SPACE, CHAR_MALE, CHAR_FEMALE, EOS }; +static const u16 sKeyboardRow_Upper_3[] = { CHAR_U, CHAR_V, CHAR_W, CHAR_X, CHAR_Y, CHAR_Z, CHAR_SPACE, CHAR_SPACE, CHAR_SPACE, CHAR_SPACE, CHAR_SPACE, CHAR_MALE, CHAR_FEMALE, CHAR_EOS }; -static const u16 sKeyboardRow_Upper_4[] = { CHAR_SPACE, CHAR_SPACE, CHAR_SPACE, CHAR_SPACE, CHAR_SPACE, CHAR_SPACE, CHAR_SPACE, CHAR_SPACE, CHAR_SPACE, CHAR_SPACE, CHAR_SPACE, CHAR_SPACE, CHAR_SPACE, EOS }; +static const u16 sKeyboardRow_Upper_4[] = { CHAR_SPACE, CHAR_SPACE, CHAR_SPACE, CHAR_SPACE, CHAR_SPACE, CHAR_SPACE, CHAR_SPACE, CHAR_SPACE, CHAR_SPACE, CHAR_SPACE, CHAR_SPACE, CHAR_SPACE, CHAR_SPACE, CHAR_EOS }; -static const u16 sKeyboardRow_Upper_5[] = { CHAR_0, CHAR_1, CHAR_2, CHAR_3, CHAR_4, CHAR_5, CHAR_6, CHAR_7, CHAR_8, CHAR_9, CHAR_SPACE, CHAR_SPACE, CHAR_SPACE, EOS }; +static const u16 sKeyboardRow_Upper_5[] = { CHAR_0, CHAR_1, CHAR_2, CHAR_3, CHAR_4, CHAR_5, CHAR_6, CHAR_7, CHAR_8, CHAR_9, CHAR_SPACE, CHAR_SPACE, CHAR_SPACE, CHAR_EOS }; -static const u16 sKeyboardRow_Lower_1[] = { CHAR_a, CHAR_b, CHAR_c, CHAR_d, CHAR_e, CHAR_f, CHAR_g, CHAR_h, CHAR_i, CHAR_j, CHAR_SPACE, CHAR_COMMA, CHAR_PERIOD, EOS }; +static const u16 sKeyboardRow_Lower_1[] = { CHAR_a, CHAR_b, CHAR_c, CHAR_d, CHAR_e, CHAR_f, CHAR_g, CHAR_h, CHAR_i, CHAR_j, CHAR_SPACE, CHAR_COMMA, CHAR_PERIOD, CHAR_EOS }; -static const u16 sKeyboardRow_Lower_2[] = { CHAR_k, CHAR_l, CHAR_m, CHAR_n, CHAR_o, CHAR_p, CHAR_q, CHAR_r, CHAR_s, CHAR_t, CHAR_SPACE, CHAR_RAPOST, CHAR_HYPHEN, EOS }; +static const u16 sKeyboardRow_Lower_2[] = { CHAR_k, CHAR_l, CHAR_m, CHAR_n, CHAR_o, CHAR_p, CHAR_q, CHAR_r, CHAR_s, CHAR_t, CHAR_SPACE, CHAR_SINGLE_QUOTE_CLOSE, CHAR_MINUS, CHAR_EOS }; -static const u16 sKeyboardRow_Lower_3[] = { CHAR_u, CHAR_v, CHAR_w, CHAR_x, CHAR_y, CHAR_z, CHAR_SPACE, CHAR_SPACE, CHAR_SPACE, CHAR_SPACE, CHAR_SPACE, CHAR_MALE, CHAR_FEMALE, EOS }; +static const u16 sKeyboardRow_Lower_3[] = { CHAR_u, CHAR_v, CHAR_w, CHAR_x, CHAR_y, CHAR_z, CHAR_SPACE, CHAR_SPACE, CHAR_SPACE, CHAR_SPACE, CHAR_SPACE, CHAR_MALE, CHAR_FEMALE, CHAR_EOS }; -static const u16 sKeyboardRow_Lower_4[] = { CHAR_SPACE, CHAR_SPACE, CHAR_SPACE, CHAR_SPACE, CHAR_SPACE, CHAR_SPACE, CHAR_SPACE, CHAR_SPACE, CHAR_SPACE, CHAR_SPACE, CHAR_SPACE, CHAR_SPACE, CHAR_SPACE, EOS }; +static const u16 sKeyboardRow_Lower_4[] = { CHAR_SPACE, CHAR_SPACE, CHAR_SPACE, CHAR_SPACE, CHAR_SPACE, CHAR_SPACE, CHAR_SPACE, CHAR_SPACE, CHAR_SPACE, CHAR_SPACE, CHAR_SPACE, CHAR_SPACE, CHAR_SPACE, CHAR_EOS }; -static const u16 sKeyboardRow_Lower_5[] = { CHAR_0, CHAR_1, CHAR_2, CHAR_3, CHAR_4, CHAR_5, CHAR_6, CHAR_7, CHAR_8, CHAR_9, CHAR_SPACE, CHAR_SPACE, CHAR_SPACE, EOS }; +static const u16 sKeyboardRow_Lower_5[] = { CHAR_0, CHAR_1, CHAR_2, CHAR_3, CHAR_4, CHAR_5, CHAR_6, CHAR_7, CHAR_8, CHAR_9, CHAR_SPACE, CHAR_SPACE, CHAR_SPACE, CHAR_EOS }; -static const u16 sKeyboardRow_Symbols_1[] = { CHAR_COMMA, CHAR_PERIOD, CHAR_COLON, CHAR_SEMICOLON, CHAR_EXCL, CHAR_QMARK, CHAR_SPACE, CHAR_SPACE, CHAR_SPACE, CHAR_MALE, CHAR_FEMALE, CHAR_SPACE, CHAR_SPACE, EOS }; +static const u16 sKeyboardRow_Symbols_1[] = { CHAR_COMMA, CHAR_PERIOD, CHAR_COLON, CHAR_SEMICOLON, CHAR_EMARK, CHAR_QMARK, CHAR_SPACE, CHAR_SPACE, CHAR_SPACE, CHAR_MALE, CHAR_FEMALE, CHAR_SPACE, CHAR_SPACE, CHAR_EOS }; -static const u16 sKeyboardRow_Symbols_2[] = { CHAR_LDQUOT, CHAR_RDQUOT, CHAR_LAPOST, CHAR_RAPOST, CHAR_LPAREN, CHAR_RPAREN, CHAR_SPACE, CHAR_SPACE, CHAR_SPACE, CHAR_SPACE, CHAR_SPACE, CHAR_SPACE, CHAR_SPACE, EOS }; +static const u16 sKeyboardRow_Symbols_2[] = { CHAR_DOUBLE_QUOTE_OPEN, CHAR_DOUBLE_QUOTE_CLOSE, CHAR_SINGLE_QUOTE_OPEN, CHAR_SINGLE_QUOTE_CLOSE, CHAR_PARENTHESES_OPEN, CHAR_PARENTHESES_CLOSE, CHAR_SPACE, CHAR_SPACE, CHAR_SPACE, CHAR_SPACE, CHAR_SPACE, CHAR_SPACE, CHAR_SPACE, CHAR_EOS }; -static const u16 sKeyboardRow_Symbols_3[] = { CHAR_ELLIPSIS, CHAR_CTRDOT, CHAR_TILDE, CHAR_AT, CHAR_HASH, CHAR_PERCENT, CHAR_PLUS, CHAR_HYPHEN, CHAR_ASTERISK, CHAR_SLASH, CHAR_EQUALS, CHAR_SPACE, CHAR_SPACE, EOS }; +static const u16 sKeyboardRow_Symbols_3[] = { CHAR_ELLIPSIS, CHAR_DOT, CHAR_TILDE, CHAR_AT_SIGN, CHAR_HASH, CHAR_PERCENT, CHAR_PLUS, CHAR_MINUS, CHAR_ASTERISK, CHAR_SLASH, CHAR_EQUALS, CHAR_SPACE, CHAR_SPACE, CHAR_EOS }; -static const u16 sKeyboardRow_Symbols_4[] = { CHAR_CIRCLE_DOT, CHAR_CIRCLE, CHAR_SQUARE, CHAR_TRIANGLE, CHAR_DIAMOND, CHAR_SPADE_SUIT, CHAR_HEART_SUIT, CHAR_DIAMOND_SUIT, CHAR_CLUB_SUIT, CHAR_STAR, CHAR_MUSIC_NOTE, CHAR_SPACE, CHAR_SPACE, EOS }; +static const u16 sKeyboardRow_Symbols_4[] = { CHAR_DOUBLE_CIRCLE, CHAR_CIRCLE, CHAR_SQUARE, CHAR_TRIANGLE, CHAR_DIAMOND, CHAR_SPADE_SUIT, CHAR_HEART_SUIT, CHAR_DIAMOND_SUIT, CHAR_CLUB_SUIT, CHAR_STAR, CHAR_MUSIC_NOTE, CHAR_SPACE, CHAR_SPACE, CHAR_EOS }; -static const u16 sKeyboardRow_Symbols_5[] = { CHAR_SUN, CHAR_TREBLE_CLEF, CHAR_UMBRELLA, CHAR_SNOWMAN, CHAR_SMILEY, CHAR_LAUGHING, CHAR_ANGUISH, CHAR_ANGRY, CHAR_SNORING, CHAR_UP_ARROW, CHAR_DOWN_ARROW, CHAR_SPACE, CHAR_SPACE, EOS }; +static const u16 sKeyboardRow_Symbols_5[] = { CHAR_SUN, CHAR_CLOUD, CHAR_UMBRELLA, CHAR_SNOWMAN, CHAR_EMOTE_SMILE, CHAR_EMOTE_LAUGH, CHAR_EMOTE_UPSET, CHAR_EMOTE_FROWN, CHAR_ZZZ, CHAR_ARROW_CURVE_UP, CHAR_ARROW_CURVE_DOWN, CHAR_SPACE, CHAR_SPACE, CHAR_EOS }; -static const u16 sKeyboardRow_JPMisc_1[] = { 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_EXCLAM_MARK, CHAR_JP_QUESTION_MARK, EOS }; +static const u16 sKeyboardRow_JPMisc_1[] = { 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 u16 sKeyboardRow_JPMisc_2[] = { CHAR_JP_COMMA, CHAR_JP_FULLSTOP, CHAR_JP_HW_COMMA, CHAR_JP_HW_PERIOD, CHAR_JP_ELLIPSIS, CHAR_JP_CENTER_DOT, CHAR_JP_TILDE, CHAR_JP_HW_COLON, CHAR_JP_HW_SEMICOLON, CHAR_JP_SLASH, CHAR_JP_SPACE, CHAR_JP_OTOKO, CHAR_JP_ONNA, EOS }; +static const u16 sKeyboardRow_JPMisc_2[] = { CHAR_JP_COMMA, CHAR_JP_FULL_STOP, CHAR_JP_HW_COMMA, CHAR_JP_HW_PERIOD, CHAR_JP_ELLIPSIS, CHAR_JP_DOT, 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 }; -static const u16 sKeyboardRow_JPMisc_3[] = { CHAR_JP_OPEN_QUOT, CHAR_JP_CLOSE_QUOT, CHAR_JP_OPEN_DQUOT, CHAR_JP_CLOSE_DQUOT, CHAR_JP_OPEN_PAREN, CHAR_JP_CLOSE_PAREN, CHAR_JP_PLUS, CHAR_JP_HYPHEN, CHAR_JP_MULT, CHAR_JP_DIV, CHAR_JP_EQUAL, CHAR_JP_PERCENT, CHAR_JP_AT, EOS }; +static const u16 sKeyboardRow_JPMisc_3[] = { CHAR_JP_SINGLE_QUOTE_OPEN, CHAR_JP_SINGLE_QUOTE_CLOSE, CHAR_JP_DOUBLE_QUOTE_OPEN, CHAR_JP_DOUBLE_QUOTE_CLOSE, 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 u16 sKeyboardRow_JPMisc_4[] = { CHAR_JP_CIRCLE_DOT, 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, EOS }; +static const u16 sKeyboardRow_JPMisc_4[] = { 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 u16 sKeyboardRow_JPMisc_5[] = { CHAR_JP_SUN, CHAR_JP_TREBLE_CLEF, CHAR_JP_UMBRELLA, CHAR_JP_SNOWMAN, CHAR_JP_SMILEY, CHAR_JP_LAUGHING, CHAR_JP_ANGUISH, CHAR_JP_ANGRY, CHAR_JP_SNORING, CHAR_JP_UP_ARROW, CHAR_JP_DOWN_ARROW, CHAR_JP_SPACE, CHAR_JP_SPACE, EOS }; +static const u16 sKeyboardRow_JPMisc_5[] = { 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 }; -static const u16 sKeyboardRow_Numpad_1[] = { CHAR_0, CHAR_1, CHAR_2, CHAR_3, CHAR_4, 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, EOS }; +static const u16 sKeyboardRow_Numpad_1[] = { CHAR_0, CHAR_1, CHAR_2, CHAR_3, CHAR_4, 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 u16 sKeyboardRow_Numpad_2[] = { CHAR_5, CHAR_6, CHAR_7, CHAR_8, CHAR_9, 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, EOS }; +static const u16 sKeyboardRow_Numpad_2[] = { CHAR_5, CHAR_6, CHAR_7, CHAR_8, CHAR_9, 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 u16 sKeyboardRow_Numpad_345[] = { 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, EOS }; +static const u16 sKeyboardRow_Numpad_345[] = { 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 }; static const u16 *sKeyboardLayoutPtrs[][5] = { { sKeyboardRow_Upper_1, sKeyboardRow_Upper_2, sKeyboardRow_Upper_3, sKeyboardRow_Upper_4, sKeyboardRow_Upper_5 }, @@ -307,88 +307,88 @@ static const u16 *sKeyboardLayoutPtrs[][5] = { // These arrays are used to convert Japanese characters in response to pressing R. static const u16 sJpCharConvTable[][3] = { - { 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_TU, CHAR_JP_HIRA_DU, CHAR_JP_HIRA_TU_SMALL }, - { CHAR_JP_KATA_TU, CHAR_JP_KATA_DU, CHAR_JP_KATA_TU_SMALL }, - { 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_SI, CHAR_JP_HIRA_ZI, 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_TI, CHAR_JP_HIRA_DI, 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_SI, CHAR_JP_KATA_ZI, 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_TI, CHAR_JP_KATA_DI, 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_HU, 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_HU, 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_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 }, }; #define CHARCONVTBL_ALPHA_BEGIN 0 @@ -396,18 +396,18 @@ static const u16 sJpCharConvTable[][3] = { #define CHARCONVTBL_HANDAKU_BEGIN 72 static const u16 sDakutenTable[][2] = { - { CHAR_JP_HIRA_TU_SMALL, CHAR_JP_HIRA_DU }, - { CHAR_JP_KATA_TU_SMALL, CHAR_JP_KATA_DU }, - { 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 }, + { 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 u16 sHandakutenTable[][2] = { @@ -439,11 +439,11 @@ static const u8 sKeyboardFrameColors[] = { // These were intended for the Japanese build, but their purpose was replaced with GMM. // The arrays still appear in the final English ROM. -const u16 sPrompt_YourName[] = { 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_QUESTION_MARK, EOS }; +const u16 sPrompt_YourName[] = { 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 u16 sPrompt_PokemonsNickname[] = { 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_TU_SMALL, CHAR_JP_KATA_KU, CHAR_JP_KATA_NE, CHAR_JP_HYPHEN, CHAR_JP_KATA_MU, CHAR_JP_HIRA_HA, CHAR_JP_QUESTION_MARK, EOS }; +const u16 sPrompt_PokemonsNickname[] = { 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 u16 sPrompt_BoxName[] = { CHAR_JP_KATA_BO, CHAR_JP_KATA_TU_SMALL, 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_QUESTION_MARK, EOS }; +const u16 sPrompt_BoxName[] = { 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 }; // Required to force the above three arrays to appear in the final ROM. // This pointer array does not appear in the final ROM. @@ -682,7 +682,7 @@ static BOOL NamingScreen_PMCharArrayIsAllSpaces(const u16 *s) { int i; for (i = 0;; ++i) { - if (s[i] == EOS) { + if (s[i] == CHAR_EOS) { break; } if (s[i] != CHAR_SPACE) { @@ -697,7 +697,7 @@ BOOL NamingScreenApp_Exit(OverlayManager *ovyMan, int *pState) { NamingScreenAppData *data = OverlayManager_GetData(ovyMan); NamingScreenArgs *args = OverlayManager_GetArgs(ovyMan); - data->entryBuf[data->textCursorPos] = EOS; + data->entryBuf[data->textCursorPos] = CHAR_EOS; if (data->type == NAME_SCREEN_POKEMON) { Pokemon *mon = AllocMonZeroed(HEAP_ID_NAMING_SCREEN); CreateMon(mon, data->playerGenderOrMonSpecies, 5, 10, 10, 10, 10, 10); @@ -762,7 +762,7 @@ NamingScreenArgs *NamingScreen_CreateArgs(enum HeapID heapID, NameScreenType kin ret->playerGenderOrMonSpecies = param; ret->maxLen = maxLen; ret->noInput = FALSE; - ret->nameInputFlat[0] = EOS; + ret->nameInputFlat[0] = CHAR_EOS; ret->nameInputString = String_New(32, heapID); ret->battleMsgId = 0; ret->pcStorage = 0; @@ -935,7 +935,7 @@ static void NamingScreen_InitKeyboardAndEntryCursors(NamingScreenAppData *data, BgSetPosTextAndCommit(data->bgConfig, data->activeKeyboardBgId, BG_POS_OP_SET_Y, data->bgPosVecs[data->activeKeyboardBgId].y); BgSetPosTextAndCommit(data->bgConfig, data->activeKeyboardBgId ^ 1, BG_POS_OP_SET_X, data->bgPosVecs[data->activeKeyboardBgId ^ 1].x); BgSetPosTextAndCommit(data->bgConfig, data->activeKeyboardBgId ^ 1, BG_POS_OP_SET_Y, data->bgPosVecs[data->activeKeyboardBgId ^ 1].y); - data->entryBufBak[0] = EOS; + data->entryBufBak[0] = CHAR_EOS; if (args->nameInputString != NULL) { CopyStringToU16Array(args->nameInputString, data->entryBufBak, 32); } @@ -962,7 +962,7 @@ static void NamingScreen_InitKeyboardAndEntryCursors(NamingScreenAppData *data, data->unk_484 = -1; data->unk_488 = 0; data->unk_48C = 0; - data->entryBuf[data->maxLen] = EOS; + data->entryBuf[data->maxLen] = CHAR_EOS; for (int i = 0; i < 7; ++i) { data->spriteAnimUpdateReq[i] = 0; } @@ -993,7 +993,7 @@ static void NamingScreen_PrepareBattleMessage(NamingScreenAppData *data, Overlay BufferBoxMonSpeciesName(data->msgFormat, 0, Mon_GetBoxMon(mon)); Heap_Free(mon); } else { - data->entryBuf[data->textCursorPos] = EOS; + data->entryBuf[data->textCursorPos] = CHAR_EOS; CopyU16ArrayToString(string, data->entryBuf); BufferString(data->msgFormat, 0, string, 0, 0, 0); } @@ -1347,7 +1347,7 @@ static void NamingScreen_InitWindows(NamingScreenAppData *data, OverlayManager * OverlayManager_GetArgs(ovyMan); - if (data->entryBufBak[0] != EOS) { + if (data->entryBufBak[0] != CHAR_EOS) { CopyU16StringArray(data->entryBuf, data->entryBufBak); NamingScreen_BlitRawCharactersToWindow(&data->windows[3], data->entryBuf, 0, 0, 12, TEXT_SPEED_INSTANT, MAKE_TEXT_COLOR(14, 15, 1), NULL); } @@ -1518,7 +1518,7 @@ static void NamingScreen_BlitRawCharactersToWindow(Window *window, const u16 *ra int centerX; u16 pmCharBuf[2]; String *string = String_New(2, HEAP_ID_NAMING_SCREEN); - while (rawChars[i] != EOS) { + while (rawChars[i] != CHAR_EOS) { if (rawChars[i] == NAME_SCREEN_CONTROL_DAKU || rawChars[i] == NAME_SCREEN_CONTROL_HANDAKU || rawChars[i] == NAME_SCREEN_CONTROL_SPACE) { // This is unreachable outside of Japan. u16 buttonId = rawChars[i] - NAME_SCREEN_CONTROL_DAKU; @@ -1528,7 +1528,7 @@ static void NamingScreen_BlitRawCharactersToWindow(Window *window, const u16 *ra continue; } else { pmCharBuf[0] = rawChars[i]; - pmCharBuf[1] = EOS; + pmCharBuf[1] = CHAR_EOS; width = FontID_FlatArray_GetWidth(0, pmCharBuf, 0); CopyU16ArrayToString(string, pmCharBuf); centerX = x + i * spacing + ((spacing - width) / 2); @@ -1565,7 +1565,7 @@ static void NamingScreen_PrintCharacterOnWindowAndOBJ(Window *windows, const u16 string2 = String_New(21, HEAP_ID_NAMING_SCREEN); for (i = 0; i < 3; ++i) { curCharBuf[0] = tmpBuf[i]; - curCharBuf[1] = EOS; + curCharBuf[1] = CHAR_EOS; FillWindowPixelBuffer(&windows[i], 0); CopyU16ArrayToString(string2, curCharBuf); @@ -1694,7 +1694,7 @@ static NamingScreenMainState NamingScreen_HandleCharacterInput(NamingScreenAppDa break; case NAME_SCREEN_BUTTON_BACK: if (data->textCursorPos != 0) { - data->entryBuf[data->textCursorPos - 1] = EOS; + data->entryBuf[data->textCursorPos - 1] = CHAR_EOS; --data->textCursorPos; FillWindowPixelBuffer(&data->windows[3], 1); if (data->textCursorPos == 0) { @@ -1823,12 +1823,12 @@ static BOOL NamingScreen_JP_FlipDiacritic(int tableStart, int tableEnd, int conv } break; case NAME_SCREEN_BUTTON_PAGE_JP_UNUSED_2: - if (key == CHAR_JP_HIRA_DU) { - pmCharBuf[cursorPos - 1] = CHAR_JP_HIRA_TU_SMALL; + if (key == CHAR_JP_HIRA_DZU) { + pmCharBuf[cursorPos - 1] = CHAR_JP_HIRA_SOKUON; return TRUE; } - if (key == CHAR_JP_KATA_DU) { - pmCharBuf[cursorPos - 1] = CHAR_JP_KATA_TU_SMALL; + if (key == CHAR_JP_KATA_DZU) { + pmCharBuf[cursorPos - 1] = CHAR_JP_KATA_SOKUON; return TRUE; } break; diff --git a/src/overlay_25.c b/src/overlay_25.c index 8f5d149312..1df53a6649 100644 --- a/src/overlay_25.c +++ b/src/overlay_25.c @@ -58,17 +58,17 @@ static const MailMessageTemplate TrainerHouse_DefaultIntroMessage = { { \ .language = GAME_LANGUAGE, \ .nickname = { \ - EOS, \ - EOS, \ - EOS, \ - EOS, \ - EOS, \ - EOS, \ - EOS, \ - EOS, \ - EOS, \ - EOS, \ - }, \ + CHAR_EOS, \ + CHAR_EOS, \ + CHAR_EOS, \ + CHAR_EOS, \ + CHAR_EOS, \ + CHAR_EOS, \ + CHAR_EOS, \ + CHAR_EOS, \ + CHAR_EOS, \ + CHAR_EOS, \ + }, \ } static const TrainerHouseSet ov25_02259D9C = { @@ -82,11 +82,11 @@ static const TrainerHouseSet ov25_02259D9C = { CHAR_JP_HIRA_HI, CHAR_JP_HIRA_KA, CHAR_JP_HIRA_RU, - EOS, - EOS, - EOS, - EOS, - EOS, + CHAR_EOS, + CHAR_EOS, + CHAR_EOS, + CHAR_EOS, + CHAR_EOS, }, // "ひかる" }, .party = { @@ -113,11 +113,11 @@ static const TrainerHouseSet ov25_02259D9C = { CHAR_JP_KATA_NI, CHAR_JP_KATA_U, CHAR_JP_KATA_MU, - EOS, - EOS, - EOS, - EOS, - EOS, + CHAR_EOS, + CHAR_EOS, + CHAR_EOS, + CHAR_EOS, + CHAR_EOS, }, // "メガニウム" }, { @@ -140,14 +140,14 @@ static const TrainerHouseSet ov25_02259D9C = { .nickname = { CHAR_JP_KATA_BA, CHAR_JP_KATA_KU, - CHAR_JP_KATA_HU, - CHAR_JP_HYPHEN, - CHAR_JP_KATA_N_, - EOS, - EOS, - EOS, - EOS, - EOS, + CHAR_JP_KATA_FU, + CHAR_JP_MINUS, + CHAR_JP_KATA_N, + CHAR_EOS, + CHAR_EOS, + CHAR_EOS, + CHAR_EOS, + CHAR_EOS, }, // "バクフーン" }, { @@ -169,15 +169,15 @@ static const TrainerHouseSet ov25_02259D9C = { .level = 50, .nickname = { CHAR_JP_KATA_O, - CHAR_JP_HYPHEN, + CHAR_JP_MINUS, CHAR_JP_KATA_DA, CHAR_JP_KATA_I, CHAR_JP_KATA_RU, - EOS, - EOS, - EOS, - EOS, - EOS, + CHAR_EOS, + CHAR_EOS, + CHAR_EOS, + CHAR_EOS, + CHAR_EOS, }, // "オーダイル" }, DUMMY_TRAINER_HOUSE_MON, @@ -226,7 +226,7 @@ static void TrainerHouse_SetNames(TrainerHouseSet *set) { if (length > PLAYER_NAME_LENGTH) { length = PLAYER_NAME_LENGTH; } - MI_CpuFill16(set->trainer.otName, EOS, (PLAYER_NAME_LENGTH + 1) * sizeof(u16)); + MI_CpuFill16(set->trainer.otName, CHAR_EOS, (PLAYER_NAME_LENGTH + 1) * sizeof(u16)); MI_CpuCopy16(String_cstr(otName), set->trainer.otName, length * sizeof(u16)); String_Delete(otName); } @@ -244,7 +244,7 @@ static void TrainerHouse_SetNames(TrainerHouseSet *set) { if (length > POKEMON_NAME_LENGTH) { length = POKEMON_NAME_LENGTH; } - MI_CpuFill16(trainerHouseMon->nickname, EOS, POKEMON_NAME_LENGTH * sizeof(u16)); + MI_CpuFill16(trainerHouseMon->nickname, CHAR_EOS, POKEMON_NAME_LENGTH * sizeof(u16)); MI_CpuCopy16(String_cstr(name), trainerHouseMon->nickname, length * sizeof(u16)); String_Delete(name); } diff --git a/src/player_data.c b/src/player_data.c index 9213da35fd..4aabb9a998 100644 --- a/src/player_data.c +++ b/src/player_data.c @@ -59,7 +59,7 @@ void PlayerProfile_Init(PlayerProfile *profile) { BOOL PlayerProfile_IsNameEmpty(PlayerProfile *profile) { for (s32 i = 0; i < PLAYER_NAME_LENGTH + 1; i++) { - if (profile->name[i] != CHAR_NUL) { + if (profile->name[i] != CHAR_NONE) { return FALSE; } } diff --git a/src/pm_string.c b/src/pm_string.c index 8c3b80622f..b09a78efec 100644 --- a/src/pm_string.c +++ b/src/pm_string.c @@ -21,7 +21,7 @@ String *String_New(u32 maxsize, enum HeapID heapID) { ret->magic = STRING_MAGIC; ret->maxsize = maxsize; ret->size = 0; - ret->data[0] = EOS; + ret->data[0] = CHAR_EOS; } return ret; } @@ -35,7 +35,7 @@ void String_Delete(String *string) { void String_SetEmpty(String *string) { ASSERT_STRING(string); string->size = 0; - string->data[0] = EOS; + string->data[0] = CHAR_EOS; } void String_Copy(String *dest, const String *src) { @@ -109,7 +109,7 @@ void String16_FormatInteger(String *str, int num, u32 ndigits, PrintingMode strC String_SetEmpty(str); if (isNegative) { num *= -1; - u16 hyphen = (u16)((whichCharset == 0) ? CHAR_JP_HYPHEN : CHAR_HYPHEN); + u16 hyphen = (u16)((whichCharset == 0) ? CHAR_JP_MINUS : CHAR_MINUS); str->data[str->size++] = hyphen; } u32 dividend = sPowersOfTen[ndigits - 1]; @@ -117,19 +117,19 @@ void String16_FormatInteger(String *str, int num, u32 ndigits, PrintingMode strC u16 digit = (u16)(num / dividend); num -= dividend * digit; if (strConvMode == PRINTING_MODE_LEADING_ZEROS) { - u16 value = (u16)((digit < 10) ? charbase[digit] : CHAR_JP_QUESTION_MARK); + u16 value = (u16)((digit < 10) ? charbase[digit] : CHAR_JP_QMARK); str->data[str->size++] = value; } else if (digit != 0 || dividend == 1) { strConvMode = PRINTING_MODE_LEADING_ZEROS; - u16 value = (u16)((digit < 10) ? charbase[digit] : CHAR_JP_QUESTION_MARK); + u16 value = (u16)((digit < 10) ? charbase[digit] : CHAR_JP_QMARK); str->data[str->size++] = value; } else if (strConvMode == PRINTING_MODE_RIGHT_ALIGN) { - u16 value = (u16)((whichCharset == 0) ? CHAR_JP_SPACE : CHAR_NARROW_SPACE); + u16 value = (u16)((whichCharset == 0) ? CHAR_JP_SPACE : CHAR_NUM_SPACE); str->data[str->size++] = value; } dividend /= 10; } - str->data[str->size] = EOS; + str->data[str->size] = CHAR_EOS; return; } GF_ASSERT(FALSE); @@ -195,7 +195,7 @@ void String16_FormatUnsignedLongLong(String *str, u64 num, u32 ndigits, Printing String_SetEmpty(str); if (isNegative) { num *= -1; - u16 hyphen = (u16)((whichCharset == 0) ? CHAR_JP_HYPHEN : CHAR_HYPHEN); + u16 hyphen = (u16)((whichCharset == 0) ? CHAR_JP_MINUS : CHAR_MINUS); str->data[str->size++] = hyphen; } u64 dividend = sPowersOfTen[ndigits - 1]; @@ -203,11 +203,11 @@ void String16_FormatUnsignedLongLong(String *str, u64 num, u32 ndigits, Printing u64 digit = num / dividend; num -= dividend * digit; if (strConvMode == PRINTING_MODE_LEADING_ZEROS) { - u16 value = (u16)((digit < 10ull) ? charbase[digit] : CHAR_JP_QUESTION_MARK); + u16 value = (u16)((digit < 10ull) ? charbase[digit] : CHAR_JP_QMARK); str->data[str->size++] = value; } else if (digit != 0 || dividend == 1) { strConvMode = PRINTING_MODE_LEADING_ZEROS; - u16 value = (u16)((digit < 10ull) ? charbase[digit] : CHAR_JP_QUESTION_MARK); + u16 value = (u16)((digit < 10ull) ? charbase[digit] : CHAR_JP_QMARK); str->data[str->size++] = value; } else if (strConvMode == PRINTING_MODE_RIGHT_ALIGN) { u16 value = (u16)((whichCharset == 0) ? CHAR_JP_SPACE : CHAR_SPACE); @@ -215,7 +215,7 @@ void String16_FormatUnsignedLongLong(String *str, u64 num, u32 ndigits, Printing } dividend /= 10ull; } - str->data[str->size] = EOS; + str->data[str->size] = CHAR_EOS; return; } GF_ASSERT(FALSE); @@ -251,7 +251,7 @@ BOOL String_Compare(String *str1, String *str2) { ASSERT_STRING(str2); for (int i = 0; str1->data[i] == str2->data[i]; i++) { - if (str1->data[i] == EOS) { + if (str1->data[i] == CHAR_EOS) { return FALSE; } } @@ -268,7 +268,7 @@ int String_CountLines(volatile String *str) { int i, nline; for (i = 0, nline = 1; i < str->size; i++) { - if (str->data[i] == CHAR_LF) { + if (str->data[i] == CHAR_LINE_BREAK) { nline++; } } @@ -282,7 +282,7 @@ void String_GetLineN(String *dest, volatile String *src, u32 n) { int i = 0; if (n != 0) { for (i = 0; i < src->size; i++) { - if (src->data[i] == CHAR_LF && --n == 0) { + if (src->data[i] == CHAR_LINE_BREAK && --n == 0) { i++; break; } @@ -291,7 +291,7 @@ void String_GetLineN(String *dest, volatile String *src, u32 n) { String_SetEmpty(dest); for (; i < src->size; i++) { u16 c = src->data[i]; - if (c == CHAR_LF) { + if (c == CHAR_LINE_BREAK) { break; } String_AddChar(dest, c); @@ -325,14 +325,14 @@ void String_RadioAddStatic(String *string, u8 level) { void CopyU16ArrayToString(String *str, const u16 *buf) { ASSERT_STRING(str); - for (str->size = 0; *buf != EOS;) { + for (str->size = 0; *buf != CHAR_EOS;) { if (str->size >= str->maxsize - 1) { GF_ASSERT(FALSE); break; } str->data[str->size++] = *buf++; } - str->data[str->size] = EOS; + str->data[str->size] = CHAR_EOS; } void CopyU16ArrayToStringN(String *str, const u16 *buf, u32 length) { @@ -342,13 +342,13 @@ void CopyU16ArrayToStringN(String *str, const u16 *buf, u32 length) { int i; memcpy(str->data, buf, length * 2); for (i = 0; i < length; i++) { - if (str->data[i] == EOS) { + if (str->data[i] == CHAR_EOS) { break; } } str->size = (u16)i; if (i == length) { - str->data[length - 1] = EOS; + str->data[length - 1] = CHAR_EOS; } return; } @@ -388,14 +388,14 @@ void String_AddChar(String *str, u16 val) { if (str->size + 1 < str->maxsize) { str->data[str->size++] = val; - str->data[str->size] = EOS; + str->data[str->size] = CHAR_EOS; return; } GF_ASSERT(FALSE); } BOOL String_IsTrainerName(String *string) { - return string->size != 0 && string->data[0] == TRNAMECODE; + return string->size != 0 && string->data[0] == CHAR_COMPRESSED_MARK; } void String_Cat_HandleTrainerName(String *dest, String *src) { @@ -422,7 +422,7 @@ void String_Cat_HandleTrainerName(String *dest, String *src) { *dest_p++ = cur_char; outsize++; } - *dest_p = EOS; + *dest_p = CHAR_EOS; dest->size += outsize; } else { String_Cat(dest, src); diff --git a/src/pokemon.c b/src/pokemon.c index abf453e39a..8b04c62221 100644 --- a/src/pokemon.c +++ b/src/pokemon.c @@ -738,7 +738,7 @@ static u32 GetBoxMonDataInternal(BoxPokemon *boxMon, int attr, void *dest) { for (ret = 0; ret < POKEMON_NAME_LENGTH; ret++) { dest16[ret] = blockC->nickname[ret]; } - dest16[ret] = EOS; + dest16[ret] = CHAR_EOS; } break; case MON_DATA_NICKNAME_STRING_AND_FLAG: @@ -791,7 +791,7 @@ static u32 GetBoxMonDataInternal(BoxPokemon *boxMon, int attr, void *dest) { for (ret = 0; ret < PLAYER_NAME_LENGTH; ret++) { dest16[ret] = blockD->otName[ret]; } - dest16[ret] = EOS; + dest16[ret] = CHAR_EOS; } break; case MON_DATA_OT_NAME_STRING: CopyU16ArrayToString(dest, blockD->otName); diff --git a/src/render_text.c b/src/render_text.c index f008caca06..5996047574 100644 --- a/src/render_text.c +++ b/src/render_text.c @@ -111,9 +111,9 @@ RenderResult RenderText(TextPrinter *printer) { GF_ASSERT(currentChar != 0xF100); switch (currentChar) { - case EOS: + case CHAR_EOS: return RENDER_FINISH; - case CHAR_LF: + case CHAR_LINE_BREAK: printer->template.currentX = printer->template.x; s32 fontAttribute = GetFontAttribute(printer->template.fontId, 1); @@ -124,7 +124,7 @@ RenderResult RenderText(TextPrinter *printer) { case 0xF0FD: printer->template.currentChar.raw++; return RENDER_REPEAT; - case EXT_CTRL_CODE_BEGIN: + case CHAR_CONTROL_CODE_ARG: printer->template.currentChar.raw--; switch ((u16)MsgArray_GetControlCode(printer->template.currentChar.raw)) { case 0xFF00: diff --git a/src/save_misc.c b/src/save_misc.c index f16435a4b4..81bf0795c4 100644 --- a/src/save_misc.c +++ b/src/save_misc.c @@ -34,7 +34,7 @@ void Save_Misc_Init(SAVE_MISC_DATA *saveMiscData) { Save_BerryPots_Init(saveMiscData->berry_pots); Save_BerryPotRTC_Init(&saveMiscData->berry_datetime); Save_Gymmick_Clear(&saveMiscData->gymmick); - MI_CpuFill16(saveMiscData->rivalName, EOS, PLAYER_NAME_LENGTH + 1); + MI_CpuFill16(saveMiscData->rivalName, CHAR_EOS, PLAYER_NAME_LENGTH + 1); MI_CpuFill8(saveMiscData->unk_0280, 0xFF, 8); MailMsg_Init_WithBank(&saveMiscData->battleGreetingEC, MAILMSG_BANK_0295_GMM); saveMiscData->battleGreetingEC.msg_no = msg_0295_00000; diff --git a/src/save_palpad.c b/src/save_palpad.c index d1c52498be..cd59500ab2 100644 --- a/src/save_palpad.c +++ b/src/save_palpad.c @@ -17,7 +17,7 @@ void Save_PalPad_Init(SavePalPad *palPad) { for (i = 0; i < NUM_PALPAD_ENTRIES; i++) { memset(&palPad[i], 0, sizeof(SavePalPad)); - palPad[i].name[0] = EOS; + palPad[i].name[0] = CHAR_EOS; } } @@ -53,12 +53,12 @@ void SavePalPad_Merge(SavePalPad *a, SavePalPad *b, int n, enum HeapID heapID) { for (i = 0; i < n; i++) { c[k] = b[i]; if (sp18[i] >= 0) { - a[sp18[i]].name[0] = EOS; + a[sp18[i]].name[0] = CHAR_EOS; } k++; } for (i = 0; i < NUM_PALPAD_ENTRIES; i++) { - if (a[i].name[0] != EOS) { + if (a[i].name[0] != CHAR_EOS) { c[k] = a[i]; k++; if (k >= NUM_PALPAD_ENTRIES) { diff --git a/src/string_control_code.c b/src/string_control_code.c index 523bd11530..d23e2d0c18 100644 --- a/src/string_control_code.c +++ b/src/string_control_code.c @@ -5,8 +5,8 @@ #include "pm_string.h" const u16 *MsgArray_SkipControlCode(const u16 *arr) { - GF_ASSERT(*arr == EXT_CTRL_CODE_BEGIN); - if (*arr == EXT_CTRL_CODE_BEGIN) { + GF_ASSERT(*arr == CHAR_CONTROL_CODE_ARG); + if (*arr == CHAR_CONTROL_CODE_ARG) { u16 size = arr[2]; arr += 3; arr += size; @@ -15,7 +15,7 @@ const u16 *MsgArray_SkipControlCode(const u16 *arr) { } int MsgArray_GetControlCode(const u16 *arr) { - GF_ASSERT(*arr == EXT_CTRL_CODE_BEGIN); + GF_ASSERT(*arr == CHAR_CONTROL_CODE_ARG); return arr[1]; } @@ -25,7 +25,7 @@ BOOL MsgArray_ControlCodeIsStrVar(const u16 *arr) { } int MsgArray_ControlCodeGetField(const u16 *arr, u32 fieldno) { - GF_ASSERT(*arr == EXT_CTRL_CODE_BEGIN); + GF_ASSERT(*arr == CHAR_CONTROL_CODE_ARG); GF_ASSERT(fieldno < arr[2]); arr += 3; return arr[fieldno]; diff --git a/src/string_util.c b/src/string_util.c index fb875c20ec..c382262486 100644 --- a/src/string_util.c +++ b/src/string_util.c @@ -5,12 +5,12 @@ #include "constants/charcode.h" u16 *CopyU16StringArray(u16 *dest, const u16 *src) { - while (*src != EOS) { + while (*src != CHAR_EOS) { *dest = *src; src++; dest++; } - *dest = EOS; + *dest = CHAR_EOS; return dest; } @@ -25,13 +25,13 @@ u16 *CopyU16StringArrayN(u16 *dest, const u16 *src, u32 n) { int StringLength(const u16 *str) { int i; - for (i = 0; str[i] != EOS; i++) {} + for (i = 0; str[i] != CHAR_EOS; i++) {} return i; } BOOL StringNotEqual(const u16 *a, const u16 *b) { while (*a == *b) { - if (*a == EOS) { + if (*a == CHAR_EOS) { return FALSE; } a++; @@ -45,7 +45,7 @@ BOOL StringNotEqualN(const u16 *a, const u16 *b, u32 n) { if (n == 0) { return FALSE; } - if (*a == EOS && *b == EOS) { + if (*a == CHAR_EOS && *b == CHAR_EOS) { return FALSE; } a++; @@ -64,7 +64,7 @@ u16 *StringFill(u16 *str, u16 val, u32 n) { } u16 *StringFillEOS(u16 *str, u32 n) { - return StringFill(str, EOS, n); + return StringFill(str, CHAR_EOS, n); } u16 *ConvertUIntToDecimalString(u16 *dest, u32 num, PrintingMode strconvmode, u32 ndigits) { @@ -91,17 +91,17 @@ u16 *ConvertUIntToDecimalString(u16 *dest, u32 num, PrintingMode strconvmode, u3 digit = num / denom; num -= denom * digit; if (strconvmode == PRINTING_MODE_LEADING_ZEROS) { - *dest = (digit >= 10) ? CHAR_JP_QUESTION_MARK : _digit_strcode[digit]; + *dest = (digit >= 10) ? CHAR_JP_QMARK : _digit_strcode[digit]; dest++; } else if (digit != 0 || denom == 1) { strconvmode = PRINTING_MODE_LEADING_ZEROS; - *dest = (digit >= 10) ? CHAR_JP_QUESTION_MARK : _digit_strcode[digit]; + *dest = (digit >= 10) ? CHAR_JP_QMARK : _digit_strcode[digit]; dest++; } else if (strconvmode == PRINTING_MODE_RIGHT_ALIGN) { *dest = CHAR_JP_SPACE; dest++; } } - *dest = EOS; + *dest = CHAR_EOS; return dest; } diff --git a/src/unk_0200CE7C.c b/src/unk_0200CE7C.c index f3cf8d7bfe..04a1dc84b4 100644 --- a/src/unk_0200CE7C.c +++ b/src/unk_0200CE7C.c @@ -8,7 +8,7 @@ void sub_0200CE7C(MessagePrinter *msgPrinter, u8 glyphId, u32 num, u32 ndigits, void sub_0200CEB0(BattleNumberPrinter *unk, u32 num, u32 ndigits, PrintingMode strConvMode, u16 *dest) { u8 fillVal = (unk->fillVal << 4) | unk->fillVal; ConvertUIntToDecimalString(unk->strbuf, num, strConvMode, ndigits); - for (int i = 0; unk->strbuf[i] != EOS; ++i) { + for (int i = 0; unk->strbuf[i] != CHAR_EOS; ++i) { if (unk->strbuf[i] >= CHAR_JP_0 && unk->strbuf[i] <= CHAR_JP_9) { const u8 *src = (const u8 *)unk->charData->pRawData + 32 * (unk->strbuf[i] - CHAR_JP_0); u8 *dst = (u8 *)dest + i * 32;