From 5ec85180eccbc125b5156c96c1f981466b4365e6 Mon Sep 17 00:00:00 2001 From: xLuigiGamerx <88401287+xLuigiGamerx@users.noreply.github.com> Date: Wed, 13 Sep 2023 13:04:30 +0300 Subject: [PATCH] Adding the missing colorful letters (q, v, x, z). (#464) * xLuigiGamerxsDevFork * xLuigiGamerxsDevFork * Fixed Accidentally used older character.c file --------- Co-authored-by: xLuigiGamerx --- bin/segment2.c | 30 ++++++---------------- src/game/characters.c | 4 +-- src/pc/djui/djui_font.c | 4 --- textures/segment2/custom_hud_q.rgba16.png | Bin 0 -> 473 bytes textures/segment2/custom_hud_v.rgba16.png | Bin 0 -> 429 bytes textures/segment2/custom_hud_x.rgba16.png | Bin 0 -> 477 bytes textures/segment2/custom_hud_z.rgba16.png | Bin 0 -> 342 bytes 7 files changed, 10 insertions(+), 28 deletions(-) create mode 100644 textures/segment2/custom_hud_q.rgba16.png create mode 100644 textures/segment2/custom_hud_v.rgba16.png create mode 100644 textures/segment2/custom_hud_x.rgba16.png create mode 100644 textures/segment2/custom_hud_z.rgba16.png 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 0000000000000000000000000000000000000000..fb15e2fabef873a1af78c1dcff36bb55ac50f0a8 GIT binary patch literal 473 zcmV;~0Ve*5P)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0d7e|K~y+TbyF=* z13?gd+X98ApD3s$`~e&Shd`kC3DhAl2n-fok06+$2_*>r2n}CN2&7=Z5=c1S+Yj!# zy?e>t-n^MNJ2QJ{kb{KyMCw{J86(1!Lt@i+beXF<3+!)L6UUwD_z5B_o-a9Zm04;t zzyjC!7kJyA)G*8;h(**H+?)g2+*?dy-?`_(CJ5pRPirw)g7<6Sap3HbWV6NKT_n;3 zlq4>n8`OM|1TRa#C zEN+30Mg{mD10P9xO=>HgtO~b|NJcYCXP`jtXTvm!IGf!2ZhIu-??69Fz2gEDEYZy~ zFnBdq7zW&Ag@rBXC+UrR0?s0Q!s>hdFvHW1F?r{Enex8;uAZZ^(>VZtoJwM3_de?4 P00000NkvXXu0mjfPx#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0YXVcK~y+Tjgz}d z13?sq|B09Nl3gLBF>he!OXMM}1q)Md3Oli~8teo?A&8Jp5CnY+L9n&3$!m<~GP9YP zOduZ|GBfAj|D3a#HHdJob$$tBtZ{^{O`=O+Q2>w7xTKI=>xM5ZX(i-=j249ySt}27B^Jhn%A9|m)4@HGm(`6Bs_<_Nj}*oz;SFq8Jrzdh zh4vXSplf12#wyB%G8&!TJkTag(i&==I~pDO#HMf;vtPLRAKd$5`CY7Ir2}TTuU%|HaW45Hzx;a5>Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0dh%1K~y+Tl~OHF z13?gdcaYHDA?gSYf+e{Af;y0#L}EyAgro+AM-oH{g5rt=g#^P#fdnv+)U_lC6yTP5 zv$N&6UP5@ubf-J>-t5c`^60pZGxz^c@;Tg@!-&YA!hswtFT&XDRk^UDNX`o|Hg^p- z--WB+my5&$49xYIh=AowfXU5nhI9;=q{YC_lfSoAMO^z_Hy5Z#k|vAD+KnfrVu_uM zEgf63AztYUv2RI|kXXfJ+>-(^h!r8VJSrWysTrVZLRE=WO)wFk1&;23uk43I3^f^e z?MWq8mK5z>qHKqL8JYO?sMex?W=atu1#91ylZl}KKUwR=1kAK=5!k4YPCr0ZN#1?P zw14)heaoryu#@vxm_&5N8!i9po;fLlGWe}b}Ub4T=)RVLoILJsf^^v8-C TFW~o`00000NkvXXu0mjfInmAO literal 0 HcmV?d00001 diff --git a/textures/segment2/custom_hud_z.rgba16.png b/textures/segment2/custom_hud_z.rgba16.png new file mode 100644 index 0000000000000000000000000000000000000000..2b3197fbebdac10b6fd9ec09b50d1381ac62cd96 GIT binary patch literal 342 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJV{wqX6T`Z5GB1G~mUKs7M+SzC z{oH>NS%G}l0G|-o|3L8U|GPE+&ocbK$oc=O!2hcX|F3HPzh(44i{WZ9!!t*Q=6ja^ zEg6dM1^s`P^#4`K|98#*-%b7hZpr^|d;kBx_aA7|jTieQfs}YjkY6y!Kuo~!%;8xa zPzh&&M`SSr1K%MKW)#)%Y5)qBd%8G=Xawi>-WED!z`@GddyJ(xGxXp8U|WT``*s-H zyy0VZnIiO>b!qPDnFmEbz2)y1MiUVKxBp0{`