diff --git a/bin/segment2.c b/bin/segment2.c index a8034c61..d1e9df8c 100644 --- a/bin/segment2.c +++ b/bin/segment2.c @@ -923,6 +923,13 @@ ALIGNED8 static const u8 texture_font_char_question [] = "textures/special ALIGNED8 static const u8 texture_font_char_umlaut [] = "textures/special/umlaut"; ALIGNED8 static const u8 texture_font_char_enye [] = "textures/special/enye"; +ALIGNED8 static const u8 texture_hud_char_J [] = "textures/special/hud_j"; +ALIGNED8 static const u8 texture_hud_char_Q [] = "textures/special/hud_q"; +ALIGNED8 static const u8 texture_hud_char_V [] = "textures/special/hud_v"; +ALIGNED8 static const u8 texture_hud_char_X [] = "textures/special/hud_x"; +ALIGNED8 static const u8 texture_hud_char_Z [] = "textures/special/hud_z"; +ALIGNED8 static const u8 texture_hud_char_decimal_point [] = "textures/special/hud_decimal"; + ALIGNED8 static const u8 texture_hud_char_camera[] = "textures/segment2/segment2.07B50.rgba16"; ALIGNED8 static const u8 texture_hud_char_lakitu[] = "textures/segment2/segment2.07D50.rgba16"; @@ -939,16 +946,16 @@ const u8 *const main_hud_lut[] = { texture_hud_char_4, texture_hud_char_5, texture_hud_char_6, texture_hud_char_7, texture_hud_char_8, texture_hud_char_9, texture_hud_char_A, texture_hud_char_B, texture_hud_char_C, texture_hud_char_D, texture_hud_char_E, texture_hud_char_F, - texture_hud_char_G, texture_hud_char_H, texture_hud_char_I, 0x0, + texture_hud_char_G, texture_hud_char_H, texture_hud_char_I, texture_hud_char_J, texture_hud_char_K, texture_hud_char_L, texture_hud_char_M, texture_hud_char_N, - texture_hud_char_O, texture_hud_char_P, 0x0, texture_hud_char_R, - texture_hud_char_S, texture_hud_char_T, texture_hud_char_U, 0x0, - texture_hud_char_W, 0x0, texture_hud_char_Y, 0x0, - 0x0, 0x0, 0x0, 0x0, - 0x0, 0x0, 0x0, 0x0, - 0x0, 0x0, 0x0, 0x0, - 0x0, 0x0, texture_hud_char_multiply, texture_hud_char_coin, - texture_hud_char_mario_head, texture_hud_char_star, 0x0, 0x0, + texture_hud_char_O, texture_hud_char_P, texture_hud_char_Q, texture_hud_char_R, + texture_hud_char_S, texture_hud_char_T, texture_hud_char_U, texture_hud_char_V, + texture_hud_char_W, texture_hud_char_X, texture_hud_char_Y, texture_hud_char_Z, + 0x0, 0x0, 0x0, 0x0, + 0x0, 0x0, 0x0, 0x0, + 0x0, 0x0, 0x0, 0x0, + 0x0, 0x0, texture_hud_char_multiply, texture_hud_char_coin, + texture_hud_char_mario_head, texture_hud_char_star, texture_hud_char_decimal_point, 0x0, texture_hud_char_apostrophe, texture_hud_char_double_quote, }; @@ -2285,4 +2292,4 @@ const s16 seg2_painting_mesh_neighbor_tris[] = { 3, 260, 261, 263, 3, 240, 242, 244, 1, 243, -}; +}; \ No newline at end of file diff --git a/src/text/text-loader.c b/src/text/text-loader.c index 4cf74168..8a6c5377 100644 --- a/src/text/text-loader.c +++ b/src/text/text-loader.c @@ -180,10 +180,17 @@ void alloc_languages(char* exePath, char* gamedir){ strncpy(parent, exePath, strlen(exePath) - strlen(lastSlash)); char * languagesDir = malloc(FILENAME_MAX * sizeof(char*)); + #ifndef WIN32 strcpy(languagesDir, parent); strcat(languagesDir, "/"); strcat(languagesDir, gamedir); strcat(languagesDir, "/texts/"); + #else + strcpy(languagesDir, parent); + strcat(languagesDir, "\\"); + strcat(languagesDir, gamedir); + strcat(languagesDir, "\\texts\\"); + #endif DIR *lf = opendir(languagesDir); struct dirent *de; diff --git a/src/text/txtconv.c b/src/text/txtconv.c index d90af6e8..54857fcd 100644 --- a/src/text/txtconv.c +++ b/src/text/txtconv.c @@ -37,7 +37,7 @@ struct Character charmap[356] = { {"|", {0x51, NULL}}, {"<", {0x52, NULL}}, {">", {0x53, NULL}}, {"[A]", {0x54, NULL}}, {"[B]", {0x55, NULL}}, {"[C]", {0x56, NULL}}, {"[Z]", {0x57, NULL}}, {"[R]", {0x58, NULL}}, {"/", {0xd0, NULL}}, {"the", {0xd1, NULL}}, {"you", {0xd2, NULL}}, {"{00224}", {0x60, NULL}}, {"{00226}", {0x61, NULL}}, {"{00228}", {0x62, NULL}}, {"{00192}", {0x64, NULL}}, {"{00194}", {0x65, NULL}}, {"{00196}", {0x66, NULL}}, {"{00232}", {0x70, NULL}}, {"{00234}", {0x71, NULL}}, {"{00235}", {0x72, NULL}}, {"{00200}", {0x74, NULL}}, {"{00202}", {0x75, NULL}}, {"{00203}", {0x76, NULL}}, {"{00249}", {0x80, NULL}}, {"{00251}", {0x81, NULL}}, - {"{00217}", {0x84, NULL}}, {"{00219}", {0x85, NULL}}, {"{00220}", {0x86, NULL}}, {"{00244}", {0x91, NULL}}, {"{00246}", {0x92, NULL}}, {"{00212}", {0x95, NULL}}, {"{00214}", {0x96, NULL}}, {"{00238}", {0xa1, NULL}}, + {"{00217}", {0x84, NULL}}, {"{00219}", {0x85, NULL}}, {"{00244}", {0x91, NULL}}, {"{00246}", {0x92, NULL}}, {"{00212}", {0x95, NULL}}, {"{00214}", {0x96, NULL}}, {"{00238}", {0xa1, NULL}}, {"{00239}", {0xa2, NULL}}, {"{00223}", {0xec, NULL}}, {"{00199}", {0xed, NULL}}, {"{00231}", {0xee, NULL}}, {"{08222}", {0xf0, NULL}}, // SPECIAL CHARACTERS