From dfa8ae8e0c64d6305da6e7e80760cc47330342fc Mon Sep 17 00:00:00 2001 From: RoamerX <20692776+RoamerX@users.noreply.github.com> Date: Sun, 25 May 2025 23:36:32 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8D=8E=E4=B8=BD=E5=A4=A7=E8=B5=9B=E9=83=A8?= =?UTF-8?q?=E5=88=86=E6=96=87=E6=9C=AC=E5=86=8D=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 华丽大赛结果界面图片文字更新至与当前翻译一致。修改了部分文字的位置 训练师卡图片上的文字至与当前翻译一致 存档确认文本微调 --- data/maps/LilycoveCity/scripts.inc | 4 ++-- data/maps/LilycoveCity_House3/scripts.inc | 8 ++++---- data/text/contest_strings.inc | 8 ++++---- data/text/save.inc | 4 ++-- graphics/contest/results_screen/tiles.png | Bin 3100 -> 5124 bytes graphics/trainer_card/tiles.png | Bin 1754 -> 3669 bytes src/contest_util.c | 10 +++++----- 7 files changed, 17 insertions(+), 17 deletions(-) diff --git a/data/maps/LilycoveCity/scripts.inc b/data/maps/LilycoveCity/scripts.inc index 553db84e3f..3b4645d08c 100644 --- a/data/maps/LilycoveCity/scripts.inc +++ b/data/maps/LilycoveCity/scripts.inc @@ -485,7 +485,7 @@ LilycoveCity_Text_GetLostMessingUpTraining: .string "嗯？你想干什么？\p你打扰了我们训练了，\n所以你能不能，那个，赶紧消失啊？$" LilycoveCity_Text_ContestHallInTown: - .string "就在这个镇子里有个\n宝可梦华丽大赛会场，\p全国的悉心培育的宝可梦\n都会在这里聚集。\p我已经激动得心跳加速了！$" + .string "这个城镇里就有个\n宝可梦华丽大赛会场，\p全国的悉心培育的宝可梦\n都会在这里聚集。\p我已经激动得心跳加速了！$" LilycoveCity_Text_StrangeCaveInCove: .string "你看到镇子边缘的海湾里\n那个可疑的洞窟了吗？$" @@ -560,7 +560,7 @@ LilycoveCity_Text_FasterSpinBetterPokeblocks: .string "大家要齐心合力\n让它转得更快。\p据说它转得越快，\n得到的宝可方块就越好。$" LilycoveCity_Text_ExplainBerryBlender: - .string "它是用来制作一种\n叫做宝可方块的树果的。\p如果给宝可梦吃优质宝可方块，\n它的外貌会有很大成长。$" + .string "它是用来制作一种\n叫做宝可方块的糖果的。\p如果给宝可梦吃优质宝可方块，\n它的状态会有很大的提升。$" LilycoveCity_Text_HeardTowerCalledSkyPillar: .string "据说水路某处\n有座塔，\p叫做天空之柱。$" diff --git a/data/maps/LilycoveCity_House3/scripts.inc b/data/maps/LilycoveCity_House3/scripts.inc index 315cedbe9f..eb6b8345fa 100644 --- a/data/maps/LilycoveCity_House3/scripts.inc +++ b/data/maps/LilycoveCity_House3/scripts.inc @@ -98,13 +98,13 @@ LilycoveCity_House3_EventScript_WereDoingContest:: end LilycoveCity_House3_Text_LearnFromMasterOfPokeblocks: - .string "啊，天哪，天哪，你是一个人旅行吗？\n但你真得很年轻！真不错！\p我的孩子也该\n好好向你学习！\p我？我是宝可方块专家，\p假如我认真起来，\n我就能混合出极棒的宝可方块。\p你想听我这个专家的\n指教吗？$" + .string "哎呀呀，你是一个人旅行吗？\n明明你才这么年轻！真了不起！\p我的孩子也该\n好好向你学习！\p我？我可是宝可方块专家。\p只要稍微认真一些，\n我就能混合出顶级的宝可方块。\p想不想向本宝可方块大师\n学习学习呀？$" LilycoveCity_House3_Text_OhAreYouSure: - .string "哦？是吗？\p不要总是试图\n独自完成一切！$" + .string "哦？是吗？\p不要总是试图\n独自面对一切，亲爱的！$" LilycoveCity_House3_Text_ExplainPokeblocks: - .string "啊，好！你很聪明！\n虽然有点长，但你得竖起耳朵听好了！\p准备好了吗？\p如果看看宝可方块，\n你会发现它们都有一个细腻度。\p值越小，说明\n质量越好，要牢牢记住！\p好的宝可方块细腻度低，\n等级却高。\p比起普通宝可方块，一只宝可梦\n应该吃更多更好的宝可方块。\p还有一点很重要，\p如果想制作细腻的宝可方块，\n就得使用不同的树果。\p不要吝啬——树果的种类\n会影响到宝可方块细腻度。\p另外，\p混合树果的人越多，\n宝可方块就越细腻，\p因此你得叫上其他人\n一起来制作宝可方块。\p关于怎么制作好的宝可方块，\n这些就是你要知道的。\p如果每个人都有喜爱的宝可梦，\n细腻的宝可方块，\l幸福的家庭，世界会变得更美好。\p别放弃，亲爱的！$" + .string "啊，太好了！你是聪明人！\n接下来可能有点长，但请仔细听好！\p准备好了吗？\p查看宝可方块的时候，\n你会发现它们都有一个细腻度。\p这个数值越小，\n说明品质越好，要牢牢记住！\p优质宝可方块的特点是\n细腻度低，而等级高。\p而且比起普通的宝可方块，宝可梦\n能吃下更多优质的宝可方块哦！\p还有一点很重要，\p如果想制作细腻的宝可方块，\n就得使用不同种类的树果。\p不要吝啬——树果的种类\n会影响到宝可方块细腻度。\p另外还有一点，\p混合树果的人越多，\n宝可方块就越细腻，\p因此你要多和其他人交流，\n一起来制作宝可方块。\p掌握这些诀窍，\n就能做出优质宝可方块啦。\p如果每个人都有喜爱的宝可梦，\n细腻的宝可方块和幸福的家庭，\l世界该多美好啊！\p加油哦，亲爱的！$" LilycoveCity_House3_Text_HappyToHaveQuadruplets: .string "妻子生下四胞胎的时候，\n我真的大吃一惊，\p但现在看着他们一起玩耍，\n我觉得很幸福。$" @@ -119,5 +119,5 @@ LilycoveCity_House3_Text_MakePokeblocksWithBerryBlender: .string "我们要用树果混合器\n制作出超级宝可方块！$" LilycoveCity_House3_Text_GoingToEnterContest: - .string "我要让大家看看\n我强大的宝可梦，所以我们\l一起去参加华丽大赛。$" + .string "我要让大家看看我的宝可梦有多强壮，\n所以我们打算一起参加华丽大赛。$" diff --git a/data/text/contest_strings.inc b/data/text/contest_strings.inc index ef92944323..1c8bd7507b 100644 --- a/data/text/contest_strings.inc +++ b/data/text/contest_strings.inc @@ -118,14 +118,14 @@ gText_TriedToJamMonDoingWell:: @じゃまを　しようと　した！ gText_StandoutMonHustledEvenMore:: - .string "本来就十分引人注目的{STR_VAR_1}\n" - .string "更是鼓足了干劲！{PAUSE 15}{PAUSE 15}{PAUSE 15}{PAUSE 15}$" + .string "本来就引人注目的\n" + .string "{STR_VAR_1}更加鼓足干劲了！{PAUSE 15}{PAUSE 15}{PAUSE 15}{PAUSE 15}$" @めだっている　{STR_VAR_1}は @さらに　はりきった！ gText_LargelyUnnoticedMonWorkedHard:: - .string "原本不太引人注目的{STR_VAR_1}\n" - .string "加油努力了起来！{PAUSE 15}{PAUSE 15}{PAUSE 15}{PAUSE 15}$" + .string "原本不太引人注目的\n" + .string "{STR_VAR_1}加油努力了起来！{PAUSE 15}{PAUSE 15}{PAUSE 15}{PAUSE 15}$" @めだっていない　{STR_VAR_1}は @がんばりまくった！ diff --git a/data/text/save.inc b/data/text/save.inc index 986a2a05d0..b9b0247afd 100644 --- a/data/text/save.inc +++ b/data/text/save.inc @@ -4,8 +4,8 @@ gText_ConfirmSave:: .string "冒险记录吗？$" gText_AlreadySavedFile:: - .string "要覆盖写入上次保存的\n" - .string "记录，可以吗？$" + .string "需要覆盖写入上次的\n" + .string "保存记录，可以吗？$" gText_SavingDontTurnOff:: .string "正在写入记录……\n" diff --git a/graphics/contest/results_screen/tiles.png b/graphics/contest/results_screen/tiles.png index 22e00e7442415a9c55bbf4044301ec40aadd15eb..22b9f9e95f0f6166d32ea820004d41f3d45e8046 100755 GIT binary patch literal 5124 zcmds5c|4R|-@nEX*@=ofnZ_ea#>|*u7A6!zSqgcN*j}#$Wqcq zBr;@aq0Lg(h}nN&ho``nF|c$Dg9*m~;wqo1q=XE_gk|k7*qh%5aLZccw)J&`5No=~{$I1Q{X- zVsNR5h@e0gha5pce&r=YW8rNy67dzn4WJ;+g$5C>c8-Yk>`(@RppQk-Fc=JiK+>lY z2{^1bNe^LwF~FiRB&ee>7&4AP#t{+U8xk@XO7|gev9S7X44P4peq3%a8I2AP57!UJ z>9a$9(O41*A}~N37@!~oiWAA=QX^0-j>ZoL3kHW4$_(Z**(`*Rk?PIf#ibx2so#7E z3SOXPalXe1iWoYA8jQy3V}w3^1=48?xZqu(fnSZ&X=p|uBZ$G`av&^r0UPYc=CV0{ z?0-YO@c5q$K(V#6Td?shh&5SP9KBN-o|9n+2I_WpB6AIs9XjG31!U?g~3DJ*#JX^ zIv%?QLnLD`-=KDEI@2feXQ&~{z|a{BWtT)YB>WQ;su?05WY{TMksVo}9#)5)`eAZ_&>0}=x0>c}R#iMX| z0|tsg#~YzYG@K!dNcAzoVT`CWBgVpd3pQ<+Ftb0_)1mc7Mg)=%9ZN&u@fc{80p1Wr z#TgJ$3@VO_F*5MRP%%C~>^p=qp{+#?{I7Y08%|gfWNRh|N>=3e9pS_X`92C{BED7u znMxB@Hw8%(rjTzn&P}kSZ@N6fumA?xc;+rsQmEGSUed^B;yy# z@4u1$J*+f8D$ADvot0?h|H7HSRf&Jj!!P&J|D7{v;R*Sz!qER(d|#jabeckm{CW#I zqJ_hSmjg6ec)c)KP@F=cm&eE{bvyt_F14{RcaGqumZ*q6b+%w8OUYM04U5?QRK|3(Xx)qRH_j#Or)@eVveL26 z7|?F5PqS2ix+bSoD?u-=$cF&PCy6e%(c1QKo#@_UOPBb6T;guju!^Sw;4&knD{@?w zV=rgu%Od1+PSju3vC=;FK*2yW;j+K71jq(WD#uqV1kYuz9(z;)x_6a>lPLF!QjvWOi~i zCEH+H0xqzJIa$xj-TiEN+@U@14!yFexvc;Glj3^;K*NMqu1)V$FLy_V&CRXianfH3 zr$u%d`x}b+ZFkU?iSl?{2|Q|cvA(%jqO(jMxSQ(Y>0vr0vXEp4pA@ zC|rPy!a0^5ddW>c?J_NongmK)-+C3hk`9qq;>Mb=>iUKaPm4L|Dgp~DJ8f7kGXCb(|=B%c%AGk8B>++kYmcM+?F=xay?r4s@S7< zDNVWu)PaeN&nc#PE-e$D2Egj3ooSPiM_i_`=XZIXj$N%1vh?AnbCqC~l)ymkk6Wh{ z8_bWIK7ai|7I>R@O}5J3t*%Vm?NjF}#+NOcTNgJZSH;A-1#K9^C%pMMmJgd&0u0lU zllGct^__N$Pb|B$?)mzaQ>o%MA)T?3ye-$p-s?t;tYozs0PWWfZaN-&THn*Mak{3m zEX+%WQVc&J4(q`K$vWDLG?{5uW+Xa821;F|*Jy z#Snd^E|{QffV@>r^MPmU=|SEIOk&M8`7Mj7&vtHLt$} zfBBYXvuNw#XxDjO0DsuX)ScotjT@=84K{PF80s7?U&<8J`ZUw|IM|>)j~uM9!^XwAAIsS4ky7=t9l0W z09RharOFmO2@&WenCy?Ac-ZC+L(k!k+@JfH91nQc)iDCPq-2lBVRtNrXBS`URFZo0 zZdmfkZRJ}X>8K;N}rgxX4PL|)!(FA z`-;-|KyD)3R!|ZL_m`0EITfc`Cox|BcyIBZ1GmjdYeYj@uTDi?>dSu6LrmWOT2SDZ z>GDWVV6T=b=2xCmcV+&j9PoKCXY2lpooI=%A!4r_L1IUIe-~mo;r+QMx?Tr$95wB!CkM!1pyl-oE-x>6<|4ge+Ahy)6!_#BVJu^u`P@hK_1lW}s;y-u zb}{#Lo+X{wSs(QpsXbqLb-;9to?iI!Q=YHiGSY_Ua3YmRtvJJ4@1Xtk-lXg=~OUcl`b39Hkq00e(uw0@M0ke@0wUxJo2XT<9zN2TiIc`dCz=? zR~#43)~MP0+7n^F2dj`Z?X22%Od)7=HD>U%0__fE zC$6)2Xg~nD^`nS_Mx69wUPt?}Jy{GBL+j>^(J#eyB%_^?ODg$FZURd1oqcwwHAm)1%1W|o}r6xXHf z@H5)OzB1fi{G{9QTxp^p{qp8FBQB0-LALCT~t$RYn++56g+gfxt5)DsmW#@*WYWJs$Kdo7MO~)?hpsI~u_8+~MljjL}oA>Ut zyMA-Kkx5O5CaLX_p>iwBFWK+4(%WSoVeM{1>*|Y;bAuTyU@n?b9W7@UqaG_**+X|mEKc=y>SR!)T|;YA0?){R$y*pjcCX=$9W;jLiS!D>j^$BC$>C!guR5E&- zMdS~wP_IwPEQ;&wX&tbCHCi&^Yq5?|lG$6_efY3AmLz6fw`}It9;u={?NxWr>@oY? z!2778dOw&W8728pyX3dNtXb8_?Ao=@lJ7s1&(x8px>pC)mO2^K?(`3tycYS`_f_s2 z9Z^Z$1CMZRF7l-jM`Ong4JDd|SP3($?DK|<`nz)g!`t=D)3(uTQ@)8Eid)?`RHo(= z(g-FRz(Ds zvRKWr<@n8cWWv}N0sZ-{GR;;)ozCR+JXdTT`?4CiEdGZ0+M9HXW1Ahq0NklOOwiA3GeeZO(Y-cb) zD?8et#!mkJ>jNmrOljX`2}`gg3jqEw+#POh2QbxNRxjhe;sNZ2&H%V8_%N9O_$>!w ze18u}j}ritCRqSdHe;yw832X;E&!+q~|m-}P@Q()YUp&k5L02qK+1-c|5I%RL9UMB!4y|HsN#Pn7bu5Qw^+1b^Ti zo8YS^0KlDO(-=Df0_DrPL=hNd-u^ zs8a&9H3#UZ>>>OxXvqPpLg^$BUVlAqO%nPkjp1PkQHTJrt90a-12fn$Z&4=*F@W*A zG;)uy<@Fp5wS8v$^oK0)|Ao!|@~bue)30dZy4=8@WdF2T~c5c>}SgwSfeKY+l09l%hBVAurEA%6#20ldf5 zY5?#h(>ee|J?0!p0esH1ZUEqN82*h9L7+*7bp%N4p$4Ee_}z0L9QSdDd018(7MSJ> zTv*`30vE7doCHua3X~%K0DMv*AF>7O(Rca-INi?9f!uL?uGIqMj^lG}uszfMMSFgN zpO;_olYL@xF2GMT^#6?hUw^s*JX#Zb-B=Urduw8SXH5en6yS4Kx>%T+>r!-oSDP`mf-P+ z2iUR*0ALCB-#vg6qFw=>0m!S2{`x=);D>Dm0JjM6-L?Y2wY3W9X@9Gs%e?X`NUs1- z&tN_Wf>|ri%ybg;rvTauT6o)rCuMkjp!Xbz0OSmoCuOz65d3e0QLqh0!8RBLTR93s zfW)0E8WvF!ZXek{)PfEBM+w+J)Pf!RZvZep;$l3QU?z>F80ygD2l7Au{Vt}JXIC_Ass>YRTi*WD&TP%f50Ccr6xPPe#=vZ((f&fQO ze=We_00JC1{Xu|cfZ*DJygu-!09tK8{w09(EC8Hm0pL6%z|&9o`SlDxzhB^IkZT^m zC*fv8X&?c767F`C29*Lxfc}4>|KHsKj(!+o9pGW;01kc_Vt*ZQgP}hKj!lK=01~7M zQGW^?`IN+$Vi5vMu;)RD#h}j|5D1)oDg+*Z4o0pL_Mw0$5W`R!6Nq7m){6q?0Q94P zAlSALYy$#T0PQzgXMo25U=slB0{|j;LOT<{6Kq=uwgEw30B}I|0O`4j2jIC$ZvZqs z@#~v_VIRzoV1IJbBf!?55ebGc5Nf@5fD`Q10nl_k8z4MESY}$bgBE|)hS6wbKX75W zT&?V@t?d)w&6^RuD}dGYwS6sDH#hdRT;1N<*K+mnU|-ACw{P}!4uCo-bpUTh?nMCC z2ylY{w+Qfn0N>64(36#v0*=5*?ffqtfoq-rr6V{!1b=)7(|CX&2P%S<%d^!Dwzt?m zU|ab=9Y9Xm5#VA}z1;@@ELWK6P3@@w@}_gi0G0m>`#JjmhhZ>dtpKcZ0I+Wdutq0g z+XsMnp2KN?03&ziz^}1^B?(STBe}BJ@5Y7NF zJX1CdfPdxyTpg$!-&w2LduzP`&@~E5LtB|f!hgAR1Zx+8I~Rj>%Kz!5SVzDClr#$5 z!Km`TMg`WWz`92T3V*eV3K1ZHdzS<2~z?TS&0Qjqi<2<{}w0D_SOY~O(=m{3F zmI4@$#}jJC+9nL}R@qc)*sKwc6`4br2)$mll!V82O%mL#N{d&gD4exxfQpQ`9*LfS6c;87$U@z=;p~SATZl zPaEG0HdS*dI#NX5}yN3V;=Omn81tIV^>BT=e7~Z5pP-KK42B08d5{3XJKfO^D zg}h-b1_3RZCq3|VUId?n3Lwa{BD^kE zs>L`2t`y9K8p&Zu#UL>ZgFMqoNO6M{31kS~li;8}hJgn~06;R#sUE3HsPjw%6#73A zMJ2=zQzC+6EQxUvI_I2)9FZh|8VJFEBI<*Y^*2NBxcUJ%$Rs4Q%fS`~;M0nz7|W*# iR3U1%i#+RmH2e>Yu3X$-oo;^s0000`6feY& zTBTaCVvATWM6|A`2p|F-NbtrsQ=a0ilt<`C&Kz`^J6z zz@D~Bs3s2r@BY1;tz@%J=QX1FltGojrBHbyk4}~%utM&MgtquCyj8idUy(iMeD+XiZG8cinAi7vj z#M`J4o+k-{ebibS7IJWu!Y~XL5*$(_b}pvQ2=5qk@V?!r!7ilp9)4dEfKiU6OebJnb2en%?+j* zb%K_nrzHY2osHgT#6DV@)Ty#{;35eKLk9jT(|0AEi8_{>o#KS_RlzWZXyd7&n};B*gv-1|%!FXGet4@jatB1>98yVv;ge zw5BJg1zbkin9(}47M(%lVX)RDR*QcHVBfoT0)h{IZ9$8IVvMT24pLzOHZmPE(M`t|f3p8;5FXWFU3F+WpOI!o+}_<3TRihj zF&BagFV)#O5Qt56MynY-9iCp~!7A9c<&%9WKh%_II~@mea`>v2YSR%7UIn4vSIhQJ zUV?fZ89kv@mZ5JPJovtK7;Gbr%GNs0VIN3XfqH4QzvQLq?ma6Wp~|<(Z8XUE8@`xQ zTNHnDQng?1Fe?+O^3-J_cZ~f%Y^ArXWCI4>(5D^qbq;G?dGTID=H`u|DUZkBbN%V) z(Au2wtjU2Lhi2%rd5Q)57R+Z3y8Hb-b-m@K=O!W9@yi=Bv@L6kE}RZF?0+-c!iIY~ zuw(C{Z>Q$%useACvlA^Lb@|M}A>rW%&U{<+;KIgPk1|%pbE~gsR!)}Gi%*;7{5&^{ zJ-X2~KEhN{Qu#cPH8<)-<64COV1Y?co6~(SWyeah^Gp01gKuzR+16F8ImAgxq5rM+ z)H!XmsB)u~!Vx_2|BCe+M>`4Ixf|RC`SPM|ij0#i!zhi5)juy;ES1*fPueh)U(RCdKMgN^HnPIQ?x!!VkAd{% zxe#6=Osqe}YR&W~v03c%?5fKSBAZdvE8ijO5f{-@lkY^)<2%Q;k9v)Igik7~ zu*=ywd{BYY%O~}=?T<$<^|)w~IrV&d5VhE$w$Rqe@laaUs}~h+g~Oa2^V9Ud>>MRX z-3mQ^_={9GTBbMU%QJQrQRqDXT3GYP%DRoJ&FMifdNtGWrpNMg2xk| zTW^W^*J_b)tU&puXxCT8F7+=?94M>LsXhLU%ESE}E-}2?U4H<3vo`bM6~n0 z&PjJ{7!jeMy@{`fq4r1o4iC?z24qI0w-4WEBjG-Ig5;j4c%{f02;0BK_YP1df0J delta 956 zcmV;t14I1P9NG<#BMtxrXF*Lt006O$eEU(8u^|ove*=X{L_t(&f$f-UmZKmLg*8r2 zM>OLGdX~|@v;SRPf64;ips)ZtZAb*118s;vkOz>lmljBXPSnLBKu}tS;?D&DJ-e?gz>p~mT=#Xe zi7^njpjY?H0m7iCK>-VJ7OVpdgT9}&U;>#+X$!>t4)h1~3Bm_PH3mXIW9LRFIp}2Q z|APL3Fk~ZyDl`Pc&QC{wwue;x=zS6Zl?U*De>n0?F#z>E6{3^{8bC#$jRDZQ>6q99 zz0v@f%OPr*tG?{ ze=XMl%&++cpgIo>F#s$V1GMb|kWB+I3s?e?`J@^E_Y0`}b4CO7p->Ef7KFtb3*mj` zIb}hQGkOz%Sm0*?dJRAaLovW?fnA#3TP|on2_Q|!%gu>MuJ7vsdX^4~0WgGeiSf3O0O68X3oAg87AkxI4eKkVhSBLFvN6rrEP zZa+2wY)Qpg05Leu2M{5bTROU*HAh$=JwG2{xY&Yv0C#skfP@8P8nQfqmh1-b@#MmE zfcas!hDrg@3d|4J0gRP7e=h*^9`nOx0OM5v56}mkPX|EZ|Nne|=UEN?0{jAee_H_j zvHLQB%OkMleERzZmN6ASj!wxVUw_@O9N)?v1u$F*u)K5Wq7*EM?-Dvq$ntHPruolZ zu|v4eOXOO7)##Z0I+Jo zs}TUC`}V`@R81%gwAKMY(e7hNc?_nAIa4C~1s3E0sPq2jM6J*k>