diff --git a/bin/segment2.c b/bin/segment2.c index 3d320610..932291a0 100644 --- a/bin/segment2.c +++ b/bin/segment2.c @@ -86,15 +86,9 @@ ALIGNED8 const Texture texture_hud_char_I[] = { #include "textures/segment2/segment2.02400.rgba16.inc.c" }; -#if defined(VERSION_JP) || defined(VERSION_SH) -ALIGNED8 const Texture texture_hud_char_J[] = { -#include "textures/segment2/segment2.02600.rgba16.inc.c" -}; -#else ALIGNED8 static const u8 texture_hud_char_J[] = { #include "textures/segment2/custom_hud_j.rgba16.inc.c" }; -#endif ALIGNED8 const Texture texture_hud_char_K[] = { #include "textures/segment2/segment2.02800.rgba16.inc.c" @@ -120,11 +114,9 @@ ALIGNED8 const Texture texture_hud_char_P[] = { #include "textures/segment2/segment2.03200.rgba16.inc.c" }; -#if defined(VERSION_JP) || defined(VERSION_SH) ALIGNED8 const Texture texture_hud_char_Q[] = { -#include "textures/segment2/segment2.03400.rgba16.inc.c" +#include "textures/segment2/custom_hud_Q.rgba16.inc.c" }; -#endif ALIGNED8 const Texture texture_hud_char_R[] = { #include "textures/segment2/segment2.03600.rgba16.inc.c" @@ -142,31 +134,25 @@ ALIGNED8 const Texture texture_hud_char_U[] = { #include "textures/segment2/segment2.03C00.rgba16.inc.c" }; -#if defined(VERSION_JP) || defined(VERSION_EU) || defined(VERSION_SH) ALIGNED8 const Texture texture_hud_char_V[] = { -#include "textures/segment2/segment2.03E00.rgba16.inc.c" +#include "textures/segment2/custom_hud_v.rgba16.inc.c" }; -#endif ALIGNED8 const Texture texture_hud_char_W[] = { #include "textures/segment2/segment2.04000.rgba16.inc.c" }; -#if defined(VERSION_JP) || defined(VERSION_SH) ALIGNED8 const Texture texture_hud_char_X[] = { -#include "textures/segment2/segment2.04200.rgba16.inc.c" +#include "textures/segment2/custom_hud_x.rgba16.inc.c" }; -#endif ALIGNED8 const Texture texture_hud_char_Y[] = { #include "textures/segment2/segment2.04400.rgba16.inc.c" }; -#if defined(VERSION_JP) || defined(VERSION_EU) || defined(VERSION_SH) ALIGNED8 const Texture texture_hud_char_Z[] = { -#include "textures/segment2/segment2.04600.rgba16.inc.c" +#include "textures/segment2/custom_hud_z.rgba16.inc.c" }; -#endif ALIGNED8 const Texture texture_hud_char_apostrophe[] = { #include "textures/segment2/segment2.04800.rgba16.inc.c" @@ -1843,10 +1829,10 @@ const Texture *const main_hud_lut[] = { 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, 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, texture_hud_char_wario_head, texture_hud_char_Y, texture_hud_char_waluigi_head, - 0x0, 0x0, 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, + texture_hud_char_wario_head, 0x0, texture_hud_char_waluigi_head, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, texture_hud_char_slash, texture_hud_char_multiply, texture_hud_char_coin, diff --git a/src/game/characters.c b/src/game/characters.c index 03927144..ca45090b 100644 --- a/src/game/characters.c +++ b/src/game/characters.c @@ -227,7 +227,7 @@ struct Character gCharacters[CT_MAX] = { [CT_WALUIGI] = { .type = CT_WALUIGI, .name = "Waluigi", - .hudHead = 'z', + .hudHead = '?', .hudHeadTexture = { .texture = (u8*)texture_hud_char_waluigi_head, .bitSize = 8, .width = 16, .height = 16 }, .cameraHudHead = GLYPH_CAM_WALUIGI_HEAD, .modelId = MODEL_WALUIGI, @@ -295,7 +295,7 @@ struct Character gCharacters[CT_MAX] = { [CT_WARIO] = { .type = CT_WARIO, .name = "Wario", - .hudHead = 'x', + .hudHead = '!', .hudHeadTexture = { .texture = (u8*)texture_hud_char_wario_head, .bitSize = 8, .width = 16, .height = 16 }, .cameraHudHead = GLYPH_CAM_WARIO_HEAD, .modelId = MODEL_WARIO, diff --git a/src/pc/djui/djui_font.c b/src/pc/djui/djui_font.c index 9e1a4cde..b6f4b5f2 100644 --- a/src/pc/djui/djui_font.c +++ b/src/pc/djui/djui_font.c @@ -79,10 +79,6 @@ static const struct DjuiFont sDjuiFontTitle = { /////////////////////// static u8 djui_font_hud_index(char c) { - if (c == 'q' || c == 'Q') { return 50; } - if (c == 'v' || c == 'V') { return 50; } - if (c == 'x' || c == 'X') { return 50; } - if (c == 'z' || c == 'Z') { return 50; } if ((u8)c < ' ' || (u8)c > 127) { return 50; } switch (c) { diff --git a/textures/segment2/custom_hud_q.rgba16.png b/textures/segment2/custom_hud_q.rgba16.png new file mode 100644 index 00000000..fb15e2fa Binary files /dev/null and b/textures/segment2/custom_hud_q.rgba16.png differ diff --git a/textures/segment2/custom_hud_v.rgba16.png b/textures/segment2/custom_hud_v.rgba16.png new file mode 100644 index 00000000..8137f091 Binary files /dev/null and b/textures/segment2/custom_hud_v.rgba16.png differ diff --git a/textures/segment2/custom_hud_x.rgba16.png b/textures/segment2/custom_hud_x.rgba16.png new file mode 100644 index 00000000..feb34bb7 Binary files /dev/null and b/textures/segment2/custom_hud_x.rgba16.png differ diff --git a/textures/segment2/custom_hud_z.rgba16.png b/textures/segment2/custom_hud_z.rgba16.png new file mode 100644 index 00000000..2b3197fb Binary files /dev/null and b/textures/segment2/custom_hud_z.rgba16.png differ