From 7598de60a6c3bedb2f0a218a86bffc2d0581e81f Mon Sep 17 00:00:00 2001 From: 12014 Date: Mon, 7 Jul 2025 00:56:39 +0900 Subject: [PATCH] Use 'Stringappend' in some functions & Few Changes of Pics --- graphics/frontier_pass/medals.png | Bin 651 -> 645 bytes graphics/frontier_pass/medals_jp.png | Bin 0 -> 590 bytes graphics/pokedex/hgss/tileset_menu_list.png | Bin 3569 -> 1523 bytes src/battle_interface.c | 1 - src/menu.c | 11 ++++------- 5 files changed, 4 insertions(+), 8 deletions(-) create mode 100644 graphics/frontier_pass/medals_jp.png diff --git a/graphics/frontier_pass/medals.png b/graphics/frontier_pass/medals.png index 1c0d366882fa849b497f390559c87481e760b0de..eab8220ddff414d6101317fdcc6645c8dd1199ac 100644 GIT binary patch delta 573 zcmV-D0>b@^1%(BW7#0Wv0000W*#HRu0004VQb$4nuFf3kks&{S14%?dR5*>TmD`Tw zAPhu7P0J1m`2YWQT`rR_T4`riJ$|5}!mUs2N-2oyAyQVPs z9K*yrP~<#M3h4NR?m+=PDfKuGjG>@gL_JdQUN6Hhumq8Ml_8a5DznVi9-%cWWxOBZ zJzvGA;Mxe0W-gR}>8A^Zy~nt`ETrBi$00?$UK@bFcp!Eje%o{BA=u*KahS}YCggG0 zpfDW?c+|OsA;Du8$YT?N#}e=xJYuRyJP00_4&GzRMIM)M34kS!jurh255#9Y@Hzu@ z^3aI@kP6|vU$$omc=+>yL%bmme{P;U&dD>RBR^d5R1pY&!DAP|gM$B;5Xd7p^@B4% zcu2av;6o2(pNhrV8XD!00000 LNkvXXu0mjf51$XT delta 579 zcmV-J0=)f&1&alc7zqRe0002xDeVZ6E1gh6otnXRS;D9k&|c0 z8>F%16i8GNJVuZl&0>4k6dYs?7~f|+2%3@NJNn)jf-)!8qS@K zDEN_cHO0|r?#?&oo)tpW9&eutRBhj+1*?4;dNSBpE}ZQyPsM}Tg|nU6E3v1i&bEK` zMC^_gksqInBxjKi#Fb%#0fA}cfTA_QpI*XAk{Q-Dz_?u^c(0=^}JPmws9eIxP{Plf#>RRhhb8HL)%EO-_p$z;{ zQ7{kTkcK~srg?}w5GDIFz}rjqhuaJ@ z&1;?)g59g~lbO=TdHEhy^MWrM@W&{eARqJWY|8oJcJKNBihmsQ@Vx%z&o2bX^K07t Rdbj`p002ovPDHLkV1kLcCSw2q diff --git a/graphics/frontier_pass/medals_jp.png b/graphics/frontier_pass/medals_jp.png new file mode 100644 index 0000000000000000000000000000000000000000..dd18955bc147dcbc9255776d4b15a61a08535814 GIT binary patch literal 590 zcmV-U0Px#Fi=cXMVzET|NsBZ&CR5wq~_Jd-n5+FoOAB(_TJv+)y>t##l^j}w5+70q@0wL zi-U`Ub1Q?66#xJM%t=H+R5*>rm5q*sFbITetU`5#_kY_PDA?}(W$%*9k?d-*#rDfE zmhv%{DSUicoEFz*ndO0CRTX+XJb_27HjB;^iRD1BTtvjUqq4NtFoBvXacf5*LIM*S ze%$CN*FuB|sA;Q~2NDb6UaTlKB1NcTf)F9GRnoG`h6x+~>|fVXq~e9OVh+`62|cE; z#Hv%QpB(;W9udJKOH%Ss>CY*7P)71VV7^~F4@+Er4Ibo3=;mReP9u11`@SQw@5uw9 z&Lnvtum`&g9=3(Ad8|{s&f^SuBo9s;!GquP;C?bBf(H`5f|3W5FAy;5Jh=12lHh@t z*dB~e=K)0tYS@W8kEk*9QKLwGSs#DPL%!o-D9C_x9-gow$-|e(%)`WCU6VYVsfj4{ z;XFtOkLr^AV;-Hw+36=*O4|Z+*#6Nzmk0<|NXJHZk;XpjXKWwY9k;zZn z5)G63xEtml`epjQWW&%i554=vkMEz4nTJW@c;+G3;4uV}Jgmm#A6C!CE%o8gCja1c c)7N;s0XA?niS*+kIRF3v07*qoM6N<$f+%(ycmMzZ literal 0 HcmV?d00001 diff --git a/graphics/pokedex/hgss/tileset_menu_list.png b/graphics/pokedex/hgss/tileset_menu_list.png index 7fed73263d922ff11cff806cb6e662fddd1b994f..e04fcc17e8c9fc1c89b9b99d7cb8ef8a4b7eb7ad 100644 GIT binary patch delta 1447 zcmV;Y1z7s=8}kd0Bnkm@Qb$4nuFf3kks&^R1#wA4K~!jg?U>n;qc99baS0FervLxj z!Pa8QmVpq`T~ihH5(36Px>{J4g)MnoQ*4*_uU8DWZTS?y$#MGr9{^;$W%((9ypPze zY;MNfNV{A9jRZFV&@Z<2W_Ecfd=em7jhEX7VK&AjfG~jhMS$j8@45#NAYwqM>o0+S z5kUhOoSQ6Q{4O2>Tq^XnEVOgvOrMpY0|-Mrkyuf8fH<~M%nd-!BLGhwq}Zs8Qa%V^ z&zk6Mqr5#15cqw;-U5JR`iupbh+#ti5CE7?y9_HOmk?ZAJ(L0*_Ub$XfCe}yuzzd; zK&OEKlwSR3BEr66J^~>2NP$lAqY#vTPGtc0{4yPf7Ls;UX^_06HbOw10+I-0X50nP zc8Cr@6&V%Sd`%X{ zfOeS&07`-8OjRibn^zgQH;`@uI)2uGq~&I$?|bhZ=I2IqN;(1*{Nol3MF~59PfFqZ zb=*CGwVr)oR{-)G3asgvAa(PE0Qk4wl->r2tX<_!=3#*J1^7%AL;&rw>;djKB9Mus zp-imZ0hOfVJ0AYo0gj95#1!DjP5>spsZF%5WBBqKKZ5D{*#e{iU>oeOd$cXo^D(WV z9EQp$(A$#qp;rC|0D02JbmTIf8`(YW;dd&yCNTw z0WSkgJXFWbRzGxKyZqKa9TWlB$FYlj z-q{Qvrmac1B2AARvSpeqEv3znxdJt!ylfZ&eu2+J6>-rQ_Xqd+_4y#>&g9^1fAGez zns1dHg0lyWdK2^zfZr>BIdFPK{jdVl2MxWr`~W~mAOHso&Gz?G#o@I8k(vGP#rlc@ zHvwJ+dt8B6L(nPUVl$+`d?LN4JG>#DxMdZv(gaEPc>tq8uzorE5I}uNUQUB{?JVyV z&jDh482}Kn`a6L2#CfFv(AK4pFhCt4$$Zve@GvJ(61)IiYfrAwwk0bd8an-!5w zJ~4?4K)=AR#YZ);&FDhV#f)>{HIsy)^@9YXkZD4=5CCYx-3Ac%(Yh_skdRpbi5G$+ zam11{Ei}$$y~xA^7>qJQQbXrnut^4;WGx@G3Cx^k`Xc~;qXt(^A%}&;;yGHT3<@Nb z$S%a?V5+N2Bh`)9B{j9K_9PS<7lOvz6o3wZ4z}^Jv~n^3-whk&4H~r zU8j+Cq!)Dctg)x^k`d5U;~?A9%$J4ID7xmE+V2lyt7lF`laPAJlk5PAu1sjBI=L84 zGm1Wfq|+*Y*3MX0pHB5UfRPeHfOff8o`dP805(qDq>tJZ0JJ+myNZ1XKr5})v6l~9 zQhfw~?=@)47QbA{P%gJ00dQsAJVh=sz}6$9tbZTCv|rP9sX0^v0Il{rH+`o7DVe%% zY5!B^0k|*!Jiss77vKx<1^5Dd0lolVfL{mr2chH=z*5Fo(To59002ovPDHLkV1iIB BkWT;r literal 3569 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, STR_CONV_MODE_LEFT_ALIGN, 3); @@ -2276,9 +2274,8 @@ void BufferSaveMenuText(u8 textId, u8 *dest, u8 color) *string = flagCount + CHAR_0; string++; //修改,增加徽章单位显示 - *string++ = 0x04; - *string++ = 0x60; //手动写入汉字「个」的编码 - //*string++ = EOS; //结束 + StringAppend(string, COMPOUND_STRING("个")); + //*string++ = EOS; //修正错误 *endOfString = EOS; break; }