From 1e70488649e52d8d12da7b3480ad562323b1bbcc Mon Sep 17 00:00:00 2001
From: 12014 <BOT00XX@protonmail.com>
Date: Tue, 15 Apr 2025 22:07:47 +0900
Subject: [PATCH] Translation of the texts of Player PC, the Pokemon storage
 System and some Graphics.

---
 data/tilesets/primary/general/tiles.png | Bin 7622 -> 7722 bytes
 graphics/pokedex/search_menu.png        | Bin 1302 -> 1372 bytes
 graphics/pokemon_storage/menu.png       | Bin 1336 -> 1492 bytes
 src/contest.c                           |  30 ++++++------
 src/item_menu.c                         |  10 ++--
 src/player_pc.c                         |  32 ++++++------
 src/pokemon_storage_system.c            |  62 ++++++++++++------------
 src/strings.c                           |   8 +--
 8 files changed, 72 insertions(+), 70 deletions(-)
 mode change 100644 => 100755 data/tilesets/primary/general/tiles.png
 mode change 100644 => 100755 graphics/pokedex/search_menu.png
 mode change 100644 => 100755 graphics/pokemon_storage/menu.png

diff --git a/data/tilesets/primary/general/tiles.png b/data/tilesets/primary/general/tiles.png
old mode 100644
new mode 100755
index 17426ab80e8fe2434bc9ecefbc8e063fd4e6d09a..888dad6375a0b9d7f1c03fa5633662d9eaaa4ad8
GIT binary patch
delta 7673
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

delta 7596
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
O0000<MNUMnLSTXjY)c^k

diff --git a/graphics/pokedex/search_menu.png b/graphics/pokedex/search_menu.png
old mode 100644
new mode 100755
index 6d63a1b228fdbeca7c288e0b72d1ac865426bb51..8a547ae735445efea3ae7c686761a0bbcd0275a8
GIT binary patch
delta 1305
zcmV+!1?Kve3fu~i7#0Wv0002x2#-ww0004VQb$4nuFf3kks&{S+DSw~RA_<4Sc#I`
zFbMSw6IZel|NrOK;zq(wntFEWPT~W>6AuCDvamc^fMsL(b0X`y?xMT9bpVg`b%=dO
z!L<*&7yrwP<tqTe5j%d|31Cg-62Rd<0C=#R0=S}JT_2OYqhKZf3P4bQ2jJmWn88Z`
zV?^ctD+<=xKLTKX1baroPXIU&ko0wO{WXAV3T6P$6ZvNV(>eKA4%A<-g_lHdu(6ng
zJGut_^6uZRu|-ZKhY|q#o!t0GxtriDdE^1WzXDjIuR$%*gK+aHfP8CaJ*s5@;(l@j
zZz6COjse=N7G8O{-vBsE!X-v3L=A=)X6FpR_s8(R<fQ<AuzKX(F38<_y#{pEg*sQS
zdC(YLqZ)YJ;}tDXz5dwiiTbGLUnP3LJ!CO`Xsz2mK4pbR;Blg2*RznSqVvD$tEeXc
zaE|B{tfJgl2NJ`g7b1W#NG3hnQAc{%6D_lc06GP-099#kn<%G-fy2}gKp-swpuKks
zP04LDfF3e`)%VsMgA!T?0KFS)sh)c!8!|nmzyT0;HwgQ>1aR0^|55LF>Rxdy5&)V5
zNCEk6%!gkvP{05#a>XTKmQzy>0Ff_o0>u9oKohJ908Ty0DTv7`6O>ZWTBrk*KwCUs
z3ZTadk0GmabiE!(8L_gWY)AyK5~|@?2QX!QDN@6Koc{c|oh7TDxpx3u$Y@(s4lr6R
z;TGsIGQ>3|&y_9YvR9h{NZK|!w93^+-%{gIk5yP-KGp7O_QX=#wxDK}P$;n4naW(_
z@6ZbXULSO?yY)N;zakO92Z%q_`&8tIN|*;WYX(Ek`gy<=wQ$h9`BF%y78LxJn;C$!
z+gu%g2u;q<1J+rsBSZv;n+o;#V-Wr7_{SI`06DkKHv=w8c`1$&pr#ySAiD-a(cv(J
zsxg=VQ0t2AFzxeF|7jo!V_XE#H&43;j)hP%QJ@>+J_8W@p-{j8)F)F0zR9=<XxJ-4
zsT_?n0Bj4y^FVHFMx?_N$1rZr5hzy?c)E6fY@PO!0-pmH6gb}T`XmAdz#?G7=5-Ei
zI=rM5Pzd-0juFrwP%Z~_-nO9T^MEBmXt)6Ydq<yuOvDJx0C<8H{?7nd-dzJAe{>AB
z1Y`i7_Pd}-`fs|)bRM9A0o+)g<p4&Zs&``H1OWB<);8|&*2>d)z}~f4&m*Xnije+)
zRjY)af?NB1j6o*r4B*Z_|EYKienldH{Zdfn#?8k_^vLeJ=4~z0CH+?{sgKPaPkHF`
zQ7^MM13>>&sJL3`Da2KXK<x5U0}u<G`7cs}inCWI1f7DNjts~jo?jALu`>mz*WZD`
z1uJmH`v)n7RjZO5!;%8Ph5=$y!c`}K0JteJmvlJ=%8jUMAIL+16tH2?+8OnWP(V0+
zXW<1201P9jQH}2@0PthW5V8P3Vv8?1A94UnWEHYXodIYLK(z=IOS35lGzlsPEe9ax
ziX;KdxiaQ}BUHj%Cjh!NN`;hLF((*CO5f)|aZ#Qrs66CQ<}$}w5*7iV!_g&p02ecv
zB!mJ7KmpPLuf?6ikOPHsNrAqlKxpDQN)jibpc)KHtx{(SeB6OIGy+usQi-`|bENcY
z7XYhh@u$}<QzfikXf~J+!PpBj8GFH*c(b4CF@V=~H@tfkhyZ?i4jAPx!ENFNLB2Fg
P00000NkvXXu0mjfx70>s

delta 1235
zcmV;^1T6d93YH3x7zqRe0000W_+m_vE<b;vNkl<ZScRpQzmDTJ5XKGM3oSsTAc(t{
z2sUr9LU2G*-adeVgVdx^Bh~`0kV|!Bf0b~}0o!StG%0rX8S;I@ztVbrPHte!_K^DV
zo8b(t!vVIy6l{XsSJwPV?~{zF-_}*$(eCf><dgRw)-?>A2RyF{@XK|8PffNR;I@AW
z^KM}qz&3>DHrYOe=8pg%`vTzZ*CcZfNJ{y6A%r_s0Dmj>p@i_?0nH0+U3t9-*oBY*
zOJ#2YzN-s%cz0>^Jry3(RNA}nfvdXVy>kD4MBXJw1;96N!#mHc?g_VH@TSP(F1-Ob
zgfEd+d;(SH0i2NUxsfQumjO}1;cb5fO4T7Gt(y=6_iaF(#Dhu-N)khAvjhQrzqC=8
z?Y#h&<!iIIYke;-%Yrg)rpbV3P=*E<4A3{uv-n0gWgjN6ShJ6Pa#$Ze!tago9G~6v
z1(V?$XFq#Cs(=o@X~HiTeVE6y;;?+B8>=~$C({=cjGmT!6Mh<}=#qJCbpd~PgXJ9E
zWikNxJ%%_E0L%Nya~+=n>jNem$Z{z}$`!!upa7iWL!_9-g{A<I9AH3EK}_Tp;7-P6
z-^mFLps4^T%^2nYNsE9O0s))6gd~<+<s2Aun!UsB%x(|x%umUImt4&;u{^0H1Rv^P
zbfYsR1V0;(9XBVJd}?-515$qnq5zf1fmjEl@+JdN5`4KjvHl!Dq#1?fus3eb@tTwJ
zC-792mx(C>Lu~;cxiRh}ah*IXj6UqQgP*S{`6f<sxVqpAAxMo^mh1k<z6f}D)n(WE
zLI^)$5pZ4apELf!#PeVZbx_4CHHg9xZ<yc0Gqmk-Xm#7R8Gt^=fR}$d;QplZz_aQ`
zwuAVZ=J&R@8i-D74anyR;QpfHr~u_um2y;oj*b$zw$}a7S`Y?G$N+R4ZXQ+L`|JYm
zlu3;v0L8Vn4x!`_*kcB!Vmqc@kj`T-`3$fG^jh0~3&11*=Fm%}nczWi=>*LRx~+oH
z&a_<!qG0r!5F~nBYXyG-5Cvm6KQ}oTdCZg$devK`GARg;H_QQ=*#xa-lLHg$AOa9U
zuUj=F1sMPZBQsC~sLJmE)^Z#BL9>_=K>imD4j&u<_4&sWeKtWy0ziZ9xRFOy1JL^(
z=Kx!uN%#`a1NMHn_*99|fHLX^+gYi^_=tC1??(y6nhdzE_s@S>en$Mi76IR0HukhE
zS1q4Z;6Zj98y;;X-mq6X^?vm6mkhKS@c7Rb@YnOoj4P!DfckHlaoGh{5jsLD@pA+$
z-`br$EnKX(Js5b|Bmq@`O4e;>duxXzApuYtQC|ccb%%L2cb-%tTB#r8&sAr@`Y3m4
zwz`$C3;_;^$25P`Zl3{1-J=~al|uG_Hk?x#fV;J|=$~T+P?m<F!R|u<K-oG6XnKg}
z2~q$$9H+LoWos&c)-?cYqiJmwZ!7WiL)?WkA@rLNv~3X+b7M;qj{tO_*jIpFS>5Rh
z0F{ghnJpo-y0e6y3jqykTU&>qg@Jr^IfPaMQdSLpT?aq=N+bYPXZb?T`H?D7HUUcw
xU8%%3d!e?}3$J|yJZ`)3SpZktPn`#}e*w3)k?uwz=<@&o002ovPDHLkV1hmqIk5l$

diff --git a/graphics/pokemon_storage/menu.png b/graphics/pokemon_storage/menu.png
old mode 100644
new mode 100755
index 0a1ca913b0803e2d4dcb8f3dbfbdbeb8889ba2e3..92889b0e03025aa20b8dac5d2f9e394c2ff18f6b
GIT binary patch
delta 1353
zcmV-P1-AOQ3e*dboPPx(Nkl<ZXo1yPiI%G<5H<3W1L+s$^kU#GG5`OULv1XITeQ!a
zxg8ZtLS1gLl<B597%f97)tUj&$WP^ZwErghNB6f|c_exx0;faJCIS`r;W%BU2()ct
zCy#T!XbUHPs2FV>B*5F-?KU`0#9*2LG-|CX0fun2aI$a{s(+!$)~JdAx7*15Eifnu
zv||F6p;9RpgaJPUYTrPBJDqhtc3jcbDk<6-0=H@ih6LJi2t<IEoCOya-6>Q+aUn9<
zO`vUuO{nV?8&+5NyJ88T*rKp>72`q(w5H?dPdb(fSbM#qwBUgW1fNO>D6!zf!wEom
z&u93=atr5Rf`8j9m0PZ(&MQJtQdlH#W+*Nz#WrDfR`TI$2NQ^p^6)yqt09mtj>f<~
zY#_jBif_M)8i9onj0wE%KBKUnfNWpQaLF8Q7C)*`O6oVC@4N6HATU@m*AkHWNT7cm
zhY;v{PoOq^pUQX}OGPz!;QOX6Lr^9RYF!9ILk{2_wtwpgW1o&|x$H@!3Iey7G6~ia
z04GGixy+|`88uRd%b}J-0&Nxo$(U9U7=)m3L)~=j2H@fopK1XE*R+?@$&d!-B>rWd
zt{(%L0v;~x1@(yW0Ba<`LWPCsl9JlXrIq58<53<i1Y+M@L7*IV-bVuX9p`Z+ya=-L
zW&%DJw|`VXBGBi7f*TJZn7|Z)xP%S}P;)8LE*Bu1l)d-qQTWm}0__w5^e3SX7ncOc
zCuN`2>d87uU}@va3G7-4H|}~(mB608VA9k4%V$PlAA`x4(ggzlWYb_5ny+USUsHC}
z{Nv-}E8_8ZyuW{bO<<}c5#96G7{8xg_xxMIvwsr;T?7&6Cb0D49~AiYdxSrrz~4%L
zW)!&B(VV8{8IPr|P5>0B^k-TDa)*nK`1bGt0>htbavY`r`J^p@IXE9afq>CkTRz}~
zZ@*g8-N6dnX-n`9%dk2#0b{i_T!4;S!$b~N;4a%DD-bptB)~s$K%WB*P{Cl)n(tKL
zj(-^s62LwigI<vd5HNcbcoZlVfKR+B6tL87OCbmhjD1mo#{>b&IK23GLj?>d0N!_w
zfyWd9$_kuk0&xtW^fd0N`xJtg$G{j80_1R~5MV(<02=Thv@i~EZiWjeFvgMsa|FgK
zA%!5GG_61y4W_;qY*yg&vzu9p-)8WN0)JIhDkIkH1zQ!UZtIoGh-M+@+N=Oe-auvv
zSD6S>!|^J#m<P<}12YOt5s(_*ZzQl)0rVRj_X7ev=DuG6aV%Gv2mUU3fcstrd?N5(
z5ReT(rr&x6#tR{>gtamK?BH!CInD|A+<&)0fo)l_&!rF3Pv)V-KF<Hu3T%WZz<<*}
z5|GiK=Kuc%>;4_LzUE>xL(H$#@m;xDTGQ7yGs0ZX9{=Ua1m<?N6{r)?lAvo&)iF=d
zc`C2ph`?Le!8IM4ws+js#U$ofHd2#qrb>X)lq_wwMf!@iL?AR(_>{CFB^aqF^^&a~
z0?y7bLBoD=_LkWqfy_bbu1Os?1%JcHk&6=w7|zbD;XKW-$&j&BKo=e3hGQ&pTl61|
z6ADPq%6>6_wlRIJD!_d<DG*t&WekWuiwf98AdUuLVDNPgjdcZ*izq=Pz@~w5E(C_v
zHmrq-3e*Ros8IIX=&{%3F(Cd?c`8{gFEiyVFe0j!1Y72tiT-8SnM^G`H$n@diYaH;
zaZJ&4%0sXNbporGu!Ubb)-I?ctXsp6*$b+_KCb+Mbal<eW(N2dRnL!s1Q!EC00000
LNkvXXu0mjfXw+>Y

delta 1196
zcmV;d1XKIe3%Cl9oPPv{Nkl<ZXo1z4i*}nZ42B78J+L(Fw7I~#g}nb;PO>E5kc}ba
zob7My*oL4F3EN6qRXeL@HBD1@k<1_;mG`~vSJu8Ue>#Q5;mrUJyQp>mig_r9w-*Bh
z4mci9r>Go=Kmo9kvvJ~%^oryzjQ2Y;e*%I4pq>HrAbS;PL4WZcD}&Pn+8+R4EWcyn
zkjXT$(?<jzz)1~33{dL;=Gr}(A$yI3BMh!0f(-zX3x9y@t^Y7R>iBTXXOHAU(6&_G
z->EDEknhb6LdO8~1VCM)YN%jyUx4r58|w$`z)Q?nfW`qdX#g975Mc>`9yc~Z5;Fh;
zI84>J=B@zF4}bR3)R|2`eIk~JKt84e_?KR_9IXIgRl%pXN&{F3!5m<_c@Lo+Kz5HR
zUNYm&;+v|bk@Ktb$5Z+T0HP(c6hO{50MmBu0`P?Wsj9;egb71a7J_LS$8o}%TUg=W
z6daj&gj+OLH37iMrc9zjfMLMvVudYJ!`~Dh!Ix=+27ekGE6km|bfFj^41u}0t870!
z0x)25uy|Ni_1odlkq^3q*q3=){0tNUz&(4uumDIPdV8y-nKC@f!|gM`o+Ufv>q(BV
z2Ta!|H2{Dh^4co_hQWH)80TV-utn3I187PC*d;Uq@Vy-Z&|H`#IHNp{G`0?)P5~Hi
zV>M7^`hR9jYCDV`krtFBz|zL&13a}7uH5x172uh@AZaQ8<<kRrjv)D+Z~@?_Hw~Ur
zb$O_|q{fZUKR-V&R`>h;<KuiuD0L%N*T=89z8=@><By`pRRFG51aM7g>3cVL;Mdno
zztIDKl>5ne;HIlO)LEeiGywE~azAMgB<vf2_<yGwU%PqWc7sKpDt?(V0zlVhw4Vof
zC%|g7tzqy1;5#N%UK{HDJODS0HgBUKP}c+K+pg=|zVq5`x2Fdn;tXJJ9=kyZjOmU6
zIxJ9c^}s!l1EB5xMgUO=oM{2T5Nz|nT?KGA@2WgNyKxrW6#xvpXPdgS5cB~+zjYSO
z1%J~JHu{@+*>^1QEa=P+F5Ko>FxQd?RDk3{<kkULcud7_IHK<bt37Z&Uo$J=F{3RW
zP^Fw~RI(SW^?<sqD<>OO3pv+n53tKC%xm#oCW4$X(1LJV%mcFdK*j?p06F8f7GSLh
zAdyu8_?f$m^abg49+(UP089iR^FW^Zfq(Qu4~zmpo)7@ue%$mc_rQE1q?J&6rojWF
zf9DQh2m!7uJg_b+9(@3qelic`;j{C<*aIsi9^mP30c85Q`TxJD?7v~<XD(kSQhuej
z-<7MSHNE&cv2r=P{g*2P<aV_ZsQ|g0U34UXW68NWbs7LACnia6dr8(geeV+hlz&io
z?I6>jhJRX@12CC7e*zmlr|hk1r~q`$E^2qyPB0jZ>mlGwz4elH&L3r50cd9cZ34gz
zXG7515I6w)$wdGc0tt)f`~?6BLF+=W0U#5CB>?vMJOsUc24DLOxJ+F_!09_SbO0^8
zeqt6BeDbC1K=BH;@JmPWiW;kI2_@fYFVKE|Ec}7A_{`<&g!&5*vyE{&U#7eO0000<
KMNUMnLSTZ!mL;+P

diff --git a/src/contest.c b/src/contest.c
index a77015687a..ef8ec9dc95 100644
--- a/src/contest.c
+++ b/src/contest.c
@@ -690,7 +690,7 @@ static const u16 sText_Pal[] = INCBIN_U16("graphics/contest/text.gbapal");
 
 const u8 *const gContestEffectDescriptionPointers[] =
 {
-    [CONTEST_EFFECT_HIGHLY_APPEALING]                      = COMPOUND_STRING("能获得很多关注度。"),
+    [CONTEST_EFFECT_HIGHLY_APPEALING]                      = COMPOUND_STRING("能获得很多吸引力。"),
     [CONTEST_EFFECT_USER_MORE_EASILY_STARTLED]             = COMPOUND_STRING("在表演这个招式之后\n宝可梦会变得很容易受惊。"),
     [CONTEST_EFFECT_GREAT_APPEAL_BUT_NO_MORE_MOVES]        = COMPOUND_STRING("这个表演会受到全场瞩目，但\n后面直到结束前什么都不能做了。"),
     [CONTEST_EFFECT_REPETITION_NOT_BORING]                 = COMPOUND_STRING("即使在下回继续使用也不会\n被审查员厌烦并获得关注。"),
@@ -709,7 +709,7 @@ const u8 *const gContestEffectDescriptionPointers[] =
     [CONTEST_EFFECT_SHIFT_JUDGE_ATTENTION]                 = COMPOUND_STRING("能够转移审查员对\n其他宝可梦的关注度。"),
     [CONTEST_EFFECT_STARTLE_MON_WITH_JUDGES_ATTENTION]     = COMPOUND_STRING("特别是能够惊吓受到\n审查员关注的宝可梦。"),
     [CONTEST_EFFECT_JAMS_OTHERS_BUT_MISS_ONE_TURN]         = COMPOUND_STRING("不停地在场上捣乱，\n下个回合不能参加表演。"),
-    [CONTEST_EFFECT_STARTLE_MONS_SAME_TYPE_APPEAL]         = COMPOUND_STRING("特别是能够惊吓和自己\n有着一样类型关注度的宝可梦。"),
+    [CONTEST_EFFECT_STARTLE_MONS_SAME_TYPE_APPEAL]         = COMPOUND_STRING("特别是能够惊吓和自己\n有着一样类型吸引力的宝可梦。"),
     [CONTEST_EFFECT_STARTLE_MONS_COOL_APPEAL]              = COMPOUND_STRING("特别是能够惊吓表演\n帅气招式的宝可梦。"),
     [CONTEST_EFFECT_STARTLE_MONS_BEAUTY_APPEAL]            = COMPOUND_STRING("特别是能够惊吓表演\n美丽招式的宝可梦。"),
     [CONTEST_EFFECT_STARTLE_MONS_CUTE_APPEAL]              = COMPOUND_STRING("特别是能够惊吓表演\n可爱招式的宝可梦。"),
@@ -719,24 +719,24 @@ const u8 *const gContestEffectDescriptionPointers[] =
     [CONTEST_EFFECT_MAKE_FOLLOWING_MONS_NERVOUS]           = COMPOUND_STRING("会使在这之后登场的\n所有宝可梦紧张。"),
     [CONTEST_EFFECT_WORSEN_CONDITION_OF_PREV_MONS]         = COMPOUND_STRING("降低已经表演完的\n宝可梦们的状态。"),
     [CONTEST_EFFECT_BADLY_STARTLES_MONS_IN_GOOD_CONDITION] = COMPOUND_STRING("特别是能够惊吓\n当前状态很好的宝可梦。"),
-    [CONTEST_EFFECT_BETTER_IF_FIRST]                       = COMPOUND_STRING("率先第一个出场表演的话\n很容易获得很高的关注度"),
-    [CONTEST_EFFECT_BETTER_IF_LAST]                        = COMPOUND_STRING("最后一个出场表演的话\n很容易获得很高的关注度"),
-    [CONTEST_EFFECT_APPEAL_AS_GOOD_AS_PREV_ONES]           = COMPOUND_STRING("能够表演同之前登场过的\n宝可梦们相同的关注度。"),
-    [CONTEST_EFFECT_APPEAL_AS_GOOD_AS_PREV_ONE]            = COMPOUND_STRING("能够表演同前一只登场的\n宝可梦相同的关注度。"),
-    [CONTEST_EFFECT_BETTER_WHEN_LATER]                     = COMPOUND_STRING("越在所有宝可梦的后面表演\n越容易获得关注度。"),
-    [CONTEST_EFFECT_QUALITY_DEPENDS_ON_TIMING]             = COMPOUND_STRING("根据出场时间的不同，\n关注度的状态也有所变化。"),
-    [CONTEST_EFFECT_BETTER_IF_SAME_TYPE]                   = COMPOUND_STRING("与前一只宝可梦的关注度\n一样的话就会受到喜欢。"),
-    [CONTEST_EFFECT_BETTER_IF_DIFF_TYPE]                   = COMPOUND_STRING("与前一只宝可梦的关注度\n不一样的话就会受到喜欢。"),
-    [CONTEST_EFFECT_AFFECTED_BY_PREV_APPEAL]               = COMPOUND_STRING("招式的关注度会受到\n前面一只宝可梦的影响。"),
-    [CONTEST_EFFECT_IMPROVE_CONDITION_PREVENT_NERVOUSNESS] = COMPOUND_STRING("能够提升自身关注度的状态，\n并且变得不那么容易紧张。"),
-    [CONTEST_EFFECT_BETTER_WITH_GOOD_CONDITION]            = COMPOUND_STRING("如果状态好的时候表演的话\n很容易获得很高的关注度。"),
+    [CONTEST_EFFECT_BETTER_IF_FIRST]                       = COMPOUND_STRING("率先第一个出场表演的话\n很容易获得很高的吸引力"),
+    [CONTEST_EFFECT_BETTER_IF_LAST]                        = COMPOUND_STRING("最后一个出场表演的话\n很容易获得很高的吸引力"),
+    [CONTEST_EFFECT_APPEAL_AS_GOOD_AS_PREV_ONES]           = COMPOUND_STRING("能够表演同之前登场过的\n宝可梦们相同的吸引力。"),
+    [CONTEST_EFFECT_APPEAL_AS_GOOD_AS_PREV_ONE]            = COMPOUND_STRING("能够表演同前一只登场的\n宝可梦相同的吸引力。"),
+    [CONTEST_EFFECT_BETTER_WHEN_LATER]                     = COMPOUND_STRING("越在所有宝可梦的后面表演\n越容易获得吸引力。"),
+    [CONTEST_EFFECT_QUALITY_DEPENDS_ON_TIMING]             = COMPOUND_STRING("根据出场时间的不同，\n吸引力的状态也有所变化。"),
+    [CONTEST_EFFECT_BETTER_IF_SAME_TYPE]                   = COMPOUND_STRING("与前一只宝可梦的吸引力\n一样的话就会受到喜欢。"),
+    [CONTEST_EFFECT_BETTER_IF_DIFF_TYPE]                   = COMPOUND_STRING("与前一只宝可梦的吸引力\n不一样的话就会受到喜欢。"),
+    [CONTEST_EFFECT_AFFECTED_BY_PREV_APPEAL]               = COMPOUND_STRING("招式的吸引力会受到\n前面一只宝可梦的影响。"),
+    [CONTEST_EFFECT_IMPROVE_CONDITION_PREVENT_NERVOUSNESS] = COMPOUND_STRING("能够提升自身吸引力的状态，\n并且变得不那么容易紧张。"),
+    [CONTEST_EFFECT_BETTER_WITH_GOOD_CONDITION]            = COMPOUND_STRING("如果状态好的时候表演的话\n很容易获得很高的吸引力。"),
     [CONTEST_EFFECT_NEXT_APPEAL_EARLIER]                   = COMPOUND_STRING("下一回合登场时自己的\n登场顺序会更靠前。"),
     [CONTEST_EFFECT_NEXT_APPEAL_LATER]                     = COMPOUND_STRING("下一回合登场时自己的\n登场顺序会更靠后。"),
     [CONTEST_EFFECT_MAKE_SCRAMBLING_TURN_ORDER_EASIER]     = COMPOUND_STRING("使得下一回合登场的顺序\n更容易被打乱。"),
     [CONTEST_EFFECT_SCRAMBLE_NEXT_TURN_ORDER]              = COMPOUND_STRING("会打乱下个回合宝可梦们\n登场表演的顺序。"),
     [CONTEST_EFFECT_EXCITE_AUDIENCE_IN_ANY_CONTEST]        = COMPOUND_STRING("无论是什么类型的华丽大赛\n表演这个招式都能获得关注度。"),
-    [CONTEST_EFFECT_BADLY_STARTLE_MONS_WITH_GOOD_APPEALS]  = COMPOUND_STRING("特别是能够惊吓场上\n关注度很高的所有宝可梦。"),
-    [CONTEST_EFFECT_BETTER_WHEN_AUDIENCE_EXCITED]          = COMPOUND_STRING("会场上的气氛越热烈，\n越容易受到喜爱与关注。"),
+    [CONTEST_EFFECT_BADLY_STARTLE_MONS_WITH_GOOD_APPEALS]  = COMPOUND_STRING("特别是能够惊吓场上\n吸引力很高的所有宝可梦。"),
+    [CONTEST_EFFECT_BETTER_WHEN_AUDIENCE_EXCITED]          = COMPOUND_STRING("会场上的气氛越热烈，\n越容易受到关注度与吸引力。"),
     [CONTEST_EFFECT_DONT_EXCITE_AUDIENCE]                  = COMPOUND_STRING("在这个表演结束之后，\n会场的气氛会变得冷清一会儿。"),
 };
 
diff --git a/src/item_menu.c b/src/item_menu.c
index 04a0febfb1..b8cef425e7 100755
--- a/src/item_menu.c
+++ b/src/item_menu.c
@@ -212,11 +212,11 @@ static void ConfirmSell(u8);
 static void CancelSell(u8);
 static void Task_FadeAndCloseBagMenuIfMulch(u8 taskId);
 
-static const u8 sText_Var1CantBeHeldHere[] = _("The {STR_VAR_1} can't be held\nhere.");
-static const u8 sText_DepositHowManyVar1[] = _("Deposit how many\n{STR_VAR_1}?");
-static const u8 sText_DepositedVar2Var1s[] = _("Deposited {STR_VAR_2}\n{STR_VAR_1}.");
-static const u8 sText_NoRoomForItems[] = _("There's no room to\nstore items.");
-static const u8 sText_CantStoreImportantItems[] = _("Important items\ncan't be stored in\nthe PC!");
+static const u8 sText_Var1CantBeHeldHere[] = _("不能让宝可梦持有\n{STR_VAR_1}！");
+static const u8 sText_DepositHowManyVar1[] = _("要存放多少个\n{STR_VAR_1}呢？");
+static const u8 sText_DepositedVar2Var1s[] = _("存放了{STR_VAR_2}个\n{STR_VAR_1}。");
+static const u8 sText_NoRoomForItems[] = _("已经没有\n存放道具的空间了……");
+static const u8 sText_CantStoreImportantItems[] = _("重要物品\n不能存放到\n电脑中！");
 
 static const struct BgTemplate sBgTemplates_ItemMenu[] =
 {
diff --git a/src/player_pc.c b/src/player_pc.c
index 352a7a11f8..afcc31e1e4 100644
--- a/src/player_pc.c
+++ b/src/player_pc.c
@@ -181,30 +181,30 @@ static EWRAM_DATA u8 sTopMenuNumOptions = 0;
 EWRAM_DATA struct PlayerPCItemPageStruct gPlayerPCItemPageInfo = {};
 static EWRAM_DATA struct ItemStorageMenu *sItemStorageMenu = NULL;
 
-static const u8 sText_WithdrawItem[] = _("WITHDRAW ITEM");
-static const u8 sText_DepositItem[] = _("DEPOSIT ITEM");
-static const u8 sText_TossItem[] = _("TOSS ITEM");
-static const u8 sText_Mailbox[] = _("MAILBOX");
+static const u8 sText_WithdrawItem[] = _("取出道具");
+static const u8 sText_DepositItem[] = _("存放道具");
+static const u8 sText_TossItem[] = _("丢弃道具");
+static const u8 sText_Mailbox[] = _("邮件箱");
 
-static const u8 sText_WithdrawHowManyItems[] = _("Withdraw how many\n{STR_VAR_1}?");
-static const u8 sText_WithdrawXItems[] = _("Withdrew {STR_VAR_2}\n{STR_VAR_1}.");
-static const u8 sText_NoRoomInBag[] = _("There is no more\nroom in the BAG.");
+static const u8 sText_WithdrawHowManyItems[] = _("要取出多少个\n{STR_VAR_1}呢？");
+static const u8 sText_WithdrawXItems[] = _("取出了{STR_VAR_2}个\n{STR_VAR_1}。");
+static const u8 sText_NoRoomInBag[] = _("包包已经满了！");
 static const u8 sText_TooImportantToToss[] = _("That's much too\nimportant to toss\nout!");
 
 static const u8 *const sItemStorage_OptionDescriptions[] =
 {
-    [MENU_WITHDRAW] = COMPOUND_STRING("Take out items from the PC."),
-    [MENU_DEPOSIT]  = COMPOUND_STRING("Store items in the PC."),
-    [MENU_TOSS]     = COMPOUND_STRING("Throw away items stored in the PC."),
+    [MENU_WITHDRAW] = COMPOUND_STRING("从电脑中\n取出道具。"),
+    [MENU_DEPOSIT]  = COMPOUND_STRING("将道具\n放入电脑中。"),
+    [MENU_TOSS]     = COMPOUND_STRING("丢弃电脑中\n存放的道具。"),
     [MENU_EXIT]     = gText_GoBackPrevMenu,
 };
 
 static const struct MenuAction sPlayerPCMenuActions[] =
 {
-    [MENU_ITEMSTORAGE] = { COMPOUND_STRING("ITEM STORAGE"), {PlayerPC_ItemStorage} },
+    [MENU_ITEMSTORAGE] = { COMPOUND_STRING("存放道具"), {PlayerPC_ItemStorage} },
     [MENU_MAILBOX]     = { sText_Mailbox,                   {PlayerPC_Mailbox} },
-    [MENU_DECORATION]  = { COMPOUND_STRING("DECORATION"),   {PlayerPC_Decoration} },
-    [MENU_TURNOFF]     = { COMPOUND_STRING("TURN OFF"),     {PlayerPC_TurnOff} }
+    [MENU_DECORATION]  = { COMPOUND_STRING("装饰"),   {PlayerPC_Decoration} },
+    [MENU_TURNOFF]     = { COMPOUND_STRING("切断接续"),     {PlayerPC_TurnOff} }
 };
 
 static const u8 sBedroomPC_OptionOrder[] =
@@ -240,9 +240,9 @@ static const u16 sNewGamePCItems[][2] =
 
 const struct MenuAction gMailboxMailOptions[] =
 {
-    { COMPOUND_STRING("READ"),        {Mailbox_DoMailRead} },
-    { COMPOUND_STRING("MOVE TO BAG"), {Mailbox_MoveToBag} },
-    { COMPOUND_STRING("GIVE"),        {Mailbox_Give} },
+    { COMPOUND_STRING("阅读"),        {Mailbox_DoMailRead} },
+    { COMPOUND_STRING("放入包包"), {Mailbox_MoveToBag} },
+    { COMPOUND_STRING("给予"),        {Mailbox_Give} },
     { gText_Cancel2,                  {Mailbox_Cancel} }
 };
 
diff --git a/src/pokemon_storage_system.c b/src/pokemon_storage_system.c
index 460f3714bb..3df3841c12 100644
--- a/src/pokemon_storage_system.c
+++ b/src/pokemon_storage_system.c
@@ -850,15 +850,15 @@ void UpdateSpeciesSpritePSS(struct BoxPokemon *boxmon);
 
 static const u8 gText_JustOnePkmn[] = _("这样就没有可战斗的宝可梦了！");
 static const u8 gText_PartyFull[] = _("同行的宝可梦已经满了！");
-static const u8 gText_Box[] = _("盒子");
+static const u8 gText_Box[] = _("箱子 ");
 
 struct {
     const u8 *text;
     const u8 *desc;
 } static const sMainMenuTexts[OPTIONS_COUNT] =
 {
-    [OPTION_WITHDRAW]   = {COMPOUND_STRING("存放宝可梦"),     COMPOUND_STRING("可以将存放在盒子中的宝可梦\n取出并添加到队伍中。")},
-    [OPTION_DEPOSIT]    = {COMPOUND_STRING("取出宝可梦"),     COMPOUND_STRING("可以将当前队伍中的宝可梦\n存放到电脑中。")},
+    [OPTION_WITHDRAW]   = {COMPOUND_STRING("取出宝可梦"),     COMPOUND_STRING("可以将当前队伍中的宝可梦\n存放到电脑中。")},
+    [OPTION_DEPOSIT]    = {COMPOUND_STRING("存放宝可梦"),     COMPOUND_STRING("可以将存放在盒子中的宝可梦\n取出并添加到队伍中。")},
     [OPTION_MOVE_MONS]  = {COMPOUND_STRING("整理宝可梦"),     COMPOUND_STRING("可以整理当前队伍以及\n盒子中存放的所有宝可梦。")},
     [OPTION_MOVE_ITEMS] = {COMPOUND_STRING("整理道具"),       COMPOUND_STRING("可以整理当前所有宝可梦\n所携带的道具。")},
     [OPTION_EXIT]       = {COMPOUND_STRING("再见！"),         COMPOUND_STRING("返回上一个菜单。")}
@@ -1038,41 +1038,41 @@ static const struct SpriteTemplate sSpriteTemplate_DisplayMon =
     .callback = SpriteCallbackDummy,
 };
 
-static const u8 gText_PkmnIsSelected[] = _("{DYNAMIC 0} is selected.");
+static const u8 gText_PkmnIsSelected[] = _("要对{DYNAMIC 0}做什么？");
 
 static const struct StorageMessage sMessages[] =
 {
-    [MSG_EXIT_BOX]             = {COMPOUND_STRING("Exit from the BOX?"),         MSG_VAR_NONE},
-    [MSG_WHAT_YOU_DO]          = {COMPOUND_STRING("What do you want to do?"),    MSG_VAR_NONE},
-    [MSG_PICK_A_THEME]         = {COMPOUND_STRING("Please pick a theme."),       MSG_VAR_NONE},
-    [MSG_PICK_A_WALLPAPER]     = {COMPOUND_STRING("Pick the wallpaper."),        MSG_VAR_NONE},
+    [MSG_EXIT_BOX]             = {COMPOUND_STRING("要停止对箱子的操作吗？"),         MSG_VAR_NONE},
+    [MSG_WHAT_YOU_DO]          = {COMPOUND_STRING("要对这个箱子做什么？"),    MSG_VAR_NONE},
+    [MSG_PICK_A_THEME]         = {COMPOUND_STRING("要选择哪一种壁纸主题？"),       MSG_VAR_NONE},
+    [MSG_PICK_A_WALLPAPER]     = {COMPOUND_STRING("要选择哪一种壁纸？"),        MSG_VAR_NONE},
     [MSG_IS_SELECTED]          = {gText_PkmnIsSelected,                          MSG_VAR_MON_NAME_1},
-    [MSG_JUMP_TO_WHICH_BOX]    = {COMPOUND_STRING("Jump to which BOX?"),         MSG_VAR_NONE},
-    [MSG_DEPOSIT_IN_WHICH_BOX] = {COMPOUND_STRING("Deposit in which BOX?"),      MSG_VAR_NONE},
-    [MSG_WAS_DEPOSITED]        = {COMPOUND_STRING("{DYNAMIC 0} was deposited."), MSG_VAR_MON_NAME_1},
-    [MSG_BOX_IS_FULL]          = {COMPOUND_STRING("这个盒子已经满了！"),           MSG_VAR_NONE},
+    [MSG_JUMP_TO_WHICH_BOX]    = {COMPOUND_STRING("要跳转到哪个箱子？"),         MSG_VAR_NONE},
+    [MSG_DEPOSIT_IN_WHICH_BOX] = {COMPOUND_STRING("要存放到哪个箱子中？"),      MSG_VAR_NONE},
+    [MSG_WAS_DEPOSITED]        = {COMPOUND_STRING("存放了{DYNAMIC 0}！"), MSG_VAR_MON_NAME_1},
+    [MSG_BOX_IS_FULL]          = {COMPOUND_STRING("这个箱子已经满了！"),           MSG_VAR_NONE},
     [MSG_RELEASE_POKE]         = {COMPOUND_STRING("真的要放生吗？"),      MSG_VAR_NONE},
     [MSG_WAS_RELEASED]         = {COMPOUND_STRING("已将{DYNAMIC 0}放生了！"),  MSG_VAR_RELEASE_MON_1},
-    [MSG_BYE_BYE]              = {COMPOUND_STRING("再见，{DYNAMIC 0}！"),      MSG_VAR_RELEASE_MON_3},
-    [MSG_MARK_POKE]            = {COMPOUND_STRING("Mark your POKéMON."),         MSG_VAR_NONE},
-    [MSG_LAST_POKE]            = {COMPOUND_STRING("That's your last POKéMON!"),  MSG_VAR_NONE},
+    [MSG_BYE_BYE]              = {COMPOUND_STRING("再见了！{DYNAMIC 0}！"),      MSG_VAR_RELEASE_MON_3},
+    [MSG_MARK_POKE]            = {COMPOUND_STRING("请选择标记。"),         MSG_VAR_NONE},
+    [MSG_LAST_POKE]            = {COMPOUND_STRING("没有可以战斗的宝可梦了！"),  MSG_VAR_NONE},
     [MSG_PARTY_FULL]           = {gText_YourPartysFull,                          MSG_VAR_NONE},
-    [MSG_HOLDING_POKE]         = {COMPOUND_STRING("You're holding a POKéMON!"),  MSG_VAR_NONE},
-    [MSG_WHICH_ONE_WILL_TAKE]  = {COMPOUND_STRING("Which one will you take?"),   MSG_VAR_NONE},
-    [MSG_CANT_RELEASE_EGG]     = {COMPOUND_STRING("You can't release an EGG."),  MSG_VAR_NONE},
-    [MSG_CONTINUE_BOX]         = {COMPOUND_STRING("Continue BOX operations?"),   MSG_VAR_NONE},
-    [MSG_CAME_BACK]            = {COMPOUND_STRING("{DYNAMIC 0} came back!"),     MSG_VAR_MON_NAME_1},
-    [MSG_WORRIED]              = {COMPOUND_STRING("Was it worried about you?"),  MSG_VAR_NONE},
+    [MSG_HOLDING_POKE]         = {COMPOUND_STRING("正在抓着宝可梦！"),  MSG_VAR_NONE},
+    [MSG_WHICH_ONE_WILL_TAKE]  = {COMPOUND_STRING("请选择要带走的宝可梦！"),   MSG_VAR_NONE},
+    [MSG_CANT_RELEASE_EGG]     = {COMPOUND_STRING("你不能放生宝可梦蛋！"),  MSG_VAR_NONE},
+    [MSG_CONTINUE_BOX]         = {COMPOUND_STRING("要继续对箱子的操作吗？"),   MSG_VAR_NONE},
+    [MSG_CAME_BACK]            = {COMPOUND_STRING("{DYNAMIC 0}回来了！"),     MSG_VAR_MON_NAME_1},
+    [MSG_WORRIED]              = {COMPOUND_STRING("它是在担心你吗？"),  MSG_VAR_NONE},
     [MSG_SURPRISE]             = {COMPOUND_STRING("… … … … !"),                  MSG_VAR_NONE},
-    [MSG_PLEASE_REMOVE_MAIL]   = {COMPOUND_STRING("Please remove the MAIL."),    MSG_VAR_NONE},
+    [MSG_PLEASE_REMOVE_MAIL]   = {COMPOUND_STRING("请取下携带的邮件！"),    MSG_VAR_NONE},
     [MSG_IS_SELECTED2]         = {gText_PkmnIsSelected,                          MSG_VAR_ITEM_NAME},
-    [MSG_GIVE_TO_MON]          = {COMPOUND_STRING("GIVE to a POKéMON?"),         MSG_VAR_NONE},
-    [MSG_PLACED_IN_BAG]        = {COMPOUND_STRING("Placed item in the BAG."),    MSG_VAR_ITEM_NAME},
-    [MSG_BAG_FULL]             = {COMPOUND_STRING("The BAG is full."),           MSG_VAR_NONE},
-    [MSG_PUT_IN_BAG]           = {COMPOUND_STRING("Put this item in the BAG?"),  MSG_VAR_NONE},
-    [MSG_ITEM_IS_HELD]         = {COMPOUND_STRING("{DYNAMIC 0} is now held."),   MSG_VAR_ITEM_NAME},
-    [MSG_CHANGED_TO_ITEM]      = {COMPOUND_STRING("Changed to {DYNAMIC 0}."),    MSG_VAR_ITEM_NAME},
-    [MSG_CANT_STORE_MAIL]      = {COMPOUND_STRING("MAIL can't be stored!"),      MSG_VAR_NONE},
+    [MSG_GIVE_TO_MON]          = {COMPOUND_STRING("要给宝可梦携带吗？"),         MSG_VAR_NONE},
+    [MSG_PLACED_IN_BAG]        = {COMPOUND_STRING("将{DYNAMIC 0}放入了包包。"),    MSG_VAR_ITEM_NAME},
+    [MSG_BAG_FULL]             = {COMPOUND_STRING("包包已经满了！"),           MSG_VAR_NONE},
+    [MSG_PUT_IN_BAG]           = {COMPOUND_STRING("要将道具放回包包吗？"),  MSG_VAR_NONE},
+    [MSG_ITEM_IS_HELD]         = {COMPOUND_STRING("让精灵持有了{DYNAMIC 0}。"),   MSG_VAR_ITEM_NAME},
+    [MSG_CHANGED_TO_ITEM]      = {COMPOUND_STRING("将{DYNAMIC 0}交换出来了！"),    MSG_VAR_ITEM_NAME},
+    [MSG_CANT_STORE_MAIL]      = {COMPOUND_STRING("不能存放邮件！"),      MSG_VAR_NONE},
 };
 
 static const struct WindowTemplate sYesNoWindowTemplate =
@@ -8070,7 +8070,9 @@ static s8 GetMenuItemTextId(u8 menuIdx)
 
 static void AddMenu(void)
 {
-    sStorage->menuWindow.width = sStorage->menuWidth + 2;
+    sStorage->menuWindow.width = sStorage->menuWidth;
+    //修改，修改精灵存储页面选择框宽度。
+    //sStorage->menuWindow.width = sStorage->menuWidth + 2;
     sStorage->menuWindow.height = 2 * sStorage->menuItemsCount;
     sStorage->menuWindow.tilemapLeft = 29 - sStorage->menuWindow.width;
     sStorage->menuWindow.tilemapTop = 15 - sStorage->menuWindow.height;
diff --git a/src/strings.c b/src/strings.c
index 5d3aa52b7a..9ef21f4fe4 100644
--- a/src/strings.c
+++ b/src/strings.c
@@ -301,7 +301,7 @@ const u8 gText_MoveToWhere[] = _("移动到哪里?");
 const u8 gText_TeachWhichPokemon[] = _("让哪个宝可梦学会?");
 const u8 gText_UseOnWhichPokemon[] = _("用于哪个宝可梦?");
 const u8 gText_GiveToWhichPokemon[] = _("给予哪个宝可梦?");
-const u8 gText_DoWhatWithPokemon[] = _("对这个宝可梦做什么?");
+const u8 gText_DoWhatWithPokemon[] = _("对{STR_VAR_1}做什么?");
 const u8 gText_NothingToCut[] = _("这里没有东西可以砍。");
 const u8 gText_CantSurfHere[] = _("你不能在这冲浪。");
 const u8 gText_AlreadySurfing[] = _("你已经在冲浪了。");
@@ -408,7 +408,7 @@ const u8 gText_DelRegist[] = _("删除注册项。");
 const u8 gText_Var3Var1SlashVar2[] = _("{STR_VAR_3}{STR_VAR_1}/{STR_VAR_2}"); // Unused
 const u8 gText_Decorate[] = _("装饰");
 const u8 gText_PutAway[] = _("收好");
-const u8 gText_Toss2[] = _("扔掉");
+const u8 gText_Toss2[] = _("丢弃");
 const u8 gText_Color161Shadow161[] = _("{COLOR 161}{SHADOW 161}");
 const u8 gText_PutOutSelectedDecorItem[] = _("取出了选择的装饰物品。");
 const u8 gText_StoreChosenDecorInPC[] = _("将选择的装饰物品存入了电脑中。");
@@ -420,7 +420,7 @@ const u8 gText_Plant[] = _("盆栽");
 const u8 gText_Ornament[] = _("物品");
 const u8 gText_Mat[] = _("地毯");
 const u8 gText_Poster[] = _("海报");
-const u8 gText_Doll[] = _("玩偶哦");
+const u8 gText_Doll[] = _("玩偶");
 const u8 gText_Cushion[] = _("垫子");
 const u8 gText_Gold[] = _("金");
 const u8 gText_Silver[] = _("银");
@@ -1095,7 +1095,7 @@ const u8 gText_FromSpace[] = _("从");
 const u8 gText_MixingRecords[] = _("混合存档中…");
 const u8 gText_RecordMixingComplete[] = _("存档混合完成。\n感谢您的等待。");
 const u8 gText_YourName[] = _("你的名字?");
-const u8 gText_BoxName[] = _("盒子的名字?");
+const u8 gText_BoxName[] = _("箱子的名字?");
 const u8 gText_PkmnsNickname[] = _("{STR_VAR_1}的昵称?");
 const u8 gText_TellHimTheWords[] = _("告诉他那个单词。");
 const u8 gText_MoveOkBack[] = _("{DPAD_NONE}移动 {A_BUTTON}确认 {B_BUTTON}返回");