From e27071dcd623e5ce3d802e559478911304f4fd92 Mon Sep 17 00:00:00 2001
From: Eduardo Quezada <eduardo602002@gmail.com>
Date: Sun, 19 Jan 2025 13:57:35 -0300
Subject: [PATCH] Almost all non-graphics data done

---
 .../primary/general/spanish/tiles.png         |  Bin 0 -> 7571 bytes
 .../secondary/shop/spanish/metatiles.bin      |  Bin 0 -> 4624 bytes
 graphics/fonts/spanish/latin_narrow.png       |  Bin 0 -> 3486 bytes
 graphics/fonts/spanish/latin_normal.png       |  Bin 0 -> 3569 bytes
 graphics/fonts/spanish/latin_short.png        |  Bin 0 -> 3493 bytes
 graphics/fonts/spanish/latin_small.png        |  Bin 0 -> 3133 bytes
 graphics/fonts/spanish/latin_small_narrow.png |  Bin 0 -> 3132 bytes
 graphics_file_rules.mk                        |   18 +
 include/battle_script_commands.h              |    2 +-
 include/constants/battle_tower.h              |    2 +-
 include/constants/global.h                    |    2 +
 include/global.h                              |   16 +-
 src/data/contest_opponents.h                  |  325 +-
 src/data/credits.h                            |   30 +-
 src/data/decoration/description_es.h          |  552 +++
 src/data/decoration/header.h                  |  364 +-
 src/data/graphics/slot_machine.h              |    2 +-
 src/data/items.h                              |  886 +++-
 src/data/lilycove_lady.h                      |  755 +--
 src/data/pokemon/pokedex_entries.h            | 3097 ++----------
 src/data/pokemon/spanish/pokedex_text.h       | 2314 +++++++++
 src/data/tilesets/metatiles.h                 |    2 +
 src/data/trainers.h                           | 4270 ++++-------------
 src/decoration.c                              |    2 +
 src/fonts.c                                   |   10 +
 src/graphics.c                                |    2 +
 src/pokedex.c                                 |    2 +
 27 files changed, 5503 insertions(+), 7150 deletions(-)
 create mode 100644 data/tilesets/primary/general/spanish/tiles.png
 create mode 100644 data/tilesets/secondary/shop/spanish/metatiles.bin
 create mode 100644 graphics/fonts/spanish/latin_narrow.png
 create mode 100644 graphics/fonts/spanish/latin_normal.png
 create mode 100644 graphics/fonts/spanish/latin_short.png
 create mode 100644 graphics/fonts/spanish/latin_small.png
 create mode 100644 graphics/fonts/spanish/latin_small_narrow.png
 create mode 100644 src/data/decoration/description_es.h
 create mode 100644 src/data/pokemon/spanish/pokedex_text.h

diff --git a/data/tilesets/primary/general/spanish/tiles.png b/data/tilesets/primary/general/spanish/tiles.png
new file mode 100644
index 0000000000000000000000000000000000000000..8d36125ee38a224c3695f30c0ad23a81bc659bd5
GIT binary patch
literal 7571
zcmWkzXFSx81O9&Rj&sJ@A>+u*>PU97S9aoTQrVkq?(7wkJx@}EkX^>vs}LDUoa~WV
z$o&8Qub$_{^E_{#&*ypK4fHgq$gh(F06?XsscQ5eVgUdIVE+*y@6qQV0AM%QQdKez
z$bX&}>dL0^jObFfjD<R3Csj014l3K5hHMG)KPK)D-S{rd;GJu}jl$VG<>s+L*ly&#
z>~*6N_WMrLC+f-i9W1Lp>0z!>Z+vDtdr$ef<o!Zq+~dELB0>YAzc-4P{(_g;P8>96
zDHe%r*biW^mdNRR@WaUo736ObC(O?~Rvlq~H``26Kf7;aMBNlViF5u^tria}<*wqa
zta?vUC8tdGuoW>a@(WD7<qPAhoBbo?d7W@2wcBkY!0J>rm6iA934pmy?Dh+T6Vd_0
z3eoxKAv*?<1uIKl#hTVxjJrveX=EWLqIc1`bo?gBL*cP@R<#~BlMrEE@eqLz;i25D
zQg4`~?2?Ot8K18#)|mVxr5Q_J%xFNrYcfCPqBfnHuUBhpXq<cZ&AdXW>P;G+E@~1z
zgG7S{78Q~un?tjq16$8Cq@t~?%t&C0nbX%JVPxk)(sPyHWPwa{oZ-IdR2XB79qivw
zE-HTU(<CRQc@_Se#JlNe23rxfqpiQ9x-?zYO(u#YRcEQy4PB;ccm60LhAY0vvPn>G
zccERQl|<43v*+<I<hZ%tG(V`0e!lYMbZC}unKG>mHfhqvLhOBx=i|j#I+1if-_-^z
zu%~*X1DgW}1#+F6o>d<L?o~=jacN+|1V@qi(oZ;Z8qa%WRU+_q((Mn`)Uqjwwp1Tk
zd8#BgC(Gt5Zz(5ZU)0nFH2L|H+-kR=+Ep}h6K&jVU>()DPpDaMa~HujNMs3hYPXrY
zO})}?L$r)$ntu1hl>e*hy%ujxQLUli`08QB^tppJjCtG2mZFW~?y%?8s$gn2I!;pP
z&X_S4Sd9HksHWv43k9u+k&>N^?(!;Ft7jg!EIivStE-iu1lj9CcD@~}_8jTMou1sT
zq)Igc;KNirc>$Xw;gJUoHeRX2RC+p+4<HUX`?=BnjS8%=w62sSZU!l;)5lDbp3q9%
zpj5->J7LfrP4M&?SJE-5FXj!k0v8Rn7||?!Q<sP6AAB-;Gi4Hz7o1p^cSL*KH{9q9
z<S=-%)0;+gdiQ)phbEs&yN+>Xw|i{X8B>yYp}lm97U-#-+LU!@YhU<8Jac_*Xyewn
z=^t}hJ85Zcky|B5t9A#dnjAnz;JIQh$QfYZs={)Tl>>zW{j^4I#^kEG2=nRS(5$)3
zM$glS2_krl&<;8ysVP?52F6O1tu=U!wGqw~6x`!UV{D#Skuh29@)v)7?tJRafxnpL
zeq^rvk;^nmzKRkrp%rqYMrn8#?17ZoJ_+>O-x=Gm-Ec)8i~Qbg#GXBLzO&J%9KzCr
zy8>4;dK<`Dk1mvOvSrl~aN%i=z||Zl&4pQ4ld_*(9PU$!j`HtqP^#?T1eL0k11k*e
zAjZ;^nd>V2F<%<wQd&=bCBpW$aK1jNjH-S1&Y&PL8zmEGq~gzEz251G1jrU5C(@Y%
zLUkd8RR%%_)X;$k&!g_FaFcfEUqB~qBl@4cc+Ij8^HoNNN<Qht%f;bpGP>dz?4omp
zAh;FV8ZzR?u2qxFz;)Mc!SvD{3$$Oce?Tl;G0_y0%AS}3|Ax$09LUgfY_gYEj|1r;
zQvqJy-s5=z=4YSQBTuDXZ=H^jeudJJREIDfI<I8xLTm|VD(X=S%(qL*q-DewmBuec
zH6viy+&`ZavrW0+*p&-0<13Dk5Aq4}8TB1MjFmV_kgh!Q0vYIPWhB6_(a>>>%FzUN
zgu<DQ$Y=-B4S`^q5Mp0q>a=-k2~u3Aw6=d1t0_nS$KK#&zrXQ%>>=w6iYpaJ<=|)R
za`>zbyyA@OPoxcX{l)SfvU(Zn1o!f$>)&Z!YhD`bNR<;bT?<@FeK}n2Lv=DUsG%oz
z9OZ*yWU%b_+I#7bm)~7p{#Oh!Pg<GDlr_bs_(Z>2x>huFuc~wpKhnHaKfKbi)`EQg
ztIO-d-aZ58S_HV7Ku=Hqo~~19xv!rh{(!A8CD^(%lO7>79DV0KfQkfz=O;8212rs3
z_U4oqF(24QC_D|&4{bb=j|2#9+!}m~a>U@+)^2jZN!TomESroNgD+R4+xyYm^?Flb
z?{haf+In3WP6Bae0N<c>0L**XoRHqQ)!yhyK;fUbD)t{nJ0Go!0Y(uh9mLxm2gsbv
zXGjSK$k^>@$Z^`Itu6v|!yLv7KIw%%-4O|77?eMCl8aVb37ZupZ;$64(`EM;Y7I=^
z-{Uz6%FgJQa*BW<4g7V)To>1FnU;@?G?OE0@5-q<H3il~UfjM$8fTlE$xT+{o{XR&
zGB;kA2>rZFI<UpgdgrUct0bSttp?Jrip}Dr%f|)<6y2V#O3#4t$Fm}P$q4r}3s%zE
z{<d@4<FVTP*1=;9zN`h6LtQ)bMsc1<3e$2L-{qBk2*k5KC0HXt|2dN@tDsu`)^2f5
zOh&XdK#-LZ7k!5QI}>2XU=H^`ER4Et3ujp$5~Bgkk#zE!3qCr0ClOm5%78yFAaZvt
zccvRgbVRY#tdz*u=03W&M*VL0-xGJd#wz<Yt7ocx(e^6~8dTfALJ!@iXrb>#kl20f
zzlaSxweE=cg>0%XOf6!Ci!?E>P~T1XZuL>jF6ctitrCa&#aXt4Upg56C1YkBPbY!@
z&P#H8{kz`HL0<ptEE~s^X=N71EU_J!Ik;QA*_jYdZ;3Mp-vKGtVc48u3V@-$Bd?4X
zF!*QJEiqSH*}1F4WpYNPCk50=(2R{rQgUmsZ{7?)Ue|kKnt9KQWqV{O7ru*dj+9Oa
zt$bPI3cTi0xM}mMqa=U}C_9g*+V+{43D?hdLW_wF9XEl;`G$?1N~Q3z2m)!D6le<o
zL)C11`HoBClKvd(yP<e%J3bgt^aTWr1*^)impg%y^<X;LiYb=VG()B+Mf^?eC|cJL
zEe9+C=%l1f>wj`l6aaHy3TK2hj)c9;)us=PRBjpgMYi)ig7JB<G#ZMHBt-_)O5r*p
zuMLw3T)l9SF+D1=t3>&#e~B~@HHfvhrNC!<F;7|o*;7*iKo&@-_x?p#94;AS>Y6!@
z|1x2@L1cbgLkTS|=;Xs#EP?z8%CVi3a1jSjX0hQS%(|lGaxs0Mw8$7<>`kwv4yMk$
zU>`7Q;T$fS(S#Bt*X}hAAfgA9@3_K~JZQ*~Aoj=l^k9Hu+y4d4lpki#R_`^Iv+*$-
zrmI;1tf|;xC)NvD7V2ieVaTY3s(?&eSfePZn34I$Edz)X6yL+va{JUzLmo||xMC(A
zDejxCb?LAuPo9U91eB(qFM-L&eIUPs1J%ZenXtcGcKr<A{SPnnr<uj8{JM~|>3v0F
zK*}a0TFbvLfVdjHv?_LBfL6pF@Mf=%s7R(h*jF6b=a8iY##xKmcp`mHM6*WCBj&!p
zGUT6)+BlfhoCW{2UEdY+i7H-F>g)7@cBok31F*7jlHqJHkMyra)CTeceM@(B71HHc
zTZRMtSrfTPe>_52NB9idSe=Qz=L!R`^1aZBF`$*TnN8{@hh^puL53?~2;N5ZYj6!Q
zfSXKINlI3ngD9;8G-DmbIb4Zf{LbqFSwz6KwB56&d7$TJ_R6~e#h3TKrQ-TX{d5xG
zj*uDdCwsR>s7LJO(VeN*2Od_3kuor>R2O^A7TVn~IVP62JXogX@a*!l)78{x8T6BH
zxXw-p8uRvMY&-=VLH=`?<YVXkm7E+GpWEojHDnOCBc`#)+mS~7weqpIc;xY#_U)CH
z2lyVpNH<Ha#Q=Ffl{_ix5hm3pZ#z4kunuEEt9&7=uJ2STYULEqPn4|-Z_WH15+ld4
zr;Fx`X6aqn$Upts$N2sujZf>$GJN<&qF1riNIBc*Bw)8tHq>t?4Whatl;t%76;oVQ
z|7RPh0MTH0BcI}<WJqR&fdC?JolxbL?K*~)1(7A4`ATGry}#zXzgfzM?50(woM~ph
zyu;pZm`rah)fY7@CtSWf?0bK$E2em21o8Acl9EpENQU<9U0N!t@xwc|wQ3ugBUSlO
zF8ZeezQJSTJ~cH!B2NF==v{%C+qZ9XbEoK7fZnBKsMsZ=oWnH%$43r1!Bey}F}pW7
z4a$W8gr#VsVT5o`vhOt>#j6RRD!U51Ti)=L70u`A91(s*2pJgDJ&}{KJs)fk(f;P5
z+h_rKqZv`JLYH)dlPr_QQ{AMw9OMKymolwg8bJg*7G?<@(Pk9p&Go(yI#%VRbM8b_
z`r=7X+D+`4=Z%0&I*1TgjS3`EzJCr{B(T$`t%(4Cf3mOwY$o`8!l*qten5ZoDYjAI
zD`0g{+e>uzb0n8-2dMxk3tsd+BMeFsA;|UXHNt0Y(Q(h{8}AeJM_!S4{`^4ZsosFB
zKavB=J0%ra#|Mq_MG2aD6C>Xk$8I%3-h6%;`~%=#o1HCaf|MC)Gm8=MlKJQ&k}a9h
z{kmg_No$$l4O&x=?4<x&H?1Uk0?`JhDA%`t<Nd$;X_7{C01#D3g34x8VFxPX67@fO
zwZ?%9Z%6*&(y)gP;nl{oE(cr&z0r?(l(}OjlG2GpYI|^J{LS30db)|RsJ0N3{Dq2K
zbP1g{_;x9P5<HGQ{W^H7Vo`|q1g#KF>)!;U%+R4au`vI!e>a?;X|ZKu<=`RnEsSr+
zWM$KQl0sDn{2=<C{iox_yQ2CyWK7aw$g}G4PAwMOa1F4J>uMr$1@+;q^I-PCd2jWt
z-Nwq(jd3}h<J+6IaffXx+Hn3@185!jo);1{C?c^7b*p6|Et1sU&6p3~V1Kg~JLnF}
zd!~o9<4FW#X|T2!DGaibTOo9J#b{&YznoF(mjJU^&mh;FX%fgnh4qVEA;|ukKnrJx
zM(?8U-s6#@IbkuP;{gqYaTHsm7>(se2wSA4PrXBI+6Ygj2o?ijT76fOERc${hO?*I
z=ptVHQNO8V6#s#VCN=iEcqR8-GgFi_m+CA{(U+bLi4A-mtB)8kMTHiCV7H0vPvht(
zCY-Wc3ld1OH4u6QQeti|3B6vdeAIZ=dQ~cP5)a^UaWU;xH!zkd4M0DOz=$8gY1*Rp
z-o*tA1ftL<?23fz=yD*38(|%0m3zQ)(6^pSy8dUw<%&-J&-JSu2x0rTj28`P+A}9V
zCGXb`-5WF^I8=L`WLZIYBcw{XE_rzfxwAPV+WzhEf2{1q>-`dzU!XvV*aBbYH9|jv
z5Xwlam!UW4;3h#mrxoFIvP{i`Jr5<pm~j2p`E85<y*Zj+!ftzqoM2W`B{zy0ql97S
z*o}X7MiDt82wsC1hzDv~o_5H{cZDcEUI7m+vY9wAPe>ciP`woR$RdK`FzF6cQ1>ZB
zhx0Vp=mL$5=kTd{8{04;ie{fph+B*2>`YAu0B7w^47n82t7&av{BBCP+SKp<Q}4gc
zt=D@Gd)8&zk5QbjtyY;<&mbY5*CfoS2jE)S9^K7njIr-nzYBj0ucRX2>=Nj0O`x0N
zVs<}j()|XE=NlD(c%wJGu9+Es?TFu0ei*~?@rWp_qy1v)Ek!Ifwi7d}e9ulj9VlD8
ziy$NJ*tN}XgNT}l_;7_289<y+mv41O58PGJf(Yu$RB4&{syL)x%1YiJl>dv7BFufJ
zJikYEwT3dF7fNc*u0i0*?>7(z)qm#V>1Q;GaxtZ@{5NskMs!#aML9U(@N;(8>8GWO
z@^K2N`$H|f`}+1Nmd8Jvw@9i7yE3`v6o$TYrxfJnmm(^oG!fp&L3Eko&GHEz+ZZn&
z=b&SEl{<@BX0WIk3It-@7Wxgg9bu_K4=7rcJ~f}Zf+NUEVNP;c{MdXzR`@yHvg26?
zmBAr&5)i>{s>hyoo)h>WKX}zPf%ShN!d6@HVSK8|&+KQfMKR{9@qDVni-%t;A@cZ7
zhJHmiE%qcI$Zi0HeOV+w#?cjACx5K@814oj+aAL`<%!83OTNRfh3}^`xK_TV5-5vN
z1Id+cSU)BZ^A5zI+;D^B*UBLoajUS#RA=bZy+Hdy;JY3$tE?@!z!G9XmyOGL@_QVR
zc<mTUc!9kr0M_H8=$^>e96TPs%Z|m>LmoG2<I~sE7#OIH@U&=kD#9`S%*P6F<Pymn
zL3Z<Fkz4ORA@!d<Id+%71{Xp(5T+;9uDj1^2PgZ#vMw2>`jOSHi-mQ(F@V#DJ=M{2
zhFqYt)z(5jz@isg^Q4~Q%m?6=Fl46=@}}D>Dya6=Or2%f3zp#73c%arH7f!D5=q6J
z<RR%AUm#|=broc!&c;1kn|YL#0CzQ&bm<&e-i8SbYIQ;dIcn1FzK%(fy@2Vms5gc!
z?T0mPp(pv}G$BVrr}^apfQs2YceQS!^R{+(!BXcPKk1=^xNT0v*lo2wW#)Mmwt2I6
z4mCx64ilQlT|S2-7rB}i^HM>u87VGSL#=+QP*kXUJ^6ynQnQ6Ljt9s!yb5lazYG_{
zUwSloOm~q$0{S`3{C{6$KTr*t5|ahi0`GqN!4X7VzKeTmQ-m6yTUW9RLlha?%~RE6
z-D87bO_J^h9WEXH{$VHb$7ABo`?kE`{%7{0;Indi1CN8c>ZMQ{YuTm<5wl>a^(~5E
zm7o<-@q;67bnOM*>TTv1g^Vh72tpu7`%y;StqYHlj`N{$r}AML<4!k}4R04exdv)6
zxsBB)A0m#yq^DtHyL<zVo^Zg<|CZWlvWKA_j!pA}PSY1@ixCW|-3Ld3M@`C<gN(A@
zI|EhZ*$U;(##GK5O8qByG!lRI8JAcOys5il2e&r1uQ(lKNd$Ev(%}Nq8b53P?8N?3
z+22JqDxB|q)j+XFhQqM6serf6vg>Lq4ZAMcI6(aF8np2<{Oz|OhRX+O9C?gngna9G
zxzKkdtfPm-hI?al1{WIp+>Z!^^_QX$bbrst=YrjBb%O=7S=^_VKT`yYYz`!<uji^v
zh&WgEKpjpj=9CuV-?;A)9d~l?yy{-pCiR4*tL)ipl{P?zB&WmUKflBiAQk*95^X_e
z?epu!trtjimMrFzpWs)D=7$rcgpbG__RUry;%EKqK0$Y0F)=ea!dExT-RX#}bYPKQ
z1yj~YNc~YlCTC7Pf0wyRT!6ck`|dBom|pi;&XoRjF?<`4a&A%TLPyjI>Q`Xe`)U=)
z_4&mkyYNfs)vIvEg{8!)6rF(i{}u|CTvWbO!~62KSL@@We^-w>TTHD5+Yaa|lS^=e
zTBF16@c*aE0Se<bJm9yerg>zE4lNIJqQwlAXOjr7+(<d%bI;@AJQ$h}_736y=?>Qv
z?!|FyYrb|9QxS}C%v8e88yAdoKr(uV1k-cA&T4|v(K*UBKYGj-Z1Y<8f&xGwBy0;<
z?N>vju$HykJUDT(nv`M7d)2$-(oHi~kUbPk;+5(q($P1IxY%?esrZ4(QwQ(0XxZEx
z3Hx4ietE_Ygp8y{eQoxXbPd5FXAw`IEojCa%0H)Y*ebqiX{(`E<dtNKqWanR8g?3Y
zBXSlHRQUU8!GJtOfi!(|inSK@rtp#H7^np?@4s-R@=W%Cx_%}Rvu$kKs@2f;+1o^7
zo24+u3KkRC2{%Iiw|*1FIhgMgnJ<ZwtIp<TMGfHFPud2;VfE}Z8KXV3?z`vdqgsen
zSs?tcDQaWOSYDB!&NfvtVfsX~O&Sh-XSD*0zR08cBQ@_T<8O_mSO41YJ@~@TbF!gP
z3p)B=dxNp=?Vq|J3OKl1^{!gBKJ$SiOgd;ok6KApCG;htC;js*qzOm<z-wJ!$mNH>
zhIGKNH7Q*Ur>2)o4?n=4ao6{#>);u7@U(01$R(zh1n=Nz@o~Sy4JtpfS!MFFbkD7X
z$5tKkG!5`vyLttB$umEm%xF-zd4~d@Pzhv>Y6dsAknHh`DfUNR&VQOz_v2F2mJiM-
z+{qLb&Cst>O0l+VNrm|)Q7}_HecIlCTEW%+JlsNXpXz33ibv*X$kj!n>D304)XSYY
zG4Wz<!*{Srbpv}_IH@F#aw9k7Be$-+A)=>a3MpPQOR5>(R{O!kO+4rhn2YtI%rkhQ
zZuJAPhxqa}U-MF-`1<?~Q-N-orSoOQu|xPrDtw-pAapeBG!$|vs<abdA6)ExbFVc#
zl-;J`l2WKg*QgDxO&yu?+rbP~q;~54K0y5#qPZtdw&&mmD0uYgv+h|?o9o{tp_8C7
zXnU_~Cb<7*O37Y>@Up}0@?Q}YKa1sk)HaI_NYL<U5|GSqfA&!rbrd6aAB|%L$jUl}
zUl}^3!dP#6C&)Y~)K8-L3HFaeOG;*<1TUrW`yCim_jISr$x;M)C7SL?8S4@z_kz|D
zaatkZ%sn}}cX6=$&AJ`@?v{C~4Cpr0kvUEY{#AFTF^M?|3))bF&Fy?ApZV}G+2iS>
zT)0D*=?PPiPMRY0*YgGDR0+O}^#X=Cc!oCdcK413`&__k?=Dswqpd1eD#@vW?d%VZ
zJcZDA?d+;RraB7fI!N*P-=$JUdV(TnA-7fa^}}tjg5>xx{ZS@}<j`unIC!eL^{4DL
zDws#@7I=Q0Zj6Hevypr0;lcr5!T~>7@2fjIx@JrC2h78KZRI~L+8tst-X_RiHJS=@
zG#&VY%QpAED#UcmPy6c!4eq{WmJ%;vD`G7gNOD%(4^W?93RtaJP`HjlDFK$mjor4A
z97EFM5q%@s!lH5PFR#GFUtiCg?uI7G0GE9#${eDRkxPNF<!>Y{)lJ~LZAT=qe+-+U
zx)Gq^!=T?DcBB7fN2{XDS6oJ{6i|D(YUarit`8_Y|F1i)ZoO&gJz3DHzm<JXaY?*J
zh%CVJD-AeN0bk5qkC%JACWZP_uw)voh(OEN?sDMI+>`k{WnF!yME-VjVLkh`TBdJ5
zP%%!Fi%a41G2(OAilq@!uTaq#n+ytFHz@PB+WZU#+yjN-SO!oikB+#wb!<xw8<WIh
z^RxUhPGs+6%wu>8vJP7J8mh1x^ekygKL9GB=AhULt*AEfqK7F({mssiZ)eeWLnBnj
zB-3E6*gG-C?WXZ#B&iR84~Y<9FO~(!j!vlKCCPmV%vy9w2E3yxyN5{qnXr3p0vTiN
zw#C0@lvsK=-mQbk&Q`@509?T{hmQ!;3`7@Shd7ElW!+h-i3hNd>E#MKyqhY7Q=Ba1
zS(Zs~|8f3Fxw^*q7LadbJM%Tj_5}Kn-z9g`DX#8)Ay?Vk$KqyWXw9mmQovI#TaksV
zCYhS+Ao)d|J;K|w_5BFDpI(!G1FvFRDzEl;pOYEvPK%y@ePyr~3o*onz8)v$d|R_-
zXSu!}mPG0uFS*S2z>IHa<LD-^iL0s*+9_v!v%=2qX#R=HQ?KDmSn{VXkY<e9fI6rj
zrS_IwJ4f>7v>4^zhPDO-CN9WU&JX2Rt<<5kG5g%H@3m^RZPH@!VCGixlapqC%B4x0
zmc{|w9Y)twwh^n~w_Y)Uwt=Swk5#g*Gkq3D6U7|9{i%4rLMHEjD3_eEEnqyc%hSC8
zCH99+jx1ZU3MN2h?h{&Eb}0!9N9+D+TvSOp7+T<(F~dp8-HGFZ0u7h{wt`LnwEfU}
zF&yBSO2Sy>#q>JZZ{m^-sF%6aC2dcUjPYk!!ZR+O$xJtFFPchKha-WmKj8-#&WsME
z(;`w1+(hhJvpoR(p2&9|mL!-Uh{L)I;f(L0lTUQI7yh(<1t$XhCcZdG?I*@v`ohVA
zYJ2_m)yRYLsCuUIQhuh*o1ReXqy9bpDk9ngeBOsU4E`K00Iz}PuNG8*N<~1^hLZW;
zhRrYTm*JOBOQ+%3_fgpMYLb(U2@NdTs6tpG;*=d?OYb_FehV_w5Kg)nDc5aR<zGx^
zodV8WcEr^FN(5?DA&cElJ$!Jr^KW455(UHh4}83f;8>Q>+Ii+bIn0l>;bK7ARDZJU
j$%YhkTR~~lq3;Tw?iNRj-7Xvc|J$mirl<N|**4;THLd(@

literal 0
HcmV?d00001

diff --git a/data/tilesets/secondary/shop/spanish/metatiles.bin b/data/tilesets/secondary/shop/spanish/metatiles.bin
new file mode 100644
index 0000000000000000000000000000000000000000..55ee0ad21622e0671627b9f125c64648d0cf5972
GIT binary patch
literal 4624
zcmcgvYm60D5<U(WhXCq;APK08uR#YL#s{Db51)g)N5N5i3|Or_i4ooHN@yd_Y8*jD
zMeXSLHoLv-_?}%`8Q&36+^i2YqKPnw4r+{n&5DozTi-di`kubR-|f!1H(%GO`l`;U
zQ`K!u@fuDC(cyFi>C^F5csLzZkYj$6H{a=>T+lDdq3_H0Wv?i2s+#ZH8*lyb=fj^0
zhQB^OtIGen)*2c?Bk6#$$2C+#N7FI6|G*>V*7X2BmX6CY_|<-0WK2z1*E%vB5t`Bg
zGEAxV)*-jnt{t*g^@psfT{C1|?K;SC526wsN~3anr_iZ%Hl35>lE_DS^3!NColEEC
z@?t!7D@);^a8!7x<%WH?K1a}aK8l<8WFAcJR)5BL{^J>9!I;8R8Q71%C72!f_-H<c
zeS9n*$Kz>C*hEd?*<I&!UD&m_3v4f>y(w%NbDL%FP5)u>8i@kA1|Lu1Q@Nfeu;SBr
zG9S+;upj@Kd=_hdPK+Dk=6G7HxPd3~G;X$X_<wHKd0k7oF6w$K9ZVR;JRoDe@V_nS
z?X+7^j||K`(~DQ*Kb_C8@xwQaR=$91c#y>B_WPvx#CS$LJyv`opTyI725$;J>(~`+
z?2uqf7#05Y1%7a2s6JL_C=biy10E(={i)*-1^!8KV>~OKne#XDB%aB$7~BKFr~Bc5
zIgcOQeIEZ<9><6Ck$HT>`5-=+56N+f2lFT%UB<3Hz(3uew&3CbJ`V)nbnNZ;slfkn
zx+OK{Jz+BjYriG^Bz@l^W9q4%wgz8VUC15Y3VmFqgXs`DlKxPhZA_!!nPvQUdD=*m
zeuw?}p9PzOjlr(m{wBe@Jp66&eeg^0TP`0620HczdvpJt{aN%NIgcy&LF<#^_hbef
z_Wj#H8wlK=1_QZ$a0^F{Td0MuqwCA@&7p>5Vlp-vm%!FvlD{S%E~Uxe5`R5lzabfx
zOq2O~-mrdC<c9uWbD;S~xPA)u=6vA(S#HR2{h4m2YiWhdUut!RT6@jOKa&@ejmbNS
z;w*V7*_6DS;5=`U9o$Tt?R@3e^9FyXCC$lXGsW76z8{Z=Z9E>f^Htvh`O)>nUT>f^
z<i~#-ttQpi__ZD=R=L){+oL<8hoXn2QoGArU;E&AZ~gH=>*WKozc|5)Hxnwz`kY_m
zSN>|O{7*$sN3TS$7WlD$&KqMIy!CSYs8_uyxL=n2Mm_130q)h*C%cXPZY|qujeswR
zF0>f`z>6c74~yj~u;0JH=kp`J-g3QOEex)|RQf6E73!t>+d|8uHd-Zkxmf>WbY(=*
zD#7^wQxru()FP;j0+F(e>i*^YcmBa<U8}n%B*sjYQMbh1rZl13l%{t3^Or;y+4wZy
z4-9GpUygoN+231){k}-?Eh`1d!1-&FyAqE(KeNkE>cf_Birl6&+xAqQe^qp~*sJIt
z7L2iHO66J)v0m<d%JC~!e)R{o7KMun=YJtB%<~I!)LYFj#mWafm*z<{m3UBBR)j0;
zfE<^ehc9^>-yhu{Een^){$T&y)lTgNtbIV`)%a4njONpVT)$FJoQ5Bt@Ben*VfmeZ
z*M@2z*w&-+`;o@GzkYu?T|qZ`{@+BMv?{zYx2Nk3`#yg^e`WbQ!<)i=>R0h=zg2&<
z-@1I;n%7g{&x6kk_=}*D->TowJ1xJ~v$;HvFXhWv`^kJ>z?btCtowC7&*4jWX}<r8
zTj<-Mjeg1bz6-t!ewAC-^ZTHMev=uBU&~(4{+)f0_4C&SezjNakK$^7U=R7G{sAN3
zG(MI4xLS_)xnbQyyT^5p?Vb~#A1{qBi5tECj{c|ou!sJqa_vtl*Z!m!^P%ti2R^*V
zxqgQk#(3w$zOQwLosv&Be=KhB>LcRSeAfN~to5_{yaIQI?S=eoujHrAFyDT){`9Kz
zzmR4~cGVZYPk_<W@jv>S(bxFvJzeIz^O2v2lFx_rf!+_<51CtyJ2M}z&F(7TyJeOy
zzb9LleU<J^|C8REI(=hy3ck01zZUf0T<+^bXLq(c+atFzkH~mNki(B=k7dth&*k`W
zkv=a&<xgZ!3Ni-VK0mm9esKHzst;XUZ=`RgAEqDW{=M1rM$bn*ANDw@F?wDUZ_Bo4
zKg#*>G0u}>%-^3J^~bjd+@J0!_`9R0zsL7~Ta`WEf8^u8`nKEito)eo`{VlyK3^Z_
z5pp-*^(V#JpWJ>G-!B$NE?@9Iu{&EH?a3<rKZte<+LLL&_v1xAR{B%eXUxjJVm{np
zvF3B!7Z>vH23h5b|4v_VD6*9@U{Bu%jB)l9Ltpv#H6Qt`a?LNTAKHHu>-VNR|ILZ^
p2gTYS{Q7|PNB#1@Ptc$6jfeeP$cyYZr|#wd<6rsPd71tG`yb>I(@X#W

literal 0
HcmV?d00001

diff --git a/graphics/fonts/spanish/latin_narrow.png b/graphics/fonts/spanish/latin_narrow.png
new file mode 100644
index 0000000000000000000000000000000000000000..cff033aa974de802b337e169677a756da59c795c
GIT binary patch
literal 3486
zcma)9_dnHf`+k2M&ao-S%FHHvlW}B(I8Hj0tRw4K$=-ZqZwiU%h^%DG$T&%fjI4-6
zq0F*M6uv#**YgKFKV8>--S?08>$+Z75)ONjf%Xh70D!^BP|q9y=pUs36o`Moymy`W
z59o0wc>T;bC#tHd)6>%@Cnxp`eggmQO^x()@WBr@3%k9!`dRz>3?zGN#-{6RANwr)
zuEm`y#h#K!e~^Xr60^n2e1pgW`pHi+ZtDrEDziDQdDi<naJ)NaS<)A(X*zAhz{QeD
zNDi65AM)|TXPi*b(c+y!M3HMy;8z9h`PmQ4)xwlU+UOgGGr~Lx+q>@kdZuElcXO-v
z%;VKrPG`LQeXx#kj@1zKvRZwd`ciFR^;(*TdAoy+f{sn2x~=7t`<BLPi5{=U;;~cj
z+{<!qKdZZ0Jl@ml%eU8@zgi9gzv{u&kNqH*1PE8}FHPP+UscF;?+Lt4Hd2k^^+aVE
zzwmeN<oEheHQwA*6qjWzSMH)>D4R2ssBnH)0LIJn_HF(VRdisM`K(Tt1ID`^#?gQ)
z?Dru5#_bR=#Q4ZXj*wfxvTUred&aGeM=1qr{P<wH$`nzxDV&dM1nXxA?UJ+0I-*Jy
z&gIZb%s8gf(?#~_De_uO!}l00313E2&LBxKQFhVc2}e+VV!^VL-Xv6^y!flj%U;E!
zt}t!3r5aKy<`s*35WB57E3#0{+TxwMeKz2W6$wqj=TH`1q(I233@^;MMt!R=!%#+A
zX0e)eDwWYm_1bB8b@l~XoAC}59G}}FMb>_`*YIlj>k_2^rtDO5G0iP0Ynz+t5Noo=
zO;O_Q2hsZZg(IwlH=t|&)kY_wtra)YB@*|oSd~*1$c4=pDEs(vB;fCwj8gPg4}B(@
zlI13yYD0Jy7D6!}CQ<eD-ZdzKqO=!g@Y8OVcEx$Xk=8F;<dOE_P-lsWR4WAx99Kg!
zXYyPqwAxbp_?#KELNUIWpN5dH5#&L+f;OiZCQAGerK<kXb!iF(O5HEq2gD0EFh7UV
zJ$ta`<n@-5TsW;16d7ulQVH==$=G!S8%YKumqeM{<Q<NP+~du~@6MqeG@ph$f(FNr
zT;klL149&hO7PVHEGFr=pP8fwe`5oO<&T&P&_y;VF$I`cs2x9{u9?Rc8yba|sM<&B
za`8W8s1})^#zkW92fEoxPK5RT{7O%Du3#%*WvCz_%~omHV8^qcRsw6AT|p~NvukK!
zN7*6ieFox}3-oWkgTyrl`O((drGab3BdBae!o?|q3I+E`0FqP=B}~lKQg0=PZuq;l
z)67|w)Kx-`0~#|TkB7M~vs77%4s#ns7BeH>ZHD}bW0sM)uoRb%TBn14DZ=@;0>yi0
zb<YxC2t1UsSK$F1<IiYFhv~FcG{5liQq0zSCg9Vx9j>Hp>$5c^{L*9>7uihJ9{XD=
zes?AcMcCoGtsCDcqc0y4wwZanaVabOy@(_p5m}zcLH>beL5OJg3Q?8vQvFx3ZOF8U
zjIjPKBrruAABv$MCj=QMWQXiYL!@0i)DARE!J8#Ca1iOga*%Q)_RlqpYsbfbD@WUj
zgh-$kH0QpXX;sZ0kNF;8&p|bJQhTNz8dgGYbJ&voy(OQ!K|4ypXW(#3i7{VkaiATO
zMzr{3MoTUv61$G=E$dwLRx9)cUdTQ=T1luy8P3Jx3#l<x4%yFeCURNRdFf*mTJt|p
z{~lml{*uda`>J_yPlkb*aa=as-1!Rn%N0QnKkVO3Q|F^-#**a{I-*f@nW_sI{i4{>
zjQzgonR|(g_jJM$W|K(IRlc?D3yh!76>@L|*Io5N_qL3rdXhiuPzF0YEkuMU6Nm`e
zRC*4o(V}yn*I~v08(T!Ey5OORD<bnZ{@!aZzO^p3Nw^EyWCIt~=)We??lTN8d&oL+
z?0b=2IC6$zJK~1UJ5Ikqz6CEk(Zo+1XZ<YsN(R32mUhwc@AFWO7IdEDPB@gZ=a`T2
zuX)0YC~b(FfG2L`f-e^pZjwe&jUK`$2jVzExKO7}2sW<(W>P>|Ru1T%XMqQwM-QaV
z7liPc*K(lvrMV2w?wA5$2J&4gk({O|ge?8XKl#F#n=TBKlrQdjxmgs{(om;$hUqx%
z3}2oer%^XmA+ZfZq_n(0nsZ6bH=OXqup!kzis_3kiiDQRR52F4@98bv>QHN5aU_vQ
zHnN5Wj|QidA@)(G3djIi&^moJPXfBzX@CTq7t56tN#=?(JQeHI%NoI(fc$IO>>@&`
zp0SdNQ8y>|NbeHUiH+k7Gu?Dg0L=FlGEaHCI5<`RoW>qS-j7myEfDFqOyl?``et5^
zf<;%;*8qS$!v?mR$;}^H<m#vU)yW+v_Y_Ih(3P-|nB(3K(RG-EoM;^ciV~3U=6Of3
z;|D}VfO03Vo(KPP<VS5Q!H&8Da*_?OL^qYyrg_3`$S>wzn4t={N#vH6^Rco{sF0vS
z6uQ21;2SM}w>@0A`~NC0YE*?GQMY}!|DbJ;edkYHtv6kz@MVTne{BS;W>x2XzXd<x
ze>+R-gwVU2`m_zmxPnjvjrS>68$k&t97*g=SqZ)qVu}b38Ii7L>E(-PFkmT_%8N9k
zxX|3xGIvcdQTwp&TRtGTZ6#^iR<&hk4U0U8-0Po>AV2X5<H6C)!4%*zzr3x@t*3~p
zc4Pn@j)HXRwdQGp;hS|hlvz{d!F6!pA@=^nbDzWhV31jF9kjWs;a9ul#w>nrn_uBn
z`s^RxfnFFi?CV=~_K{h_eG6QdVO%K(d+g9&ZQFZOx)p9WjCiVy10k&r`wJmGiwQ3;
zgKC^jv=aZqbYLpM_7w|U2rQEZ%Q$z_*v@KPb=^G!!e1DvGOW<D8u$6F0CMWOPSX|v
z{7Gx*N<R~rAqlEbKm5+<t;g@H$E>Pgm8ugQV!aC1fm3YbLcmLBQuysvl?C<%m0{Z}
z_aV9iDs~`jKLnZl?GgO|lg-?!U5w}ugBf}(kV|ub1L&4%a$W2Jy9&0AYIHP3CRYL;
zF~}A)W^PymJ1)sdRN2%j<)uJ@e6sM4d6XOc)>&!}^>?`LW-J|z*>eBBi4Izt-cU2=
z3S|B^SfkEAOEF6wT2r9cDk=;SCs!<3%GIo<Dm_&IbL?K_#sdkGqnT|BAY5!<F|t`I
zeJXp$hwo2DmX&*%lsXvQq@7oEKJRr|ih!u2z<cOlj<7>pm+t(=RIcC*0P_WiENZlj
z6rL`jYDRia;=f)uMUbc{oaFVN0`#&bAIOgHd>a=)g?T+A;?^x@d?sG;i~ck5HBK>L
z>Jv)RG8%Yaa2i*oC<?C?4>Z}~iYZBlKN`KZ?S4hOQ-B;hYl?x;?Bn|P4~Qk)JeSD&
zMNMODu4p@+O7DF4qv)APTdp@{_jUJ6)Kc$B4Kx`g-%*}?_qjlX=FPaHnGuBD^(wF0
z)>8DZ?s8Mt;7gpE;7h=ht)7V2Fe0%>zRzS?wmAR3xFcMO%zLKE+x+U56|AQ7`sK4$
z)$6Cp%8Wcr4#VxriuH#n8|4lqaC(@#0pmXPPB=d{o(>Rlt)0p&<i~yNb5du(t<h^F
znmQk=nA_0w<6(`<%JO`KR*6RB%VPJ}HV0i*8;4;H+uPk@ESwYlylR6f&o)xpc1j!;
zHE6e(wlX?XsMJTBHsy>p&0Rv@yQl0vp#o)I8R9RO*<0d9ynp=1?!UZBVgFC?|8GP%
z=c5>HR{yZ+Gk$*2-lzN!X)-yzIFohkIehAG?x_*ql#zoT&EiYt*FQcsX<7XZ$>+uf
zx0a0EZw_m9gyf?#KuFc7X>t@M$&wl;()l43wD?L$BgI?=;nYWiOz%Xq>q=R6PwMG0
z{m8#k-jH%^aBMHSyJ)iTDHQaJrcMg~!%RIvz`JCKYwdX-muU|346#Dwb5z*P&2^C_
zFVJtAZOFNf?!MtaT@pd1_=gmoAt)EV@*s(%XS^5t<p;-T;&aXlT+x;GzMi)yPd-xH
zWc@C$kj8pGp!%l9dQ$jq>S}e<xhL-VH)`gGDpwg|+E6jAGNrmYe^V@2Yn)gyhX^4%
z@hUfo{I!mvDNB?JO6H1rU-yw<Jz-}?*LkbOC9r>h_gJFJ$Kaj|LLzLS2@+csv3LU+
zW%!*$a&HlJA>3U7n3cA2?&qV!x5*x?w$y;w_gY2($oH=;qYaf4hJ$!%w|AH(=o@-`
zu_0AR(4e?j1n<t8Qeni-s(0)bu5}D{sYk_z2jyp7Vn5{Op{*6%d^r4Y1-H_gtJUqe
zw7XNe^xl0eRsZqbg5?HZ?~Bfnguk}Yh4X`0Z)}8>{P!>>MUYF=KbLaB36{EL@DcAL
zO(lG9?}%@lMGM>~<$d8|nhcokK~7c$+s}#qTej?(7>)cCF`bRDI64xQIE$H&ywoDs
zo}sjAHx*u;&bJ$}DdY4lt)pmNpbDZ)+UiRi{5o*U!m2V`+jX+=p0l%VPI?!ig=*H`
zHpw8V;Hmq&#P6-l6O<l;dGh=#t<PuL-Z=8?Kc8Qx=j^lhC-8;X2T7j8nC0g(xha)H
r-4j0Dk=2`BoB^^^4L`dV>5dT@`$BGI`x;~a3KuZa$LiHwAl&{xqs(0$

literal 0
HcmV?d00001

diff --git a/graphics/fonts/spanish/latin_normal.png b/graphics/fonts/spanish/latin_normal.png
new file mode 100644
index 0000000000000000000000000000000000000000..01d3f29e2be1b61bd0ad0828fb86129d551c7845
GIT binary patch
literal 3569
zcma)9_dnE+1Af2noO#FxrK3<Ed+(#<?6YNm%#)B6;>vbJMj6>F4w;cnvQD;&v$8X;
z%y32s@%1Nse|nzh^?IJ4pXZ4&)Yqh^MbH8OK(B>XGXencl0pCo^b)QdSU$Q0xS_6z
zdSd?t5{aCen!32Suv_%Gb?L`zsVSTI<!rs_@MIrg?OT0i(ci4?(DgL6H;mNrNj*_P
zy?;%!j)qI+t*%G;+q>NAvG0sHU@;nAvlc|Hc9NMW2Xr(q@x{mFXy~X#b0H2FM}xl7
z;J@H6b*Jt#PxGAVFC9rnzwepznZsvO{+>?hb!k`r?SpcEk5qxLv(YDcFOZPk@td1Q
z8Z7Jgf6OL=Pg|M2I3D!<#tMvJ8uhjLir9G@mg9ufqPFUd5VqRS-)>XpJT{NKR78my
zBS>hX$^3s^Ve9Bh60VaT5VSXPhWr|W;F)-_yoBwP3a2j<5oXi+ciF$(q~ce5#{xH~
zyf(h_7h}z>Fvl3DT@$t9ZGqvR<vWpgUvlD!O*#xdI|?$Dn@C7HoIjuiVvobvysY)6
zAud=<RuPyyms2X2lxdFM%y&tn)P3Ufpo^1Ax=TK5u>_ETRoj@&{KSgTv4&tdaQD^%
zD-tErSEq3%oa3gPzKUj<yj_GB$yqq>>Ls2xyh8?0BnvVjTs~6hnLwc{4owP_?xx9y
zBHSh_pB*9zno}-#iNzo#mxWO=JTug+Up+$?+Lq(YZ?MnQ42%V-`40&DTUHj_X0p-q
zavlQ$s5$f8uR<|~_7UHjjBpi>I%(O-g(=Iahp*XYfZ2AEqyCHRF`UK@I;T~DNb#y&
zB)mRX3iC+L9*Leg+0}kBXFk4mhYx*mhR(5Z1l+Bvc6dRg^Fr^El$4#*(1)*ZO*g2%
zZ5Gy8b`hh1&z+#6A-r41t+0Pa$N+5>Shwlp=Vp|c%}gx2a`;SRNC@T(WFd7^=5z>)
zGibAqsS)CI)cnR52f<iqRutSqnAYMJ>RHjhcmq}cDt-)hRj>ITfHz^@pg=LxLbIwG
z9hn<nLfQlVzM-gKg{_4h)C%LtHeSo!G0C68VTIQI)D4m&0gjO{u~w3=>>@LrVVt<!
zsJ9y377M;44XN0fMN>MW#0nXwCf|jjvK9<yu(Wx4&~ceXc1vI5`|l1g9}BW#S6yRc
z?GfT8rghni%=q&h$t~hX3-XMgOa?$u+0Xez4|{~CtVhfPi)zv4;dKAe@&UfgXG&y+
z=H~9;#iJzLycRG|(NPSTY`syZtdONgi4HnLTxqK-U8@}czK%QqX^LaO9;H(p*NSu>
z&64zxxxUxFv2qoBDHJi<Xl0Vg&)n#aX<{0NIsjR@O}5m#1>D`W2&#9@KnpEOZ_SQ&
z_v38}5sM#z-Bq={VIiv5p{4DGtdCU!_*G*>^gVDPsxe_KZC95O+UmADj?lzy>sEuz
z!-q+mWk0*1FO2_LKZ-N{IV%touv0`cFCdfgt<~b-PR}RcuYQd<*Ex4FKi4^ZK0m6%
zSQt*+VX6DE*U@!Vd*HR`x?mYUn}PJmj|zrF%GSWHSh>tXIT$eS3`bHf{s*EQUxP@M
zRm#>WsZ2W1FyLiwZxi)FkEJrfDr<XJly&TU4)<A3TVN9Vx`n(%Wn_;MjfqcTFriV%
znVfwK_Bn#Tzb4^mftwe1&8Ue;?elL)IedeQ*-9kv_qJ$oiu0c&7>aF6Qz;0ETIWsK
zP>ax+*SLPD4Sze@D=kNeVdm3+tn0LeLzga+Qn4%zsY$q^`7@xkw6o3^g3BBD$#@9e
zCn<iXTMLdp3{eBf|7KHgkhR>+MwGtiMYww2iab*Ev2FL%fy$OUx#{*f^qA2!SBe@Y
zzjC%U!;a#H!ay#G`ZDmjH-R4wda=s@*G58`CshQ7^8bp!*vj?Q7KDqz4}N8?_}TcF
zt9|X1rAfP#?r^X2a_e2)36N~cQAH4~^sY{)Tx`4b$<E@99K2GIT9EYMBco+l^D1@W
zxHjhSMgwHO*E0h~JY_h@ZgY!Jt=r-Mo{rDDOr_LDj^aiiqyx*Qz4C1&Zk=h}vZHi#
z2UBs>Dg^TbB<q5|+T<k&*$~u9V_)WOppQBIg0UFQn&2r>vzb#9x&cDTfj)Y1t+_DV
zea9`gG~myu{0}gEA$!-Mn~i`NZU4Bv$@_LE{AT++j&$76)kqU64#mmlzRoSz4{CRk
zJ;QIcvkp<<gIQAn@4L-i<3i<I2x0~WLH$703M3yVOa$KcWUdcI(R(@T=UumZO$__!
z=z=?hdcZ6e8fR{hu^c~<1QA_mJtvZrOxOtO3%pt*rgcigarB%<uX?!hXHBFFF1-#Y
z;%Sl_9E)It68AfHc%0w*)%%k|P{Z7NMGdx8YfD1Tt2mI%JQb4DFm0Y4)XGp@a%`DF
z@rr(lU{Nw%=n1Ax$iw$7uVOG@eXzMOVGxcIst2mqi=Aa9W`XAE5h)FpowNfZy(zL$
zFh)klldPs}iWSj@{!;8m_P!JzCNNF5l>L>)7rk5c_Un>5nm+oX$yC`vZZN}ei0$Yx
zq*hW5RG$|s=c;}T&G=v|cLuoU*Ru#-{}Vqby`%xId%tfoIaa8NO{my^GSXJYn<kA3
zg<#k+_ASJ0OF%x?==g9NTo~3?#vWeHOjh~y)Mig8oEShsTgmH33uLFyLRD<h1nWBM
zjK6D8z&cO3q1ct{8Y@(E!glbHbF$x)>4%eiQlbL5xqfjrJF2xE)=?nHg<HpF?^T@h
zd+2zB87;8DB{p?a>x5#s0{SEOC$8$ZG4Lb#Y30^U`*mhW9YbPZnri!DOy9aVLsm9N
zt{Zg|L@K38mTn5-S^x%n&=vK3pHCzfax}z-T*2AWpu`w4NSK%PRidH^@VAun6hwHx
z%N{6#A0(JroKV?;m?4)_yYIT9j`a&u_r34p9n8JqXsZPUnWaBmF1=`~%?X3w^S=dv
zJit>GN{rX+D<Z8w1O&rsPjA<`j@&a26t#|8K;F{@F&^Z5!7$X>Clb6=!8PA53eRld
z&2B#%O82F;YGKYde!L|D7YsS;>`>9C>Hs>tb7fLwFf(Yiue>u5vs?GYZ(KQzWdGB7
zU#Y0a)3qY$3G`Qj8Xd^nAR~wBa7QQf&H<-VHZAha6b8jb3KI0y*~vPGMnIcv#ydv$
zs<GcIztp6;Z5jOrydI;z1z@)C;Ucwuf00OE%jXCkX321Pj9SmHV7>-PNsErvE;qEh
zzvgukV6?!AsZXlBwP&hfw@yLWeJO6t^YcdKf13TRNub~AfLGP^*km5F8{7655|TPa
z{%v$b?$9w4p6tiVQauQ0mb7*Duwsp}U>8+IfzEZ1z(fn&(<*Ng=oD2P5F)%7&J4B#
z@qTyib6YvV2+2P80Dk(wbaS)oxL4;2F2l?+Fjd5E0V3KAMvLNVS6VbkDt~w%7)L0>
zA3a5mZP0S^0285B^gUM7RC5#nq9mVUe8T2r)98v@%i~Y~c-81??+4_?Pez^TB^wyr
zd~({Ll&DwdIX`*m(K=V6TW|S6Lu)f=ldP9aAv`9f90x9lMP&{iwK%wRFGypDsFsB`
z5*S#CB|U`Som|GBXH^;_(<o97sC?245t!Mh(zHEZwm3!9Ez1sDjv*SNEJNH2ac5I@
zgoR@Hi0+667^m;A#_)_rMQE$eo&oss<oTC+Ehoh94-dyFaW9|7^AdU;>CJ=*4A_<H
zv;FS4pXI+0@Tj?0nS1`pTPHrXyK8wVG4KudbdD8u{?iA=K_1f|+UdxQ<b;xI@(Lr3
zThv82Ycmhm|6H6YP!Srpq9v`{pIIFb&$e84Mh?>ZazXsxM1Y6WU&W+c4ral!eCPxc
z&f95Jx#`|M18*ODY__J&D!dn)V=nhC@39#?kci~ua?p#8n#~z{Ki_q^LiU`Y7R8A9
zf_+B*5eT^Pwh03L(AK~D4=!K=_#rTO1_Z0nxCz#rE2V*@MPR6<KKL!dFQVHwq@i5F
z3f%t1gwgTZ>3gHfr=*cRdEC;M0MV!RXlm9vUdTN<GGR^|1Cp%xUrRQworO=>Cmgap
zI#Oom)LcHy_j#Zkld?whro-V)Z?jc)P>Q$qkp=QkXljCNo&GXsf>^KYd)Th}y^Bo4
z$!kU~*K+s7dn`Iy`n%XEeHbad?a)!-`(n9!-uZ*TI%A?=C&^wA65o`TI??&H^Yb|J
zY~PNVj<@Qr2`tpjDXQYvl7ViVP<g#HzUFf=JxWieOql^4kaK#JjMH?3qx9|q?7r5E
zVu`!ytm%mID*!RRf%7^bIj|ujiI$C8o@I<YUN#?x*M2&=6<96{)JnVQqs~Y;5UCxl
z@cqxLJ5{xPyPEya_{2qRN|6dIwwg0aJ$a>thO39BXYr}S19}5nCF)WE6}u1RtLA1`
zzA#oOUHkC2ZeV>YUreXB^#}!GG820OSEAw7us2M}g3CsRPxQWCu;r4$eu|zec7gqq
z_H=G0LOb_{lcRMyQ*6u1YHkv%=Sdqoic1kd@QHw)gLDE+dJ>i(e`Yc4)^Yoer`Wq1
zQC)g2bcE95hjQjO^J-JI|9GT2+ltV+Su32Vw1`ZdkHLJ>ee0SjJ)}q~hRhXlm_Zz#
zv@N)Lt7~IUETl}*MDl#7;PCa4X`d@>O)GJa`^2+(cFzI3U6PPGPgVRJD{^%4EU2>s
Y^fxI=r^0KNUVb=0OI=^>y$UA$e|X-V>;M1&

literal 0
HcmV?d00001

diff --git a/graphics/fonts/spanish/latin_short.png b/graphics/fonts/spanish/latin_short.png
new file mode 100644
index 0000000000000000000000000000000000000000..633594c2838b7bf53647cbadbe8fc9072a0c5429
GIT binary patch
literal 3493
zcma)<=RXzx|Hj|v91f0-kr5{%vNMuR9IGgM&y%uFbVBy*P>94)5+CBo-ZLw4j6$T-
z$%<@886`SK=GX5(_}#jm*Y$WkUN^3LSAv<zH6#Ls001Bj4fHGkfSe!{Kw&4sMsvWP
z$SE@;D}6%Wv5Jby`1tto@$t=Bf1#6mD?>ePtB~wpuR46r_H*_ANV4l|x$fE>^x{MG
zLPwWAK~3Ml;C4NepiTiAcl3}^!oumr{DpDOn8~X#DP5TrRn2s4$Bz`|JKdfyW$;-)
zddg&=68g9O@6xX!mX{srANqrpSwp6$zGZ$M%6hdE6cmJ&(5IZ0+G@-ne$=?363z#Y
zI8~cMZA<rACYmz%sGX`wnPeBxU2|2f7C9$7YX7gnDWJ{)QN$&*AB2(KB7G4rFJ}Lt
zuK0fro1rJ6t1?ukFzS}ARPa*)FQ2An@61?(qbE-Hujt@$&xc>vFvYJz<8FNa&@FB)
z{nPoiEge?>D<bvKT+CWJ=<`Y-f~KcFS7%_`?wqht@nGlZjnjzb{s}3^K=DF;f)Lur
z<jbk)y`}ch46Y@s${cB@^Ob=X^>lJlgQbVQDDqFY^3Y4g{-xwgd0s}%jCSY$SSYWF
zu&V|bmGE+`5ei-P2qT=c8TiR&0k<hG$1!ydbT@?PD}39m8_YJ=zfMz=^gMLb74J4D
zA+(dw#9Bp&Q)Asx<pQ)#{&uWWU|lG2ten;pdg-<V35&69kL<4uOSY%L!hKj0A>@6s
zuJ<*D2u%z-F<b(2{Zmz|Y7+?UPH&SF!|xHxMf2$U&NeQ_s?scIgWaxhBDYi~emXu!
zwRNqm+@D#H)o5}ooU5t|D@yDchWDn~_<_diF_U_H6oKAoyRYXm10jKldeLPT?A=Oc
z;w62HAmPEf6L7HSyreS^8K#f$zdLnxcWX;!b@eg(X;wWPY0Eu22Ma?4QZw;FbvARc
zc$K4j&U?XkU3VCmvDuf2wwyKkpn1gs&#wBlMBL>ERcp)}21e!cu7V6R9`f#HtkNwz
z&OdwQ$6n|TakLtR+KTTAjy~Un{4@W4z|_($4sMaWakt>tQ;S{?o_y;<*?G&&AA<bH
zRuY~GV1y6Ar>PJm(_4kL)gj0*om?N3_74)jpT|t-EW+s+WQG^0D@a!ISeA!JZ1rD6
zPl1&Z2v^0I#|?WH5~%Ri(4PA$Fhbj?)dp60N(e-6LqhU7MV6T(rZHv@>Cm>3_O~tv
zp(KDX?LEE>!gm>nGP+pgKz{O~v#R#!A?;WSb1b;XAv(efGE*N*bbm^vR4XWl{PLS{
zkz;0Cf|PV7o203gO1;6|TX0D~sk9VANUnOZmxvCz(xo9ZEnEcTbu&Tx;)?E64kK^S
ztIqgAv-wJqBB{3hL|T#}tMAk&-iQkMJbdrbaQ*`v={wY)bi<jp4SBAb=@F;uI6c@u
ze2g(7sJ_?8^u!4DdlFvb7dg=8_(2J7cwhGITPLv8zr~s_^?>KJr8DjwJsOLMuaFur
zcCVOD?_Gi8uR{RBTRL!9zXi<3AfR~Z0C$Nm3s1Q4E`cONRf~8LaqwjYSRH5GzZRK4
zNyIY&C*1Q<b*~0zB73!?>(;##&L+QVtm)n275C^qn(3VVz=XD%lH`TLK**L1SJC<3
zMDbZRMdD73p*bjm_^honlq2GNo7KF`dBFY`mL>+f$wzO_`c+PrKvn}TAc<YajywCE
z69R&xM~rjtpS;Y?v6AxFOc|owYqfSP9ypU`y2cCI?+;9%{%t3Zh1p-l%8H$2_9R}h
z?GMXM!EKwXg|Q7Yh`LoDoijB)HZbI;{zk}8_dvRYhqUKmGQ`OA9KBndB}^_FNR<RW
z(AAXPmM|XmZnR6B!lJH`LiD5=3BSgL$pEox82s@sW&Y{p3n?w~9;6}=X-Typ*zl9d
zd~Xk37NK&_de^3Zm<OeQz6X0J*@J@(F7;pO)hv4|J&ehc;}BeBar0Pr7JK`<Z@NRt
z`ZKWEicP9OHb-i|sJZASwdiO5{^%mx0HIiYlJDRlQz+1Zkr;o)P^RO!1v6miIgh^B
z6yrIyxUgO+;Dv*)rP}CX?kn>a0F{wgKe=x!JHEidYFE*DD+$qLXgX<6a-kS!e{>$p
zu2Qe%#Q7Q!n!-=<Y`;yg6!HEKmVBlKG;|UI?hoP1-`$(H5@AyE&^m*MUyN<T8nU)`
zR|Rc7D{TcU^`J)Jmz;(xX|cH+?&^8vuLg(CWrvrsrw(t~_9B86OW`iYMa*azR8E1J
zSEl-H=@fe}{O%S`@02e@*sE<dBM`d>DMHp9REX4e_oO&+oYwN=mLFV8_zPaHLb;<5
zAzFAv8VvLSo%FAwrmp2bTKv%GbiyW_;HOnc%K8BHVWAO<iPGR=Fv1{fsta=48Y+|P
z@frebJ0=Hj-5`>1pjEmAlJA0uR(89a2YhI0gI5NPc2Svt;P)Vo39l5R5RwKvchnON
z^JOrnJg$qfU#p`3_Cy4)TZ$n}nMQH4XGT1@k>dWHc<3}LF|do?rYa-VkpGTeof~ML
zgZ=#2BpX{MLv0nHBL#Bua~Rns8;^b9e&}o1d+{4G%=;Ws5k?j$UVfR#kk14#@h_8J
zva_!L1u$koQ8!?h%gP8p9imJi7e44E_s1z*%JU=cmI0C~@EenPqNKju4$4X(Rjuwu
zgkZROfMGXFMF7MK@SsRhg!an@Z0!1S{ji@XgBKzOvtGL&>=FmVbw~(O9zB}ed7*LJ
zdn0^pH4tvD#=@iTf&7~>lSNpk0E|GzIEU=(2C;L2hybd&7=2QK)J*$$b#10(u=Fc;
zn}|tp<?o~;j0|&W267oNQVFKoOX3tG5@=$6J46YHzwsx{I1=}6optL)gkh~Nfh#O3
zeS61B$%a`hU<0-v(%ms$4<5@jGJn01s3tE81f#DlIRq?veTE25M}`xiY`zzQ<~5+E
z>)#=y<3K(+F#bS0j3&mSQ9=*>oOkD;<~?DXode<9GjUDl_plwsG;WH4tom{YI)xR=
zp}ZOP+URg_)u2SAv1RB{ssZ081_P&EG@W&WPp<PwA!NJSh#BIcIzR!Lz5xPTH<+M_
zhw3*cvkM{Kit~Mtz7W9Dkk+?&d-H-)s{(q0gd@EGnK9+i0wfzV@tSt4^YsET(GK@S
z$}dWtjcJ4|ev&J=l+9Ep!t>YLAFm4a2cR`V;-<x;s83LuiCT-=n^7#{j}mzww(_4(
zqn-N$^hv^avuz`*NWR4lCKXqH3TqaO<74p3wOY@uHK|mD0xiQbMTu?+WC_wmYq9GV
z7MK~yG<!e&GspmJyC<k0Szu;z--Y?<%Di0qE}wksaO^RC_Hof1Sgo2vu?;O`lh`KI
zY?WdR6Byp-N0wy1rR`LTfANr>%60I5G$TE)Y<&Ld`qt*EZ-sHa&(zp9E?^8bH#(<m
zjH)qSh?a!4PyJq88Fml`f3k{{-U+r9ZDYUEUsd1<304{!;hV|$ogk$)_8)%zCimXH
zP;I1o`*KNt8F>4!N8zAN?IydRCd*SXUr)=kD|QdFM9!JcbCR1sU%7w(I$@y}Ws(j^
z(mVaeXBUe$@YP8Zz<0!{i*C2MO8Y&ut>6P+UCKqcUEas4PPZ<Pi)o)xYh$^oDZR&e
zI*VrAmWT{n{wZ!|s`o%IRYp)#P;<LF9jiCl<m$AQJr$t0e*AJh9gMg0TSl*1hrd1}
zi)jnln1BD|{|*0Y2d+h16mITA?@9*l5CL)I`c57JN!iD<A5^`Nxo?|H?SZ*hnY?K>
zjnynVye4jEy|TeP<T=K2hZntEE#Z>o6%bDmFfT$vhYi;CBxZk$7Q2Ht_Yq`6t6lbq
zNAfntOB7KlV14G#OB_Q@`7noD5$#poox8B+okVag(NXIT-}M6?rFE~kJ@NS@vd42{
zwY<YoDc7z>X2F(+QWl-M*Jo-_YyDF22^_gVA#$Irk}#W?w#-{NQ~xYA=m)-OFJtqH
zH72TT^NTh{=!j|8ZGJ&WWqOfj`a-p1ZgDDPXo@rP@JKY+M`aME(xY1lLr_d}{s!d_
z0)AFPsPOE)G9gXP?@E|>xp;9)>fz1f96R4oj=bx;mX~Dv2hJS}Rr>WieWD*W{q_b@
zf_lEfi4W)r-IZewsT%;p7eI~4B=YDcL$Wxo{GJRHtc@SqBhcra-x<U2`2XB}?^>vN
z%%7=^v71~p7@<So{1hfSySwlhGVb;G+w^|g*=ky1N-pvHJ8|UlN4|V*_P~bYuN#-^
ztwk%{lh^I3ZEdnG`)$}xyke+bl_V?1_ZCei^-RZquV#Ml?R^aSeMKIGh`RmNZq<kE
z#&GuNa`ig+Qp-Y*^23GTL^e+6h@DHh@v>_cl`-)L**&$~8k8H>U&n-38mpW4s&o9V
z;x+$0I_FB`d-Bu%%oXZk@ut(h@V`+1Nm}5GQ4nLayKuF!C2T+Yoz;NA$Ad+#Z{yVR
zeCZ2!J9lz@3W5y>mrx2{#boFdJI5KTPBEf>w=>Cv%@iCiH5H-n1n(&sCPiRTHk?Gy
yR1V!mpO(o@|L5BS#UIx58=?!-r3IKz|I^xpm{BBOt9zX6E?}r{qF1Hk67xSWK7dF7

literal 0
HcmV?d00001

diff --git a/graphics/fonts/spanish/latin_small.png b/graphics/fonts/spanish/latin_small.png
new file mode 100644
index 0000000000000000000000000000000000000000..5232e21aadcfe1652983a7e302ec88895375f7d6
GIT binary patch
literal 3133
zcmV-D48rq?P)<h;3K|Lk000e1NJLTq0096100IC40{{R35cFDT0000CP)t-skjVcy
zI5^nY*#H0kU*K~h000Z@Nkl<Zc%1E>zi%7K702g{Scp}nv0<x9W5egaLPd}|MM%hU
zBPZZSq%83-IAD>&h0EY1SaQS00!`mZS6y*%p#3K#KqgW~fF!`@#sW@fnR(xN^LA#3
zOL4hWE*swr@I2hzna|Fz_jb5^PgZK$G)R={lbn$pB=-0sw#RKLhn%GCT-O)QOr_P>
z9-o<GNZ*u;6ieT^t}l!g<>X!+{m+3XwKywvQw}-AEvqjy<E*qi*)rvjL)^0Zg7g)#
z7V{vvB4dCY;+EGJ+~%S}-IK8Zw@EnJO0qH*;GWnh(*^g$QGr?5h^^=gJF%6wbli(Q
zG3Ag$P7*6ai{><$a3O_c^gXfqeHc%sp&5gMbr2P)>;v*dp#HIMrPO|$U5TrvD`KSt
z;94!$N~y@J{4i#vD%^!A83rKVH<D+uAZZI4UJGyx8zAb9Lak)jYK`ndBer%ytTd+C
z*H8=ay3lk$4FlLnMjIKm9%uC%mFpy%Mo{P|;c~8|fRi|@->?a|!@HOTg<vCeIY&+f
zkT*rU-tlENA|#b>C<pH^(E%zv_-OKE0sz)ObmQRA1IVr;qwnvt$FNeV9&C63*>z-g
zDetq#QDT>R?FC&c(*@Cw7B%_s4cX8=rwb5Q*AKtTDj3xJAZFcI9|drAJz5&pQ0NJC
z<Ajvph`O-<$OEJm=<W><Aa+5f@$iXK$FD~L(1P!*J!s?s^19&Kgv}*u4>ofEN7RB(
z0ys6|+Jtu<YY!kh9^mJ1N=)O(r5w_TL6U*;ujNPu0jqlq`0%DA;NevOpsMF(0gX-4
zhu2e#0RU)0=`J))3rYi4w|NkMDht?o#(+;{0TVBzkcth|WU~+e0r39`2#LQ$>H(q8
zsX_IHuASj}j-gdw6$JE)03Ojl%{|T|4=^YKK&9Fq=a2)sZKF*<W!`3e9Dc8$0XWe&
zfTjT~Qm32r<s#Ztik^1*J!1bOmpvNQg2e&vP>}zPh-&~GD)qe?gVQI&uSPO0Sc&-I
zx<UsLRc@mTs}^waW(=TBfNvwtqlf|Mf&k7wjsUC}z%Gr}1$`^qrOH3hsI7Wk=#T0`
z`c{T2UTkwdSfTF@FO_=PqA@YE@Z&c;fNxy@R^o;apdlYnOHR(ICA&(|hK1iLQWwsX
z?CSvi!VzCG^a}+l_2~!7>0oeDa3O^>rBVGw00);`J1YXnd~5Zj|BG}%-YJ%D!DVkZ
z3jwAcgT}Og&1nJeE&-fg$ux#^`5?*l08r|B%rZmAU&JK<H<uW23xK5(fZ75BkV7U0
zyzJV_r2x45IyHTRK(ESl0f4(C_f*M2oTW;$ishOr0SIZrqzCY$D*qDZU|N8F7ES}u
zUxA+R*1i+~zj9$$epVKM-_cO{qUftIKjC*Y-TWsd0XR7|V5%<Q<Wz&GFHAFyQ!nLT
zV=6LGmkwe81i)tk2uY<sz7`UdGl<cnDFF|+rv$9lt^bklqv+=10p!1sP^(?umEc19
z>wm(2iTL~~&Uyg(-{#d?-TLJHGiCum9Q!WftQXX`K47=U7sas?EdfA$6VGDy1`-FJ
zGXs#W>1h-IUiBTD7D&_2OxKPDVD8+@1E9&;QNwBW+r)8VFtZ>7c_IM34&0CJtHJHq
z`XZoJ>1UO7EgJ|x`yIsg)!=zzeGyLG&&poQ0H#_<A&nWdftTlq{^wsYuK|CK3j^R@
zhZjy*bw?urP^yst+#L|y9S~{BhrKKS=jw^gQ7=`DUSd}smbF%-Hec`eSqt<0nsb{K
z%^L+XfTNYH5BHkM+sO!kD9^qD{Ittm(~iH1)!O<f0GfxvJThZ|mh=<bbOE$R0kln+
z=N9OJeZjv$_)bo`3wduW#U>o>GT`*oX}0Meay<(>IRLQ<=L54Y2JCXU<IGmi%--0g
ze4dP1i6M<Qn&S*?1pxAp)T>O{r?IR&@n3fBfX<b1y_bCe4z@f1;NrjR%a#C8a4oUV
ze*mI{&o^W1zwF9dY#jo1lkf(=<^UcgwhQ7NSdXm@z<wbGxX#RSGRgt866@@E?3B$6
zmYj5rhKx@;v9PavK<cNg>}PkAAwdxvi9HsdMy==Kr!27v`g3e!8gLHfj-6xiX`Fr`
zg;a77opKcbWL#{Ob*X5Z0vG1^gL7VXtnEC&s}TVCxg6(zq;fxx0$?M74Te}A?Wdja
zv7DC{Xk|(jCb6#9c^2qJl2v<@i`*87nR2)H?)Kl0-v9uHM{llb&IJ_oqbhW~Lc-r#
zT!3!DR$`4t-^>EGe6kNn;}sHCXDPR6>gipX=sk2Cb^yOI%03{CS4i0LTgtsQ^(I<K
zCpqOpQWF@_JekM}|JMMQIVg;i0|1W36zX4cZJ##dsZzK*5a>M=O1@9~`vcL?{l6MO
z-Y#S@Hqn(M0I*zeOHKiP0c`I#lB^w&S0(bgV1FeC05yjC!kFldM8e$>yU~oTdhhRg
z0O)_qR0II9f5&VeT)S~>U<VjPZ0Fs504l-~V?O|!a2~ULaP0={f_~SKw~$crQ(Vw4
z1P268MSqMLB^uzaz*2yzS^yV&d0*)3Lt%g$C_Hfs5U1eYRrUjgTYxcejmD&{(EvA|
zvD6s2l^RYy5g?6aa`M81D7GMt+e$9?L%Q096jFW~(CE1C#{Xl$KA*e3lrOnybuUqm
z=)rkNvbxFV=AP%vkgpNsApzj*d$>)X4WL1v8xc#>$%lN6GJx;t^Ev~XPwBZCvEW*?
z%`)U`baMeANwHd7WI&_GfX4)QZ0-y|<0*e0@-_Oh%Yc;?1K6_w+_7aK(vl%xBXprj
zfOeY!O$X3$D$AG*`5Ij#S=}}O>IR&iZ`PIi2YsE{GV<K{oa<|}^DI%jyBt}y^O^y7
zm-A)(LLzxU13BBtmyimisg3Gbz&PC=3&`lUQLKpovc4f&otLtZv4B*+BU6!DF}K8e
zar<@wz>?Df0W_#PGX%M}TmbNRoA2K80CRNr8=WEmqvrq#V2kd&Jj1OR3)pgW`v&?B
zHKjY(>O3=J0j_Re!!&l-M)XL9@82%~$mn*LD^IizLYi)ar3Wzp0^l<Ngj9uD2!H^n
z1|Xy=%t8PJKs5j%RbdtaAONZX2&oFQ5C8#C4M0d$n1uicfNB6js=_P;Kmb$&5K<Lp
zApioP8i0_hFbe??0M!75RE1dxfB>ilAfzhHLI4CnH2@)9QG&xi{M4@okQ0JX2+-@<
z&+-?H5u$VxusR1w_<z|r4VsV(2uTwEeMHaPpwD+uF=97-Kej;!O}K#CQwvz67G0zB
zcMytTf}gH+Ea3Wr35aq5&AJ8XQ&jm5#zaDolnq+~Ao2l!U-SS73P52x->93xHh|eK
z0X7tmemXc^8-jqp!~8{u3qlZ{fG#0`s@FALSo8tPh9Iod`59-x?sggIj=>h4)6<8+
zNs|dd&>=|9X`Dl_l!PasRrgg$zt%MLhr0Di{IkRthXSK;yujzbR_6MQS9WHemnqgd
zq6@LSp)j|g5Vw^!C^-Lep7WVH1GGIrVFdkPnW_#SuP+*{gPDVsiTLxEe<l`G-dLy_
z;u|+f%jSM(TU;}D^8u}GR&4+x)1?*}AZ>9FIpqQn7z6-XvIJm@@);AxNar55%uN75
zKbC)E0jQ*#x4<CX9XftKr_`%IaR6m=fi2Y*0QzpuGXcklqyhlBhM0WzYaYB>*Mu;k
z9>S2sq$_ib0fp7k`cKCXVjHfcubJanr(Q@`m9EcERzBTiNqA!Vu$&Zd%Y-N1asFF?
z=l4cel%=l$xHF!6cMJfUiL`Lb=BNN&kcxPy;#dQ4=g2(&u{>b|Pzi!1zC6d*p$p5@
zs-@c|TzAd@@JO#kX03N<*><`4-3MF{pl8oGOs_-Fy3T$6EMa@<FQn&Ni#F_5T7ZN?
z_|J_bi3!7OK}$8@ah;#Ml4h3q?idR(ThRUa89PhTZEnF<HXsl!!QKd}3<w79rZF!1
zvpM&NKN>(SC*)Xc<n8C#@I`<gbgT{0fL>=9@LO~4_xH2mix0ZCm9QaGZ}&fw?+gC{
X(iiW0*nB<)00000NkvXXu0mjf@@&2i

literal 0
HcmV?d00001

diff --git a/graphics/fonts/spanish/latin_small_narrow.png b/graphics/fonts/spanish/latin_small_narrow.png
new file mode 100644
index 0000000000000000000000000000000000000000..5ba544cc394ff205384d178a953b7278df2eb522
GIT binary patch
literal 3132
zcmV-C48!w@P)<h;3K|Lk000e1NJLTq0096100IC40{{R35cFDT0000CP)t-skjVcy
zI5^nY*#H0kU*K~h000Z?Nkl<Zc%1E>zi%7K702g{Scp}nv0<x9W5egaLPd}|MM&sJ
zBPZZSq%83-IAD>&h0EY1SaQS00xjQ3S6y*%p#3K#KqgW~fF!`@#sW@fnR(xN^LA#3
zOL4grjE!#wcpmQV%xCA<dplgdCo45+>L*I|NX|(P6MK9a+vB#BLr&6muImfurqXI`
zkI&69q-V-SilygV*B3^La&oVZ{^!t>TAY=-DTf^5mem)UaaLNMY?*S%A#PcHLHY_=
zi+PY-kug9Ham(uqZgWwg?#W1i+a#Q9C0Q8>a8GQM>4JOWxWFuI#8&i$-Pp=oI^Kyr
zG3Ag$P7^Bwi{>mDb0LLf^gXfqeH4$Up&5gMbr2P)>;v*dp#HIMrPM*3U5TrvD`KSt
z;94!$N~y@JJRh@C74AZm3<8iJ7|F9(khBF2uLU@U4G{H4p;j_zwT5<~5nH<;RvOdn
zYp4ZyU1&O>h5>9O!;OqukF)xX%5{=WBPev7a5+~}z-gS-Z`cIf;a$vvLa-6KoFiuf
z$eW@)@AxVk5t7O`l>PTt=l~V&e>8bA1_0|Hx^Z~q0c6*a(f9Y+V_2zF4>ml2>^d^L
zl=s==D6vbu_JXdJ>4NA-i<*4&hHU7*(*=mD>qkFi6%6Wq7_)Ay4+FTm9xV-ODD(un
zaY{;XOkFrw^Z;oEx_iR|h+U9rJbI$k$?IVNwBQG84;p!Zye_ylVROmagUuYkF}2{6
z0M3lKHsM{z+5^b02l(~764N+zDTg#<kYu3zYdKOu!0J8&KD;Rjn7<AHRP~}Pps`8%
z@OpwV001p0-G!!UL21D1HV@)2WdXa-81ShqVC;nyQn7&=Zx#X|0RBG#A@P?;Js|Ws
zHK@MOwR2q0F|_KNf`DETz#{$A+~+*<0R18WRI2TB4mqUTHrfPK=55x;!S@OpfD=6f
zXd1u*b-GDkE}~7P=xL|lBlbRW+2dg?Sm^T(1^GXSxCX$HQa_q8ID0bqY9!Nwm53j%
zD|8T1<u<yoY5|vTMgZCb_&(x1iWq<{2;ltV5WtE7?9pgl(zmibs{9j;+N#%u-mosD
zZ)K?B<u>R275eV*QmL0M8WS@MKYzyq_|^qrC2sft8uC81<n)4CvZoYnSoobHb>Sk(
zz7EhY9PuSXzfho3pMIj84*I7B7g9(Q8r9DNIK1N8c@aS7TdOC%&(Z~Xr&ziLSH0aV
z1ekaX8j}JxCk4E_0&sRM(-_j#gCy4jK&hKC%M=}d6_)_qUShx<0G3JsYI6)g4jCKp
zvTG}s0^siJ)btGky(-fM0Pd4KP$dU(nkr2zmK&-BAfz#q9>9;P{7aa_Ndfv<I0-<1
z1$x3;`%(b>%7tC|d07B{M?>YyqOZdIgx}G0^PiLi;N--BiMoK36AhxiFv&Ddyp(^7
zsmMTGIfwxe0AC0oB$fX7T1ZsRAV!N50_L|T1gzGr|B>&b=;q=9<iC(mt6koe;6nQA
zf5Lu=`1~r)dI0&~=G9u=`sDpPW&uDP`!3_G7u5GYU~h*nieo2Q0)Y4?p2zGBBn~|1
z1|VJ2(<lJE>N_zlkfxuTuAK<L+<7MtfF^544X4>}6UT|c%z_N$sQ~ag@F2FY2DfAD
zi-1<8pH<eitS<oVcM#iGgBOYQML2UmD|;;im}nt|G-A;DUY;ZRpZ~<X2K+fL41jwb
zUN~XZ9S;FOsfGe@cR+A=K%^xf_Ok$-t0y)`y;L!F61(!SthFMw`FgL%TA1h8oZGBu
z)+m?(9Is@3xYtbHPKE$Pc@7NVmp$&9cKl7O*4Bps&^!$0u^9ujq?g#H3!pU&pl!k|
zw?Gf<3;qqlcXHBQ$a`ZcHsN@W0cU4UvrYGq>si>%0f<ew=$m!XXP3iWXSR0C?2TN?
z7s-f~7}98?Im*CR03Z)Zy~>n*8q3NP|7F(>=v*1sd)WuzV9NslF8<5DYzY7b*An~u
z2OvuLd^5KG%dV`&)*(<g32*Rg4q!2{T@dfUdTea~_6sS%b!L{6Q4XM$SZBu*r)*}h
z<fLmfWPI9*g?-}#Qa@#7Kf9X@35wWA?6LSXYCRV}Wr<DDpJN--fO9B!;v9=l<Kzn|
zq>_W^l&b(B<6^6<OGVohxHQKfob$3{ZRY`A4FSl{<v9N{mHTxV02>KxFvRj`KkbB%
z<-D{&D^sd4iFLisvp_GBtlFbo<hDS}l)JrmxBq_p1^_TTdUI8CE})<vRiWb*68_fW
z0(1+u5^FSiW)`sJlYKxMuaK}hOSuJ8Pw&b^@1f(c1Ne<m_5o?ULc)&UQtq{>H`YQr
z%_$d>8q<*alIt=4*#W%?0Ea~Yy(_LA>>EIoWOpFYdnlBApZ50$qM-+WH-Nld$U<zQ
zD~AAJx!{(Z0{jBl-ftvXJ0P!0<aNQpN)7;O4E2RE(Hn_`yCZg^8C&%}*z*9;|CXr;
z0AT-(**>^-<HW!YF^JG@cOQU?u*BF8z$RS8Y#&^^0lT2zHRLTMRQwbdv<txjfm6{R
zV}^+axGS&}V4@bl#a`YQ`ub29;06kh-2%iZxObKPK;af(3|ylzZfi8ajb|)125zN>
zlaB>RW0{=1@F0pUNaMDWtNoC!cOiw8pZYX9uDkKI0B$bj%V@v>pPPA}FS%)TKT(VH
z;5;H(-Q;tPZIXzk>Er{xMv!>|z}feRD$N@}^C>;{A{JbWwpj*zjWU2A>GL`R9uwfP
zxihXcp7Q4bU!&V|2uX_7!U6*tI~IUDwhTmCGT>|Ub(aAvD+aJ{0S%|JjLCqn5xUSM
zK)cNV_;BB@EA=n>HnL^px$}9z*XRbx>b3z;H{kRP!2RWX$@MkbeU_-bJ&vr}C3!^S
zFx|<Q(F-Z;0VYo)jp``f9tp_kw$Y2R0J6RzS{s+Lkdc5?zavwTS~0W4%lhu!0)Qo_
z1p;VLccuvPV7UO`@iyPR<pE~s?zcKc07lON62KPSd3lOkF%q!l==Lr29coH<uGM*F
zMgm;jzJY1%u!`@H3O{^U0Fcq`E>|9F9gIq0e^4Mzvcb}W7ytqAg#bdT!Yl+p08|4I
zQWa()00N*IfRL&%3jq)S)c}N4g;@xI0H_8aq$<op00cla03lUj76KpussRY83bPOZ
z0Z<J<NL84H00@9;079z5ECfIRR09xF6=op-0-zdzkgh2qVgQcr*8|9jVJHOH*|DGH
zFBl_4={8_>j<E3mvT+)9Ar}ymBmn>jzqv)9@1bJEe*AuLL>f^gfZ9_FSfCc&p!4?-
z%V46XZgec*=A4PBaskb{1?W>$`5wkZVwaQ+TLK{R0sma^0Ej9;VLIQao541K=`H~_
z6pwy7I9(gVfWO21Rfh{g5Z{0<A%JS9Yr3%D1C)(nSf}$-&Vb$TGSD4^Ejp*C4}+5?
z6T_fmn4Hr%hhQm*Z$PUas*rxGY2Xia>y!9ri7yUBR^fP#&ws1T^(n9H)GRMktaU^e
zVtGSh?m!{#Ds513{^cy^Q*{Ptdw{}-8p1MF9X?)PFj@yQ2P+ft=db@tEU3J(P&EWd
zZjzSG{K2-kX71(#THCDJ07RxsEiypb;vn?O1t78r0JLNYz!v3GCXA8J&9}@=06;&M
ze`f)xq?<R#Al)50em<krtG{pnWpj=#)fNEyZq73S#|Xs&0J(;keEM4+yjs`9K%pMu
zn8c(jbBqCn)zSJ-$B$wg@1(Dp<7uZ}NY|Ba&W=|;-DF98<IwQqQGh!pzVV*(-vT^;
zFubBHeGR~!@!Y#-0MJaNxjQyT1?YlQ#6uOw8h|@T=J}812^)Y)5G?WK8NLo(Sf*Aj
z-8J#PGX{W1dMz?*y+g~k%gygT;(`D@d&Y5o9eUPv9`a|2`%`}-J>Oceal6t2BoxAb
zZX`)e7-kDvssWGd{N$B1waj<NScutz?$1uyS(0vZ3%0Tmg=h)(Mo?uyFmShxanYa6
zxj+5c0BXyF(<C<X?(=N?BS4Qj)`n=nPG=DCdvorO53}))kGi&%uptv~_rH+u3;zRD
WN9ErXO<&3Y0000<MNUMnLSTX#XT!Y!

literal 0
HcmV?d00001

diff --git a/graphics_file_rules.mk b/graphics_file_rules.mk
index 5c2a31a82c..437a68641b 100644
--- a/graphics_file_rules.mk
+++ b/graphics_file_rules.mk
@@ -135,6 +135,9 @@ $(TILESETGFXDIR)/secondary/shop/french/tiles.4bpp: %.4bpp: %.png
 $(TILESETGFXDIR)/secondary/shop/italian/tiles.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -num_tiles 502
 
+$(TILESETGFXDIR)/secondary/shop/spanish/tiles.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -num_tiles 502
+
 $(TILESETGFXDIR)/secondary/pokemon_center/tiles.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -num_tiles 478 -Wnum_tiles
 
@@ -301,6 +304,9 @@ $(FONTGFXDIR)/french/small.latfont: $(FONTGFXDIR)/french/latin_small.png
 $(FONTGFXDIR)/italian/small.latfont: $(FONTGFXDIR)/italian/latin_small.png
 	$(GFX) $< $@
 
+$(FONTGFXDIR)/spanish/small.latfont: $(FONTGFXDIR)/spanish/latin_small.png
+	$(GFX) $< $@
+
 $(FONTGFXDIR)/normal.latfont: $(FONTGFXDIR)/latin_normal.png
 	$(GFX) $< $@
 
@@ -310,6 +316,9 @@ $(FONTGFXDIR)/french/normal.latfont: $(FONTGFXDIR)/french/latin_normal.png
 $(FONTGFXDIR)/italian/normal.latfont: $(FONTGFXDIR)/italian/latin_normal.png
 	$(GFX) $< $@
 
+$(FONTGFXDIR)/spanish/normal.latfont: $(FONTGFXDIR)/spanish/latin_normal.png
+	$(GFX) $< $@
+
 $(FONTGFXDIR)/short.latfont: $(FONTGFXDIR)/latin_short.png
 	$(GFX) $< $@
 
@@ -319,6 +328,9 @@ $(FONTGFXDIR)/french/short.latfont: $(FONTGFXDIR)/french/latin_short.png
 $(FONTGFXDIR)/italian/short.latfont: $(FONTGFXDIR)/italian/latin_short.png
 	$(GFX) $< $@
 
+$(FONTGFXDIR)/spanish/short.latfont: $(FONTGFXDIR)/spanish/latin_short.png
+	$(GFX) $< $@
+
 $(FONTGFXDIR)/narrow.latfont: $(FONTGFXDIR)/latin_narrow.png
 	$(GFX) $< $@
 
@@ -328,6 +340,9 @@ $(FONTGFXDIR)/french/narrow.latfont: $(FONTGFXDIR)/french/latin_narrow.png
 $(FONTGFXDIR)/italian/narrow.latfont: $(FONTGFXDIR)/italian/latin_narrow.png
 	$(GFX) $< $@
 
+$(FONTGFXDIR)/spanish/narrow.latfont: $(FONTGFXDIR)/spanish/latin_narrow.png
+	$(GFX) $< $@
+
 $(FONTGFXDIR)/small_narrow.latfont: $(FONTGFXDIR)/latin_small_narrow.png
 	$(GFX) $< $@
 
@@ -337,6 +352,9 @@ $(FONTGFXDIR)/french/small_narrow.latfont: $(FONTGFXDIR)/french/latin_small_narr
 $(FONTGFXDIR)/italian/small_narrow.latfont: $(FONTGFXDIR)/italian/latin_small_narrow.png
 	$(GFX) $< $@
 
+$(FONTGFXDIR)/spanish/small_narrow.latfont: $(FONTGFXDIR)/spanish/latin_small_narrow.png
+	$(GFX) $< $@
+
 $(FONTGFXDIR)/small.hwjpnfont: $(FONTGFXDIR)/japanese_small.png
 	$(GFX) $< $@
 
diff --git a/include/battle_script_commands.h b/include/battle_script_commands.h
index a98a79a8a2..b0e07535b3 100644
--- a/include/battle_script_commands.h
+++ b/include/battle_script_commands.h
@@ -8,7 +8,7 @@
 #define WINDOW_BG1   (1 << 7)
 
 // Arguments for 'xStart, yStart, xEnd, yEnd' in HandleBattleWindow
-#if FRENCH || ITALIAN
+#if EUROPE
 #define YESNOBOX_X_Y 23, 8, 29, 13
 #else //ENGLISH
 #define YESNOBOX_X_Y 24, 8, 29, 13
diff --git a/include/constants/battle_tower.h b/include/constants/battle_tower.h
index b53ba5a315..e92cd9285f 100644
--- a/include/constants/battle_tower.h
+++ b/include/constants/battle_tower.h
@@ -17,7 +17,7 @@
 #define BATTLE_TOWER_FUNC_TRY_CLOSE_LINK        13
 #define BATTLE_TOWER_FUNC_SET_PARTNER_GFX       14
 #define BATTLE_TOWER_FUNC_SET_INTERVIEW_DATA    15
-#define BATTLE_TOWER_FUNC_GET_OPPONENT_INTRO2   16 // French and Italian versions
+#define BATTLE_TOWER_FUNC_GET_OPPONENT_INTRO2   16 // French, Italian and Spanish versions
 
 #define TOWER_DATA_WIN_STREAK         1
 #define TOWER_DATA_WIN_STREAK_ACTIVE  2
diff --git a/include/constants/global.h b/include/constants/global.h
index 666fd3851e..32b4cc748b 100644
--- a/include/constants/global.h
+++ b/include/constants/global.h
@@ -32,6 +32,8 @@
 #define GAME_LANGUAGE (LANGUAGE_FRENCH)
 #elif ITALIAN
 #define GAME_LANGUAGE (LANGUAGE_ITALIAN)
+#elif SPANISH
+#define GAME_LANGUAGE (LANGUAGE_SPANISH)
 #else
 #define GAME_LANGUAGE (LANGUAGE_ENGLISH)
 #endif
diff --git a/include/global.h b/include/global.h
index ffb91eb67d..dc6a29fab9 100644
--- a/include/global.h
+++ b/include/global.h
@@ -152,17 +152,17 @@
 #define STATIC_ASSERT(expr, id) typedef char id[(expr) ? 1 : -1];
 
 #if FRENCH
-#define LANG_VAL(_english, _french, _italian, ...) (_french)
-#define LANGUAGE_STRING(_english, _french, _italian, ...) _(_french)
+#define LANG_VAL(_english, _french, _italian, _spanish) (_french)
+#define LANGUAGE_STRING(_english, _french, _italian, _spanish) _(_french)
 #elif ITALIAN
-#define LANG_VAL(_english, _french, _italian, ...) (_italian)
-#define LANGUAGE_STRING(_english, _french, _italian, ...) _(_italian)
+#define LANG_VAL(_english, _french, _italian, _spanish) (_italian)
+#define LANGUAGE_STRING(_english, _french, _italian, _spanish) _(_italian)
 #elif SPANISH
-#define LANG_VAL(_english, _french, _italian, ...) (_english)
-#define LANGUAGE_STRING(_english, _french, _italian, ...) _(_english)
+#define LANG_VAL(_english, _french, _italian, _spanish) (_spanish)
+#define LANGUAGE_STRING(_english, _french, _italian, _spanish) _(_spanish)
 #else //ENGLISH
-#define LANG_VAL(_english, _french, _italian, ...) (_english)
-#define LANGUAGE_STRING(_english, _french, _italian, ...) _(_english)
+#define LANG_VAL(_english, _french, _italian, _spanish) (_english)
+#define LANGUAGE_STRING(_english, _french, _italian, _spanish) _(_english)
 #endif
 
 struct Coords8
diff --git a/src/data/contest_opponents.h b/src/data/contest_opponents.h
index 0b6af7f9ae..a460d0fd71 100644
--- a/src/data/contest_opponents.h
+++ b/src/data/contest_opponents.h
@@ -154,6 +154,9 @@ const struct ContestWinner gDefaultContestWinners[] =
     #elif ITALIAN
         .monName = _("ELECTER"),
         .trainerName = _("EZRA"),
+    #elif SPANISH
+        .monName = _("ELETRI"),
+        .trainerName = _("ERORO"),
     #else //ENGLISH
         .monName = _("ELECTER"),
         .trainerName = _("EZRA"),
@@ -168,10 +171,10 @@ const struct ContestWinner gDefaultContestWinners[] =
     #if FRENCH
         .monName = _("TROPO"),
         .trainerName = _("NICOLAS"),
-    #elif ITALIAN
-        .monName = _("TROPO"),
-        .trainerName = _("ALLAN"),
-    #else //ENGLISH
+    #elif SPANISH
+        .monName = _("TROPILI"),
+        .trainerName = _("ALAN"),
+    #else //ENGLISH || ITALIAN
         .monName = _("TROPO"),
         .trainerName = _("ALLAN"),
     #endif
@@ -185,10 +188,10 @@ const struct ContestWinner gDefaultContestWinners[] =
     #if FRENCH
         .monName = _("TUXA"),
         .trainerName = _("JULIA"),
-    #elif ITALIAN
-        .monName = _("TUXA"),
-        .trainerName = _("JULIET"),
-    #else //ENGLISH
+    #elif SPANISH
+        .monName = _("CHATU"),
+        .trainerName = _("JULIA"),
+    #else //ENGLISH || ITALIAN
         .monName = _("TUXA"),
         .trainerName = _("JULIET"),
     #endif
@@ -205,6 +208,9 @@ const struct ContestWinner gDefaultContestWinners[] =
     #elif ITALIAN
         .monName = _("PULSE"),
         .trainerName = _("LEIO"),
+    #elif SPANISH
+        .monName = _("PUSLITO"),
+        .trainerName = _("LEIO"),
     #else //ENGLISH
         .monName = _("PULSE"),
         .trainerName = _("BAILY"),
@@ -222,6 +228,9 @@ const struct ContestWinner gDefaultContestWinners[] =
     #elif ITALIAN
         .monName = _("SHUPUP"),
         .trainerName = _("MELANY"),
+    #elif SPANISH
+        .monName = _("CHUPETE"),
+        .trainerName = _("MELADIA"),
     #else //ENGLISH
         .monName = _("SHUPUP"),
         .trainerName = _("MELANY"),
@@ -239,6 +248,9 @@ const struct ContestWinner gDefaultContestWinners[] =
     #elif ITALIAN
         .monName = _("GOOZAN"),
         .trainerName = _("HANA"),
+    #elif SPANISH
+        .monName = _("ZANGO"),
+        .trainerName = _("JANA"),
     #else //ENGLISH
         .monName = _("GOOZAN"),
         .trainerName = _("HANA"),
@@ -256,6 +268,9 @@ const struct ContestWinner gDefaultContestWinners[] =
     #elif ITALIAN
         .monName = _("LOUDED"),
         .trainerName = _("BERTO"),
+    #elif SPANISH
+        .monName = _("LOUDED"),
+        .trainerName = _("BASILIO"),
     #else //ENGLISH
         .monName = _("LOUDED"),
         .trainerName = _("BRYANT"),
@@ -273,6 +288,9 @@ const struct ContestWinner gDefaultContestWinners[] =
     #elif ITALIAN
         .monName = _("KITSY"),
         .trainerName = _("OMAR"),
+    #elif SPANISH
+        .monName = _("KITSY"),
+        .trainerName = _("OTILIO"),
     #else //ENGLISH
         .monName = _("KITSY"),
         .trainerName = _("OMAR"),
@@ -291,6 +309,9 @@ const struct ContestPokemon gContestOpponents[] =
     #elif ITALIAN
         .nickname = _("POOCHY"),
         .trainerName = _("JIMMY"),
+    #elif SPANISH
+        .nickname = _("POOCHY"),
+        .trainerName = _("JULAN"),
     #else //ENGLISH
         .nickname = _("POOCHY"),
         .trainerName = _("JIMMY"),
@@ -327,6 +348,9 @@ const struct ContestPokemon gContestOpponents[] =
     #elif ITALIAN
         .nickname = _("MUSILLE"),
         .trainerName = _("AMBRA"),
+    #elif SPANISH
+        .nickname = _("ILLUMI"),
+        .trainerName = _("JUDITH"),
     #else //ENGLISH
         .nickname = _("MUSILLE"),
         .trainerName = _("EDITH"),
@@ -363,6 +387,9 @@ const struct ContestPokemon gContestOpponents[] =
     #elif ITALIAN
         .nickname = _("DUSTER"),
         .trainerName = _("IVANO"),
+    #elif SPANISH
+        .nickname = _("DUSTER"),
+        .trainerName = _("ELVIO"),
     #else //ENGLISH
         .nickname = _("DUSTER"),
         .trainerName = _("EVAN"),
@@ -399,6 +426,9 @@ const struct ContestPokemon gContestOpponents[] =
     #elif ITALIAN
         .nickname = _("DOTS"),
         .trainerName = _("CAROLA"),
+    #elif SPANISH
+        .nickname = _("DOTS"),
+        .trainerName = _("KIKA"),
     #else //ENGLISH
         .nickname = _("DOTS"),
         .trainerName = _("KELSEY"),
@@ -435,6 +465,9 @@ const struct ContestPokemon gContestOpponents[] =
     #elif ITALIAN
         .nickname = _("TATAY"),
         .trainerName = _("LILLY"),
+    #elif SPANISH
+        .nickname = _("TATAY"),
+        .trainerName = _("MARISOL"),
     #else //ENGLISH
         .nickname = _("TATAY"),
         .trainerName = _("MADISON"),
@@ -471,6 +504,9 @@ const struct ContestPokemon gContestOpponents[] =
     #elif ITALIAN
         .nickname = _("NINDA"),
         .trainerName = _("RAYMOND"),
+    #elif SPANISH
+        .nickname = _("NINDA"),
+        .trainerName = _("MONCHO"),
     #else //ENGLISH
         .nickname = _("NINDA"),
         .trainerName = _("RAYMOND"),
@@ -507,6 +543,9 @@ const struct ContestPokemon gContestOpponents[] =
     #elif ITALIAN
         .nickname = _("SMISH"),
         .trainerName = _("GIGIO"),
+    #elif SPANISH
+        .nickname = _("SMISH"),
+        .trainerName = _("GONZALO"),
     #else //ENGLISH
         .nickname = _("SMISH"),
         .trainerName = _("GRANT"),
@@ -543,6 +582,9 @@ const struct ContestPokemon gContestOpponents[] =
     #elif ITALIAN
         .nickname = _("SPHELI"),
         .trainerName = _("LORENA"),
+    #elif SPANISH
+        .nickname = _("SPHELI"),
+        .trainerName = _("PAZ"),
     #else //ENGLISH
         .nickname = _("SLEAL"),
         .trainerName = _("PAIGE"),
@@ -579,6 +621,9 @@ const struct ContestPokemon gContestOpponents[] =
     #elif ITALIAN
         .nickname = _("SLOKTH"),
         .trainerName = _("EZIO"),
+    #elif SPANISH
+        .nickname = _("SLOKTH"),
+        .trainerName = _("ABEL"),
     #else //ENGLISH
         .nickname = _("SLOKTH"),
         .trainerName = _("ALEC"),
@@ -615,6 +660,9 @@ const struct ContestPokemon gContestOpponents[] =
     #elif ITALIAN
         .nickname = _("WHIRIS"),
         .trainerName = _("LUANA"),
+    #elif SPANISH
+        .nickname = _("WHIRIS"),
+        .trainerName = _("SONIA"),
     #else //ENGLISH
         .nickname = _("WHIRIS"),
         .trainerName = _("SYDNEY"),
@@ -651,6 +699,9 @@ const struct ContestPokemon gContestOpponents[] =
     #elif ITALIAN
         .nickname = _("MAHITA"),
         .trainerName = _("SABINO"),
+    #elif SPANISH
+        .nickname = _("MAHITA"),
+        .trainerName = _("MAURI"),
     #else //ENGLISH
         .nickname = _("MAHITA"),
         .trainerName = _("MORRIS"),
@@ -687,6 +738,9 @@ const struct ContestPokemon gContestOpponents[] =
     #elif ITALIAN
         .nickname = _("RONAR"),
         .trainerName = _("LIALA"),
+    #elif SPANISH
+        .nickname = _("RONAR"),
+        .trainerName = _("MARILIA"),
     #else //ENGLISH
         .nickname = _("RONAR"),
         .trainerName = _("MARIAH"),
@@ -723,6 +777,9 @@ const struct ContestPokemon gContestOpponents[] =
     #elif ITALIAN
         .nickname = _("BATRO"),
         .trainerName = _("GIULIO"),
+    #elif SPANISH
+        .nickname = _("CROBI"),
+        .trainerName = _("ROSENDO"),
     #else //ENGLISH
         .nickname = _("BATRO"),
         .trainerName = _("RUSSELL"),
@@ -759,6 +816,9 @@ const struct ContestPokemon gContestOpponents[] =
     #elif ITALIAN
         .nickname = _("GULIN"),
         .trainerName = _("MELANIE"),
+    #elif SPANISH
+        .nickname = _("GULIN"),
+        .trainerName = _("MELANIA"),
     #else //ENGLISH
         .nickname = _("GULIN"),
         .trainerName = _("MELANIE"),
@@ -795,6 +855,9 @@ const struct ContestPokemon gContestOpponents[] =
     #elif ITALIAN
         .nickname = _("RIKELEC"),
         .trainerName = _("BIAGIO"),
+    #elif SPANISH
+        .nickname = _("RIKELEC"),
+        .trainerName = _("ISIDRO"),
     #else //ENGLISH
         .nickname = _("RIKELEC"),
         .trainerName = _("CHANCE"),
@@ -831,6 +894,9 @@ const struct ContestPokemon gContestOpponents[] =
     #elif ITALIAN
         .nickname = _("BULBY"),
         .trainerName = _("AGATHA"),
+    #elif SPANISH
+        .nickname = _("BULBI"),
+        .trainerName = _("ALICIA"),
     #else //ENGLISH
         .nickname = _("BULBY"),
         .trainerName = _("AGATHA"),
@@ -867,6 +933,9 @@ const struct ContestPokemon gContestOpponents[] =
     #elif ITALIAN
         .nickname = _("FUTTERBE"),
         .trainerName = _("BEBA"),
+    #elif SPANISH
+        .nickname = _("BUTTI"),
+        .trainerName = _("BUSI"),
     #else //ENGLISH
         .nickname = _("FUTTERBE"),
         .trainerName = _("BEAU"),
@@ -903,6 +972,9 @@ const struct ContestPokemon gContestOpponents[] =
     #elif ITALIAN
         .nickname = _("PIDEOT"),
         .trainerName = _("KALY"),
+    #elif SPANISH
+        .nickname = _("PIDGE"),
+        .trainerName = _("LERE"),
     #else //ENGLISH
         .nickname = _("PIDEOT"),
         .trainerName = _("KAY"),
@@ -939,6 +1011,9 @@ const struct ContestPokemon gContestOpponents[] =
     #elif ITALIAN
         .nickname = _("DIGLE"),
         .trainerName = _("CARLINO"),
+    #elif SPANISH
+        .nickname = _("DIGLIT"),
+        .trainerName = _("DINO"),
     #else //ENGLISH
         .nickname = _("DIGLE"),
         .trainerName = _("CALE"),
@@ -972,7 +1047,7 @@ const struct ContestPokemon gContestOpponents[] =
     #if FRENCH
         .nickname = _("TARPI"),
         .trainerName = _("EMMA"),
-    #elif ITALIAN
+    #elif ITALIAN || SPANISH
         .nickname = _("POLI"),
         .trainerName = _("CADALIA"),
     #else //ENGLISH
@@ -1011,6 +1086,9 @@ const struct ContestPokemon gContestOpponents[] =
     #elif ITALIAN
         .nickname = _("TOTDIL"),
         .trainerName = _("CICCO"),
+    #elif SPANISH
+        .nickname = _("TOTODIL"),
+        .trainerName = _("CHECHU"),
     #else //ENGLISH
         .nickname = _("TOTDIL"),
         .trainerName = _("COLBY"),
@@ -1047,6 +1125,9 @@ const struct ContestPokemon gContestOpponents[] =
     #elif ITALIAN
         .nickname = _("BALEDY"),
         .trainerName = _("KYLIE"),
+    #elif SPANISH
+        .nickname = _("LEDYBI"),
+        .trainerName = _("NARA"),
     #else //ENGLISH
         .nickname = _("BALEDY"),
         .trainerName = _("KYLIE"),
@@ -1083,6 +1164,9 @@ const struct ContestPokemon gContestOpponents[] =
     #elif ITALIAN
         .nickname = _("BIRDLY"),
         .trainerName = _("LARO"),
+    #elif SPANISH
+        .nickname = _("DELIBI"),
+        .trainerName = _("LINO"),
     #else //ENGLISH
         .nickname = _("BIRDLY"),
         .trainerName = _("LIAM"),
@@ -1119,6 +1203,9 @@ const struct ContestPokemon gContestOpponents[] =
     #elif ITALIAN
         .nickname = _("TARVITAR"),
         .trainerName = _("MILO"),
+    #elif SPANISH
+        .nickname = _("LARVITI"),
+        .trainerName = _("MILO"),
     #else //ENGLISH
         .nickname = _("TARVITAR"),
         .trainerName = _("MILO"),
@@ -1155,6 +1242,9 @@ const struct ContestPokemon gContestOpponents[] =
     #elif ITALIAN
         .nickname = _("RELIA"),
         .trainerName = _("BRUNA"),
+    #elif SPANISH
+        .nickname = _("RELIA"),
+        .trainerName = _("CARINA"),
     #else //ENGLISH
         .nickname = _("RELIA"),
         .trainerName = _("KARINA"),
@@ -1191,6 +1281,9 @@ const struct ContestPokemon gContestOpponents[] =
     #elif ITALIAN
         .nickname = _("DUODO"),
         .trainerName = _("BOBBY"),
+    #elif SPANISH
+        .nickname = _("DUODO"),
+        .trainerName = _("BRAULIO"),
     #else //ENGLISH
         .nickname = _("DUODO"),
         .trainerName = _("BOBBY"),
@@ -1227,6 +1320,9 @@ const struct ContestPokemon gContestOpponents[] =
     #elif ITALIAN
         .nickname = _("PINCHIN"),
         .trainerName = _("CLARA"),
+    #elif SPANISH
+        .nickname = _("PINCHIN"),
+        .trainerName = _("INGRID"),
     #else //ENGLISH
         .nickname = _("PINCHIN"),
         .trainerName = _("CLAIRE"),
@@ -1263,6 +1359,9 @@ const struct ContestPokemon gContestOpponents[] =
     #elif ITALIAN
         .nickname = _("NACAC"),
         .trainerName = _("WILLY"),
+    #elif SPANISH
+        .nickname = _("NACAC"),
+        .trainerName = _("GUILLE"),
     #else //ENGLISH
         .nickname = _("NACAC"),
         .trainerName = _("WILLIE"),
@@ -1299,6 +1398,9 @@ const struct ContestPokemon gContestOpponents[] =
     #elif ITALIAN
         .nickname = _("SHRAND"),
         .trainerName = _("CLOE"),
+    #elif SPANISH
+        .nickname = _("SHRAND"),
+        .trainerName = _("CASILDA"),
     #else //ENGLISH
         .nickname = _("SHRAND"),
         .trainerName = _("CASSIDY"),
@@ -1335,6 +1437,9 @@ const struct ContestPokemon gContestOpponents[] =
     #elif ITALIAN
         .nickname = _("TOYBAL"),
         .trainerName = _("DAVIDE"),
+    #elif SPANISH
+        .nickname = _("TOYBAL"),
+        .trainerName = _("MARGO"),
     #else //ENGLISH
         .nickname = _("TOYBAL"),
         .trainerName = _("MORGAN"),
@@ -1371,6 +1476,9 @@ const struct ContestPokemon gContestOpponents[] =
     #elif ITALIAN
         .nickname = _("CHAMCHAM"),
         .trainerName = _("DIANA"),
+    #elif SPANISH
+        .nickname = _("MEDICHI"),
+        .trainerName = _("SABINA"),
     #else //ENGLISH
         .nickname = _("CHAMCHAM"),
         .trainerName = _("SUMMER"),
@@ -1407,6 +1515,9 @@ const struct ContestPokemon gContestOpponents[] =
     #elif ITALIAN
         .nickname = _("SPININ"),
         .trainerName = _("MARK"),
+    #elif SPANISH
+        .nickname = _("SPININ"),
+        .trainerName = _("MARIO"),
     #else //ENGLISH
         .nickname = _("SPININ"),
         .trainerName = _("MILES"),
@@ -1443,6 +1554,9 @@ const struct ContestPokemon gContestOpponents[] =
     #elif ITALIAN
         .nickname = _("SWABY"),
         .trainerName = _("AZZURRA"),
+    #elif SPANISH
+        .nickname = _("SWABY"),
+        .trainerName = _("AURORA"),
     #else //ENGLISH
         .nickname = _("SWABY"),
         .trainerName = _("AUDREY"),
@@ -1479,6 +1593,9 @@ const struct ContestPokemon gContestOpponents[] =
     #elif ITALIAN
         .nickname = _("POINKER"),
         .trainerName = _("FABIO"),
+    #elif SPANISH
+        .nickname = _("SPON"),
+        .trainerName = _("VARO"),
     #else //ENGLISH
         .nickname = _("POINKER"),
         .trainerName = _("AVERY"),
@@ -1515,6 +1632,9 @@ const struct ContestPokemon gContestOpponents[] =
     #elif ITALIAN
         .nickname = _("KECON"),
         .trainerName = _("TAMY"),
+    #elif SPANISH
+        .nickname = _("KECON"),
+        .trainerName = _("ADRIANA"),
     #else //ENGLISH
         .nickname = _("KECON"),
         .trainerName = _("ARIANA"),
@@ -1551,6 +1671,9 @@ const struct ContestPokemon gContestOpponents[] =
     #elif ITALIAN
         .nickname = _("GOLDEN"),
         .trainerName = _("ENZO"),
+    #elif SPANISH
+        .nickname = _("GOLDEN"),
+        .trainerName = _("AUGUSTO"),
     #else //ENGLISH
         .nickname = _("GOLDEN"),
         .trainerName = _("ASHTON"),
@@ -1587,7 +1710,7 @@ const struct ContestPokemon gContestOpponents[] =
     #elif ITALIAN
         .nickname = _("BOBOACH"),
         .trainerName = _("SANDRA"),
-    #else //ENGLISH
+    #else //ENGLISH || SPANISH
         .nickname = _("BOBOACH"),
         .trainerName = _("SANDRA"),
     #endif
@@ -1623,6 +1746,9 @@ const struct ContestPokemon gContestOpponents[] =
     #elif ITALIAN
         .nickname = _("SKARMY"),
         .trainerName = _("PIERRE"),
+    #elif SPANISH
+        .nickname = _("SKAMY"),
+        .trainerName = _("CIRILO"),
     #else //ENGLISH
         .nickname = _("CORPY"),
         .trainerName = _("CARSON"),
@@ -1659,6 +1785,9 @@ const struct ContestPokemon gContestOpponents[] =
     #elif ITALIAN
         .nickname = _("TADO"),
         .trainerName = _("KATRINA"),
+    #elif SPANISH
+        .nickname = _("TADO"),
+        .trainerName = _("LINA"),
     #else //ENGLISH
         .nickname = _("TADO"),
         .trainerName = _("KATRINA"),
@@ -1695,6 +1824,9 @@ const struct ContestPokemon gContestOpponents[] =
     #elif ITALIAN
         .nickname = _("BROWLO"),
         .trainerName = _("LUKE"),
+    #elif SPANISH
+        .nickname = _("SLOWBI"),
+        .trainerName = _("LUQUE"),
     #else //ENGLISH
         .nickname = _("BROWLO"),
         .trainerName = _("LUKE"),
@@ -1731,6 +1863,9 @@ const struct ContestPokemon gContestOpponents[] =
     #elif ITALIAN
         .nickname = _("FARFI"),
         .trainerName = _("RINO"),
+    #elif SPANISH
+        .nickname = _("FARFI"),
+        .trainerName = _("ORIOL"),
     #else //ENGLISH
         .nickname = _("FETCHIN"),
         .trainerName = _("RAUL"),
@@ -1767,6 +1902,9 @@ const struct ContestPokemon gContestOpponents[] =
     #elif ITALIAN
         .nickname = _("SEELEY"),
         .trainerName = _("JADA"),
+    #elif SPANISH
+        .nickname = _("SELI"),
+        .trainerName = _("JADA"),
     #else //ENGLISH
         .nickname = _("SEELEY"),
         .trainerName = _("JADA"),
@@ -1803,6 +1941,9 @@ const struct ContestPokemon gContestOpponents[] =
     #elif ITALIAN
         .nickname = _("DROWZIN"),
         .trainerName = _("JACK"),
+    #elif SPANISH
+        .nickname = _("DROW"),
+        .trainerName = _("CURRO"),
     #else //ENGLISH
         .nickname = _("DROWZIN"),
         .trainerName = _("ZEEK"),
@@ -1839,6 +1980,9 @@ const struct ContestPokemon gContestOpponents[] =
     #elif ITALIAN
         .nickname = _("HITEMON"),
         .trainerName = _("GIOVI"),
+    #elif SPANISH
+        .nickname = _("HITMOCHI"),
+        .trainerName = _("DIEGO"),
     #else //ENGLISH
         .nickname = _("HITEMON"),
         .trainerName = _("DIEGO"),
@@ -1875,6 +2019,9 @@ const struct ContestPokemon gContestOpponents[] =
     #elif ITALIAN
         .nickname = _("BLISS"),
         .trainerName = _("LELY"),
+    #elif SPANISH
+        .nickname = _("BLISSI"),
+        .trainerName = _("LETI"),
     #else //ENGLISH
         .nickname = _("BLISS"),
         .trainerName = _("ALIYAH"),
@@ -1911,6 +2058,9 @@ const struct ContestPokemon gContestOpponents[] =
     #elif ITALIAN
         .nickname = _("KIDLEK"),
         .trainerName = _("NATALIA"),
+    #elif SPANISH
+        .nickname = _("ELEKI"),
+        .trainerName = _("NATALIA"),
     #else //ENGLISH
         .nickname = _("KIDLEK"),
         .trainerName = _("NATALIA"),
@@ -1944,10 +2094,10 @@ const struct ContestPokemon gContestOpponents[] =
     #if FRENCH
         .nickname = _("SNUBBINS"),
         .trainerName = _("MARCO"),
-    #elif ITALIAN
-        .nickname = _("SNUBBINS"),
-        .trainerName = _("DEVIN"),
-    #else //ENGLISH
+    #elif SPANISH
+        .nickname = _("SNUBBI"),
+        .trainerName = _("PEPITO"),
+    #else //ENGLISH || ITALIAN
         .nickname = _("SNUBBINS"),
         .trainerName = _("DEVIN"),
     #endif
@@ -1983,6 +2133,9 @@ const struct ContestPokemon gContestOpponents[] =
     #elif ITALIAN
         .nickname = _("DREAVIS"),
         .trainerName = _("TATA"),
+    #elif SPANISH
+        .nickname = _("MISDRI"),
+        .trainerName = _("TILE"),
     #else //ENGLISH
         .nickname = _("DREAVIS"),
         .trainerName = _("TYLOR"),
@@ -2019,6 +2172,9 @@ const struct ContestPokemon gContestOpponents[] =
     #elif ITALIAN
         .nickname = _("LAIRN"),
         .trainerName = _("RONNIE"),
+    #elif SPANISH
+        .nickname = _("LAIRN"),
+        .trainerName = _("ROQUE"),
     #else //ENGLISH
         .nickname = _("LAIRN"),
         .trainerName = _("RONNIE"),
@@ -2055,7 +2211,7 @@ const struct ContestPokemon gContestOpponents[] =
     #elif ITALIAN
         .nickname = _("SHIFTY"),
         .trainerName = _("DENISE"),
-    #else //ENGLISH
+    #else //ENGLISH || SPANISH
         .nickname = _("SHIFTY"),
         .trainerName = _("CLAUDIA"),
     #endif
@@ -2091,6 +2247,9 @@ const struct ContestPokemon gContestOpponents[] =
     #elif ITALIAN
         .nickname = _("NINAS"),
         .trainerName = _("ELIAS"),
+    #elif SPANISH
+        .nickname = _("NINAS"),
+        .trainerName = _("ELADIO"),
     #else //ENGLISH
         .nickname = _("NINAS"),
         .trainerName = _("ELIAS"),
@@ -2127,6 +2286,9 @@ const struct ContestPokemon gContestOpponents[] =
     #elif ITALIAN
         .nickname = _("WELOW"),
         .trainerName = _("GIADA"),
+    #elif SPANISH
+        .nickname = _("WELOW"),
+        .trainerName = _("IRMA"),
     #else //ENGLISH
         .nickname = _("WELOW"),
         .trainerName = _("JADE"),
@@ -2163,6 +2325,9 @@ const struct ContestPokemon gContestOpponents[] =
     #elif ITALIAN
         .nickname = _("YENA"),
         .trainerName = _("FRANCIS"),
+    #elif SPANISH
+        .nickname = _("YENA"),
+        .trainerName = _("FRAN"),
     #else //ENGLISH
         .nickname = _("YENA"),
         .trainerName = _("FRANCIS"),
@@ -2199,6 +2364,9 @@ const struct ContestPokemon gContestOpponents[] =
     #elif ITALIAN
         .nickname = _("TIFLY"),
         .trainerName = _("ALISHA"),
+    #elif SPANISH
+        .nickname = _("TIFLY"),
+        .trainerName = _("OLGA"),
     #else //ENGLISH
         .nickname = _("TIFLY"),
         .trainerName = _("ALISHA"),
@@ -2235,6 +2403,9 @@ const struct ContestPokemon gContestOpponents[] =
     #elif ITALIAN
         .nickname = _("KINGSEA"),
         .trainerName = _("SAUL"),
+    #elif SPANISH
+        .nickname = _("KINGSEA"),
+        .trainerName = _("SALVA"),
     #else //ENGLISH
         .nickname = _("KINGSEA"),
         .trainerName = _("SAUL"),
@@ -2271,6 +2442,9 @@ const struct ContestPokemon gContestOpponents[] =
     #elif ITALIAN
         .nickname = _("CASTER"),
         .trainerName = _("LIZIA"),
+    #elif SPANISH
+        .nickname = _("CASTI"),
+        .trainerName = _("FELICIA"),
     #else //ENGLISH
         .nickname = _("CASTER"),
         .trainerName = _("FELICIA"),
@@ -2307,6 +2481,9 @@ const struct ContestPokemon gContestOpponents[] =
     #elif ITALIAN
         .nickname = _("CHOKEM"),
         .trainerName = _("PACO"),
+    #elif SPANISH
+        .nickname = _("MACHOKI"),
+        .trainerName = _("EMILIO"),
     #else //ENGLISH
         .nickname = _("CHOKEM"),
         .trainerName = _("EMILIO"),
@@ -2340,7 +2517,7 @@ const struct ContestPokemon gContestOpponents[] =
     #if FRENCH
         .nickname = _("LOMBE"),
         .trainerName = _("CARLA"),
-    #elif ITALIAN
+    #elif ITALIAN || SPANISH
         .nickname = _("LOMBE"),
         .trainerName = _("CARLA"),
     #else //ENGLISH
@@ -2379,6 +2556,9 @@ const struct ContestPokemon gContestOpponents[] =
     #elif ITALIAN
         .nickname = _("VIPES"),
         .trainerName = _("RAUL"),
+    #elif SPANISH
+        .nickname = _("VIPES"),
+        .trainerName = _("DAVID"),
     #else //ENGLISH
         .nickname = _("VIPES"),
         .trainerName = _("DARRYL"),
@@ -2415,6 +2595,9 @@ const struct ContestPokemon gContestOpponents[] =
     #elif ITALIAN
         .nickname = _("MERAIL"),
         .trainerName = _("SELENA"),
+    #elif SPANISH
+        .nickname = _("MERAIL"),
+        .trainerName = _("SERENA"),
     #else //ENGLISH
         .nickname = _("MERAIL"),
         .trainerName = _("SELENA"),
@@ -2451,6 +2634,9 @@ const struct ContestPokemon gContestOpponents[] =
     #elif ITALIAN
         .nickname = _("KARPAG"),
         .trainerName = _("NOEL"),
+    #elif SPANISH
+        .nickname = _("KARPAG"),
+        .trainerName = _("NOEL"),
     #else //ENGLISH
         .nickname = _("KARPAG"),
         .trainerName = _("NOEL"),
@@ -2487,6 +2673,9 @@ const struct ContestPokemon gContestOpponents[] =
     #elif ITALIAN
         .nickname = _("LUNONE"),
         .trainerName = _("LACEY"),
+    #elif SPANISH
+        .nickname = _("LUNONE"),
+        .trainerName = _("LUZ"),
     #else //ENGLISH
         .nickname = _("LUNONE"),
         .trainerName = _("LACEY"),
@@ -2523,6 +2712,9 @@ const struct ContestPokemon gContestOpponents[] =
     #elif ITALIAN
         .nickname = _("ABSO"),
         .trainerName = _("ELIO"),
+    #elif SPANISH
+        .nickname = _("ABSI"),
+        .trainerName = _("COCO"),
     #else //ENGLISH
         .nickname = _("ABSO"),
         .trainerName = _("CORBIN"),
@@ -2559,6 +2751,9 @@ const struct ContestPokemon gContestOpponents[] =
     #elif ITALIAN
         .nickname = _("EGGSOR"),
         .trainerName = _("GRACIE"),
+    #elif SPANISH
+        .nickname = _("EXEGGUT"),
+        .trainerName = _("GRACIA"),
     #else //ENGLISH
         .nickname = _("EGGSOR"),
         .trainerName = _("GRACIE"),
@@ -2595,6 +2790,9 @@ const struct ContestPokemon gContestOpponents[] =
     #elif ITALIAN
         .nickname = _("CUBIN"),
         .trainerName = _("COLTIN"),
+    #elif SPANISH
+        .nickname = _("CUBONI"),
+        .trainerName = _("CUCHO"),
     #else //ENGLISH
         .nickname = _("CUBIN"),
         .trainerName = _("COLTIN"),
@@ -2631,6 +2829,9 @@ const struct ContestPokemon gContestOpponents[] =
     #elif ITALIAN
         .nickname = _("HITMON"),
         .trainerName = _("ELLIE"),
+    #elif SPANISH
+        .nickname = _("HITMON"),
+        .trainerName = _("ELIA"),
     #else //ENGLISH
         .nickname = _("HITMON"),
         .trainerName = _("ELLIE"),
@@ -2667,6 +2868,9 @@ const struct ContestPokemon gContestOpponents[] =
     #elif ITALIAN
         .nickname = _("SURTLE"),
         .trainerName = _("MARZIO"),
+    #elif SPANISH
+        .nickname = _("SQUIRTI"),
+        .trainerName = _("MARCOS"),
     #else //ENGLISH
         .nickname = _("SURTLE"),
         .trainerName = _("MARCUS"),
@@ -2703,6 +2907,9 @@ const struct ContestPokemon gContestOpponents[] =
     #elif ITALIAN
         .nickname = _("KHANKAN"),
         .trainerName = _("KIARA"),
+    #elif SPANISH
+        .nickname = _("KANGASI"),
+        .trainerName = _("LARA"),
     #else //ENGLISH
         .nickname = _("KHANKAN"),
         .trainerName = _("KIARA"),
@@ -2739,6 +2946,9 @@ const struct ContestPokemon gContestOpponents[] =
     #elif ITALIAN
         .nickname = _("PINOC"),
         .trainerName = _("BICIO"),
+    #elif SPANISH
+        .nickname = _("PINECHI"),
+        .trainerName = _("BRUSO"),
     #else //ENGLISH
         .nickname = _("PINOC"),
         .trainerName = _("BRYCE"),
@@ -2775,6 +2985,9 @@ const struct ContestPokemon gContestOpponents[] =
     #elif ITALIAN
         .nickname = _("DILTOT"),
         .trainerName = _("JAMIE"),
+    #elif SPANISH
+        .nickname = _("TOTOLI"),
+        .trainerName = _("JAIRA"),
     #else //ENGLISH
         .nickname = _("DILTOT"),
         .trainerName = _("JAMIE"),
@@ -2811,6 +3024,9 @@ const struct ContestPokemon gContestOpponents[] =
     #elif ITALIAN
         .nickname = _("DOOMOND"),
         .trainerName = _("JORGE"),
+    #elif SPANISH
+        .nickname = _("HOUNDI"),
+        .trainerName = _("JORGE"),
     #else //ENGLISH
         .nickname = _("DOOMOND"),
         .trainerName = _("JORGE"),
@@ -2847,6 +3063,9 @@ const struct ContestPokemon gContestOpponents[] =
     #elif ITALIAN
         .nickname = _("MILKAN"),
         .trainerName = _("DANI"),
+    #elif SPANISH
+        .nickname = _("MILTANI"),
+        .trainerName = _("DANI"),
     #else //ENGLISH
         .nickname = _("MILKAN"),
         .trainerName = _("DEVON"),
@@ -2883,6 +3102,9 @@ const struct ContestPokemon gContestOpponents[] =
     #elif ITALIAN
         .nickname = _("RADOS"),
         .trainerName = _("JUSTINA"),
+    #elif SPANISH
+        .nickname = _("RADOS"),
+        .trainerName = _("JUSTA"),
     #else //ENGLISH
         .nickname = _("RADOS"),
         .trainerName = _("JUSTINA"),
@@ -2919,6 +3141,9 @@ const struct ContestPokemon gContestOpponents[] =
     #elif ITALIAN
         .nickname = _("LOUDERD"),
         .trainerName = _("RALPH"),
+    #elif SPANISH
+        .nickname = _("LOUDERD"),
+        .trainerName = _("RAFA"),
     #else //ENGLISH
         .nickname = _("LOUDERD"),
         .trainerName = _("RALPH"),
@@ -2955,6 +3180,9 @@ const struct ContestPokemon gContestOpponents[] =
     #elif ITALIAN
         .nickname = _("SITTY"),
         .trainerName = _("ROSALIA"),
+    #elif SPANISH
+        .nickname = _("STITI"),
+        .trainerName = _("ROSITA"),
     #else //ENGLISH
         .nickname = _("SITTY"),
         .trainerName = _("ROSA"),
@@ -2991,6 +3219,9 @@ const struct ContestPokemon gContestOpponents[] =
     #elif ITALIAN
         .nickname = _("SLING"),
         .trainerName = _("KEATON"),
+    #elif SPANISH
+        .nickname = _("SLING"),
+        .trainerName = _("COSME"),
     #else //ENGLISH
         .nickname = _("SLING"),
         .trainerName = _("KEATON"),
@@ -3027,6 +3258,9 @@ const struct ContestPokemon gContestOpponents[] =
     #elif ITALIAN
         .nickname = _("TARIA"),
         .trainerName = _("MARA"),
+    #elif SPANISH
+        .nickname = _("TARIA"),
+        .trainerName = _("MAIRA"),
     #else //ENGLISH
         .nickname = _("TARIA"),
         .trainerName = _("MAYRA"),
@@ -3063,6 +3297,9 @@ const struct ContestPokemon gContestOpponents[] =
     #elif ITALIAN
         .nickname = _("LIRKI"),
         .trainerName = _("FIORE"),
+    #elif SPANISH
+        .nickname = _("LIRKI"),
+        .trainerName = _("LUCIO"),
     #else //ENGLISH
         .nickname = _("LIRKI"),
         .trainerName = _("LAMAR"),
@@ -3099,6 +3336,9 @@ const struct ContestPokemon gContestOpponents[] =
     #elif ITALIAN
         .nickname = _("BLOSSOM"),
         .trainerName = _("ROBERTA"),
+    #elif SPANISH
+        .nickname = _("BELLI"),
+        .trainerName = _("NALE"),
     #else //ENGLISH
         .nickname = _("BLOSSOM"),
         .trainerName = _("AUBREY"),
@@ -3135,6 +3375,9 @@ const struct ContestPokemon gContestOpponents[] =
     #elif ITALIAN
         .nickname = _("EYESAB"),
         .trainerName = _("NIGEL"),
+    #elif SPANISH
+        .nickname = _("SABLI"),
+        .trainerName = _("NACHO"),
     #else //ENGLISH
         .nickname = _("EYESAB"),
         .trainerName = _("NIGEL"),
@@ -3171,6 +3414,9 @@ const struct ContestPokemon gContestOpponents[] =
     #elif ITALIAN
         .nickname = _("UTAN"),
         .trainerName = _("CAMILLA"),
+    #elif SPANISH
+        .nickname = _("UTAN"),
+        .trainerName = _("CAMILA"),
     #else //ENGLISH
         .nickname = _("UTAN"),
         .trainerName = _("CAMILLE"),
@@ -3207,6 +3453,9 @@ const struct ContestPokemon gContestOpponents[] =
     #elif ITALIAN
         .nickname = _("PEDOS"),
         .trainerName = _("LEONIO"),
+    #elif SPANISH
+        .nickname = _("SHARPI"),
+        .trainerName = _("ABRAHAM"),
     #else //ENGLISH
         .nickname = _("PEDOS"),
         .trainerName = _("DEON"),
@@ -3243,6 +3492,9 @@ const struct ContestPokemon gContestOpponents[] =
     #elif ITALIAN
         .nickname = _("LUVIS"),
         .trainerName = _("JANETTE"),
+    #elif SPANISH
+        .nickname = _("LUVIS"),
+        .trainerName = _("JULIETA"),
     #else //ENGLISH
         .nickname = _("LUVIS"),
         .trainerName = _("JANELLE"),
@@ -3279,6 +3531,9 @@ const struct ContestPokemon gContestOpponents[] =
     #elif ITALIAN
         .nickname = _("HEROSS"),
         .trainerName = _("HEATH"),
+    #elif SPANISH
+        .nickname = _("HEROSS"),
+        .trainerName = _("JULIO"),
     #else //ENGLISH
         .nickname = _("HEROSS"),
         .trainerName = _("HEATH"),
@@ -3315,6 +3570,9 @@ const struct ContestPokemon gContestOpponents[] =
     #elif ITALIAN
         .nickname = _("RODLECT"),
         .trainerName = _("SASHA"),
+    #elif SPANISH
+        .nickname = _("RODLECT"),
+        .trainerName = _("FREDA"),
     #else //ENGLISH
         .nickname = _("RODLECT"),
         .trainerName = _("SASHA"),
@@ -3351,6 +3609,9 @@ const struct ContestPokemon gContestOpponents[] =
     #elif ITALIAN
         .nickname = _("CHUPY"),
         .trainerName = _("VICTOR"),
+    #elif SPANISH
+        .nickname = _("CHUPY"),
+        .trainerName = _("SANCHO"),
     #else //ENGLISH
         .nickname = _("CHUPY"),
         .trainerName = _("FRANKIE"),
@@ -3387,6 +3648,9 @@ const struct ContestPokemon gContestOpponents[] =
     #elif ITALIAN
         .nickname = _("WOBET"),
         .trainerName = _("HELEN"),
+    #elif SPANISH
+        .nickname = _("WOBET"),
+        .trainerName = _("ELENA"),
     #else //ENGLISH
         .nickname = _("WOBET"),
         .trainerName = _("HELEN"),
@@ -3423,6 +3687,9 @@ const struct ContestPokemon gContestOpponents[] =
     #elif ITALIAN
         .nickname = _("GAREN"),
         .trainerName = _("CAMILLE"),
+    #elif SPANISH
+        .nickname = _("GENGA"),
+        .trainerName = _("CAMILIA"),
     #else //ENGLISH
         .nickname = _("GAREN"),
         .trainerName = _("CAMILE"),
@@ -3459,6 +3726,9 @@ const struct ContestPokemon gContestOpponents[] =
     #elif ITALIAN
         .nickname = _("GONPOR"),
         .trainerName = _("MARTIN"),
+    #elif SPANISH
+        .nickname = _("PORY"),
+        .trainerName = _("MARCO"),
     #else //ENGLISH
         .nickname = _("GONPOR"),
         .trainerName = _("MARTIN"),
@@ -3495,6 +3765,9 @@ const struct ContestPokemon gContestOpponents[] =
     #elif ITALIAN
         .nickname = _("DRITE"),
         .trainerName = _("SERENO"),
+    #elif SPANISH
+        .nickname = _("DRNITE"),
+        .trainerName = _("SERENO"),
     #else //ENGLISH
         .nickname = _("DRITE"),
         .trainerName = _("SERGIO"),
@@ -3531,6 +3804,9 @@ const struct ContestPokemon gContestOpponents[] =
     #elif ITALIAN
         .nickname = _("MEOWY"),
         .trainerName = _("KAILEY"),
+    #elif SPANISH
+        .nickname = _("MEOWY"),
+        .trainerName = _("NORA"),
     #else //ENGLISH
         .nickname = _("MEOWY"),
         .trainerName = _("KAILEY"),
@@ -3567,6 +3843,9 @@ const struct ContestPokemon gContestOpponents[] =
     #elif ITALIAN
         .nickname = _("NYX"),
         .trainerName = _("PEPA"),
+    #elif SPANISH
+        .nickname = _("NYXI"),
+        .trainerName = _("PEPA"),
     #else //ENGLISH
         .nickname = _("NYX"),
         .trainerName = _("PERLA"),
@@ -3600,10 +3879,7 @@ const struct ContestPokemon gContestOpponents[] =
     #if FRENCH
         .nickname = _("PIGETO"),
         .trainerName = _("CLARA"),
-    #elif ITALIAN
-        .nickname = _("GEPITO"),
-        .trainerName = _("CLARA"),
-    #else //ENGLISH
+    #else //ENGLISH || ITALIAN || SPANISH
         .nickname = _("GEPITO"),
         .trainerName = _("CLARA"),
     #endif
@@ -3639,6 +3915,9 @@ const struct ContestPokemon gContestOpponents[] =
     #elif ITALIAN
         .nickname = _("SPEON"),
         .trainerName = _("JAKOB"),
+    #elif SPANISH
+        .nickname = _("SEPEON"),
+        .trainerName = _("JUACO"),
     #else //ENGLISH
         .nickname = _("SPEON"),
         .trainerName = _("JAKOB"),
@@ -3675,6 +3954,9 @@ const struct ContestPokemon gContestOpponents[] =
     #elif ITALIAN
         .nickname = _("SLOWGO"),
         .trainerName = _("TREY"),
+    #elif SPANISH
+        .nickname = _("SLOKI"),
+        .trainerName = _("TONINO"),
     #else //ENGLISH
         .nickname = _("SLOWGO"),
         .trainerName = _("TREY"),
@@ -3711,6 +3993,9 @@ const struct ContestPokemon gContestOpponents[] =
     #elif ITALIAN
         .nickname = _("URSING"),
         .trainerName = _("LENO"),
+    #elif SPANISH
+        .nickname = _("URSARI"),
+        .trainerName = _("LENO"),
     #else //ENGLISH
         .nickname = _("URSING"),
         .trainerName = _("LANE"),
diff --git a/src/data/credits.h b/src/data/credits.h
index d7112a7b9d..259bf290d4 100644
--- a/src/data/credits.h
+++ b/src/data/credits.h
@@ -43,7 +43,7 @@ enum
     PAGE_COORDINATORS,
     PAGE_ENGLISH_VERSION,
     PAGE_TRANSLATOR,
-#if !defined(FRENCH) && !defined(ITALIAN)
+#if !EUROPE
     PAGE_TEXT_EDITOR,
 #endif
     PAGE_NCL_COORDINATOR,
@@ -51,12 +51,12 @@ enum
     PAGE_GRAPHIC_DESIGNER,
     PAGE_ENVIRONMENT_AND_TOOL_PROGRAMS_2,
     PAGE_NOA_TESTING,
-#if !defined(FRENCH) && !defined(ITALIAN)
+#if !EUROPE
     PAGE_BRAILLE_CODE_CHECK_1,
     PAGE_BRAILLE_CODE_CHECK_2,
 #endif
     PAGE_SPECIAL_THANKS_5,
-#if FRENCH || ITALIAN
+#if EUROPE
     PAGE_SPECIAL_THANKS_6,
 #endif
     PAGE_TASK_MANAGERS,
@@ -74,6 +74,8 @@ static const u8 sCreditsText_EmptyString[]                    = _("");
 static const u8 sCreditsText_PkmnEmeraldVersion[]             = _("POKéMON VERSION EMERAUDE");
 #elif ITALIAN
 static const u8 sCreditsText_PkmnEmeraldVersion[]             = _("POKéMON VERSIONE SMERALDO");
+#elif SPANISH
+static const u8 sCreditsText_PkmnEmeraldVersion[]             = _("POKéMON EDICIÓN ESMERALDA");
 #else //ENGLISH
 static const u8 sCreditsText_PkmnEmeraldVersion[]             = _("POKéMON EMERALD VERSION");
 #endif
@@ -210,10 +212,12 @@ static const u8 sCreditsText_PackageAndManual[]               = _("Package & Man
 static const u8 sCreditsText_EnglishVersion[]                 = _("French Version Coordinators");
 #elif ITALIAN
 static const u8 sCreditsText_EnglishVersion[]                 = _("Italian Version Coordinators");
+#elif SPANISH
+static const u8 sCreditsText_EnglishVersion[]                 = _("Spanish Version Coordinators");
 #else //ENGLISH
 static const u8 sCreditsText_EnglishVersion[]                 = _("English Version Coordinators");
 #endif
-#if FRENCH || ITALIAN
+#if EUROPE
 static const u8 sCreditsText_Translator[]                     = _("Translators");
 static const u8 sCreditsText_TextEditor[]                     = _("Text Editor");
 static const u8 sCreditsText_NCLCoordinator[]                 = _("NCL Coordinators");
@@ -243,10 +247,10 @@ static const u8 sCreditsText_NationalFederationBlind[]        = _("National Fede
 static const u8 sCreditsText_PatriciaAMaurer[]                = _("Patricia A. Maurer");
 static const u8 sCreditsText_EuropeanBlindUnion[]             = _("European Blind Union");
 static const u8 sCreditsText_AustralianBrailleAuthority[]     = _("Australian Braille Authority");
-#if FRENCH || ITALIAN
+#if EUROPE
 static const u8 sCreditsText_EuropeanBlindUnion2[]            = _("European Blind Union");
 static const u8 sCreditsText_MotoyasuTojima[]                 = _("Motoyasu Tojima");
-static const u8 sCreditsText_NicolaPrattBarlow[]              = _("Nicola Wright"); // Possibly got married :)
+static const u8 sCreditsText_NicolaPrattBarlow[]              = _("Nicola Wright");
 #else //ENGLISH
 static const u8 sCreditsText_RoyalNewZealandFederationBlind[] = _("Royal New Zealand Federation for the Blind");
 static const u8 sCreditsText_MotoyasuTojima[]                 = _("Motoyasu Tojima");
@@ -255,7 +259,7 @@ static const u8 sCreditsText_NicolaPrattBarlow[]              = _("Nicola Pratt-
 static const u8 sCreditsText_ShellieDow[]                     = _("Shellie Dow");
 static const u8 sCreditsText_ErikJohnson[]                    = _("Erik Johnson");
 // New
-#if FRENCH || ITALIAN
+#if EUROPE
 static const u8 sCreditsText_NorikoNetley[]                   = _("Noriko Netley");
 #if FRENCH
 static const u8 sCreditsText_PierreSanchez[]                  = _("Pierre Sanchez");
@@ -265,6 +269,10 @@ static const u8 sCreditsText_ThomasFougeray[]                 = _("Thomas Fouger
 static const u8 sCreditsText_PierreSanchez[]                  = _("Elena Nardo");
 static const u8 sCreditsText_SabrinaBretant[]                 = _("Giovanna Prati");
 static const u8 sCreditsText_ThomasFougeray[]                 = _("Andrea Salvi");
+#elif SPANISH
+static const u8 sCreditsText_PierreSanchez[]                  = _("Sofía Marín Aguilar-Galindo");
+static const u8 sCreditsText_SabrinaBretant[]                 = _("Jesús Ángel Rodríguez Gago");
+static const u8 sCreditsText_ThomasFougeray[]                 = _("Palma Sánchez de Moya Rodríguez");
 #endif
 static const u8 sCreditsText_AlessioDanieli[]                 = _("Alessio Danieli");
 static const u8 sCreditsText_NOETestingTeam[]                 = _("NOE Testing Team");
@@ -427,7 +435,7 @@ static const struct CreditsEntry sCreditsEntry_NationalFederationBlind
 static const struct CreditsEntry sCreditsEntry_PatriciaAMaurer                  = { 0, FALSE, sCreditsText_PatriciaAMaurer};
 static const struct CreditsEntry sCreditsEntry_EuropeanBlindUnion               = { 0, FALSE, sCreditsText_EuropeanBlindUnion};
 static const struct CreditsEntry sCreditsEntry_AustralianBrailleAuthority       = { 0, FALSE, sCreditsText_AustralianBrailleAuthority};
-#if FRENCH || ITALIAN
+#if EUROPE
 static const struct CreditsEntry sCreditsEntry_EuropeanBlindUnion2              = { 0, FALSE, sCreditsText_EuropeanBlindUnion2};
 #else //ENGLISH
 static const struct CreditsEntry sCreditsEntry_RoyalNewZealandFederationBlind   = { 0, FALSE, sCreditsText_RoyalNewZealandFederationBlind};
@@ -438,7 +446,7 @@ static const struct CreditsEntry sCreditsEntry_ShellieDow
 static const struct CreditsEntry sCreditsEntry_ErikJohnson                      = { 0, FALSE, sCreditsText_ErikJohnson};
 
 // New
-#if FRENCH || ITALIAN
+#if EUROPE
 static const struct CreditsEntry sCreditsEntry_NorikoNetley                     = { 0, FALSE, sCreditsText_NorikoNetley};
 static const struct CreditsEntry sCreditsEntry_PierreSanchez                    = { 0, FALSE, sCreditsText_PierreSanchez};
 static const struct CreditsEntry sCreditsEntry_SabrinaBretant                   = { 0, FALSE, sCreditsText_SabrinaBretant};
@@ -741,7 +749,7 @@ static const struct CreditsEntry *const sCreditsEntryPointerTable[PAGE_COUNT][EN
         &sCreditsEntry_RetsujiNomoto,
         _,
     },
-#if FRENCH || ITALIAN
+#if EUROPE
     [PAGE_ENGLISH_VERSION] = {
         _,
         &sCreditsEntry_EnglishVersion,
@@ -814,7 +822,7 @@ static const struct CreditsEntry *const sCreditsEntryPointerTable[PAGE_COUNT][EN
         &sCreditsEntry_KimikoNakamichi,
         _,
     },
-#if FRENCH || ITALIAN
+#if EUROPE
     [PAGE_NOA_TESTING] = {
         _,
         &sCreditsEntry_NOAProductTesting,
diff --git a/src/data/decoration/description_es.h b/src/data/decoration/description_es.h
new file mode 100644
index 0000000000..7179eb7dc4
--- /dev/null
+++ b/src/data/decoration/description_es.h
@@ -0,0 +1,552 @@
+const u8 DecorDesc_SMALL_DESK[] = _(
+    "Mesa pequeña para\n"
+    "una sola persona.");
+
+const u8 DecorDesc_POKEMON_DESK[] = _(
+    "Mesa pequeña con\n"
+    "forma de POKé BALL.");
+
+const u8 DecorDesc_HEAVY_DESK[] = _(
+    "Mesa grande de\n"
+    "acero. Decórala.");
+
+const u8 DecorDesc_RAGGED_DESK[] = _(
+    "Mesa grande de\n"
+    "madera. Decórala.");
+
+const u8 DecorDesc_COMFORT_DESK[] = _(
+    "Mesa grande de\n"
+    "hojas. Decórala.");
+
+const u8 DecorDesc_PRETTY_DESK[] = _(
+    "Mesa enorme de\n"
+    "cristal. Decórala\n"
+    "con muchas cosas.");
+
+const u8 DecorDesc_BRICK_DESK[] = _(
+    "Mesa enorme de\n"
+    "ladrillo. Decórala\n"
+    "con muchas cosas.");
+
+const u8 DecorDesc_CAMP_DESK[] = _(
+    "Mesa enorme de\n"
+    "troncos. Decórala\n"
+    "con muchas cosas.");
+
+const u8 DecorDesc_HARD_DESK[] = _(
+    "Mesa enorme de\n"
+    "piedra. Decórala\n"
+    "con muchas cosas.");
+
+const u8 DecorDesc_SMALL_CHAIR[] = _(
+    "Silla pequeña para\n"
+    "una persona.");
+
+const u8 DecorDesc_POKEMON_CHAIR[] = _(
+    "Silla pequeña con\n"
+    "forma de POKé BALL.");
+
+const u8 DecorDesc_HEAVY_CHAIR[] = _(
+    "Silla pequeña\n"
+    "de acero.");
+
+const u8 DecorDesc_PRETTY_CHAIR[] = _(
+    "Silla pequeña\n"
+    "de cristal.");
+
+const u8 DecorDesc_COMFORT_CHAIR[] = _(
+    "Silla pequeña\n"
+    "de hojas.");
+
+const u8 DecorDesc_RAGGED_CHAIR[] = _(
+    "Silla pequeña\n"
+    "de madera.");
+
+const u8 DecorDesc_BRICK_CHAIR[] = _(
+    "Silla pequeña\n"
+    "de ladrillo.");
+
+const u8 DecorDesc_CAMP_CHAIR[] = _(
+    "Silla pequeña\n"
+    "de troncos.");
+
+const u8 DecorDesc_HARD_CHAIR[] = _(
+    "Silla pequeña\n"
+    "de piedra.");
+
+const u8 DecorDesc_RED_PLANT[] = _(
+    "Maceta con planta\n"
+    "de color rojo vivo.");
+
+const u8 DecorDesc_TROPICAL_PLANT[] = _(
+    "Exuberante planta\n"
+    "tropical.");
+
+const u8 DecorDesc_PRETTY_FLOWERS[] = _(
+    "Maceta llena de\n"
+    "flores muy bonitas.");
+
+const u8 DecorDesc_COLORFUL_PLANT[] = _(
+    "Macetón lleno de\n"
+    "flores de colores.");
+
+const u8 DecorDesc_BIG_PLANT[] = _(
+    "Planta grande con\n"
+    "forma de sombrilla.");
+
+const u8 DecorDesc_GORGEOUS_PLANT[] = _(
+    "Planta enorme\n"
+    "e imponente.");
+
+const u8 DecorDesc_RED_BRICK[] = _(
+    "Ladrillo de color\n"
+    "rojo. Ponle cosas\n"
+    "encima.");
+
+const u8 DecorDesc_YELLOW_BRICK[] = _(
+    "Ladrillo de color\n"
+    "amarillo. Ponle\n"
+    "cosas encima.");
+
+const u8 DecorDesc_BLUE_BRICK[] = _(
+    "Ladrillo de color\n"
+    "azul. Ponle cosas\n"
+    "encima.");
+
+const u8 DecorDesc_RED_BALLOON[] = _(
+    "Globo rojo de agua.\n"
+    "Si lo pisas, explota.");
+
+const u8 DecorDesc_BLUE_BALLOON[] = _(
+    "Globo azul de agua.\n"
+    "Si lo pisas, explota.");
+
+const u8 DecorDesc_YELLOW_BALLOON[] = _(
+    "Globo amarillo de\n"
+    "agua. Si lo pisas,\n"
+    "explota.");
+
+const u8 DecorDesc_RED_TENT[] = _(
+    "Tienda grande roja.\n"
+    "Sirve de escondite.");
+
+const u8 DecorDesc_BLUE_TENT[] = _(
+    "Tienda grande azul.\n"
+    "Sirve de escondite.");
+
+const u8 DecorDesc_SOLID_BOARD[] = _(
+    "Colócala sobre un\n"
+    "agujero y cruza  \n"
+    "al otro lado.");
+
+const u8 DecorDesc_SLIDE[] = _(
+    "Sirve para \n"
+    "deslizarse desde\n"
+    "una plataforma.");
+
+const u8 DecorDesc_FENCE_LENGTH[] = _(
+    "Pequeña valla que\n"
+    "bloquea el paso.");
+
+const u8 DecorDesc_FENCE_WIDTH[] = _(
+    "Pequeña valla que\n"
+    "bloquea el paso.");
+
+const u8 DecorDesc_TIRE[] = _(
+    "Neumático viejo.\n"
+    "Ponle cosas encima.");
+
+const u8 DecorDesc_STAND[] = _(
+    "Gran pedestal\n"
+    "con escalones.");
+
+const u8 DecorDesc_MUD_BALL[] = _(
+    "Gran bola de lodo\n"
+    "que se deshace\n"
+    "si la pisas.");
+
+const u8 DecorDesc_BREAKABLE_DOOR[] = _(
+    "Es extraña, pero\n"
+    "puede atravesarse\n"
+    "sin problema.");
+
+const u8 DecorDesc_SAND_ORNAMENT[] = _(
+    "Adorno de arena\n"
+    "que se desmorona\n"
+    "con sólo tocarlo.");
+
+const u8 DecorDesc_SILVER_SHIELD[] = _(
+    "Se gana al vencer \n"
+    "50 veces seguidas \n"
+    "en TORRE BATALLA.");
+
+const u8 DecorDesc_GOLD_SHIELD[] = _(
+    "Premio por 100 \n"
+    "victorias seguidas\n"
+    "en TORRE BATALLA.");
+
+const u8 DecorDesc_GLASS_ORNAMENT[] = _(
+    "Réplica en cristal\n"
+    "de una escultura\n"
+    "del MUSEO DE ARTE.");
+
+const u8 DecorDesc_TV[] = _(
+    "Tele de juguete\n"
+    "de color gris.");
+
+const u8 DecorDesc_ROUND_TV[] = _(
+    "Tele de juguete con\n"
+    "forma de SEEDOT.");
+
+const u8 DecorDesc_CUTE_TV[] = _(
+    "Tele de juguete con\n"
+    "forma de SKITTY.");
+
+const u8 DecorDesc_GLITTER_MAT[] = _(
+    "Tapete viejo que\n"
+    "brilla si lo pisas.");
+
+const u8 DecorDesc_JUMP_MAT[] = _(
+    "Tapete mágico\n"
+    "que te hace saltar\n"
+    "si lo pisas.");
+
+const u8 DecorDesc_SPIN_MAT[] = _(
+    "Tapete mágico\n"
+    "que te hace girar\n"
+    "si lo pisas.");
+
+const u8 DecorDesc_C_LOW_NOTE_MAT[] = _(
+    "Tapete que suena\n"
+    "en do menor,\n"
+    "si lo pisas.");
+
+const u8 DecorDesc_D_NOTE_MAT[] = _(
+    "Tapete que toca\n"
+    "re, si lo pisas.");
+
+const u8 DecorDesc_E_NOTE_MAT[] = _(
+    "Tapete que toca\n"
+    "mi, si lo pisas.");
+
+const u8 DecorDesc_F_NOTE_MAT[] = _(
+    "Tapete que toca\n"
+    "fa, si lo pisas.");
+
+const u8 DecorDesc_G_NOTE_MAT[] = _(
+    "Tapete que toca\n"
+    "sol, si lo pisas.");
+
+const u8 DecorDesc_A_NOTE_MAT[] = _(
+    "Tapete que toca\n"
+    "la, si lo pisas.");
+
+const u8 DecorDesc_B_NOTE_MAT[] = _(
+    "Tapete que toca\n"
+    "si, si lo pisas.");
+
+const u8 DecorDesc_C_HIGH_NOTE_MAT[] = _(
+    "Tapete que suena\n"
+    "en do mayor,\n"
+    "si lo pisas.");
+
+const u8 DecorDesc_SURF_MAT[] = _(
+    "Tapete con dibujo\n"
+    "de SURF.\n"
+    "Ponle cosas encima.");
+
+const u8 DecorDesc_THUNDER_MAT[] = _(
+    "Tapete con dibujo\n"
+    "de TRUENO.\n"
+    "Ponle cosas encima.");
+
+const u8 DecorDesc_FIRE_BLAST_MAT[] = _(
+    "Tapete con dibujo\n"
+    "de LLAMARADA.\n"
+    "Ponle cosas encima.");
+
+const u8 DecorDesc_POWDER_SNOW_MAT[] = _(
+    "Tapete con dibujo\n"
+    "de NIEVE POLVO.\n"
+    "Ponle cosas encima.");
+
+const u8 DecorDesc_ATTRACT_MAT[] = _(
+    "Tapete con dibujo\n"
+    "de ATRACCIÓN.\n"
+    "Ponle cosas encima.");
+
+const u8 DecorDesc_FISSURE_MAT[] = _(
+    "Tapete con dibujo\n"
+    "de FISURA.\n"
+    "Ponle cosas encima.");
+
+const u8 DecorDesc_SPIKES_MAT[] = _(
+    "Tapete con dibujo\n"
+    "de PÚAS.\n"
+    "Ponle cosas encima.");
+
+const u8 DecorDesc_BALL_POSTER[] = _(
+    "Póster pequeño de\n"
+    "POKé BALL.");
+
+const u8 DecorDesc_GREEN_POSTER[] = _(
+    "Póster pequeño\n"
+    "de TREECKO.");
+
+const u8 DecorDesc_RED_POSTER[] = _(
+    "Póster pequeño\n"
+    "de TORCHIC.");
+
+const u8 DecorDesc_BLUE_POSTER[] = _(
+    "Póster pequeño\n"
+    "de MUDKIP.");
+
+const u8 DecorDesc_CUTE_POSTER[] = _(
+    "Póster pequeño\n"
+    "de AZURILL.");
+
+const u8 DecorDesc_PIKA_POSTER[] = _(
+    "Póster grande\n"
+    "de PIKACHU\n"
+    "y PICHU.");
+
+const u8 DecorDesc_LONG_POSTER[] = _(
+    "Póster grande\n"
+    "de SEVIPER.");
+
+const u8 DecorDesc_SEA_POSTER[] = _(
+    "Póster grande\n"
+    "de RELICANTH.");
+
+const u8 DecorDesc_SKY_POSTER[] = _(
+    "Póster grande\n"
+    "de WINGULL.");
+
+const u8 DecorDesc_KISS_POSTER[] = _(
+    "Póster grande\n"
+    "de SMOOCHUM.");
+
+const u8 DecorDesc_PICHU_DOLL[] = _(
+    "Muñeco de PICHU.\n"
+    "Ponlo en una\n"
+    "mesa o tapete.");
+
+const u8 DecorDesc_PIKACHU_DOLL[] = _(
+    "Muñeco de PIKACHU.\n"
+    "Ponlo en una\n"
+    "mesa o tapete.");
+
+const u8 DecorDesc_MARILL_DOLL[] = _(
+    "Muñeco de MARILL.\n"
+    "Ponlo en una\n"
+    "mesa o tapete.");
+
+const u8 DecorDesc_TOGEPI_DOLL[] = _(
+    "Muñeco de TOGEPI.\n"
+    "Ponlo en una\n"
+    "mesa o tapete.");
+
+const u8 DecorDesc_CYNDAQUIL_DOLL[] = _(
+    "Muñeco de\n"
+    "CYNDAQUIL. Ponlo en\n"
+    "una mesa o tapete.");
+
+const u8 DecorDesc_CHIKORITA_DOLL[] = _(
+    "Muñeco de\n"
+    "CHIKORITA. Ponlo en\n"
+    "una mesa o tapete.");
+
+const u8 DecorDesc_TOTODILE_DOLL[] = _(
+    "Muñeco de\n"
+    "TOTODILE. Ponlo en\n"
+    "una mesa o tapete.");
+
+const u8 DecorDesc_JIGGLYPUFF_DOLL[] = _(
+    "Muñeco de JIGGLY-\n"
+    "PUFF. Ponlo en una\n"
+    "mesa o tapete.");
+
+const u8 DecorDesc_MEOWTH_DOLL[] = _(
+    "Muñeco de MEOWTH.\n"
+    "Ponlo en una\n"
+    "mesa o tapete.");
+
+const u8 DecorDesc_CLEFAIRY_DOLL[] = _(
+    "Muñeco de\n"
+    "CLEFAIRY. Ponlo en\n"
+    "una mesa o tapete.");
+
+const u8 DecorDesc_DITTO_DOLL[] = _(
+    "Muñeco de DITTO.\n"
+    "Ponlo en una mesa\n"
+    "o tapete.");
+
+const u8 DecorDesc_SMOOCHUM_DOLL[] = _(
+    "Muñeco de SMOO-\n"
+    "CHUM. Ponlo en\n"
+    "una mesa o tapete.");
+
+const u8 DecorDesc_TREECKO_DOLL[] = _(
+    "Muñeco de\n"
+    "TREECKO. Ponlo en\n"
+    "una mesa o tapete.");
+
+const u8 DecorDesc_TORCHIC_DOLL[] = _(
+    "Muñeco de\n"
+    "TORCHIC. Ponlo en\n"
+    "una mesa o tapete.");
+
+const u8 DecorDesc_MUDKIP_DOLL[] = _(
+    "Muñeco de MUDKIP.\n"
+    "Ponlo en una mesa\n"
+    "o tapete.");
+
+const u8 DecorDesc_DUSKULL_DOLL[] = _(
+    "Muñeco de DUSKULL.\n"
+    "Ponlo en una mesa\n"
+    "o tapete.");
+
+const u8 DecorDesc_WYNAUT_DOLL[] = _(
+    "Muñeco de WYNAUT.\n"
+    "Ponlo en una mesa\n"
+    "o tapete.");
+
+const u8 DecorDesc_BALTOY_DOLL[] = _(
+    "Muñeco de BALTOY.\n"
+    "Ponlo en una mesa\n"
+    "o tapete.");
+
+const u8 DecorDesc_KECLEON_DOLL[] = _(
+    "Muñeco de KECLEON.\n"
+    "Ponlo en una mesa\n"
+    "o tapete.");
+
+const u8 DecorDesc_AZURILL_DOLL[] = _(
+    "Muñeco de AZURILL.\n"
+    "Ponlo en una mesa\n"
+    "o tapete.");
+
+const u8 DecorDesc_SKITTY_DOLL[] = _(
+    "Muñeco de SKITTY.\n"
+    "Ponlo en una mesa\n"
+    "o tapete.");
+
+const u8 DecorDesc_SWABLU_DOLL[] = _(
+    "Muñeco de SWABLU.\n"
+    "Ponlo en una mesa\n"
+    "o tapete.");
+
+const u8 DecorDesc_GULPIN_DOLL[] = _(
+    "Muñeco de GULPIN.\n"
+    "Ponlo en una mesa\n"
+    "o tapete.");
+
+const u8 DecorDesc_LOTAD_DOLL[] = _(
+    "Muñeco de LOTAD.\n"
+    "Ponlo en una mesa\n"
+    "o tapete.");
+
+const u8 DecorDesc_SEEDOT_DOLL[] = _(
+    "Muñeco de SEEDOT.\n"
+    "Ponlo en una mesa\n"
+    "o tapete.");
+
+const u8 DecorDesc_PIKA_CUSHION[] = _(
+    "Cojín de PIKACHU.\n"
+    "Ponlo en una mesa\n"
+    "o tapete.");
+
+const u8 DecorDesc_ROUND_CUSHION[] = _(
+    "Cojín de MARILL.\n"
+    "Ponlo en una mesa\n"
+    "o tapete.");
+
+const u8 DecorDesc_KISS_CUSHION[] = _(
+    "Cojín de SMOOCHUM.\n"
+    "Ponlo en una mesa\n"
+    "o tapete.");
+
+const u8 DecorDesc_ZIGZAG_CUSHION[] = _(
+    "Cojín de ZIGZA-\n"
+    "GOON. Ponlo en\n"
+    "una mesa o tapete.");
+
+const u8 DecorDesc_SPIN_CUSHION[] = _(
+    "Cojín de SPINDA.\n"
+    "Ponlo en una mesa\n"
+    "o tapete.");
+
+const u8 DecorDesc_DIAMOND_CUSHION[] = _(
+    "Cojín de SABLEYE.\n"
+    "Ponlo en una mesa\n"
+    "o tapete.");
+
+const u8 DecorDesc_BALL_CUSHION[] = _(
+    "Cojín con forma de\n"
+    "BALL. Ponlo en una\n"
+    "mesa o tapete.");
+
+const u8 DecorDesc_GRASS_CUSHION[] = _(
+    "Cojín estampado de\n"
+    "planta. Ponlo en una\n"
+    "mesa o tapete.");
+
+const u8 DecorDesc_FIRE_CUSHION[] = _(
+    "Cojín estampado de\n"
+    "fuego. Ponlo en una\n"
+    "mesa o tapete.");
+
+const u8 DecorDesc_WATER_CUSHION[] = _(
+    "Cojín estampado de\n"
+    "agua. Ponlo en una\n"
+    "mesa o tapete.");
+
+const u8 DecorDesc_SNORLAX_DOLL[] = _(
+    "Muñeco grande.\n"
+    "Ponlo en una mesa\n"
+    "o tapete.");
+
+const u8 DecorDesc_RHYDON_DOLL[] = _(
+    "Muñeco grande.\n"
+    "Ponlo en una mesa\n"
+    "o tapete.");
+
+const u8 DecorDesc_LAPRAS_DOLL[] = _(
+    "Muñeco grande.\n"
+    "Ponlo en una mesa\n"
+    "o tapete.");
+
+const u8 DecorDesc_VENUSAUR_DOLL[] = _(
+    "Muñeco grande.\n"
+    "Ponlo en una mesa\n"
+    "o tapete.");
+
+const u8 DecorDesc_CHARIZARD_DOLL[] = _(
+    "Muñeco grande.\n"
+    "Ponlo en una mesa\n"
+    "o tapete.");
+
+const u8 DecorDesc_BLASTOISE_DOLL[] = _(
+    "Muñeco grande.\n"
+    "Ponlo en una mesa\n"
+    "o tapete.");
+
+const u8 DecorDesc_WAILMER_DOLL[] = _(
+    "Muñeco grande.\n"
+    "Ponlo en una mesa\n"
+    "o tapete.");
+
+const u8 DecorDesc_REGIROCK_DOLL[] = _(
+    "Muñeco grande.\n"
+    "Ponlo en una mesa\n"
+    "o tapete.");
+
+const u8 DecorDesc_REGICE_DOLL[] = _(
+    "Muñeco grande.\n"
+    "Ponlo en una mesa\n"
+    "o tapete.");
+
+const u8 DecorDesc_REGISTEEL_DOLL[] = _(
+    "Muñeco grande.\n"
+    "Ponlo en una mesa\n"
+    "o tapete.");
diff --git a/src/data/decoration/header.h b/src/data/decoration/header.h
index 833dff11e6..c36b0e69ef 100644
--- a/src/data/decoration/header.h
+++ b/src/data/decoration/header.h
@@ -6,7 +6,8 @@ const struct Decoration gDecorations[] =
         .name = LANGUAGE_STRING(
             "SMALL DESK",
             "PETIT BUREAU",
-            "TAVOLO PICCOLO"),
+            "TAVOLO PICCOLO",
+            "MESA PEQUEÑA"),
         .permission = DECORPERM_SOLID_FLOOR,
         .shape = DECORSHAPE_1x1,
         .category = DECORCAT_DESK,
@@ -21,7 +22,8 @@ const struct Decoration gDecorations[] =
         .name = LANGUAGE_STRING(
             "SMALL DESK",
             "PETIT BUREAU",
-            "TAVOLO PICCOLO"),
+            "TAVOLO PICCOLO",
+            "MESA PEQUEÑA"),
         .permission = DECORPERM_SOLID_FLOOR,
         .shape = DECORSHAPE_1x1,
         .category = DECORCAT_DESK,
@@ -36,7 +38,8 @@ const struct Decoration gDecorations[] =
         .name = LANGUAGE_STRING(
             "POKéMON DESK",
             "BUREAU POKéMON",
-            "TAVOLO POKéMON"),
+            "TAVOLO POKéMON",
+            "MESA POKéMON"),
         .permission = DECORPERM_SOLID_FLOOR,
         .shape = DECORSHAPE_1x1,
         .category = DECORCAT_DESK,
@@ -51,7 +54,8 @@ const struct Decoration gDecorations[] =
         .name = LANGUAGE_STRING(
             "HEAVY DESK",
             "GRAND BUREAU",
-            "TAVOLO PESANTE"),
+            "TAVOLO PESANTE",
+            "MESA PESADA"),
         .permission = DECORPERM_SOLID_FLOOR,
         .shape = DECORSHAPE_3x2,
         .category = DECORCAT_DESK,
@@ -66,7 +70,8 @@ const struct Decoration gDecorations[] =
         .name = LANGUAGE_STRING(
             "RAGGED DESK",
             "BUREAU BRUT",
-            "TAVOLO GREZZO"),
+            "TAVOLO GREZZO",
+            "MESA RÚSTICA"),
         .permission = DECORPERM_SOLID_FLOOR,
         .shape = DECORSHAPE_3x2,
         .category = DECORCAT_DESK,
@@ -81,7 +86,8 @@ const struct Decoration gDecorations[] =
         .name = LANGUAGE_STRING(
             "COMFORT DESK",
             "BUREAU COQUET",
-            "TAVOLO COMODO"),
+            "TAVOLO COMODO",
+            "MESA CÓMODA"),
         .permission = DECORPERM_SOLID_FLOOR,
         .shape = DECORSHAPE_3x2,
         .category = DECORCAT_DESK,
@@ -96,7 +102,8 @@ const struct Decoration gDecorations[] =
         .name = LANGUAGE_STRING(
             "PRETTY DESK",
             "JOLI BUREAU",
-            "BEL TAVOLO"),
+            "BEL TAVOLO",
+            "MESA BONITA"),
         .permission = DECORPERM_SOLID_FLOOR,
         .shape = DECORSHAPE_3x3,
         .category = DECORCAT_DESK,
@@ -111,7 +118,8 @@ const struct Decoration gDecorations[] =
         .name = LANGUAGE_STRING(
             "BRICK DESK",
             "BUREAU BRIQUES",
-            "TAVOLO MATTONI"),
+            "TAVOLO MATTONI",
+            "MESA LADRILLO"),
         .permission = DECORPERM_SOLID_FLOOR,
         .shape = DECORSHAPE_3x3,
         .category = DECORCAT_DESK,
@@ -126,7 +134,8 @@ const struct Decoration gDecorations[] =
         .name = LANGUAGE_STRING(
             "CAMP DESK",
             "BUREAU CAMPEUR",
-            "TAVOLO DA CAMPO"),
+            "TAVOLO DA CAMPO",
+            "MESA DE CAMPO"),
         .permission = DECORPERM_SOLID_FLOOR,
         .shape = DECORSHAPE_3x3,
         .category = DECORCAT_DESK,
@@ -141,7 +150,8 @@ const struct Decoration gDecorations[] =
         .name = LANGUAGE_STRING(
             "HARD DESK",
             "BUREAU PIERRES",
-            "TAVOLO DURO"),
+            "TAVOLO DURO",
+            "MESA FUERTE"),
         .permission = DECORPERM_SOLID_FLOOR,
         .shape = DECORSHAPE_3x3,
         .category = DECORCAT_DESK,
@@ -156,7 +166,8 @@ const struct Decoration gDecorations[] =
         .name = LANGUAGE_STRING(
             "SMALL CHAIR",
             "PETITE CHAISE",
-            "SEDIA PICCOLA"),
+            "SEDIA PICCOLA",
+            "SILLA PEQUEÑA"),
         .permission = DECORPERM_PASS_FLOOR,
         .shape = DECORSHAPE_1x1,
         .category = DECORCAT_CHAIR,
@@ -171,7 +182,8 @@ const struct Decoration gDecorations[] =
         .name = LANGUAGE_STRING(
             "POKéMON CHAIR",
             "CHAISE POKéMON",
-            "SEDIA POKéMON"),
+            "SEDIA POKéMON",
+            "SILLA POKéMON"),
         .permission = DECORPERM_PASS_FLOOR,
         .shape = DECORSHAPE_1x1,
         .category = DECORCAT_CHAIR,
@@ -186,7 +198,8 @@ const struct Decoration gDecorations[] =
         .name = LANGUAGE_STRING(
             "HEAVY CHAIR",
             "GRANDE CHAISE",
-            "SEDIA PESANTE"),
+            "SEDIA PESANTE",
+            "SILLA PESADA"),
         .permission = DECORPERM_PASS_FLOOR,
         .shape = DECORSHAPE_1x1,
         .category = DECORCAT_CHAIR,
@@ -201,7 +214,8 @@ const struct Decoration gDecorations[] =
         .name = LANGUAGE_STRING(
             "PRETTY CHAIR",
             "JOLIE CHAISE",
-            "BELLA SEDIA"),
+            "BELLA SEDIA",
+            "SILLA BONITA"),
         .permission = DECORPERM_PASS_FLOOR,
         .shape = DECORSHAPE_1x1,
         .category = DECORCAT_CHAIR,
@@ -216,7 +230,8 @@ const struct Decoration gDecorations[] =
         .name = LANGUAGE_STRING(
             "COMFORT CHAIR",
             "CHAISE COQUETTE",
-            "SEDIA COMODA"),
+            "SEDIA COMODA",
+            "SILLA CÓMODA"),
         .permission = DECORPERM_PASS_FLOOR,
         .shape = DECORSHAPE_1x1,
         .category = DECORCAT_CHAIR,
@@ -231,7 +246,8 @@ const struct Decoration gDecorations[] =
         .name = LANGUAGE_STRING(
             "RAGGED CHAIR",
             "CHAISE BRUTE",
-            "SEDIA GREZZA"),
+            "SEDIA GREZZA",
+            "SILLA RÚSTICA"),
         .permission = DECORPERM_PASS_FLOOR,
         .shape = DECORSHAPE_1x1,
         .category = DECORCAT_CHAIR,
@@ -246,7 +262,8 @@ const struct Decoration gDecorations[] =
         .name = LANGUAGE_STRING(
             "BRICK CHAIR",
             "CHAISE BRIQUES",
-            "SEDIA MATTONI"),
+            "SEDIA MATTONI",
+            "SILLA LADRILLO"),
         .permission = DECORPERM_PASS_FLOOR,
         .shape = DECORSHAPE_1x1,
         .category = DECORCAT_CHAIR,
@@ -261,7 +278,8 @@ const struct Decoration gDecorations[] =
         .name = LANGUAGE_STRING(
             "CAMP CHAIR",
             "CHAISE CAMPEUR",
-            "SEDIA DA CAMPO"),
+            "SEDIA DA CAMPO",
+            "SILLA DE CAMPO"),
         .permission = DECORPERM_PASS_FLOOR,
         .shape = DECORSHAPE_1x1,
         .category = DECORCAT_CHAIR,
@@ -276,7 +294,8 @@ const struct Decoration gDecorations[] =
         .name = LANGUAGE_STRING(
             "HARD CHAIR",
             "CHAISE PIERRES",
-            "SEDIA DURA"),
+            "SEDIA DURA",
+            "SILLA FUERTE"),
         .permission = DECORPERM_PASS_FLOOR,
         .shape = DECORSHAPE_1x1,
         .category = DECORCAT_CHAIR,
@@ -291,7 +310,8 @@ const struct Decoration gDecorations[] =
         .name = LANGUAGE_STRING(
             "RED PLANT",
             "PLANTE ROUGE",
-            "PIANTA ROSSA"),
+            "PIANTA ROSSA",
+            "PLANTA ROJA"),
         .permission = DECORPERM_BEHIND_FLOOR,
         .shape = DECORSHAPE_1x2,
         .category = DECORCAT_PLANT,
@@ -306,7 +326,8 @@ const struct Decoration gDecorations[] =
         .name = LANGUAGE_STRING(
             "TROPICAL PLANT",
             "PLANTE TROPIC",
-            "TROPICPIANTA"),
+            "TROPICPIANTA",
+            "PL. TROPICAL"),
         .permission = DECORPERM_BEHIND_FLOOR,
         .shape = DECORSHAPE_1x2,
         .category = DECORCAT_PLANT,
@@ -321,7 +342,8 @@ const struct Decoration gDecorations[] =
         .name = LANGUAGE_STRING(
             "PRETTY FLOWERS",
             "JOLIES FLEURS",
-            "BEI FIORI"),
+            "BEI FIORI",
+            "FLORES BONITAS"),
         .permission = DECORPERM_BEHIND_FLOOR,
         .shape = DECORSHAPE_1x2,
         .category = DECORCAT_PLANT,
@@ -336,7 +358,8 @@ const struct Decoration gDecorations[] =
         .name = LANGUAGE_STRING(
             "COLORFUL PLANT",
             "PLANTE COLOREE",
-            "PIANTA COLORATA"),
+            "PIANTA COLORATA",
+            "PL. COLORIDA"),
         .permission = DECORPERM_BEHIND_FLOOR,
         .shape = DECORSHAPE_2x2,
         .category = DECORCAT_PLANT,
@@ -351,7 +374,8 @@ const struct Decoration gDecorations[] =
         .name = LANGUAGE_STRING(
             "BIG PLANT",
             "GROSSE PLANTE",
-            "PIANTA GRANDE"),
+            "PIANTA GRANDE",
+            "PLANTA GRANDE"),
         .permission = DECORPERM_BEHIND_FLOOR,
         .shape = DECORSHAPE_2x2,
         .category = DECORCAT_PLANT,
@@ -366,7 +390,8 @@ const struct Decoration gDecorations[] =
         .name = LANGUAGE_STRING(
             "GORGEOUS PLANT",
             "BELLE PLANTE",
-            "PIANTA CHIC"),
+            "PIANTA CHIC",
+            "PLANTA ENORME"),
         .permission = DECORPERM_BEHIND_FLOOR,
         .shape = DECORSHAPE_2x2,
         .category = DECORCAT_PLANT,
@@ -381,7 +406,8 @@ const struct Decoration gDecorations[] =
         .name = LANGUAGE_STRING(
             "RED BRICK",
             "BRIQUE ROUGE",
-            "MATTONE ROSSO"),
+            "MATTONE ROSSO",
+            "LADRILLO ROJO"),
         .permission = DECORPERM_SOLID_FLOOR,
         .shape = DECORSHAPE_1x2,
         .category = DECORCAT_ORNAMENT,
@@ -396,7 +422,8 @@ const struct Decoration gDecorations[] =
         .name = LANGUAGE_STRING(
             "YELLOW BRICK",
             "BRIQUE JAUNE",
-            "MATTONE GIALLO"),
+            "MATTONE GIALLO",
+            "LADR. AMARILLO"),
         .permission = DECORPERM_SOLID_FLOOR,
         .shape = DECORSHAPE_1x2,
         .category = DECORCAT_ORNAMENT,
@@ -411,7 +438,8 @@ const struct Decoration gDecorations[] =
         .name = LANGUAGE_STRING(
             "BLUE BRICK",
             "BRIQUE BLEUE",
-            "MATTONE BLU"),
+            "MATTONE BLU",
+            "LADRILLO AZUL"),
         .permission = DECORPERM_SOLID_FLOOR,
         .shape = DECORSHAPE_1x2,
         .category = DECORCAT_ORNAMENT,
@@ -426,7 +454,8 @@ const struct Decoration gDecorations[] =
         .name = LANGUAGE_STRING(
             "RED BALLOON",
             "BALLON ROUGE",
-            "PALLONE ROSSO"),
+            "PALLONE ROSSO",
+            "GLOBO ROJO"),
         .permission = DECORPERM_PASS_FLOOR,
         .shape = DECORSHAPE_1x1,
         .category = DECORCAT_ORNAMENT,
@@ -441,7 +470,8 @@ const struct Decoration gDecorations[] =
         .name = LANGUAGE_STRING(
             "BLUE BALLOON",
             "BALLON BLEU",
-            "PALLONE BLU"),
+            "PALLONE BLU",
+            "GLOBO AZUL"),
         .permission = DECORPERM_PASS_FLOOR,
         .shape = DECORSHAPE_1x1,
         .category = DECORCAT_ORNAMENT,
@@ -456,7 +486,8 @@ const struct Decoration gDecorations[] =
         .name = LANGUAGE_STRING(
             "YELLOW BALLOON",
             "BALLON JAUNE",
-            "PALLONE GIALLO"),
+            "PALLONE GIALLO",
+            "GLOBO AMARILLO"),
         .permission = DECORPERM_PASS_FLOOR,
         .shape = DECORSHAPE_1x1,
         .category = DECORCAT_ORNAMENT,
@@ -471,7 +502,8 @@ const struct Decoration gDecorations[] =
         .name = LANGUAGE_STRING(
             "RED TENT",
             "TENTE ROUGE",
-            "TENDA ROSSA"),
+            "TENDA ROSSA",
+            "TIENDA ROJA"),
         .permission = DECORPERM_PASS_FLOOR,
         .shape = DECORSHAPE_3x3,
         .category = DECORCAT_ORNAMENT,
@@ -486,7 +518,8 @@ const struct Decoration gDecorations[] =
         .name = LANGUAGE_STRING(
             "BLUE TENT",
             "TENTE BLEUE",
-            "TENDA BLU"),
+            "TENDA BLU",
+            "TIENDA AZUL"),
         .permission = DECORPERM_PASS_FLOOR,
         .shape = DECORSHAPE_3x3,
         .category = DECORCAT_ORNAMENT,
@@ -501,7 +534,8 @@ const struct Decoration gDecorations[] =
         .name = LANGUAGE_STRING(
             "SOLID BOARD",
             "PLANCHE SOLIDE",
-            "ASSE SOLIDA"),
+            "ASSE SOLIDA",
+            "TABLA"),
         .permission = DECORPERM_PASS_FLOOR,
         .shape = DECORSHAPE_1x2,
         .category = DECORCAT_ORNAMENT,
@@ -516,7 +550,8 @@ const struct Decoration gDecorations[] =
         .name = LANGUAGE_STRING(
             "SLIDE",
             "TOBOGGAN",
-            "SCIVOLO"),
+            "SCIVOLO",
+            "TOBOGÁN"),
         .permission = DECORPERM_PASS_FLOOR,
         .shape = DECORSHAPE_2x4,
         .category = DECORCAT_ORNAMENT,
@@ -531,7 +566,8 @@ const struct Decoration gDecorations[] =
         .name = LANGUAGE_STRING(
             "FENCE LENGTH",
             "BARRIERE HAUTE",
-            "BARRIERA LUNGA"),
+            "BARRIERA LUNGA",
+            "VALLA LARGA"),
         .permission = DECORPERM_SOLID_FLOOR,
         .shape = DECORSHAPE_1x1,
         .category = DECORCAT_ORNAMENT,
@@ -546,7 +582,8 @@ const struct Decoration gDecorations[] =
         .name = LANGUAGE_STRING(
             "FENCE WIDTH",
             "BARRIERE LARGE",
-            "BARRIERA LARGA"),
+            "BARRIERA LARGA",
+            "VALLA ANCHA"),
         .permission = DECORPERM_SOLID_FLOOR,
         .shape = DECORSHAPE_1x1,
         .category = DECORCAT_ORNAMENT,
@@ -561,7 +598,8 @@ const struct Decoration gDecorations[] =
         .name = LANGUAGE_STRING(
             "TIRE",
             "PNEU",
-            "CERCHIONE"),
+            "CERCHIONE",
+            "NEUMÁTICO"),
         .permission = DECORPERM_SOLID_FLOOR,
         .shape = DECORSHAPE_2x2,
         .category = DECORCAT_ORNAMENT,
@@ -576,7 +614,8 @@ const struct Decoration gDecorations[] =
         .name = LANGUAGE_STRING(
             "STAND",
             "ESTRADE",
-            "PALCHETTO"),
+            "PALCHETTO",
+            "PODIO"),
         .permission = DECORPERM_PASS_FLOOR,
         .shape = DECORSHAPE_4x2,
         .category = DECORCAT_ORNAMENT,
@@ -591,7 +630,8 @@ const struct Decoration gDecorations[] =
         .name = LANGUAGE_STRING(
             "MUD BALL",
             "BOULE DE BOUE",
-            "PALLA FANGO"),
+            "PALLA FANGO",
+            "BOLA DE LODO"),
         .permission = DECORPERM_PASS_FLOOR,
         .shape = DECORSHAPE_1x1,
         .category = DECORCAT_ORNAMENT,
@@ -606,7 +646,8 @@ const struct Decoration gDecorations[] =
         .name = LANGUAGE_STRING(
             "BREAKABLE DOOR",
             "PORTE CASSABLE",
-            "PORTA FRAGILE"),
+            "PORTA FRAGILE",
+            "PUERTA RARA"),
         .permission = DECORPERM_PASS_FLOOR,
         .shape = DECORSHAPE_1x2,
         .category = DECORCAT_ORNAMENT,
@@ -621,7 +662,8 @@ const struct Decoration gDecorations[] =
         .name = LANGUAGE_STRING(
             "SAND ORNAMENT",
             "DECO DE SABLE",
-            "STATUA FRAGILE"),
+            "STATUA FRAGILE",
+            "ADORNO ARENA"),
         .permission = DECORPERM_BEHIND_FLOOR,
         .shape = DECORSHAPE_1x2,
         .category = DECORCAT_ORNAMENT,
@@ -636,7 +678,8 @@ const struct Decoration gDecorations[] =
         .name = LANGUAGE_STRING(
             "SILVER SHIELD",
             "BOUCLIER ARGENT",
-            "SCUDO ARGENTEO"),
+            "SCUDO ARGENTEO",
+            "ESCUDO PLATA"),
         .permission = DECORPERM_BEHIND_FLOOR,
         .shape = DECORSHAPE_1x2,
         .category = DECORCAT_ORNAMENT,
@@ -651,7 +694,8 @@ const struct Decoration gDecorations[] =
         .name = LANGUAGE_STRING(
             "GOLD SHIELD",
             "BOUCLIER OR",
-            "SCUDO AUREO"),
+            "SCUDO AUREO",
+            "ESCUDO DE ORO"),
         .permission = DECORPERM_BEHIND_FLOOR,
         .shape = DECORSHAPE_1x2,
         .category = DECORCAT_ORNAMENT,
@@ -666,7 +710,8 @@ const struct Decoration gDecorations[] =
         .name = LANGUAGE_STRING(
             "GLASS ORNAMENT",
             "ORNEMENT VERRE",
-            "STATUA VITREA"),
+            "STATUA VITREA",
+            "ADORNO CRISTAL"),
         .permission = DECORPERM_BEHIND_FLOOR,
         .shape = DECORSHAPE_1x2,
         .category = DECORCAT_ORNAMENT,
@@ -681,7 +726,8 @@ const struct Decoration gDecorations[] =
         .name = LANGUAGE_STRING(
             "TV",
             "TV",
-            "TV"),
+            "TV",
+            "TELEVISIÓN"),
         .permission = DECORPERM_SOLID_FLOOR,
         .shape = DECORSHAPE_1x1,
         .category = DECORCAT_ORNAMENT,
@@ -696,7 +742,8 @@ const struct Decoration gDecorations[] =
         .name = LANGUAGE_STRING(
             "ROUND TV",
             "TV RONDE",
-            "TV ROTONDA"),
+            "TV ROTONDA",
+            "TELE REDONDA"),
         .permission = DECORPERM_SOLID_FLOOR,
         .shape = DECORSHAPE_1x1,
         .category = DECORCAT_ORNAMENT,
@@ -711,7 +758,8 @@ const struct Decoration gDecorations[] =
         .name = LANGUAGE_STRING(
             "CUTE TV",
             "JOLIE TV",
-            "TV CARINA"),
+            "TV CARINA",
+            "TELE BONITA"),
         .permission = DECORPERM_SOLID_FLOOR,
         .shape = DECORSHAPE_1x1,
         .category = DECORCAT_ORNAMENT,
@@ -726,7 +774,8 @@ const struct Decoration gDecorations[] =
         .name = LANGUAGE_STRING(
             "GLITTER MAT",
             "TAPIS BRILLANT",
-            "TAPP. BRILLANTE"),
+            "TAPP. BRILLANTE",
+            "TAPETE BRILLO"),
         .permission = DECORPERM_PASS_FLOOR,
         .shape = DECORSHAPE_1x1,
         .category = DECORCAT_MAT,
@@ -741,7 +790,8 @@ const struct Decoration gDecorations[] =
         .name = LANGUAGE_STRING(
             "JUMP MAT",
             "TAPIS SAUTEUR",
-            "TAPPETO SALTO"),
+            "TAPPETO SALTO",
+            "TAPETE MUELLE"),
         .permission = DECORPERM_PASS_FLOOR,
         .shape = DECORSHAPE_1x1,
         .category = DECORCAT_MAT,
@@ -756,7 +806,8 @@ const struct Decoration gDecorations[] =
         .name = LANGUAGE_STRING(
             "SPIN MAT",
             "TAPIS TOURNANT",
-            "TAPPETO GIRO"),
+            "TAPPETO GIRO",
+            "TAPETE GIRO"),
         .permission = DECORPERM_PASS_FLOOR,
         .shape = DECORSHAPE_1x1,
         .category = DECORCAT_MAT,
@@ -771,7 +822,8 @@ const struct Decoration gDecorations[] =
         .name = LANGUAGE_STRING(
             "C Low NOTE MAT",
             "TAPIS DO GRAVE",
-            "TAPP. DO BASSO"),
+            "TAPP. DO BASSO",
+            "TAP. DO MENOR"),
         .permission = DECORPERM_PASS_FLOOR,
         .shape = DECORSHAPE_1x1,
         .category = DECORCAT_MAT,
@@ -786,7 +838,8 @@ const struct Decoration gDecorations[] =
         .name = LANGUAGE_STRING(
             "D NOTE MAT",
             "TAPIS RE",
-            "TAPPETO RE"),
+            "TAPPETO RE",
+            "TAPETE NOTA RE"),
         .permission = DECORPERM_PASS_FLOOR,
         .shape = DECORSHAPE_1x1,
         .category = DECORCAT_MAT,
@@ -801,7 +854,8 @@ const struct Decoration gDecorations[] =
         .name = LANGUAGE_STRING(
             "E NOTE MAT",
             "TAPIS MI",
-            "TAPPETO MI"),
+            "TAPPETO MI",
+            "TAPETE NOTA MI"),
         .permission = DECORPERM_PASS_FLOOR,
         .shape = DECORSHAPE_1x1,
         .category = DECORCAT_MAT,
@@ -816,7 +870,8 @@ const struct Decoration gDecorations[] =
         .name = LANGUAGE_STRING(
             "F NOTE MAT",
             "TAPIS FA",
-            "TAPPETO FA"),
+            "TAPPETO FA",
+            "TAPETE NOTA FA"),
         .permission = DECORPERM_PASS_FLOOR,
         .shape = DECORSHAPE_1x1,
         .category = DECORCAT_MAT,
@@ -831,7 +886,8 @@ const struct Decoration gDecorations[] =
         .name = LANGUAGE_STRING(
             "G NOTE MAT",
             "TAPIS SOL",
-            "TAPPETO SOL"),
+            "TAPPETO SOL",
+            "TAP. NOTA SOL"),
         .permission = DECORPERM_PASS_FLOOR,
         .shape = DECORSHAPE_1x1,
         .category = DECORCAT_MAT,
@@ -846,7 +902,8 @@ const struct Decoration gDecorations[] =
         .name = LANGUAGE_STRING(
             "A NOTE MAT",
             "TAPIS LA",
-            "TAPPETO LA"),
+            "TAPPETO LA",
+            "TAPETE NOTA LA"),
         .permission = DECORPERM_PASS_FLOOR,
         .shape = DECORSHAPE_1x1,
         .category = DECORCAT_MAT,
@@ -861,7 +918,8 @@ const struct Decoration gDecorations[] =
         .name = LANGUAGE_STRING(
             "B NOTE MAT",
             "TAPIS SI",
-            "TAPPETO SI"),
+            "TAPPETO SI",
+            "TAPETE NOTA SI"),
         .permission = DECORPERM_PASS_FLOOR,
         .shape = DECORSHAPE_1x1,
         .category = DECORCAT_MAT,
@@ -876,7 +934,8 @@ const struct Decoration gDecorations[] =
         .name = LANGUAGE_STRING(
             "C High NOTE MAT",
             "TAPIS DO AIGU",
-            "TAPPETO DO ALTO"),
+            "TAPPETO DO ALTO",
+            "TAP. DO MAYOR"),
         .permission = DECORPERM_PASS_FLOOR,
         .shape = DECORSHAPE_1x1,
         .category = DECORCAT_MAT,
@@ -891,7 +950,8 @@ const struct Decoration gDecorations[] =
         .name = LANGUAGE_STRING(
             "SURF MAT",
             "TAPIS SURF",
-            "TAPPETO SURF"),
+            "TAPPETO SURF",
+            "TAPETE SURF"),
         .permission = DECORPERM_PASS_FLOOR,
         .shape = DECORSHAPE_3x3,
         .category = DECORCAT_MAT,
@@ -906,7 +966,8 @@ const struct Decoration gDecorations[] =
         .name = LANGUAGE_STRING(
             "THUNDER MAT",
             "TA.FATAL-FOUDRE",
-            "TAPPETO TUONO"),
+            "TAPPETO TUONO",
+            "TAPETE TRUENO"),
         .permission = DECORPERM_PASS_FLOOR,
         .shape = DECORSHAPE_3x3,
         .category = DECORCAT_MAT,
@@ -921,7 +982,8 @@ const struct Decoration gDecorations[] =
         .name = LANGUAGE_STRING(
             "FIRE BLAST MAT",
             "TA.DEFLAGRATION",
-            "TAPP.FUOCOBOMBA"),
+            "TAPP.FUOCOBOMBA",
+            "TAP. LLAMARADA"),
         .permission = DECORPERM_PASS_FLOOR,
         .shape = DECORSHAPE_3x3,
         .category = DECORCAT_MAT,
@@ -936,7 +998,8 @@ const struct Decoration gDecorations[] =
         .name = LANGUAGE_STRING(
             "POWDER SNOW MAT",
             "TAPIS POUDREUSE",
-            "TAPP. POLNEVE"),
+            "TAPP. POLNEVE",
+            "T. NIEVE POLVO"),
         .permission = DECORPERM_PASS_FLOOR,
         .shape = DECORSHAPE_3x3,
         .category = DECORCAT_MAT,
@@ -951,7 +1014,8 @@ const struct Decoration gDecorations[] =
         .name = LANGUAGE_STRING(
             "ATTRACT MAT",
             "TAP. ATTRACTION",
-            "TAPP.ATTRAZIONE"),
+            "TAPP.ATTRAZIONE",
+            "TAP. ATRACCIÓN"),
         .permission = DECORPERM_PASS_FLOOR,
         .shape = DECORSHAPE_3x3,
         .category = DECORCAT_MAT,
@@ -966,7 +1030,8 @@ const struct Decoration gDecorations[] =
         .name = LANGUAGE_STRING(
             "FISSURE MAT",
             "TAPIS ABIME",
-            "TAPP. ABISSO"),
+            "TAPP. ABISSO",
+            "TAPETE FISURA"),
         .permission = DECORPERM_PASS_FLOOR,
         .shape = DECORSHAPE_3x3,
         .category = DECORCAT_MAT,
@@ -981,7 +1046,8 @@ const struct Decoration gDecorations[] =
         .name = LANGUAGE_STRING(
             "SPIKES MAT",
             "TAPIS PICOTS",
-            "TAPP. PUNTE"),
+            "TAPP. PUNTE",
+            "TAPETE PÚAS"),
         .permission = DECORPERM_PASS_FLOOR,
         .shape = DECORSHAPE_3x3,
         .category = DECORCAT_MAT,
@@ -996,7 +1062,8 @@ const struct Decoration gDecorations[] =
         .name = LANGUAGE_STRING(
             "BALL POSTER",
             "POSTER BALL",
-            "POSTER BALL"),
+            "POSTER BALL",
+            "P. POKé BALL"),
         .permission = DECORPERM_NA_WALL,
         .shape = DECORSHAPE_1x1,
         .category = DECORCAT_POSTER,
@@ -1011,7 +1078,8 @@ const struct Decoration gDecorations[] =
         .name = LANGUAGE_STRING(
             "GREEN POSTER",
             "POSTER VERT",
-            "POSTER VERDE"),
+            "POSTER VERDE",
+            "PÓSTER VERDE"),
         .permission = DECORPERM_NA_WALL,
         .shape = DECORSHAPE_1x1,
         .category = DECORCAT_POSTER,
@@ -1026,7 +1094,8 @@ const struct Decoration gDecorations[] =
         .name = LANGUAGE_STRING(
             "RED POSTER",
             "POSTER ROUGE",
-            "POSTER ROSSO"),
+            "POSTER ROSSO",
+            "PÓSTER ROJO"),
         .permission = DECORPERM_NA_WALL,
         .shape = DECORSHAPE_1x1,
         .category = DECORCAT_POSTER,
@@ -1041,7 +1110,8 @@ const struct Decoration gDecorations[] =
         .name = LANGUAGE_STRING(
             "BLUE POSTER",
             "POSTER BLEU",
-            "POSTER BLU"),
+            "POSTER BLU",
+            "PÓSTER AZUL"),
         .permission = DECORPERM_NA_WALL,
         .shape = DECORSHAPE_1x1,
         .category = DECORCAT_POSTER,
@@ -1056,7 +1126,8 @@ const struct Decoration gDecorations[] =
         .name = LANGUAGE_STRING(
             "CUTE POSTER",
             "JOLI POSTER",
-            "POSTER CARINO"),
+            "POSTER CARINO",
+            "PÓSTER BONITO"),
         .permission = DECORPERM_NA_WALL,
         .shape = DECORSHAPE_1x1,
         .category = DECORCAT_POSTER,
@@ -1071,7 +1142,8 @@ const struct Decoration gDecorations[] =
         .name = LANGUAGE_STRING(
             "PIKA POSTER",
             "POSTER PIKA",
-            "POSTER PIKA"),
+            "POSTER PIKA",
+            "PÓSTER PIKA"),
         .permission = DECORPERM_NA_WALL,
         .shape = DECORSHAPE_2x1,
         .category = DECORCAT_POSTER,
@@ -1086,7 +1158,8 @@ const struct Decoration gDecorations[] =
         .name = LANGUAGE_STRING(
             "LONG POSTER",
             "GRAND POSTER",
-            "POSTER LUNGO"),
+            "POSTER LUNGO",
+            "PÓSTER GRANDE"),
         .permission = DECORPERM_NA_WALL,
         .shape = DECORSHAPE_2x1,
         .category = DECORCAT_POSTER,
@@ -1101,7 +1174,8 @@ const struct Decoration gDecorations[] =
         .name = LANGUAGE_STRING(
             "SEA POSTER",
             "POSTER OCEAN",
-            "POSTER MARE"),
+            "POSTER MARE",
+            "PÓSTER MAR"),
         .permission = DECORPERM_NA_WALL,
         .shape = DECORSHAPE_2x1,
         .category = DECORCAT_POSTER,
@@ -1116,7 +1190,8 @@ const struct Decoration gDecorations[] =
         .name = LANGUAGE_STRING(
             "SKY POSTER",
             "POSTER CIEL",
-            "POSTER CIELO"),
+            "POSTER CIELO",
+            "PÓSTER CIELO"),
         .permission = DECORPERM_NA_WALL,
         .shape = DECORSHAPE_2x1,
         .category = DECORCAT_POSTER,
@@ -1131,7 +1206,8 @@ const struct Decoration gDecorations[] =
         .name = LANGUAGE_STRING(
             "KISS POSTER",
             "POSTER BAISER",
-            "POSTER SMACK"),
+            "POSTER SMACK",
+            "PÓSTER BESO"),
         .permission = DECORPERM_NA_WALL,
         .shape = DECORSHAPE_2x1,
         .category = DECORCAT_POSTER,
@@ -1146,7 +1222,8 @@ const struct Decoration gDecorations[] =
         .name = LANGUAGE_STRING(
             "PICHU DOLL",
             "POUPEE PICHU",
-            "BAMBOLA PICHU"),
+            "BAMBOLA PICHU",
+            "MUÑECO PICHU"),
         .permission = DECORPERM_SPRITE,
         .shape = DECORSHAPE_1x1,
         .category = DECORCAT_DOLL,
@@ -1161,7 +1238,8 @@ const struct Decoration gDecorations[] =
         .name = LANGUAGE_STRING(
             "PIKACHU DOLL",
             "POUPEE PIKACHU",
-            "BAMBOLA PIKACHU"),
+            "BAMBOLA PIKACHU",
+            "MUÑECO PIKACHU"),
         .permission = DECORPERM_SPRITE,
         .shape = DECORSHAPE_1x1,
         .category = DECORCAT_DOLL,
@@ -1176,7 +1254,8 @@ const struct Decoration gDecorations[] =
         .name = LANGUAGE_STRING(
             "MARILL DOLL",
             "POUPEE MARILL",
-            "BAMBOLA MARILL"),
+            "BAMBOLA MARILL",
+            "MUÑECO MARILL"),
         .permission = DECORPERM_SPRITE,
         .shape = DECORSHAPE_1x1,
         .category = DECORCAT_DOLL,
@@ -1191,7 +1270,8 @@ const struct Decoration gDecorations[] =
         .name = LANGUAGE_STRING(
             "TOGEPI DOLL",
             "POUPEE TOGEPI",
-            "BAMBOLA TOGEPI"),
+            "BAMBOLA TOGEPI",
+            "MUÑECO TOGEPI"),
         .permission = DECORPERM_SPRITE,
         .shape = DECORSHAPE_1x1,
         .category = DECORCAT_DOLL,
@@ -1206,7 +1286,8 @@ const struct Decoration gDecorations[] =
         .name = LANGUAGE_STRING(
             "CYNDAQUIL DOLL",
             "POUP.HERICENDRE",
-            "BAMB. CYNDAQUIL"),
+            "BAMB. CYNDAQUIL",
+            "MUÑ. CYNDAQUIL"),
         .permission = DECORPERM_SPRITE,
         .shape = DECORSHAPE_1x1,
         .category = DECORCAT_DOLL,
@@ -1221,7 +1302,8 @@ const struct Decoration gDecorations[] =
         .name = LANGUAGE_STRING(
             "CHIKORITA DOLL",
             "POUP. GERMIGNON",
-            "BAMB. CHIKORITA"),
+            "BAMB. CHIKORITA",
+            "MUÑ. CHIKORITA"),
         .permission = DECORPERM_SPRITE,
         .shape = DECORSHAPE_1x1,
         .category = DECORCAT_DOLL,
@@ -1236,7 +1318,8 @@ const struct Decoration gDecorations[] =
         .name = LANGUAGE_STRING(
             "TOTODILE DOLL",
             "POUPEE KAIMINUS",
-            "BAMB. TOTODILE"),
+            "BAMB. TOTODILE",
+            "MUÑ. TOTODILE"),
         .permission = DECORPERM_SPRITE,
         .shape = DECORSHAPE_1x1,
         .category = DECORCAT_DOLL,
@@ -1251,7 +1334,8 @@ const struct Decoration gDecorations[] =
         .name = LANGUAGE_STRING(
             "JIGGLYPUFF DOLL",
             "POUP. RONDOUDOU",
-            "BAMB.JIGGLYPUFF"),
+            "BAMB.JIGGLYPUFF",
+            "MUÑ. JIGGLYPUFF"),
         .permission = DECORPERM_SPRITE,
         .shape = DECORSHAPE_1x1,
         .category = DECORCAT_DOLL,
@@ -1266,7 +1350,8 @@ const struct Decoration gDecorations[] =
         .name = LANGUAGE_STRING(
             "MEOWTH DOLL",
             "POUPEE MIAOUSS",
-            "BAMB. MEOWTH"),
+            "BAMB. MEOWTH",
+            "MUÑECO MEOWTH"),
         .permission = DECORPERM_SPRITE,
         .shape = DECORSHAPE_1x1,
         .category = DECORCAT_DOLL,
@@ -1281,7 +1366,8 @@ const struct Decoration gDecorations[] =
         .name = LANGUAGE_STRING(
             "CLEFAIRY DOLL",
             "POUPEE MELOFEE",
-            "BAMB. CLEFAIRY"),
+            "BAMB. CLEFAIRY",
+            "MUÑECO CLEFAIRY"),
         .permission = DECORPERM_SPRITE,
         .shape = DECORSHAPE_1x1,
         .category = DECORCAT_DOLL,
@@ -1296,7 +1382,8 @@ const struct Decoration gDecorations[] =
         .name = LANGUAGE_STRING(
             "DITTO DOLL",
             "POUP. METAMORPH",
-            "BAMBOLA DITTO"),
+            "BAMBOLA DITTO",
+            "MUÑECO DITTO"),
         .permission = DECORPERM_SPRITE,
         .shape = DECORSHAPE_1x1,
         .category = DECORCAT_DOLL,
@@ -1311,7 +1398,8 @@ const struct Decoration gDecorations[] =
         .name = LANGUAGE_STRING(
             "SMOOCHUM DOLL",
             "POUPEE LIPPOUTI",
-            "BAMB. SMOOCHUM"),
+            "BAMB. SMOOCHUM",
+            "MUÑECO SMOOCHUM"),
         .permission = DECORPERM_SPRITE,
         .shape = DECORSHAPE_1x1,
         .category = DECORCAT_DOLL,
@@ -1326,7 +1414,8 @@ const struct Decoration gDecorations[] =
         .name = LANGUAGE_STRING(
             "TREECKO DOLL",
             "POUPEE ARCKO",
-            "BAMBOLA TREECKO"),
+            "BAMBOLA TREECKO",
+            "MUÑECO TREECKO"),
         .permission = DECORPERM_SPRITE,
         .shape = DECORSHAPE_1x1,
         .category = DECORCAT_DOLL,
@@ -1341,7 +1430,8 @@ const struct Decoration gDecorations[] =
         .name = LANGUAGE_STRING(
             "TORCHIC DOLL",
             "POUP.POUSSIFEU",
-            "BAMBOLA TORCHIC"),
+            "BAMBOLA TORCHIC",
+            "MUÑECO TORCHIC"),
         .permission = DECORPERM_SPRITE,
         .shape = DECORSHAPE_1x1,
         .category = DECORCAT_DOLL,
@@ -1356,7 +1446,8 @@ const struct Decoration gDecorations[] =
         .name = LANGUAGE_STRING(
             "MUDKIP DOLL",
             "POUPEE GOBOU",
-            "BAMBOLA MUDKIP"),
+            "BAMBOLA MUDKIP",
+            "MUÑECO MUDKIP"),
         .permission = DECORPERM_SPRITE,
         .shape = DECORSHAPE_1x1,
         .category = DECORCAT_DOLL,
@@ -1371,7 +1462,8 @@ const struct Decoration gDecorations[] =
         .name = LANGUAGE_STRING(
             "DUSKULL DOLL",
             "POUPEE SKELENOX",
-            "BAMBOLA DUSKULL"),
+            "BAMBOLA DUSKULL",
+            "MUÑECO DUSKULL"),
         .permission = DECORPERM_SPRITE,
         .shape = DECORSHAPE_1x1,
         .category = DECORCAT_DOLL,
@@ -1386,7 +1478,8 @@ const struct Decoration gDecorations[] =
         .name = LANGUAGE_STRING(
             "WYNAUT DOLL",
             "POUPEE OKEOKE",
-            "BAMBOLA WYNAUT"),
+            "BAMBOLA WYNAUT",
+            "MUÑECO WYNAUT"),
         .permission = DECORPERM_SPRITE,
         .shape = DECORSHAPE_1x1,
         .category = DECORCAT_DOLL,
@@ -1401,7 +1494,8 @@ const struct Decoration gDecorations[] =
         .name = LANGUAGE_STRING(
             "BALTOY DOLL",
             "POUPEE BALBUTO",
-            "BAMBOLA BALTOY"),
+            "BAMBOLA BALTOY",
+            "MUÑECO BALTOY"),
         .permission = DECORPERM_SPRITE,
         .shape = DECORSHAPE_1x1,
         .category = DECORCAT_DOLL,
@@ -1416,7 +1510,8 @@ const struct Decoration gDecorations[] =
         .name = LANGUAGE_STRING(
             "KECLEON DOLL",
             "POUPEE KECLEON",
-            "BAMBOLA KECLEON"),
+            "BAMBOLA KECLEON",
+            "MUÑECO KECLEON"),
         .permission = DECORPERM_SPRITE,
         .shape = DECORSHAPE_1x1,
         .category = DECORCAT_DOLL,
@@ -1431,7 +1526,8 @@ const struct Decoration gDecorations[] =
         .name = LANGUAGE_STRING(
             "AZURILL DOLL",
             "POUPEE AZURILL",
-            "BAMBOLA AZURILL"),
+            "BAMBOLA AZURILL",
+            "MUÑECO AZURILL"),
         .permission = DECORPERM_SPRITE,
         .shape = DECORSHAPE_1x1,
         .category = DECORCAT_DOLL,
@@ -1446,7 +1542,8 @@ const struct Decoration gDecorations[] =
         .name = LANGUAGE_STRING(
             "SKITTY DOLL",
             "POUPEE SKITTY",
-            "BAMBOLA SKITTY"),
+            "BAMBOLA SKITTY",
+            "MUÑECO SKITTY"),
         .permission = DECORPERM_SPRITE,
         .shape = DECORSHAPE_1x1,
         .category = DECORCAT_DOLL,
@@ -1461,7 +1558,8 @@ const struct Decoration gDecorations[] =
         .name = LANGUAGE_STRING(
             "SWABLU DOLL",
             "POUPEE TYLTON",
-            "BAMBOLA SWABLU"),
+            "BAMBOLA SWABLU",
+            "MUÑECO SWABLU"),
         .permission = DECORPERM_SPRITE,
         .shape = DECORSHAPE_1x1,
         .category = DECORCAT_DOLL,
@@ -1476,7 +1574,8 @@ const struct Decoration gDecorations[] =
         .name = LANGUAGE_STRING(
             "GULPIN DOLL",
             "POUPEE GLOUPTI",
-            "BAMBOLA GULPIN"),
+            "BAMBOLA GULPIN",
+            "MUÑECO GULPIN"),
         .permission = DECORPERM_SPRITE,
         .shape = DECORSHAPE_1x1,
         .category = DECORCAT_DOLL,
@@ -1491,7 +1590,8 @@ const struct Decoration gDecorations[] =
         .name = LANGUAGE_STRING(
             "LOTAD DOLL",
             "POUPEE NENUPIOT",
-            "BAMBOLA LOTAD"),
+            "BAMBOLA LOTAD",
+            "MUÑECO LOTAD"),
         .permission = DECORPERM_SPRITE,
         .shape = DECORSHAPE_1x1,
         .category = DECORCAT_DOLL,
@@ -1506,7 +1606,8 @@ const struct Decoration gDecorations[] =
         .name = LANGUAGE_STRING(
             "SEEDOT DOLL",
             "POUP.GRAINIPIOT",
-            "BAMBOLA SEEDOT"),
+            "BAMBOLA SEEDOT",
+            "MUÑECO SEEDOT"),
         .permission = DECORPERM_SPRITE,
         .shape = DECORSHAPE_1x1,
         .category = DECORCAT_DOLL,
@@ -1521,7 +1622,8 @@ const struct Decoration gDecorations[] =
         .name = LANGUAGE_STRING(
             "PIKA CUSHION",
             "COUSSIN PIKACHU",
-            "CUSCINO PIKA"),
+            "CUSCINO PIKA",
+            "COJÍN PIKA"),
         .permission = DECORPERM_SPRITE,
         .shape = DECORSHAPE_1x1,
         .category = DECORCAT_CUSHION,
@@ -1536,7 +1638,8 @@ const struct Decoration gDecorations[] =
         .name = LANGUAGE_STRING(
             "ROUND CUSHION",
             "COUSSIN ROND",
-            "CUSCINO ROTONDO"),
+            "CUSCINO ROTONDO",
+            "COJÍN REDONDO"),
         .permission = DECORPERM_SPRITE,
         .shape = DECORSHAPE_1x1,
         .category = DECORCAT_CUSHION,
@@ -1551,7 +1654,8 @@ const struct Decoration gDecorations[] =
         .name = LANGUAGE_STRING(
             "KISS CUSHION",
             "COUSSIN BAISER",
-            "CUSCINO SMACK"),
+            "CUSCINO SMACK",
+            "COJÍN BESO"),
         .permission = DECORPERM_SPRITE,
         .shape = DECORSHAPE_1x1,
         .category = DECORCAT_CUSHION,
@@ -1566,7 +1670,8 @@ const struct Decoration gDecorations[] =
         .name = LANGUAGE_STRING(
             "ZIGZAG CUSHION",
             "COUSSIN ZIGZAG",
-            "CUSCINO ZIGZAG"),
+            "CUSCINO ZIGZAG",
+            "COJÍN ZIGZAGOON"),
         .permission = DECORPERM_SPRITE,
         .shape = DECORSHAPE_1x1,
         .category = DECORCAT_CUSHION,
@@ -1581,7 +1686,8 @@ const struct Decoration gDecorations[] =
         .name = LANGUAGE_STRING(
             "SPIN CUSHION",
             "COUSSIN SPIRALE",
-            "CUSCINO GIRO"),
+            "CUSCINO GIRO",
+            "COJÍN SPINDA"),
         .permission = DECORPERM_SPRITE,
         .shape = DECORSHAPE_1x1,
         .category = DECORCAT_CUSHION,
@@ -1596,7 +1702,8 @@ const struct Decoration gDecorations[] =
         .name = LANGUAGE_STRING(
             "DIAMOND CUSHION",
             "COUSSIN DIAMANT",
-            "CUSC. DIAMANTE"),
+            "CUSC. DIAMANTE",
+            "COJÍN DIAMANTE"),
         .permission = DECORPERM_SPRITE,
         .shape = DECORSHAPE_1x1,
         .category = DECORCAT_CUSHION,
@@ -1611,7 +1718,8 @@ const struct Decoration gDecorations[] =
         .name = LANGUAGE_STRING(
             "BALL CUSHION",
             "COUSSIN BALL",
-            "CUSCINO BALL"),
+            "CUSCINO BALL",
+            "COJÍN BALL"),
         .permission = DECORPERM_SPRITE,
         .shape = DECORSHAPE_1x1,
         .category = DECORCAT_CUSHION,
@@ -1626,7 +1734,8 @@ const struct Decoration gDecorations[] =
         .name = LANGUAGE_STRING(
             "GRASS CUSHION",
             "COUSSIN PLANTE",
-            "CUSCINO ERBA"),
+            "CUSCINO ERBA",
+            "COJÍN PLANTA"),
         .permission = DECORPERM_SPRITE,
         .shape = DECORSHAPE_1x1,
         .category = DECORCAT_CUSHION,
@@ -1641,7 +1750,8 @@ const struct Decoration gDecorations[] =
         .name = LANGUAGE_STRING(
             "FIRE CUSHION",
             "COUSSIN FEU",
-            "CUSCINO FUOCO"),
+            "CUSCINO FUOCO",
+            "COJÍN FUEGO"),
         .permission = DECORPERM_SPRITE,
         .shape = DECORSHAPE_1x1,
         .category = DECORCAT_CUSHION,
@@ -1656,7 +1766,8 @@ const struct Decoration gDecorations[] =
         .name = LANGUAGE_STRING(
             "WATER CUSHION",
             "COUSSIN EAU",
-            "CUSCINO ACQUA"),
+            "CUSCINO ACQUA",
+            "COJÍN AGUA"),
         .permission = DECORPERM_SPRITE,
         .shape = DECORSHAPE_1x1,
         .category = DECORCAT_CUSHION,
@@ -1671,7 +1782,8 @@ const struct Decoration gDecorations[] =
         .name = LANGUAGE_STRING(
             "SNORLAX DOLL",
             "POUPEE RONFLEX",
-            "BAMBOLA SNORLAX"),
+            "BAMBOLA SNORLAX",
+            "MUÑECO SNORLAX"),
         .permission = DECORPERM_SPRITE,
         .shape = DECORSHAPE_1x2,
         .category = DECORCAT_DOLL,
@@ -1686,7 +1798,8 @@ const struct Decoration gDecorations[] =
         .name = LANGUAGE_STRING(
             "RHYDON DOLL",
             "POUP.RHINOFEROS",
-            "BAMBOLA RHYDON"),
+            "BAMBOLA RHYDON",
+            "MUÑECO RHYDON"),
         .permission = DECORPERM_SPRITE,
         .shape = DECORSHAPE_1x2,
         .category = DECORCAT_DOLL,
@@ -1701,7 +1814,8 @@ const struct Decoration gDecorations[] =
         .name = LANGUAGE_STRING(
             "LAPRAS DOLL",
             "POUPEE LOKHLASS",
-            "BAMBOLA LAPRAS"),
+            "BAMBOLA LAPRAS",
+            "MUÑECO LAPRAS"),
         .permission = DECORPERM_SPRITE,
         .shape = DECORSHAPE_1x2,
         .category = DECORCAT_DOLL,
@@ -1716,7 +1830,8 @@ const struct Decoration gDecorations[] =
         .name = LANGUAGE_STRING(
             "VENUSAUR DOLL",
             "POUP.FLORIZARRE",
-            "BAMB. VENUSAUR"),
+            "BAMB. VENUSAUR",
+            "MUÑECO VENUSAUR"),
         .permission = DECORPERM_SPRITE,
         .shape = DECORSHAPE_1x2,
         .category = DECORCAT_DOLL,
@@ -1731,7 +1846,8 @@ const struct Decoration gDecorations[] =
         .name = LANGUAGE_STRING(
             "CHARIZARD DOLL",
             "POUP. DRACAUFEU",
-            "BAMB. CHARIZARD"),
+            "BAMB. CHARIZARD",
+            "MUÑECO CHARIZAR"),
         .permission = DECORPERM_SPRITE,
         .shape = DECORSHAPE_1x2,
         .category = DECORCAT_DOLL,
@@ -1746,7 +1862,8 @@ const struct Decoration gDecorations[] =
         .name = LANGUAGE_STRING(
             "BLASTOISE DOLL",
             "POUPEE TORTANK",
-            "BAMB. BLASTOISE"),
+            "BAMB. BLASTOISE",
+            "MUÑ. BLASTOISE"),
         .permission = DECORPERM_SPRITE,
         .shape = DECORSHAPE_1x2,
         .category = DECORCAT_DOLL,
@@ -1761,7 +1878,8 @@ const struct Decoration gDecorations[] =
         .name = LANGUAGE_STRING(
             "WAILMER DOLL",
             "POUPEE WAILMER",
-            "BAMB. WAILMER"),
+            "BAMB. WAILMER",
+            "MUÑECO WAILMER"),
         .permission = DECORPERM_SPRITE,
         .shape = DECORSHAPE_1x2,
         .category = DECORCAT_DOLL,
@@ -1776,7 +1894,8 @@ const struct Decoration gDecorations[] =
         .name = LANGUAGE_STRING(
             "REGIROCK DOLL",
             "POUPEE REGIROCK",
-            "BAMB. REGIROCK"),
+            "BAMB. REGIROCK",
+            "MUÑECO REGIROCK"),
         .permission = DECORPERM_SPRITE,
         .shape = DECORSHAPE_1x2,
         .category = DECORCAT_DOLL,
@@ -1791,7 +1910,8 @@ const struct Decoration gDecorations[] =
         .name = LANGUAGE_STRING(
             "REGICE DOLL",
             "POUPEE REGICE",
-            "BAMBOLA REGICE"),
+            "BAMBOLA REGICE",
+            "MUÑECO REGICE"),
         .permission = DECORPERM_SPRITE,
         .shape = DECORSHAPE_1x2,
         .category = DECORCAT_DOLL,
@@ -1806,7 +1926,8 @@ const struct Decoration gDecorations[] =
         .name = LANGUAGE_STRING(
             "REGISTEEL DOLL",
             "POUP. REGISTEEL",
-            "BAMB. REGISTEEL"),
+            "BAMB. REGISTEEL",
+            "MUÑ. REGISTEEL"),
         .permission = DECORPERM_SPRITE,
         .shape = DECORSHAPE_1x2,
         .category = DECORCAT_DOLL,
@@ -1815,3 +1936,4 @@ const struct Decoration gDecorations[] =
         .tiles = DecorGfx_REGISTEEL_DOLL,
     }
 };
+
diff --git a/src/data/graphics/slot_machine.h b/src/data/graphics/slot_machine.h
index 30db4fa0b2..b03f24baf4 100644
--- a/src/data/graphics/slot_machine.h
+++ b/src/data/graphics/slot_machine.h
@@ -1,5 +1,5 @@
 const u16 gSlotMachineMenu_Pal[] = INCBIN_U16("graphics/slot_machine/menu.gbapal");
-#if FRENCH
+#if FRENCH || SPANISH
 const u32 gSlotMachineMenu_Gfx[] = INCBIN_U32("graphics/slot_machine/french/menu.4bpp.lz");
 const u16 gSlotMachineMenu_Tilemap[] = INCBIN_U16("graphics/slot_machine/menu.bin");
 
diff --git a/src/data/items.h b/src/data/items.h
index 58e28c0d8d..a9db5aa9b2 100644
--- a/src/data/items.h
+++ b/src/data/items.h
@@ -2,7 +2,11 @@ const struct Item gItems[] =
 {
     [ITEM_NONE] =
     {
-        .name = _("????????"),
+        .name = LANGUAGE_STRING(
+            "????????",
+            "????????",
+            "????????",
+            "????????"),
         .itemId = ITEM_NONE,
         .price = 0,
         .description = sDummyDesc,
@@ -16,6 +20,7 @@ const struct Item gItems[] =
     [ITEM_MASTER_BALL] =
     {
         .name = LANGUAGE_STRING(
+            "MASTER BALL",
             "MASTER BALL",
             "MASTER BALL",
             "MASTER BALL"),
@@ -34,7 +39,8 @@ const struct Item gItems[] =
         .name = LANGUAGE_STRING(
             "ULTRA BALL",
             "HYPER BALL",
-            "ULTRA BALL"),
+            "ULTRA BALL",
+            "ULTRABALL"),
         .itemId = ITEM_ULTRA_BALL,
         .price = 1200,
         .description = sUltraBallDesc,
@@ -50,7 +56,8 @@ const struct Item gItems[] =
         .name = LANGUAGE_STRING(
             "GREAT BALL",
             "SUPER BALL",
-            "MEGA BALL"),
+            "MEGA BALL",
+            "SUPERBALL"),
         .itemId = ITEM_GREAT_BALL,
         .price = 600,
         .description = sGreatBallDesc,
@@ -64,6 +71,7 @@ const struct Item gItems[] =
     [ITEM_POKE_BALL] =
     {
         .name = LANGUAGE_STRING(
+            "POKé BALL",
             "POKé BALL",
             "POKé BALL",
             "POKé BALL"),
@@ -80,6 +88,7 @@ const struct Item gItems[] =
     [ITEM_SAFARI_BALL] =
     {
         .name = LANGUAGE_STRING(
+            "SAFARI BALL",
             "SAFARI BALL",
             "SAFARI BALL",
             "SAFARI BALL"),
@@ -98,7 +107,8 @@ const struct Item gItems[] =
         .name = LANGUAGE_STRING(
             "NET BALL",
             "FILET BALL",
-            "RETE BALL"),
+            "RETE BALL",
+            "MALLA BALL"),
         .itemId = ITEM_NET_BALL,
         .price = 1000,
         .description = sNetBallDesc,
@@ -114,7 +124,8 @@ const struct Item gItems[] =
         .name = LANGUAGE_STRING(
             "DIVE BALL",
             "SCUBA BALL",
-            "SUB BALL"),
+            "SUB BALL",
+            "BUCEO BALL"),
         .itemId = ITEM_DIVE_BALL,
         .price = 1000,
         .description = sDiveBallDesc,
@@ -130,7 +141,8 @@ const struct Item gItems[] =
         .name = LANGUAGE_STRING(
             "NEST BALL",
             "FAIBLO BALL",
-            "MINOR BALL"),
+            "MINOR BALL",
+            "NIDO BALL"),
         .itemId = ITEM_NEST_BALL,
         .price = 1000,
         .description = sNestBallDesc,
@@ -146,7 +158,8 @@ const struct Item gItems[] =
         .name = LANGUAGE_STRING(
             "REPEAT BALL",
             "BIS BALL",
-            "BIS BALL"),
+            "BIS BALL",
+            "ACOPIO BALL"),
         .itemId = ITEM_REPEAT_BALL,
         .price = 1000,
         .description = sRepeatBallDesc,
@@ -162,7 +175,8 @@ const struct Item gItems[] =
         .name = LANGUAGE_STRING(
             "TIMER BALL",
             "CHRONO BALL",
-            "TIMER BALL"),
+            "TIMER BALL",
+            "TURNO BALL"),
         .itemId = ITEM_TIMER_BALL,
         .price = 1000,
         .description = sTimerBallDesc,
@@ -178,7 +192,8 @@ const struct Item gItems[] =
         .name = LANGUAGE_STRING(
             "LUXURY BALL",
             "LUXE BALL",
-            "CHIC BALL"),
+            "CHIC BALL",
+            "LUJO BALL"),
         .itemId = ITEM_LUXURY_BALL,
         .price = 1000,
         .description = sLuxuryBallDesc,
@@ -194,7 +209,8 @@ const struct Item gItems[] =
         .name = LANGUAGE_STRING(
             "PREMIER BALL",
             "HONOR BALL",
-            "PREMIER BALL"),
+            "PREMIER BALL",
+            "HONOR BALL"),
         .itemId = ITEM_PREMIER_BALL,
         .price = 200,
         .description = sPremierBallDesc,
@@ -212,7 +228,8 @@ const struct Item gItems[] =
         .name = LANGUAGE_STRING(
             "POTION",
             "POTION",
-            "POZIONE"),
+            "POZIONE",
+            "POCIÓN"),
         .itemId = ITEM_POTION,
         .price = 300,
         .holdEffectParam = 20,
@@ -229,7 +246,8 @@ const struct Item gItems[] =
         .name = LANGUAGE_STRING(
             "ANTIDOTE",
             "ANTIDOTE",
-            "ANTIDOTO"),
+            "ANTIDOTO",
+            "ANTÍDOTO"),
         .itemId = ITEM_ANTIDOTE,
         .price = 100,
         .description = sAntidoteDesc,
@@ -245,7 +263,8 @@ const struct Item gItems[] =
         .name = LANGUAGE_STRING(
             "BURN HEAL",
             "ANTI-BRULE",
-            "ANTISCOTTAT."),
+            "ANTISCOTTAT.",
+            "ANTIQUEMAR"),
         .itemId = ITEM_BURN_HEAL,
         .price = 250,
         .description = sBurnHealDesc,
@@ -261,7 +280,8 @@ const struct Item gItems[] =
         .name = LANGUAGE_STRING(
             "ICE HEAL",
             "ANTIGEL",
-            "ANTIGELO"),
+            "ANTIGELO",
+            "ANTIHIELO"),
         .itemId = ITEM_ICE_HEAL,
         .price = 250,
         .description = sIceHealDesc,
@@ -277,7 +297,8 @@ const struct Item gItems[] =
         .name = LANGUAGE_STRING(
             "AWAKENING",
             "REVEIL",
-            "SVEGLIA"),
+            "SVEGLIA",
+            "DESPERTAR"),
         .itemId = ITEM_AWAKENING,
         .price = 250,
         .description = sAwakeningDesc,
@@ -293,7 +314,8 @@ const struct Item gItems[] =
         .name = LANGUAGE_STRING(
             "PARLYZ HEAL",
             "ANTI-PARA",
-            "ANTIPARALISI"),
+            "ANTIPARALISI",
+            "ANTIPARALIZ"),
         .itemId = ITEM_PARALYZE_HEAL,
         .price = 200,
         .description = sParalyzeHealDesc,
@@ -309,7 +331,8 @@ const struct Item gItems[] =
         .name = LANGUAGE_STRING(
             "FULL RESTORE",
             "GUERISON",
-            "RICARICA TOT"),
+            "RICARICA TOT",
+            "RESTAU. TODO"),
         .itemId = ITEM_FULL_RESTORE,
         .price = 3000,
         .holdEffectParam = 255,
@@ -326,7 +349,8 @@ const struct Item gItems[] =
         .name = LANGUAGE_STRING(
             "MAX POTION",
             "POTION MAX",
-            "POZIONE MAX"),
+            "POZIONE MAX",
+            "MÁX. POCIÓN"),
         .itemId = ITEM_MAX_POTION,
         .price = 2500,
         .holdEffectParam = 255,
@@ -343,7 +367,8 @@ const struct Item gItems[] =
         .name = LANGUAGE_STRING(
             "HYPER POTION",
             "HYPER POTION",
-            "IPERPOZIONE"),
+            "IPERPOZIONE",
+            "HIPERPOCIÓN"),
         .itemId = ITEM_HYPER_POTION,
         .price = 1200,
         .holdEffectParam = 200,
@@ -360,7 +385,8 @@ const struct Item gItems[] =
         .name = LANGUAGE_STRING(
             "SUPER POTION",
             "SUPER POTION",
-            "SUPERPOZIONE"),
+            "SUPERPOZIONE",
+            "SUPERPOCIÓN"),
         .itemId = ITEM_SUPER_POTION,
         .price = 700,
         .holdEffectParam = 50,
@@ -377,7 +403,8 @@ const struct Item gItems[] =
         .name = LANGUAGE_STRING(
             "FULL HEAL",
             "TOTAL SOIN",
-            "CURA TOTALE"),
+            "CURA TOTALE",
+            "CURA TOTAL"),
         .itemId = ITEM_FULL_HEAL,
         .price = 600,
         .description = sFullHealDesc,
@@ -393,7 +420,8 @@ const struct Item gItems[] =
         .name = LANGUAGE_STRING(
             "REVIVE",
             "RAPPEL",
-            "REVITALIZ."),
+            "REVITALIZ.",
+            "REVIVIR"),
         .itemId = ITEM_REVIVE,
         .price = 1500,
         .description = sReviveDesc,
@@ -409,7 +437,8 @@ const struct Item gItems[] =
         .name = LANGUAGE_STRING(
             "MAX REVIVE",
             "RAPPEL MAX",
-            "REVITAL. MAX"),
+            "REVITAL. MAX",
+            "MÁX. REVIVIR"),
         .itemId = ITEM_MAX_REVIVE,
         .price = 4000,
         .description = sMaxReviveDesc,
@@ -425,7 +454,8 @@ const struct Item gItems[] =
         .name = LANGUAGE_STRING(
             "FRESH WATER",
             "EAU FRAICHE",
-            "ACQUA FRESCA"),
+            "ACQUA FRESCA",
+            "AGUA FRESCA"),
         .itemId = ITEM_FRESH_WATER,
         .price = 200,
         .holdEffectParam = 50,
@@ -442,7 +472,8 @@ const struct Item gItems[] =
         .name = LANGUAGE_STRING(
             "SODA POP",
             "SODA COOL",
-            "GASSOSA"),
+            "GASSOSA",
+            "REFRESCO"),
         .itemId = ITEM_SODA_POP,
         .price = 300,
         .holdEffectParam = 60,
@@ -459,7 +490,8 @@ const struct Item gItems[] =
         .name = LANGUAGE_STRING(
             "LEMONADE",
             "LIMONADE",
-            "LEMONSUCCO"),
+            "LEMONSUCCO",
+            "LIMONADA"),
         .itemId = ITEM_LEMONADE,
         .price = 350,
         .holdEffectParam = 80,
@@ -476,7 +508,8 @@ const struct Item gItems[] =
         .name = LANGUAGE_STRING(
             "MOOMOO MILK",
             "LAIT MEUMEU",
-            "LATTE MUMU"),
+            "LATTE MUMU",
+            "LECHE MU-MU"),
         .itemId = ITEM_MOOMOO_MILK,
         .price = 500,
         .holdEffectParam = 100,
@@ -493,7 +526,8 @@ const struct Item gItems[] =
         .name = LANGUAGE_STRING(
             "ENERGYPOWDER",
             "POUDRENERGIE",
-            "POLVENERGIA"),
+            "POLVENERGIA",
+            "POLVOENERGÍA"),
         .itemId = ITEM_ENERGY_POWDER,
         .price = 500,
         .description = sEnergyPowderDesc,
@@ -509,7 +543,8 @@ const struct Item gItems[] =
         .name = LANGUAGE_STRING(
             "ENERGY ROOT",
             "RACINENERGIE",
-            "RADICENERGIA"),
+            "RADICENERGIA",
+            "RAÍZ ENERGÍA"),
         .itemId = ITEM_ENERGY_ROOT,
         .price = 800,
         .description = sEnergyRootDesc,
@@ -525,7 +560,8 @@ const struct Item gItems[] =
         .name = LANGUAGE_STRING(
             "HEAL POWDER",
             "POUDRE SOIN",
-            "POLVOCURA"),
+            "POLVOCURA",
+            "POL.CURACIÓN"),
         .itemId = ITEM_HEAL_POWDER,
         .price = 450,
         .description = sHealPowderDesc,
@@ -541,7 +577,8 @@ const struct Item gItems[] =
         .name = LANGUAGE_STRING(
             "REVIVAL HERB",
             "HERBE RAPPEL",
-            "VITALERBA"),
+            "VITALERBA",
+            "HIERBA REV."),
         .itemId = ITEM_REVIVAL_HERB,
         .price = 2800,
         .description = sRevivalHerbDesc,
@@ -557,7 +594,8 @@ const struct Item gItems[] =
         .name = LANGUAGE_STRING(
             "ETHER",
             "HUILE",
-            "ETERE"),
+            "ETERE",
+            "ÉTER"),
         .itemId = ITEM_ETHER,
         .price = 1200,
         .holdEffectParam = 10,
@@ -574,7 +612,8 @@ const struct Item gItems[] =
         .name = LANGUAGE_STRING(
             "MAX ETHER",
             "HUILE MAX",
-            "ETERE MAX"),
+            "ETERE MAX",
+            "ÉTER MÁX."),
         .itemId = ITEM_MAX_ETHER,
         .price = 2000,
         .holdEffectParam = 255,
@@ -591,7 +630,8 @@ const struct Item gItems[] =
         .name = LANGUAGE_STRING(
             "ELIXIR",
             "ELIXIR",
-            "ELISIR"),
+            "ELISIR",
+            "ELIXIR"),
         .itemId = ITEM_ELIXIR,
         .price = 3000,
         .holdEffectParam = 10,
@@ -608,7 +648,8 @@ const struct Item gItems[] =
         .name = LANGUAGE_STRING(
             "MAX ELIXIR",
             "MAX ELIXIR",
-            "ELISIR MAX"),
+            "ELISIR MAX",
+            "ELIXIR MÁX."),
         .itemId = ITEM_MAX_ELIXIR,
         .price = 4500,
         .holdEffectParam = 255,
@@ -625,7 +666,8 @@ const struct Item gItems[] =
         .name = LANGUAGE_STRING(
             "LAVA COOKIE",
             "LAVA COOKIE",
-            "LAVOTTINO"),
+            "LAVOTTINO",
+            "GALLETA LAVA"),
         .itemId = ITEM_LAVA_COOKIE,
         .price = 200,
         .description = sLavaCookieDesc,
@@ -641,7 +683,8 @@ const struct Item gItems[] =
         .name = LANGUAGE_STRING(
             "BLUE FLUTE",
             "FLUTE BLEUE",
-            "FLAUTO BLU"),
+            "FLAUTO BLU",
+            "FLAUTA AZUL"),
         .itemId = ITEM_BLUE_FLUTE,
         .price = 100,
         .description = sBlueFluteDesc,
@@ -657,7 +700,8 @@ const struct Item gItems[] =
         .name = LANGUAGE_STRING(
             "YELLOW FLUTE",
             "FLUTE JAUNE",
-            "FLAUTO GIAL."),
+            "FLAUTO GIAL.",
+            "FL. AMARILLA"),
         .itemId = ITEM_YELLOW_FLUTE,
         .price = 200,
         .description = sYellowFluteDesc,
@@ -673,7 +717,8 @@ const struct Item gItems[] =
         .name = LANGUAGE_STRING(
             "RED FLUTE",
             "FLUTE ROUGE",
-            "FLAUTO ROSSO"),
+            "FLAUTO ROSSO",
+            "FLAUTA ROJA"),
         .itemId = ITEM_RED_FLUTE,
         .price = 300,
         .description = sRedFluteDesc,
@@ -689,7 +734,8 @@ const struct Item gItems[] =
         .name = LANGUAGE_STRING(
             "BLACK FLUTE",
             "FLUTE NOIRE",
-            "FLAUTO NERO"),
+            "FLAUTO NERO",
+            "FLAUTA NEGRA"),
         .itemId = ITEM_BLACK_FLUTE,
         .price = 400,
         .holdEffectParam = 50,
@@ -704,7 +750,8 @@ const struct Item gItems[] =
         .name = LANGUAGE_STRING(
             "WHITE FLUTE",
             "FLUTEBLANCHE",
-            "FLAUTO B.NCO"),
+            "FLAUTO B.NCO",
+            "FL. BLANCA"),
         .itemId = ITEM_WHITE_FLUTE,
         .price = 500,
         .holdEffectParam = 150,
@@ -719,7 +766,8 @@ const struct Item gItems[] =
         .name = LANGUAGE_STRING(
             "BERRY JUICE",
             "JUS DE BAIE",
-            "SUCCODIBACCA"),
+            "SUCCODIBACCA",
+            "ZUMO DE BAYA"),
         .itemId = ITEM_BERRY_JUICE,
         .price = 100,
         .holdEffect = HOLD_EFFECT_RESTORE_HP,
@@ -737,7 +785,8 @@ const struct Item gItems[] =
         .name = LANGUAGE_STRING(
             "SACRED ASH",
             "CENDRESACREE",
-            "CENEREMAGICA"),
+            "CENEREMAGICA",
+            "CEN. SAGRADA"),
         .itemId = ITEM_SACRED_ASH,
         .price = 200,
         .description = sSacredAshDesc,
@@ -753,7 +802,8 @@ const struct Item gItems[] =
         .name = LANGUAGE_STRING(
             "SHOAL SALT",
             "SEL TREFONDS",
-            "SALE ONDOSO"),
+            "SALE ONDOSO",
+            "SAL CARDUMEN"),
         .itemId = ITEM_SHOAL_SALT,
         .price = 20,
         .description = sShoalSaltDesc,
@@ -767,7 +817,8 @@ const struct Item gItems[] =
         .name = LANGUAGE_STRING(
             "SHOAL SHELL",
             "CO. TREFONDS",
-            "GUSCIONDOSO"),
+            "GUSCIONDOSO",
+            "C. CARDUMEN"),
         .itemId = ITEM_SHOAL_SHELL,
         .price = 20,
         .description = sShoalShellDesc,
@@ -781,7 +832,8 @@ const struct Item gItems[] =
         .name = LANGUAGE_STRING(
             "RED SHARD",
             "TESSON ROUGE",
-            "COCCIO ROSSO"),
+            "COCCIO ROSSO",
+            "PARTE ROJA"),
         .itemId = ITEM_RED_SHARD,
         .price = 200,
         .description = sRedShardDesc,
@@ -795,7 +847,8 @@ const struct Item gItems[] =
         .name = LANGUAGE_STRING(
             "BLUE SHARD",
             "TESSON BLEU",
-            "COCCIO BLU"),
+            "COCCIO BLU",
+            "PARTE AZUL"),
         .itemId = ITEM_BLUE_SHARD,
         .price = 200,
         .description = sBlueShardDesc,
@@ -809,7 +862,8 @@ const struct Item gItems[] =
         .name = LANGUAGE_STRING(
             "YELLOW SHARD",
             "TESSON JAUNE",
-            "COCCIO GIAL."),
+            "COCCIO GIAL.",
+            "P. AMARILLA"),
         .itemId = ITEM_YELLOW_SHARD,
         .price = 200,
         .description = sYellowShardDesc,
@@ -823,7 +877,8 @@ const struct Item gItems[] =
         .name = LANGUAGE_STRING(
             "GREEN SHARD",
             "TESSON VERT",
-            "COCCIO VERDE"),
+            "COCCIO VERDE",
+            "PARTE VERDE"),
         .itemId = ITEM_GREEN_SHARD,
         .price = 200,
         .description = sGreenShardDesc,
@@ -835,6 +890,7 @@ const struct Item gItems[] =
     [ITEM_034] =
     {
         .name = LANGUAGE_STRING(
+            "????????",
             "????????",
             "????????",
             "????????"),
@@ -849,6 +905,7 @@ const struct Item gItems[] =
     [ITEM_035] =
     {
         .name = LANGUAGE_STRING(
+            "????????",
             "????????",
             "????????",
             "????????"),
@@ -863,6 +920,7 @@ const struct Item gItems[] =
     [ITEM_036] =
     {
         .name = LANGUAGE_STRING(
+            "????????",
             "????????",
             "????????",
             "????????"),
@@ -877,6 +935,7 @@ const struct Item gItems[] =
     [ITEM_037] =
     {
         .name = LANGUAGE_STRING(
+            "????????",
             "????????",
             "????????",
             "????????"),
@@ -891,6 +950,7 @@ const struct Item gItems[] =
     [ITEM_038] =
     {
         .name = LANGUAGE_STRING(
+            "????????",
             "????????",
             "????????",
             "????????"),
@@ -905,6 +965,7 @@ const struct Item gItems[] =
     [ITEM_039] =
     {
         .name = LANGUAGE_STRING(
+            "????????",
             "????????",
             "????????",
             "????????"),
@@ -919,6 +980,7 @@ const struct Item gItems[] =
     [ITEM_03A] =
     {
         .name = LANGUAGE_STRING(
+            "????????",
             "????????",
             "????????",
             "????????"),
@@ -933,6 +995,7 @@ const struct Item gItems[] =
     [ITEM_03B] =
     {
         .name = LANGUAGE_STRING(
+            "????????",
             "????????",
             "????????",
             "????????"),
@@ -947,6 +1010,7 @@ const struct Item gItems[] =
     [ITEM_03C] =
     {
         .name = LANGUAGE_STRING(
+            "????????",
             "????????",
             "????????",
             "????????"),
@@ -961,6 +1025,7 @@ const struct Item gItems[] =
     [ITEM_03D] =
     {
         .name = LANGUAGE_STRING(
+            "????????",
             "????????",
             "????????",
             "????????"),
@@ -975,6 +1040,7 @@ const struct Item gItems[] =
     [ITEM_03E] =
     {
         .name = LANGUAGE_STRING(
+            "????????",
             "????????",
             "????????",
             "????????"),
@@ -993,7 +1059,8 @@ const struct Item gItems[] =
         .name = LANGUAGE_STRING(
             "HP UP",
             "PV PLUS",
-            "PS-SU"),
+            "PS-SU",
+            "MÁS PS"),
         .itemId = ITEM_HP_UP,
         .price = 9800,
         .description = sHPUpDesc,
@@ -1007,7 +1074,8 @@ const struct Item gItems[] =
         .name = LANGUAGE_STRING(
             "PROTEIN",
             "PROTEINE",
-            "PROTEINA"),
+            "PROTEINA",
+            "PROTEÍNA"),
         .itemId = ITEM_PROTEIN,
         .price = 9800,
         .description = sProteinDesc,
@@ -1021,7 +1089,8 @@ const struct Item gItems[] =
         .name = LANGUAGE_STRING(
             "IRON",
             "FER",
-            "FERRO"),
+            "FERRO",
+            "HIERRO"),
         .itemId = ITEM_IRON,
         .price = 9800,
         .description = sIronDesc,
@@ -1035,6 +1104,7 @@ const struct Item gItems[] =
         .name = LANGUAGE_STRING(
             "CARBOS",
             "CARBONE",
+            "CARBURANTE",
             "CARBURANTE"),
         .itemId = ITEM_CARBOS,
         .price = 9800,
@@ -1049,6 +1119,7 @@ const struct Item gItems[] =
         .name = LANGUAGE_STRING(
             "CALCIUM",
             "CALCIUM",
+            "CALCIO",
             "CALCIO"),
         .itemId = ITEM_CALCIUM,
         .price = 9800,
@@ -1063,7 +1134,8 @@ const struct Item gItems[] =
         .name = LANGUAGE_STRING(
             "RARE CANDY",
             "SUPER BONBON",
-            "CARAM. RARA"),
+            "CARAM. RARA",
+            "CARAMELORARO"),
         .itemId = ITEM_RARE_CANDY,
         .price = 4800,
         .description = sRareCandyDesc,
@@ -1077,7 +1149,8 @@ const struct Item gItems[] =
         .name = LANGUAGE_STRING(
             "PP UP",
             "PP PLUS",
-            "PP-SU"),
+            "PP-SU",
+            "MÁS PP"),
         .itemId = ITEM_PP_UP,
         .price = 9800,
         .description = sPPUpDesc,
@@ -1091,7 +1164,8 @@ const struct Item gItems[] =
         .name = LANGUAGE_STRING(
             "ZINC",
             "ZINC",
-            "ZINCO"),
+            "ZINCO",
+            "ZINC"),
         .itemId = ITEM_ZINC,
         .price = 9800,
         .description = sZincDesc,
@@ -1105,7 +1179,8 @@ const struct Item gItems[] =
         .name = LANGUAGE_STRING(
             "PP MAX",
             "PP MAX",
-            "PP-MAX"),
+            "PP-MAX",
+            "MÁX. PP"),
         .itemId = ITEM_PP_MAX,
         .price = 9800,
         .description = sPPMaxDesc,
@@ -1117,6 +1192,7 @@ const struct Item gItems[] =
     [ITEM_048] =
     {
         .name = LANGUAGE_STRING(
+            "????????",
             "????????",
             "????????",
             "????????"),
@@ -1135,7 +1211,8 @@ const struct Item gItems[] =
         .name = LANGUAGE_STRING(
             "GUARD SPEC.",
             "DEFENSE SPEC",
-            "SUPERGUARDIA"),
+            "SUPERGUARDIA",
+            "PROTEC. ESP."),
         .itemId = ITEM_GUARD_SPEC,
         .price = 700,
         .description = sGuardSpecDesc,
@@ -1151,7 +1228,8 @@ const struct Item gItems[] =
         .name = LANGUAGE_STRING(
             "DIRE HIT",
             "MUSCLE +",
-            "SUPERCOLPO"),
+            "SUPERCOLPO",
+            "DIRECTO"),
         .itemId = ITEM_DIRE_HIT,
         .price = 650,
         .description = sDireHitDesc,
@@ -1167,7 +1245,8 @@ const struct Item gItems[] =
         .name = LANGUAGE_STRING(
             "X ATTACK",
             "ATTAQUE +",
-            "ATTACCO X"),
+            "ATTACCO X",
+            "ATAQUE X"),
         .itemId = ITEM_X_ATTACK,
         .price = 500,
         .description = sXAttackDesc,
@@ -1183,7 +1262,8 @@ const struct Item gItems[] =
         .name = LANGUAGE_STRING(
             "X DEFEND",
             "DEFENSE +",
-            "DIFESA X"),
+            "DIFESA X",
+            "DEFENSA X"),
         .itemId = ITEM_X_DEFEND,
         .price = 550,
         .description = sXDefendDesc,
@@ -1199,7 +1279,8 @@ const struct Item gItems[] =
         .name = LANGUAGE_STRING(
             "X SPEED",
             "VITESSE +",
-            "VELOCITÀ X"),
+            "VELOCITÀ X",
+            "VELOCIDAD X"),
         .itemId = ITEM_X_SPEED,
         .price = 350,
         .description = sXSpeedDesc,
@@ -1215,7 +1296,8 @@ const struct Item gItems[] =
         .name = LANGUAGE_STRING(
             "X ACCURACY",
             "PRECISION +",
-            "PRECISIONE X"),
+            "PRECISIONE X",
+            "PRECISIÓN X"),
         .itemId = ITEM_X_ACCURACY,
         .price = 950,
         .description = sXAccuracyDesc,
@@ -1231,7 +1313,8 @@ const struct Item gItems[] =
         .name = LANGUAGE_STRING(
             "X SPECIAL",
             "SPECIAL +",
-            "SPECIAL X"),
+            "SPECIAL X",
+            "ESPECIAL X"),
         .itemId = ITEM_X_SPECIAL,
         .price = 350,
         .description = sXSpecialDesc,
@@ -1247,7 +1330,8 @@ const struct Item gItems[] =
         .name = LANGUAGE_STRING(
             "POKé DOLL",
             "POKéPOUPEE",
-            "POKé BAMBOLA"),
+            "POKé BAMBOLA",
+            "POKé MUÑECO"),
         .itemId = ITEM_POKE_DOLL,
         .price = 1000,
         .description = sPokeDollDesc,
@@ -1263,7 +1347,8 @@ const struct Item gItems[] =
         .name = LANGUAGE_STRING(
             "FLUFFY TAIL",
             "QUEUE SKITTY",
-            "CODA SKITTY"),
+            "CODA SKITTY",
+            "COLA SKITTY"),
         .itemId = ITEM_FLUFFY_TAIL,
         .price = 1000,
         .description = sFluffyTailDesc,
@@ -1277,6 +1362,7 @@ const struct Item gItems[] =
     [ITEM_052] =
     {
         .name = LANGUAGE_STRING(
+            "????????",
             "????????",
             "????????",
             "????????"),
@@ -1295,7 +1381,8 @@ const struct Item gItems[] =
         .name = LANGUAGE_STRING(
             "SUPER REPEL",
             "SUPEREPOUSSE",
-            "SUPERREPELL."),
+            "SUPERREPELL.",
+            "SUPERREPEL"),
         .itemId = ITEM_SUPER_REPEL,
         .price = 500,
         .holdEffectParam = 200,
@@ -1310,7 +1397,8 @@ const struct Item gItems[] =
         .name = LANGUAGE_STRING(
             "MAX REPEL",
             "MAX REPOUSSE",
-            "REPELL. MAX"),
+            "REPELL. MAX",
+            "MÁX. REPEL"),
         .itemId = ITEM_MAX_REPEL,
         .price = 700,
         .holdEffectParam = 250,
@@ -1325,7 +1413,8 @@ const struct Item gItems[] =
         .name = LANGUAGE_STRING(
             "ESCAPE ROPE",
             "CORDE SORTIE",
-            "FUNE DI FUGA"),
+            "FUNE DI FUGA",
+            "CUERDA HUIDA"),
         .itemId = ITEM_ESCAPE_ROPE,
         .price = 550,
         .description = sEscapeRopeDesc,
@@ -1339,7 +1428,8 @@ const struct Item gItems[] =
         .name = LANGUAGE_STRING(
             "REPEL",
             "REPOUSSE",
-            "REPELLENTE"),
+            "REPELLENTE",
+            "REPELENTE"),
         .itemId = ITEM_REPEL,
         .price = 350,
         .holdEffectParam = 100,
@@ -1352,6 +1442,7 @@ const struct Item gItems[] =
     [ITEM_057] =
     {
         .name = LANGUAGE_STRING(
+            "????????",
             "????????",
             "????????",
             "????????"),
@@ -1366,6 +1457,7 @@ const struct Item gItems[] =
     [ITEM_058] =
     {
         .name = LANGUAGE_STRING(
+            "????????",
             "????????",
             "????????",
             "????????"),
@@ -1380,6 +1472,7 @@ const struct Item gItems[] =
     [ITEM_059] =
     {
         .name = LANGUAGE_STRING(
+            "????????",
             "????????",
             "????????",
             "????????"),
@@ -1394,6 +1487,7 @@ const struct Item gItems[] =
     [ITEM_05A] =
     {
         .name = LANGUAGE_STRING(
+            "????????",
             "????????",
             "????????",
             "????????"),
@@ -1408,6 +1502,7 @@ const struct Item gItems[] =
     [ITEM_05B] =
     {
         .name = LANGUAGE_STRING(
+            "????????",
             "????????",
             "????????",
             "????????"),
@@ -1422,6 +1517,7 @@ const struct Item gItems[] =
     [ITEM_05C] =
     {
         .name = LANGUAGE_STRING(
+            "????????",
             "????????",
             "????????",
             "????????"),
@@ -1440,7 +1536,8 @@ const struct Item gItems[] =
         .name = LANGUAGE_STRING(
             "SUN STONE",
             "PIERRESOLEIL",
-            "PIETRASOLARE"),
+            "PIETRASOLARE",
+            "PIEDRA SOLAR"),
         .itemId = ITEM_SUN_STONE,
         .price = 2100,
         .description = sSunStoneDesc,
@@ -1454,7 +1551,8 @@ const struct Item gItems[] =
         .name = LANGUAGE_STRING(
             "MOON STONE",
             "PIERRE LUNE",
-            "PIETRALUNARE"),
+            "PIETRALUNARE",
+            "PIEDRA LUNAR"),
         .itemId = ITEM_MOON_STONE,
         .price = 0,
         .description = sMoonStoneDesc,
@@ -1468,7 +1566,8 @@ const struct Item gItems[] =
         .name = LANGUAGE_STRING(
             "FIRE STONE",
             "PIERRE FEU",
-            "PIETRAFOCAIA"),
+            "PIETRAFOCAIA",
+            "PIEDRA FUEGO"),
         .itemId = ITEM_FIRE_STONE,
         .price = 2100,
         .description = sFireStoneDesc,
@@ -1482,7 +1581,8 @@ const struct Item gItems[] =
         .name = LANGUAGE_STRING(
             "THUNDERSTONE",
             "PIERREFOUDRE",
-            "PIETRATUONO"),
+            "PIETRATUONO",
+            "PIEDRATRUENO"),
         .itemId = ITEM_THUNDER_STONE,
         .price = 2100,
         .description = sThunderStoneDesc,
@@ -1496,7 +1596,8 @@ const struct Item gItems[] =
         .name = LANGUAGE_STRING(
             "WATER STONE",
             "PIERRE EAU",
-            "PIETRAIDRICA"),
+            "PIETRAIDRICA",
+            "PIEDRA AGUA"),
         .itemId = ITEM_WATER_STONE,
         .price = 2100,
         .description = sWaterStoneDesc,
@@ -1510,7 +1611,8 @@ const struct Item gItems[] =
         .name = LANGUAGE_STRING(
             "LEAF STONE",
             "PIERREPLANTE",
-            "PIETRAFOGLIA"),
+            "PIETRAFOGLIA",
+            "PIEDRA HOJA"),
         .itemId = ITEM_LEAF_STONE,
         .price = 2100,
         .description = sLeafStoneDesc,
@@ -1522,6 +1624,7 @@ const struct Item gItems[] =
     [ITEM_063] =
     {
         .name = LANGUAGE_STRING(
+            "????????",
             "????????",
             "????????",
             "????????"),
@@ -1536,6 +1639,7 @@ const struct Item gItems[] =
     [ITEM_064] =
     {
         .name = LANGUAGE_STRING(
+            "????????",
             "????????",
             "????????",
             "????????"),
@@ -1550,6 +1654,7 @@ const struct Item gItems[] =
     [ITEM_065] =
     {
         .name = LANGUAGE_STRING(
+            "????????",
             "????????",
             "????????",
             "????????"),
@@ -1564,6 +1669,7 @@ const struct Item gItems[] =
     [ITEM_066] =
     {
         .name = LANGUAGE_STRING(
+            "????????",
             "????????",
             "????????",
             "????????"),
@@ -1582,7 +1688,8 @@ const struct Item gItems[] =
         .name = LANGUAGE_STRING(
             "TINYMUSHROOM",
             "PETIT CHAMPI",
-            "MINIFUNGO"),
+            "MINIFUNGO",
+            "MINI SETA"),
         .itemId = ITEM_TINY_MUSHROOM,
         .price = 500,
         .description = sTinyMushroomDesc,
@@ -1596,7 +1703,8 @@ const struct Item gItems[] =
         .name = LANGUAGE_STRING(
             "BIG MUSHROOM",
             "GROS CHAMPI",
-            "GRANDE FUNGO"),
+            "GRANDE FUNGO",
+            "SETA GRANDE"),
         .itemId = ITEM_BIG_MUSHROOM,
         .price = 5000,
         .description = sBigMushroomDesc,
@@ -1608,6 +1716,7 @@ const struct Item gItems[] =
     [ITEM_069] =
     {
         .name = LANGUAGE_STRING(
+            "????????",
             "????????",
             "????????",
             "????????"),
@@ -1624,6 +1733,7 @@ const struct Item gItems[] =
         .name = LANGUAGE_STRING(
             "PEARL",
             "PERLE",
+            "PERLA",
             "PERLA"),
         .itemId = ITEM_PEARL,
         .price = 1400,
@@ -1638,7 +1748,8 @@ const struct Item gItems[] =
         .name = LANGUAGE_STRING(
             "BIG PEARL",
             "GRANDE PERLE",
-            "GRANDE PERLA"),
+            "GRANDE PERLA",
+            "PERLA GRANDE"),
         .itemId = ITEM_BIG_PEARL,
         .price = 7500,
         .description = sBigPearlDesc,
@@ -1652,7 +1763,8 @@ const struct Item gItems[] =
         .name = LANGUAGE_STRING(
             "STARDUST",
             "POUSS.ETOILE",
-            "POLVOSTELLA"),
+            "POLVOSTELLA",
+            "POLVOESTELAR"),
         .itemId = ITEM_STARDUST,
         .price = 2000,
         .description = sStardustDesc,
@@ -1666,7 +1778,8 @@ const struct Item gItems[] =
         .name = LANGUAGE_STRING(
             "STAR PIECE",
             "MORC. ETOILE",
-            "PEZZO STELLA"),
+            "PEZZO STELLA",
+            "TR. ESTRELLA"),
         .itemId = ITEM_STAR_PIECE,
         .price = 9800,
         .description = sStarPieceDesc,
@@ -1680,6 +1793,7 @@ const struct Item gItems[] =
         .name = LANGUAGE_STRING(
             "NUGGET",
             "PEPITE",
+            "PEPITA",
             "PEPITA"),
         .itemId = ITEM_NUGGET,
         .price = 10000,
@@ -1694,7 +1808,8 @@ const struct Item gItems[] =
         .name = LANGUAGE_STRING(
             "HEART SCALE",
             "ECAILLECOEUR",
-            "SQUAMA CUORE"),
+            "SQUAMA CUORE",
+            "ESC. CORAZÓN"),
         .itemId = ITEM_HEART_SCALE,
         .price = 100,
         .description = sHeartScaleDesc,
@@ -1706,6 +1821,7 @@ const struct Item gItems[] =
     [ITEM_070] =
     {
         .name = LANGUAGE_STRING(
+            "????????",
             "????????",
             "????????",
             "????????"),
@@ -1720,6 +1836,7 @@ const struct Item gItems[] =
     [ITEM_071] =
     {
         .name = LANGUAGE_STRING(
+            "????????",
             "????????",
             "????????",
             "????????"),
@@ -1734,6 +1851,7 @@ const struct Item gItems[] =
     [ITEM_072] =
     {
         .name = LANGUAGE_STRING(
+            "????????",
             "????????",
             "????????",
             "????????"),
@@ -1748,6 +1866,7 @@ const struct Item gItems[] =
     [ITEM_073] =
     {
         .name = LANGUAGE_STRING(
+            "????????",
             "????????",
             "????????",
             "????????"),
@@ -1762,6 +1881,7 @@ const struct Item gItems[] =
     [ITEM_074] =
     {
         .name = LANGUAGE_STRING(
+            "????????",
             "????????",
             "????????",
             "????????"),
@@ -1776,6 +1896,7 @@ const struct Item gItems[] =
     [ITEM_075] =
     {
         .name = LANGUAGE_STRING(
+            "????????",
             "????????",
             "????????",
             "????????"),
@@ -1790,6 +1911,7 @@ const struct Item gItems[] =
     [ITEM_076] =
     {
         .name = LANGUAGE_STRING(
+            "????????",
             "????????",
             "????????",
             "????????"),
@@ -1804,6 +1926,7 @@ const struct Item gItems[] =
     [ITEM_077] =
     {
         .name = LANGUAGE_STRING(
+            "????????",
             "????????",
             "????????",
             "????????"),
@@ -1818,6 +1941,7 @@ const struct Item gItems[] =
     [ITEM_078] =
     {
         .name = LANGUAGE_STRING(
+            "????????",
             "????????",
             "????????",
             "????????"),
@@ -1835,7 +1959,8 @@ const struct Item gItems[] =
         .name = LANGUAGE_STRING(
             "ORANGE MAIL",
             "LETTRE ORANJ",
-            "MESS. AGRUME"),
+            "MESS. AGRUME",
+            "CAR. NARANJA"),
         .itemId = ITEM_ORANGE_MAIL,
         .price = 50,
         .description = sOrangeMailDesc,
@@ -1850,7 +1975,8 @@ const struct Item gItems[] =
         .name = LANGUAGE_STRING(
             "HARBOR MAIL",
             "LETTRE PORT",
-            "MESS. PORTO"),
+            "MESS. PORTO",
+            "CARTA PUERTO"),
         .itemId = ITEM_HARBOR_MAIL,
         .price = 50,
         .description = sHarborMailDesc,
@@ -1865,7 +1991,8 @@ const struct Item gItems[] =
         .name = LANGUAGE_STRING(
             "GLITTER MAIL",
             "LETTRE BRILL",
-            "MESS. LUCI"),
+            "MESS. LUCI",
+            "CARTA BRILLO"),
         .itemId = ITEM_GLITTER_MAIL,
         .price = 50,
         .description = sGlitterMailDesc,
@@ -1880,7 +2007,8 @@ const struct Item gItems[] =
         .name = LANGUAGE_STRING(
             "MECH MAIL",
             "LETTRE MECA",
-            "MESS. TECNO"),
+            "MESS. TECNO",
+            "CARTA IMÁN"),
         .itemId = ITEM_MECH_MAIL,
         .price = 50,
         .description = sMechMailDesc,
@@ -1895,7 +2023,8 @@ const struct Item gItems[] =
         .name = LANGUAGE_STRING(
             "WOOD MAIL",
             "LETTRE BOIS",
-            "MESS. BOSCO"),
+            "MESS. BOSCO",
+            "CARTA MADERA"),
         .itemId = ITEM_WOOD_MAIL,
         .price = 50,
         .description = sWoodMailDesc,
@@ -1910,7 +2039,8 @@ const struct Item gItems[] =
         .name = LANGUAGE_STRING(
             "WAVE MAIL",
             "LETTRE VAGUE",
-            "MESS. ONDA"),
+            "MESS. ONDA",
+            "CARTA OLA"),
         .itemId = ITEM_WAVE_MAIL,
         .price = 50,
         .description = sWaveMailDesc,
@@ -1925,7 +2055,8 @@ const struct Item gItems[] =
         .name = LANGUAGE_STRING(
             "BEAD MAIL",
             "LETTRE BULLE",
-            "MESS. PERLE"),
+            "MESS. PERLE",
+            "CARTA IMAGEN"),
         .itemId = ITEM_BEAD_MAIL,
         .price = 50,
         .description = sBeadMailDesc,
@@ -1940,7 +2071,8 @@ const struct Item gItems[] =
         .name = LANGUAGE_STRING(
             "SHADOW MAIL",
             "LETTRE OMBRE",
-            "MESS. OMBRA"),
+            "MESS. OMBRA",
+            "CARTA SOMBRA"),
         .itemId = ITEM_SHADOW_MAIL,
         .price = 50,
         .description = sShadowMailDesc,
@@ -1955,7 +2087,8 @@ const struct Item gItems[] =
         .name = LANGUAGE_STRING(
             "TROPIC MAIL",
             "LETTRE TROPI",
-            "MESS. TROPIC"),
+            "MESS. TROPIC",
+            "CAR. TROPIC."),
         .itemId = ITEM_TROPIC_MAIL,
         .price = 50,
         .description = sTropicMailDesc,
@@ -1970,7 +2103,8 @@ const struct Item gItems[] =
         .name = LANGUAGE_STRING(
             "DREAM MAIL",
             "LETTRE SONGE",
-            "MESS. SOGNO"),
+            "MESS. SOGNO",
+            "CARTA SUEÑO"),
         .itemId = ITEM_DREAM_MAIL,
         .price = 50,
         .description = sDreamMailDesc,
@@ -1985,7 +2119,8 @@ const struct Item gItems[] =
         .name = LANGUAGE_STRING(
             "FAB MAIL",
             "LETTRE COOL",
-            "MESS. LUSSO"),
+            "MESS. LUSSO",
+            "CARTA FAB."),
         .itemId = ITEM_FAB_MAIL,
         .price = 50,
         .description = sFabMailDesc,
@@ -2000,7 +2135,8 @@ const struct Item gItems[] =
         .name = LANGUAGE_STRING(
             "RETRO MAIL",
             "LETTRE RETRO",
-            "MESS. RÉTRO"),
+            "MESS. RÉTRO",
+            "CARTA RETRO."),
         .itemId = ITEM_RETRO_MAIL,
         .price = 0,
         .description = sRetroMailDesc,
@@ -2017,7 +2153,8 @@ const struct Item gItems[] =
         .name = LANGUAGE_STRING(
             "CHERI BERRY",
             "BAIE CERIZ",
-            "BACCALIEGIA"),
+            "BACCALIEGIA",
+            "BAYA ZREZA"),
         .itemId = ITEM_CHERI_BERRY,
         .price = 20,
         .holdEffect = HOLD_EFFECT_CURE_PAR,
@@ -2034,7 +2171,8 @@ const struct Item gItems[] =
         .name = LANGUAGE_STRING(
             "CHESTO BERRY",
             "BAIE MARON",
-            "BACCASTAGNA"),
+            "BACCASTAGNA",
+            "BAYA ATANIA"),
         .itemId = ITEM_CHESTO_BERRY,
         .price = 20,
         .holdEffect = HOLD_EFFECT_CURE_SLP,
@@ -2051,7 +2189,8 @@ const struct Item gItems[] =
         .name = LANGUAGE_STRING(
             "PECHA BERRY",
             "BAIE PECHA",
-            "BACCAPESCA"),
+            "BACCAPESCA",
+            "BAYA MELOC"),
         .itemId = ITEM_PECHA_BERRY,
         .price = 20,
         .holdEffect = HOLD_EFFECT_CURE_PSN,
@@ -2068,7 +2207,8 @@ const struct Item gItems[] =
         .name = LANGUAGE_STRING(
             "RAWST BERRY",
             "BAIE FRAIVE",
-            "BACCAFRAGO"),
+            "BACCAFRAGO",
+            "BAYA SAFRE"),
         .itemId = ITEM_RAWST_BERRY,
         .price = 20,
         .holdEffect = HOLD_EFFECT_CURE_BRN,
@@ -2085,7 +2225,8 @@ const struct Item gItems[] =
         .name = LANGUAGE_STRING(
             "ASPEAR BERRY",
             "BAIE WILLIA",
-            "BACCAPERINA"),
+            "BACCAPERINA",
+            "BAYA PERASI"),
         .itemId = ITEM_ASPEAR_BERRY,
         .price = 20,
         .holdEffect = HOLD_EFFECT_CURE_FRZ,
@@ -2102,7 +2243,8 @@ const struct Item gItems[] =
         .name = LANGUAGE_STRING(
             "LEPPA BERRY",
             "BAIE MEPO",
-            "BACCAMELA"),
+            "BACCAMELA",
+            "BAYA ZANAMA"),
         .itemId = ITEM_LEPPA_BERRY,
         .price = 20,
         .holdEffect = HOLD_EFFECT_RESTORE_PP,
@@ -2120,7 +2262,8 @@ const struct Item gItems[] =
         .name = LANGUAGE_STRING(
             "ORAN BERRY",
             "BAIE ORAN",
-            "BACCARANCIA"),
+            "BACCARANCIA",
+            "BAYA ARANJA"),
         .itemId = ITEM_ORAN_BERRY,
         .price = 20,
         .holdEffect = HOLD_EFFECT_RESTORE_HP,
@@ -2138,7 +2281,8 @@ const struct Item gItems[] =
         .name = LANGUAGE_STRING(
             "PERSIM BERRY",
             "BAIE KIKA",
-            "BACCAKI"),
+            "BACCAKI",
+            "BAYA CAQUIC"),
         .itemId = ITEM_PERSIM_BERRY,
         .price = 20,
         .holdEffect = HOLD_EFFECT_CURE_CONFUSION,
@@ -2155,7 +2299,8 @@ const struct Item gItems[] =
         .name = LANGUAGE_STRING(
             "LUM BERRY",
             "BAIE PRINE",
-            "BACCAPRUGNA"),
+            "BACCAPRUGNA",
+            "BAYA ZIUELA"),
         .itemId = ITEM_LUM_BERRY,
         .price = 20,
         .holdEffect = HOLD_EFFECT_CURE_STATUS,
@@ -2172,7 +2317,8 @@ const struct Item gItems[] =
         .name = LANGUAGE_STRING(
             "SITRUS BERRY",
             "BAIE SITRUS",
-            "BACCACEDRO"),
+            "BACCACEDRO",
+            "BAYA ZIDRA"),
         .itemId = ITEM_SITRUS_BERRY,
         .price = 20,
         .holdEffect = HOLD_EFFECT_RESTORE_HP,
@@ -2190,7 +2336,8 @@ const struct Item gItems[] =
         .name = LANGUAGE_STRING(
             "FIGY BERRY",
             "BAIE FIGUY",
-            "BACCAFICO"),
+            "BACCAFICO",
+            "BAYA HIGOG"),
         .itemId = ITEM_FIGY_BERRY,
         .price = 20,
         .holdEffect = HOLD_EFFECT_CONFUSE_SPICY,
@@ -2206,7 +2353,8 @@ const struct Item gItems[] =
         .name = LANGUAGE_STRING(
             "WIKI BERRY",
             "BAIE WIKI",
-            "BACCAKIWI"),
+            "BACCAKIWI",
+            "BAYA WIKI"),
         .itemId = ITEM_WIKI_BERRY,
         .price = 20,
         .holdEffect = HOLD_EFFECT_CONFUSE_DRY,
@@ -2222,7 +2370,8 @@ const struct Item gItems[] =
         .name = LANGUAGE_STRING(
             "MAGO BERRY",
             "BAIE MAGO",
-            "BACCAMANGO"),
+            "BACCAMANGO",
+            "BAYA ANGO"),
         .itemId = ITEM_MAGO_BERRY,
         .price = 20,
         .holdEffect = HOLD_EFFECT_CONFUSE_SWEET,
@@ -2238,7 +2387,8 @@ const struct Item gItems[] =
         .name = LANGUAGE_STRING(
             "AGUAV BERRY",
             "BAIE GOWAV",
-            "BACCAGUAVA"),
+            "BACCAGUAVA",
+            "BAYA GUAYA"),
         .itemId = ITEM_AGUAV_BERRY,
         .price = 20,
         .holdEffect = HOLD_EFFECT_CONFUSE_BITTER,
@@ -2254,7 +2404,8 @@ const struct Item gItems[] =
         .name = LANGUAGE_STRING(
             "IAPAPA BERRY",
             "BAIE PAPAYA",
-            "BACCAPAIA"),
+            "BACCAPAIA",
+            "BAYA PABAYA"),
         .itemId = ITEM_IAPAPA_BERRY,
         .price = 20,
         .holdEffect = HOLD_EFFECT_CONFUSE_SOUR,
@@ -2270,7 +2421,8 @@ const struct Item gItems[] =
         .name = LANGUAGE_STRING(
             "RAZZ BERRY",
             "BAIE FRAMBY",
-            "BACCALAMPON"),
+            "BACCALAMPON",
+            "BAYA FRAMBU"),
         .itemId = ITEM_RAZZ_BERRY,
         .price = 20,
         .description = sRazzBerryDesc,
@@ -2284,7 +2436,8 @@ const struct Item gItems[] =
         .name = LANGUAGE_STRING(
             "BLUK BERRY",
             "BAIE REMU",
-            "BACCAMORA"),
+            "BACCAMORA",
+            "BAYA ORAM"),
         .itemId = ITEM_BLUK_BERRY,
         .price = 20,
         .description = sBlukBerryDesc,
@@ -2298,7 +2451,8 @@ const struct Item gItems[] =
         .name = LANGUAGE_STRING(
             "NANAB BERRY",
             "BAIE NANAB",
-            "BACCABANA"),
+            "BACCABANA",
+            "BAYA LATANO"),
         .itemId = ITEM_NANAB_BERRY,
         .price = 20,
         .description = sNanabBerryDesc,
@@ -2312,7 +2466,8 @@ const struct Item gItems[] =
         .name = LANGUAGE_STRING(
             "WEPEAR BERRY",
             "BAIE REPOI",
-            "BACCAPERA"),
+            "BACCAPERA",
+            "BAYA PERAGU"),
         .itemId = ITEM_WEPEAR_BERRY,
         .price = 20,
         .description = sWepearBerryDesc,
@@ -2326,7 +2481,8 @@ const struct Item gItems[] =
         .name = LANGUAGE_STRING(
             "PINAP BERRY",
             "BAIE NANANA",
-            "BACCANANAS"),
+            "BACCANANAS",
+            "BAYA PINIA"),
         .itemId = ITEM_PINAP_BERRY,
         .price = 20,
         .description = sPinapBerryDesc,
@@ -2340,7 +2496,8 @@ const struct Item gItems[] =
         .name = LANGUAGE_STRING(
             "POMEG BERRY",
             "BAIE GRENA",
-            "BACCAGRANA"),
+            "BACCAGRANA",
+            "BAYA GRANA"),
         .itemId = ITEM_POMEG_BERRY,
         .price = 20,
         .description = sPomegBerryDesc,
@@ -2354,7 +2511,8 @@ const struct Item gItems[] =
         .name = LANGUAGE_STRING(
             "KELPSY BERRY",
             "BAIE ALGA",
-            "BACCALGA"),
+            "BACCALGA",
+            "BAYA ALGAMA"),
         .itemId = ITEM_KELPSY_BERRY,
         .price = 20,
         .description = sKelpsyBerryDesc,
@@ -2368,7 +2526,8 @@ const struct Item gItems[] =
         .name = LANGUAGE_STRING(
             "QUALOT BERRY",
             "BAIE QUALOT",
-            "BACCALOQUAT"),
+            "BACCALOQUAT",
+            "BAYA ISPERO"),
         .itemId = ITEM_QUALOT_BERRY,
         .price = 20,
         .description = sQualotBerryDesc,
@@ -2382,7 +2541,8 @@ const struct Item gItems[] =
         .name = LANGUAGE_STRING(
             "HONDEW BERRY",
             "BAIE LONME",
-            "BACCAMELON"),
+            "BACCAMELON",
+            "BAYA MELUCE"),
         .itemId = ITEM_HONDEW_BERRY,
         .price = 20,
         .description = sHondewBerryDesc,
@@ -2396,7 +2556,8 @@ const struct Item gItems[] =
         .name = LANGUAGE_STRING(
             "GREPA BERRY",
             "BAIE RESIN",
-            "BACCAUVA"),
+            "BACCAUVA",
+            "BAYA UVAV"),
         .itemId = ITEM_GREPA_BERRY,
         .price = 20,
         .description = sGrepaBerryDesc,
@@ -2410,7 +2571,8 @@ const struct Item gItems[] =
         .name = LANGUAGE_STRING(
             "TAMATO BERRY",
             "BAIE TAMATO",
-            "BACCAMODORO"),
+            "BACCAMODORO",
+            "BAYA TAMATE"),
         .itemId = ITEM_TAMATO_BERRY,
         .price = 20,
         .description = sTamatoBerryDesc,
@@ -2424,7 +2586,8 @@ const struct Item gItems[] =
         .name = LANGUAGE_STRING(
             "CORNN BERRY",
             "BAIE SIAM",
-            "BACCAVENA"),
+            "BACCAVENA",
+            "BAYA MAIS"),
         .itemId = ITEM_CORNN_BERRY,
         .price = 20,
         .description = sCornnBerryDesc,
@@ -2438,7 +2601,8 @@ const struct Item gItems[] =
         .name = LANGUAGE_STRING(
             "MAGOST BERRY",
             "BAIE MANGOU",
-            "BACCAGOSTAN"),
+            "BACCAGOSTAN",
+            "BAYA AOSTAN"),
         .itemId = ITEM_MAGOST_BERRY,
         .price = 20,
         .description = sMagostBerryDesc,
@@ -2452,7 +2616,8 @@ const struct Item gItems[] =
         .name = LANGUAGE_STRING(
             "RABUTA BERRY",
             "BAIE RABUTA",
-            "BACCAMBUTAN"),
+            "BACCAMBUTAN",
+            "BAYA RAUTAN"),
         .itemId = ITEM_RABUTA_BERRY,
         .price = 20,
         .description = sRabutaBerryDesc,
@@ -2466,7 +2631,8 @@ const struct Item gItems[] =
         .name = LANGUAGE_STRING(
             "NOMEL BERRY",
             "BAIE TRONCI",
-            "BACCALEMON"),
+            "BACCALEMON",
+            "BAYA MONLI"),
         .itemId = ITEM_NOMEL_BERRY,
         .price = 20,
         .description = sNomelBerryDesc,
@@ -2480,7 +2646,8 @@ const struct Item gItems[] =
         .name = LANGUAGE_STRING(
             "SPELON BERRY",
             "BAIE KIWAN",
-            "BACCAMELOS"),
+            "BACCAMELOS",
+            "BAYA WIKANO"),
         .itemId = ITEM_SPELON_BERRY,
         .price = 20,
         .description = sSpelonBerryDesc,
@@ -2494,7 +2661,8 @@ const struct Item gItems[] =
         .name = LANGUAGE_STRING(
             "PAMTRE BERRY",
             "BAIE PALMA",
-            "BACCAPALMA"),
+            "BACCAPALMA",
+            "BAYA PLAMA"),
         .itemId = ITEM_PAMTRE_BERRY,
         .price = 20,
         .description = sPamtreBerryDesc,
@@ -2508,7 +2676,8 @@ const struct Item gItems[] =
         .name = LANGUAGE_STRING(
             "WATMEL BERRY",
             "BAIE STEKPA",
-            "BACCACOMERO"),
+            "BACCACOMERO",
+            "BAYA SAMBIA"),
         .itemId = ITEM_WATMEL_BERRY,
         .price = 20,
         .description = sWatmelBerryDesc,
@@ -2522,7 +2691,8 @@ const struct Item gItems[] =
         .name = LANGUAGE_STRING(
             "DURIN BERRY",
             "BAIE DURIN",
-            "BACCADURIAN"),
+            "BACCADURIAN",
+            "BAYA RUDION"),
         .itemId = ITEM_DURIN_BERRY,
         .price = 20,
         .description = sDurinBerryDesc,
@@ -2536,7 +2706,8 @@ const struct Item gItems[] =
         .name = LANGUAGE_STRING(
             "BELUE BERRY",
             "BAIE MYRTE",
-            "BACCARTILLO"),
+            "BACCARTILLO",
+            "BAYA ANDANO"),
         .itemId = ITEM_BELUE_BERRY,
         .price = 20,
         .description = sBelueBerryDesc,
@@ -2550,7 +2721,8 @@ const struct Item gItems[] =
         .name = LANGUAGE_STRING(
             "LIECHI BERRY",
             "BAIE LICHII",
-            "BACCALICI"),
+            "BACCALICI",
+            "BAYA LICHI"),
         .itemId = ITEM_LIECHI_BERRY,
         .price = 20,
         .holdEffect = HOLD_EFFECT_ATTACK_UP,
@@ -2566,7 +2738,8 @@ const struct Item gItems[] =
         .name = LANGUAGE_STRING(
             "GANLON BERRY",
             "BAIE LINGAN",
-            "BACCALONGAN"),
+            "BACCALONGAN",
+            "BAYA GONLAN"),
         .itemId = ITEM_GANLON_BERRY,
         .price = 20,
         .holdEffect = HOLD_EFFECT_DEFENSE_UP,
@@ -2582,7 +2755,8 @@ const struct Item gItems[] =
         .name = LANGUAGE_STRING(
             "SALAC BERRY",
             "BAIE SAILAK",
-            "BACCASALAK"),
+            "BACCASALAK",
+            "BAYA ASLAC"),
         .itemId = ITEM_SALAC_BERRY,
         .price = 20,
         .holdEffect = HOLD_EFFECT_SPEED_UP,
@@ -2598,7 +2772,8 @@ const struct Item gItems[] =
         .name = LANGUAGE_STRING(
             "PETAYA BERRY",
             "BAIE PITAYE",
-            "BACCAPITAYA"),
+            "BACCAPITAYA",
+            "BAYA YAPATI"),
         .itemId = ITEM_PETAYA_BERRY,
         .price = 20,
         .holdEffect = HOLD_EFFECT_SP_ATTACK_UP,
@@ -2614,7 +2789,8 @@ const struct Item gItems[] =
         .name = LANGUAGE_STRING(
             "APICOT BERRY",
             "BAIE ABRIKO",
-            "BACCACOCCA"),
+            "BACCACOCCA",
+            "BAYA ARICOC"),
         .itemId = ITEM_APICOT_BERRY,
         .price = 20,
         .holdEffect = HOLD_EFFECT_SP_DEFENSE_UP,
@@ -2630,7 +2806,8 @@ const struct Item gItems[] =
         .name = LANGUAGE_STRING(
             "LANSAT BERRY",
             "BAIE LANSAT",
-            "BACCALANGSA"),
+            "BACCALANGSA",
+            "BAYA ZONLAN"),
         .itemId = ITEM_LANSAT_BERRY,
         .price = 20,
         .holdEffect = HOLD_EFFECT_CRITICAL_UP,
@@ -2646,7 +2823,8 @@ const struct Item gItems[] =
         .name = LANGUAGE_STRING(
             "STARF BERRY",
             "BAIE FRISTA",
-            "BACCAMBOLA"),
+            "BACCAMBOLA",
+            "BAYA ARABOL"),
         .itemId = ITEM_STARF_BERRY,
         .price = 20,
         .holdEffect = HOLD_EFFECT_RANDOM_STAT_UP,
@@ -2662,7 +2840,8 @@ const struct Item gItems[] =
         .name = LANGUAGE_STRING(
             "ENIGMA BERRY",
             "BAIE ENIGMA",
-            "BACCAENIGMA"),
+            "BACCAENIGMA",
+            "BAYA ENIGMA"),
         .itemId = ITEM_ENIGMA_BERRY,
         .price = 20,
         .description = sEnigmaBerryDesc,
@@ -2676,6 +2855,7 @@ const struct Item gItems[] =
     [ITEM_UNUSED_BERRY_1] =
     {
         .name = LANGUAGE_STRING(
+            "????????",
             "????????",
             "????????",
             "????????"),
@@ -2690,6 +2870,7 @@ const struct Item gItems[] =
     [ITEM_UNUSED_BERRY_2] =
     {
         .name = LANGUAGE_STRING(
+            "????????",
             "????????",
             "????????",
             "????????"),
@@ -2704,6 +2885,7 @@ const struct Item gItems[] =
     [ITEM_UNUSED_BERRY_3] =
     {
         .name = LANGUAGE_STRING(
+            "????????",
             "????????",
             "????????",
             "????????"),
@@ -2722,7 +2904,8 @@ const struct Item gItems[] =
         .name = LANGUAGE_STRING(
             "BRIGHTPOWDER",
             "POUDRECLAIRE",
-            "LUMINPOLVERE"),
+            "LUMINPOLVERE",
+            "POLVO BRILLO"),
         .itemId = ITEM_BRIGHT_POWDER,
         .price = 10,
         .holdEffect = HOLD_EFFECT_EVASION_UP,
@@ -2738,7 +2921,8 @@ const struct Item gItems[] =
         .name = LANGUAGE_STRING(
             "WHITE HERB",
             "HERBEBLANCHE",
-            "ERBACHIARA"),
+            "ERBACHIARA",
+            "HIER. BLANCA"),
         .itemId = ITEM_WHITE_HERB,
         .price = 100,
         .holdEffect = HOLD_EFFECT_RESTORE_STATS,
@@ -2753,7 +2937,8 @@ const struct Item gItems[] =
         .name = LANGUAGE_STRING(
             "MACHO BRACE",
             "BRAC. MACHO",
-            "CRESCICAPPA"),
+            "CRESCICAPPA",
+            "VESTIDURA"),
         .itemId = ITEM_MACHO_BRACE,
         .price = 3000,
         .holdEffect = HOLD_EFFECT_MACHO_BRACE,
@@ -2768,7 +2953,8 @@ const struct Item gItems[] =
         .name = LANGUAGE_STRING(
             "EXP. SHARE",
             "MULTI EXP",
-            "CONDIV. ESP."),
+            "CONDIV. ESP.",
+            "REPARTIR EXP"),
         .itemId = ITEM_EXP_SHARE,
         .price = 3000,
         .holdEffect = HOLD_EFFECT_EXP_SHARE,
@@ -2783,7 +2969,8 @@ const struct Item gItems[] =
         .name = LANGUAGE_STRING(
             "QUICK CLAW",
             "VIVE GRIFFE",
-            "RAPIDARTIGLI"),
+            "RAPIDARTIGLI",
+            "GARRA RÁPIDA"),
         .itemId = ITEM_QUICK_CLAW,
         .price = 100,
         .holdEffect = HOLD_EFFECT_QUICK_CLAW,
@@ -2799,7 +2986,8 @@ const struct Item gItems[] =
         .name = LANGUAGE_STRING(
             "SOOTHE BELL",
             "GRELOT ZEN",
-            "CALMANELLA"),
+            "CALMANELLA",
+            "CAMP. ALIVIO"),
         .itemId = ITEM_SOOTHE_BELL,
         .price = 100,
         .holdEffect = HOLD_EFFECT_FRIENDSHIP_UP,
@@ -2814,7 +3002,8 @@ const struct Item gItems[] =
         .name = LANGUAGE_STRING(
             "MENTAL HERB",
             "HERBE MENTAL",
-            "MENTALERBA"),
+            "MENTALERBA",
+            "HIER. MENTAL"),
         .itemId = ITEM_MENTAL_HERB,
         .price = 100,
         .holdEffect = HOLD_EFFECT_CURE_ATTRACT,
@@ -2829,7 +3018,8 @@ const struct Item gItems[] =
         .name = LANGUAGE_STRING(
             "CHOICE BAND",
             "BAND. CHOIX",
-            "BENDASCELTA"),
+            "BENDASCELTA",
+            "CIN. ELEGIDA"),
         .itemId = ITEM_CHOICE_BAND,
         .price = 100,
         .holdEffect = HOLD_EFFECT_CHOICE_BAND,
@@ -2844,7 +3034,8 @@ const struct Item gItems[] =
         .name = LANGUAGE_STRING(
             "KING'S ROCK",
             "ROCHE ROYALE",
-            "ROCCIA DI RE"),
+            "ROCCIA DI RE",
+            "ROCA DEL REY"),
         .itemId = ITEM_KINGS_ROCK,
         .price = 100,
         .holdEffect = HOLD_EFFECT_FLINCH,
@@ -2860,7 +3051,8 @@ const struct Item gItems[] =
         .name = LANGUAGE_STRING(
             "SILVERPOWDER",
             "POUDRE ARG.",
-            "ARGENPOLVERE"),
+            "ARGENPOLVERE",
+            "POLVO PLATA"),
         .itemId = ITEM_SILVER_POWDER,
         .price = 100,
         .holdEffect = HOLD_EFFECT_BUG_POWER,
@@ -2876,7 +3068,8 @@ const struct Item gItems[] =
         .name = LANGUAGE_STRING(
             "AMULET COIN",
             "PIECE RUNE",
-            "MONETAMULETO"),
+            "MONETAMULETO",
+            "MON. AMULETO"),
         .itemId = ITEM_AMULET_COIN,
         .price = 100,
         .holdEffect = HOLD_EFFECT_DOUBLE_PRIZE,
@@ -2892,7 +3085,8 @@ const struct Item gItems[] =
         .name = LANGUAGE_STRING(
             "CLEANSE TAG",
             "RUNE PURIF.",
-            "VELOPURO"),
+            "VELOPURO",
+            "AMULETO"),
         .itemId = ITEM_CLEANSE_TAG,
         .price = 200,
         .holdEffect = HOLD_EFFECT_REPEL,
@@ -2907,7 +3101,8 @@ const struct Item gItems[] =
         .name = LANGUAGE_STRING(
             "SOUL DEW",
             "ROSEE AME",
-            "CUORUGIADA"),
+            "CUORUGIADA",
+            "ROCÍO BONDAD"),
         .itemId = ITEM_SOUL_DEW,
         .price = 200,
         .holdEffect = HOLD_EFFECT_SOUL_DEW,
@@ -2922,7 +3117,8 @@ const struct Item gItems[] =
         .name = LANGUAGE_STRING(
             "DEEPSEATOOTH",
             "DENT OCEAN",
-            "DENTE ABISSI"),
+            "DENTE ABISSI",
+            "DIENTE MAR."),
         .itemId = ITEM_DEEP_SEA_TOOTH,
         .price = 200,
         .holdEffect = HOLD_EFFECT_DEEP_SEA_TOOTH,
@@ -2937,7 +3133,8 @@ const struct Item gItems[] =
         .name = LANGUAGE_STRING(
             "DEEPSEASCALE",
             "ECAILLEOCEAN",
-            "SQUAMABISSI"),
+            "SQUAMABISSI",
+            "ESCAMA MAR."),
         .itemId = ITEM_DEEP_SEA_SCALE,
         .price = 200,
         .holdEffect = HOLD_EFFECT_DEEP_SEA_SCALE,
@@ -2952,7 +3149,8 @@ const struct Item gItems[] =
         .name = LANGUAGE_STRING(
             "SMOKE BALL",
             "BOULE FUMEE",
-            "PALLA FUMO"),
+            "PALLA FUMO",
+            "BOLA HUMO"),
         .itemId = ITEM_SMOKE_BALL,
         .price = 200,
         .holdEffect = HOLD_EFFECT_CAN_ALWAYS_RUN,
@@ -2967,7 +3165,8 @@ const struct Item gItems[] =
         .name = LANGUAGE_STRING(
             "EVERSTONE",
             "PIERRE STASE",
-            "PIETRASTANTE"),
+            "PIETRASTANTE",
+            "PIEDRAETERNA"),
         .itemId = ITEM_EVERSTONE,
         .price = 200,
         .holdEffect = HOLD_EFFECT_PREVENT_EVOLVE,
@@ -2982,7 +3181,8 @@ const struct Item gItems[] =
         .name = LANGUAGE_STRING(
             "FOCUS BAND",
             "BANDEAU",
-            "BANDANA"),
+            "BANDANA",
+            "CINTA FOCUS"),
         .itemId = ITEM_FOCUS_BAND,
         .price = 200,
         .holdEffect = HOLD_EFFECT_FOCUS_BAND,
@@ -2998,7 +3198,8 @@ const struct Item gItems[] =
         .name = LANGUAGE_STRING(
             "LUCKY EGG",
             "OEUF CHANCE",
-            "FORTUNUOVO"),
+            "FORTUNUOVO",
+            "HUEVO SUERTE"),
         .itemId = ITEM_LUCKY_EGG,
         .price = 200,
         .holdEffect = HOLD_EFFECT_LUCKY_EGG,
@@ -3013,7 +3214,8 @@ const struct Item gItems[] =
         .name = LANGUAGE_STRING(
             "SCOPE LENS",
             "LENTILSCOPE",
-            "MIRINO"),
+            "MIRINO",
+            "PERISCOPIO"),
         .itemId = ITEM_SCOPE_LENS,
         .price = 200,
         .holdEffect = HOLD_EFFECT_SCOPE_LENS,
@@ -3028,7 +3230,8 @@ const struct Item gItems[] =
         .name = LANGUAGE_STRING(
             "METAL COAT",
             "PEAU METAL",
-            "METALCOPERTA"),
+            "METALCOPERTA",
+            "REV.METÁLICO"),
         .itemId = ITEM_METAL_COAT,
         .price = 100,
         .holdEffect = HOLD_EFFECT_STEEL_POWER,
@@ -3044,7 +3247,8 @@ const struct Item gItems[] =
         .name = LANGUAGE_STRING(
             "LEFTOVERS",
             "RESTES",
-            "AVANZI"),
+            "AVANZI",
+            "RESTOS"),
         .itemId = ITEM_LEFTOVERS,
         .price = 200,
         .holdEffect = HOLD_EFFECT_LEFTOVERS,
@@ -3060,7 +3264,8 @@ const struct Item gItems[] =
         .name = LANGUAGE_STRING(
             "DRAGON SCALE",
             "ECAILLEDRACO",
-            "SQUAMA DRAGO"),
+            "SQUAMA DRAGO",
+            "ESCAMADRAGÓN"),
         .itemId = ITEM_DRAGON_SCALE,
         .price = 2100,
         .holdEffect = HOLD_EFFECT_DRAGON_SCALE,
@@ -3076,7 +3281,8 @@ const struct Item gItems[] =
         .name = LANGUAGE_STRING(
             "LIGHT BALL",
             "BALLELUMIERE",
-            "ELETTROPALLA"),
+            "ELETTROPALLA",
+            "BOLALUMINOSA"),
         .itemId = ITEM_LIGHT_BALL,
         .price = 100,
         .holdEffect = HOLD_EFFECT_LIGHT_BALL,
@@ -3091,7 +3297,8 @@ const struct Item gItems[] =
         .name = LANGUAGE_STRING(
             "SOFT SAND",
             "SABLE DOUX",
-            "SABBIA SOFF."),
+            "SABBIA SOFF.",
+            "ARENA FINA"),
         .itemId = ITEM_SOFT_SAND,
         .price = 100,
         .holdEffect = HOLD_EFFECT_GROUND_POWER,
@@ -3107,7 +3314,8 @@ const struct Item gItems[] =
         .name = LANGUAGE_STRING(
             "HARD STONE",
             "PIERRE DURE",
-            "PIETRADURA"),
+            "PIETRADURA",
+            "PIEDRA DURA"),
         .itemId = ITEM_HARD_STONE,
         .price = 100,
         .holdEffect = HOLD_EFFECT_ROCK_POWER,
@@ -3123,7 +3331,8 @@ const struct Item gItems[] =
         .name = LANGUAGE_STRING(
             "MIRACLE SEED",
             "GRAIN MIRACL",
-            "MIRACOLSEME"),
+            "MIRACOLSEME",
+            "SEM. MILAGRO"),
         .itemId = ITEM_MIRACLE_SEED,
         .price = 100,
         .holdEffect = HOLD_EFFECT_GRASS_POWER,
@@ -3139,7 +3348,8 @@ const struct Item gItems[] =
         .name = LANGUAGE_STRING(
             "BLACKGLASSES",
             "LUNET.NOIRES",
-            "OCCHIALINERI"),
+            "OCCHIALINERI",
+            "GAFAS DE SOL"),
         .itemId = ITEM_BLACK_GLASSES,
         .price = 100,
         .holdEffect = HOLD_EFFECT_DARK_POWER,
@@ -3155,7 +3365,8 @@ const struct Item gItems[] =
         .name = LANGUAGE_STRING(
             "BLACK BELT",
             "CEINT.NOIRE",
-            "CINTURANERA"),
+            "CINTURANERA",
+            "CINT. NEGRO"),
         .itemId = ITEM_BLACK_BELT,
         .price = 100,
         .holdEffect = HOLD_EFFECT_FIGHTING_POWER,
@@ -3171,7 +3382,8 @@ const struct Item gItems[] =
         .name = LANGUAGE_STRING(
             "MAGNET",
             "AIMANT",
-            "CALAMITA"),
+            "CALAMITA",
+            "IMÁN"),
         .itemId = ITEM_MAGNET,
         .price = 100,
         .holdEffect = HOLD_EFFECT_ELECTRIC_POWER,
@@ -3187,7 +3399,8 @@ const struct Item gItems[] =
         .name = LANGUAGE_STRING(
             "MYSTIC WATER",
             "EAU MYSTIQUE",
-            "ACQUA MAGICA"),
+            "ACQUA MAGICA",
+            "AGUA MÍSTICA"),
         .itemId = ITEM_MYSTIC_WATER,
         .price = 100,
         .holdEffect = HOLD_EFFECT_WATER_POWER,
@@ -3203,7 +3416,8 @@ const struct Item gItems[] =
         .name = LANGUAGE_STRING(
             "SHARP BEAK",
             "BEC POINTU",
-            "BECCAFFILATO"),
+            "BECCAFFILATO",
+            "PICO AFILADO"),
         .itemId = ITEM_SHARP_BEAK,
         .price = 100,
         .holdEffect = HOLD_EFFECT_FLYING_POWER,
@@ -3219,7 +3433,8 @@ const struct Item gItems[] =
         .name = LANGUAGE_STRING(
             "POISON BARB",
             "PIC VENIN",
-            "VELENACULEO"),
+            "VELENACULEO",
+            "FLECHA VEN."),
         .itemId = ITEM_POISON_BARB,
         .price = 100,
         .holdEffect = HOLD_EFFECT_POISON_POWER,
@@ -3235,7 +3450,8 @@ const struct Item gItems[] =
         .name = LANGUAGE_STRING(
             "NEVERMELTICE",
             "GLACETERNEL",
-            "GELOMAI"),
+            "GELOMAI",
+            "ANTIDERRETIR"),
         .itemId = ITEM_NEVER_MELT_ICE,
         .price = 100,
         .holdEffect = HOLD_EFFECT_ICE_POWER,
@@ -3251,7 +3467,8 @@ const struct Item gItems[] =
         .name = LANGUAGE_STRING(
             "SPELL TAG",
             "RUNE SORT",
-            "SPETTROTARGA"),
+            "SPETTROTARGA",
+            "HECHIZO"),
         .itemId = ITEM_SPELL_TAG,
         .price = 100,
         .holdEffect = HOLD_EFFECT_GHOST_POWER,
@@ -3267,7 +3484,8 @@ const struct Item gItems[] =
         .name = LANGUAGE_STRING(
             "TWISTEDSPOON",
             "CUILLERTORDU",
-            "CUCCH. TORTO"),
+            "CUCCH. TORTO",
+            "CUCHARA TOR"),
         .itemId = ITEM_TWISTED_SPOON,
         .price = 100,
         .holdEffect = HOLD_EFFECT_PSYCHIC_POWER,
@@ -3283,7 +3501,8 @@ const struct Item gItems[] =
         .name = LANGUAGE_STRING(
             "CHARCOAL",
             "CHARBON",
-            "CARBONELLA"),
+            "CARBONELLA",
+            "CARBÓN"),
         .itemId = ITEM_CHARCOAL,
         .price = 9800,
         .holdEffect = HOLD_EFFECT_FIRE_POWER,
@@ -3299,7 +3518,8 @@ const struct Item gItems[] =
         .name = LANGUAGE_STRING(
             "DRAGON FANG",
             "CROC DRAGON",
-            "DENTEDIDRAGO"),
+            "DENTEDIDRAGO",
+            "COLMILLODRAG"),
         .itemId = ITEM_DRAGON_FANG,
         .price = 100,
         .holdEffect = HOLD_EFFECT_DRAGON_POWER,
@@ -3315,7 +3535,8 @@ const struct Item gItems[] =
         .name = LANGUAGE_STRING(
             "SILK SCARF",
             "MOUCH. SOIE",
-            "SCIARPA SETA"),
+            "SCIARPA SETA",
+            "PAÑUELO SEDA"),
         .itemId = ITEM_SILK_SCARF,
         .price = 100,
         .holdEffect = HOLD_EFFECT_NORMAL_POWER,
@@ -3331,7 +3552,8 @@ const struct Item gItems[] =
         .name = LANGUAGE_STRING(
             "UP-GRADE",
             "AMELIORATOR",
-            "UPGRADE"),
+            "UPGRADE",
+            "MEJORA"),
         .itemId = ITEM_UP_GRADE,
         .price = 2100,
         .holdEffect = HOLD_EFFECT_UP_GRADE,
@@ -3346,7 +3568,8 @@ const struct Item gItems[] =
         .name = LANGUAGE_STRING(
             "SHELL BELL",
             "GRELOT COQUE",
-            "CONCHINELLA"),
+            "CONCHINELLA",
+            "CAMP. CONCHA"),
         .itemId = ITEM_SHELL_BELL,
         .price = 200,
         .holdEffect = HOLD_EFFECT_SHELL_BELL,
@@ -3362,7 +3585,8 @@ const struct Item gItems[] =
         .name = LANGUAGE_STRING(
             "SEA INCENSE",
             "ENCENS MER",
-            "MAREAROMA"),
+            "MAREAROMA",
+            "INCIE. MAR."),
         .itemId = ITEM_SEA_INCENSE,
         .price = 9600,
         .holdEffect = HOLD_EFFECT_WATER_POWER,
@@ -3378,7 +3602,8 @@ const struct Item gItems[] =
         .name = LANGUAGE_STRING(
             "LAX INCENSE",
             "ENCENS DOUX",
-            "DISTRAROMA"),
+            "DISTRAROMA",
+            "INCIE. SUAVE"),
         .itemId = ITEM_LAX_INCENSE,
         .price = 9600,
         .holdEffect = HOLD_EFFECT_EVASION_UP,
@@ -3394,7 +3619,8 @@ const struct Item gItems[] =
         .name = LANGUAGE_STRING(
             "LUCKY PUNCH",
             "POING CHANCE",
-            "FORTUNPUGNO"),
+            "FORTUNPUGNO",
+            "PUÑO SUERTE"),
         .itemId = ITEM_LUCKY_PUNCH,
         .price = 10,
         .holdEffect = HOLD_EFFECT_LUCKY_PUNCH,
@@ -3409,7 +3635,8 @@ const struct Item gItems[] =
         .name = LANGUAGE_STRING(
             "METAL POWDER",
             "POUDRE METAL",
-            "METALPOLVERE"),
+            "METALPOLVERE",
+            "POL.METÁLICO"),
         .itemId = ITEM_METAL_POWDER,
         .price = 10,
         .holdEffect = HOLD_EFFECT_METAL_POWDER,
@@ -3424,7 +3651,8 @@ const struct Item gItems[] =
         .name = LANGUAGE_STRING(
             "THICK CLUB",
             "MASSE OS",
-            "OSSOSPESSO"),
+            "OSSOSPESSO",
+            "HUESO GRUESO"),
         .itemId = ITEM_THICK_CLUB,
         .price = 500,
         .holdEffect = HOLD_EFFECT_THICK_CLUB,
@@ -3439,7 +3667,8 @@ const struct Item gItems[] =
         .name = LANGUAGE_STRING(
             "STICK",
             "BATON",
-            "GAMBO"),
+            "GAMBO",
+            "PALO"),
         .itemId = ITEM_STICK,
         .price = 200,
         .holdEffect = HOLD_EFFECT_STICK,
@@ -3452,6 +3681,7 @@ const struct Item gItems[] =
     [ITEM_0E2] =
     {
         .name = LANGUAGE_STRING(
+            "????????",
             "????????",
             "????????",
             "????????"),
@@ -3466,6 +3696,7 @@ const struct Item gItems[] =
     [ITEM_0E3] =
     {
         .name = LANGUAGE_STRING(
+            "????????",
             "????????",
             "????????",
             "????????"),
@@ -3480,6 +3711,7 @@ const struct Item gItems[] =
     [ITEM_0E4] =
     {
         .name = LANGUAGE_STRING(
+            "????????",
             "????????",
             "????????",
             "????????"),
@@ -3494,6 +3726,7 @@ const struct Item gItems[] =
     [ITEM_0E5] =
     {
         .name = LANGUAGE_STRING(
+            "????????",
             "????????",
             "????????",
             "????????"),
@@ -3508,6 +3741,7 @@ const struct Item gItems[] =
     [ITEM_0E6] =
     {
         .name = LANGUAGE_STRING(
+            "????????",
             "????????",
             "????????",
             "????????"),
@@ -3522,6 +3756,7 @@ const struct Item gItems[] =
     [ITEM_0E7] =
     {
         .name = LANGUAGE_STRING(
+            "????????",
             "????????",
             "????????",
             "????????"),
@@ -3536,6 +3771,7 @@ const struct Item gItems[] =
     [ITEM_0E8] =
     {
         .name = LANGUAGE_STRING(
+            "????????",
             "????????",
             "????????",
             "????????"),
@@ -3550,6 +3786,7 @@ const struct Item gItems[] =
     [ITEM_0E9] =
     {
         .name = LANGUAGE_STRING(
+            "????????",
             "????????",
             "????????",
             "????????"),
@@ -3564,6 +3801,7 @@ const struct Item gItems[] =
     [ITEM_0EA] =
     {
         .name = LANGUAGE_STRING(
+            "????????",
             "????????",
             "????????",
             "????????"),
@@ -3578,6 +3816,7 @@ const struct Item gItems[] =
     [ITEM_0EB] =
     {
         .name = LANGUAGE_STRING(
+            "????????",
             "????????",
             "????????",
             "????????"),
@@ -3592,6 +3831,7 @@ const struct Item gItems[] =
     [ITEM_0EC] =
     {
         .name = LANGUAGE_STRING(
+            "????????",
             "????????",
             "????????",
             "????????"),
@@ -3606,6 +3846,7 @@ const struct Item gItems[] =
     [ITEM_0ED] =
     {
         .name = LANGUAGE_STRING(
+            "????????",
             "????????",
             "????????",
             "????????"),
@@ -3620,6 +3861,7 @@ const struct Item gItems[] =
     [ITEM_0EE] =
     {
         .name = LANGUAGE_STRING(
+            "????????",
             "????????",
             "????????",
             "????????"),
@@ -3634,6 +3876,7 @@ const struct Item gItems[] =
     [ITEM_0EF] =
     {
         .name = LANGUAGE_STRING(
+            "????????",
             "????????",
             "????????",
             "????????"),
@@ -3648,6 +3891,7 @@ const struct Item gItems[] =
     [ITEM_0F0] =
     {
         .name = LANGUAGE_STRING(
+            "????????",
             "????????",
             "????????",
             "????????"),
@@ -3662,6 +3906,7 @@ const struct Item gItems[] =
     [ITEM_0F1] =
     {
         .name = LANGUAGE_STRING(
+            "????????",
             "????????",
             "????????",
             "????????"),
@@ -3676,6 +3921,7 @@ const struct Item gItems[] =
     [ITEM_0F2] =
     {
         .name = LANGUAGE_STRING(
+            "????????",
             "????????",
             "????????",
             "????????"),
@@ -3690,6 +3936,7 @@ const struct Item gItems[] =
     [ITEM_0F3] =
     {
         .name = LANGUAGE_STRING(
+            "????????",
             "????????",
             "????????",
             "????????"),
@@ -3704,6 +3951,7 @@ const struct Item gItems[] =
     [ITEM_0F4] =
     {
         .name = LANGUAGE_STRING(
+            "????????",
             "????????",
             "????????",
             "????????"),
@@ -3718,6 +3966,7 @@ const struct Item gItems[] =
     [ITEM_0F5] =
     {
         .name = LANGUAGE_STRING(
+            "????????",
             "????????",
             "????????",
             "????????"),
@@ -3732,6 +3981,7 @@ const struct Item gItems[] =
     [ITEM_0F6] =
     {
         .name = LANGUAGE_STRING(
+            "????????",
             "????????",
             "????????",
             "????????"),
@@ -3746,6 +3996,7 @@ const struct Item gItems[] =
     [ITEM_0F7] =
     {
         .name = LANGUAGE_STRING(
+            "????????",
             "????????",
             "????????",
             "????????"),
@@ -3760,6 +4011,7 @@ const struct Item gItems[] =
     [ITEM_0F8] =
     {
         .name = LANGUAGE_STRING(
+            "????????",
             "????????",
             "????????",
             "????????"),
@@ -3774,6 +4026,7 @@ const struct Item gItems[] =
     [ITEM_0F9] =
     {
         .name = LANGUAGE_STRING(
+            "????????",
             "????????",
             "????????",
             "????????"),
@@ -3788,6 +4041,7 @@ const struct Item gItems[] =
     [ITEM_0FA] =
     {
         .name = LANGUAGE_STRING(
+            "????????",
             "????????",
             "????????",
             "????????"),
@@ -3802,6 +4056,7 @@ const struct Item gItems[] =
     [ITEM_0FB] =
     {
         .name = LANGUAGE_STRING(
+            "????????",
             "????????",
             "????????",
             "????????"),
@@ -3816,6 +4071,7 @@ const struct Item gItems[] =
     [ITEM_0FC] =
     {
         .name = LANGUAGE_STRING(
+            "????????",
             "????????",
             "????????",
             "????????"),
@@ -3830,6 +4086,7 @@ const struct Item gItems[] =
     [ITEM_0FD] =
     {
         .name = LANGUAGE_STRING(
+            "????????",
             "????????",
             "????????",
             "????????"),
@@ -3846,7 +4103,8 @@ const struct Item gItems[] =
         .name = LANGUAGE_STRING(
             "RED SCARF",
             "FOUL. ROUGE",
-            "FASCIA ROSSA"),
+            "FASCIA ROSSA",
+            "PAÑUELO ROJO"),
         .itemId = ITEM_RED_SCARF,
         .price = 100,
         .description = sRedScarfDesc,
@@ -3860,7 +4118,8 @@ const struct Item gItems[] =
         .name = LANGUAGE_STRING(
             "BLUE SCARF",
             "FOUL. BLEU",
-            "FASCIA BLU"),
+            "FASCIA BLU",
+            "PAÑUELO AZUL"),
         .itemId = ITEM_BLUE_SCARF,
         .price = 100,
         .description = sBlueScarfDesc,
@@ -3874,7 +4133,8 @@ const struct Item gItems[] =
         .name = LANGUAGE_STRING(
             "PINK SCARF",
             "FOUL. ROSE",
-            "FASCIA ROSA"),
+            "FASCIA ROSA",
+            "PAÑUELO ROSA"),
         .itemId = ITEM_PINK_SCARF,
         .price = 100,
         .description = sPinkScarfDesc,
@@ -3888,7 +4148,8 @@ const struct Item gItems[] =
         .name = LANGUAGE_STRING(
             "GREEN SCARF",
             "FOUL. VERT",
-            "FASCIA VERDE"),
+            "FASCIA VERDE",
+            "PAÑ. VERDE"),
         .itemId = ITEM_GREEN_SCARF,
         .price = 100,
         .description = sGreenScarfDesc,
@@ -3902,7 +4163,8 @@ const struct Item gItems[] =
         .name = LANGUAGE_STRING(
             "YELLOW SCARF",
             "FOUL. JAUNE",
-            "FASCIA GIAL."),
+            "FASCIA GIAL.",
+            "P. AMARILLO"),
         .itemId = ITEM_YELLOW_SCARF,
         .price = 100,
         .description = sYellowScarfDesc,
@@ -3918,7 +4180,8 @@ const struct Item gItems[] =
         .name = LANGUAGE_STRING(
             "MACH BIKE",
             "VELO COURSE",
-            "BICI CORSA"),
+            "BICI CORSA",
+            "BICI CARRERA"),
         .itemId = ITEM_MACH_BIKE,
         .price = 0,
         .description = sMachBikeDesc,
@@ -3935,7 +4198,8 @@ const struct Item gItems[] =
         .name = LANGUAGE_STRING(
             "COIN CASE",
             "BOITE JETONS",
-            "SALVADANAIO"),
+            "SALVADANAIO",
+            "MONEDERO"),
         .itemId = ITEM_COIN_CASE,
         .price = 0,
         .description = sCoinCaseDesc,
@@ -3950,7 +4214,8 @@ const struct Item gItems[] =
         .name = LANGUAGE_STRING(
             "ITEMFINDER",
             "CHERCH'OBJET",
-            "DETECTOR"),
+            "DETECTOR",
+            "BUSCAOBJETOS"),
         .itemId = ITEM_ITEMFINDER,
         .price = 0,
         .description = sItemfinderDesc,
@@ -3966,7 +4231,8 @@ const struct Item gItems[] =
         .name = LANGUAGE_STRING(
             "OLD ROD",
             "CANNE",
-            "AMO VECCHIO"),
+            "AMO VECCHIO",
+            "CAÑA VIEJA"),
         .itemId = ITEM_OLD_ROD,
         .price = 0,
         .description = sOldRodDesc,
@@ -3983,7 +4249,8 @@ const struct Item gItems[] =
         .name = LANGUAGE_STRING(
             "GOOD ROD",
             "SUPER CANNE",
-            "AMO BUONO"),
+            "AMO BUONO",
+            "CAÑA BUENA"),
         .itemId = ITEM_GOOD_ROD,
         .price = 0,
         .description = sGoodRodDesc,
@@ -4000,7 +4267,8 @@ const struct Item gItems[] =
         .name = LANGUAGE_STRING(
             "SUPER ROD",
             "MEGA CANNE",
-            "SUPER AMO"),
+            "SUPER AMO",
+            "SUPERCAÑA"),
         .itemId = ITEM_SUPER_ROD,
         .price = 0,
         .description = sSuperRodDesc,
@@ -4017,7 +4285,8 @@ const struct Item gItems[] =
         .name = LANGUAGE_STRING(
             "S.S. TICKET",
             "PASSE BATEAU",
-            "BIGL. NAVE"),
+            "BIGL. NAVE",
+            "TICKET BARCO"),
         .itemId = ITEM_SS_TICKET,
         .price = 0,
         .description = sSSTicketDesc,
@@ -4032,7 +4301,8 @@ const struct Item gItems[] =
         .name = LANGUAGE_STRING(
             "CONTEST PASS",
             "PASSECONCOUR",
-            "TESSERA GARE"),
+            "TESSERA GARE",
+            "PASE CONCUR."),
         .itemId = ITEM_CONTEST_PASS,
         .price = 0,
         .description = sContestPassDesc,
@@ -4045,6 +4315,7 @@ const struct Item gItems[] =
     [ITEM_10B] =
     {
         .name = LANGUAGE_STRING(
+            "????????",
             "????????",
             "????????",
             "????????"),
@@ -4061,7 +4332,8 @@ const struct Item gItems[] =
         .name = LANGUAGE_STRING(
             "WAILMER PAIL",
             "SEAU WAILMER",
-            "VASO WAILMER"),
+            "VASO WAILMER",
+            "CUBO WAILMER"),
         .itemId = ITEM_WAILMER_PAIL,
         .price = 0,
         .description = sWailmerPailDesc,
@@ -4076,7 +4348,8 @@ const struct Item gItems[] =
         .name = LANGUAGE_STRING(
             "DEVON GOODS",
             "PACK DEVON",
-            "MERCE DEVON"),
+            "MERCE DEVON",
+            "PIEZAS DEVON"),
         .itemId = ITEM_DEVON_GOODS,
         .price = 0,
         .description = sDevonGoodsDesc,
@@ -4091,7 +4364,8 @@ const struct Item gItems[] =
         .name = LANGUAGE_STRING(
             "SOOT SACK",
             "SAC A SUIE",
-            "SACCO CENERE"),
+            "SACCO CENERE",
+            "SACO HOLLÍN"),
         .itemId = ITEM_SOOT_SACK,
         .price = 0,
         .description = sSootSackDesc,
@@ -4106,7 +4380,8 @@ const struct Item gItems[] =
         .name = LANGUAGE_STRING(
             "BASEMENT KEY",
             "CLE SOUS-SOL",
-            "CHIAVE SOTT."),
+            "CHIAVE SOTT.",
+            "LL. SÓTANO"),
         .itemId = ITEM_BASEMENT_KEY,
         .price = 0,
         .description = sBasementKeyDesc,
@@ -4121,7 +4396,8 @@ const struct Item gItems[] =
         .name = LANGUAGE_STRING(
             "ACRO BIKE",
             "VELO CROSS",
-            "BICI CROSS"),
+            "BICI CROSS",
+            "BICI ACROB."),
         .itemId = ITEM_ACRO_BIKE,
         .price = 0,
         .description = sAcroBikeDesc,
@@ -4138,7 +4414,8 @@ const struct Item gItems[] =
         .name = LANGUAGE_STRING(
             "{POKEBLOCK} CASE",
             "BOITE {POKEBLOCK}S",
-            "PORTA{POKEMELLE}"),
+            "PORTA{POKEMELLE}",
+            "TUBO {POKEBLOCK}S"),
         .itemId = ITEM_POKEBLOCK_CASE,
         .price = 0,
         .description = sPokeblockCaseDesc,
@@ -4154,7 +4431,8 @@ const struct Item gItems[] =
         .name = LANGUAGE_STRING(
             "LETTER",
             "LETTRE",
-            "LETTERA"),
+            "LETTERA",
+            "CARTA"),
         .itemId = ITEM_LETTER,
         .price = 0,
         .description = sLetterDesc,
@@ -4169,7 +4447,8 @@ const struct Item gItems[] =
         .name = LANGUAGE_STRING(
             "EON TICKET",
             "PASSE EON",
-            "BIGL. EONE"),
+            "BIGL. EONE",
+            "TICKET EÓN"),
         .itemId = ITEM_EON_TICKET,
         .price = 0,
         .description = sEonTicketDesc,
@@ -4185,7 +4464,8 @@ const struct Item gItems[] =
         .name = LANGUAGE_STRING(
             "RED ORB",
             "ORBE ROUGE",
-            "SFERA ROSSA"),
+            "SFERA ROSSA",
+            "ESFERA ROJA"),
         .itemId = ITEM_RED_ORB,
         .price = 0,
         .description = sRedOrbDesc,
@@ -4200,7 +4480,8 @@ const struct Item gItems[] =
         .name = LANGUAGE_STRING(
             "BLUE ORB",
             "ORBE BLEU",
-            "SFERA BLU"),
+            "SFERA BLU",
+            "ESFERA AZUL"),
         .itemId = ITEM_BLUE_ORB,
         .price = 0,
         .description = sBlueOrbDesc,
@@ -4215,7 +4496,8 @@ const struct Item gItems[] =
         .name = LANGUAGE_STRING(
             "SCANNER",
             "SCANNER",
-            "SCANNER"),
+            "SCANNER",
+            "ESCÁNER"),
         .itemId = ITEM_SCANNER,
         .price = 0,
         .description = sScannerDesc,
@@ -4230,7 +4512,8 @@ const struct Item gItems[] =
         .name = LANGUAGE_STRING(
             "GO-GOGGLES",
             "LUNET. SABLE",
-            "OCCHIALONI"),
+            "OCCHIALONI",
+            "GAF. AISLAN."),
         .itemId = ITEM_GO_GOGGLES,
         .price = 0,
         .description = sGoGogglesDesc,
@@ -4245,7 +4528,8 @@ const struct Item gItems[] =
         .name = LANGUAGE_STRING(
             "METEORITE",
             "METEORITE",
-            "METEORITE"),
+            "METEORITE",
+            "METEORITO"),
         .itemId = ITEM_METEORITE,
         .price = 0,
         .description = sMeteoriteDesc,
@@ -4260,7 +4544,8 @@ const struct Item gItems[] =
         .name = LANGUAGE_STRING(
             "RM. 1 KEY",
             "CLE SALLE 1",
-            "CHIAVE CAB.1"),
+            "CHIAVE CAB.1",
+            "LL. CABINA 1"),
         .itemId = ITEM_ROOM_1_KEY,
         .price = 0,
         .description = sRoom1KeyDesc,
@@ -4275,7 +4560,8 @@ const struct Item gItems[] =
         .name = LANGUAGE_STRING(
             "RM. 2 KEY",
             "CLE SALLE 2",
-            "CHIAVE CAB.2"),
+            "CHIAVE CAB.2",
+            "LL. CABINA 2"),
         .itemId = ITEM_ROOM_2_KEY,
         .price = 0,
         .description = sRoom2KeyDesc,
@@ -4290,7 +4576,8 @@ const struct Item gItems[] =
         .name = LANGUAGE_STRING(
             "RM. 4 KEY",
             "CLE SALLE 4",
-            "CHIAVE CAB.4"),
+            "CHIAVE CAB.4",
+            "LL. CABINA 4"),
         .itemId = ITEM_ROOM_4_KEY,
         .price = 0,
         .description = sRoom4KeyDesc,
@@ -4305,7 +4592,8 @@ const struct Item gItems[] =
         .name = LANGUAGE_STRING(
             "RM. 6 KEY",
             "CLE SALLE 6",
-            "CHIAVE CAB.6"),
+            "CHIAVE CAB.6",
+            "LL. CABINA 6"),
         .itemId = ITEM_ROOM_6_KEY,
         .price = 0,
         .description = sRoom6KeyDesc,
@@ -4320,7 +4608,8 @@ const struct Item gItems[] =
         .name = LANGUAGE_STRING(
             "STORAGE KEY",
             "CLE STOCKAGE",
-            "CHIAVE STIVA"),
+            "CHIAVE STIVA",
+            "LL. ALMACÉN"),
         .itemId = ITEM_STORAGE_KEY,
         .price = 0,
         .description = sStorageKeyDesc,
@@ -4335,7 +4624,8 @@ const struct Item gItems[] =
         .name = LANGUAGE_STRING(
             "ROOT FOSSIL",
             "FOSS. RACINE",
-            "RADIFOSSILE"),
+            "RADIFOSSILE",
+            "FÓSIL RAÍZ"),
         .itemId = ITEM_ROOT_FOSSIL,
         .price = 0,
         .description = sRootFossilDesc,
@@ -4350,7 +4640,8 @@ const struct Item gItems[] =
         .name = LANGUAGE_STRING(
             "CLAW FOSSIL",
             "FOSS. GRIFFE",
-            "FOSSILUNGHIA"),
+            "FOSSILUNGHIA",
+            "FÓSIL GARRA"),
         .itemId = ITEM_CLAW_FOSSIL,
         .price = 0,
         .description = sClawFossilDesc,
@@ -4365,7 +4656,8 @@ const struct Item gItems[] =
         .name = LANGUAGE_STRING(
             "DEVON SCOPE",
             "DEVON SCOPE",
-            "DEVONSCOPIO"),
+            "DEVONSCOPIO",
+            "DETEC. DEVON"),
         .itemId = ITEM_DEVON_SCOPE,
         .price = 0,
         .description = sDevonScopeDesc,
@@ -4382,6 +4674,7 @@ const struct Item gItems[] =
         .name = LANGUAGE_STRING(
             "TM01",
             "CT01",
+            "MT01",
             "MT01"),
         .itemId = ITEM_TM01,
         .price = 3000,
@@ -4396,6 +4689,7 @@ const struct Item gItems[] =
         .name = LANGUAGE_STRING(
             "TM02",
             "CT02",
+            "MT02",
             "MT02"),
         .itemId = ITEM_TM02,
         .price = 3000,
@@ -4410,6 +4704,7 @@ const struct Item gItems[] =
         .name = LANGUAGE_STRING(
             "TM03",
             "CT03",
+            "MT03",
             "MT03"),
         .itemId = ITEM_TM03,
         .price = 3000,
@@ -4424,6 +4719,7 @@ const struct Item gItems[] =
         .name = LANGUAGE_STRING(
             "TM04",
             "CT04",
+            "MT04",
             "MT04"),
         .itemId = ITEM_TM04,
         .price = 3000,
@@ -4438,6 +4734,7 @@ const struct Item gItems[] =
         .name = LANGUAGE_STRING(
             "TM05",
             "CT05",
+            "MT05",
             "MT05"),
         .itemId = ITEM_TM05,
         .price = 1000,
@@ -4452,6 +4749,7 @@ const struct Item gItems[] =
         .name = LANGUAGE_STRING(
             "TM06",
             "CT06",
+            "MT06",
             "MT06"),
         .itemId = ITEM_TM06,
         .price = 3000,
@@ -4466,6 +4764,7 @@ const struct Item gItems[] =
         .name = LANGUAGE_STRING(
             "TM07",
             "CT07",
+            "MT07",
             "MT07"),
         .itemId = ITEM_TM07,
         .price = 3000,
@@ -4480,6 +4779,7 @@ const struct Item gItems[] =
         .name = LANGUAGE_STRING(
             "TM08",
             "CT08",
+            "MT08",
             "MT08"),
         .itemId = ITEM_TM08,
         .price = 3000,
@@ -4494,6 +4794,7 @@ const struct Item gItems[] =
         .name = LANGUAGE_STRING(
             "TM09",
             "CT09",
+            "MT09",
             "MT09"),
         .itemId = ITEM_TM09,
         .price = 3000,
@@ -4508,6 +4809,7 @@ const struct Item gItems[] =
         .name = LANGUAGE_STRING(
             "TM10",
             "CT10",
+            "MT10",
             "MT10"),
         .itemId = ITEM_TM10,
         .price = 3000,
@@ -4522,6 +4824,7 @@ const struct Item gItems[] =
         .name = LANGUAGE_STRING(
             "TM11",
             "CT11",
+            "MT11",
             "MT11"),
         .itemId = ITEM_TM11,
         .price = 2000,
@@ -4536,6 +4839,7 @@ const struct Item gItems[] =
         .name = LANGUAGE_STRING(
             "TM12",
             "CT12",
+            "MT12",
             "MT12"),
         .itemId = ITEM_TM12,
         .price = 3000,
@@ -4550,6 +4854,7 @@ const struct Item gItems[] =
         .name = LANGUAGE_STRING(
             "TM13",
             "CT13",
+            "MT13",
             "MT13"),
         .itemId = ITEM_TM13,
         .price = 3000,
@@ -4564,6 +4869,7 @@ const struct Item gItems[] =
         .name = LANGUAGE_STRING(
             "TM14",
             "CT14",
+            "MT14",
             "MT14"),
         .itemId = ITEM_TM14,
         .price = 5500,
@@ -4578,6 +4884,7 @@ const struct Item gItems[] =
         .name = LANGUAGE_STRING(
             "TM15",
             "CT15",
+            "MT15",
             "MT15"),
         .itemId = ITEM_TM15,
         .price = 7500,
@@ -4592,6 +4899,7 @@ const struct Item gItems[] =
         .name = LANGUAGE_STRING(
             "TM16",
             "CT16",
+            "MT16",
             "MT16"),
         .itemId = ITEM_TM16,
         .price = 3000,
@@ -4606,6 +4914,7 @@ const struct Item gItems[] =
         .name = LANGUAGE_STRING(
             "TM17",
             "CT17",
+            "MT17",
             "MT17"),
         .itemId = ITEM_TM17,
         .price = 3000,
@@ -4620,6 +4929,7 @@ const struct Item gItems[] =
         .name = LANGUAGE_STRING(
             "TM18",
             "CT18",
+            "MT18",
             "MT18"),
         .itemId = ITEM_TM18,
         .price = 2000,
@@ -4634,6 +4944,7 @@ const struct Item gItems[] =
         .name = LANGUAGE_STRING(
             "TM19",
             "CT19",
+            "MT19",
             "MT19"),
         .itemId = ITEM_TM19,
         .price = 3000,
@@ -4648,6 +4959,7 @@ const struct Item gItems[] =
         .name = LANGUAGE_STRING(
             "TM20",
             "CT20",
+            "MT20",
             "MT20"),
         .itemId = ITEM_TM20,
         .price = 3000,
@@ -4662,6 +4974,7 @@ const struct Item gItems[] =
         .name = LANGUAGE_STRING(
             "TM21",
             "CT21",
+            "MT21",
             "MT21"),
         .itemId = ITEM_TM21,
         .price = 1000,
@@ -4676,6 +4989,7 @@ const struct Item gItems[] =
         .name = LANGUAGE_STRING(
             "TM22",
             "CT22",
+            "MT22",
             "MT22"),
         .itemId = ITEM_TM22,
         .price = 3000,
@@ -4690,6 +5004,7 @@ const struct Item gItems[] =
         .name = LANGUAGE_STRING(
             "TM23",
             "CT23",
+            "MT23",
             "MT23"),
         .itemId = ITEM_TM23,
         .price = 3000,
@@ -4704,6 +5019,7 @@ const struct Item gItems[] =
         .name = LANGUAGE_STRING(
             "TM24",
             "CT24",
+            "MT24",
             "MT24"),
         .itemId = ITEM_TM24,
         .price = 3000,
@@ -4718,6 +5034,7 @@ const struct Item gItems[] =
         .name = LANGUAGE_STRING(
             "TM25",
             "CT25",
+            "MT25",
             "MT25"),
         .itemId = ITEM_TM25,
         .price = 5500,
@@ -4732,6 +5049,7 @@ const struct Item gItems[] =
         .name = LANGUAGE_STRING(
             "TM26",
             "CT26",
+            "MT26",
             "MT26"),
         .itemId = ITEM_TM26,
         .price = 3000,
@@ -4746,6 +5064,7 @@ const struct Item gItems[] =
         .name = LANGUAGE_STRING(
             "TM27",
             "CT27",
+            "MT27",
             "MT27"),
         .itemId = ITEM_TM27,
         .price = 1000,
@@ -4760,6 +5079,7 @@ const struct Item gItems[] =
         .name = LANGUAGE_STRING(
             "TM28",
             "CT28",
+            "MT28",
             "MT28"),
         .itemId = ITEM_TM28,
         .price = 2000,
@@ -4774,6 +5094,7 @@ const struct Item gItems[] =
         .name = LANGUAGE_STRING(
             "TM29",
             "CT29",
+            "MT29",
             "MT29"),
         .itemId = ITEM_TM29,
         .price = 2000,
@@ -4788,6 +5109,7 @@ const struct Item gItems[] =
         .name = LANGUAGE_STRING(
             "TM30",
             "CT30",
+            "MT30",
             "MT30"),
         .itemId = ITEM_TM30,
         .price = 3000,
@@ -4802,6 +5124,7 @@ const struct Item gItems[] =
         .name = LANGUAGE_STRING(
             "TM31",
             "CT31",
+            "MT31",
             "MT31"),
         .itemId = ITEM_TM31,
         .price = 3000,
@@ -4816,6 +5139,7 @@ const struct Item gItems[] =
         .name = LANGUAGE_STRING(
             "TM32",
             "CT32",
+            "MT32",
             "MT32"),
         .itemId = ITEM_TM32,
         .price = 2000,
@@ -4830,6 +5154,7 @@ const struct Item gItems[] =
         .name = LANGUAGE_STRING(
             "TM33",
             "CT33",
+            "MT33",
             "MT33"),
         .itemId = ITEM_TM33,
         .price = 3000,
@@ -4844,6 +5169,7 @@ const struct Item gItems[] =
         .name = LANGUAGE_STRING(
             "TM34",
             "CT34",
+            "MT34",
             "MT34"),
         .itemId = ITEM_TM34,
         .price = 3000,
@@ -4858,6 +5184,7 @@ const struct Item gItems[] =
         .name = LANGUAGE_STRING(
             "TM35",
             "CT35",
+            "MT35",
             "MT35"),
         .itemId = ITEM_TM35,
         .price = 3000,
@@ -4872,6 +5199,7 @@ const struct Item gItems[] =
         .name = LANGUAGE_STRING(
             "TM36",
             "CT36",
+            "MT36",
             "MT36"),
         .itemId = ITEM_TM36,
         .price = 1000,
@@ -4886,6 +5214,7 @@ const struct Item gItems[] =
         .name = LANGUAGE_STRING(
             "TM37",
             "CT37",
+            "MT37",
             "MT37"),
         .itemId = ITEM_TM37,
         .price = 2000,
@@ -4900,6 +5229,7 @@ const struct Item gItems[] =
         .name = LANGUAGE_STRING(
             "TM38",
             "CT38",
+            "MT38",
             "MT38"),
         .itemId = ITEM_TM38,
         .price = 5500,
@@ -4914,6 +5244,7 @@ const struct Item gItems[] =
         .name = LANGUAGE_STRING(
             "TM39",
             "CT39",
+            "MT39",
             "MT39"),
         .itemId = ITEM_TM39,
         .price = 3000,
@@ -4928,6 +5259,7 @@ const struct Item gItems[] =
         .name = LANGUAGE_STRING(
             "TM40",
             "CT40",
+            "MT40",
             "MT40"),
         .itemId = ITEM_TM40,
         .price = 3000,
@@ -4942,6 +5274,7 @@ const struct Item gItems[] =
         .name = LANGUAGE_STRING(
             "TM41",
             "CT41",
+            "MT41",
             "MT41"),
         .itemId = ITEM_TM41,
         .price = 3000,
@@ -4956,6 +5289,7 @@ const struct Item gItems[] =
         .name = LANGUAGE_STRING(
             "TM42",
             "CT42",
+            "MT42",
             "MT42"),
         .itemId = ITEM_TM42,
         .price = 3000,
@@ -4970,6 +5304,7 @@ const struct Item gItems[] =
         .name = LANGUAGE_STRING(
             "TM43",
             "CT43",
+            "MT43",
             "MT43"),
         .itemId = ITEM_TM43,
         .price = 3000,
@@ -4984,6 +5319,7 @@ const struct Item gItems[] =
         .name = LANGUAGE_STRING(
             "TM44",
             "CT44",
+            "MT44",
             "MT44"),
         .itemId = ITEM_TM44,
         .price = 3000,
@@ -4998,6 +5334,7 @@ const struct Item gItems[] =
         .name = LANGUAGE_STRING(
             "TM45",
             "CT45",
+            "MT45",
             "MT45"),
         .itemId = ITEM_TM45,
         .price = 3000,
@@ -5012,6 +5349,7 @@ const struct Item gItems[] =
         .name = LANGUAGE_STRING(
             "TM46",
             "CT46",
+            "MT46",
             "MT46"),
         .itemId = ITEM_TM46,
         .price = 3000,
@@ -5026,6 +5364,7 @@ const struct Item gItems[] =
         .name = LANGUAGE_STRING(
             "TM47",
             "CT47",
+            "MT47",
             "MT47"),
         .itemId = ITEM_TM47,
         .price = 3000,
@@ -5040,6 +5379,7 @@ const struct Item gItems[] =
         .name = LANGUAGE_STRING(
             "TM48",
             "CT48",
+            "MT48",
             "MT48"),
         .itemId = ITEM_TM48,
         .price = 3000,
@@ -5054,6 +5394,7 @@ const struct Item gItems[] =
         .name = LANGUAGE_STRING(
             "TM49",
             "CT49",
+            "MT49",
             "MT49"),
         .itemId = ITEM_TM49,
         .price = 3000,
@@ -5068,6 +5409,7 @@ const struct Item gItems[] =
         .name = LANGUAGE_STRING(
             "TM50",
             "CT50",
+            "MT50",
             "MT50"),
         .itemId = ITEM_TM50,
         .price = 3000,
@@ -5082,7 +5424,8 @@ const struct Item gItems[] =
         .name = LANGUAGE_STRING(
             "HM01",
             "CS01",
-            "MN01"),
+            "MN01",
+            "MO01"),
         .itemId = ITEM_HM01,
         .price = 0,
         .description = sHM01Desc,
@@ -5097,7 +5440,8 @@ const struct Item gItems[] =
         .name = LANGUAGE_STRING(
             "HM02",
             "CS02",
-            "MN02"),
+            "MN02",
+            "MO02"),
         .itemId = ITEM_HM02,
         .price = 0,
         .description = sHM02Desc,
@@ -5112,7 +5456,8 @@ const struct Item gItems[] =
         .name = LANGUAGE_STRING(
             "HM03",
             "CS03",
-            "MN03"),
+            "MN03",
+            "MO03"),
         .itemId = ITEM_HM03,
         .price = 0,
         .description = sHM03Desc,
@@ -5127,7 +5472,8 @@ const struct Item gItems[] =
         .name = LANGUAGE_STRING(
             "HM04",
             "CS04",
-            "MN04"),
+            "MN04",
+            "MO04"),
         .itemId = ITEM_HM04,
         .price = 0,
         .description = sHM04Desc,
@@ -5142,7 +5488,8 @@ const struct Item gItems[] =
         .name = LANGUAGE_STRING(
             "HM05",
             "CS05",
-            "MN05"),
+            "MN05",
+            "MO05"),
         .itemId = ITEM_HM05,
         .price = 0,
         .description = sHM05Desc,
@@ -5157,7 +5504,8 @@ const struct Item gItems[] =
         .name = LANGUAGE_STRING(
             "HM06",
             "CS06",
-            "MN06"),
+            "MN06",
+            "MO06"),
         .itemId = ITEM_HM06,
         .price = 0,
         .description = sHM06Desc,
@@ -5172,7 +5520,8 @@ const struct Item gItems[] =
         .name = LANGUAGE_STRING(
             "HM07",
             "CS07",
-            "MN07"),
+            "MN07",
+            "MO07"),
         .itemId = ITEM_HM07,
         .price = 0,
         .description = sHM07Desc,
@@ -5187,7 +5536,8 @@ const struct Item gItems[] =
         .name = LANGUAGE_STRING(
             "HM08",
             "CS08",
-            "MN08"),
+            "MN08",
+            "MO08"),
         .itemId = ITEM_HM08,
         .price = 0,
         .description = sHM08Desc,
@@ -5200,6 +5550,7 @@ const struct Item gItems[] =
     [ITEM_15B] =
     {
         .name = LANGUAGE_STRING(
+            "????????",
             "????????",
             "????????",
             "????????"),
@@ -5214,6 +5565,7 @@ const struct Item gItems[] =
     [ITEM_15C] =
     {
         .name = LANGUAGE_STRING(
+            "????????",
             "????????",
             "????????",
             "????????"),
@@ -5232,7 +5584,8 @@ const struct Item gItems[] =
         .name = LANGUAGE_STRING(
             "OAK'S PARCEL",
             "COLIS CHEN",
-            "PACCO DI OAK"),
+            "PACCO DI OAK",
+            "CORREO-OAK"),
         .itemId = ITEM_OAKS_PARCEL,
         .price = 0,
         .description = sOaksParcelDesc,
@@ -5247,7 +5600,8 @@ const struct Item gItems[] =
         .name = LANGUAGE_STRING(
             "POKé FLUTE",
             "POKéFLUTE",
-            "POKé FLAUTO"),
+            "POKé FLAUTO",
+            "POKé FLAUTA"),
         .itemId = ITEM_POKE_FLUTE,
         .price = 0,
         .description = sPokeFluteDesc,
@@ -5262,7 +5616,8 @@ const struct Item gItems[] =
         .name = LANGUAGE_STRING(
             "SECRET KEY",
             "CLE SECRETE",
-            "CHIAVE SEGR."),
+            "CHIAVE SEGR.",
+            "LL. SECRETA"),
         .itemId = ITEM_SECRET_KEY,
         .price = 0,
         .description = sSecretKeyDesc,
@@ -5277,7 +5632,8 @@ const struct Item gItems[] =
         .name = LANGUAGE_STRING(
             "BIKE VOUCHER",
             "BON COMMANDE",
-            "BUONO BICI"),
+            "BUONO BICI",
+            "BONO BICI"),
         .itemId = ITEM_BIKE_VOUCHER,
         .price = 0,
         .description = sBikeVoucherDesc,
@@ -5292,7 +5648,8 @@ const struct Item gItems[] =
         .name = LANGUAGE_STRING(
             "GOLD TEETH",
             "DENT D'OR",
-            "DENTI D’ORO"),
+            "DENTI D’ORO",
+            "DIENTES ORO"),
         .itemId = ITEM_GOLD_TEETH,
         .price = 0,
         .description = sGoldTeethDesc,
@@ -5307,7 +5664,8 @@ const struct Item gItems[] =
         .name = LANGUAGE_STRING(
             "OLD AMBER",
             "VIEIL AMBRE",
-            "AMBRA ANTICA"),
+            "AMBRA ANTICA",
+            "ÁMBAR VIEJO"),
         .itemId = ITEM_OLD_AMBER,
         .price = 0,
         .description = sOldAmberDesc,
@@ -5322,7 +5680,8 @@ const struct Item gItems[] =
         .name = LANGUAGE_STRING(
             "CARD KEY",
             "CARTE MAGN.",
-            "APRIPORTA"),
+            "APRIPORTA",
+            "LL.MAGNÉTICA"),
         .itemId = ITEM_CARD_KEY,
         .price = 0,
         .description = sCardKeyDesc,
@@ -5337,7 +5696,8 @@ const struct Item gItems[] =
         .name = LANGUAGE_STRING(
             "LIFT KEY",
             "CLE ASC.",
-            "CHIAVE ASC."),
+            "CHIAVE ASC.",
+            "LL. ASCENSOR"),
         .itemId = ITEM_LIFT_KEY,
         .price = 0,
         .description = sLiftKeyDesc,
@@ -5352,7 +5712,8 @@ const struct Item gItems[] =
         .name = LANGUAGE_STRING(
             "HELIX FOSSIL",
             "NAUTILE",
-            "HELIXFOSSILE"),
+            "HELIXFOSSILE",
+            "FÓSIL HELIX"),
         .itemId = ITEM_HELIX_FOSSIL,
         .price = 0,
         .description = sHelixFossilDesc,
@@ -5367,7 +5728,8 @@ const struct Item gItems[] =
         .name = LANGUAGE_STRING(
             "DOME FOSSIL",
             "FOSSILE DOME",
-            "DOMOFOSSILE"),
+            "DOMOFOSSILE",
+            "FÓSIL DOMO"),
         .itemId = ITEM_DOME_FOSSIL,
         .price = 0,
         .description = sDomeFossilDesc,
@@ -5382,7 +5744,8 @@ const struct Item gItems[] =
         .name = LANGUAGE_STRING(
             "SILPH SCOPE",
             "SCOPE SYLPHE",
-            "SPETTROSONDA"),
+            "SPETTROSONDA",
+            "SCOPE SILPH"),
         .itemId = ITEM_SILPH_SCOPE,
         .price = 0,
         .description = sSilphScopeDesc,
@@ -5397,7 +5760,8 @@ const struct Item gItems[] =
         .name = LANGUAGE_STRING(
             "BICYCLE",
             "BICYCLETTE",
-            "BICICLETTA"),
+            "BICICLETTA",
+            "BICICLETA"),
         .itemId = ITEM_BICYCLE,
         .price = 0,
         .description = sBicycleDesc,
@@ -5413,7 +5777,8 @@ const struct Item gItems[] =
         .name = LANGUAGE_STRING(
             "TOWN MAP",
             "CARTE",
-            "MAPPA CITTÀ"),
+            "MAPPA CITTÀ",
+            "MAPA"),
         .itemId = ITEM_TOWN_MAP,
         .price = 0,
         .description = sTownMapDesc,
@@ -5429,7 +5794,8 @@ const struct Item gItems[] =
         .name = LANGUAGE_STRING(
             "VS SEEKER",
             "CHERCHE VS",
-            "CERCASFIDE"),
+            "CERCASFIDE",
+            "BUSCAPELEA"),
         .itemId = ITEM_VS_SEEKER,
         .price = 0,
         .description = sVSSeekerDesc,
@@ -5445,7 +5811,8 @@ const struct Item gItems[] =
         .name = LANGUAGE_STRING(
             "FAME CHECKER",
             "MEMORYDEX",
-            "POKéVIP"),
+            "POKéVIP",
+            "MEMORÍN"),
         .itemId = ITEM_FAME_CHECKER,
         .price = 0,
         .description = sFameCheckerDesc,
@@ -5461,7 +5828,8 @@ const struct Item gItems[] =
         .name = LANGUAGE_STRING(
             "TM CASE",
             "BOITE CT",
-            "PORTA-MT"),
+            "PORTA-MT",
+            "TUBO MT-MO"),
         .itemId = ITEM_TM_CASE,
         .price = 0,
         .description = sTMCaseDesc,
@@ -5477,7 +5845,8 @@ const struct Item gItems[] =
         .name = LANGUAGE_STRING(
             "BERRY POUCH",
             "SAC A BAIES",
-            "PORTABACCHE"),
+            "PORTABACCHE",
+            "SACO BAYAS"),
         .itemId = ITEM_BERRY_POUCH,
         .price = 0,
         .description = sBerryPouchDesc,
@@ -5493,7 +5862,8 @@ const struct Item gItems[] =
         .name = LANGUAGE_STRING(
             "TEACHY TV",
             "TV ABC",
-            "POKéTIVÙ"),
+            "POKéTIVÙ",
+            "POKé TELE"),
         .itemId = ITEM_TEACHY_TV,
         .price = 0,
         .description = sTeachyTVDesc,
@@ -5509,7 +5879,8 @@ const struct Item gItems[] =
         .name = LANGUAGE_STRING(
             "TRI-PASS",
             "TRI-PASSE",
-            "TRIS PASS"),
+            "TRIS PASS",
+            "TRI-TICKET"),
         .itemId = ITEM_TRI_PASS,
         .price = 0,
         .description = sTriPassDesc,
@@ -5525,7 +5896,8 @@ const struct Item gItems[] =
         .name = LANGUAGE_STRING(
             "RAINBOW PASS",
             "PASSE PRISME",
-            "SETTE PASS"),
+            "SETTE PASS",
+            "IRIS-TICKET"),
         .itemId = ITEM_RAINBOW_PASS,
         .price = 0,
         .description = sRainbowPassDesc,
@@ -5541,7 +5913,8 @@ const struct Item gItems[] =
         .name = LANGUAGE_STRING(
             "TEA",
             "THE",
-            "TÈ"),
+            "TÈ",
+            "TÉ"),
         .itemId = ITEM_TEA,
         .price = 0,
         .description = sTeaDesc,
@@ -5557,7 +5930,8 @@ const struct Item gItems[] =
         .name = LANGUAGE_STRING(
             "MYSTICTICKET",
             "TICKETMYSTIK",
-            "BIGL. MAGICO"),
+            "BIGL. MAGICO",
+            "MISTI-TICKET"),
         .itemId = ITEM_MYSTIC_TICKET,
         .price = 0,
         .description = sMysticTicketDesc,
@@ -5573,7 +5947,8 @@ const struct Item gItems[] =
         .name = LANGUAGE_STRING(
             "AURORATICKET",
             "TICKETAURORA",
-            "BIGL. AURORA"),
+            "BIGL. AURORA",
+            "ORI-TICKET"),
         .itemId = ITEM_AURORA_TICKET,
         .price = 0,
         .description = sAuroraTicketDesc,
@@ -5589,7 +5964,8 @@ const struct Item gItems[] =
         .name = LANGUAGE_STRING(
             "POWDER JAR",
             "POT POUDRE",
-            "PORTAFARINA"),
+            "PORTAFARINA",
+            "BOTE POLVOS"),
         .itemId = ITEM_POWDER_JAR,
         .price = 0,
         .description = sPowderJarDesc,
@@ -5605,7 +5981,8 @@ const struct Item gItems[] =
         .name = LANGUAGE_STRING(
             "RUBY",
             "RUBIS",
-            "RUBINO"),
+            "RUBINO",
+            "RUBÍ"),
         .itemId = ITEM_RUBY,
         .price = 0,
         .description = sRubyDesc,
@@ -5621,7 +5998,8 @@ const struct Item gItems[] =
         .name = LANGUAGE_STRING(
             "SAPPHIRE",
             "SAPHIR",
-            "ZAFFIRO"),
+            "ZAFFIRO",
+            "ZAFIRO"),
         .itemId = ITEM_SAPPHIRE,
         .price = 0,
         .description = sSapphireDesc,
@@ -5639,7 +6017,8 @@ const struct Item gItems[] =
         .name = LANGUAGE_STRING(
             "MAGMA EMBLEM",
             "SCEAU MAGMA",
-            "STEMMA MAGMA"),
+            "STEMMA MAGMA",
+            "SIGNO MAGMA"),
         .itemId = ITEM_MAGMA_EMBLEM,
         .price = 0,
         .description = sMagmaEmblemDesc,
@@ -5655,7 +6034,8 @@ const struct Item gItems[] =
         .name = LANGUAGE_STRING(
             "OLD SEA MAP",
             "VIEILLECARTE",
-            "MAPPA STINTA"),
+            "MAPPA STINTA",
+            "MAPA VIEJO"),
         .itemId = ITEM_OLD_SEA_MAP,
         .price = 0,
         .description = sOldSeaMapDesc,
diff --git a/src/data/lilycove_lady.h b/src/data/lilycove_lady.h
index 0583382f48..1ba00145f0 100644
--- a/src/data/lilycove_lady.h
+++ b/src/data/lilycove_lady.h
@@ -19,631 +19,213 @@ static const u16 sLilycoveLadyGfxId[] =
 };
 
 // Quiz Lady data
+static const u16 sQuizLadyQuestion1[QUIZ_QUESTION_LEN] =
+{
 #if FRENCH
-static const u16 sQuizLadyQuestion1[QUIZ_QUESTION_LEN] =
-{
-   EC_WORD_CASE,
-   EC_WORD_INFORMATION,
-   EC_WORD_UP,
-   EC_WORD_CASE,
-   EC_WORD_POKEMON,
-   EC_WORD_QUES,
-   EC_WORD_PHONE,
-   EC_WORD_POKEDEX,
-   EC_WORD_POKENAV
-};
-
-static const u16 sQuizLadyQuestion2[QUIZ_QUESTION_LEN] =
-{
-   EC_WORD_CASE,
-   EC_WORD_COMPLETE,
-   EC_WORD_IT_S,
-   EC_WORD_QUES,
-   EC_WORD_AWESOME,
-   EC_WORD_NO_MATCH,
-   EC_WORD_OR,
-   EC_WORD_SCARY,
-   EC_EMPTY_WORD
-};
-
-static const u16 sQuizLadyQuestion3[QUIZ_QUESTION_LEN] =
-{
-   EC_WORD_HOW,
-   EC_WORD_MAKE,
-   EC_WORD_EVOLVE,
-   EC_WORD_CASE,
-   EC_WORD_POKEMON,
-   EC_WORD_QUES,
-   EC_WORD_LEVEL,
-   EC_WORD_INSOMNIA,
-   EC_WORD_CUTE_CHARM,
-};
-
-static const u16 sQuizLadyQuestion4[QUIZ_QUESTION_LEN] =
-{
-   EC_WORD_IT_S,
-   EC_EMPTY_WORD,
-   EC_WORD_GOOD,
-   EC_WORD_QUES,
-   EC_WORD_RADIO,
-   EC_WORD_SWEETS,
-   EC_WORD_MACHINE,
-   EC_EMPTY_WORD,
-   EC_EMPTY_WORD
-};
-
-static const u16 sQuizLadyQuestion5[QUIZ_QUESTION_LEN] =
-{
-   EC_WORD_WHAT,
-   EC_WORD_ITEM,
-   EC_WORD_AREN_T,
-   EC_EMPTY_WORD,
-   EC_WORD_IGNORANT,
-   EC_WORD_QUES,
-   EC_WORD_EGG,
-   EC_WORD_MAIL,
-   EC_WORD_PHONE
-};
-
-static const u16 sQuizLadyQuestion6[QUIZ_QUESTION_LEN] =
-{
-   EC_WORD_EVEN_SO,
-   EC_WORD_USES,
-   EC_WORD_SO,
-   EC_EMPTY_WORD,
-   EC_WORD_CONFUSED,
-   EC_WORD_QUES,
-   EC_WORD_ILLUMINATE,
-   EC_WORD_OWN_TEMPO,
-   EC_WORD_SWIFT_SWIM
-};
-
-static const u16 sQuizLadyQuestion7[QUIZ_QUESTION_LEN] =
-{
-   EC_WORD_A,
-   EC_WORD_POKEMON,
-   EC_WORD_IT_S,
-   EC_WORD_QUES,
-   EC_EMPTY_WORD,
-   EC_EMPTY_WORD,
-   EC_WORD_LOVEY_DOVEY,
-   EC_WORD_TERRIBLE,
-   EC_WORD_NO_MATCH
-};
-
-static const u16 sQuizLadyQuestion8[QUIZ_QUESTION_LEN] =
-{
-   EC_WORD_EVEN_SO,
-   EC_WORD_USES,
-   EC_WORD_VERSUS,
-   EC_WORD_FEELING,
-   EC_WORD_RUN_AWAY,
-   EC_WORD_QUES,
-   EC_WORD_VOLT_ABSORB,
-   EC_WORD_SHADOW_TAG,
-   EC_WORD_WONDER_GUARD
-};
-
-static const u16 sQuizLadyQuestion9[QUIZ_QUESTION_LEN] =
-{
-   EC_WORD_FOR,
-   EC_WORD_FIGHT,
-   EC_WORD_THE,
-   EC_EMPTY_WORD,
-   EC_WORD_POISON,
-   EC_WORD_QUES,
-   EC_WORD_GUTS,
-   EC_WORD_IMMUNITY,
-   EC_WORD_SHED_SKIN
-};
-
-static const u16 sQuizLadyQuestion10[QUIZ_QUESTION_LEN] =
-{
-   EC_WORD_FOREVER,
-   EC_WORD_SATURDAY,
-   EC_WORD_IT_S,
-   EC_WORD_QUES,
-   EC_EMPTY_WORD,
-   EC_EMPTY_WORD,
-   EC_WORD_SUNDAY,
-   EC_WORD_TUESDAY,
-   EC_WORD_THURSDAY
-};
-
-static const u16 sQuizLadyQuestion11[QUIZ_QUESTION_LEN] =
-{
-   EC_WORD_IT_S,
-   EC_WORD_FULL,
-   EC_WORD_OF,
-   EC_EMPTY_WORD,
-   EC_WORD_SOFTWARE,
-   EC_WORD_QUES,
-   EC_WORD_DEPT_STORE,
-   EC_WORD_SCHOOL,
-   EC_WORD_MACHINE
-};
-
-static const u16 sQuizLadyQuestion12[QUIZ_QUESTION_LEN] =
-{
-   EC_WORD_HOW,
-   EC_WORD_HAVE,
-   EC_WORD_MOOD,
-   EC_EMPTY_WORD,
-   EC_WORD_INFORMATION,
-   EC_WORD_QUES,
-   EC_WORD_BIKE,
-   EC_WORD_LOCOMOTIVE,
-   EC_WORD_TELEVISION
-};
-
-static const u16 sQuizLadyQuestion13[QUIZ_QUESTION_LEN] =
-{
-   EC_MOVE2(WATER_PULSE),
-   EC_WORD_IT_S,
-   EC_WORD_AN,
-   EC_WORD_QUES,
-   EC_WORD_MOVE,
-   EC_WORD_COLOR,
-   EC_WORD_OR,
-   EC_WORD_AN,
-   EC_WORD_AWAY
-};
-
-static const u16 sQuizLadyQuestion14[QUIZ_QUESTION_LEN] =
-{
-   EC_WORD_STEEL,
-   EC_WORD_IS,
-   EC_WORD_STRONG,
-   EC_EMPTY_WORD,
-   EC_WORD_VERSUS,
-   EC_WORD_QUES,
-   EC_WORD_ICE,
-   EC_EMPTY_WORD,
-   EC_WORD_GROUND
-};
-
-static const u16 sQuizLadyQuestion15[QUIZ_QUESTION_LEN] =
-{
-   EC_WORD_DARK,
-   EC_WORD_IS,
-   EC_WORD_WEAK,
-   EC_EMPTY_WORD,
-   EC_WORD_VERSUS,
-   EC_WORD_QUES,
-   EC_WORD_PSYCHIC,
-   EC_EMPTY_WORD,
-   EC_WORD_FIGHTING
-};
-
-static const u16 sQuizLadyQuestion16[QUIZ_QUESTION_LEN] =
-{
-   EC_WORD_GHOST,
-   EC_WORD_IS,
-   EC_WORD_WEAK,
-   EC_EMPTY_WORD,
-   EC_WORD_VERSUS,
-   EC_WORD_QUES,
-   EC_WORD_NORMAL,
-   EC_WORD_DARK,
-   EC_EMPTY_WORD
-};
+    EC_WORD_CASE, EC_WORD_INFORMATION, EC_WORD_UP, EC_WORD_CASE, EC_WORD_POKEMON, EC_WORD_QUES, EC_WORD_PHONE, EC_WORD_POKEDEX, EC_WORD_POKENAV
 #elif ITALIAN
-static const u16 sQuizLadyQuestion1[QUIZ_QUESTION_LEN] =
-{
-    EC_WORD_THING,
-    EC_WORD_HAVE,
-    EC_WORD_INFORMATION,
-    EC_WORD_UP,
-    EC_WORD_POKEMON,
-    EC_WORD_QUES,
-    EC_WORD_TELEVISION,
-    EC_WORD_POKEDEX,
-    EC_WORD_POKENAV,
-};
-
-static const u16 sQuizLadyQuestion2[QUIZ_QUESTION_LEN] =
-{
-    EC_WORD_GIMME,
-    EC_WORD_AS_IF,
-    EC_WORD_IS,
-    EC_WORD_TO,
-    EC_WORD_VERSION,
-    EC_WORD_QUES,
-    EC_WORD_RUBY,
-    EC_WORD_SAPPHIRE,
-    EC_WORD_DARK,
-};
-
-static const u16 sQuizLadyQuestion3[QUIZ_QUESTION_LEN] =
-{
-    EC_WORD_THING,
-    EC_WORD_PLAYED,
-    EC_WORD_EVOLVE,
-    EC_WORD_A,
-    EC_WORD_POKEMON,
-    EC_WORD_QUES,
-    EC_WORD_LEVEL,
-    EC_WORD_INSOMNIA,
-    EC_WORD_CUTE_CHARM,
-};
-
-static const u16 sQuizLadyQuestion4[QUIZ_QUESTION_LEN] =
-{
-    EC_WORD_MISS,
-    EC_MOVE(SWEET_SCENT),
-    EC_WORD_LISTEN,
-    EC_WORD_ELLIPSIS,
-    EC_WORD_ELLIPSIS,
-    EC_WORD_QUES,
-    EC_WORD_MESSAGE,
-    EC_WORD_FLOWERS,
-    EC_WORD_DISAPPOINT,
-};
-
-static const u16 sQuizLadyQuestion5[QUIZ_QUESTION_LEN] =
-{
-    EC_WORD_GIMME,
-    EC_WORD_AS_IF,
-    EC_WORD_IS,
-    EC_WORD_VERY,
-    EC_WORD_ROCK_SOLID,
-    EC_WORD_QUES,
-    EC_WORD_EGG,
-    EC_WORD_MAIL,
-    EC_WORD_PHONE,
-};
-
-static const u16 sQuizLadyQuestion6[QUIZ_QUESTION_LEN] =
-{
-    EC_WORD_MISS,
-    EC_WORD_THING,
-    EC_WORD_CHANGE,
-    EC_WORD_TAKE_THAT,
-    EC_MOVE2(CONFUSION),
-    EC_WORD_QUES,
-    EC_WORD_ILLUMINATE,
-    EC_WORD_OWN_TEMPO,
-    EC_WORD_SWIFT_SWIM,
-};
-
-static const u16 sQuizLadyQuestion7[QUIZ_QUESTION_LEN] =
-{
-    EC_WORD_GIMME,
-    EC_WORD_IS,
-    EC_WORD_TO,
-    EC_WORD_THIN,
-    EC_WORD_MUSIC,
-    EC_WORD_QUES,
-    EC_WORD_CHAT,
-    EC_WORD_SHOPPING,
-    EC_WORD_ANIME,
-};
-
-static const u16 sQuizLadyQuestion8[QUIZ_QUESTION_LEN] =
-{
-    EC_WORD_THING,
-    EC_WORD_LEARN,
-    EC_WORD_FAINT,
-    EC_WORD_VERSUS,
-    EC_WORD_ESCAPE,
-    EC_WORD_QUES,
-    EC_WORD_RUN_AWAY,
-    EC_WORD_SHADOW_TAG,
-    EC_WORD_WONDER_GUARD,
-};
-
-static const u16 sQuizLadyQuestion9[QUIZ_QUESTION_LEN] =
-{
-    EC_WORD_THING,
-    EC_WORD_THERE,
-    EC_WORD_USING,
-    EC_WORD_VERSUS,
-    EC_WORD_POISON,
-    EC_WORD_QUES,
-    EC_WORD_GUTS,
-    EC_WORD_IMMUNITY,
-    EC_WORD_SHED_SKIN,
-};
-
-static const u16 sQuizLadyQuestion10[QUIZ_QUESTION_LEN] =
-{
-    EC_WORD_MISS,
-    EC_WORD_THING,
-    EC_WORD_STORES,
-    EC_WORD_LAY,
-    EC_WORD_CENTER,
-    EC_WORD_QUES,
-    EC_WORD_POKEDEX,
-    EC_WORD_POKEMON,
-    EC_WORD_POKENAV,
-};
-
-static const u16 sQuizLadyQuestion11[QUIZ_QUESTION_LEN] =
-{
-    EC_WORD_EVEN_SO,
-    EC_WORD_THINKS,
-    EC_WORD_ALL,
-    EC_WORD_DID,
-    EC_WORD_POKEMON,
-    EC_WORD_QUES,
-    EC_WORD_PC,
-    EC_WORD_CLASS,
-    EC_WORD_TELEVISION,
-};
-
-static const u16 sQuizLadyQuestion12[QUIZ_QUESTION_LEN] =
-{
-    EC_WORD_IS,
-    EC_WORD_TO,
-    EC_WORD_MACHINE,
-    EC_WORD_NITWIT,
-    EC_WORD_INFORMATION,
-    EC_WORD_ELLIPSIS,
-    EC_WORD_BIKE,
-    EC_WORD_TRAIN,
-    EC_WORD_TELEVISION,
-};
-
-static const u16 sQuizLadyQuestion13[QUIZ_QUESTION_LEN] =
-{
-    EC_WORD_THING,
-    EC_WORD_CHANGE,
-    EC_WORD_CONCEDE,
-    EC_WORD_A,
-    EC_WORD_POKEMON,
-    EC_WORD_QUES,
-    EC_WORD_PHONE,
-    EC_WORD_PLUSH_DOLL,
-    EC_WORD_MAIL,
-};
-
-static const u16 sQuizLadyQuestion14[QUIZ_QUESTION_LEN] =
-{
-    EC_WORD_VERSUS,
-    EC_WORD_THING,
-    EC_WORD_IS,
-    EC_WORD_STRONG,
-    EC_WORD_STEEL,
-    EC_WORD_QUES,
-    EC_WORD_ICE,
-    EC_WORD_GROUND,
-    EC_EMPTY_WORD,
-};
-
-static const u16 sQuizLadyQuestion15[QUIZ_QUESTION_LEN] =
-{
-    EC_WORD_VERSUS,
-    EC_WORD_THING,
-    EC_WORD_IS,
-    EC_WORD_WEAK,
-    EC_WORD_DARK,
-    EC_WORD_QUES,
-    EC_WORD_PSYCHIC,
-    EC_WORD_FIGHTING,
-    EC_EMPTY_WORD,
-};
-
-static const u16 sQuizLadyQuestion16[QUIZ_QUESTION_LEN] =
-{
-    EC_WORD_VERSUS,
-    EC_WORD_THING,
-    EC_WORD_IS,
-    EC_WORD_WEAK,
-    EC_WORD_GHOST,
-    EC_WORD_QUES,
-    EC_WORD_NORMAL,
-    EC_WORD_DARK,
-    EC_EMPTY_WORD,
-};
+    EC_WORD_THING, EC_WORD_HAVE, EC_WORD_INFORMATION, EC_WORD_UP, EC_WORD_POKEMON, EC_WORD_QUES, EC_WORD_TELEVISION, EC_WORD_POKEDEX, EC_WORD_POKENAV,
+#elif SPANISH
+    EC_WORD_QUES_EXCL, EC_WORD_CAN_T, EC_WORD_LIKELY_TO, EC_WORD_POKEMON, EC_WORD_THE, EC_WORD_QUES, EC_WORD_SWARM, EC_WORD_POKEDEX, EC_WORD_DROUGHT
 #else //ENGLISH
-static const u16 sQuizLadyQuestion1[QUIZ_QUESTION_LEN] =
-{
-    EC_WORD_WHICH,
-    EC_WORD_STORES,
-    EC_WORD_INFORMATION,
-    EC_WORD_ON,
-    EC_WORD_POKEMON,
-    EC_WORD_QUES,
-    EC_WORD_CAMERA,
-    EC_WORD_POKEDEX,
-    EC_WORD_POKENAV
+    EC_WORD_WHICH, EC_WORD_STORES, EC_WORD_INFORMATION, EC_WORD_ON, EC_WORD_POKEMON, EC_WORD_QUES, EC_WORD_CAMERA, EC_WORD_POKEDEX, EC_WORD_POKENAV
+#endif
 };
 
 static const u16 sQuizLadyQuestion2[QUIZ_QUESTION_LEN] =
 {
-    EC_WORD_WHICH,
-    EC_WORD_ISN_T,
-    EC_WORD_A,
-    EC_WORD_GAME,
-    EC_WORD_VERSION,
-    EC_WORD_QUES,
-    EC_WORD_RUBY,
-    EC_WORD_SAPPHIRE,
-    EC_WORD_DARK
+#if FRENCH
+    EC_WORD_CASE, EC_WORD_COMPLETE, EC_WORD_IT_S, EC_WORD_QUES, EC_WORD_AWESOME, EC_WORD_NO_MATCH, EC_WORD_OR, EC_WORD_SCARY, EC_EMPTY_WORD
+#elif ITALIAN
+    EC_WORD_GIMME, EC_WORD_AS_IF, EC_WORD_IS, EC_WORD_TO, EC_WORD_VERSION, EC_WORD_QUES, EC_WORD_RUBY, EC_WORD_SAPPHIRE, EC_WORD_DARK,
+#elif SPANISH
+    EC_WORD_QUES_EXCL, EC_WORD_DOWN, EC_WORD_WHERE, EC_WORD_IS, EC_WORD_CHILD_S_PLAY, EC_WORD_QUES, EC_WORD_RUBY, EC_WORD_SAPPHIRE, EC_WORD_WHAT
+#else //ENGLISH
+    EC_WORD_WHICH, EC_WORD_ISN_T, EC_WORD_A, EC_WORD_GAME, EC_WORD_VERSION, EC_WORD_QUES, EC_WORD_RUBY, EC_WORD_SAPPHIRE, EC_WORD_DARK
+#endif
 };
 
 static const u16 sQuizLadyQuestion3[QUIZ_QUESTION_LEN] =
 {
-    EC_WORD_HOW,
-    EC_WORD_DO,
-    EC_WORD_POKEMON,
-    EC_WORD_EVOLVE,
-    EC_WORD_QUES,
-    EC_EMPTY_WORD,
-    EC_WORD_LEVEL,
-    EC_WORD_INSOMNIA,
-    EC_WORD_CUTE_CHARM
+#if FRENCH
+    EC_WORD_HOW, EC_WORD_MAKE, EC_WORD_EVOLVE, EC_WORD_CASE, EC_WORD_POKEMON, EC_WORD_QUES, EC_WORD_LEVEL, EC_WORD_INSOMNIA, EC_WORD_CUTE_CHARM,
+#elif ITALIAN
+    EC_WORD_THING, EC_WORD_PLAYED, EC_WORD_EVOLVE, EC_WORD_A, EC_WORD_POKEMON, EC_WORD_QUES, EC_WORD_LEVEL, EC_WORD_INSOMNIA, EC_WORD_CUTE_CHARM,
+#elif SPANISH
+    EC_WORD_QUES_EXCL, EC_WORD_EVEN_SO, EC_WORD_SERIOUSLY, EC_WORD_WITHOUT, EC_WORD_EVOLUTION, EC_WORD_QUES, EC_WORD_LEVEL, EC_WORD_INSOMNIA, EC_WORD_CUTE_CHARM
+#else //ENGLISH
+    EC_WORD_HOW, EC_WORD_DO, EC_WORD_POKEMON, EC_WORD_EVOLVE, EC_WORD_QUES, EC_EMPTY_WORD, EC_WORD_LEVEL, EC_WORD_INSOMNIA, EC_WORD_CUTE_CHARM
+#endif
 };
 
 static const u16 sQuizLadyQuestion4[QUIZ_QUESTION_LEN] =
 {
-    EC_WORD_WHICH,
-    EC_WORD_IS,
-    EC_WORD_THE,
-    EC_WORD_PRETTY,
-    EC_WORD_ITEM,
-    EC_WORD_QUES,
-    EC_WORD_COLD,
-    EC_WORD_FLOWERS,
-    EC_WORD_MACHINE
+#if FRENCH
+    EC_WORD_IT_S, EC_EMPTY_WORD, EC_WORD_GOOD, EC_WORD_QUES, EC_WORD_RADIO, EC_WORD_SWEETS, EC_WORD_MACHINE, EC_EMPTY_WORD, EC_EMPTY_WORD
+#elif ITALIAN
+    EC_WORD_MISS, EC_MOVE(SWEET_SCENT), EC_WORD_LISTEN, EC_WORD_ELLIPSIS, EC_WORD_ELLIPSIS, EC_WORD_QUES, EC_WORD_MESSAGE, EC_WORD_FLOWERS, EC_WORD_DISAPPOINT,
+#elif SPANISH
+    EC_WORD_QUES_EXCL, EC_WORD_DOWN, EC_WORD_IS, EC_WORD_VERY, EC_WORD_SILKY, EC_WORD_QUES, EC_WORD_WEEK, EC_WORD_FLOWERS, EC_WORD_AGE
+#else //ENGLISH
+    EC_WORD_WHICH, EC_WORD_IS, EC_WORD_THE, EC_WORD_PRETTY, EC_WORD_ITEM, EC_WORD_QUES, EC_WORD_COLD, EC_WORD_FLOWERS, EC_WORD_MACHINE
+#endif
 };
 
 static const u16 sQuizLadyQuestion5[QUIZ_QUESTION_LEN] =
 {
-    EC_WORD_WHICH,
-    EC_WORD_ITEM,
-    EC_WORD_DO,
-    EC_WORD_YOU,
-    EC_WORD_BREAK,
-    EC_WORD_QUES,
-    EC_WORD_EGG,
-    EC_WORD_MAIL,
-    EC_WORD_PHONE
+#if FRENCH
+    EC_WORD_WHAT, EC_WORD_ITEM, EC_WORD_AREN_T, EC_EMPTY_WORD, EC_WORD_IGNORANT, EC_WORD_QUES, EC_WORD_EGG, EC_WORD_MAIL, EC_WORD_PHONE
+#elif ITALIAN
+    EC_WORD_GIMME, EC_WORD_AS_IF, EC_WORD_IS, EC_WORD_VERY, EC_WORD_ROCK_SOLID, EC_WORD_QUES, EC_WORD_EGG, EC_WORD_MAIL, EC_WORD_PHONE,
+#elif SPANISH
+    EC_WORD_QUES_EXCL, EC_WORD_DOWN, EC_WORD_WHERE, EC_WORD_IS, EC_WORD_APPROVED, EC_WORD_QUES, EC_WORD_EGG, EC_WORD_LETTER, EC_WORD_DIGITAL
+#else //ENGLISH
+    EC_WORD_WHICH, EC_WORD_ITEM, EC_WORD_DO, EC_WORD_YOU, EC_WORD_BREAK, EC_WORD_QUES, EC_WORD_EGG, EC_WORD_MAIL, EC_WORD_PHONE
+#endif
 };
 
 static const u16 sQuizLadyQuestion6[QUIZ_QUESTION_LEN] =
 {
-    EC_WORD_WHICH,
-    EC_WORD_WILL,
-    EC_WORD_STOP,
-    EC_MOVE2(CONFUSION),
-    EC_WORD_QUES,
-    EC_EMPTY_WORD,
-    EC_WORD_ILLUMINATE,
-    EC_WORD_OWN_TEMPO,
-    EC_WORD_SWIFT_SWIM
+#if FRENCH
+    EC_WORD_EVEN_SO, EC_WORD_USES, EC_WORD_SO, EC_EMPTY_WORD, EC_WORD_CONFUSED, EC_WORD_QUES, EC_WORD_ILLUMINATE, EC_WORD_OWN_TEMPO, EC_WORD_SWIFT_SWIM
+#elif ITALIAN
+    EC_WORD_MISS, EC_WORD_THING, EC_WORD_CHANGE, EC_WORD_TAKE_THAT, EC_MOVE2(CONFUSION), EC_WORD_QUES, EC_WORD_ILLUMINATE, EC_WORD_OWN_TEMPO, EC_WORD_SWIFT_SWIM,
+#elif SPANISH
+    EC_WORD_QUES_EXCL, EC_WORD_DOWN, EC_WORD_RECOMMEND, EC_WORD_THAT_S, EC_MOVE2(CONFUSION), EC_WORD_QUES, EC_WORD_ILLUMINATE, EC_WORD_OWN_TEMPO, EC_WORD_SWIFT_SWIM
+#else //ENGLISH
+    EC_WORD_WHICH, EC_WORD_WILL, EC_WORD_STOP, EC_MOVE2(CONFUSION), EC_WORD_QUES, EC_EMPTY_WORD, EC_WORD_ILLUMINATE, EC_WORD_OWN_TEMPO, EC_WORD_SWIFT_SWIM
+#endif
 };
 
 static const u16 sQuizLadyQuestion7[QUIZ_QUESTION_LEN] =
 {
-    EC_WORD_WHICH,
-    EC_WORD_OF,
-    EC_WORD_THESE,
-    EC_WORD_IS,
-    EC_WORD_MUSIC,
-    EC_WORD_QUES,
-    EC_WORD_FLYING,
-    EC_WORD_STEEL,
-    EC_WORD_ROCK
+#if FRENCH
+    EC_WORD_A, EC_WORD_POKEMON, EC_WORD_IT_S, EC_WORD_QUES, EC_EMPTY_WORD, EC_EMPTY_WORD, EC_WORD_LOVEY_DOVEY, EC_WORD_TERRIBLE, EC_WORD_NO_MATCH
+#elif ITALIAN
+    EC_WORD_GIMME, EC_WORD_IS, EC_WORD_TO, EC_WORD_THIN, EC_WORD_MUSIC, EC_WORD_QUES, EC_WORD_CHAT, EC_WORD_SHOPPING, EC_WORD_ANIME,
+#elif SPANISH
+    EC_WORD_QUES_EXCL, EC_WORD_DOWN, EC_WORD_LAY, EC_WORD_LIKE, EC_WORD_LIKELY_TO, EC_WORD_QUES, EC_WORD_RADIO, EC_WORD_TOURNAMENT, EC_WORD_TELEVISION
+#else //ENGLISH
+    EC_WORD_WHICH, EC_WORD_OF, EC_WORD_THESE, EC_WORD_IS, EC_WORD_MUSIC, EC_WORD_QUES, EC_WORD_FLYING, EC_WORD_STEEL, EC_WORD_ROCK
+#endif
 };
 
 static const u16 sQuizLadyQuestion8[QUIZ_QUESTION_LEN] =
 {
-    EC_WORD_WHICH,
-    EC_WORD_WILL,
-    EC_MOVE2(BLOCK),
-    EC_WORD_ESCAPE,
-    EC_WORD_QUES,
-    EC_EMPTY_WORD,
-    EC_WORD_RUN_AWAY,
-    EC_WORD_SHADOW_TAG,
-    EC_WORD_WONDER_GUARD
+#if FRENCH
+    EC_WORD_EVEN_SO, EC_WORD_USES, EC_WORD_VERSUS, EC_WORD_FEELING, EC_WORD_RUN_AWAY, EC_WORD_QUES, EC_WORD_VOLT_ABSORB, EC_WORD_SHADOW_TAG, EC_WORD_WONDER_GUARD
+#elif ITALIAN
+    EC_WORD_THING, EC_WORD_LEARN, EC_WORD_FAINT, EC_WORD_VERSUS, EC_WORD_ESCAPE, EC_WORD_QUES, EC_WORD_RUN_AWAY, EC_WORD_SHADOW_TAG, EC_WORD_WONDER_GUARD,
+#elif SPANISH
+    EC_WORD_QUES_EXCL, EC_WORD_DOWN, EC_WORD_LAY, EC_WORD_LIKE, EC_WORD_WASN_T, EC_WORD_QUES, EC_WORD_ROCK, EC_WORD_CUTENESS, EC_WORD_NATURE
+#else //ENGLISH
+    EC_WORD_WHICH, EC_WORD_WILL, EC_MOVE2(BLOCK), EC_WORD_ESCAPE, EC_WORD_QUES, EC_EMPTY_WORD, EC_WORD_RUN_AWAY, EC_WORD_SHADOW_TAG, EC_WORD_WONDER_GUARD
+#endif
 };
 
 static const u16 sQuizLadyQuestion9[QUIZ_QUESTION_LEN] =
 {
-    EC_WORD_WHICH,
-    EC_WORD_WILL,
-    EC_WORD_STOP,
-    EC_WORD_POISON,
-    EC_WORD_QUES,
-    EC_EMPTY_WORD,
-    EC_WORD_GUTS,
-    EC_WORD_IMMUNITY,
-    EC_WORD_SHED_SKIN
+#if FRENCH
+    EC_WORD_FOR, EC_WORD_FIGHT, EC_WORD_THE, EC_EMPTY_WORD, EC_WORD_POISON, EC_WORD_QUES, EC_WORD_GUTS, EC_WORD_IMMUNITY, EC_WORD_SHED_SKIN
+#elif ITALIAN
+    EC_WORD_THING, EC_WORD_THERE, EC_WORD_USING, EC_WORD_VERSUS, EC_WORD_POISON, EC_WORD_QUES, EC_WORD_GUTS, EC_WORD_IMMUNITY, EC_WORD_SHED_SKIN,
+#elif SPANISH
+    EC_WORD_QUES_EXCL, EC_WORD_DOWN, EC_WORD_RECOMMEND, EC_WORD_A_TINY_BIT, EC_WORD_POISON, EC_WORD_QUES, EC_WORD_GUTS, EC_WORD_IMMUNITY, EC_WORD_SHED_SKIN
+#else //ENGLISH
+    EC_WORD_WHICH, EC_WORD_WILL, EC_WORD_STOP, EC_WORD_POISON, EC_WORD_QUES, EC_EMPTY_WORD, EC_WORD_GUTS, EC_WORD_IMMUNITY, EC_WORD_SHED_SKIN
+#endif
 };
 
 static const u16 sQuizLadyQuestion10[QUIZ_QUESTION_LEN] =
 {
-    EC_WORD_WHICH,
-    EC_WORD_GOES,
-    EC_WORD_WITH,
-    EC_WORD_CENTER,
-    EC_WORD_QUES,
-    EC_EMPTY_WORD,
-    EC_WORD_POKEDEX,
-    EC_WORD_POKEMON,
-    EC_WORD_POKENAV
+#if FRENCH
+    EC_WORD_FOREVER, EC_WORD_SATURDAY, EC_WORD_IT_S, EC_WORD_QUES, EC_EMPTY_WORD, EC_EMPTY_WORD, EC_WORD_SUNDAY, EC_WORD_TUESDAY, EC_WORD_THURSDAY
+#elif ITALIAN
+    EC_WORD_MISS, EC_WORD_THING, EC_WORD_STORES, EC_WORD_LAY, EC_WORD_CENTER, EC_WORD_QUES, EC_WORD_POKEDEX, EC_WORD_POKEMON, EC_WORD_POKENAV,
+#elif SPANISH
+    EC_WORD_QUES_EXCL, EC_WORD_DOWN, EC_WORD_IS, EC_EMPTY_WORD, EC_WORD_FAMILY, EC_WORD_QUES, EC_WORD_SILKY, EC_WORD_GRANDFATHER, EC_WORD_YOU_VE
+#else //ENGLISH
+    EC_WORD_WHICH, EC_WORD_GOES, EC_WORD_WITH, EC_WORD_CENTER, EC_WORD_QUES, EC_EMPTY_WORD, EC_WORD_POKEDEX, EC_WORD_POKEMON, EC_WORD_POKENAV
+#endif
 };
 
 static const u16 sQuizLadyQuestion11[QUIZ_QUESTION_LEN] =
 {
-    EC_WORD_WHICH,
-    EC_WORD_STORES,
-    EC_WORD_YOUR,
-    EC_WORD_POKEMON,
-    EC_WORD_QUES,
-    EC_EMPTY_WORD,
-    EC_WORD_PC,
-    EC_WORD_DEPT_STORE,
-    EC_WORD_TELEVISION
+#if FRENCH
+    EC_WORD_IT_S, EC_WORD_FULL, EC_WORD_OF, EC_EMPTY_WORD, EC_WORD_SOFTWARE, EC_WORD_QUES, EC_WORD_DEPT_STORE, EC_WORD_SCHOOL, EC_WORD_MACHINE
+#elif ITALIAN
+    EC_WORD_EVEN_SO, EC_WORD_THINKS, EC_WORD_ALL, EC_WORD_DID, EC_WORD_POKEMON, EC_WORD_QUES, EC_WORD_PC, EC_WORD_CLASS, EC_WORD_TELEVISION,
+#elif SPANISH
+    EC_WORD_QUES_EXCL, EC_WORD_CAN_T, EC_WORD_STORES, EC_WORD_POKEMON, EC_WORD_THE, EC_WORD_QUES, EC_WORD_PC, EC_WORD_DEPT_STORE, EC_WORD_TEACHER
+#else //ENGLISH
+    EC_WORD_WHICH, EC_WORD_STORES, EC_WORD_YOUR, EC_WORD_POKEMON, EC_WORD_QUES, EC_EMPTY_WORD, EC_WORD_PC, EC_WORD_DEPT_STORE, EC_WORD_TELEVISION
+#endif
 };
 
 static const u16 sQuizLadyQuestion12[QUIZ_QUESTION_LEN] =
 {
-    EC_WORD_WHICH,
-    EC_WORD_MACHINE,
-    EC_WORD_GIVES,
-    EC_WORD_YOU,
-    EC_WORD_INFORMATION,
-    EC_WORD_QUES,
-    EC_WORD_BIKE,
-    EC_WORD_LOCOMOTIVE,
-    EC_WORD_TELEVISION
+#if FRENCH
+    EC_WORD_HOW, EC_WORD_HAVE, EC_WORD_MOOD, EC_EMPTY_WORD, EC_WORD_INFORMATION, EC_WORD_QUES, EC_WORD_BIKE, EC_WORD_LOCOMOTIVE, EC_WORD_TELEVISION
+#elif ITALIAN
+    EC_WORD_IS, EC_WORD_TO, EC_WORD_MACHINE, EC_WORD_NITWIT, EC_WORD_INFORMATION, EC_WORD_ELLIPSIS, EC_WORD_BIKE, EC_WORD_TRAIN, EC_WORD_TELEVISION,
+#elif SPANISH
+    EC_WORD_QUES_EXCL, EC_WORD_DOWN, EC_WORD_LAY, EC_WORD_WITHOUT, EC_WORD_MESSAGE, EC_WORD_QUES, EC_WORD_BIKE, EC_WORD_LOCOMOTIVE, EC_WORD_RADIO
+#else //ENGLISH
+    EC_WORD_WHICH, EC_WORD_MACHINE, EC_WORD_GIVES, EC_WORD_YOU, EC_WORD_INFORMATION, EC_WORD_QUES, EC_WORD_BIKE, EC_WORD_LOCOMOTIVE, EC_WORD_TELEVISION
+#endif
 };
 
 static const u16 sQuizLadyQuestion13[QUIZ_QUESTION_LEN] =
 {
-    EC_WORD_A,
-    EC_WORD_POKEMON,
-    EC_WORD_WAS,
-    EC_WORD_ONCE,
-    EC_WORD_THIS,
-    EC_WORD_QUES,
-    EC_WORD_PHONE,
-    EC_WORD_PLUSH_DOLL,
-    EC_WORD_LETTER
+#if FRENCH
+    EC_MOVE2(WATER_PULSE), EC_WORD_IT_S, EC_WORD_AN, EC_WORD_QUES, EC_WORD_MOVE, EC_WORD_COLOR, EC_WORD_OR, EC_WORD_AN, EC_WORD_AWAY
+#elif ITALIAN
+    EC_WORD_THING, EC_WORD_CHANGE, EC_WORD_CONCEDE, EC_WORD_A, EC_WORD_POKEMON, EC_WORD_QUES, EC_WORD_PHONE, EC_WORD_PLUSH_DOLL, EC_WORD_MAIL,
+#elif SPANISH
+    EC_WORD_QUES_EXCL, EC_WORD_DOWN, EC_WORD_WENT, EC_WORD_FOR_NOW, EC_WORD_POKEMON, EC_WORD_QUES, EC_WORD_PHONE, EC_WORD_PLUSH_DOLL, EC_WORD_LETTER
+#else //ENGLISH
+    EC_WORD_A, EC_WORD_POKEMON, EC_WORD_WAS, EC_WORD_ONCE, EC_WORD_THIS, EC_WORD_QUES, EC_WORD_PHONE, EC_WORD_PLUSH_DOLL, EC_WORD_LETTER
+#endif
 };
 
 static const u16 sQuizLadyQuestion14[QUIZ_QUESTION_LEN] =
 {
-    EC_WORD_STEEL,
-    EC_WORD_IS,
-    EC_WORD_STRONG,
-    EC_WORD_VERSUS,
-    EC_WORD_WHICH,
-    EC_WORD_QUES,
-    EC_WORD_ICE,
-    EC_WORD_GROUND,
-    EC_EMPTY_WORD
+#if FRENCH
+    EC_WORD_STEEL, EC_WORD_IS, EC_WORD_STRONG, EC_EMPTY_WORD, EC_WORD_VERSUS, EC_WORD_QUES, EC_WORD_ICE, EC_EMPTY_WORD, EC_WORD_GROUND
+#elif ITALIAN
+    EC_WORD_VERSUS, EC_WORD_THING, EC_WORD_IS, EC_WORD_STRONG, EC_WORD_STEEL, EC_WORD_QUES, EC_WORD_ICE, EC_WORD_GROUND, EC_EMPTY_WORD,
+#elif SPANISH
+    EC_WORD_IS, EC_WORD_FUNNY, EC_WORD_NOT_VERY, EC_WORD_A_TINY_BIT, EC_WORD_STEEL, EC_EMPTY_WORD, EC_WORD_ICE, EC_WORD_GROUND, EC_EMPTY_WORD
+#else //ENGLISH
+    EC_WORD_STEEL, EC_WORD_IS, EC_WORD_STRONG, EC_WORD_VERSUS, EC_WORD_WHICH, EC_WORD_QUES, EC_WORD_ICE, EC_WORD_GROUND, EC_EMPTY_WORD
+#endif
 };
 
 static const u16 sQuizLadyQuestion15[QUIZ_QUESTION_LEN] =
 {
-    EC_WORD_DARK,
-    EC_WORD_IS,
-    EC_WORD_WEAK,
-    EC_WORD_VERSUS,
-    EC_WORD_WHICH,
-    EC_WORD_QUES,
-    EC_WORD_PSYCHIC,
-    EC_WORD_FIGHTING,
-    EC_EMPTY_WORD
+#if FRENCH
+    EC_WORD_DARK, EC_WORD_IS, EC_WORD_WEAK, EC_EMPTY_WORD, EC_WORD_VERSUS, EC_WORD_QUES, EC_WORD_PSYCHIC, EC_EMPTY_WORD, EC_WORD_FIGHTING
+#elif ITALIAN
+    EC_WORD_VERSUS, EC_WORD_THING, EC_WORD_IS, EC_WORD_WEAK, EC_WORD_DARK, EC_WORD_QUES, EC_WORD_PSYCHIC, EC_WORD_FIGHTING, EC_EMPTY_WORD,
+#elif SPANISH
+    EC_WORD_DARK, EC_WORD_IS, EC_WORD_FUNNY, EC_WORD_NOT_VERY, EC_EMPTY_WORD, EC_EMPTY_WORD, EC_WORD_PSYCHIC, EC_WORD_GUARD, EC_EMPTY_WORD
+#else //ENGLISH
+    EC_WORD_DARK, EC_WORD_IS, EC_WORD_WEAK, EC_WORD_VERSUS, EC_WORD_WHICH, EC_WORD_QUES, EC_WORD_PSYCHIC, EC_WORD_FIGHTING, EC_EMPTY_WORD
+#endif
 };
 
 static const u16 sQuizLadyQuestion16[QUIZ_QUESTION_LEN] =
 {
-    EC_WORD_GHOST,
-    EC_WORD_IS,
-    EC_WORD_WEAK,
-    EC_WORD_VERSUS,
-    EC_WORD_WHICH,
-    EC_WORD_QUES,
-    EC_WORD_NORMAL,
-    EC_WORD_DARK,
-    EC_EMPTY_WORD
-};
+#if FRENCH
+    EC_WORD_GHOST, EC_WORD_IS, EC_WORD_WEAK, EC_EMPTY_WORD, EC_WORD_VERSUS, EC_WORD_QUES, EC_WORD_NORMAL, EC_WORD_DARK, EC_EMPTY_WORD
+#elif ITALIAN
+    EC_WORD_VERSUS, EC_WORD_THING, EC_WORD_IS, EC_WORD_WEAK, EC_WORD_GHOST, EC_WORD_QUES, EC_WORD_NORMAL, EC_WORD_DARK, EC_EMPTY_WORD,
+#elif SPANISH
+    EC_WORD_GHOST, EC_WORD_IS, EC_WORD_FUNNY, EC_WORD_NOT_VERY, EC_EMPTY_WORD, EC_EMPTY_WORD, EC_WORD_NORMAL, EC_WORD_DARK, EC_EMPTY_WORD
+#else //ENGLISH
+    EC_WORD_GHOST, EC_WORD_IS, EC_WORD_WEAK, EC_WORD_VERSUS, EC_WORD_WHICH, EC_WORD_QUES, EC_WORD_NORMAL, EC_WORD_DARK, EC_EMPTY_WORD
 #endif
+};
 
 static const u16 *const sQuizLadyQuizQuestions[] =
 {
@@ -668,56 +250,11 @@ static const u16 *const sQuizLadyQuizQuestions[] =
 static const u16 sQuizLadyQuizAnswers[] =
 {
 #if FRENCH
-    EC_WORD_POKEDEX,
-    EC_WORD_AWESOME,
-    EC_WORD_LEVEL,
-    EC_WORD_SWEETS,
-    EC_WORD_EGG,
-    EC_WORD_OWN_TEMPO,
-    EC_WORD_LOVEY_DOVEY,
-    EC_WORD_SHADOW_TAG,
-    EC_WORD_IMMUNITY,
-    EC_WORD_SUNDAY,
-    EC_WORD_MACHINE,
-    EC_WORD_TELEVISION,
-    EC_WORD_MOVE,
-    EC_WORD_ICE,
-    EC_WORD_FIGHTING,
-    EC_WORD_DARK
+    EC_WORD_POKEDEX, EC_WORD_AWESOME, EC_WORD_LEVEL, EC_WORD_SWEETS, EC_WORD_EGG, EC_WORD_OWN_TEMPO, EC_WORD_LOVEY_DOVEY, EC_WORD_SHADOW_TAG, EC_WORD_IMMUNITY, EC_WORD_SUNDAY, EC_WORD_MACHINE, EC_WORD_TELEVISION, EC_WORD_MOVE, EC_WORD_ICE, EC_WORD_FIGHTING, EC_WORD_DARK
 #elif ITALIAN
-    EC_WORD_POKEDEX,
-    EC_WORD_DARK,
-    EC_WORD_LEVEL,
-    EC_WORD_FLOWERS,
-    EC_WORD_EGG,
-    EC_WORD_OWN_TEMPO,
-    EC_WORD_ANIME,
-    EC_WORD_SHADOW_TAG,
-    EC_WORD_IMMUNITY,
-    EC_WORD_POKEMON,
-    EC_WORD_PC,
-    EC_WORD_TELEVISION,
-    EC_WORD_PLUSH_DOLL,
-    EC_WORD_ICE,
-    EC_WORD_FIGHTING,
-    EC_WORD_DARK,
+    EC_WORD_POKEDEX, EC_WORD_DARK, EC_WORD_LEVEL, EC_WORD_FLOWERS, EC_WORD_EGG, EC_WORD_OWN_TEMPO, EC_WORD_ANIME, EC_WORD_SHADOW_TAG, EC_WORD_IMMUNITY, EC_WORD_POKEMON, EC_WORD_PC, EC_WORD_TELEVISION, EC_WORD_PLUSH_DOLL, EC_WORD_ICE, EC_WORD_FIGHTING, EC_WORD_DARK,
 #else //ENGLISH
-    EC_WORD_POKEDEX,
-    EC_WORD_DARK,
-    EC_WORD_LEVEL,
-    EC_WORD_FLOWERS,
-    EC_WORD_EGG,
-    EC_WORD_OWN_TEMPO,
-    EC_WORD_ROCK,
-    EC_WORD_SHADOW_TAG,
-    EC_WORD_IMMUNITY,
-    EC_WORD_POKEMON,
-    EC_WORD_PC,
-    EC_WORD_TELEVISION,
-    EC_WORD_PLUSH_DOLL,
-    EC_WORD_ICE,
-    EC_WORD_FIGHTING,
-    EC_WORD_DARK
+    EC_WORD_POKEDEX, EC_WORD_DARK, EC_WORD_LEVEL, EC_WORD_FLOWERS, EC_WORD_EGG, EC_WORD_OWN_TEMPO, EC_WORD_ROCK, EC_WORD_SHADOW_TAG, EC_WORD_IMMUNITY, EC_WORD_POKEMON, EC_WORD_PC, EC_WORD_TELEVISION, EC_WORD_PLUSH_DOLL, EC_WORD_ICE, EC_WORD_FIGHTING, EC_WORD_DARK
 #endif
 };
 
diff --git a/src/data/pokemon/pokedex_entries.h b/src/data/pokemon/pokedex_entries.h
index 6305496e65..529f51cffe 100644
--- a/src/data/pokemon/pokedex_entries.h
+++ b/src/data/pokemon/pokedex_entries.h
@@ -2,13 +2,7 @@ const struct PokedexEntry gPokedexEntries[] =
 {
     [NATIONAL_DEX_NONE] =
     {
-    #if FRENCH
-        .categoryName = _("INCONNU"),
-    #elif ITALIAN
-        .categoryName = _("SCONOSC"),
-    #else //ENGLISH
-        .categoryName = _("UNKNOWN"),
-    #endif
+        .categoryName = LANGUAGE_STRING("UNKNOWN", "INCONNU", "SCONOSC", "DESCON."),
         .height = 0,
         .weight = 0,
         .description = gDummyPokedexText,
@@ -20,13 +14,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_BULBASAUR] =
     {
-    #if FRENCH
-        .categoryName = _("GRAINE"),
-    #elif ITALIAN
-        .categoryName = _("SEME"),
-    #else //ENGLISH
-        .categoryName = _("SEED"),
-    #endif
+        .categoryName = LANGUAGE_STRING("SEED", "GRAINE", "SEME", "SEMILLA"),
         .height = 7,
         .weight = 69,
         .description = gBulbasaurPokedexText,
@@ -38,13 +26,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_IVYSAUR] =
     {
-    #if FRENCH
-        .categoryName = _("GRAINE"),
-    #elif ITALIAN
-        .categoryName = _("SEME"),
-    #else //ENGLISH
-        .categoryName = _("SEED"),
-    #endif
+        .categoryName = LANGUAGE_STRING("SEED", "GRAINE", "SEME", "SEMILLA"),
         .height = 10,
         .weight = 130,
         .description = gIvysaurPokedexText,
@@ -56,13 +38,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_VENUSAUR] =
     {
-    #if FRENCH
-        .categoryName = _("GRAINE"),
-    #elif ITALIAN
-        .categoryName = _("SEME"),
-    #else //ENGLISH
-        .categoryName = _("SEED"),
-    #endif
+        .categoryName = LANGUAGE_STRING("SEED", "GRAINE", "SEME", "SEMILLA"),
         .height = 20,
         .weight = 1000,
         .description = gVenusaurPokedexText,
@@ -74,13 +50,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_CHARMANDER] =
     {
-    #if FRENCH
-        .categoryName = _("LEZARD"),
-    #elif ITALIAN
-        .categoryName = _("LUCERTOLA"),
-    #else //ENGLISH
-        .categoryName = _("LIZARD"),
-    #endif
+        .categoryName = LANGUAGE_STRING("LIZARD", "LEZARD", "LUCERTOLA", "LAGARTIJA"),
         .height = 6,
         .weight = 85,
         .description = gCharmanderPokedexText,
@@ -92,13 +62,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_CHARMELEON] =
     {
-    #if FRENCH
-        .categoryName = _("FLAMME"),
-    #elif ITALIAN
-        .categoryName = _("FIAMMA"),
-    #else //ENGLISH
-        .categoryName = _("FLAME"),
-    #endif
+        .categoryName = LANGUAGE_STRING("FLAME", "FLAMME", "FIAMMA", "LLAMA"),
         .height = 11,
         .weight = 190,
         .description = gCharmeleonPokedexText,
@@ -110,13 +74,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_CHARIZARD] =
     {
-    #if FRENCH
-        .categoryName = _("FLAMME"),
-    #elif ITALIAN
-        .categoryName = _("FIAMMA"),
-    #else //ENGLISH
-        .categoryName = _("FLAME"),
-    #endif
+        .categoryName = LANGUAGE_STRING("FLAME", "FLAMME", "FIAMMA", "LLAMA"),
         .height = 17,
         .weight = 905,
         .description = gCharizardPokedexText,
@@ -128,13 +86,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_SQUIRTLE] =
     {
-    #if FRENCH
-        .categoryName = _("MINITORTUE"),
-    #elif ITALIAN
-        .categoryName = _("TARTAGHINA"),
-    #else //ENGLISH
-        .categoryName = _("TINY TURTLE"),
-    #endif
+        .categoryName = LANGUAGE_STRING("TINY TURTLE", "MINITORTUE", "TARTAGHINA", "TORTUGUITA"),
         .height = 5,
         .weight = 90,
         .description = gSquirtlePokedexText,
@@ -146,13 +98,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_WARTORTLE] =
     {
-    #if FRENCH
-        .categoryName = _("TORTUE"),
-    #elif ITALIAN
-        .categoryName = _("TARTARUGA"),
-    #else //ENGLISH
-        .categoryName = _("TURTLE"),
-    #endif
+        .categoryName = LANGUAGE_STRING("TURTLE", "TORTUE", "TARTARUGA", "TORTUGA"),
         .height = 10,
         .weight = 225,
         .description = gWartortlePokedexText,
@@ -164,13 +110,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_BLASTOISE] =
     {
-    #if FRENCH
-        .categoryName = _("CARAPACE"),
-    #elif ITALIAN
-        .categoryName = _("CROSTACEO"),
-    #else //ENGLISH
-        .categoryName = _("SHELLFISH"),
-    #endif
+        .categoryName = LANGUAGE_STRING("SHELLFISH", "CARAPACE", "CROSTACEO", "MARISCO"),
         .height = 16,
         .weight = 855,
         .description = gBlastoisePokedexText,
@@ -182,13 +122,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_CATERPIE] =
     {
-    #if FRENCH
-        .categoryName = _("VER"),
-    #elif ITALIAN
-        .categoryName = _("BACO"),
-    #else //ENGLISH
-        .categoryName = _("WORM"),
-    #endif
+        .categoryName = LANGUAGE_STRING("WORM", "VER", "BACO", "GUSANO"),
         .height = 3,
         .weight = 29,
         .description = gCaterpiePokedexText,
@@ -200,13 +134,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_METAPOD] =
     {
-    #if FRENCH
-        .categoryName = _("COCON"),
-    #elif ITALIAN
-        .categoryName = _("BOZZOLO"),
-    #else //ENGLISH
-        .categoryName = _("COCOON"),
-    #endif
+        .categoryName = LANGUAGE_STRING("COCOON", "COCON", "BOZZOLO", "CAPULLO"),
         .height = 7,
         .weight = 99,
         .description = gMetapodPokedexText,
@@ -218,13 +146,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_BUTTERFREE] =
     {
-    #if FRENCH
-        .categoryName = _("PAPILLON"),
-    #elif ITALIAN
-        .categoryName = _("FARFALLA"),
-    #else //ENGLISH
-        .categoryName = _("BUTTERFLY"),
-    #endif
+        .categoryName = LANGUAGE_STRING("BUTTERFLY", "PAPILLON", "FARFALLA", "MARIPOSA"),
         .height = 11,
         .weight = 320,
         .description = gButterfreePokedexText,
@@ -236,13 +158,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_WEEDLE] =
     {
-    #if FRENCH
-        .categoryName = _("INSECTOPIC"),
-    #elif ITALIAN
-        .categoryName = _("MILLEPIEDI"),
-    #else //ENGLISH
-        .categoryName = _("HAIRY BUG"),
-    #endif
+        .categoryName = LANGUAGE_STRING("HAIRY BUG", "INSECTOPIC", "MILLEPIEDI", "ORUGA"),
         .height = 3,
         .weight = 32,
         .description = gWeedlePokedexText,
@@ -254,13 +170,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_KAKUNA] =
     {
-    #if FRENCH
-        .categoryName = _("COCON"),
-    #elif ITALIAN
-        .categoryName = _("BOZZOLO"),
-    #else //ENGLISH
-        .categoryName = _("COCOON"),
-    #endif
+        .categoryName = LANGUAGE_STRING("COCOON", "COCON", "BOZZOLO", "CAPULLO"),
         .height = 6,
         .weight = 100,
         .description = gKakunaPokedexText,
@@ -272,13 +182,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_BEEDRILL] =
     {
-    #if FRENCH
-        .categoryName = _("GUEPOISON"),
-    #elif ITALIAN
-        .categoryName = _("VELENAPE"),
-    #else //ENGLISH
-        .categoryName = _("POISON BEE"),
-    #endif
+        .categoryName = LANGUAGE_STRING("POISON BEE", "GUEPOISON", "VELENAPE", "ABEJA VEN."),
         .height = 10,
         .weight = 295,
         .description = gBeedrillPokedexText,
@@ -290,13 +194,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_PIDGEY] =
     {
-    #if FRENCH
-        .categoryName = _("MINOISEAU"),
-    #elif ITALIAN
-        .categoryName = _("UCCELLINO"),
-    #else //ENGLISH
-        .categoryName = _("TINY BIRD"),
-    #endif
+        .categoryName = LANGUAGE_STRING("TINY BIRD", "MINOISEAU", "UCCELLINO", "PAJARITO"),
         .height = 3,
         .weight = 18,
         .description = gPidgeyPokedexText,
@@ -308,13 +206,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_PIDGEOTTO] =
     {
-    #if FRENCH
-        .categoryName = _("OISEAU"),
-    #elif ITALIAN
-        .categoryName = _("UCCELLO"),
-    #else //ENGLISH
-        .categoryName = _("BIRD"),
-    #endif
+        .categoryName = LANGUAGE_STRING("BIRD", "OISEAU", "UCCELLO", "PÁJARO"),
         .height = 11,
         .weight = 300,
         .description = gPidgeottoPokedexText,
@@ -326,13 +218,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_PIDGEOT] =
     {
-    #if FRENCH
-        .categoryName = _("OISEAU"),
-    #elif ITALIAN
-        .categoryName = _("UCCELLO"),
-    #else //ENGLISH
-        .categoryName = _("BIRD"),
-    #endif
+        .categoryName = LANGUAGE_STRING("BIRD", "OISEAU", "UCCELLO", "PÁJARO"),
         .height = 15,
         .weight = 395,
         .description = gPidgeotPokedexText,
@@ -344,13 +230,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_RATTATA] =
     {
-    #if FRENCH
-        .categoryName = _("SOURIS"),
-    #elif ITALIAN
-        .categoryName = _("TOPO"),
-    #else //ENGLISH
-        .categoryName = _("MOUSE"),
-    #endif
+        .categoryName = LANGUAGE_STRING("MOUSE", "SOURIS", "TOPO", "RATÓN"),
         .height = 3,
         .weight = 35,
         .description = gRattataPokedexText,
@@ -362,13 +242,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_RATICATE] =
     {
-    #if FRENCH
-        .categoryName = _("SOURIS"),
-    #elif ITALIAN
-        .categoryName = _("TOPO"),
-    #else //ENGLISH
-        .categoryName = _("MOUSE"),
-    #endif
+        .categoryName = LANGUAGE_STRING("MOUSE", "SOURIS", "TOPO", "RATÓN"),
         .height = 7,
         .weight = 185,
         .description = gRaticatePokedexText,
@@ -380,13 +254,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_SPEAROW] =
     {
-    #if FRENCH
-        .categoryName = _("MINOISEAU"),
-    #elif ITALIAN
-        .categoryName = _("UCCELLINO"),
-    #else //ENGLISH
-        .categoryName = _("TINY BIRD"),
-    #endif
+        .categoryName = LANGUAGE_STRING("TINY BIRD", "MINOISEAU", "UCCELLINO", "PAJARITO"),
         .height = 3,
         .weight = 20,
         .description = gSpearowPokedexText,
@@ -398,13 +266,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_FEAROW] =
     {
-    #if FRENCH
-        .categoryName = _("BEC-OISEAU"),
-    #elif ITALIAN
-        .categoryName = _("BECCO"),
-    #else //ENGLISH
-        .categoryName = _("BEAK"),
-    #endif
+        .categoryName = LANGUAGE_STRING("BEAK", "BEC-OISEAU", "BECCO", "PICO"),
         .height = 12,
         .weight = 380,
         .description = gFearowPokedexText,
@@ -416,13 +278,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_EKANS] =
     {
-    #if FRENCH
-        .categoryName = _("SERPENT"),
-    #elif ITALIAN
-        .categoryName = _("SERPENTE"),
-    #else //ENGLISH
-        .categoryName = _("SNAKE"),
-    #endif
+        .categoryName = LANGUAGE_STRING("SNAKE", "SERPENT", "SERPENTE", "SERPIENTE"),
         .height = 20,
         .weight = 69,
         .description = gEkansPokedexText,
@@ -434,13 +290,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_ARBOK] =
     {
-    #if FRENCH
-        .categoryName = _("COBRA"),
-    #elif ITALIAN
-        .categoryName = _("COBRA"),
-    #else //ENGLISH
-        .categoryName = _("COBRA"),
-    #endif
+        .categoryName = LANGUAGE_STRING("COBRA", "COBRA", "COBRA", "COBRA"),
         .height = 35,
         .weight = 650,
         .description = gArbokPokedexText,
@@ -452,13 +302,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_PIKACHU] =
     {
-    #if FRENCH
-        .categoryName = _("SOURIS"),
-    #elif ITALIAN
-        .categoryName = _("TOPO"),
-    #else //ENGLISH
-        .categoryName = _("MOUSE"),
-    #endif
+        .categoryName = LANGUAGE_STRING("MOUSE", "SOURIS", "TOPO", "RATÓN"),
         .height = 4,
         .weight = 60,
         .description = gPikachuPokedexText,
@@ -470,13 +314,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_RAICHU] =
     {
-    #if FRENCH
-        .categoryName = _("SOURIS"),
-    #elif ITALIAN
-        .categoryName = _("TOPO"),
-    #else //ENGLISH
-        .categoryName = _("MOUSE"),
-    #endif
+        .categoryName = LANGUAGE_STRING("MOUSE", "SOURIS", "TOPO", "RATÓN"),
         .height = 8,
         .weight = 300,
         .description = gRaichuPokedexText,
@@ -488,13 +326,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_SANDSHREW] =
     {
-    #if FRENCH
-        .categoryName = _("SOURIS"),
-    #elif ITALIAN
-        .categoryName = _("TOPO"),
-    #else //ENGLISH
-        .categoryName = _("MOUSE"),
-    #endif
+        .categoryName = LANGUAGE_STRING("MOUSE", "SOURIS", "TOPO", "RATÓN"),
         .height = 6,
         .weight = 120,
         .description = gSandshrewPokedexText,
@@ -506,13 +338,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_SANDSLASH] =
     {
-    #if FRENCH
-        .categoryName = _("SOURIS"),
-    #elif ITALIAN
-        .categoryName = _("TOPO"),
-    #else //ENGLISH
-        .categoryName = _("MOUSE"),
-    #endif
+        .categoryName = LANGUAGE_STRING("MOUSE", "SOURIS", "TOPO", "RATÓN"),
         .height = 10,
         .weight = 295,
         .description = gSandslashPokedexText,
@@ -524,13 +350,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_NIDORAN_F] =
     {
-    #if FRENCH
-        .categoryName = _("VENEPIC"),
-    #elif ITALIAN
-        .categoryName = _("VELENAGO"),
-    #else //ENGLISH
-        .categoryName = _("POISON PIN"),
-    #endif
+        .categoryName = LANGUAGE_STRING("POISON PIN", "VENEPIC", "VELENAGO", "PIN VENENO"),
         .height = 4,
         .weight = 70,
         .description = gNidoranFPokedexText,
@@ -542,13 +362,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_NIDORINA] =
     {
-    #if FRENCH
-        .categoryName = _("VENEPIC"),
-    #elif ITALIAN
-        .categoryName = _("VELENAGO"),
-    #else //ENGLISH
-        .categoryName = _("POISON PIN"),
-    #endif
+        .categoryName = LANGUAGE_STRING("POISON PIN", "VENEPIC", "VELENAGO", "PIN VENENO"),
         .height = 8,
         .weight = 200,
         .description = gNidorinaPokedexText,
@@ -560,13 +374,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_NIDOQUEEN] =
     {
-    #if FRENCH
-        .categoryName = _("PERCEUR"),
-    #elif ITALIAN
-        .categoryName = _("TRAPANO"),
-    #else //ENGLISH
-        .categoryName = _("DRILL"),
-    #endif
+        .categoryName = LANGUAGE_STRING("DRILL", "PERCEUR", "TRAPANO", "TALADRO"),
         .height = 13,
         .weight = 600,
         .description = gNidoqueenPokedexText,
@@ -578,13 +386,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_NIDORAN_M] =
     {
-    #if FRENCH
-        .categoryName = _("VENEPIC"),
-    #elif ITALIAN
-        .categoryName = _("VELENAGO"),
-    #else //ENGLISH
-        .categoryName = _("POISON PIN"),
-    #endif
+        .categoryName = LANGUAGE_STRING("POISON PIN", "VENEPIC", "VELENAGO", "PIN VENENO"),
         .height = 5,
         .weight = 90,
         .description = gNidoranMPokedexText,
@@ -596,13 +398,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_NIDORINO] =
     {
-    #if FRENCH
-        .categoryName = _("VENEPIC"),
-    #elif ITALIAN
-        .categoryName = _("VELENAGO"),
-    #else //ENGLISH
-        .categoryName = _("POISON PIN"),
-    #endif
+        .categoryName = LANGUAGE_STRING("POISON PIN", "VENEPIC", "VELENAGO", "PIN VENENO"),
         .height = 9,
         .weight = 195,
         .description = gNidorinoPokedexText,
@@ -614,13 +410,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_NIDOKING] =
     {
-    #if FRENCH
-        .categoryName = _("PERCEUR"),
-    #elif ITALIAN
-        .categoryName = _("TRAPANO"),
-    #else //ENGLISH
-        .categoryName = _("DRILL"),
-    #endif
+        .categoryName = LANGUAGE_STRING("DRILL", "PERCEUR", "TRAPANO", "TALADRO"),
         .height = 14,
         .weight = 620,
         .description = gNidokingPokedexText,
@@ -632,13 +422,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_CLEFAIRY] =
     {
-    #if FRENCH
-        .categoryName = _("FEE"),
-    #elif ITALIAN
-        .categoryName = _("FATA"),
-    #else //ENGLISH
-        .categoryName = _("FAIRY"),
-    #endif
+        .categoryName = LANGUAGE_STRING("FAIRY", "FEE", "FATA", "HADA"),
         .height = 6,
         .weight = 75,
         .description = gClefairyPokedexText,
@@ -650,13 +434,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_CLEFABLE] =
     {
-    #if FRENCH
-        .categoryName = _("FEE"),
-    #elif ITALIAN
-        .categoryName = _("FATA"),
-    #else //ENGLISH
-        .categoryName = _("FAIRY"),
-    #endif
+        .categoryName = LANGUAGE_STRING("FAIRY", "FEE", "FATA", "HADA"),
         .height = 13,
         .weight = 400,
         .description = gClefablePokedexText,
@@ -668,13 +446,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_VULPIX] =
     {
-    #if FRENCH
-        .categoryName = _("RENARD"),
-    #elif ITALIAN
-        .categoryName = _("VOLPE"),
-    #else //ENGLISH
-        .categoryName = _("FOX"),
-    #endif
+        .categoryName = LANGUAGE_STRING("FOX", "RENARD", "VOLPE", "ZORRO"),
         .height = 6,
         .weight = 99,
         .description = gVulpixPokedexText,
@@ -686,13 +458,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_NINETALES] =
     {
-    #if FRENCH
-        .categoryName = _("RENARD"),
-    #elif ITALIAN
-        .categoryName = _("VOLPE"),
-    #else //ENGLISH
-        .categoryName = _("FOX"),
-    #endif
+        .categoryName = LANGUAGE_STRING("FOX", "RENARD", "VOLPE", "ZORRO"),
         .height = 11,
         .weight = 199,
         .description = gNinetalesPokedexText,
@@ -704,13 +470,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_JIGGLYPUFF] =
     {
-    #if FRENCH
-        .categoryName = _("BOUBOULE"),
-    #elif ITALIAN
-        .categoryName = _("PALLONE"),
-    #else //ENGLISH
-        .categoryName = _("BALLOON"),
-    #endif
+        .categoryName = LANGUAGE_STRING("BALLOON", "BOUBOULE", "PALLONE", "GLOBO"),
         .height = 5,
         .weight = 55,
         .description = gJigglypuffPokedexText,
@@ -722,13 +482,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_WIGGLYTUFF] =
     {
-    #if FRENCH
-        .categoryName = _("BOUBOULE"),
-    #elif ITALIAN
-        .categoryName = _("PALLONE"),
-    #else //ENGLISH
-        .categoryName = _("BALLOON"),
-    #endif
+        .categoryName = LANGUAGE_STRING("BALLOON", "BOUBOULE", "PALLONE", "GLOBO"),
         .height = 10,
         .weight = 120,
         .description = gWigglytuffPokedexText,
@@ -740,13 +494,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_ZUBAT] =
     {
-    #if FRENCH
-        .categoryName = _("CHOVSOURIS"),
-    #elif ITALIAN
-        .categoryName = _("PIPISTREL."),
-    #else //ENGLISH
-        .categoryName = _("BAT"),
-    #endif
+        .categoryName = LANGUAGE_STRING("BAT", "CHOVSOURIS", "PIPISTREL.", "MURCIÉLAGO"),
         .height = 8,
         .weight = 75,
         .description = gZubatPokedexText,
@@ -758,13 +506,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_GOLBAT] =
     {
-    #if FRENCH
-        .categoryName = _("CHOVSOURIS"),
-    #elif ITALIAN
-        .categoryName = _("PIPISTREL."),
-    #else //ENGLISH
-        .categoryName = _("BAT"),
-    #endif
+        .categoryName = LANGUAGE_STRING("BAT", "CHOVSOURIS", "PIPISTREL.", "MURCIÉLAGO"),
         .height = 16,
         .weight = 550,
         .description = gGolbatPokedexText,
@@ -776,13 +518,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_ODDISH] =
     {
-    #if FRENCH
-        .categoryName = _("RACINE"),
-    #elif ITALIAN
-        .categoryName = _("MALERBA"),
-    #else //ENGLISH
-        .categoryName = _("WEED"),
-    #endif
+        .categoryName = LANGUAGE_STRING("WEED", "RACINE", "MALERBA", "HIERBAJO"),
         .height = 5,
         .weight = 54,
         .description = gOddishPokedexText,
@@ -794,13 +530,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_GLOOM] =
     {
-    #if FRENCH
-        .categoryName = _("RACINE"),
-    #elif ITALIAN
-        .categoryName = _("MALERBA"),
-    #else //ENGLISH
-        .categoryName = _("WEED"),
-    #endif
+        .categoryName = LANGUAGE_STRING("WEED", "RACINE", "MALERBA", "HIERBAJO"),
         .height = 8,
         .weight = 86,
         .description = gGloomPokedexText,
@@ -812,13 +542,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_VILEPLUME] =
     {
-    #if FRENCH
-        .categoryName = _("FLEUR"),
-    #elif ITALIAN
-        .categoryName = _("FIORE"),
-    #else //ENGLISH
-        .categoryName = _("FLOWER"),
-    #endif
+        .categoryName = LANGUAGE_STRING("FLOWER", "FLEUR", "FIORE", "FLOR"),
         .height = 12,
         .weight = 186,
         .description = gVileplumePokedexText,
@@ -830,13 +554,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_PARAS] =
     {
-    #if FRENCH
-        .categoryName = _("CHAMPIGNON"),
-    #elif ITALIAN
-        .categoryName = _("FUNGO"),
-    #else //ENGLISH
-        .categoryName = _("MUSHROOM"),
-    #endif
+        .categoryName = LANGUAGE_STRING("MUSHROOM", "CHAMPIGNON", "FUNGO", "HONGO"),
         .height = 3,
         .weight = 54,
         .description = gParasPokedexText,
@@ -848,13 +566,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_PARASECT] =
     {
-    #if FRENCH
-        .categoryName = _("CHAMPIGNON"),
-    #elif ITALIAN
-        .categoryName = _("FUNGO"),
-    #else //ENGLISH
-        .categoryName = _("MUSHROOM"),
-    #endif
+        .categoryName = LANGUAGE_STRING("MUSHROOM", "CHAMPIGNON", "FUNGO", "HONGO"),
         .height = 10,
         .weight = 295,
         .description = gParasectPokedexText,
@@ -866,13 +578,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_VENONAT] =
     {
-    #if FRENCH
-        .categoryName = _("VERMINE"),
-    #elif ITALIAN
-        .categoryName = _("INSETTO"),
-    #else //ENGLISH
-        .categoryName = _("INSECT"),
-    #endif
+        .categoryName = LANGUAGE_STRING("INSECT", "VERMINE", "INSETTO", "INSECTO"),
         .height = 10,
         .weight = 300,
         .description = gVenonatPokedexText,
@@ -884,13 +590,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_VENOMOTH] =
     {
-    #if FRENCH
-        .categoryName = _("PAPIPOISON"),
-    #elif ITALIAN
-        .categoryName = _("VELENTARMA"),
-    #else //ENGLISH
-        .categoryName = _("POISON MOTH"),
-    #endif
+        .categoryName = LANGUAGE_STRING("POISON MOTH", "PAPIPOISON", "VELENTARMA", "POLILLA V."),
         .height = 15,
         .weight = 125,
         .description = gVenomothPokedexText,
@@ -902,13 +602,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_DIGLETT] =
     {
-    #if FRENCH
-        .categoryName = _("TAUPE"),
-    #elif ITALIAN
-        .categoryName = _("TALPA"),
-    #else //ENGLISH
-        .categoryName = _("MOLE"),
-    #endif
+        .categoryName = LANGUAGE_STRING("MOLE", "TAUPE", "TALPA", "TOPO"),
         .height = 2,
         .weight = 8,
         .description = gDiglettPokedexText,
@@ -920,13 +614,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_DUGTRIO] =
     {
-    #if FRENCH
-        .categoryName = _("TAUPE"),
-    #elif ITALIAN
-        .categoryName = _("TALPA"),
-    #else //ENGLISH
-        .categoryName = _("MOLE"),
-    #endif
+        .categoryName = LANGUAGE_STRING("MOLE", "TAUPE", "TALPA", "TOPO"),
         .height = 7,
         .weight = 333,
         .description = gDugtrioPokedexText,
@@ -938,13 +626,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_MEOWTH] =
     {
-    #if FRENCH
-        .categoryName = _("CHADEGOUT"),
-    #elif ITALIAN
-        .categoryName = _("GRAFFIMIAO"),
-    #else //ENGLISH
-        .categoryName = _("SCRATCH CAT"),
-    #endif
+        .categoryName = LANGUAGE_STRING("SCRATCH CAT", "CHADEGOUT", "GRAFFIMIAO", "GATO ARAÑA"),
         .height = 4,
         .weight = 42,
         .description = gMeowthPokedexText,
@@ -956,13 +638,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_PERSIAN] =
     {
-    #if FRENCH
-        .categoryName = _("CHADEVILLE"),
-    #elif ITALIAN
-        .categoryName = _("NOBILGATTO"),
-    #else //ENGLISH
-        .categoryName = _("CLASSY CAT"),
-    #endif
+        .categoryName = LANGUAGE_STRING("CLASSY CAT", "CHADEVILLE", "NOBILGATTO", "GATO FINO"),
         .height = 10,
         .weight = 320,
         .description = gPersianPokedexText,
@@ -974,13 +650,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_PSYDUCK] =
     {
-    #if FRENCH
-        .categoryName = _("CANARD"),
-    #elif ITALIAN
-        .categoryName = _("PAPERO"),
-    #else //ENGLISH
-        .categoryName = _("DUCK"),
-    #endif
+        .categoryName = LANGUAGE_STRING("DUCK", "CANARD", "PAPERO", "PATO"),
         .height = 8,
         .weight = 196,
         .description = gPsyduckPokedexText,
@@ -992,13 +662,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_GOLDUCK] =
     {
-    #if FRENCH
-        .categoryName = _("CANARD"),
-    #elif ITALIAN
-        .categoryName = _("PAPERO"),
-    #else //ENGLISH
-        .categoryName = _("DUCK"),
-    #endif
+        .categoryName = LANGUAGE_STRING("DUCK", "CANARD", "PAPERO", "PATO"),
         .height = 17,
         .weight = 766,
         .description = gGolduckPokedexText,
@@ -1010,13 +674,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_MANKEY] =
     {
-    #if FRENCH
-        .categoryName = _("PORSINGE"),
-    #elif ITALIAN
-        .categoryName = _("SUINPANZÉ"),
-    #else //ENGLISH
-        .categoryName = _("PIG MONKEY"),
-    #endif
+        .categoryName = LANGUAGE_STRING("PIG MONKEY", "PORSINGE", "SUINPANZÉ", "MONO CERDO"),
         .height = 5,
         .weight = 280,
         .description = gMankeyPokedexText,
@@ -1028,13 +686,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_PRIMEAPE] =
     {
-    #if FRENCH
-        .categoryName = _("PORSINGE"),
-    #elif ITALIAN
-        .categoryName = _("SUINPANZÉ"),
-    #else //ENGLISH
-        .categoryName = _("PIG MONKEY"),
-    #endif
+        .categoryName = LANGUAGE_STRING("PIG MONKEY", "PORSINGE", "SUINPANZÉ", "MONO CERDO"),
         .height = 10,
         .weight = 320,
         .description = gPrimeapePokedexText,
@@ -1046,13 +698,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_GROWLITHE] =
     {
-    #if FRENCH
-        .categoryName = _("CHIOT"),
-    #elif ITALIAN
-        .categoryName = _("CAGNOLINO"),
-    #else //ENGLISH
-        .categoryName = _("PUPPY"),
-    #endif
+        .categoryName = LANGUAGE_STRING("PUPPY", "CHIOT", "CAGNOLINO", "PERRITO"),
         .height = 7,
         .weight = 190,
         .description = gGrowlithePokedexText,
@@ -1064,13 +710,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_ARCANINE] =
     {
-    #if FRENCH
-        .categoryName = _("LEGENDAIRE"),
-    #elif ITALIAN
-        .categoryName = _("LEGGENDA"),
-    #else //ENGLISH
-        .categoryName = _("LEGENDARY"),
-    #endif
+        .categoryName = LANGUAGE_STRING("LEGENDARY", "LEGENDAIRE", "LEGGENDA", "LEGENDARIO"),
         .height = 19,
         .weight = 1550,
         .description = gArcaninePokedexText,
@@ -1082,13 +722,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_POLIWAG] =
     {
-    #if FRENCH
-        .categoryName = _("TETARD"),
-    #elif ITALIAN
-        .categoryName = _("GIRINO"),
-    #else //ENGLISH
-        .categoryName = _("TADPOLE"),
-    #endif
+        .categoryName = LANGUAGE_STRING("TADPOLE", "TETARD", "GIRINO", "RENACUAJO"),
         .height = 6,
         .weight = 124,
         .description = gPoliwagPokedexText,
@@ -1100,13 +734,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_POLIWHIRL] =
     {
-    #if FRENCH
-        .categoryName = _("TETARD"),
-    #elif ITALIAN
-        .categoryName = _("GIRINO"),
-    #else //ENGLISH
-        .categoryName = _("TADPOLE"),
-    #endif
+        .categoryName = LANGUAGE_STRING("TADPOLE", "TETARD", "GIRINO", "RENACUAJO"),
         .height = 10,
         .weight = 200,
         .description = gPoliwhirlPokedexText,
@@ -1118,13 +746,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_POLIWRATH] =
     {
-    #if FRENCH
-        .categoryName = _("TETARD"),
-    #elif ITALIAN
-        .categoryName = _("GIRINO"),
-    #else //ENGLISH
-        .categoryName = _("TADPOLE"),
-    #endif
+        .categoryName = LANGUAGE_STRING("TADPOLE", "TETARD", "GIRINO", "RENACUAJO"),
         .height = 13,
         .weight = 540,
         .description = gPoliwrathPokedexText,
@@ -1136,13 +758,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_ABRA] =
     {
-    #if FRENCH
-        .categoryName = _("PSY"),
-    #elif ITALIAN
-        .categoryName = _("PSICO"),
-    #else //ENGLISH
-        .categoryName = _("PSI"),
-    #endif
+        .categoryName = LANGUAGE_STRING("PSI", "PSY", "PSICO", "PSI"),
         .height = 9,
         .weight = 195,
         .description = gAbraPokedexText,
@@ -1154,13 +770,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_KADABRA] =
     {
-    #if FRENCH
-        .categoryName = _("PSY"),
-    #elif ITALIAN
-        .categoryName = _("PSICO"),
-    #else //ENGLISH
-        .categoryName = _("PSI"),
-    #endif
+        .categoryName = LANGUAGE_STRING("PSI", "PSY", "PSICO", "PSI"),
         .height = 13,
         .weight = 565,
         .description = gKadabraPokedexText,
@@ -1172,13 +782,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_ALAKAZAM] =
     {
-    #if FRENCH
-        .categoryName = _("PSY"),
-    #elif ITALIAN
-        .categoryName = _("PSICO"),
-    #else //ENGLISH
-        .categoryName = _("PSI"),
-    #endif
+        .categoryName = LANGUAGE_STRING("PSI", "PSY", "PSICO", "PSI"),
         .height = 15,
         .weight = 480,
         .description = gAlakazamPokedexText,
@@ -1190,13 +794,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_MACHOP] =
     {
-    #if FRENCH
-        .categoryName = _("COLOSSE"),
-    #elif ITALIAN
-        .categoryName = _("MEGAFORZA"),
-    #else //ENGLISH
-        .categoryName = _("SUPERPOWER"),
-    #endif
+        .categoryName = LANGUAGE_STRING("SUPERPOWER", "COLOSSE", "MEGAFORZA", "SUPERPODER"),
         .height = 8,
         .weight = 195,
         .description = gMachopPokedexText,
@@ -1208,13 +806,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_MACHOKE] =
     {
-    #if FRENCH
-        .categoryName = _("COLOSSE"),
-    #elif ITALIAN
-        .categoryName = _("MEGAFORZA"),
-    #else //ENGLISH
-        .categoryName = _("SUPERPOWER"),
-    #endif
+        .categoryName = LANGUAGE_STRING("SUPERPOWER", "COLOSSE", "MEGAFORZA", "SUPERPODER"),
         .height = 15,
         .weight = 705,
         .description = gMachokePokedexText,
@@ -1226,13 +818,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_MACHAMP] =
     {
-    #if FRENCH
-        .categoryName = _("COLOSSE"),
-    #elif ITALIAN
-        .categoryName = _("MEGAFORZA"),
-    #else //ENGLISH
-        .categoryName = _("SUPERPOWER"),
-    #endif
+        .categoryName = LANGUAGE_STRING("SUPERPOWER", "COLOSSE", "MEGAFORZA", "SUPERPODER"),
         .height = 16,
         .weight = 1300,
         .description = gMachampPokedexText,
@@ -1244,13 +830,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_BELLSPROUT] =
     {
-    #if FRENCH
-        .categoryName = _("FLEUR"),
-    #elif ITALIAN
-        .categoryName = _("FIORE"),
-    #else //ENGLISH
-        .categoryName = _("FLOWER"),
-    #endif
+        .categoryName = LANGUAGE_STRING("FLOWER", "FLEUR", "FIORE", "FLOR"),
         .height = 7,
         .weight = 40,
         .description = gBellsproutPokedexText,
@@ -1262,13 +842,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_WEEPINBELL] =
     {
-    #if FRENCH
-        .categoryName = _("CARNIVORE"),
-    #elif ITALIAN
-        .categoryName = _("MOSCHIVORO"),
-    #else //ENGLISH
-        .categoryName = _("FLYCATCHER"),
-    #endif
+        .categoryName = LANGUAGE_STRING("FLYCATCHER", "CARNIVORE", "MOSCHIVORO", "MATAMOSCAS"),
         .height = 10,
         .weight = 64,
         .description = gWeepinbellPokedexText,
@@ -1280,13 +854,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_VICTREEBEL] =
     {
-    #if FRENCH
-        .categoryName = _("CARNIVORE"),
-    #elif ITALIAN
-        .categoryName = _("MOSCHIVORO"),
-    #else //ENGLISH
-        .categoryName = _("FLYCATCHER"),
-    #endif
+        .categoryName = LANGUAGE_STRING("FLYCATCHER", "CARNIVORE", "MOSCHIVORO", "MATAMOSCAS"),
         .height = 17,
         .weight = 155,
         .description = gVictreebelPokedexText,
@@ -1298,13 +866,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_TENTACOOL] =
     {
-    #if FRENCH
-        .categoryName = _("MOLLUSQUE"),
-    #elif ITALIAN
-        .categoryName = _("MEDUSA"),
-    #else //ENGLISH
-        .categoryName = _("JELLYFISH"),
-    #endif
+        .categoryName = LANGUAGE_STRING("JELLYFISH", "MOLLUSQUE", "MEDUSA", "MEDUSA"),
         .height = 9,
         .weight = 455,
         .description = gTentacoolPokedexText,
@@ -1316,13 +878,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_TENTACRUEL] =
     {
-    #if FRENCH
-        .categoryName = _("MOLLUSQUE"),
-    #elif ITALIAN
-        .categoryName = _("MEDUSA"),
-    #else //ENGLISH
-        .categoryName = _("JELLYFISH"),
-    #endif
+        .categoryName = LANGUAGE_STRING("JELLYFISH", "MOLLUSQUE", "MEDUSA", "MEDUSA"),
         .height = 16,
         .weight = 550,
         .description = gTentacruelPokedexText,
@@ -1334,13 +890,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_GEODUDE] =
     {
-    #if FRENCH
-        .categoryName = _("ROCHE"),
-    #elif ITALIAN
-        .categoryName = _("ROCCIA"),
-    #else //ENGLISH
-        .categoryName = _("ROCK"),
-    #endif
+        .categoryName = LANGUAGE_STRING("ROCK", "ROCHE", "ROCCIA", "ROCA"),
         .height = 4,
         .weight = 200,
         .description = gGeodudePokedexText,
@@ -1352,13 +902,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_GRAVELER] =
     {
-    #if FRENCH
-        .categoryName = _("ROCHE"),
-    #elif ITALIAN
-        .categoryName = _("ROCCIA"),
-    #else //ENGLISH
-        .categoryName = _("ROCK"),
-    #endif
+        .categoryName = LANGUAGE_STRING("ROCK", "ROCHE", "ROCCIA", "ROCA"),
         .height = 10,
         .weight = 1050,
         .description = gGravelerPokedexText,
@@ -1370,13 +914,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_GOLEM] =
     {
-    #if FRENCH
-        .categoryName = _("TITANESQUE"),
-    #elif ITALIAN
-        .categoryName = _("MEGATONE"),
-    #else //ENGLISH
-        .categoryName = _("MEGATON"),
-    #endif
+        .categoryName = LANGUAGE_STRING("MEGATON", "TITANESQUE", "MEGATONE", "MEGATÓN"),
         .height = 14,
         .weight = 3000,
         .description = gGolemPokedexText,
@@ -1388,13 +926,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_PONYTA] =
     {
-    #if FRENCH
-        .categoryName = _("CHEVAL FEU"),
-    #elif ITALIAN
-        .categoryName = _("CAVALFUOCO"),
-    #else //ENGLISH
-        .categoryName = _("FIRE HORSE"),
-    #endif
+        .categoryName = LANGUAGE_STRING("FIRE HORSE", "CHEVAL FEU", "CAVALFUOCO", "CABALLO F."),
         .height = 10,
         .weight = 300,
         .description = gPonytaPokedexText,
@@ -1406,13 +938,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_RAPIDASH] =
     {
-    #if FRENCH
-        .categoryName = _("CHEVAL FEU"),
-    #elif ITALIAN
-        .categoryName = _("CAVALFUOCO"),
-    #else //ENGLISH
-        .categoryName = _("FIRE HORSE"),
-    #endif
+        .categoryName = LANGUAGE_STRING("FIRE HORSE", "CHEVAL FEU", "CAVALFUOCO", "CABALLO F."),
         .height = 17,
         .weight = 950,
         .description = gRapidashPokedexText,
@@ -1424,13 +950,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_SLOWPOKE] =
     {
-    #if FRENCH
-        .categoryName = _("CRETIN"),
-    #elif ITALIAN
-        .categoryName = _("RONFONE"),
-    #else //ENGLISH
-        .categoryName = _("DOPEY"),
-    #endif
+        .categoryName = LANGUAGE_STRING("DOPEY", "CRETIN", "RONFONE", "ATONTADO"),
         .height = 12,
         .weight = 360,
         .description = gSlowpokePokedexText,
@@ -1442,13 +962,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_SLOWBRO] =
     {
-    #if FRENCH
-        .categoryName = _("SYMBIOSE"),
-    #elif ITALIAN
-        .categoryName = _("PAGURO"),
-    #else //ENGLISH
-        .categoryName = _("HERMIT CRAB"),
-    #endif
+        .categoryName = LANGUAGE_STRING("HERMIT CRAB", "SYMBIOSE", "PAGURO", "ERMITAÑO"),
         .height = 16,
         .weight = 785,
         .description = gSlowbroPokedexText,
@@ -1460,13 +974,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_MAGNEMITE] =
     {
-    #if FRENCH
-        .categoryName = _("MAGNETIQUE"),
-    #elif ITALIAN
-        .categoryName = _("CALAMITA"),
-    #else //ENGLISH
-        .categoryName = _("MAGNET"),
-    #endif
+        .categoryName = LANGUAGE_STRING("MAGNET", "MAGNETIQUE", "CALAMITA", "IMÁN"),
         .height = 3,
         .weight = 60,
         .description = gMagnemitePokedexText,
@@ -1478,13 +986,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_MAGNETON] =
     {
-    #if FRENCH
-        .categoryName = _("MAGNETIQUE"),
-    #elif ITALIAN
-        .categoryName = _("CALAMITA"),
-    #else //ENGLISH
-        .categoryName = _("MAGNET"),
-    #endif
+        .categoryName = LANGUAGE_STRING("MAGNET", "MAGNETIQUE", "CALAMITA", "IMÁN"),
         .height = 10,
         .weight = 600,
         .description = gMagnetonPokedexText,
@@ -1496,13 +998,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_FARFETCHD] =
     {
-    #if FRENCH
-        .categoryName = _("CANARD FOU"),
-    #elif ITALIAN
-        .categoryName = _("SELVANATRA"),
-    #else //ENGLISH
-        .categoryName = _("WILD DUCK"),
-    #endif
+        .categoryName = LANGUAGE_STRING("WILD DUCK", "CANARD FOU", "SELVANATRA", "PATO SALV."),
         .height = 8,
         .weight = 150,
         .description = gFarfetchdPokedexText,
@@ -1514,13 +1010,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_DODUO] =
     {
-    #if FRENCH
-        .categoryName = _("DUOISEAU"),
-    #elif ITALIAN
-        .categoryName = _("BIUCCELLO"),
-    #else //ENGLISH
-        .categoryName = _("TWIN BIRD"),
-    #endif
+        .categoryName = LANGUAGE_STRING("TWIN BIRD", "DUOISEAU", "BIUCCELLO", "AVE GEMELA"),
         .height = 14,
         .weight = 392,
         .description = gDoduoPokedexText,
@@ -1532,13 +1022,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_DODRIO] =
     {
-    #if FRENCH
-        .categoryName = _("TRIOISEAU"),
-    #elif ITALIAN
-        .categoryName = _("TRIUCCELLO"),
-    #else //ENGLISH
-        .categoryName = _("TRIPLE BIRD"),
-    #endif
+        .categoryName = LANGUAGE_STRING("TRIPLE BIRD", "TRIOISEAU", "TRIUCCELLO", "AVE TRIPLE"),
         .height = 18,
         .weight = 852,
         .description = gDodrioPokedexText,
@@ -1550,13 +1034,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_SEEL] =
     {
-    #if FRENCH
-        .categoryName = _("OTARIE"),
-    #elif ITALIAN
-        .categoryName = _("OTARIA"),
-    #else //ENGLISH
-        .categoryName = _("SEA LION"),
-    #endif
+        .categoryName = LANGUAGE_STRING("SEA LION", "OTARIE", "OTARIA", "LEÓN MAR."),
         .height = 11,
         .weight = 900,
         .description = gSeelPokedexText,
@@ -1568,13 +1046,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_DEWGONG] =
     {
-    #if FRENCH
-        .categoryName = _("OTARIE"),
-    #elif ITALIAN
-        .categoryName = _("OTARIA"),
-    #else //ENGLISH
-        .categoryName = _("SEA LION"),
-    #endif
+        .categoryName = LANGUAGE_STRING("SEA LION", "OTARIE", "OTARIA", "LEÓN MAR."),
         .height = 17,
         .weight = 1200,
         .description = gDewgongPokedexText,
@@ -1586,13 +1058,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_GRIMER] =
     {
-    #if FRENCH
-        .categoryName = _("DEGUEU"),
-    #elif ITALIAN
-        .categoryName = _("MELMA"),
-    #else //ENGLISH
-        .categoryName = _("SLUDGE"),
-    #endif
+        .categoryName = LANGUAGE_STRING("SLUDGE", "DEGUEU", "MELMA", "LODO"),
         .height = 9,
         .weight = 300,
         .description = gGrimerPokedexText,
@@ -1604,13 +1070,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_MUK] =
     {
-    #if FRENCH
-        .categoryName = _("DEGUEU"),
-    #elif ITALIAN
-        .categoryName = _("MELMA"),
-    #else //ENGLISH
-        .categoryName = _("SLUDGE"),
-    #endif
+        .categoryName = LANGUAGE_STRING("SLUDGE", "DEGUEU", "MELMA", "LODO"),
         .height = 12,
         .weight = 300,
         .description = gMukPokedexText,
@@ -1622,13 +1082,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_SHELLDER] =
     {
-    #if FRENCH
-        .categoryName = _("BIVALVE"),
-    #elif ITALIAN
-        .categoryName = _("BIVALVE"),
-    #else //ENGLISH
-        .categoryName = _("BIVALVE"),
-    #endif
+        .categoryName = LANGUAGE_STRING("BIVALVE", "BIVALVE", "BIVALVE", "BIVALVO"),
         .height = 3,
         .weight = 40,
         .description = gShellderPokedexText,
@@ -1640,13 +1094,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_CLOYSTER] =
     {
-    #if FRENCH
-        .categoryName = _("BIVALVE"),
-    #elif ITALIAN
-        .categoryName = _("BIVALVE"),
-    #else //ENGLISH
-        .categoryName = _("BIVALVE"),
-    #endif
+        .categoryName = LANGUAGE_STRING("BIVALVE", "BIVALVE", "BIVALVE", "BIVALVO"),
         .height = 15,
         .weight = 1325,
         .description = gCloysterPokedexText,
@@ -1658,13 +1106,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_GASTLY] =
     {
-    #if FRENCH
-        .categoryName = _("GAZ"),
-    #elif ITALIAN
-        .categoryName = _("GAS"),
-    #else //ENGLISH
-        .categoryName = _("GAS"),
-    #endif
+        .categoryName = LANGUAGE_STRING("GAS", "GAZ", "GAS", "GAS"),
         .height = 13,
         .weight = 1,
         .description = gGastlyPokedexText,
@@ -1676,13 +1118,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_HAUNTER] =
     {
-    #if FRENCH
-        .categoryName = _("GAZ"),
-    #elif ITALIAN
-        .categoryName = _("GAS"),
-    #else //ENGLISH
-        .categoryName = _("GAS"),
-    #endif
+        .categoryName = LANGUAGE_STRING("GAS", "GAZ", "GAS", "GAS"),
         .height = 16,
         .weight = 1,
         .description = gHaunterPokedexText,
@@ -1694,13 +1130,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_GENGAR] =
     {
-    #if FRENCH
-        .categoryName = _("OMBRE"),
-    #elif ITALIAN
-        .categoryName = _("OMBRA"),
-    #else //ENGLISH
-        .categoryName = _("SHADOW"),
-    #endif
+        .categoryName = LANGUAGE_STRING("SHADOW", "OMBRE", "OMBRA", "SOMBRA"),
         .height = 15,
         .weight = 405,
         .description = gGengarPokedexText,
@@ -1712,13 +1142,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_ONIX] =
     {
-    #if FRENCH
-        .categoryName = _("SERPENROC"),
-    #elif ITALIAN
-        .categoryName = _("SERPESASSO"),
-    #else //ENGLISH
-        .categoryName = _("ROCK SNAKE"),
-    #endif
+        .categoryName = LANGUAGE_STRING("ROCK SNAKE", "SERPENROC", "SERPESASSO", "SERP. ROCA"),
         .height = 88,
         .weight = 2100,
         .description = gOnixPokedexText,
@@ -1730,13 +1154,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_DROWZEE] =
     {
-    #if FRENCH
-        .categoryName = _("HYPNOSE"),
-    #elif ITALIAN
-        .categoryName = _("IPNOSI"),
-    #else //ENGLISH
-        .categoryName = _("HYPNOSIS"),
-    #endif
+        .categoryName = LANGUAGE_STRING("HYPNOSIS", "HYPNOSE", "IPNOSI", "HIPNOSIS"),
         .height = 10,
         .weight = 324,
         .description = gDrowzeePokedexText,
@@ -1748,13 +1166,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_HYPNO] =
     {
-    #if FRENCH
-        .categoryName = _("HYPNOSE"),
-    #elif ITALIAN
-        .categoryName = _("IPNOSI"),
-    #else //ENGLISH
-        .categoryName = _("HYPNOSIS"),
-    #endif
+        .categoryName = LANGUAGE_STRING("HYPNOSIS", "HYPNOSE", "IPNOSI", "HIPNOSIS"),
         .height = 16,
         .weight = 756,
         .description = gHypnoPokedexText,
@@ -1766,13 +1178,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_KRABBY] =
     {
-    #if FRENCH
-        .categoryName = _("DOUX CRABE"),
-    #elif ITALIAN
-        .categoryName = _("GRANCHIO"),
-    #else //ENGLISH
-        .categoryName = _("RIVER CRAB"),
-    #endif
+        .categoryName = LANGUAGE_STRING("RIVER CRAB", "DOUX CRABE", "GRANCHIO", "CANGREJO"),
         .height = 4,
         .weight = 65,
         .description = gKrabbyPokedexText,
@@ -1784,13 +1190,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_KINGLER] =
     {
-    #if FRENCH
-        .categoryName = _("PINCE"),
-    #elif ITALIAN
-        .categoryName = _("CHELA"),
-    #else //ENGLISH
-        .categoryName = _("PINCER"),
-    #endif
+        .categoryName = LANGUAGE_STRING("PINCER", "PINCE", "CHELA", "TENAZA"),
         .height = 13,
         .weight = 600,
         .description = gKinglerPokedexText,
@@ -1802,13 +1202,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_VOLTORB] =
     {
-    #if FRENCH
-        .categoryName = _("BALLE"),
-    #elif ITALIAN
-        .categoryName = _("BALL"),
-    #else //ENGLISH
-        .categoryName = _("BALL"),
-    #endif
+        .categoryName = LANGUAGE_STRING("BALL", "BALLE", "BALL", "BOLA"),
         .height = 5,
         .weight = 104,
         .description = gVoltorbPokedexText,
@@ -1820,13 +1214,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_ELECTRODE] =
     {
-    #if FRENCH
-        .categoryName = _("BALLE"),
-    #elif ITALIAN
-        .categoryName = _("BALL"),
-    #else //ENGLISH
-        .categoryName = _("BALL"),
-    #endif
+        .categoryName = LANGUAGE_STRING("BALL", "BALLE", "BALL", "BOLA"),
         .height = 12,
         .weight = 666,
         .description = gElectrodePokedexText,
@@ -1838,13 +1226,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_EXEGGCUTE] =
     {
-    #if FRENCH
-        .categoryName = _("OEUF"),
-    #elif ITALIAN
-        .categoryName = _("UOVO"),
-    #else //ENGLISH
-        .categoryName = _("EGG"),
-    #endif
+        .categoryName = LANGUAGE_STRING("EGG", "OEUF", "UOVO", "HUEVO"),
         .height = 4,
         .weight = 25,
         .description = gExeggcutePokedexText,
@@ -1856,13 +1238,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_EXEGGUTOR] =
     {
-    #if FRENCH
-        .categoryName = _("FRUITPALME"),
-    #elif ITALIAN
-        .categoryName = _("NOCECOCCO"),
-    #else //ENGLISH
-        .categoryName = _("COCONUT"),
-    #endif
+        .categoryName = LANGUAGE_STRING("COCONUT", "FRUITPALME", "NOCECOCCO", "COCO"),
         .height = 20,
         .weight = 1200,
         .description = gExeggutorPokedexText,
@@ -1874,13 +1250,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_CUBONE] =
     {
-    #if FRENCH
-        .categoryName = _("SOLITAIRE"),
-    #elif ITALIAN
-        .categoryName = _("SOLITARIO"),
-    #else //ENGLISH
-        .categoryName = _("LONELY"),
-    #endif
+        .categoryName = LANGUAGE_STRING("LONELY", "SOLITAIRE", "SOLITARIO", "SOLITARIO"),
         .height = 4,
         .weight = 65,
         .description = gCubonePokedexText,
@@ -1892,13 +1262,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_MAROWAK] =
     {
-    #if FRENCH
-        .categoryName = _("GARD'OS"),
-    #elif ITALIAN
-        .categoryName = _("GUARDAOSSI"),
-    #else //ENGLISH
-        .categoryName = _("BONE KEEPER"),
-    #endif
+        .categoryName = LANGUAGE_STRING("BONE KEEPER", "GARD'OS", "GUARDAOSSI", "APILAHUESO"),
         .height = 10,
         .weight = 450,
         .description = gMarowakPokedexText,
@@ -1910,13 +1274,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_HITMONLEE] =
     {
-    #if FRENCH
-        .categoryName = _("LATTEUR"),
-    #elif ITALIAN
-        .categoryName = _("TIRACALCI"),
-    #else //ENGLISH
-        .categoryName = _("KICKING"),
-    #endif
+        .categoryName = LANGUAGE_STRING("KICKING", "LATTEUR", "TIRACALCI", "PATADA"),
         .height = 15,
         .weight = 498,
         .description = gHitmonleePokedexText,
@@ -1928,13 +1286,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_HITMONCHAN] =
     {
-    #if FRENCH
-        .categoryName = _("PUNCHEUR"),
-    #elif ITALIAN
-        .categoryName = _("TIRAPUGNI"),
-    #else //ENGLISH
-        .categoryName = _("PUNCHING"),
-    #endif
+        .categoryName = LANGUAGE_STRING("PUNCHING", "PUNCHEUR", "TIRAPUGNI", "PUÑETAZO"),
         .height = 14,
         .weight = 502,
         .description = gHitmonchanPokedexText,
@@ -1946,13 +1298,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_LICKITUNG] =
     {
-    #if FRENCH
-        .categoryName = _("LECHEUR"),
-    #elif ITALIAN
-        .categoryName = _("LINGUACCIA"),
-    #else //ENGLISH
-        .categoryName = _("LICKING"),
-    #endif
+        .categoryName = LANGUAGE_STRING("LICKING", "LECHEUR", "LINGUACCIA", "LAMETAZO"),
         .height = 12,
         .weight = 655,
         .description = gLickitungPokedexText,
@@ -1964,13 +1310,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_KOFFING] =
     {
-    #if FRENCH
-        .categoryName = _("GAZ MORTEL"),
-    #elif ITALIAN
-        .categoryName = _("VELENUVOLA"),
-    #else //ENGLISH
-        .categoryName = _("POISON GAS"),
-    #endif
+        .categoryName = LANGUAGE_STRING("POISON GAS", "GAZ MORTEL", "VELENUVOLA", "GAS VENENO"),
         .height = 6,
         .weight = 10,
         .description = gKoffingPokedexText,
@@ -1982,13 +1322,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_WEEZING] =
     {
-    #if FRENCH
-        .categoryName = _("GAZ MORTEL"),
-    #elif ITALIAN
-        .categoryName = _("VELENUVOLA"),
-    #else //ENGLISH
-        .categoryName = _("POISON GAS"),
-    #endif
+        .categoryName = LANGUAGE_STRING("POISON GAS", "GAZ MORTEL", "VELENUVOLA", "GAS VENENO"),
         .height = 12,
         .weight = 95,
         .description = gWeezingPokedexText,
@@ -2000,13 +1334,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_RHYHORN] =
     {
-    #if FRENCH
-        .categoryName = _("PIQUANT"),
-    #elif ITALIAN
-        .categoryName = _("PUNZONI"),
-    #else //ENGLISH
-        .categoryName = _("SPIKES"),
-    #endif
+        .categoryName = LANGUAGE_STRING("SPIKES", "PIQUANT", "PUNZONI", "CLAVOS"),
         .height = 10,
         .weight = 1150,
         .description = gRhyhornPokedexText,
@@ -2018,13 +1346,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_RHYDON] =
     {
-    #if FRENCH
-        .categoryName = _("PERCEUR"),
-    #elif ITALIAN
-        .categoryName = _("TRAPANO"),
-    #else //ENGLISH
-        .categoryName = _("DRILL"),
-    #endif
+        .categoryName = LANGUAGE_STRING("DRILL", "PERCEUR", "TRAPANO", "TALADRO"),
         .height = 19,
         .weight = 1200,
         .description = gRhydonPokedexText,
@@ -2036,13 +1358,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_CHANSEY] =
     {
-    #if FRENCH
-        .categoryName = _("OEUF"),
-    #elif ITALIAN
-        .categoryName = _("UOVO"),
-    #else //ENGLISH
-        .categoryName = _("EGG"),
-    #endif
+        .categoryName = LANGUAGE_STRING("EGG", "OEUF", "UOVO", "HUEVO"),
         .height = 11,
         .weight = 346,
         .description = gChanseyPokedexText,
@@ -2054,13 +1370,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_TANGELA] =
     {
-    #if FRENCH
-        .categoryName = _("VIGNE"),
-    #elif ITALIAN
-        .categoryName = _("LIANA"),
-    #else //ENGLISH
-        .categoryName = _("VINE"),
-    #endif
+        .categoryName = LANGUAGE_STRING("VINE", "VIGNE", "LIANA", "ENREDADERA"),
         .height = 10,
         .weight = 350,
         .description = gTangelaPokedexText,
@@ -2072,13 +1382,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_KANGASKHAN] =
     {
-    #if FRENCH
-        .categoryName = _("MATERNEL"),
-    #elif ITALIAN
-        .categoryName = _("GENITORE"),
-    #else //ENGLISH
-        .categoryName = _("PARENT"),
-    #endif
+        .categoryName = LANGUAGE_STRING("PARENT", "MATERNEL", "GENITORE", "PADRES"),
         .height = 22,
         .weight = 800,
         .description = gKangaskhanPokedexText,
@@ -2090,13 +1394,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_HORSEA] =
     {
-    #if FRENCH
-        .categoryName = _("DRAGON"),
-    #elif ITALIAN
-        .categoryName = _("DRAGO"),
-    #else //ENGLISH
-        .categoryName = _("DRAGON"),
-    #endif
+        .categoryName = LANGUAGE_STRING("DRAGON", "DRAGON", "DRAGO", "DRAGÓN"),
         .height = 4,
         .weight = 80,
         .description = gHorseaPokedexText,
@@ -2108,13 +1406,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_SEADRA] =
     {
-    #if FRENCH
-        .categoryName = _("DRAGON"),
-    #elif ITALIAN
-        .categoryName = _("DRAGO"),
-    #else //ENGLISH
-        .categoryName = _("DRAGON"),
-    #endif
+        .categoryName = LANGUAGE_STRING("DRAGON", "DRAGON", "DRAGO", "DRAGÓN"),
         .height = 12,
         .weight = 250,
         .description = gSeadraPokedexText,
@@ -2126,13 +1418,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_GOLDEEN] =
     {
-    #if FRENCH
-        .categoryName = _("POISSON"),
-    #elif ITALIAN
-        .categoryName = _("PESCEROSSO"),
-    #else //ENGLISH
-        .categoryName = _("GOLDFISH"),
-    #endif
+        .categoryName = LANGUAGE_STRING("GOLDFISH", "POISSON", "PESCEROSSO", "PEZ COLOR"),
         .height = 6,
         .weight = 150,
         .description = gGoldeenPokedexText,
@@ -2144,13 +1430,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_SEAKING] =
     {
-    #if FRENCH
-        .categoryName = _("POISSON"),
-    #elif ITALIAN
-        .categoryName = _("PESCEROSSO"),
-    #else //ENGLISH
-        .categoryName = _("GOLDFISH"),
-    #endif
+        .categoryName = LANGUAGE_STRING("GOLDFISH", "POISSON", "PESCEROSSO", "PEZ COLOR"),
         .height = 13,
         .weight = 390,
         .description = gSeakingPokedexText,
@@ -2162,13 +1442,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_STARYU] =
     {
-    #if FRENCH
-        .categoryName = _("ETOILE"),
-    #elif ITALIAN
-        .categoryName = _("STELLA"),
-    #else //ENGLISH
-        .categoryName = _("STAR SHAPE"),
-    #endif
+        .categoryName = LANGUAGE_STRING("STAR SHAPE", "ETOILE", "STELLA", "ESTRELLADA"),
         .height = 8,
         .weight = 345,
         .description = gStaryuPokedexText,
@@ -2180,13 +1454,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_STARMIE] =
     {
-    #if FRENCH
-        .categoryName = _("MYSTERIEUX"),
-    #elif ITALIAN
-        .categoryName = _("MISTERIOSO"),
-    #else //ENGLISH
-        .categoryName = _("MYSTERIOUS"),
-    #endif
+        .categoryName = LANGUAGE_STRING("MYSTERIOUS", "MYSTERIEUX", "MISTERIOSO", "MISTERIOSO"),
         .height = 11,
         .weight = 800,
         .description = gStarmiePokedexText,
@@ -2198,13 +1466,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_MR_MIME] =
     {
-    #if FRENCH
-        .categoryName = _("BLOQUEUR"),
-    #elif ITALIAN
-        .categoryName = _("BARRIERA"),
-    #else //ENGLISH
-        .categoryName = _("BARRIER"),
-    #endif
+        .categoryName = LANGUAGE_STRING("BARRIER", "BLOQUEUR", "BARRIERA", "BARRERA"),
         .height = 13,
         .weight = 545,
         .description = gMrMimePokedexText,
@@ -2216,13 +1478,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_SCYTHER] =
     {
-    #if FRENCH
-        .categoryName = _("MANTE"),
-    #elif ITALIAN
-        .categoryName = _("MANTIDE"),
-    #else //ENGLISH
-        .categoryName = _("MANTIS"),
-    #endif
+        .categoryName = LANGUAGE_STRING("MANTIS", "MANTE", "MANTIDE", "MANTIS"),
         .height = 15,
         .weight = 560,
         .description = gScytherPokedexText,
@@ -2234,13 +1490,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_JYNX] =
     {
-    #if FRENCH
-        .categoryName = _("HUMANOIDE"),
-    #elif ITALIAN
-        .categoryName = _("UMANOIDE"),
-    #else //ENGLISH
-        .categoryName = _("HUMAN SHAPE"),
-    #endif
+        .categoryName = LANGUAGE_STRING("HUMAN SHAPE", "HUMANOIDE", "UMANOIDE", "F. HUMANA"),
         .height = 14,
         .weight = 406,
         .description = gJynxPokedexText,
@@ -2252,13 +1502,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_ELECTABUZZ] =
     {
-    #if FRENCH
-        .categoryName = _("ELECTRIQUE"),
-    #elif ITALIAN
-        .categoryName = _("ELETTRICO"),
-    #else //ENGLISH
-        .categoryName = _("ELECTRIC"),
-    #endif
+        .categoryName = LANGUAGE_STRING("ELECTRIC", "ELECTRIQUE", "ELETTRICO", "ELÉCTRICO"),
         .height = 11,
         .weight = 300,
         .description = gElectabuzzPokedexText,
@@ -2270,13 +1514,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_MAGMAR] =
     {
-    #if FRENCH
-        .categoryName = _("CRACHE-FEU"),
-    #elif ITALIAN
-        .categoryName = _("SPUTAFUOCO"),
-    #else //ENGLISH
-        .categoryName = _("SPITFIRE"),
-    #endif
+        .categoryName = LANGUAGE_STRING("SPITFIRE", "CRACHE-FEU", "SPUTAFUOCO", "ESCUPFUEGO"),
         .height = 13,
         .weight = 445,
         .description = gMagmarPokedexText,
@@ -2288,13 +1526,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_PINSIR] =
     {
-    #if FRENCH
-        .categoryName = _("SCARABEE"),
-    #elif ITALIAN
-        .categoryName = _("CERVOLANTE"),
-    #else //ENGLISH
-        .categoryName = _("STAG BEETLE"),
-    #endif
+        .categoryName = LANGUAGE_STRING("STAG BEETLE", "SCARABEE", "CERVOLANTE", "ESCARABAJO"),
         .height = 15,
         .weight = 550,
         .description = gPinsirPokedexText,
@@ -2306,13 +1538,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_TAUROS] =
     {
-    #if FRENCH
-        .categoryName = _("BUFFLE"),
-    #elif ITALIAN
-        .categoryName = _("TOROBRADO"),
-    #else //ENGLISH
-        .categoryName = _("WILD BULL"),
-    #endif
+        .categoryName = LANGUAGE_STRING("WILD BULL", "BUFFLE", "TOROBRADO", "TORO BRAVO"),
         .height = 14,
         .weight = 884,
         .description = gTaurosPokedexText,
@@ -2324,13 +1550,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_MAGIKARP] =
     {
-    #if FRENCH
-        .categoryName = _("POISSON"),
-    #elif ITALIAN
-        .categoryName = _("PESCE"),
-    #else //ENGLISH
-        .categoryName = _("FISH"),
-    #endif
+        .categoryName = LANGUAGE_STRING("FISH", "POISSON", "PESCE", "PEZ"),
         .height = 9,
         .weight = 100,
         .description = gMagikarpPokedexText,
@@ -2342,13 +1562,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_GYARADOS] =
     {
-    #if FRENCH
-        .categoryName = _("TERRIFIANT"),
-    #elif ITALIAN
-        .categoryName = _("ATROCE"),
-    #else //ENGLISH
-        .categoryName = _("ATROCIOUS"),
-    #endif
+        .categoryName = LANGUAGE_STRING("ATROCIOUS", "TERRIFIANT", "ATROCE", "ATROCIDAD"),
         .height = 65,
         .weight = 2350,
         .description = gGyaradosPokedexText,
@@ -2360,13 +1574,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_LAPRAS] =
     {
-    #if FRENCH
-        .categoryName = _("TRANSPORT"),
-    #elif ITALIAN
-        .categoryName = _("TRASPORTO"),
-    #else //ENGLISH
-        .categoryName = _("TRANSPORT"),
-    #endif
+        .categoryName = LANGUAGE_STRING("TRANSPORT", "TRANSPORT", "TRASPORTO", "TRANSPORTE"),
         .height = 25,
         .weight = 2200,
         .description = gLaprasPokedexText,
@@ -2378,13 +1586,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_DITTO] =
     {
-    #if FRENCH
-        .categoryName = _("MORPHING"),
-    #elif ITALIAN
-        .categoryName = _("MUTANTE"),
-    #else //ENGLISH
-        .categoryName = _("TRANSFORM"),
-    #endif
+        .categoryName = LANGUAGE_STRING("TRANSFORM", "MORPHING", "MUTANTE", "TRANSFORM."),
         .height = 3,
         .weight = 40,
         .description = gDittoPokedexText,
@@ -2396,13 +1598,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_EEVEE] =
     {
-    #if FRENCH
-        .categoryName = _("EVOLUTIF"),
-    #elif ITALIAN
-        .categoryName = _("EVOLUZIONE"),
-    #else //ENGLISH
-        .categoryName = _("EVOLUTION"),
-    #endif
+        .categoryName = LANGUAGE_STRING("EVOLUTION", "EVOLUTIF", "EVOLUZIONE", "EVOLUCIÓN"),
         .height = 3,
         .weight = 65,
         .description = gEeveePokedexText,
@@ -2414,13 +1610,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_VAPOREON] =
     {
-    #if FRENCH
-        .categoryName = _("BULLEUR"),
-    #elif ITALIAN
-        .categoryName = _("BOLLAJET"),
-    #else //ENGLISH
-        .categoryName = _("BUBBLE JET"),
-    #endif
+        .categoryName = LANGUAGE_STRING("BUBBLE JET", "BULLEUR", "BOLLAJET", "BURBUJA"),
         .height = 10,
         .weight = 290,
         .description = gVaporeonPokedexText,
@@ -2432,13 +1622,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_JOLTEON] =
     {
-    #if FRENCH
-        .categoryName = _("ORAGE"),
-    #elif ITALIAN
-        .categoryName = _("LUMINOSO"),
-    #else //ENGLISH
-        .categoryName = _("LIGHTNING"),
-    #endif
+        .categoryName = LANGUAGE_STRING("LIGHTNING", "ORAGE", "LUMINOSO", "RELÁMPAGO"),
         .height = 8,
         .weight = 245,
         .description = gJolteonPokedexText,
@@ -2450,13 +1634,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_FLAREON] =
     {
-    #if FRENCH
-        .categoryName = _("FLAMME"),
-    #elif ITALIAN
-        .categoryName = _("FIAMMA"),
-    #else //ENGLISH
-        .categoryName = _("FLAME"),
-    #endif
+        .categoryName = LANGUAGE_STRING("FLAME", "FLAMME", "FIAMMA", "LLAMA"),
         .height = 9,
         .weight = 250,
         .description = gFlareonPokedexText,
@@ -2468,13 +1646,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_PORYGON] =
     {
-    #if FRENCH
-        .categoryName = _("VIRTUEL"),
-    #elif ITALIAN
-        .categoryName = _("VIRTUALE"),
-    #else //ENGLISH
-        .categoryName = _("VIRTUAL"),
-    #endif
+        .categoryName = LANGUAGE_STRING("VIRTUAL", "VIRTUEL", "VIRTUALE", "VIRTUAL"),
         .height = 8,
         .weight = 365,
         .description = gPorygonPokedexText,
@@ -2486,13 +1658,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_OMANYTE] =
     {
-    #if FRENCH
-        .categoryName = _("SPIRALE"),
-    #elif ITALIAN
-        .categoryName = _("SPIRALE"),
-    #else //ENGLISH
-        .categoryName = _("SPIRAL"),
-    #endif
+        .categoryName = LANGUAGE_STRING("SPIRAL", "SPIRALE", "SPIRALE", "ESPIRAL"),
         .height = 4,
         .weight = 75,
         .description = gOmanytePokedexText,
@@ -2504,13 +1670,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_OMASTAR] =
     {
-    #if FRENCH
-        .categoryName = _("SPIRALE"),
-    #elif ITALIAN
-        .categoryName = _("SPIRALE"),
-    #else //ENGLISH
-        .categoryName = _("SPIRAL"),
-    #endif
+        .categoryName = LANGUAGE_STRING("SPIRAL", "SPIRALE", "SPIRALE", "ESPIRAL"),
         .height = 10,
         .weight = 350,
         .description = gOmastarPokedexText,
@@ -2522,13 +1682,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_KABUTO] =
     {
-    #if FRENCH
-        .categoryName = _("CARAPACE"),
-    #elif ITALIAN
-        .categoryName = _("CROSTACEO"),
-    #else //ENGLISH
-        .categoryName = _("SHELLFISH"),
-    #endif
+        .categoryName = LANGUAGE_STRING("SHELLFISH", "CARAPACE", "CROSTACEO", "MARISCO"),
         .height = 5,
         .weight = 115,
         .description = gKabutoPokedexText,
@@ -2540,13 +1694,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_KABUTOPS] =
     {
-    #if FRENCH
-        .categoryName = _("CARAPACE"),
-    #elif ITALIAN
-        .categoryName = _("CROSTACEO"),
-    #else //ENGLISH
-        .categoryName = _("SHELLFISH"),
-    #endif
+        .categoryName = LANGUAGE_STRING("SHELLFISH", "CARAPACE", "CROSTACEO", "MARISCO"),
         .height = 13,
         .weight = 405,
         .description = gKabutopsPokedexText,
@@ -2558,13 +1706,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_AERODACTYL] =
     {
-    #if FRENCH
-        .categoryName = _("FOSSILE"),
-    #elif ITALIAN
-        .categoryName = _("FOSSILE"),
-    #else //ENGLISH
-        .categoryName = _("FOSSIL"),
-    #endif
+        .categoryName = LANGUAGE_STRING("FOSSIL", "FOSSILE", "FOSSILE", "FÓSIL"),
         .height = 18,
         .weight = 590,
         .description = gAerodactylPokedexText,
@@ -2576,13 +1718,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_SNORLAX] =
     {
-    #if FRENCH
-        .categoryName = _("PIONCEUR"),
-    #elif ITALIAN
-        .categoryName = _("SONNO"),
-    #else //ENGLISH
-        .categoryName = _("SLEEPING"),
-    #endif
+        .categoryName = LANGUAGE_STRING("SLEEPING", "PIONCEUR", "SONNO", "DORMIR"),
         .height = 21,
         .weight = 4600,
         .description = gSnorlaxPokedexText,
@@ -2594,13 +1730,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_ARTICUNO] =
     {
-    #if FRENCH
-        .categoryName = _("GLACIAIRE"),
-    #elif ITALIAN
-        .categoryName = _("GELO"),
-    #else //ENGLISH
-        .categoryName = _("FREEZE"),
-    #endif
+        .categoryName = LANGUAGE_STRING("FREEZE", "GLACIAIRE", "GELO", "CONGELAR"),
         .height = 17,
         .weight = 554,
         .description = gArticunoPokedexText,
@@ -2612,13 +1742,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_ZAPDOS] =
     {
-    #if FRENCH
-        .categoryName = _("ELECTRIQUE"),
-    #elif ITALIAN
-        .categoryName = _("ELETTRICO"),
-    #else //ENGLISH
-        .categoryName = _("ELECTRIC"),
-    #endif
+        .categoryName = LANGUAGE_STRING("ELECTRIC", "ELECTRIQUE", "ELETTRICO", "ELÉCTRICO"),
         .height = 16,
         .weight = 526,
         .description = gZapdosPokedexText,
@@ -2630,13 +1754,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_MOLTRES] =
     {
-    #if FRENCH
-        .categoryName = _("FLAMME"),
-    #elif ITALIAN
-        .categoryName = _("FIAMMA"),
-    #else //ENGLISH
-        .categoryName = _("FLAME"),
-    #endif
+        .categoryName = LANGUAGE_STRING("FLAME", "FLAMME", "FIAMMA", "LLAMA"),
         .height = 20,
         .weight = 600,
         .description = gMoltresPokedexText,
@@ -2648,13 +1766,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_DRATINI] =
     {
-    #if FRENCH
-        .categoryName = _("DRAGON"),
-    #elif ITALIAN
-        .categoryName = _("DRAGO"),
-    #else //ENGLISH
-        .categoryName = _("DRAGON"),
-    #endif
+        .categoryName = LANGUAGE_STRING("DRAGON", "DRAGON", "DRAGO", "DRAGÓN"),
         .height = 18,
         .weight = 33,
         .description = gDratiniPokedexText,
@@ -2666,13 +1778,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_DRAGONAIR] =
     {
-    #if FRENCH
-        .categoryName = _("DRAGON"),
-    #elif ITALIAN
-        .categoryName = _("DRAGO"),
-    #else //ENGLISH
-        .categoryName = _("DRAGON"),
-    #endif
+        .categoryName = LANGUAGE_STRING("DRAGON", "DRAGON", "DRAGO", "DRAGÓN"),
         .height = 40,
         .weight = 165,
         .description = gDragonairPokedexText,
@@ -2684,13 +1790,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_DRAGONITE] =
     {
-    #if FRENCH
-        .categoryName = _("DRAGON"),
-    #elif ITALIAN
-        .categoryName = _("DRAGO"),
-    #else //ENGLISH
-        .categoryName = _("DRAGON"),
-    #endif
+        .categoryName = LANGUAGE_STRING("DRAGON", "DRAGON", "DRAGO", "DRAGÓN"),
         .height = 22,
         .weight = 2100,
         .description = gDragonitePokedexText,
@@ -2702,13 +1802,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_MEWTWO] =
     {
-    #if FRENCH
-        .categoryName = _("GENETIQUE"),
-    #elif ITALIAN
-        .categoryName = _("GENETICO"),
-    #else //ENGLISH
-        .categoryName = _("GENETIC"),
-    #endif
+        .categoryName = LANGUAGE_STRING("GENETIC", "GENETIQUE", "GENETICO", "GENÉTICO"),
         .height = 20,
         .weight = 1220,
         .description = gMewtwoPokedexText,
@@ -2720,13 +1814,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_MEW] =
     {
-    #if FRENCH
-        .categoryName = _("NOUVEAU"),
-    #elif ITALIAN
-        .categoryName = _("NOVASPECIE"),
-    #else //ENGLISH
-        .categoryName = _("NEW SPECIES"),
-    #endif
+        .categoryName = LANGUAGE_STRING("NEW SPECIES", "NOUVEAU", "NOVASPECIE", "N. ESPECIE"),
         .height = 4,
         .weight = 40,
         .description = gMewPokedexText,
@@ -2738,13 +1826,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_CHIKORITA] =
     {
-    #if FRENCH
-        .categoryName = _("FEUILLE"),
-    #elif ITALIAN
-        .categoryName = _("FOGLIA"),
-    #else //ENGLISH
-        .categoryName = _("LEAF"),
-    #endif
+        .categoryName = LANGUAGE_STRING("LEAF", "FEUILLE", "FOGLIA", "HOJA"),
         .height = 9,
         .weight = 64,
         .description = gChikoritaPokedexText,
@@ -2756,13 +1838,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_BAYLEEF] =
     {
-    #if FRENCH
-        .categoryName = _("FEUILLE"),
-    #elif ITALIAN
-        .categoryName = _("FOGLIA"),
-    #else //ENGLISH
-        .categoryName = _("LEAF"),
-    #endif
+        .categoryName = LANGUAGE_STRING("LEAF", "FEUILLE", "FOGLIA", "HOJA"),
         .height = 12,
         .weight = 158,
         .description = gBayleefPokedexText,
@@ -2774,13 +1850,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_MEGANIUM] =
     {
-    #if FRENCH
-        .categoryName = _("HERBE"),
-    #elif ITALIAN
-        .categoryName = _("ERBE"),
-    #else //ENGLISH
-        .categoryName = _("HERB"),
-    #endif
+        .categoryName = LANGUAGE_STRING("HERB", "HERBE", "ERBE", "HIERBA"),
         .height = 18,
         .weight = 1005,
         .description = gMeganiumPokedexText,
@@ -2792,13 +1862,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_CYNDAQUIL] =
     {
-    #if FRENCH
-        .categoryName = _("SOURIS FEU"),
-    #elif ITALIAN
-        .categoryName = _("FUOCOTOPO"),
-    #else //ENGLISH
-        .categoryName = _("FIRE MOUSE"),
-    #endif
+        .categoryName = LANGUAGE_STRING("FIRE MOUSE", "SOURIS FEU", "FUOCOTOPO", "RATÓNFUEGO"),
         .height = 5,
         .weight = 79,
         .description = gCyndaquilPokedexText,
@@ -2810,13 +1874,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_QUILAVA] =
     {
-    #if FRENCH
-        .categoryName = _("VOLCAN"),
-    #elif ITALIAN
-        .categoryName = _("VULCANO"),
-    #else //ENGLISH
-        .categoryName = _("VOLCANO"),
-    #endif
+        .categoryName = LANGUAGE_STRING("VOLCANO", "VOLCAN", "VULCANO", "VOLCÁN"),
         .height = 9,
         .weight = 190,
         .description = gQuilavaPokedexText,
@@ -2828,13 +1886,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_TYPHLOSION] =
     {
-    #if FRENCH
-        .categoryName = _("VOLCAN"),
-    #elif ITALIAN
-        .categoryName = _("VULCANO"),
-    #else //ENGLISH
-        .categoryName = _("VOLCANO"),
-    #endif
+        .categoryName = LANGUAGE_STRING("VOLCANO", "VOLCAN", "VULCANO", "VOLCÁN"),
         .height = 17,
         .weight = 795,
         .description = gTyphlosionPokedexText,
@@ -2846,13 +1898,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_TOTODILE] =
     {
-    #if FRENCH
-        .categoryName = _("MACHOIRE"),
-    #elif ITALIAN
-        .categoryName = _("MASCELLONE"),
-    #else //ENGLISH
-        .categoryName = _("BIG JAW"),
-    #endif
+        .categoryName = LANGUAGE_STRING("BIG JAW", "MACHOIRE", "MASCELLONE", "FAUCES"),
         .height = 6,
         .weight = 95,
         .description = gTotodilePokedexText,
@@ -2864,13 +1910,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_CROCONAW] =
     {
-    #if FRENCH
-        .categoryName = _("MACHOIRE"),
-    #elif ITALIAN
-        .categoryName = _("MASCELLONE"),
-    #else //ENGLISH
-        .categoryName = _("BIG JAW"),
-    #endif
+        .categoryName = LANGUAGE_STRING("BIG JAW", "MACHOIRE", "MASCELLONE", "FAUCES"),
         .height = 11,
         .weight = 250,
         .description = gCroconawPokedexText,
@@ -2882,13 +1922,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_FERALIGATR] =
     {
-    #if FRENCH
-        .categoryName = _("MACHOIRE"),
-    #elif ITALIAN
-        .categoryName = _("MASCELLONE"),
-    #else //ENGLISH
-        .categoryName = _("BIG JAW"),
-    #endif
+        .categoryName = LANGUAGE_STRING("BIG JAW", "MACHOIRE", "MASCELLONE", "FAUCES"),
         .height = 23,
         .weight = 888,
         .description = gFeraligatrPokedexText,
@@ -2900,13 +1934,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_SENTRET] =
     {
-    #if FRENCH
-        .categoryName = _("ESPION"),
-    #elif ITALIAN
-        .categoryName = _("ESPLORANTE"),
-    #else //ENGLISH
-        .categoryName = _("SCOUT"),
-    #endif
+        .categoryName = LANGUAGE_STRING("SCOUT", "ESPION", "ESPLORANTE", "EXPLORADOR"),
         .height = 8,
         .weight = 60,
         .description = gSentretPokedexText,
@@ -2918,13 +1946,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_FURRET] =
     {
-    #if FRENCH
-        .categoryName = _("ALLONGE"),
-    #elif ITALIAN
-        .categoryName = _("LUNGOCORPO"),
-    #else //ENGLISH
-        .categoryName = _("LONG BODY"),
-    #endif
+        .categoryName = LANGUAGE_STRING("LONG BODY", "ALLONGE", "LUNGOCORPO", "ALARGADO"),
         .height = 18,
         .weight = 325,
         .description = gFurretPokedexText,
@@ -2936,13 +1958,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_HOOTHOOT] =
     {
-    #if FRENCH
-        .categoryName = _("HIBOU"),
-    #elif ITALIAN
-        .categoryName = _("GUFO"),
-    #else //ENGLISH
-        .categoryName = _("OWL"),
-    #endif
+        .categoryName = LANGUAGE_STRING("OWL", "HIBOU", "GUFO", "BÚHO"),
         .height = 7,
         .weight = 212,
         .description = gHoothootPokedexText,
@@ -2954,13 +1970,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_NOCTOWL] =
     {
-    #if FRENCH
-        .categoryName = _("HIBOU"),
-    #elif ITALIAN
-        .categoryName = _("GUFO"),
-    #else //ENGLISH
-        .categoryName = _("OWL"),
-    #endif
+        .categoryName = LANGUAGE_STRING("OWL", "HIBOU", "GUFO", "BÚHO"),
         .height = 16,
         .weight = 408,
         .description = gNoctowlPokedexText,
@@ -2972,13 +1982,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_LEDYBA] =
     {
-    #if FRENCH
-        .categoryName = _("5 ETOILES"),
-    #elif ITALIAN
-        .categoryName = _("PENTASTRA"),
-    #else //ENGLISH
-        .categoryName = _("FIVE STAR"),
-    #endif
+        .categoryName = LANGUAGE_STRING("FIVE STAR", "5 ETOILES", "PENTASTRA", "5ESTRELLAS"),
         .height = 10,
         .weight = 108,
         .description = gLedybaPokedexText,
@@ -2990,13 +1994,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_LEDIAN] =
     {
-    #if FRENCH
-        .categoryName = _("5 ETOILES"),
-    #elif ITALIAN
-        .categoryName = _("PENTASTRA"),
-    #else //ENGLISH
-        .categoryName = _("FIVE STAR"),
-    #endif
+        .categoryName = LANGUAGE_STRING("FIVE STAR", "5 ETOILES", "PENTASTRA", "5ESTRELLAS"),
         .height = 14,
         .weight = 356,
         .description = gLedianPokedexText,
@@ -3008,13 +2006,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_SPINARAK] =
     {
-    #if FRENCH
-        .categoryName = _("CRACHE FIL"),
-    #elif ITALIAN
-        .categoryName = _("TELA"),
-    #else //ENGLISH
-        .categoryName = _("STRING SPIT"),
-    #endif
+        .categoryName = LANGUAGE_STRING("STRING SPIT", "CRACHE FIL", "TELA", "ESCUPESOGA"),
         .height = 5,
         .weight = 85,
         .description = gSpinarakPokedexText,
@@ -3026,13 +2018,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_ARIADOS] =
     {
-    #if FRENCH
-        .categoryName = _("LONG-PATTE"),
-    #elif ITALIAN
-        .categoryName = _("LUNGAZAMPA"),
-    #else //ENGLISH
-        .categoryName = _("LONG LEG"),
-    #endif
+        .categoryName = LANGUAGE_STRING("LONG LEG", "LONG-PATTE", "LUNGAZAMPA", "PATA LARGA"),
         .height = 11,
         .weight = 335,
         .description = gAriadosPokedexText,
@@ -3044,13 +2030,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_CROBAT] =
     {
-    #if FRENCH
-        .categoryName = _("CHOVSOURIS"),
-    #elif ITALIAN
-        .categoryName = _("PIPISTREL."),
-    #else //ENGLISH
-        .categoryName = _("BAT"),
-    #endif
+        .categoryName = LANGUAGE_STRING("BAT", "CHOVSOURIS", "PIPISTREL.", "MURCIÉLAGO"),
         .height = 18,
         .weight = 750,
         .description = gCrobatPokedexText,
@@ -3062,13 +2042,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_CHINCHOU] =
     {
-    #if FRENCH
-        .categoryName = _("POISSON"),
-    #elif ITALIAN
-        .categoryName = _("PESCATORE"),
-    #else //ENGLISH
-        .categoryName = _("ANGLER"),
-    #endif
+        .categoryName = LANGUAGE_STRING("ANGLER", "POISSON", "PESCATORE", "RAPE"),
         .height = 5,
         .weight = 120,
         .description = gChinchouPokedexText,
@@ -3080,13 +2054,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_LANTURN] =
     {
-    #if FRENCH
-        .categoryName = _("LUMIERE"),
-    #elif ITALIAN
-        .categoryName = _("LUCE"),
-    #else //ENGLISH
-        .categoryName = _("LIGHT"),
-    #endif
+        .categoryName = LANGUAGE_STRING("LIGHT", "LUMIERE", "LUCE", "LUZ"),
         .height = 12,
         .weight = 225,
         .description = gLanturnPokedexText,
@@ -3098,13 +2066,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_PICHU] =
     {
-    #if FRENCH
-        .categoryName = _("MINISOURIS"),
-    #elif ITALIAN
-        .categoryName = _("TOPINO"),
-    #else //ENGLISH
-        .categoryName = _("TINY MOUSE"),
-    #endif
+        .categoryName = LANGUAGE_STRING("TINY MOUSE", "MINISOURIS", "TOPINO", "RATONCITO"),
         .height = 3,
         .weight = 20,
         .description = gPichuPokedexText,
@@ -3116,13 +2078,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_CLEFFA] =
     {
-    #if FRENCH
-        .categoryName = _("ETOILE"),
-    #elif ITALIAN
-        .categoryName = _("STELLA"),
-    #else //ENGLISH
-        .categoryName = _("STAR SHAPE"),
-    #endif
+        .categoryName = LANGUAGE_STRING("STAR SHAPE", "ETOILE", "STELLA", "ESTRELLADA"),
         .height = 3,
         .weight = 30,
         .description = gCleffaPokedexText,
@@ -3134,13 +2090,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_IGGLYBUFF] =
     {
-    #if FRENCH
-        .categoryName = _("BOUBOULE"),
-    #elif ITALIAN
-        .categoryName = _("PALLONE"),
-    #else //ENGLISH
-        .categoryName = _("BALLOON"),
-    #endif
+        .categoryName = LANGUAGE_STRING("BALLOON", "BOUBOULE", "PALLONE", "GLOBO"),
         .height = 3,
         .weight = 10,
         .description = gIgglybuffPokedexText,
@@ -3152,13 +2102,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_TOGEPI] =
     {
-    #if FRENCH
-        .categoryName = _("BALLE PIC"),
-    #elif ITALIAN
-        .categoryName = _("PALLAPUNTE"),
-    #else //ENGLISH
-        .categoryName = _("SPIKE BALL"),
-    #endif
+        .categoryName = LANGUAGE_STRING("SPIKE BALL", "BALLE PIC", "PALLAPUNTE", "BOLACLAVOS"),
         .height = 3,
         .weight = 15,
         .description = gTogepiPokedexText,
@@ -3170,13 +2114,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_TOGETIC] =
     {
-    #if FRENCH
-        .categoryName = _("BONHEUR"),
-    #elif ITALIAN
-        .categoryName = _("FELICITÀ"),
-    #else //ENGLISH
-        .categoryName = _("HAPPINESS"),
-    #endif
+        .categoryName = LANGUAGE_STRING("HAPPINESS", "BONHEUR", "FELICITÀ", "FELICIDAD"),
         .height = 6,
         .weight = 32,
         .description = gTogeticPokedexText,
@@ -3188,13 +2126,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_NATU] =
     {
-    #if FRENCH
-        .categoryName = _("MINOISEAU"),
-    #elif ITALIAN
-        .categoryName = _("UCCELLINO"),
-    #else //ENGLISH
-        .categoryName = _("TINY BIRD"),
-    #endif
+        .categoryName = LANGUAGE_STRING("TINY BIRD", "MINOISEAU", "UCCELLINO", "PAJARITO"),
         .height = 2,
         .weight = 20,
         .description = gNatuPokedexText,
@@ -3206,13 +2138,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_XATU] =
     {
-    #if FRENCH
-        .categoryName = _("MYSTIQUE"),
-    #elif ITALIAN
-        .categoryName = _("MAGICO"),
-    #else //ENGLISH
-        .categoryName = _("MYSTIC"),
-    #endif
+        .categoryName = LANGUAGE_STRING("MYSTIC", "MYSTIQUE", "MAGICO", "MÍSTICO"),
         .height = 15,
         .weight = 150,
         .description = gXatuPokedexText,
@@ -3224,13 +2150,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_MAREEP] =
     {
-    #if FRENCH
-        .categoryName = _("LAINE"),
-    #elif ITALIAN
-        .categoryName = _("LANA"),
-    #else //ENGLISH
-        .categoryName = _("WOOL"),
-    #endif
+        .categoryName = LANGUAGE_STRING("WOOL", "LAINE", "LANA", "LANA"),
         .height = 6,
         .weight = 78,
         .description = gMareepPokedexText,
@@ -3242,13 +2162,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_FLAAFFY] =
     {
-    #if FRENCH
-        .categoryName = _("LAINE"),
-    #elif ITALIAN
-        .categoryName = _("LANA"),
-    #else //ENGLISH
-        .categoryName = _("WOOL"),
-    #endif
+        .categoryName = LANGUAGE_STRING("WOOL", "LAINE", "LANA", "LANA"),
         .height = 8,
         .weight = 133,
         .description = gFlaaffyPokedexText,
@@ -3260,13 +2174,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_AMPHAROS] =
     {
-    #if FRENCH
-        .categoryName = _("LUMIERE"),
-    #elif ITALIAN
-        .categoryName = _("LUCE"),
-    #else //ENGLISH
-        .categoryName = _("LIGHT"),
-    #endif
+        .categoryName = LANGUAGE_STRING("LIGHT", "LUMIERE", "LUCE", "LUZ"),
         .height = 14,
         .weight = 615,
         .description = gAmpharosPokedexText,
@@ -3278,13 +2186,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_BELLOSSOM] =
     {
-    #if FRENCH
-        .categoryName = _("FLEUR"),
-    #elif ITALIAN
-        .categoryName = _("FIORE"),
-    #else //ENGLISH
-        .categoryName = _("FLOWER"),
-    #endif
+        .categoryName = LANGUAGE_STRING("FLOWER", "FLEUR", "FIORE", "FLOR"),
         .height = 4,
         .weight = 58,
         .description = gBellossomPokedexText,
@@ -3296,13 +2198,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_MARILL] =
     {
-    #if FRENCH
-        .categoryName = _("AQUASOURIS"),
-    #elif ITALIAN
-        .categoryName = _("ACQUATOPO"),
-    #else //ENGLISH
-        .categoryName = _("AQUA MOUSE"),
-    #endif
+        .categoryName = LANGUAGE_STRING("AQUA MOUSE", "AQUASOURIS", "ACQUATOPO", "RATÓN AGUA"),
         .height = 4,
         .weight = 85,
         .description = gMarillPokedexText,
@@ -3314,13 +2210,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_AZUMARILL] =
     {
-    #if FRENCH
-        .categoryName = _("AQUALAPIN"),
-    #elif ITALIAN
-        .categoryName = _("ACQUNIGLIO"),
-    #else //ENGLISH
-        .categoryName = _("AQUA RABBIT"),
-    #endif
+        .categoryName = LANGUAGE_STRING("AQUA RABBIT", "AQUALAPIN", "ACQUNIGLIO", "CONEJOAGUA"),
         .height = 8,
         .weight = 285,
         .description = gAzumarillPokedexText,
@@ -3332,13 +2222,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_SUDOWOODO] =
     {
-    #if FRENCH
-        .categoryName = _("IMITATION"),
-    #elif ITALIAN
-        .categoryName = _("IMITAZIONE"),
-    #else //ENGLISH
-        .categoryName = _("IMITATION"),
-    #endif
+        .categoryName = LANGUAGE_STRING("IMITATION", "IMITATION", "IMITAZIONE", "IMITACIÓN"),
         .height = 12,
         .weight = 380,
         .description = gSudowoodoPokedexText,
@@ -3350,13 +2234,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_POLITOED] =
     {
-    #if FRENCH
-        .categoryName = _("GRENOUILLE"),
-    #elif ITALIAN
-        .categoryName = _("RANA"),
-    #else //ENGLISH
-        .categoryName = _("FROG"),
-    #endif
+        .categoryName = LANGUAGE_STRING("FROG", "GRENOUILLE", "RANA", "RANA"),
         .height = 11,
         .weight = 339,
         .description = gPolitoedPokedexText,
@@ -3368,13 +2246,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_HOPPIP] =
     {
-    #if FRENCH
-        .categoryName = _("PISSENLIT"),
-    #elif ITALIAN
-        .categoryName = _("GRAMIGNA"),
-    #else //ENGLISH
-        .categoryName = _("COTTONWEED"),
-    #endif
+        .categoryName = LANGUAGE_STRING("COTTONWEED", "PISSENLIT", "GRAMIGNA", "ALGADÓN"),
         .height = 4,
         .weight = 5,
         .description = gHoppipPokedexText,
@@ -3386,13 +2258,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_SKIPLOOM] =
     {
-    #if FRENCH
-        .categoryName = _("PISSENLIT"),
-    #elif ITALIAN
-        .categoryName = _("GRAMIGNA"),
-    #else //ENGLISH
-        .categoryName = _("COTTONWEED"),
-    #endif
+        .categoryName = LANGUAGE_STRING("COTTONWEED", "PISSENLIT", "GRAMIGNA", "ALGADÓN"),
         .height = 6,
         .weight = 10,
         .description = gSkiploomPokedexText,
@@ -3404,13 +2270,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_JUMPLUFF] =
     {
-    #if FRENCH
-        .categoryName = _("PISSENLIT"),
-    #elif ITALIAN
-        .categoryName = _("GRAMIGNA"),
-    #else //ENGLISH
-        .categoryName = _("COTTONWEED"),
-    #endif
+        .categoryName = LANGUAGE_STRING("COTTONWEED", "PISSENLIT", "GRAMIGNA", "ALGADÓN"),
         .height = 8,
         .weight = 30,
         .description = gJumpluffPokedexText,
@@ -3422,13 +2282,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_AIPOM] =
     {
-    #if FRENCH
-        .categoryName = _("LONGQUEUE"),
-    #elif ITALIAN
-        .categoryName = _("LUNGACODA"),
-    #else //ENGLISH
-        .categoryName = _("LONG TAIL"),
-    #endif
+        .categoryName = LANGUAGE_STRING("LONG TAIL", "LONGQUEUE", "LUNGACODA", "COLA LARGA"),
         .height = 8,
         .weight = 115,
         .description = gAipomPokedexText,
@@ -3440,13 +2294,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_SUNKERN] =
     {
-    #if FRENCH
-        .categoryName = _("GRAINE"),
-    #elif ITALIAN
-        .categoryName = _("SEME"),
-    #else //ENGLISH
-        .categoryName = _("SEED"),
-    #endif
+        .categoryName = LANGUAGE_STRING("SEED", "GRAINE", "SEME", "SEMILLA"),
         .height = 3,
         .weight = 18,
         .description = gSunkernPokedexText,
@@ -3458,13 +2306,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_SUNFLORA] =
     {
-    #if FRENCH
-        .categoryName = _("SOLEIL"),
-    #elif ITALIAN
-        .categoryName = _("SOLE"),
-    #else //ENGLISH
-        .categoryName = _("SUN"),
-    #endif
+        .categoryName = LANGUAGE_STRING("SUN", "SOLEIL", "SOLE", "SOL"),
         .height = 8,
         .weight = 85,
         .description = gSunfloraPokedexText,
@@ -3476,13 +2318,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_YANMA] =
     {
-    #if FRENCH
-        .categoryName = _("TRANSLAILE"),
-    #elif ITALIAN
-        .categoryName = _("ALACHIARA"),
-    #else //ENGLISH
-        .categoryName = _("CLEAR WING"),
-    #endif
+        .categoryName = LANGUAGE_STRING("CLEAR WING", "TRANSLAILE", "ALACHIARA", "ALA CLARA"),
         .height = 12,
         .weight = 380,
         .description = gYanmaPokedexText,
@@ -3494,13 +2330,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_WOOPER] =
     {
-    #if FRENCH
-        .categoryName = _("POISSON"),
-    #elif ITALIAN
-        .categoryName = _("ACQUAPESCE"),
-    #else //ENGLISH
-        .categoryName = _("WATER FISH"),
-    #endif
+        .categoryName = LANGUAGE_STRING("WATER FISH", "POISSON", "ACQUAPESCE", "PEZ AGUA"),
         .height = 4,
         .weight = 85,
         .description = gWooperPokedexText,
@@ -3512,13 +2342,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_QUAGSIRE] =
     {
-    #if FRENCH
-        .categoryName = _("POISSON"),
-    #elif ITALIAN
-        .categoryName = _("ACQUAPESCE"),
-    #else //ENGLISH
-        .categoryName = _("WATER FISH"),
-    #endif
+        .categoryName = LANGUAGE_STRING("WATER FISH", "POISSON", "ACQUAPESCE", "PEZ AGUA"),
         .height = 14,
         .weight = 750,
         .description = gQuagsirePokedexText,
@@ -3530,13 +2354,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_ESPEON] =
     {
-    #if FRENCH
-        .categoryName = _("SOLEIL"),
-    #elif ITALIAN
-        .categoryName = _("SOLE"),
-    #else //ENGLISH
-        .categoryName = _("SUN"),
-    #endif
+        .categoryName = LANGUAGE_STRING("SUN", "SOLEIL", "SOLE", "SOL"),
         .height = 9,
         .weight = 265,
         .description = gEspeonPokedexText,
@@ -3548,13 +2366,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_UMBREON] =
     {
-    #if FRENCH
-        .categoryName = _("LUNE"),
-    #elif ITALIAN
-        .categoryName = _("LUCELUNARE"),
-    #else //ENGLISH
-        .categoryName = _("MOONLIGHT"),
-    #endif
+        .categoryName = LANGUAGE_STRING("MOONLIGHT", "LUNE", "LUCELUNARE", "LUZ LUNAR"),
         .height = 10,
         .weight = 270,
         .description = gUmbreonPokedexText,
@@ -3566,13 +2378,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_MURKROW] =
     {
-    #if FRENCH
-        .categoryName = _("OBSCURITE"),
-    #elif ITALIAN
-        .categoryName = _("OSCURITÀ"),
-    #else //ENGLISH
-        .categoryName = _("DARKNESS"),
-    #endif
+        .categoryName = LANGUAGE_STRING("DARKNESS", "OBSCURITE", "OSCURITÀ", "OSCURIDAD"),
         .height = 5,
         .weight = 21,
         .description = gMurkrowPokedexText,
@@ -3584,13 +2390,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_SLOWKING] =
     {
-    #if FRENCH
-        .categoryName = _("ROYAL"),
-    #elif ITALIAN
-        .categoryName = _("REALE"),
-    #else //ENGLISH
-        .categoryName = _("ROYAL"),
-    #endif
+        .categoryName = LANGUAGE_STRING("ROYAL", "ROYAL", "REALE", "REGIO"),
         .height = 20,
         .weight = 795,
         .description = gSlowkingPokedexText,
@@ -3602,13 +2402,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_MISDREAVUS] =
     {
-    #if FRENCH
-        .categoryName = _("STRIDENT"),
-    #elif ITALIAN
-        .categoryName = _("STRIDO"),
-    #else //ENGLISH
-        .categoryName = _("SCREECH"),
-    #endif
+        .categoryName = LANGUAGE_STRING("SCREECH", "STRIDENT", "STRIDO", "CHIRRIDO"),
         .height = 7,
         .weight = 10,
         .description = gMisdreavusPokedexText,
@@ -3620,13 +2414,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_UNOWN] =
     {
-    #if FRENCH
-        .categoryName = _("SYMBOLIQUE"),
-    #elif ITALIAN
-        .categoryName = _("SIMBOLO"),
-    #else //ENGLISH
-        .categoryName = _("SYMBOL"),
-    #endif
+        .categoryName = LANGUAGE_STRING("SYMBOL", "SYMBOLIQUE", "SIMBOLO", "SÍMBOLO"),
         .height = 5,
         .weight = 50,
         .description = gUnownPokedexText,
@@ -3638,13 +2426,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_WOBBUFFET] =
     {
-    #if FRENCH
-        .categoryName = _("PATIENT"),
-    #elif ITALIAN
-        .categoryName = _("PAZIENZA"),
-    #else //ENGLISH
-        .categoryName = _("PATIENT"),
-    #endif
+        .categoryName = LANGUAGE_STRING("PATIENT", "PATIENT", "PAZIENZA", "PACIENTE"),
         .height = 13,
         .weight = 285,
         .description = gWobbuffetPokedexText,
@@ -3656,13 +2438,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_GIRAFARIG] =
     {
-    #if FRENCH
-        .categoryName = _("LONG-COU"),
-    #elif ITALIAN
-        .categoryName = _("LUNGOCOLLO"),
-    #else //ENGLISH
-        .categoryName = _("LONG NECK"),
-    #endif
+        .categoryName = LANGUAGE_STRING("LONG NECK", "LONG-COU", "LUNGOCOLLO", "GRANCUELLO"),
         .height = 15,
         .weight = 415,
         .description = gGirafarigPokedexText,
@@ -3674,13 +2450,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_PINECO] =
     {
-    #if FRENCH
-        .categoryName = _("VER CACHE"),
-    #elif ITALIAN
-        .categoryName = _("LARVA"),
-    #else //ENGLISH
-        .categoryName = _("BAGWORM"),
-    #endif
+        .categoryName = LANGUAGE_STRING("BAGWORM", "VER CACHE", "LARVA", "LARVA"),
         .height = 6,
         .weight = 72,
         .description = gPinecoPokedexText,
@@ -3692,13 +2462,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_FORRETRESS] =
     {
-    #if FRENCH
-        .categoryName = _("VER CACHE"),
-    #elif ITALIAN
-        .categoryName = _("LARVA"),
-    #else //ENGLISH
-        .categoryName = _("BAGWORM"),
-    #endif
+        .categoryName = LANGUAGE_STRING("BAGWORM", "VER CACHE", "LARVA", "LARVA"),
         .height = 12,
         .weight = 1258,
         .description = gForretressPokedexText,
@@ -3710,13 +2474,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_DUNSPARCE] =
     {
-    #if FRENCH
-        .categoryName = _("SERPENT"),
-    #elif ITALIAN
-        .categoryName = _("TERRASERPE"),
-    #else //ENGLISH
-        .categoryName = _("LAND SNAKE"),
-    #endif
+        .categoryName = LANGUAGE_STRING("LAND SNAKE", "SERPENT", "TERRASERPE", "SERPTIERRA"),
         .height = 15,
         .weight = 140,
         .description = gDunsparcePokedexText,
@@ -3728,13 +2486,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_GLIGAR] =
     {
-    #if FRENCH
-        .categoryName = _("SCORPIVOL"),
-    #elif ITALIAN
-        .categoryName = _("ALISCORPIO"),
-    #else //ENGLISH
-        .categoryName = _("FLYSCORPION"),
-    #endif
+        .categoryName = LANGUAGE_STRING("FLYSCORPION", "SCORPIVOL", "ALISCORPIO", "ESCORPIALA"),
         .height = 11,
         .weight = 648,
         .description = gGligarPokedexText,
@@ -3746,13 +2498,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_STEELIX] =
     {
-    #if FRENCH
-        .categoryName = _("SERPENFER"),
-    #elif ITALIAN
-        .categoryName = _("FERROSERPE"),
-    #else //ENGLISH
-        .categoryName = _("IRON SNAKE"),
-    #endif
+        .categoryName = LANGUAGE_STRING("IRON SNAKE", "SERPENFER", "FERROSERPE", "SERPFÉRREA"),
         .height = 92,
         .weight = 4000,
         .description = gSteelixPokedexText,
@@ -3764,13 +2510,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_SNUBBULL] =
     {
-    #if FRENCH
-        .categoryName = _("FEE"),
-    #elif ITALIAN
-        .categoryName = _("FATA"),
-    #else //ENGLISH
-        .categoryName = _("FAIRY"),
-    #endif
+        .categoryName = LANGUAGE_STRING("FAIRY", "FEE", "FATA", "HADA"),
         .height = 6,
         .weight = 78,
         .description = gSnubbullPokedexText,
@@ -3782,13 +2522,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_GRANBULL] =
     {
-    #if FRENCH
-        .categoryName = _("FEE"),
-    #elif ITALIAN
-        .categoryName = _("FATA"),
-    #else //ENGLISH
-        .categoryName = _("FAIRY"),
-    #endif
+        .categoryName = LANGUAGE_STRING("FAIRY", "FEE", "FATA", "HADA"),
         .height = 14,
         .weight = 487,
         .description = gGranbullPokedexText,
@@ -3800,13 +2534,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_QWILFISH] =
     {
-    #if FRENCH
-        .categoryName = _("BOUBOULE"),
-    #elif ITALIAN
-        .categoryName = _("PALLONE"),
-    #else //ENGLISH
-        .categoryName = _("BALLOON"),
-    #endif
+        .categoryName = LANGUAGE_STRING("BALLOON", "BOUBOULE", "PALLONE", "GLOBO"),
         .height = 5,
         .weight = 39,
         .description = gQwilfishPokedexText,
@@ -3818,13 +2546,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_SCIZOR] =
     {
-    #if FRENCH
-        .categoryName = _("PINCE"),
-    #elif ITALIAN
-        .categoryName = _("CHELA"),
-    #else //ENGLISH
-        .categoryName = _("PINCER"),
-    #endif
+        .categoryName = LANGUAGE_STRING("PINCER", "PINCE", "CHELA", "TENAZA"),
         .height = 18,
         .weight = 1180,
         .description = gScizorPokedexText,
@@ -3836,13 +2558,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_SHUCKLE] =
     {
-    #if FRENCH
-        .categoryName = _("POURRI"),
-    #elif ITALIAN
-        .categoryName = _("MUFFA"),
-    #else //ENGLISH
-        .categoryName = _("MOLD"),
-    #endif
+        .categoryName = LANGUAGE_STRING("MOLD", "POURRI", "MUFFA", "MOHO"),
         .height = 6,
         .weight = 205,
         .description = gShucklePokedexText,
@@ -3854,13 +2570,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_HERACROSS] =
     {
-    #if FRENCH
-        .categoryName = _("UNICORNE"),
-    #elif ITALIAN
-        .categoryName = _("MONOCORNO"),
-    #else //ENGLISH
-        .categoryName = _("SINGLE HORN"),
-    #endif
+        .categoryName = LANGUAGE_STRING("SINGLE HORN", "UNICORNE", "MONOCORNO", "UNICORNIO"),
         .height = 15,
         .weight = 540,
         .description = gHeracrossPokedexText,
@@ -3872,13 +2582,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_SNEASEL] =
     {
-    #if FRENCH
-        .categoryName = _("GRIFACEREE"),
-    #elif ITALIAN
-        .categoryName = _("LAMARTIGLI"),
-    #else //ENGLISH
-        .categoryName = _("SHARP CLAW"),
-    #endif
+        .categoryName = LANGUAGE_STRING("SHARP CLAW", "GRIFACEREE", "LAMARTIGLI", "GARRA FILO"),
         .height = 9,
         .weight = 280,
         .description = gSneaselPokedexText,
@@ -3890,13 +2594,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_TEDDIURSA] =
     {
-    #if FRENCH
-        .categoryName = _("MINI OURS"),
-    #elif ITALIAN
-        .categoryName = _("ORSETTO"),
-    #else //ENGLISH
-        .categoryName = _("LITTLE BEAR"),
-    #endif
+        .categoryName = LANGUAGE_STRING("LITTLE BEAR", "MINI OURS", "ORSETTO", "OSITO"),
         .height = 6,
         .weight = 88,
         .description = gTeddiursaPokedexText,
@@ -3908,13 +2606,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_URSARING] =
     {
-    #if FRENCH
-        .categoryName = _("HIBERNANT"),
-    #elif ITALIAN
-        .categoryName = _("LETARGO"),
-    #else //ENGLISH
-        .categoryName = _("HIBERNATOR"),
-    #endif
+        .categoryName = LANGUAGE_STRING("HIBERNATOR", "HIBERNANT", "LETARGO", "HIBERNANTE"),
         .height = 18,
         .weight = 1258,
         .description = gUrsaringPokedexText,
@@ -3926,13 +2618,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_SLUGMA] =
     {
-    #if FRENCH
-        .categoryName = _("LAVE"),
-    #elif ITALIAN
-        .categoryName = _("LAVA"),
-    #else //ENGLISH
-        .categoryName = _("LAVA"),
-    #endif
+        .categoryName = LANGUAGE_STRING("LAVA", "LAVE", "LAVA", "LAVA"),
         .height = 7,
         .weight = 350,
         .description = gSlugmaPokedexText,
@@ -3944,13 +2630,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_MAGCARGO] =
     {
-    #if FRENCH
-        .categoryName = _("LAVE"),
-    #elif ITALIAN
-        .categoryName = _("LAVA"),
-    #else //ENGLISH
-        .categoryName = _("LAVA"),
-    #endif
+        .categoryName = LANGUAGE_STRING("LAVA", "LAVE", "LAVA", "LAVA"),
         .height = 8,
         .weight = 550,
         .description = gMagcargoPokedexText,
@@ -3962,13 +2642,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_SWINUB] =
     {
-    #if FRENCH
-        .categoryName = _("COCHON"),
-    #elif ITALIAN
-        .categoryName = _("MAIALE"),
-    #else //ENGLISH
-        .categoryName = _("PIG"),
-    #endif
+        .categoryName = LANGUAGE_STRING("PIG", "COCHON", "MAIALE", "CERDO"),
         .height = 4,
         .weight = 65,
         .description = gSwinubPokedexText,
@@ -3980,13 +2654,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_PILOSWINE] =
     {
-    #if FRENCH
-        .categoryName = _("PORC"),
-    #elif ITALIAN
-        .categoryName = _("SUINO"),
-    #else //ENGLISH
-        .categoryName = _("SWINE"),
-    #endif
+        .categoryName = LANGUAGE_STRING("SWINE", "PORC", "SUINO", "PUERCO"),
         .height = 11,
         .weight = 558,
         .description = gPiloswinePokedexText,
@@ -3998,13 +2666,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_CORSOLA] =
     {
-    #if FRENCH
-        .categoryName = _("CORAIL"),
-    #elif ITALIAN
-        .categoryName = _("CORALLO"),
-    #else //ENGLISH
-        .categoryName = _("CORAL"),
-    #endif
+        .categoryName = LANGUAGE_STRING("CORAL", "CORAIL", "CORALLO", "CORAL"),
         .height = 6,
         .weight = 50,
         .description = gCorsolaPokedexText,
@@ -4016,13 +2678,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_REMORAID] =
     {
-    #if FRENCH
-        .categoryName = _("JET"),
-    #elif ITALIAN
-        .categoryName = _("JET"),
-    #else //ENGLISH
-        .categoryName = _("JET"),
-    #endif
+        .categoryName = LANGUAGE_STRING("JET", "JET", "JET", "REACTOR"),
         .height = 6,
         .weight = 120,
         .description = gRemoraidPokedexText,
@@ -4034,13 +2690,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_OCTILLERY] =
     {
-    #if FRENCH
-        .categoryName = _("JET"),
-    #elif ITALIAN
-        .categoryName = _("JET"),
-    #else //ENGLISH
-        .categoryName = _("JET"),
-    #endif
+        .categoryName = LANGUAGE_STRING("JET", "JET", "JET", "REACTOR"),
         .height = 9,
         .weight = 285,
         .description = gOctilleryPokedexText,
@@ -4052,13 +2702,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_DELIBIRD] =
     {
-    #if FRENCH
-        .categoryName = _("LIVRAISON"),
-    #elif ITALIAN
-        .categoryName = _("CONSEGNA"),
-    #else //ENGLISH
-        .categoryName = _("DELIVERY"),
-    #endif
+        .categoryName = LANGUAGE_STRING("DELIVERY", "LIVRAISON", "CONSEGNA", "REPARTO"),
         .height = 9,
         .weight = 160,
         .description = gDelibirdPokedexText,
@@ -4070,13 +2714,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_MANTINE] =
     {
-    #if FRENCH
-        .categoryName = _("CERVOLANT"),
-    #elif ITALIAN
-        .categoryName = _("AQUILONE"),
-    #else //ENGLISH
-        .categoryName = _("KITE"),
-    #endif
+        .categoryName = LANGUAGE_STRING("KITE", "CERVOLANT", "AQUILONE", "MILANO"),
         .height = 21,
         .weight = 2200,
         .description = gMantinePokedexText,
@@ -4088,13 +2726,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_SKARMORY] =
     {
-    #if FRENCH
-        .categoryName = _("ARMOISEAU"),
-    #elif ITALIAN
-        .categoryName = _("ARMUCCELLO"),
-    #else //ENGLISH
-        .categoryName = _("ARMOR BIRD"),
-    #endif
+        .categoryName = LANGUAGE_STRING("ARMOR BIRD", "ARMOISEAU", "ARMUCCELLO", "CORAZA AVE"),
         .height = 17,
         .weight = 505,
         .description = gSkarmoryPokedexText,
@@ -4106,13 +2738,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_HOUNDOUR] =
     {
-    #if FRENCH
-        .categoryName = _("SOMBRE"),
-    #elif ITALIAN
-        .categoryName = _("BUIO"),
-    #else //ENGLISH
-        .categoryName = _("DARK"),
-    #endif
+        .categoryName = LANGUAGE_STRING("DARK", "SOMBRE", "BUIO", "SINIESTRO"),
         .height = 6,
         .weight = 108,
         .description = gHoundourPokedexText,
@@ -4124,13 +2750,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_HOUNDOOM] =
     {
-    #if FRENCH
-        .categoryName = _("SOMBRE"),
-    #elif ITALIAN
-        .categoryName = _("BUIO"),
-    #else //ENGLISH
-        .categoryName = _("DARK"),
-    #endif
+        .categoryName = LANGUAGE_STRING("DARK", "SOMBRE", "BUIO", "SINIESTRO"),
         .height = 14,
         .weight = 350,
         .description = gHoundoomPokedexText,
@@ -4142,13 +2762,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_KINGDRA] =
     {
-    #if FRENCH
-        .categoryName = _("DRAGON"),
-    #elif ITALIAN
-        .categoryName = _("DRAGO"),
-    #else //ENGLISH
-        .categoryName = _("DRAGON"),
-    #endif
+        .categoryName = LANGUAGE_STRING("DRAGON", "DRAGON", "DRAGO", "DRAGÓN"),
         .height = 18,
         .weight = 1520,
         .description = gKingdraPokedexText,
@@ -4160,13 +2774,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_PHANPY] =
     {
-    #if FRENCH
-        .categoryName = _("LONG-NEZ"),
-    #elif ITALIAN
-        .categoryName = _("NASONE"),
-    #else //ENGLISH
-        .categoryName = _("LONG NOSE"),
-    #endif
+        .categoryName = LANGUAGE_STRING("LONG NOSE", "LONG-NEZ", "NASONE", "NARIZOTAS"),
         .height = 5,
         .weight = 335,
         .description = gPhanpyPokedexText,
@@ -4178,13 +2786,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_DONPHAN] =
     {
-    #if FRENCH
-        .categoryName = _("ARMURE"),
-    #elif ITALIAN
-        .categoryName = _("ARMATURA"),
-    #else //ENGLISH
-        .categoryName = _("ARMOR"),
-    #endif
+        .categoryName = LANGUAGE_STRING("ARMOR", "ARMURE", "ARMATURA", "CORAZA"),
         .height = 11,
         .weight = 1200,
         .description = gDonphanPokedexText,
@@ -4196,13 +2798,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_PORYGON2] =
     {
-    #if FRENCH
-        .categoryName = _("VIRTUEL"),
-    #elif ITALIAN
-        .categoryName = _("VIRTUALE"),
-    #else //ENGLISH
-        .categoryName = _("VIRTUAL"),
-    #endif
+        .categoryName = LANGUAGE_STRING("VIRTUAL", "VIRTUEL", "VIRTUALE", "VIRTUAL"),
         .height = 6,
         .weight = 325,
         .description = gPorygon2PokedexText,
@@ -4214,13 +2810,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_STANTLER] =
     {
-    #if FRENCH
-        .categoryName = _("MAXI CORNE"),
-    #elif ITALIAN
-        .categoryName = _("GRANCORNO"),
-    #else //ENGLISH
-        .categoryName = _("BIG HORN"),
-    #endif
+        .categoryName = LANGUAGE_STRING("BIG HORN", "MAXI CORNE", "GRANCORNO", "GRANCUERNO"),
         .height = 14,
         .weight = 712,
         .description = gStantlerPokedexText,
@@ -4232,13 +2822,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_SMEARGLE] =
     {
-    #if FRENCH
-        .categoryName = _("PEINTRE"),
-    #elif ITALIAN
-        .categoryName = _("PITTORE"),
-    #else //ENGLISH
-        .categoryName = _("PAINTER"),
-    #endif
+        .categoryName = LANGUAGE_STRING("PAINTER", "PEINTRE", "PITTORE", "PINTOR"),
         .height = 12,
         .weight = 580,
         .description = gSmearglePokedexText,
@@ -4250,13 +2834,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_TYROGUE] =
     {
-    #if FRENCH
-        .categoryName = _("BAGARREUR"),
-    #elif ITALIAN
-        .categoryName = _("BARUFFA"),
-    #else //ENGLISH
-        .categoryName = _("SCUFFLE"),
-    #endif
+        .categoryName = LANGUAGE_STRING("SCUFFLE", "BAGARREUR", "BARUFFA", "PELEÓN"),
         .height = 7,
         .weight = 210,
         .description = gTyroguePokedexText,
@@ -4268,13 +2846,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_HITMONTOP] =
     {
-    #if FRENCH
-        .categoryName = _("POIRIER"),
-    #elif ITALIAN
-        .categoryName = _("VERTICALE"),
-    #else //ENGLISH
-        .categoryName = _("HANDSTAND"),
-    #endif
+        .categoryName = LANGUAGE_STRING("HANDSTAND", "POIRIER", "VERTICALE", "BOCA ABAJO"),
         .height = 14,
         .weight = 480,
         .description = gHitmontopPokedexText,
@@ -4286,13 +2858,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_SMOOCHUM] =
     {
-    #if FRENCH
-        .categoryName = _("BISOU"),
-    #elif ITALIAN
-        .categoryName = _("BACIO"),
-    #else //ENGLISH
-        .categoryName = _("KISS"),
-    #endif
+        .categoryName = LANGUAGE_STRING("KISS", "BISOU", "BACIO", "BESO"),
         .height = 4,
         .weight = 60,
         .description = gSmoochumPokedexText,
@@ -4304,13 +2870,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_ELEKID] =
     {
-    #if FRENCH
-        .categoryName = _("ELECTRIQUE"),
-    #elif ITALIAN
-        .categoryName = _("ELETTRICO"),
-    #else //ENGLISH
-        .categoryName = _("ELECTRIC"),
-    #endif
+        .categoryName = LANGUAGE_STRING("ELECTRIC", "ELECTRIQUE", "ELETTRICO", "ELÉCTRICO"),
         .height = 6,
         .weight = 235,
         .description = gElekidPokedexText,
@@ -4322,13 +2882,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_MAGBY] =
     {
-    #if FRENCH
-        .categoryName = _("CHARBON"),
-    #elif ITALIAN
-        .categoryName = _("CARBONVIVO"),
-    #else //ENGLISH
-        .categoryName = _("LIVE COAL"),
-    #endif
+        .categoryName = LANGUAGE_STRING("LIVE COAL", "CHARBON", "CARBONVIVO", "ASCUAS"),
         .height = 7,
         .weight = 214,
         .description = gMagbyPokedexText,
@@ -4340,13 +2894,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_MILTANK] =
     {
-    #if FRENCH
-        .categoryName = _("VACHALAIT"),
-    #elif ITALIAN
-        .categoryName = _("BOVINO"),
-    #else //ENGLISH
-        .categoryName = _("MILK COW"),
-    #endif
+        .categoryName = LANGUAGE_STRING("MILK COW", "VACHALAIT", "BOVINO", "LECHERA"),
         .height = 12,
         .weight = 755,
         .description = gMiltankPokedexText,
@@ -4358,13 +2906,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_BLISSEY] =
     {
-    #if FRENCH
-        .categoryName = _("BONHEUR"),
-    #elif ITALIAN
-        .categoryName = _("FELICITÀ"),
-    #else //ENGLISH
-        .categoryName = _("HAPPINESS"),
-    #endif
+        .categoryName = LANGUAGE_STRING("HAPPINESS", "BONHEUR", "FELICITÀ", "FELICIDAD"),
         .height = 15,
         .weight = 468,
         .description = gBlisseyPokedexText,
@@ -4376,13 +2918,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_RAIKOU] =
     {
-    #if FRENCH
-        .categoryName = _("FOUDRE"),
-    #elif ITALIAN
-        .categoryName = _("TUONO"),
-    #else //ENGLISH
-        .categoryName = _("THUNDER"),
-    #endif
+        .categoryName = LANGUAGE_STRING("THUNDER", "FOUDRE", "TUONO", "TRUENO"),
         .height = 19,
         .weight = 1780,
         .description = gRaikouPokedexText,
@@ -4394,13 +2930,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_ENTEI] =
     {
-    #if FRENCH
-        .categoryName = _("VOLCAN"),
-    #elif ITALIAN
-        .categoryName = _("VULCANO"),
-    #else //ENGLISH
-        .categoryName = _("VOLCANO"),
-    #endif
+        .categoryName = LANGUAGE_STRING("VOLCANO", "VOLCAN", "VULCANO", "VOLCÁN"),
         .height = 21,
         .weight = 1980,
         .description = gEnteiPokedexText,
@@ -4412,13 +2942,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_SUICUNE] =
     {
-    #if FRENCH
-        .categoryName = _("AURORE"),
-    #elif ITALIAN
-        .categoryName = _("AURORA"),
-    #else //ENGLISH
-        .categoryName = _("AURORA"),
-    #endif
+        .categoryName = LANGUAGE_STRING("AURORA", "AURORE", "AURORA", "AURORA"),
         .height = 20,
         .weight = 1870,
         .description = gSuicunePokedexText,
@@ -4430,13 +2954,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_LARVITAR] =
     {
-    #if FRENCH
-        .categoryName = _("PEAUPIERRE"),
-    #elif ITALIAN
-        .categoryName = _("PELDISASSO"),
-    #else //ENGLISH
-        .categoryName = _("ROCK SKIN"),
-    #endif
+        .categoryName = LANGUAGE_STRING("ROCK SKIN", "PEAUPIERRE", "PELDISASSO", "PIEL ROCA"),
         .height = 6,
         .weight = 720,
         .description = gLarvitarPokedexText,
@@ -4448,13 +2966,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_PUPITAR] =
     {
-    #if FRENCH
-        .categoryName = _("CARAPADURE"),
-    #elif ITALIAN
-        .categoryName = _("GUSCIODURO"),
-    #else //ENGLISH
-        .categoryName = _("HARD SHELL"),
-    #endif
+        .categoryName = LANGUAGE_STRING("HARD SHELL", "CARAPADURE", "GUSCIODURO", "CAPARAZÓN"),
         .height = 12,
         .weight = 1520,
         .description = gPupitarPokedexText,
@@ -4466,13 +2978,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_TYRANITAR] =
     {
-    #if FRENCH
-        .categoryName = _("ARMURE"),
-    #elif ITALIAN
-        .categoryName = _("ARMATURA"),
-    #else //ENGLISH
-        .categoryName = _("ARMOR"),
-    #endif
+        .categoryName = LANGUAGE_STRING("ARMOR", "ARMURE", "ARMATURA", "CORAZA"),
         .height = 20,
         .weight = 2020,
         .description = gTyranitarPokedexText,
@@ -4484,13 +2990,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_LUGIA] =
     {
-    #if FRENCH
-        .categoryName = _("PLONGEON"),
-    #elif ITALIAN
-        .categoryName = _("IMMERSIONE"),
-    #else //ENGLISH
-        .categoryName = _("DIVING"),
-    #endif
+        .categoryName = LANGUAGE_STRING("DIVING", "PLONGEON", "IMMERSIONE", "BUCEO"),
         .height = 52,
         .weight = 2160,
         .description = gLugiaPokedexText,
@@ -4502,13 +3002,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_HO_OH] =
     {
-    #if FRENCH
-        .categoryName = _("ARCENCIEL"),
-    #elif ITALIAN
-        .categoryName = _("ARCOBALENO"),
-    #else //ENGLISH
-        .categoryName = _("RAINBOW"),
-    #endif
+        .categoryName = LANGUAGE_STRING("RAINBOW", "ARCENCIEL", "ARCOBALENO", "ARCO IRIS"),
         .height = 38,
         .weight = 1990,
         .description = gHoOhPokedexText,
@@ -4520,13 +3014,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_CELEBI] =
     {
-    #if FRENCH
-        .categoryName = _("TEMPOREL"),
-    #elif ITALIAN
-        .categoryName = _("TEMPOVIA"),
-    #else //ENGLISH
-        .categoryName = _("TIME TRAVEL"),
-    #endif
+        .categoryName = LANGUAGE_STRING("TIME TRAVEL", "TEMPOREL", "TEMPOVIA", "VIAJETIEMPO"),
         .height = 6,
         .weight = 50,
         .description = gCelebiPokedexText,
@@ -4538,13 +3026,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_TREECKO] =
     {
-    #if FRENCH
-        .categoryName = _("BOIS GECKO"),
-    #elif ITALIAN
-        .categoryName = _("LEGNOGECO"),
-    #else //ENGLISH
-        .categoryName = _("WOOD GECKO"),
-    #endif
+        .categoryName = LANGUAGE_STRING("WOOD GECKO", "BOIS GECKO", "LEGNOGECO", "GECO BOSQUE"),
         .height = 5,
         .weight = 50,
         .description = gTreeckoPokedexText,
@@ -4556,13 +3038,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_GROVYLE] =
     {
-    #if FRENCH
-        .categoryName = _("BOIS GECKO"),
-    #elif ITALIAN
-        .categoryName = _("LEGNOGECO"),
-    #else //ENGLISH
-        .categoryName = _("WOOD GECKO"),
-    #endif
+        .categoryName = LANGUAGE_STRING("WOOD GECKO", "BOIS GECKO", "LEGNOGECO", "GECO BOSQUE"),
         .height = 9,
         .weight = 216,
         .description = gGrovylePokedexText,
@@ -4574,13 +3050,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_SCEPTILE] =
     {
-    #if FRENCH
-        .categoryName = _("FORET"),
-    #elif ITALIAN
-        .categoryName = _("FORESTA"),
-    #else //ENGLISH
-        .categoryName = _("FOREST"),
-    #endif
+        .categoryName = LANGUAGE_STRING("FOREST", "FORET", "FORESTA", "MONTE"),
         .height = 17,
         .weight = 522,
         .description = gSceptilePokedexText,
@@ -4592,13 +3062,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_TORCHIC] =
     {
-    #if FRENCH
-        .categoryName = _("POUSSIN"),
-    #elif ITALIAN
-        .categoryName = _("PULCINO"),
-    #else //ENGLISH
-        .categoryName = _("CHICK"),
-    #endif
+        .categoryName = LANGUAGE_STRING("CHICK", "POUSSIN", "PULCINO", "POLLUELO"),
         .height = 4,
         .weight = 25,
         .description = gTorchicPokedexText,
@@ -4610,13 +3074,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_COMBUSKEN] =
     {
-    #if FRENCH
-        .categoryName = _("POULET"),
-    #elif ITALIAN
-        .categoryName = _("RAMPOLLO"),
-    #else //ENGLISH
-        .categoryName = _("YOUNG FOWL"),
-    #endif
+        .categoryName = LANGUAGE_STRING("YOUNG FOWL", "POULET", "RAMPOLLO", "AVE CORRAL"),
         .height = 9,
         .weight = 195,
         .description = gCombuskenPokedexText,
@@ -4628,13 +3086,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_BLAZIKEN] =
     {
-    #if FRENCH
-        .categoryName = _("ARDENT"),
-    #elif ITALIAN
-        .categoryName = _("VAMPE"),
-    #else //ENGLISH
-        .categoryName = _("BLAZE"),
-    #endif
+        .categoryName = LANGUAGE_STRING("BLAZE", "ARDENT", "VAMPE", "LLAMEANTE"),
         .height = 19,
         .weight = 520,
         .description = gBlazikenPokedexText,
@@ -4646,13 +3098,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_MUDKIP] =
     {
-    #if FRENCH
-        .categoryName = _("POISSONBOUE"),
-    #elif ITALIAN
-        .categoryName = _("FANGO PESCE"),
-    #else //ENGLISH
-        .categoryName = _("MUD FISH"),
-    #endif
+        .categoryName = LANGUAGE_STRING("MUD FISH", "POISSONBOUE", "FANGO PESCE", "PEZ LODO"),
         .height = 4,
         .weight = 76,
         .description = gMudkipPokedexText,
@@ -4664,13 +3110,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_MARSHTOMP] =
     {
-    #if FRENCH
-        .categoryName = _("POISSONBOUE"),
-    #elif ITALIAN
-        .categoryName = _("FANGO PESCE"),
-    #else //ENGLISH
-        .categoryName = _("MUD FISH"),
-    #endif
+        .categoryName = LANGUAGE_STRING("MUD FISH", "POISSONBOUE", "FANGO PESCE", "PEZ LODO"),
         .height = 7,
         .weight = 280,
         .description = gMarshtompPokedexText,
@@ -4682,13 +3122,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_SWAMPERT] =
     {
-    #if FRENCH
-        .categoryName = _("POISSONBOUE"),
-    #elif ITALIAN
-        .categoryName = _("FANGO PESCE"),
-    #else //ENGLISH
-        .categoryName = _("MUD FISH"),
-    #endif
+        .categoryName = LANGUAGE_STRING("MUD FISH", "POISSONBOUE", "FANGO PESCE", "PEZ LODO"),
         .height = 15,
         .weight = 819,
         .description = gSwampertPokedexText,
@@ -4700,13 +3134,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_POOCHYENA] =
     {
-    #if FRENCH
-        .categoryName = _("MORSURE"),
-    #elif ITALIAN
-        .categoryName = _("MORSO"),
-    #else //ENGLISH
-        .categoryName = _("BITE"),
-    #endif
+        .categoryName = LANGUAGE_STRING("BITE", "MORSURE", "MORSO", "MORDISCO"),
         .height = 5,
         .weight = 136,
         .description = gPoochyenaPokedexText,
@@ -4718,13 +3146,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_MIGHTYENA] =
     {
-    #if FRENCH
-        .categoryName = _("MORSURE"),
-    #elif ITALIAN
-        .categoryName = _("MORSO"),
-    #else //ENGLISH
-        .categoryName = _("BITE"),
-    #endif
+        .categoryName = LANGUAGE_STRING("BITE", "MORSURE", "MORSO", "MORDISCO"),
         .height = 10,
         .weight = 370,
         .description = gMightyenaPokedexText,
@@ -4736,13 +3158,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_ZIGZAGOON] =
     {
-    #if FRENCH
-        .categoryName = _("PETIT RATON"),
-    #elif ITALIAN
-        .categoryName = _("PROCIONE"),
-    #else //ENGLISH
-        .categoryName = _("TINYRACCOON"),
-    #endif
+        .categoryName = LANGUAGE_STRING("TINYRACCOON", "PETIT RATON", "PROCIONE", "MAPACHITO"),
         .height = 4,
         .weight = 175,
         .description = gZigzagoonPokedexText,
@@ -4754,13 +3170,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_LINOONE] =
     {
-    #if FRENCH
-        .categoryName = _("FONCEUR"),
-    #elif ITALIAN
-        .categoryName = _("SFRECCIANTE"),
-    #else //ENGLISH
-        .categoryName = _("RUSHING"),
-    #endif
+        .categoryName = LANGUAGE_STRING("RUSHING", "FONCEUR", "SFRECCIANTE", "LANZADO"),
         .height = 5,
         .weight = 325,
         .description = gLinoonePokedexText,
@@ -4772,13 +3182,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_WURMPLE] =
     {
-    #if FRENCH
-        .categoryName = _("VER"),
-    #elif ITALIAN
-        .categoryName = _("BACO"),
-    #else //ENGLISH
-        .categoryName = _("WORM"),
-    #endif
+        .categoryName = LANGUAGE_STRING("WORM", "VER", "BACO", "GUSANO"),
         .height = 3,
         .weight = 36,
         .description = gWurmplePokedexText,
@@ -4790,13 +3194,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_SILCOON] =
     {
-    #if FRENCH
-        .categoryName = _("COCON"),
-    #elif ITALIAN
-        .categoryName = _("BOZZOLO"),
-    #else //ENGLISH
-        .categoryName = _("COCOON"),
-    #endif
+        .categoryName = LANGUAGE_STRING("COCOON", "COCON", "BOZZOLO", "CAPULLO"),
         .height = 6,
         .weight = 100,
         .description = gSilcoonPokedexText,
@@ -4808,13 +3206,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_BEAUTIFLY] =
     {
-    #if FRENCH
-        .categoryName = _("PAPILLON"),
-    #elif ITALIAN
-        .categoryName = _("FARFALLA"),
-    #else //ENGLISH
-        .categoryName = _("BUTTERFLY"),
-    #endif
+        .categoryName = LANGUAGE_STRING("BUTTERFLY", "PAPILLON", "FARFALLA", "MARIPOSA"),
         .height = 10,
         .weight = 284,
         .description = gBeautiflyPokedexText,
@@ -4826,13 +3218,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_CASCOON] =
     {
-    #if FRENCH
-        .categoryName = _("COCON"),
-    #elif ITALIAN
-        .categoryName = _("BOZZOLO"),
-    #else //ENGLISH
-        .categoryName = _("COCOON"),
-    #endif
+        .categoryName = LANGUAGE_STRING("COCOON", "COCON", "BOZZOLO", "CAPULLO"),
         .height = 7,
         .weight = 115,
         .description = gCascoonPokedexText,
@@ -4844,13 +3230,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_DUSTOX] =
     {
-    #if FRENCH
-        .categoryName = _("PAPIPOISON"),
-    #elif ITALIAN
-        .categoryName = _("VELENTARMA"),
-    #else //ENGLISH
-        .categoryName = _("POISON MOTH"),
-    #endif
+        .categoryName = LANGUAGE_STRING("POISON MOTH", "PAPIPOISON", "VELENTARMA", "POLILLA V."),
         .height = 12,
         .weight = 316,
         .description = gDustoxPokedexText,
@@ -4862,13 +3242,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_LOTAD] =
     {
-    #if FRENCH
-        .categoryName = _("AQUAPLANTE"),
-    #elif ITALIAN
-        .categoryName = _("ALGA"),
-    #else //ENGLISH
-        .categoryName = _("WATER WEED"),
-    #endif
+        .categoryName = LANGUAGE_STRING("WATER WEED", "AQUAPLANTE", "ALGA", "ALGA"),
         .height = 5,
         .weight = 26,
         .description = gLotadPokedexText,
@@ -4880,13 +3254,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_LOMBRE] =
     {
-    #if FRENCH
-        .categoryName = _("JOVIAL"),
-    #elif ITALIAN
-        .categoryName = _("GIOCOSO"),
-    #else //ENGLISH
-        .categoryName = _("JOLLY"),
-    #endif
+        .categoryName = LANGUAGE_STRING("JOLLY", "JOVIAL", "GIOCOSO", "ALEGRE"),
         .height = 12,
         .weight = 325,
         .description = gLombrePokedexText,
@@ -4898,13 +3266,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_LUDICOLO] =
     {
-    #if FRENCH
-        .categoryName = _("INSOUCIANT"),
-    #elif ITALIAN
-        .categoryName = _("SPENSIERATO"),
-    #else //ENGLISH
-        .categoryName = _("CAREFREE"),
-    #endif
+        .categoryName = LANGUAGE_STRING("CAREFREE", "INSOUCIANT", "SPENSIERATO", "OPTIMISTA"),
         .height = 15,
         .weight = 550,
         .description = gLudicoloPokedexText,
@@ -4916,13 +3278,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_SEEDOT] =
     {
-    #if FRENCH
-        .categoryName = _("GLAND"),
-    #elif ITALIAN
-        .categoryName = _("GHIANDA"),
-    #else //ENGLISH
-        .categoryName = _("ACORN"),
-    #endif
+        .categoryName = LANGUAGE_STRING("ACORN", "GLAND", "GHIANDA", "BELLOTA"),
         .height = 5,
         .weight = 40,
         .description = gSeedotPokedexText,
@@ -4934,13 +3290,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_NUZLEAF] =
     {
-    #if FRENCH
-        .categoryName = _("MALIN"),
-    #elif ITALIAN
-        .categoryName = _("SCALTRO"),
-    #else //ENGLISH
-        .categoryName = _("WILY"),
-    #endif
+        .categoryName = LANGUAGE_STRING("WILY", "MALIN", "SCALTRO", "ASTUTO"),
         .height = 10,
         .weight = 280,
         .description = gNuzleafPokedexText,
@@ -4952,13 +3302,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_SHIFTRY] =
     {
-    #if FRENCH
-        .categoryName = _("MALVEILLANT"),
-    #elif ITALIAN
-        .categoryName = _("BURBERO"),
-    #else //ENGLISH
-        .categoryName = _("WICKED"),
-    #endif
+        .categoryName = LANGUAGE_STRING("WICKED", "MALVEILLANT", "BURBERO", "MALVADO"),
         .height = 13,
         .weight = 596,
         .description = gShiftryPokedexText,
@@ -4970,13 +3314,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_TAILLOW] =
     {
-    #if FRENCH
-        .categoryName = _("MINIRONDEL"),
-    #elif ITALIAN
-        .categoryName = _("RONDINELLA"),
-    #else //ENGLISH
-        .categoryName = _("TINYSWALLOW"),
-    #endif
+        .categoryName = LANGUAGE_STRING("TINYSWALLOW", "MINIRONDEL", "RONDINELLA", "PEQUEBUCHE"),
         .height = 3,
         .weight = 23,
         .description = gTaillowPokedexText,
@@ -4988,13 +3326,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_SWELLOW] =
     {
-    #if FRENCH
-        .categoryName = _("HIRONDELLE"),
-    #elif ITALIAN
-        .categoryName = _("RONDINE"),
-    #else //ENGLISH
-        .categoryName = _("SWALLOW"),
-    #endif
+        .categoryName = LANGUAGE_STRING("SWALLOW", "HIRONDELLE", "RONDINE", "BUCHE"),
         .height = 7,
         .weight = 198,
         .description = gSwellowPokedexText,
@@ -5006,13 +3338,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_WINGULL] =
     {
-    #if FRENCH
-        .categoryName = _("MOUETTE"),
-    #elif ITALIAN
-        .categoryName = _("GABBIANO"),
-    #else //ENGLISH
-        .categoryName = _("SEAGULL"),
-    #endif
+        .categoryName = LANGUAGE_STRING("SEAGULL", "MOUETTE", "GABBIANO", "GAVIOTA"),
         .height = 6,
         .weight = 95,
         .description = gWingullPokedexText,
@@ -5024,13 +3350,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_PELIPPER] =
     {
-    #if FRENCH
-        .categoryName = _("OISEAUDO"),
-    #elif ITALIAN
-        .categoryName = _("ALACQUATICO"),
-    #else //ENGLISH
-        .categoryName = _("WATER BIRD"),
-    #endif
+        .categoryName = LANGUAGE_STRING("WATER BIRD", "OISEAUDO", "ALACQUATICO", "AVE AGUA"),
         .height = 12,
         .weight = 280,
         .description = gPelipperPokedexText,
@@ -5042,13 +3362,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_RALTS] =
     {
-    #if FRENCH
-        .categoryName = _("SENTIMENT"),
-    #elif ITALIAN
-        .categoryName = _("SENSAZIONE"),
-    #else //ENGLISH
-        .categoryName = _("FEELING"),
-    #endif
+        .categoryName = LANGUAGE_STRING("FEELING", "SENTIMENT", "SENSAZIONE", "SENSIBLE"),
         .height = 4,
         .weight = 66,
         .description = gRaltsPokedexText,
@@ -5060,13 +3374,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_KIRLIA] =
     {
-    #if FRENCH
-        .categoryName = _("EMOTION"),
-    #elif ITALIAN
-        .categoryName = _("EMOZIONE"),
-    #else //ENGLISH
-        .categoryName = _("EMOTION"),
-    #endif
+        .categoryName = LANGUAGE_STRING("EMOTION", "EMOTION", "EMOZIONE", "SENSORIO"),
         .height = 8,
         .weight = 202,
         .description = gKirliaPokedexText,
@@ -5078,13 +3386,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_GARDEVOIR] =
     {
-    #if FRENCH
-        .categoryName = _("ETREINTE"),
-    #elif ITALIAN
-        .categoryName = _("ABBRACCIO"),
-    #else //ENGLISH
-        .categoryName = _("EMBRACE"),
-    #endif
+        .categoryName = LANGUAGE_STRING("EMBRACE", "ETREINTE", "ABBRACCIO", "ENVOLVENTE"),
         .height = 16,
         .weight = 484,
         .description = gGardevoirPokedexText,
@@ -5096,13 +3398,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_SURSKIT] =
     {
-    #if FRENCH
-        .categoryName = _("MARESURFEUR"),
-    #elif ITALIAN
-        .categoryName = _("SFIORAPOZZE"),
-    #else //ENGLISH
-        .categoryName = _("POND SKATER"),
-    #endif
+        .categoryName = LANGUAGE_STRING("POND SKATER", "MARESURFEUR", "SFIORAPOZZE", "ZAPATERO"),
         .height = 5,
         .weight = 17,
         .description = gSurskitPokedexText,
@@ -5114,13 +3410,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_MASQUERAIN] =
     {
-    #if FRENCH
-        .categoryName = _("BOULE OEIL"),
-    #elif ITALIAN
-        .categoryName = _("OCCHI"),
-    #else //ENGLISH
-        .categoryName = _("EYEBALL"),
-    #endif
+        .categoryName = LANGUAGE_STRING("EYEBALL", "BOULE OEIL", "OCCHI", "GLOBOCULAR"),
         .height = 8,
         .weight = 36,
         .description = gMasquerainPokedexText,
@@ -5132,13 +3422,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_SHROOMISH] =
     {
-    #if FRENCH
-        .categoryName = _("CHAMPIGNON"),
-    #elif ITALIAN
-        .categoryName = _("FUNGO"),
-    #else //ENGLISH
-        .categoryName = _("MUSHROOM"),
-    #endif
+        .categoryName = LANGUAGE_STRING("MUSHROOM", "CHAMPIGNON", "FUNGO", "HONGO"),
         .height = 4,
         .weight = 45,
         .description = gShroomishPokedexText,
@@ -5150,13 +3434,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_BRELOOM] =
     {
-    #if FRENCH
-        .categoryName = _("CHAMPIGNON"),
-    #elif ITALIAN
-        .categoryName = _("FUNGO"),
-    #else //ENGLISH
-        .categoryName = _("MUSHROOM"),
-    #endif
+        .categoryName = LANGUAGE_STRING("MUSHROOM", "CHAMPIGNON", "FUNGO", "HONGO"),
         .height = 12,
         .weight = 392,
         .description = gBreloomPokedexText,
@@ -5168,13 +3446,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_SLAKOTH] =
     {
-    #if FRENCH
-        .categoryName = _("FLANEUR"),
-    #elif ITALIAN
-        .categoryName = _("OZIOSO"),
-    #else //ENGLISH
-        .categoryName = _("SLACKER"),
-    #endif
+        .categoryName = LANGUAGE_STRING("SLACKER", "FLANEUR", "OZIOSO", "GANDUL"),
         .height = 8,
         .weight = 240,
         .description = gSlakothPokedexText,
@@ -5186,13 +3458,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_VIGOROTH] =
     {
-    #if FRENCH
-        .categoryName = _("TURBUSINGE"),
-    #elif ITALIAN
-        .categoryName = _("INDOCILE"),
-    #else //ENGLISH
-        .categoryName = _("WILD MONKEY"),
-    #endif
+        .categoryName = LANGUAGE_STRING("WILD MONKEY", "TURBUSINGE", "INDOCILE", "MONO FEROZ"),
         .height = 14,
         .weight = 465,
         .description = gVigorothPokedexText,
@@ -5204,13 +3470,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_SLAKING] =
     {
-    #if FRENCH
-        .categoryName = _("FAINEANT"),
-    #elif ITALIAN
-        .categoryName = _("PIGRIZIA"),
-    #else //ENGLISH
-        .categoryName = _("LAZY"),
-    #endif
+        .categoryName = LANGUAGE_STRING("LAZY", "FAINEANT", "PIGRIZIA", "HOLGAZÁN"),
         .height = 20,
         .weight = 1305,
         .description = gSlakingPokedexText,
@@ -5222,13 +3482,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_NINCADA] =
     {
-    #if FRENCH
-        .categoryName = _("APPRENTI"),
-    #elif ITALIAN
-        .categoryName = _("NOVIZIO"),
-    #else //ENGLISH
-        .categoryName = _("TRAINEE"),
-    #endif
+        .categoryName = LANGUAGE_STRING("TRAINEE", "APPRENTI", "NOVIZIO", "APRENDIZ"),
         .height = 5,
         .weight = 55,
         .description = gNincadaPokedexText,
@@ -5240,13 +3494,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_NINJASK] =
     {
-    #if FRENCH
-        .categoryName = _("NINJA"),
-    #elif ITALIAN
-        .categoryName = _("NINJA"),
-    #else //ENGLISH
-        .categoryName = _("NINJA"),
-    #endif
+        .categoryName = LANGUAGE_STRING("NINJA", "NINJA", "NINJA", "NINJA"),
         .height = 8,
         .weight = 120,
         .description = gNinjaskPokedexText,
@@ -5258,13 +3506,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_SHEDINJA] =
     {
-    #if FRENCH
-        .categoryName = _("EXUVIE"),
-    #elif ITALIAN
-        .categoryName = _("CAMBIAPELLE"),
-    #else //ENGLISH
-        .categoryName = _("SHED"),
-    #endif
+        .categoryName = LANGUAGE_STRING("SHED", "EXUVIE", "CAMBIAPELLE", "MUDA"),
         .height = 8,
         .weight = 12,
         .description = gShedinjaPokedexText,
@@ -5276,13 +3518,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_WHISMUR] =
     {
-    #if FRENCH
-        .categoryName = _("CHUCHOTEUR"),
-    #elif ITALIAN
-        .categoryName = _("SUSSURRO"),
-    #else //ENGLISH
-        .categoryName = _("WHISPER"),
-    #endif
+        .categoryName = LANGUAGE_STRING("WHISPER", "CHUCHOTEUR", "SUSSURRO", "SUSURRO"),
         .height = 6,
         .weight = 163,
         .description = gWhismurPokedexText,
@@ -5294,13 +3530,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_LOUDRED] =
     {
-    #if FRENCH
-        .categoryName = _("GROSSE VOIX"),
-    #elif ITALIAN
-        .categoryName = _("VOCIONE"),
-    #else //ENGLISH
-        .categoryName = _("BIG VOICE"),
-    #endif
+        .categoryName = LANGUAGE_STRING("BIG VOICE", "GROSSE VOIX", "VOCIONE", "CHILLÓN"),
         .height = 10,
         .weight = 405,
         .description = gLoudredPokedexText,
@@ -5312,13 +3542,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_EXPLOUD] =
     {
-    #if FRENCH
-        .categoryName = _("BRUIT SOURD"),
-    #elif ITALIAN
-        .categoryName = _("FRAGORE"),
-    #else //ENGLISH
-        .categoryName = _("LOUD NOISE"),
-    #endif
+        .categoryName = LANGUAGE_STRING("LOUD NOISE", "BRUIT SOURD", "FRAGORE", "ESCANDALOSO"),
         .height = 15,
         .weight = 840,
         .description = gExploudPokedexText,
@@ -5330,13 +3554,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_MAKUHITA] =
     {
-    #if FRENCH
-        .categoryName = _("TENACE"),
-    #elif ITALIAN
-        .categoryName = _("CORAGGIO"),
-    #else //ENGLISH
-        .categoryName = _("GUTS"),
-    #endif
+        .categoryName = LANGUAGE_STRING("GUTS", "TENACE", "CORAGGIO", "VALIENTE"),
         .height = 10,
         .weight = 864,
         .description = gMakuhitaPokedexText,
@@ -5348,13 +3566,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_HARIYAMA] =
     {
-    #if FRENCH
-        .categoryName = _("COGNEUR"),
-    #elif ITALIAN
-        .categoryName = _("SBERLETESE"),
-    #else //ENGLISH
-        .categoryName = _("ARM THRUST"),
-    #endif
+        .categoryName = LANGUAGE_STRING("ARM THRUST", "COGNEUR", "SBERLETESE", "EMPUJE"),
         .height = 23,
         .weight = 2538,
         .description = gHariyamaPokedexText,
@@ -5366,13 +3578,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_AZURILL] =
     {
-    #if FRENCH
-        .categoryName = _("POINT POLKA"),
-    #elif ITALIAN
-        .categoryName = _("POIS"),
-    #else //ENGLISH
-        .categoryName = _("POLKA DOT"),
-    #endif
+        .categoryName = LANGUAGE_STRING("POLKA DOT", "POINT POLKA", "POIS", "A TOPOS"),
         .height = 2,
         .weight = 20,
         .description = gAzurillPokedexText,
@@ -5384,13 +3590,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_NOSEPASS] =
     {
-    #if FRENCH
-        .categoryName = _("BOUSSOLE"),
-    #elif ITALIAN
-        .categoryName = _("BUSSOLA"),
-    #else //ENGLISH
-        .categoryName = _("COMPASS"),
-    #endif
+        .categoryName = LANGUAGE_STRING("COMPASS", "BOUSSOLE", "BUSSOLA", "BRÚJULA"),
         .height = 10,
         .weight = 970,
         .description = gNosepassPokedexText,
@@ -5402,13 +3602,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_SKITTY] =
     {
-    #if FRENCH
-        .categoryName = _("CHATON"),
-    #elif ITALIAN
-        .categoryName = _("MICIO"),
-    #else //ENGLISH
-        .categoryName = _("KITTEN"),
-    #endif
+        .categoryName = LANGUAGE_STRING("KITTEN", "CHATON", "MICIO", "GATITO"),
         .height = 6,
         .weight = 110,
         .description = gSkittyPokedexText,
@@ -5420,13 +3614,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_DELCATTY] =
     {
-    #if FRENCH
-        .categoryName = _("GUINDE"),
-    #elif ITALIAN
-        .categoryName = _("FINEZZA"),
-    #else //ENGLISH
-        .categoryName = _("PRIM"),
-    #endif
+        .categoryName = LANGUAGE_STRING("PRIM", "GUINDE", "FINEZZA", "CURSI"),
         .height = 11,
         .weight = 326,
         .description = gDelcattyPokedexText,
@@ -5438,13 +3626,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_SABLEYE] =
     {
-    #if FRENCH
-        .categoryName = _("OBSCURITE"),
-    #elif ITALIAN
-        .categoryName = _("OSCURITÀ"),
-    #else //ENGLISH
-        .categoryName = _("DARKNESS"),
-    #endif
+        .categoryName = LANGUAGE_STRING("DARKNESS", "OBSCURITE", "OSCURITÀ", "OSCURIDAD"),
         .height = 5,
         .weight = 110,
         .description = gSableyePokedexText,
@@ -5456,13 +3638,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_MAWILE] =
     {
-    #if FRENCH
-        .categoryName = _("TROMPEUR"),
-    #elif ITALIAN
-        .categoryName = _("INGANNO"),
-    #else //ENGLISH
-        .categoryName = _("DECEIVER"),
-    #endif
+        .categoryName = LANGUAGE_STRING("DECEIVER", "TROMPEUR", "INGANNO", "TRAMPOSO"),
         .height = 6,
         .weight = 115,
         .description = gMawilePokedexText,
@@ -5474,13 +3650,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_ARON] =
     {
-    #if FRENCH
-        .categoryName = _("ARMURFER"),
-    #elif ITALIAN
-        .categoryName = _("CORAZZA"),
-    #else //ENGLISH
-        .categoryName = _("IRON ARMOR"),
-    #endif
+        .categoryName = LANGUAGE_STRING("IRON ARMOR", "ARMURFER", "CORAZZA", "COR. FÉRREA"),
         .height = 4,
         .weight = 600,
         .description = gAronPokedexText,
@@ -5492,13 +3662,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_LAIRON] =
     {
-    #if FRENCH
-        .categoryName = _("ARMURFER"),
-    #elif ITALIAN
-        .categoryName = _("CORAZZA"),
-    #else //ENGLISH
-        .categoryName = _("IRON ARMOR"),
-    #endif
+        .categoryName = LANGUAGE_STRING("IRON ARMOR", "ARMURFER", "CORAZZA", "COR. FÉRREA"),
         .height = 9,
         .weight = 1200,
         .description = gLaironPokedexText,
@@ -5510,13 +3674,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_AGGRON] =
     {
-    #if FRENCH
-        .categoryName = _("ARMURFER"),
-    #elif ITALIAN
-        .categoryName = _("CORAZZA"),
-    #else //ENGLISH
-        .categoryName = _("IRON ARMOR"),
-    #endif
+        .categoryName = LANGUAGE_STRING("IRON ARMOR", "ARMURFER", "CORAZZA", "COR. FÉRREA"),
         .height = 21,
         .weight = 3600,
         .description = gAggronPokedexText,
@@ -5528,13 +3686,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_MEDITITE] =
     {
-    #if FRENCH
-        .categoryName = _("MEDITATION"),
-    #elif ITALIAN
-        .categoryName = _("MEDITAZIONE"),
-    #else //ENGLISH
-        .categoryName = _("MEDITATE"),
-    #endif
+        .categoryName = LANGUAGE_STRING("MEDITATE", "MEDITATION", "MEDITAZIONE", "MEDITADOR"),
         .height = 6,
         .weight = 112,
         .description = gMedititePokedexText,
@@ -5546,13 +3698,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_MEDICHAM] =
     {
-    #if FRENCH
-        .categoryName = _("MEDITATION"),
-    #elif ITALIAN
-        .categoryName = _("MEDITAZIONE"),
-    #else //ENGLISH
-        .categoryName = _("MEDITATE"),
-    #endif
+        .categoryName = LANGUAGE_STRING("MEDITATE", "MEDITATION", "MEDITAZIONE", "MEDITADOR"),
         .height = 13,
         .weight = 315,
         .description = gMedichamPokedexText,
@@ -5564,13 +3710,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_ELECTRIKE] =
     {
-    #if FRENCH
-        .categoryName = _("ORAGE"),
-    #elif ITALIAN
-        .categoryName = _("LAMPO"),
-    #else //ENGLISH
-        .categoryName = _("LIGHTNING"),
-    #endif
+        .categoryName = LANGUAGE_STRING("LIGHTNING", "ORAGE", "LAMPO", "CALAMBRE"),
         .height = 6,
         .weight = 152,
         .description = gElectrikePokedexText,
@@ -5582,13 +3722,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_MANECTRIC] =
     {
-    #if FRENCH
-        .categoryName = _("DECHARGE"),
-    #elif ITALIAN
-        .categoryName = _("SCOSSA"),
-    #else //ENGLISH
-        .categoryName = _("DISCHARGE"),
-    #endif
+        .categoryName = LANGUAGE_STRING("DISCHARGE", "DECHARGE", "SCOSSA", "DESCARGA"),
         .height = 15,
         .weight = 402,
         .description = gManectricPokedexText,
@@ -5600,13 +3734,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_PLUSLE] =
     {
-    #if FRENCH
-        .categoryName = _("ACCLAMEUR"),
-    #elif ITALIAN
-        .categoryName = _("INCITAMENTO"),
-    #else //ENGLISH
-        .categoryName = _("CHEERING"),
-    #endif
+        .categoryName = LANGUAGE_STRING("CHEERING", "ACCLAMEUR", "INCITAMENTO", "ÁNIMO"),
         .height = 4,
         .weight = 42,
         .description = gPluslePokedexText,
@@ -5618,13 +3746,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_MINUN] =
     {
-    #if FRENCH
-        .categoryName = _("ACCLAMEUR"),
-    #elif ITALIAN
-        .categoryName = _("INCITAMENTO"),
-    #else //ENGLISH
-        .categoryName = _("CHEERING"),
-    #endif
+        .categoryName = LANGUAGE_STRING("CHEERING", "ACCLAMEUR", "INCITAMENTO", "ÁNIMO"),
         .height = 4,
         .weight = 42,
         .description = gMinunPokedexText,
@@ -5636,13 +3758,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_VOLBEAT] =
     {
-    #if FRENCH
-        .categoryName = _("LUCIOLE"),
-    #elif ITALIAN
-        .categoryName = _("LUCCIOLA"),
-    #else //ENGLISH
-        .categoryName = _("FIREFLY"),
-    #endif
+        .categoryName = LANGUAGE_STRING("FIREFLY", "LUCIOLE", "LUCCIOLA", "LUCIÉRNAGA"),
         .height = 7,
         .weight = 177,
         .description = gVolbeatPokedexText,
@@ -5654,13 +3770,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_ILLUMISE] =
     {
-    #if FRENCH
-        .categoryName = _("LUCIOLE"),
-    #elif ITALIAN
-        .categoryName = _("LUCCIOLA"),
-    #else //ENGLISH
-        .categoryName = _("FIREFLY"),
-    #endif
+        .categoryName = LANGUAGE_STRING("FIREFLY", "LUCIOLE", "LUCCIOLA", "LUCIÉRNAGA"),
         .height = 6,
         .weight = 177,
         .description = gIllumisePokedexText,
@@ -5672,13 +3782,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_ROSELIA] =
     {
-    #if FRENCH
-        .categoryName = _("EPINE"),
-    #elif ITALIAN
-        .categoryName = _("SPINA"),
-    #else //ENGLISH
-        .categoryName = _("THORN"),
-    #endif
+        .categoryName = LANGUAGE_STRING("THORN", "EPINE", "SPINA", "ESPINA"),
         .height = 3,
         .weight = 20,
         .description = gRoseliaPokedexText,
@@ -5690,13 +3794,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_GULPIN] =
     {
-    #if FRENCH
-        .categoryName = _("ESTOMAC"),
-    #elif ITALIAN
-        .categoryName = _("STOMACO"),
-    #else //ENGLISH
-        .categoryName = _("STOMACH"),
-    #endif
+        .categoryName = LANGUAGE_STRING("STOMACH", "ESTOMAC", "STOMACO", "ESTÓMAGO"),
         .height = 4,
         .weight = 103,
         .description = gGulpinPokedexText,
@@ -5708,13 +3806,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_SWALOT] =
     {
-    #if FRENCH
-        .categoryName = _("SAC POISON"),
-    #elif ITALIAN
-        .categoryName = _("VELENOSACCO"),
-    #else //ENGLISH
-        .categoryName = _("POISON BAG"),
-    #endif
+        .categoryName = LANGUAGE_STRING("POISON BAG", "SAC POISON", "VELENOSACCO", "BOLSA VEN."),
         .height = 17,
         .weight = 800,
         .description = gSwalotPokedexText,
@@ -5726,13 +3818,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_CARVANHA] =
     {
-    #if FRENCH
-        .categoryName = _("FEROCE"),
-    #elif ITALIAN
-        .categoryName = _("FEROCE"),
-    #else //ENGLISH
-        .categoryName = _("SAVAGE"),
-    #endif
+        .categoryName = LANGUAGE_STRING("SAVAGE", "FEROCE", "FEROCE", "FEROZ"),
         .height = 8,
         .weight = 208,
         .description = gCarvanhaPokedexText,
@@ -5744,13 +3830,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_SHARPEDO] =
     {
-    #if FRENCH
-        .categoryName = _("BRUTAL"),
-    #elif ITALIAN
-        .categoryName = _("BRUTALE"),
-    #else //ENGLISH
-        .categoryName = _("BRUTAL"),
-    #endif
+        .categoryName = LANGUAGE_STRING("BRUTAL", "BRUTAL", "BRUTALE", "VORAZ"),
         .height = 18,
         .weight = 888,
         .description = gSharpedoPokedexText,
@@ -5762,13 +3842,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_WAILMER] =
     {
-    #if FRENCH
-        .categoryName = _("BALEINBOULE"),
-    #elif ITALIAN
-        .categoryName = _("BALENOTTERO"),
-    #else //ENGLISH
-        .categoryName = _("BALL WHALE"),
-    #endif
+        .categoryName = LANGUAGE_STRING("BALL WHALE", "BALEINBOULE", "BALENOTTERO", "BALLENABOLA"),
         .height = 20,
         .weight = 1300,
         .description = gWailmerPokedexText,
@@ -5780,13 +3854,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_WAILORD] =
     {
-    #if FRENCH
-        .categoryName = _("CACHABOUEE"),
-    #elif ITALIAN
-        .categoryName = _("MEGABALENA"),
-    #else //ENGLISH
-        .categoryName = _("FLOAT WHALE"),
-    #endif
+        .categoryName = LANGUAGE_STRING("FLOAT WHALE", "CACHABOUEE", "MEGABALENA", "BALLENAFLOT"),
         .height = 145,
         .weight = 3980,
         .description = gWailordPokedexText,
@@ -5798,13 +3866,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_NUMEL] =
     {
-    #if FRENCH
-        .categoryName = _("ENGOURDI"),
-    #elif ITALIAN
-        .categoryName = _("TORPORE"),
-    #else //ENGLISH
-        .categoryName = _("NUMB"),
-    #endif
+        .categoryName = LANGUAGE_STRING("NUMB", "ENGOURDI", "TORPORE", "TORPE"),
         .height = 7,
         .weight = 240,
         .description = gNumelPokedexText,
@@ -5816,13 +3878,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_CAMERUPT] =
     {
-    #if FRENCH
-        .categoryName = _("ERUPTION"),
-    #elif ITALIAN
-        .categoryName = _("ERUZIONE"),
-    #else //ENGLISH
-        .categoryName = _("ERUPTION"),
-    #endif
+        .categoryName = LANGUAGE_STRING("ERUPTION", "ERUPTION", "ERUZIONE", "ERUPCIÓN"),
         .height = 19,
         .weight = 2200,
         .description = gCameruptPokedexText,
@@ -5834,13 +3890,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_TORKOAL] =
     {
-    #if FRENCH
-        .categoryName = _("CHARBON"),
-    #elif ITALIAN
-        .categoryName = _("CARBONE"),
-    #else //ENGLISH
-        .categoryName = _("COAL"),
-    #endif
+        .categoryName = LANGUAGE_STRING("COAL", "CHARBON", "CARBONE", "CARBÓN"),
         .height = 5,
         .weight = 804,
         .description = gTorkoalPokedexText,
@@ -5852,13 +3902,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_SPOINK] =
     {
-    #if FRENCH
-        .categoryName = _("REBOND"),
-    #elif ITALIAN
-        .categoryName = _("MOLLA"),
-    #else //ENGLISH
-        .categoryName = _("BOUNCE"),
-    #endif
+        .categoryName = LANGUAGE_STRING("BOUNCE", "REBOND", "MOLLA", "SALTARÍN"),
         .height = 7,
         .weight = 306,
         .description = gSpoinkPokedexText,
@@ -5870,13 +3914,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_GRUMPIG] =
     {
-    #if FRENCH
-        .categoryName = _("MAGOUILLEUR"),
-    #elif ITALIAN
-        .categoryName = _("RAGGIRO"),
-    #else //ENGLISH
-        .categoryName = _("MANIPULATE"),
-    #endif
+        .categoryName = LANGUAGE_STRING("MANIPULATE", "MAGOUILLEUR", "RAGGIRO", "MANIPULADOR"),
         .height = 9,
         .weight = 715,
         .description = gGrumpigPokedexText,
@@ -5888,13 +3926,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_SPINDA] =
     {
-    #if FRENCH
-        .categoryName = _("PANDA TACHE"),
-    #elif ITALIAN
-        .categoryName = _("MACCHIPANDA"),
-    #else //ENGLISH
-        .categoryName = _("SPOT PANDA"),
-    #endif
+        .categoryName = LANGUAGE_STRING("SPOT PANDA", "PANDA TACHE", "MACCHIPANDA", "PANDA TOPOS"),
         .height = 11,
         .weight = 50,
         .description = gSpindaPokedexText,
@@ -5906,13 +3938,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_TRAPINCH] =
     {
-    #if FRENCH
-        .categoryName = _("PIEGEUR"),
-    #elif ITALIAN
-        .categoryName = _("TRAPPOLA"),
-    #else //ENGLISH
-        .categoryName = _("ANT PIT"),
-    #endif
+        .categoryName = LANGUAGE_STRING("ANT PIT", "PIEGEUR", "TRAPPOLA", "HORMIGALEÓN"),
         .height = 7,
         .weight = 150,
         .description = gTrapinchPokedexText,
@@ -5924,13 +3950,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_VIBRAVA] =
     {
-    #if FRENCH
-        .categoryName = _("VIBRATION"),
-    #elif ITALIAN
-        .categoryName = _("VIBRAZIONE"),
-    #else //ENGLISH
-        .categoryName = _("VIBRATION"),
-    #endif
+        .categoryName = LANGUAGE_STRING("VIBRATION", "VIBRATION", "VIBRAZIONE", "VIBRANTE"),
         .height = 11,
         .weight = 153,
         .description = gVibravaPokedexText,
@@ -5942,13 +3962,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_FLYGON] =
     {
-    #if FRENCH
-        .categoryName = _("MYSTIQUE"),
-    #elif ITALIAN
-        .categoryName = _("MAGICO"),
-    #else //ENGLISH
-        .categoryName = _("MYSTIC"),
-    #endif
+        .categoryName = LANGUAGE_STRING("MYSTIC", "MYSTIQUE", "MAGICO", "MÍSTICO"),
         .height = 20,
         .weight = 820,
         .description = gFlygonPokedexText,
@@ -5960,13 +3974,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_CACNEA] =
     {
-    #if FRENCH
-        .categoryName = _("CACTUS"),
-    #elif ITALIAN
-        .categoryName = _("CACTUS"),
-    #else //ENGLISH
-        .categoryName = _("CACTUS"),
-    #endif
+        .categoryName = LANGUAGE_STRING("CACTUS", "CACTUS", "CACTUS", "CACTUS"),
         .height = 4,
         .weight = 513,
         .description = gCacneaPokedexText,
@@ -5978,13 +3986,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_CACTURNE] =
     {
-    #if FRENCH
-        .categoryName = _("EPOUVANTAIL"),
-    #elif ITALIAN
-        .categoryName = _("SPAVENTO"),
-    #else //ENGLISH
-        .categoryName = _("SCARECROW"),
-    #endif
+        .categoryName = LANGUAGE_STRING("SCARECROW", "EPOUVANTAIL", "SPAVENTO", "ESPANTAJO"),
         .height = 13,
         .weight = 774,
         .description = gCacturnePokedexText,
@@ -5996,13 +3998,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_SWABLU] =
     {
-    #if FRENCH
-        .categoryName = _("OISEAUCOTON"),
-    #elif ITALIAN
-        .categoryName = _("ALIDICOTONE"),
-    #else //ENGLISH
-        .categoryName = _("COTTON BIRD"),
-    #endif
+        .categoryName = LANGUAGE_STRING("COTTON BIRD", "OISEAUCOTON", "ALIDICOTONE", "AVE ALGODÓN"),
         .height = 4,
         .weight = 12,
         .description = gSwabluPokedexText,
@@ -6014,13 +4010,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_ALTARIA] =
     {
-    #if FRENCH
-        .categoryName = _("VIREVOLTEUR"),
-    #elif ITALIAN
-        .categoryName = _("CANTERINO"),
-    #else //ENGLISH
-        .categoryName = _("HUMMING"),
-    #endif
+        .categoryName = LANGUAGE_STRING("HUMMING", "VIREVOLTEUR", "CANTERINO", "CANTOR"),
         .height = 11,
         .weight = 206,
         .description = gAltariaPokedexText,
@@ -6032,13 +4022,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_ZANGOOSE] =
     {
-    #if FRENCH
-        .categoryName = _("CHAT FURET"),
-    #elif ITALIAN
-        .categoryName = _("FUROGATTO"),
-    #else //ENGLISH
-        .categoryName = _("CAT FERRET"),
-    #endif
+        .categoryName = LANGUAGE_STRING("CAT FERRET", "CHAT FURET", "FUROGATTO", "GATO HURÓN"),
         .height = 13,
         .weight = 403,
         .description = gZangoosePokedexText,
@@ -6050,13 +4034,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_SEVIPER] =
     {
-    #if FRENCH
-        .categoryName = _("SERPACROC"),
-    #elif ITALIAN
-        .categoryName = _("ZANNASERPE"),
-    #else //ENGLISH
-        .categoryName = _("FANG SNAKE"),
-    #endif
+        .categoryName = LANGUAGE_STRING("FANG SNAKE", "SERPACROC", "ZANNASERPE", "COLMILLOS"),
         .height = 27,
         .weight = 525,
         .description = gSeviperPokedexText,
@@ -6068,13 +4046,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_LUNATONE] =
     {
-    #if FRENCH
-        .categoryName = _("METEORITE"),
-    #elif ITALIAN
-        .categoryName = _("METEORITE"),
-    #else //ENGLISH
-        .categoryName = _("METEORITE"),
-    #endif
+        .categoryName = LANGUAGE_STRING("METEORITE", "METEORITE", "METEORITE", "METEORITO"),
         .height = 10,
         .weight = 1680,
         .description = gLunatonePokedexText,
@@ -6086,13 +4058,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_SOLROCK] =
     {
-    #if FRENCH
-        .categoryName = _("METEORITE"),
-    #elif ITALIAN
-        .categoryName = _("METEORITE"),
-    #else //ENGLISH
-        .categoryName = _("METEORITE"),
-    #endif
+        .categoryName = LANGUAGE_STRING("METEORITE", "METEORITE", "METEORITE", "METEORITO"),
         .height = 12,
         .weight = 1540,
         .description = gSolrockPokedexText,
@@ -6104,13 +4070,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_BARBOACH] =
     {
-    #if FRENCH
-        .categoryName = _("BARBILLON"),
-    #elif ITALIAN
-        .categoryName = _("BAFFETTI"),
-    #else //ENGLISH
-        .categoryName = _("WHISKERS"),
-    #endif
+        .categoryName = LANGUAGE_STRING("WHISKERS", "BARBILLON", "BAFFETTI", "BIGOTUDO"),
         .height = 4,
         .weight = 19,
         .description = gBarboachPokedexText,
@@ -6122,13 +4082,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_WHISCASH] =
     {
-    #if FRENCH
-        .categoryName = _("BARBILLON"),
-    #elif ITALIAN
-        .categoryName = _("BAFFETTI"),
-    #else //ENGLISH
-        .categoryName = _("WHISKERS"),
-    #endif
+        .categoryName = LANGUAGE_STRING("WHISKERS", "BARBILLON", "BAFFETTI", "BIGOTUDO"),
         .height = 9,
         .weight = 236,
         .description = gWhiscashPokedexText,
@@ -6140,13 +4094,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_CORPHISH] =
     {
-    #if FRENCH
-        .categoryName = _("BRUTE"),
-    #elif ITALIAN
-        .categoryName = _("BIRBONE"),
-    #else //ENGLISH
-        .categoryName = _("RUFFIAN"),
-    #endif
+        .categoryName = LANGUAGE_STRING("RUFFIAN", "BRUTE", "BIRBONE", "RUFIÁN"),
         .height = 6,
         .weight = 115,
         .description = gCorphishPokedexText,
@@ -6158,13 +4106,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_CRAWDAUNT] =
     {
-    #if FRENCH
-        .categoryName = _("CRAPULE"),
-    #elif ITALIAN
-        .categoryName = _("CANAGLIA"),
-    #else //ENGLISH
-        .categoryName = _("ROGUE"),
-    #endif
+        .categoryName = LANGUAGE_STRING("ROGUE", "CRAPULE", "CANAGLIA", "GRANUJA"),
         .height = 11,
         .weight = 328,
         .description = gCrawdauntPokedexText,
@@ -6176,13 +4118,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_BALTOY] =
     {
-    #if FRENCH
-        .categoryName = _("POUPARGILE"),
-    #elif ITALIAN
-        .categoryName = _("ARGILLA"),
-    #else //ENGLISH
-        .categoryName = _("CLAY DOLL"),
-    #endif
+        .categoryName = LANGUAGE_STRING("CLAY DOLL", "POUPARGILE", "ARGILLA", "MUÑ. BARRO"),
         .height = 5,
         .weight = 215,
         .description = gBaltoyPokedexText,
@@ -6194,13 +4130,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_CLAYDOL] =
     {
-    #if FRENCH
-        .categoryName = _("POUPARGILE"),
-    #elif ITALIAN
-        .categoryName = _("ARGILLA"),
-    #else //ENGLISH
-        .categoryName = _("CLAY DOLL"),
-    #endif
+        .categoryName = LANGUAGE_STRING("CLAY DOLL", "POUPARGILE", "ARGILLA", "MUÑ. BARRO"),
         .height = 15,
         .weight = 1080,
         .description = gClaydolPokedexText,
@@ -6212,13 +4142,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_LILEEP] =
     {
-    #if FRENCH
-        .categoryName = _("LIS D'EAU"),
-    #elif ITALIAN
-        .categoryName = _("FIORDIMARE"),
-    #else //ENGLISH
-        .categoryName = _("SEA LILY"),
-    #endif
+        .categoryName = LANGUAGE_STRING("SEA LILY", "LIS D'EAU", "FIORDIMARE", "LILA MAR"),
         .height = 10,
         .weight = 238,
         .description = gLileepPokedexText,
@@ -6230,13 +4154,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_CRADILY] =
     {
-    #if FRENCH
-        .categoryName = _("BERNACLE"),
-    #elif ITALIAN
-        .categoryName = _("LEPADE"),
-    #else //ENGLISH
-        .categoryName = _("BARNACLE"),
-    #endif
+        .categoryName = LANGUAGE_STRING("BARNACLE", "BERNACLE", "LEPADE", "PERCEBE"),
         .height = 15,
         .weight = 604,
         .description = gCradilyPokedexText,
@@ -6248,13 +4166,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_ANORITH] =
     {
-    #if FRENCH
-        .categoryName = _("CRUSTAGE"),
-    #elif ITALIAN
-        .categoryName = _("PRIMACEO"),
-    #else //ENGLISH
-        .categoryName = _("OLD SHRIMP"),
-    #endif
+        .categoryName = LANGUAGE_STRING("OLD SHRIMP", "CRUSTAGE", "PRIMACEO", "CAMARÓN"),
         .height = 7,
         .weight = 125,
         .description = gAnorithPokedexText,
@@ -6266,13 +4178,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_ARMALDO] =
     {
-    #if FRENCH
-        .categoryName = _("BLINDAGE"),
-    #elif ITALIAN
-        .categoryName = _("PIASTRE"),
-    #else //ENGLISH
-        .categoryName = _("PLATE"),
-    #endif
+        .categoryName = LANGUAGE_STRING("PLATE", "BLINDAGE", "PIASTRE", "ARMADURA"),
         .height = 15,
         .weight = 682,
         .description = gArmaldoPokedexText,
@@ -6284,13 +4190,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_FEEBAS] =
     {
-    #if FRENCH
-        .categoryName = _("POISSON"),
-    #elif ITALIAN
-        .categoryName = _("PESCE"),
-    #else //ENGLISH
-        .categoryName = _("FISH"),
-    #endif
+        .categoryName = LANGUAGE_STRING("FISH", "POISSON", "PESCE", "PEZ"),
         .height = 6,
         .weight = 74,
         .description = gFeebasPokedexText,
@@ -6302,13 +4202,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_MILOTIC] =
     {
-    #if FRENCH
-        .categoryName = _("TENDRE"),
-    #elif ITALIAN
-        .categoryName = _("TENEREZZA"),
-    #else //ENGLISH
-        .categoryName = _("TENDER"),
-    #endif
+        .categoryName = LANGUAGE_STRING("TENDER", "TENDRE", "TENEREZZA", "TIERNO"),
         .height = 62,
         .weight = 1620,
         .description = gMiloticPokedexText,
@@ -6320,13 +4214,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_CASTFORM] =
     {
-    #if FRENCH
-        .categoryName = _("CLIMAT"),
-    #elif ITALIAN
-        .categoryName = _("METEO"),
-    #else //ENGLISH
-        .categoryName = _("WEATHER"),
-    #endif
+        .categoryName = LANGUAGE_STRING("WEATHER", "CLIMAT", "METEO", "CLIMA"),
         .height = 3,
         .weight = 8,
         .description = gCastformPokedexText,
@@ -6338,13 +4226,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_KECLEON] =
     {
-    #if FRENCH
-        .categoryName = _("MULTICOLOR"),
-    #elif ITALIAN
-        .categoryName = _("MUTACOLORE"),
-    #else //ENGLISH
-        .categoryName = _("COLOR SWAP"),
-    #endif
+        .categoryName = LANGUAGE_STRING("COLOR SWAP", "MULTICOLOR", "MUTACOLORE", "CAMALEÓNICO"),
         .height = 10,
         .weight = 220,
         .description = gKecleonPokedexText,
@@ -6356,13 +4238,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_SHUPPET] =
     {
-    #if FRENCH
-        .categoryName = _("POUPEE"),
-    #elif ITALIAN
-        .categoryName = _("PUPAZZO"),
-    #else //ENGLISH
-        .categoryName = _("PUPPET"),
-    #endif
+        .categoryName = LANGUAGE_STRING("PUPPET", "POUPEE", "PUPAZZO", "TÍTERE"),
         .height = 6,
         .weight = 23,
         .description = gShuppetPokedexText,
@@ -6374,13 +4250,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_BANETTE] =
     {
-    #if FRENCH
-        .categoryName = _("MARIONETTE"),
-    #elif ITALIAN
-        .categoryName = _("MARIONETTA"),
-    #else //ENGLISH
-        .categoryName = _("MARIONETTE"),
-    #endif
+        .categoryName = LANGUAGE_STRING("MARIONETTE", "MARIONETTE", "MARIONETTA", "MARIONETA"),
         .height = 11,
         .weight = 125,
         .description = gBanettePokedexText,
@@ -6392,13 +4262,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_DUSKULL] =
     {
-    #if FRENCH
-        .categoryName = _("REQUIEM"),
-    #elif ITALIAN
-        .categoryName = _("REQUIEM"),
-    #else //ENGLISH
-        .categoryName = _("REQUIEM"),
-    #endif
+        .categoryName = LANGUAGE_STRING("REQUIEM", "REQUIEM", "REQUIEM", "RÉQUIEM"),
         .height = 8,
         .weight = 150,
         .description = gDuskullPokedexText,
@@ -6410,13 +4274,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_DUSCLOPS] =
     {
-    #if FRENCH
-        .categoryName = _("APPEL"),
-    #elif ITALIAN
-        .categoryName = _("IPNOSGUARDO"),
-    #else //ENGLISH
-        .categoryName = _("BECKON"),
-    #endif
+        .categoryName = LANGUAGE_STRING("BECKON", "APPEL", "IPNOSGUARDO", "ATRAYENTE"),
         .height = 16,
         .weight = 306,
         .description = gDusclopsPokedexText,
@@ -6428,13 +4286,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_TROPIUS] =
     {
-    #if FRENCH
-        .categoryName = _("FRUIT"),
-    #elif ITALIAN
-        .categoryName = _("FRUTTO"),
-    #else //ENGLISH
-        .categoryName = _("FRUIT"),
-    #endif
+        .categoryName = LANGUAGE_STRING("FRUIT", "FRUIT", "FRUTTO", "FRUTO"),
         .height = 20,
         .weight = 1000,
         .description = gTropiusPokedexText,
@@ -6446,13 +4298,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_CHIMECHO] =
     {
-    #if FRENCH
-        .categoryName = _("CARILLON"),
-    #elif ITALIAN
-        .categoryName = _("VENCAMPANA"),
-    #else //ENGLISH
-        .categoryName = _("WIND CHIME"),
-    #endif
+        .categoryName = LANGUAGE_STRING("WIND CHIME", "CARILLON", "VENCAMPANA", "SONIDO AIRE"),
         .height = 6,
         .weight = 10,
         .description = gChimechoPokedexText,
@@ -6464,13 +4310,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_ABSOL] =
     {
-    #if FRENCH
-        .categoryName = _("DESASTRE"),
-    #elif ITALIAN
-        .categoryName = _("CATASTROFE"),
-    #else //ENGLISH
-        .categoryName = _("DISASTER"),
-    #endif
+        .categoryName = LANGUAGE_STRING("DISASTER", "DESASTRE", "CATASTROFE", "CATÁSTROFE"),
         .height = 12,
         .weight = 470,
         .description = gAbsolPokedexText,
@@ -6482,13 +4322,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_WYNAUT] =
     {
-    #if FRENCH
-        .categoryName = _("RAVI"),
-    #elif ITALIAN
-        .categoryName = _("BRILLANTE"),
-    #else //ENGLISH
-        .categoryName = _("BRIGHT"),
-    #endif
+        .categoryName = LANGUAGE_STRING("BRIGHT", "RAVI", "BRILLANTE", "RADIANTE"),
         .height = 6,
         .weight = 140,
         .description = gWynautPokedexText,
@@ -6500,13 +4334,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_SNORUNT] =
     {
-    #if FRENCH
-        .categoryName = _("CAPUCHE"),
-    #elif ITALIAN
-        .categoryName = _("CAPPELNEVE"),
-    #else //ENGLISH
-        .categoryName = _("SNOW HAT"),
-    #endif
+        .categoryName = LANGUAGE_STRING("SNOW HAT", "CAPUCHE", "CAPPELNEVE", "GORRO NIEVE"),
         .height = 7,
         .weight = 168,
         .description = gSnoruntPokedexText,
@@ -6518,13 +4346,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_GLALIE] =
     {
-    #if FRENCH
-        .categoryName = _("FACE"),
-    #elif ITALIAN
-        .categoryName = _("TUTTOMUSO"),
-    #else //ENGLISH
-        .categoryName = _("FACE"),
-    #endif
+        .categoryName = LANGUAGE_STRING("FACE", "FACE", "TUTTOMUSO", "CARA"),
         .height = 15,
         .weight = 2565,
         .description = gGlaliePokedexText,
@@ -6536,13 +4358,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_SPHEAL] =
     {
-    #if FRENCH
-        .categoryName = _("CLAP CLAP"),
-    #elif ITALIAN
-        .categoryName = _("ROTOLANTE"),
-    #else //ENGLISH
-        .categoryName = _("CLAP"),
-    #endif
+        .categoryName = LANGUAGE_STRING("CLAP", "CLAP CLAP", "ROTOLANTE", "APLAUSO"),
         .height = 8,
         .weight = 395,
         .description = gSphealPokedexText,
@@ -6554,13 +4370,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_SEALEO] =
     {
-    #if FRENCH
-        .categoryName = _("ROULE BOULE"),
-    #elif ITALIAN
-        .categoryName = _("ROTAPALLA"),
-    #else //ENGLISH
-        .categoryName = _("BALL ROLL"),
-    #endif
+        .categoryName = LANGUAGE_STRING("BALL ROLL", "ROULE BOULE", "ROTAPALLA", "RODABOLA"),
         .height = 11,
         .weight = 876,
         .description = gSealeoPokedexText,
@@ -6572,13 +4382,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_WALREIN] =
     {
-    #if FRENCH
-        .categoryName = _("BRISE GLACE"),
-    #elif ITALIAN
-        .categoryName = _("SPACCAGELO"),
-    #else //ENGLISH
-        .categoryName = _("ICE BREAK"),
-    #endif
+        .categoryName = LANGUAGE_STRING("ICE BREAK", "BRISE GLACE", "SPACCAGELO", "ROMPEHIELO"),
         .height = 14,
         .weight = 1506,
         .description = gWalreinPokedexText,
@@ -6590,13 +4394,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_CLAMPERL] =
     {
-    #if FRENCH
-        .categoryName = _("BIVALVE"),
-    #elif ITALIAN
-        .categoryName = _("BIVALVE"),
-    #else //ENGLISH
-        .categoryName = _("BIVALVE"),
-    #endif
+        .categoryName = LANGUAGE_STRING("BIVALVE", "BIVALVE", "BIVALVE", "BIVALVO"),
         .height = 4,
         .weight = 525,
         .description = gClamperlPokedexText,
@@ -6608,13 +4406,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_HUNTAIL] =
     {
-    #if FRENCH
-        .categoryName = _("ABYSSE"),
-    #elif ITALIAN
-        .categoryName = _("ABISSI"),
-    #else //ENGLISH
-        .categoryName = _("DEEP SEA"),
-    #endif
+        .categoryName = LANGUAGE_STRING("DEEP SEA", "ABYSSE", "ABISSI", "ABISAL"),
         .height = 17,
         .weight = 270,
         .description = gHuntailPokedexText,
@@ -6626,13 +4418,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_GOREBYSS] =
     {
-    #if FRENCH
-        .categoryName = _("MER DU SUD"),
-    #elif ITALIAN
-        .categoryName = _("SUDMARINO"),
-    #else //ENGLISH
-        .categoryName = _("SOUTH SEA"),
-    #endif
+        .categoryName = LANGUAGE_STRING("SOUTH SEA", "MER DU SUD", "SUDMARINO", "MAR DEL SUR"),
         .height = 18,
         .weight = 226,
         .description = gGorebyssPokedexText,
@@ -6644,13 +4430,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_RELICANTH] =
     {
-    #if FRENCH
-        .categoryName = _("LONGEVITE"),
-    #elif ITALIAN
-        .categoryName = _("LONGEVITÀ"),
-    #else //ENGLISH
-        .categoryName = _("LONGEVITY"),
-    #endif
+        .categoryName = LANGUAGE_STRING("LONGEVITY", "LONGEVITE", "LONGEVITÀ", "LONGEVO"),
         .height = 10,
         .weight = 234,
         .description = gRelicanthPokedexText,
@@ -6662,13 +4442,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_LUVDISC] =
     {
-    #if FRENCH
-        .categoryName = _("RENDEZVOUS"),
-    #elif ITALIAN
-        .categoryName = _("RENDEZVOUS"),
-    #else //ENGLISH
-        .categoryName = _("RENDEZVOUS"),
-    #endif
+        .categoryName = LANGUAGE_STRING("RENDEZVOUS", "RENDEZVOUS", "RENDEZVOUS", "CITA"),
         .height = 6,
         .weight = 87,
         .description = gLuvdiscPokedexText,
@@ -6680,13 +4454,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_BAGON] =
     {
-    #if FRENCH
-        .categoryName = _("TETE DE ROC"),
-    #elif ITALIAN
-        .categoryName = _("ROCCIOTESTA"),
-    #else //ENGLISH
-        .categoryName = _("ROCK HEAD"),
-    #endif
+        .categoryName = LANGUAGE_STRING("ROCK HEAD", "TETE DE ROC", "ROCCIOTESTA", "CABEZA ROCA"),
         .height = 6,
         .weight = 421,
         .description = gBagonPokedexText,
@@ -6698,13 +4466,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_SHELGON] =
     {
-    #if FRENCH
-        .categoryName = _("ENDURANT"),
-    #elif ITALIAN
-        .categoryName = _("RESISTENZA"),
-    #else //ENGLISH
-        .categoryName = _("ENDURANCE"),
-    #endif
+        .categoryName = LANGUAGE_STRING("ENDURANCE", "ENDURANT", "RESISTENZA", "RESISTENCIA"),
         .height = 11,
         .weight = 1105,
         .description = gShelgonPokedexText,
@@ -6716,13 +4478,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_SALAMENCE] =
     {
-    #if FRENCH
-        .categoryName = _("DRAGON"),
-    #elif ITALIAN
-        .categoryName = _("DRAGO"),
-    #else //ENGLISH
-        .categoryName = _("DRAGON"),
-    #endif
+        .categoryName = LANGUAGE_STRING("DRAGON", "DRAGON", "DRAGO", "DRAGÓN"),
         .height = 15,
         .weight = 1026,
         .description = gSalamencePokedexText,
@@ -6734,13 +4490,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_BELDUM] =
     {
-    #if FRENCH
-        .categoryName = _("BOULEFER"),
-    #elif ITALIAN
-        .categoryName = _("FERROSFERA"),
-    #else //ENGLISH
-        .categoryName = _("IRON BALL"),
-    #endif
+        .categoryName = LANGUAGE_STRING("IRON BALL", "BOULEFER", "FERROSFERA", "BOLA HIERRO"),
         .height = 6,
         .weight = 952,
         .description = gBeldumPokedexText,
@@ -6752,13 +4502,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_METANG] =
     {
-    #if FRENCH
-        .categoryName = _("PINCEFER"),
-    #elif ITALIAN
-        .categoryName = _("FERRUNGHIA"),
-    #else //ENGLISH
-        .categoryName = _("IRON CLAW"),
-    #endif
+        .categoryName = LANGUAGE_STRING("IRON CLAW", "PINCEFER", "FERRUNGHIA", "GARRAHIERRO"),
         .height = 12,
         .weight = 2025,
         .description = gMetangPokedexText,
@@ -6770,13 +4514,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_METAGROSS] =
     {
-    #if FRENCH
-        .categoryName = _("PATTEFER"),
-    #elif ITALIAN
-        .categoryName = _("FERRARTO"),
-    #else //ENGLISH
-        .categoryName = _("IRON LEG"),
-    #endif
+        .categoryName = LANGUAGE_STRING("IRON LEG", "PATTEFER", "FERRARTO", "PATA HIERRO"),
         .height = 16,
         .weight = 5500,
         .description = gMetagrossPokedexText,
@@ -6788,13 +4526,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_REGIROCK] =
     {
-    #if FRENCH
-        .categoryName = _("PIC ROCHEUX"),
-    #elif ITALIAN
-        .categoryName = _("PICCO"),
-    #else //ENGLISH
-        .categoryName = _("ROCK PEAK"),
-    #endif
+        .categoryName = LANGUAGE_STRING("ROCK PEAK", "PIC ROCHEUX", "PICCO", "PICO ROCA"),
         .height = 17,
         .weight = 2300,
         .description = gRegirockPokedexText,
@@ -6806,13 +4538,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_REGICE] =
     {
-    #if FRENCH
-        .categoryName = _("ICEBERG"),
-    #elif ITALIAN
-        .categoryName = _("ICEBERG"),
-    #else //ENGLISH
-        .categoryName = _("ICEBERG"),
-    #endif
+        .categoryName = LANGUAGE_STRING("ICEBERG", "ICEBERG", "ICEBERG", "ICEBERG"),
         .height = 18,
         .weight = 1750,
         .description = gRegicePokedexText,
@@ -6824,13 +4550,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_REGISTEEL] =
     {
-    #if FRENCH
-        .categoryName = _("FER"),
-    #elif ITALIAN
-        .categoryName = _("FERRO"),
-    #else //ENGLISH
-        .categoryName = _("IRON"),
-    #endif
+        .categoryName = LANGUAGE_STRING("IRON", "FER", "FERRO", "HIERRO"),
         .height = 19,
         .weight = 2050,
         .description = gRegisteelPokedexText,
@@ -6842,13 +4562,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_LATIAS] =
     {
-    #if FRENCH
-        .categoryName = _("EON"),
-    #elif ITALIAN
-        .categoryName = _("EONE"),
-    #else //ENGLISH
-        .categoryName = _("EON"),
-    #endif
+        .categoryName = LANGUAGE_STRING("EON", "EON", "EONE", "EÓN"),
         .height = 14,
         .weight = 400,
         .description = gLatiasPokedexText,
@@ -6860,13 +4574,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_LATIOS] =
     {
-    #if FRENCH
-        .categoryName = _("EON"),
-    #elif ITALIAN
-        .categoryName = _("EONE"),
-    #else //ENGLISH
-        .categoryName = _("EON"),
-    #endif
+        .categoryName = LANGUAGE_STRING("EON", "EON", "EONE", "EÓN"),
         .height = 20,
         .weight = 600,
         .description = gLatiosPokedexText,
@@ -6878,13 +4586,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_KYOGRE] =
     {
-    #if FRENCH
-        .categoryName = _("BASSINMARIN"),
-    #elif ITALIAN
-        .categoryName = _("OCEANO"),
-    #else //ENGLISH
-        .categoryName = _("SEA BASIN"),
-    #endif
+        .categoryName = LANGUAGE_STRING("SEA BASIN", "BASSINMARIN", "OCEANO", "CUENCA MAR"),
         .height = 45,
         .weight = 3520,
         .description = gKyogrePokedexText,
@@ -6896,13 +4598,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_GROUDON] =
     {
-    #if FRENCH
-        .categoryName = _("CONTINENT"),
-    #elif ITALIAN
-        .categoryName = _("CONTINENTE"),
-    #else //ENGLISH
-        .categoryName = _("CONTINENT"),
-    #endif
+        .categoryName = LANGUAGE_STRING("CONTINENT", "CONTINENT", "CONTINENTE", "CONTINENTE"),
         .height = 35,
         .weight = 9500,
         .description = gGroudonPokedexText,
@@ -6914,13 +4610,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_RAYQUAZA] =
     {
-    #if FRENCH
-        .categoryName = _("CIEUX"),
-    #elif ITALIAN
-        .categoryName = _("STRATOSFERA"),
-    #else //ENGLISH
-        .categoryName = _("SKY HIGH"),
-    #endif
+        .categoryName = LANGUAGE_STRING("SKY HIGH", "CIEUX", "STRATOSFERA", "CIELO"),
         .height = 70,
         .weight = 2065,
         .description = gRayquazaPokedexText,
@@ -6932,13 +4622,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_JIRACHI] =
     {
-    #if FRENCH
-        .categoryName = _("SOUHAIT"),
-    #elif ITALIAN
-        .categoryName = _("DESIDERIO"),
-    #else //ENGLISH
-        .categoryName = _("WISH"),
-    #endif
+        .categoryName = LANGUAGE_STRING("WISH", "SOUHAIT", "DESIDERIO", "DESEO"),
         .height = 3,
         .weight = 11,
         .description = gJirachiPokedexText,
@@ -6950,13 +4634,7 @@ const struct PokedexEntry gPokedexEntries[] =
 
     [NATIONAL_DEX_DEOXYS] =
     {
-    #if FRENCH
-        .categoryName = _("ADN"),
-    #elif ITALIAN
-        .categoryName = _("DNA"),
-    #else //ENGLISH
-        .categoryName = _("DNA"),
-    #endif
+        .categoryName = LANGUAGE_STRING("DNA", "ADN", "DNA", "ADN"),
         .height = 17,
         .weight = 608,
         .description = gDeoxysPokedexText,
@@ -6966,3 +4644,4 @@ const struct PokedexEntry gPokedexEntries[] =
         .trainerOffset = 2,
     },
 };
+
diff --git a/src/data/pokemon/spanish/pokedex_text.h b/src/data/pokemon/spanish/pokedex_text.h
new file mode 100644
index 0000000000..515c2bd2ad
--- /dev/null
+++ b/src/data/pokemon/spanish/pokedex_text.h
@@ -0,0 +1,2314 @@
+const u8 gDummyPokedexText[] = _(
+    "Lo han descubierto recientemente.\n"
+    "Está en proceso de estudio.\n"
+    "De momento no se dispone de datos\n"
+    "concretos.");
+
+const u8 gBulbasaurPokedexText[] = _(
+    "A BULBASAUR es fácil verle echándose\n"
+    "una siesta al sol. La semilla que tiene\n"
+    "en el lomo va creciendo cada vez más\n"
+    "a medida que absorbe los rayos del sol.");
+
+const u8 gIvysaurPokedexText[] = _(
+    "Soporta el peso del bulbo gracias\n"
+    "a sus fuertes patas y a su tronco.\n"
+    "Si pasa mucho tiempo al sol, el bulbo\n"
+    "se convierte en una enorme flor.");
+
+const u8 gVenusaurPokedexText[] = _(
+    "Según parece, la flor de VENUSAUR\n"
+    "adquiere unos colores muy vivos con una\n"
+    "buena nutrición y mucho sol. El aroma\n"
+    "delicado de esta flor calma los ánimos.");
+
+const u8 gCharmanderPokedexText[] = _(
+    "La llama que tiene en la punta de la cola\n"
+    "arde según sus sentimientos. Llamea\n"
+    "levemente cuando está alegre y arde\n"
+    "vigorosamente cuando está enfadado.");
+
+const u8 gCharmeleonPokedexText[] = _(
+    "Acaba sin piedad con su enemigo usando\n"
+    "sus afiladas garras. Ante rivales fuertes\n"
+    "se vuelve agresivo y la llama que tiene\n"
+    "en la cola arde con un tono azulado.");
+
+const u8 gCharizardPokedexText[] = _(
+    "CHARIZARD va volando en busca de rivales\n"
+    "fuertes. Echa fuego por la boca y es capaz\n"
+    "de derretirlo todo. Ahora bien, si su rival\n"
+    "es más débil que él, no usará este ataque.");
+
+const u8 gSquirtlePokedexText[] = _(
+    "El caparazón de SQUIRTLE no sólo lo\n"
+    "protege; su forma redondeada y sus\n"
+    "hendiduras reducen su resistencia al\n"
+    "agua y le permiten nadar más rápido.");
+
+const u8 gWartortlePokedexText[] = _(
+    "Tiene una cola larga y cubierta de un pelo\n"
+    "abundante y grueso que se torna oscuro\n"
+    "con la edad. Los arañazos del caparazón\n"
+    "muestran lo buen guerrero que es.");
+
+const u8 gBlastoisePokedexText[] = _(
+    "Lanza chorros de agua por los tubos\n"
+    "del caparazón con gran precisión.\n"
+    "Tiene tanta puntería que no fallaría al\n"
+    "tirar contra una lata pequeña a 50 metros.");
+
+const u8 gCaterpiePokedexText[] = _(
+    "Tiene un apetito voraz. Es capaz de\n"
+    "devorar hojas que superan su tamaño\n"
+    "en un abrir y cerrar de ojos. Libera\n"
+    "un hedor terrible por las antenas.");
+
+const u8 gMetapodPokedexText[] = _(
+    "La capa que le recubre el cuerpo es dura\n"
+    "como una plancha de hierro. METAPOD\n"
+    "apenas se mueve para que las vísceras\n"
+    "evolucionen dentro de su coraza.");
+
+const u8 gButterfreePokedexText[] = _(
+    "BUTTERFREE tiene una habilidad especial\n"
+    "para encontrar rico néctar en las flores.\n"
+    "Localiza, extrae y transporta polen de\n"
+    "flores que están a 10 km de distancia.");
+
+const u8 gWeedlePokedexText[] = _(
+    "WEEDLE tiene un finísimo sentido del\n"
+    "olfato. Puede distinguir las hojas que\n"
+    "le gustan de las que no olisqueándolas\n"
+    "con su gran nariz roja.");
+
+const u8 gKakunaPokedexText[] = _(
+    "Permanece casi inmóvil encaramado\n"
+    "a los árboles, pero mantiene una actividad\n"
+    "interna frenética para poder evolucionar.\n"
+    "La temperatura de la piel es muy alta.");
+
+const u8 gBeedrillPokedexText[] = _(
+    "Los BEEDRILL defienden su territorio a\n"
+    "toda costa. No conviene acercarse a su\n"
+    "colmena, por seguridad. Si se les molesta,\n"
+    "todo un enjambre atacará ferozmente.");
+
+const u8 gPidgeyPokedexText[] = _(
+    "PIDGEY tiene un sentido de la orientación\n"
+    "muy desarrollado. Aunque se encuentre\n"
+    "muy lejos de las zonas que le resultan\n"
+    "familiares, es capaz de regresar a su nido.");
+
+const u8 gPidgeottoPokedexText[] = _(
+    "Se hace con un territorio muy vasto y lo\n"
+    "sobrevuela para controlarlo. Si invaden\n"
+    "su espacio vital, no tendrá ningún reparo\n"
+    "en atacar con sus afiladas garras.");
+
+const u8 gPidgeotPokedexText[] = _(
+    "Tiene un plumaje bonito e hipnótico.\n"
+    "Muchos ENTRENADORES se quedan\n"
+    "embobados con las plumas que tiene en\n"
+    "la cabeza y lo eligen como su POKéMON.");
+
+const u8 gRattataPokedexText[] = _(
+    "RATTATA es cauto como él solo. Hasta\n"
+    "cuando duerme mueve las orejas para oír\n"
+    "todo lo que pueda suponer un peligro.\n"
+    "Cava su madriguera en cualquier sitio.");
+
+const u8 gRaticatePokedexText[] = _(
+    "A RATICATE le crecen unos colmillos\n"
+    "firmes y fuertes. Para mantenerlos\n"
+    "afilados, roe rocas, troncos e\n"
+    "incluso las paredes de las casas.");
+
+const u8 gSpearowPokedexText[] = _(
+    "Cuando pía, se le puede oír a 1 km. Si\n"
+    "a su agudo chillido le sigue una especie\n"
+    "de eco, estaremos oyendo a otros\n"
+    "SPEAROW responder al aviso de peligro.");
+
+const u8 gFearowPokedexText[] = _(
+    "Se le reconoce por tener un pescuezo\n"
+    "y un pico largos que le permiten cazar\n"
+    "en agua y en tierra firme. Mueve el pico\n"
+    "con habilidad para atrapar a sus presas.");
+
+const u8 gEkansPokedexText[] = _(
+    "Se enrosca para descansar. Esta posición\n"
+    "le permite responder rápidamente en caso\n"
+    "de amenaza, pues le basta erguir la cabeza\n"
+    "con ferocidad en cualquier dirección.");
+
+const u8 gArbokPokedexText[] = _(
+    "Es tremendamente fuerte y puede oprimir\n"
+    "cualquier cosa con su cuerpo, aplastando\n"
+    "incluso barriles de acero. Una vez atrapa\n"
+    "a su víctima, no hay forma de escapar.");
+
+const u8 gPikachuPokedexText[] = _(
+    "Tiene unas bolsas en las mejillas en\n"
+    "las que almacena electricidad. Cuando\n"
+    "la libera de golpe, la potencia de la\n"
+    "descarga es igual a la de un rayo.");
+
+const u8 gRaichuPokedexText[] = _(
+    "Si acumula demasiada electricidad, se\n"
+    "vuelve violento. Para evitarlo, suele\n"
+    "descargar los excesos de energía,\n"
+    "lo que lo mantiene calmado.");
+
+const u8 gSandshrewPokedexText[] = _(
+    "Cuando se hace una bola, repele\n"
+    "cualquier ataque. Como vive en el\n"
+    "desierto, tiene una piel tosca y dura.");
+
+const u8 gSandslashPokedexText[] = _(
+    "Se enrosca para protegerse del enemigo\n"
+    "y de los golpes de calor que hay durante\n"
+    "el día, cuando aumenta la temperatura.");
+
+const u8 gNidoranFPokedexText[] = _(
+    "Dado su pequeño tamaño, se cree que\n"
+    "desarrolló las púas venenosas a modo de\n"
+    "protección. Cuando se enfada, libera una\n"
+    "horrible sustancia tóxica por el cuerno.");
+
+const u8 gNidorinaPokedexText[] = _(
+    "Cuando está en familia o con sus amigos,\n"
+    "retrae las púas para no herir a nadie.\n"
+    "Según parece, si se la separa de su grupo,\n"
+    "se pone muy nerviosa.");
+
+const u8 gNidoqueenPokedexText[] = _(
+    "Está recubierta de escamas durísimas.\n"
+    "Suele lanzar por los aires a sus rivales\n"
+    "golpeándolos con violencia. Defiende\n"
+    "a sus crías con gran ferocidad.");
+
+const u8 gNidoranMPokedexText[] = _(
+    "El NIDORAN macho ha desarrollado músculos\n"
+    "para mover las orejas y orientarlas en\n"
+    "cualquier dirección. De este modo, es capaz\n"
+    "de captar hasta el sonido más leve.");
+
+const u8 gNidorinoPokedexText[] = _(
+    "Tiene un cuerno de dureza superior a la del\n"
+    "diamante. Si siente una presencia hostil,\n"
+    "se le erizan las púas del lomo y hace\n"
+    "frente al enemigo con todas sus fuerzas.");
+
+const u8 gNidokingPokedexText[] = _(
+    "La gruesa cola de NIDOKING resulta\n"
+    "destructora. Con agitarla una vez, puede\n"
+    "tumbar hasta una torre de transmisión.\n"
+    "Cuando se desboca, no hay quien lo pare.");
+
+const u8 gClefairyPokedexText[] = _(
+    "Cuando hay luna llena, salen en grupo para\n"
+    "jugar. Al amanecer, los CLEFAIRY, agotados,\n"
+    "regresan a sus refugios de montaña para\n"
+    "dormir acurrucados unos contra otros.");
+
+const u8 gClefablePokedexText[] = _(
+    "Usa las alas para dar saltitos y poder\n"
+    "caminar por el agua, pero no llega a volar.\n"
+    "Se sabe que le encanta pasear por los\n"
+    "lagos en tranquilas noches de luna llena.");
+
+const u8 gVulpixPokedexText[] = _(
+    "Puede controlar el fuego a su antojo\n"
+    "y libera llamas por la boca. Tiene seis\n"
+    "colas cuya temperatura sube de forma\n"
+    "radical justo antes de evolucionar.");
+
+const u8 gNinetalesPokedexText[] = _(
+    "Dicen que cada una de sus nueve colas\n"
+    "tiene poderes mágicos. Con el paso del\n"
+    "tiempo, el pelaje de NINETALES\n"
+    "adquiere un tono dorado.");
+
+const u8 gJigglypuffPokedexText[] = _(
+    "Aquel que oye su canción cae dormido. Las\n"
+    "ondas acústicas de su voz cantarina se\n"
+    "acoplan a las ondas cerebrales de quien lo\n"
+    "oye y le hacen caer en un profundo sueño.");
+
+const u8 gWigglytuffPokedexText[] = _(
+    "Su piel tiene una calidad de lujo. Dormir\n"
+    "junto a un WIGGLYTUFF es una maravilla.\n"
+    "Cuando aspira, su tamaño aumenta de\n"
+    "forma desmesurada.");
+
+const u8 gZubatPokedexText[] = _(
+    "Debido al tiempo que pasaron en oscuras\n"
+    "cavernas, sus ojos están atrofiados y\n"
+    "desprovistos de visión. Utilizan ondas\n"
+    "ultrasónicas para detectar obstáculos.");
+
+const u8 gGolbatPokedexText[] = _(
+    "Tiene colmillos que atraviesan el pelaje\n"
+    "más grueso. Se ceba chupando la sangre\n"
+    "a la gente y a otros POKéMON. Revolotea\n"
+    "en la oscuridad y ataca por la espalda.");
+
+const u8 gOddishPokedexText[] = _(
+    "Este POKéMON crece absorbiendo luz de\n"
+    "luna. Durante el día, se entierra en el\n"
+    "suelo y sólo deja las hojas fuera. Así\n"
+    "evita que los enemigos lo detecten.");
+
+const u8 gGloomPokedexText[] = _(
+    "De su boca cae una miel muy nociva que\n"
+    "desprende un hedor que puede provocar\n"
+    "la pérdida de memoria. Con todo, hay\n"
+    "quien afirma deleitarse con su fetidez.");
+
+const u8 gVileplumePokedexText[] = _(
+    "En las estaciones en las que produce más\n"
+    "polen, VILEPLUME tiñe de amarillo el aire\n"
+    "al caminar. El polen es altamente tóxico\n"
+    "y provoca parálisis.");
+
+const u8 gParasPokedexText[] = _(
+    "Lleva dos setas parásitas, llamadas\n"
+    "tochukaso, que se alimentan a partir\n"
+    "de los nutrientes del propio PARAS.\n"
+    "Las setas se usan como elixir de vida.");
+
+const u8 gParasectPokedexText[] = _(
+    "Destruyen grandes árboles absorbiendo\n"
+    "sus nutrientes. Cuando un árbol azotado\n"
+    "por la plaga muere, los PARASECT van\n"
+    "a por el siguiente al instante.");
+
+const u8 gVenonatPokedexText[] = _(
+    "Dicen que evolucionó con una fina capa\n"
+    "de pelo rígido a modo de protección.\n"
+    "Tiene unos ojos tan grandes que no hay\n"
+    "presa que le pase desapercibida.");
+
+const u8 gVenomothPokedexText[] = _(
+    "Es nocturno, sólo actúa en la oscuridad.\n"
+    "Su alimento preferido son los pequeños\n"
+    "insectos que se concentran por\n"
+    "la noche cerca de los focos de luz.");
+
+const u8 gDiglettPokedexText[] = _(
+    "En muchas granjas suelen criarlos porque,\n"
+    "caven donde caven, dejan la tierra bien\n"
+    "labrada para sembrar. El terreno queda\n"
+    "listo para plantar ricas verduras.");
+
+const u8 gDugtrioPokedexText[] = _(
+    "Los DUGTRIO son trillizos que salieron\n"
+    "de un mismo cuerpo, por eso piensan de la\n"
+    "misma forma. A la hora de cavar, trabajan\n"
+    "en equipo y sin descanso.");
+
+const u8 gMeowthPokedexText[] = _(
+    "Retrae sus afiladas uñas en las zarpas y\n"
+    "camina a hurtadillas. Así pasa inadvertido.\n"
+    "No se sabe por qué, pero adora las monedas\n"
+    "brillantes que resplandecen con la luz.");
+
+const u8 gPersianPokedexText[] = _(
+    "Tiene seis llamativos bigotes que le dan un\n"
+    "aspecto feroz y le sirven para detectar\n"
+    "cualquier amenaza. Si se le agarra por los\n"
+    "bigotes, se vuelve dócil.");
+
+const u8 gPsyduckPokedexText[] = _(
+    "Cuando le aumenta el dolor de cabeza,\n"
+    "comienza a usar extraños poderes.\n"
+    "Sin embargo, como nunca los recuerda,\n"
+    "siempre se le ve aturdido y desconcertado.");
+
+const u8 gGolduckPokedexText[] = _(
+    "Es un experto nadador. A veces, se entrena\n"
+    "con nadadores profesionales.\n"
+    "Cuando le brilla la frente, utiliza poderes\n"
+    "psíquicos.");
+
+const u8 gMankeyPokedexText[] = _(
+    "Si empieza a temblar y a respirar de\n"
+    "forma agitada, es que va a enfadarse.\n"
+    "Aunque prever su enfado es inútil, pues\n"
+    "llega tan rápido que no da tiempo a huir.");
+
+const u8 gPrimeapePokedexText[] = _(
+    "Cuando PRIMEAPE se enfada, se\n"
+    "le acelera el ritmo cardíaco y se\n"
+    "le fortalecen los músculos, pero\n"
+    "también pierde en inteligencia.");
+
+const u8 gGrowlithePokedexText[] = _(
+    "Tiene un sentido del olfato excepcional\n"
+    "y una gran memoria sensitiva: nunca olvida\n"
+    "una esencia e incluso puede identificar\n"
+    "las emociones de otros seres vivos.");
+
+const u8 gArcaninePokedexText[] = _(
+    "Es conocido por su velocidad. Dicen que\n"
+    "es capaz de correr 10.000 km en 24 horas.\n"
+    "El fuego que arde con vigor en su interior\n"
+    "constituye su fuente de energía.");
+
+const u8 gPoliwagPokedexText[] = _(
+    "Tiene una piel muy fina que deja ver las\n"
+    "vísceras en espiral que posee. Ahora bien,\n"
+    "esta piel tiene la ventaja de ser flexible,\n"
+    "por lo que hace rebotar más de un zarpazo.");
+
+const u8 gPoliwhirlPokedexText[] = _(
+    "Tiene la piel húmeda y lubricada con un\n"
+    "fluido aceitoso. Gracias a esta película\n"
+    "grasa, puede escapar de las garras de\n"
+    "cualquier rival en pleno combate.");
+
+const u8 gPoliwrathPokedexText[] = _(
+    "Tiene músculos fornidos y desarrollados,\n"
+    "que nunca se cansan por más que los use.\n"
+    "Cruzarse el océano Pacífico un par de\n"
+    "veces no le supone ningún esfuerzo.");
+
+const u8 gAbraPokedexText[] = _(
+    "Es un POKéMON que duerme 18 horas al día.\n"
+    "Se ha demostrado que cada hora utiliza\n"
+    "TELETRANSPORTE para cambiar de sitio.");
+
+const u8 gKadabraPokedexText[] = _(
+    "Dicen que un chico que tenía capacidades\n"
+    "psíquicas se transformó de repente en\n"
+    "KADABRA mientras ayudaba en un estudio\n"
+    "sobre poderes extrasensoriales.");
+
+const u8 gAlakazamPokedexText[] = _(
+    "Aunque tiene una gran capacidad psíquica\n"
+    "y una inteligencia excepcional, la\n"
+    "musculatura de ALAKAZAM es muy débil.\n"
+    "Para moverse, utiliza poderes psíquicos.");
+
+const u8 gMachopPokedexText[] = _(
+    "Se entrena hasta la extenuación para\n"
+    "dominar todos los tipos de artes\n"
+    "marciales. Es tan fuerte que puede llevar\n"
+    "a un luchador de sumo sobre los hombros.");
+
+const u8 gMachokePokedexText[] = _(
+    "MACHOKE lleva un cinturón para controlar\n"
+    "su abrumadora energía. Como es tan\n"
+    "peligroso, nadie se lo ha quitado nunca.");
+
+const u8 gMachampPokedexText[] = _(
+    "Es imposible defenderse de los puñetazos\n"
+    "y golpes que reparte con los cuatro brazos\n"
+    "que tiene. Si aparece un rival fuerte, le\n"
+    "entran unas ganas enormes de luchar.");
+
+const u8 gBellsproutPokedexText[] = _(
+    "Tiene un cuerpo delgado y flexible que\n"
+    "le permite inclinarse y balancearse para\n"
+    "esquivar ataques. Escupe un fluido\n"
+    "corrosivo que derrite hasta el hierro.");
+
+const u8 gWeepinbellPokedexText[] = _(
+    "Tiene un gancho a modo de extremidad\n"
+    "superior trasera que usa por la noche para\n"
+    "colgarse de una rama y dormir. Si se mueve\n"
+    "mientras duerme, puede acabar en el suelo.");
+
+const u8 gVictreebelPokedexText[] = _(
+    "Tiene una enredadera que le sale de la\n"
+    "cabeza. Cuando la agita y colea, recuerda\n"
+    "a un animal y así consigue atraer a sus\n"
+    "presas. Si se le acerca un rival, lo engulle.");
+
+const u8 gTentacoolPokedexText[] = _(
+    "Se compone casi enteramente de agua.\n"
+    "Atrapa a su enemigo con sus dos largos\n"
+    "tentáculos y le clava los venenosos\n"
+    "aguijones que tiene en los extremos.");
+
+const u8 gTentacruelPokedexText[] = _(
+    "Vive en formaciones complejas de roca en\n"
+    "el suelo marino y atrapa a su presa usando\n"
+    "sus 80 tentáculos. Si se pone nervioso,\n"
+    "le brillan las esferas rojas de la cabeza.");
+
+const u8 gGeodudePokedexText[] = _(
+    "Sube caminos de montaña usando sólo la\n"
+    "fuerza de los brazos. Como parece un canto\n"
+    "rodado que delimita el camino, algunos\n"
+    "montañeros se llegan a tropezar con él.");
+
+const u8 gGravelerPokedexText[] = _(
+    "Baja las montañas rodando por cuestas\n"
+    "escarpadas. Es tan robusto que\n"
+    "destroza árboles y cantos rodados\n"
+    "al impactar contra ellos.");
+
+const u8 gGolemPokedexText[] = _(
+    "Dicen que vive en cráteres volcánicos\n"
+    "situados en altas cimas. Una vez\n"
+    "al año, muda la piel y crece. La muda\n"
+    "se deshace y es absorbida por la tierra.");
+
+const u8 gPonytaPokedexText[] = _(
+    "Al nacer, es muy débil y apenas puede\n"
+    "ponerse en pie. Con todo, se va haciendo\n"
+    "más fuerte al tropezarse y caerse en su\n"
+    "intento por seguir a sus progenitores.");
+
+const u8 gRapidashPokedexText[] = _(
+    "Suele trotar sin rumbo por campos y llanos.\n"
+    "Pero, si debe ir a algún sitio, se le aviva el\n"
+    "fuego de las melenas y emprende un galope\n"
+    "llameante alcanzando 240 km por hora.");
+
+const u8 gSlowpokePokedexText[] = _(
+    "Con la cola, atrapa a su rival metiéndolo\n"
+    "bajo agua en las riberas de los ríos. Suele\n"
+    "olvidar lo que estaba haciendo y pasarse\n"
+    "días enteros holgazaneando en la orilla.");
+
+const u8 gSlowbroPokedexText[] = _(
+    "Lleva en la cola un SHELLDER enganchado\n"
+    "por los dientes. Como SLOWBRO no puede\n"
+    "pescar con la cola, se mete en el agua\n"
+    "de mala gana en busca de sus presas.");
+
+const u8 gMagnemitePokedexText[] = _(
+    "Las unidades de las extremidades son\n"
+    "imanes de gran alcance. Generan\n"
+    "magnetismo suficiente para atraer objetos\n"
+    "de hierro que estén a 100 m de distancia.");
+
+const u8 gMagnetonPokedexText[] = _(
+    "Son tres MAGNEMITE que se atraen entre\n"
+    "sí. Genera ondas de radio de gran alcance\n"
+    "que provocan que la temperatura suba\n"
+    "2 grados centígrados en un radio de 1 km.");
+
+const u8 gFarfetchdPokedexText[] = _(
+    "Lleva siempre una especie de palo de algún\n"
+    "tipo de planta y dicen que éste puede ser\n"
+    "mejor o peor. Tiene fama de haber luchado\n"
+    "contra otros POKéMON por algún palo.");
+
+const u8 gDoduoPokedexText[] = _(
+    "Incluso mientras come o duerme, una de\n"
+    "las cabezas sigue estando en guardia para\n"
+    "detectar cualquier peligro. Si lo amenazan,\n"
+    "sale huyendo a 100 km por hora.");
+
+const u8 gDodrioPokedexText[] = _(
+    "Pertenece a una rara especie de POKéMON\n"
+    "que tiene tres cabezas. Corre con energía\n"
+    "por verdes praderas incluso en estaciones\n"
+    "secas en las que llueve muy poco.");
+
+const u8 gSeelPokedexText[] = _(
+    "Busca a sus presas en aguas heladas,\n"
+    "bajo las capas de hielo. Cuando necesita\n"
+    "respirar, abre un agujerito en el hielo con\n"
+    "la protuberancia que tiene en la cabeza.");
+
+const u8 gDewgongPokedexText[] = _(
+    "Le encanta dormitar sobre la frialdad\n"
+    "del hielo. Una vez, un marinero que\n"
+    "lo vio dormido sobre un glaciar\n"
+    "lo confundió con una sirena.");
+
+const u8 gGrimerPokedexText[] = _(
+    "Nacido del lodo contaminado del mar,\n"
+    "el alimento preferido de GRIMER es la\n"
+    "basura. Se alimenta de lo que encuentra\n"
+    "en las aguas residuales de las fábricas.");
+
+const u8 gMukPokedexText[] = _(
+    "Prefiere los hábitats cálidos y húmedos.\n"
+    "En verano, las sustancias tóxicas\n"
+    "que contiene se intensifican y hacen\n"
+    "que apeste como la basura podrida.");
+
+const u8 gShellderPokedexText[] = _(
+    "De noche, usa su ancha lengua para hacer\n"
+    "un agujero en el fondo del mar donde\n"
+    "descansar. Cuando duerme, SHELLDER cierra\n"
+    "la concha, pero deja la lengua fuera.");
+
+const u8 gCloysterPokedexText[] = _(
+    "Puede nadar por el mar tragando agua y\n"
+    "expulsándola por el conducto que tiene en\n"
+    "la parte trasera. Del mismo modo lanza\n"
+    "los pinchos que tiene sobre la concha.");
+
+const u8 gGastlyPokedexText[] = _(
+    "Tiene mucha materia gaseosa. Cuando\n"
+    "es arrastrado por un vendaval mengua.\n"
+    "Se agrupan bajo los aleros de las casas\n"
+    "para resguardarse del viento.");
+
+const u8 gHaunterPokedexText[] = _(
+    "Es un POKéMON peligroso. Si en la oscuridad\n"
+    "ves a uno flotando y haciéndote señas,\n"
+    "no te acerques. Este POKéMON intentará\n"
+    "darte lametazos para robarte la energía.");
+
+const u8 gGengarPokedexText[] = _(
+    "Si una noche oscura ves que tu sombra\n"
+    "te adelanta de repente, en realidad\n"
+    "estarás viendo a GENGAR haciéndose\n"
+    "pasar por la misma.");
+
+const u8 gOnixPokedexText[] = _(
+    "Tiene un imán en el cerebro que le sirve\n"
+    "de brújula para no perder la orientación\n"
+    "cuando está cavando túneles. A medida que\n"
+    "crece, se le redondea y suaviza el cuerpo.");
+
+const u8 gDrowzeePokedexText[] = _(
+    "Si te pica la nariz mientras duermes,\n"
+    "seguro que es porque tienes a uno de\n"
+    "ellos en la almohada intentando sacarte\n"
+    "los sueños por la nariz para comérselos.");
+
+const u8 gHypnoPokedexText[] = _(
+    "Lleva un péndulo en la mano cuyo balanceo\n"
+    "y brillo sumen a su rival en un profundo\n"
+    "estado de hipnosis. Mientras busca a\n"
+    "su presa, saca brillo al péndulo.");
+
+const u8 gKrabbyPokedexText[] = _(
+    "Viven en la playa, enterrados en la arena\n"
+    "fina. Cuando escasea la comida, es común\n"
+    "verlos enfrentados panza contra\n"
+    "panza en defensa de su territorio.");
+
+const u8 gKinglerPokedexText[] = _(
+    "Tiene una pinza enorme y descomunal\n"
+    "que agita en el aire para comunicarse con\n"
+    "los demás. Lo malo es que pesa tanto\n"
+    "que se cansa enseguida.");
+
+const u8 gVoltorbPokedexText[] = _(
+    "Tiene un curioso e inexplicable parecido\n"
+    "con una POKé BALL. Como estalla a\n"
+    "la mínima, hasta los ENTRENADORES\n"
+    "veteranos lo tratan con mucho cuidado.");
+
+const u8 gElectrodePokedexText[] = _(
+    "Se agrupa con muchos otros junto a las\n"
+    "plantas de energía eléctrica. Como se\n"
+    "alimenta de electricidad, causa grandes y\n"
+    "caóticos apagones en ciudades próximas.");
+
+const u8 gExeggcutePokedexText[] = _(
+    "Está compuesto de seis huevos que forman\n"
+    "una tupida piña que va girando. Si empiezan\n"
+    "a resquebrajarse las cáscaras, no hay duda\n"
+    "de que está a punto de evolucionar.");
+
+const u8 gExeggutorPokedexText[] = _(
+    "Es originario del trópico. Cuando se expone\n"
+    "a un sol intenso, le empiezan a crecer las\n"
+    "cabezas. Dicen que, si caen al suelo, las\n"
+    "cabezas se unen para formar un EXEGGCUTE.");
+
+const u8 gCubonePokedexText[] = _(
+    "Le apena no volver a ver a su madre. La luna\n"
+    "llena le recuerda a ella y se pone a chillar.\n"
+    "Los churretes que tiene en el cráneo que\n"
+    "lleva puesto son debidos a sus lágrimas.");
+
+const u8 gMarowakPokedexText[] = _(
+    "Es la forma evolucionada de CUBONE. Es más\n"
+    "fuerte porque ha superado la pena por la\n"
+    "pérdida de su madre. Tiene el ánimo curtido,\n"
+    "por lo que no resulta fácil alterarlo.");
+
+const u8 gHitmonleePokedexText[] = _(
+    "Da unas patadas demoledoras\n"
+    "encogiendo y estirando las patas.\n"
+    "Tras la lucha, se las masajea para\n"
+    "relajar los músculos y descansar.");
+
+const u8 gHitmonchanPokedexText[] = _(
+    "Dicen que su alma es la de un boxeador que\n"
+    "se entrenó para un campeonato mundial.\n"
+    "Tiene un espíritu indomable que nunca\n"
+    "se doblega ante la adversidad.");
+
+const u8 gLickitungPokedexText[] = _(
+    "Cada vez que se encuentra con algo\n"
+    "que no conoce, le da un lametazo.\n"
+    "Así memoriza las cosas: por la textura\n"
+    "y el sabor. No soporta los sabores ácidos.");
+
+const u8 gKoffingPokedexText[] = _(
+    "Ver de cerca a un KOFFING permite\n"
+    "observar, a través de su fina piel,\n"
+    "los gases tóxicos que se remolinan\n"
+    "en su interior. A la mínima, explota.");
+
+const u8 gWeezingPokedexText[] = _(
+    "Al diluir sus gases tóxicos mediante un\n"
+    "proceso especial, se extrae un perfume\n"
+    "delicioso. Para WEEZING, los gases que\n"
+    "emana la basura son una exquisitez.");
+
+const u8 gRhyhornPokedexText[] = _(
+    "Una vez que comienza a correr, no para:\n"
+    "su minúsculo cerebro lo hace tan bobo\n"
+    "que ni siquiera es capaz de acordarse\n"
+    "de por qué empezó a hacerlo.");
+
+const u8 gRhydonPokedexText[] = _(
+    "Su cuerno, que gira como un taladro,\n"
+    "destroza altos edificios de una pasada.\n"
+    "Puede erguirse sobre las patas traseras\n"
+    "y tiene un cerebro muy bien desarrollado.");
+
+const u8 gChanseyPokedexText[] = _(
+    "Pone a diario huevos con un enorme valor\n"
+    "nutritivo. Están tan ricos que hasta quien\n"
+    "no tenga hambre se los comerá en un abrir\n"
+    "y cerrar de ojos.");
+
+const u8 gTangelaPokedexText[] = _(
+    "Se le desprenden los tentáculos en cuanto\n"
+    "se los agarran. Y no sólo no le duele,\n"
+    "sino que le permite huir rápidamente.\n"
+    "Además, al día siguiente le crecen otros.");
+
+const u8 gKangaskhanPokedexText[] = _(
+    "Si te cruzas con uno que esté jugando, no\n"
+    "lo molestes ni intentes atraparlo. Seguro\n"
+    "que uno de sus progenitores anda cerca\n"
+    "y reaccionará con enfado y violencia.");
+
+const u8 gHorseaPokedexText[] = _(
+    "Batiendo hábilmente las aletas que\n"
+    "tiene en el lomo, se mueve en cualquier\n"
+    "dirección al avanzar. Si detecta peligro,\n"
+    "escupe tinta para escapar.");
+
+const u8 gSeadraPokedexText[] = _(
+    "Las púas venenosas que cubren su cuerpo\n"
+    "tienen mucho valor a la hora de preparar\n"
+    "remedios de hierbas tradicionales. Como\n"
+    "algo amenace su nido, atacará sin piedad.");
+
+const u8 gGoldeenPokedexText[] = _(
+    "En primavera, se pueden ver bancos de\n"
+    "GOLDEEN remontando cascadas y ríos.\n"
+    "Causa mucho daño cuando embiste\n"
+    "con su único cuerno.");
+
+const u8 gSeakingPokedexText[] = _(
+    "Perfora agujeros en los cantos rodados\n"
+    "de las cuencas de los ríos. Así protege\n"
+    "sus huevos de cualquier ataque y evita\n"
+    "que los arrastre la corriente.");
+
+const u8 gStaryuPokedexText[] = _(
+    "De noche, se agrupan y hacen brillar su\n"
+    "núcleo rojo. Los destellos se intercalan\n"
+    "con el centelleo estelar. Si les arrancan\n"
+    "alguna parte del cuerpo, la regeneran.");
+
+const u8 gStarmiePokedexText[] = _(
+    "En otro tiempo, se pensaba que STARMIE\n"
+    "era el resultado de los reflejos de las\n"
+    "estrellas que centelleaban con suavidad\n"
+    "en el cielo nocturno.");
+
+const u8 gMrMimePokedexText[] = _(
+    "Domina la pantomima. Con sus gestos puede\n"
+    "convencer a sus espectadores de la\n"
+    "existencia de algo invisible y, cuando se lo\n"
+    "creen, las ilusiones se hacen realidad.");
+
+const u8 gScytherPokedexText[] = _(
+    "Es espectacular ver lo rápido que es. Su\n"
+    "velocidad potencia las guadañas que tiene\n"
+    "en los brazos, de por sí contundentes,\n"
+    "pues rebanan gruesos troncos de un tajo.");
+
+const u8 gJynxPokedexText[] = _(
+    "Camina con ritmo, cimbreándose y\n"
+    "balanceando las caderas como si bailara.\n"
+    "Hace movimientos tan atractivos que no\n"
+    "hay quien se resista a mover las caderas.");
+
+const u8 gElectabuzzPokedexText[] = _(
+    "Al desatarse una tormenta, se enfrenta\n"
+    "a otros para ver quién alcanza antes los\n"
+    "sitios altos en los que pueden caer rayos.\n"
+    "Hay ciudades que los usan como pararrayos.");
+
+const u8 gMagmarPokedexText[] = _(
+    "Al luchar, expulsa violentas llamas para\n"
+    "intimidar a su rival. Estos estallidos de\n"
+    "fuego crean ondas de calor que abrasan\n"
+    "la hierba y los árboles de la zona.");
+
+const u8 gPinsirPokedexText[] = _(
+    "Sus cuernos tienen fuerza para destrozar\n"
+    "grandes troncos. Como tienen aversión al\n"
+    "frío, cavan madrigueras bajo tierra donde\n"
+    "duermen cuando bajan las temperaturas.");
+
+const u8 gTaurosPokedexText[] = _(
+    "Le resulta imposible estarse quieto. Si\n"
+    "no hay ningún rival que luche con él, se\n"
+    "estampa contra árboles para calmarse\n"
+    "y los embiste para echarlos abajo.");
+
+const u8 gMagikarpPokedexText[] = _(
+    "Los músculos con los que nada son débiles,\n"
+    "así que se lo lleva la corriente\n"
+    "con facilidad. Muchos MAGIKARP\n"
+    "van a parar a piscinas naturales.");
+
+const u8 gGyaradosPokedexText[] = _(
+    "Es extremadamente feroz y violento.\n"
+    "Cuando las personas comienzan a luchar,\n"
+    "aparece y reduce a cenizas todo lo que\n"
+    "pilla con intensas llamaradas.");
+
+const u8 gLaprasPokedexText[] = _(
+    "Por culpa de la gente, está en peligro de\n"
+    "extinción. Dicen que, al anochecer, se pone\n"
+    "a cantar quejicoso mientras busca a los\n"
+    "miembros de su especie que puedan quedar.");
+
+const u8 gDittoPokedexText[] = _(
+    "Altera su estructura celular para cambiar\n"
+    "de forma. Pero, si intenta transformarse\n"
+    "en algo según los datos que tenga en la\n"
+    "memoria, habrá detalles que se le escapen.");
+
+const u8 gEeveePokedexText[] = _(
+    "Su configuración genética le permite\n"
+    "mutar y adaptarse enseguida a cualquier\n"
+    "medio. Evoluciona gracias a las radiaciones\n"
+    "emitidas por varias PIEDRAS.");
+
+const u8 gVaporeonPokedexText[] = _(
+    "Sufrió una mutación repentina y desarrolló\n"
+    "aletas y branquias que le permiten vivir\n"
+    "bajo el agua. Asimismo, este POKéMON\n"
+    "tiene la habilidad de controlar las aguas.");
+
+const u8 gJolteonPokedexText[] = _(
+    "Crea algo de electricidad, cuya intensidad\n"
+    "aumenta con la estática que acumula\n"
+    "en un pelaje formado por agujas cargadas\n"
+    "de energía. Así puede lanzar rayos.");
+
+const u8 gFlareonPokedexText[] = _(
+    "La suavidad de su pelaje tiene una función\n"
+    "clara: liberar calor para que no se asfixie.\n"
+    "La temperatura corporal puede alcanzar\n"
+    "los 900 grados centígrados.");
+
+const u8 gPorygonPokedexText[] = _(
+    "Puede reconvertirse en datos informáticos\n"
+    "y entrar en el ciberespacio.\n"
+    "Tiene protección anti-copia, así que\n"
+    "es imposible duplicarlo.");
+
+const u8 gOmanytePokedexText[] = _(
+    "Es un POKéMON ancestral que se extinguió\n"
+    "hace mucho tiempo y se recuperó a partir\n"
+    "de fósiles. Si le atacan, se esconderá\n"
+    "dentro de su dura concha.");
+
+const u8 gOmastarPokedexText[] = _(
+    "Usa los tentáculos para cazar.\n"
+    "Se cree que se ha extinguido debido\n"
+    "al tamaño y al peso que alcanza su concha,\n"
+    "que entorpece sus movimientos.");
+
+const u8 gKabutoPokedexText[] = _(
+    "Lo han regenerado a partir de un fósil,\n"
+    "pero aún queda algún raro ejemplar vivo.\n"
+    "Aunque existe desde hace 300 millones de\n"
+    "años, este POKéMON no ha cambiado nada.");
+
+const u8 gKabutopsPokedexText[] = _(
+    "Antes buceaba para atrapar a su presa,\n"
+    "pero evolucionó, cambió de hábitat y ahora\n"
+    "vive en tierra firme. El cambio que se\n"
+    "ve en patas y branquias así lo confirma.");
+
+const u8 gAerodactylPokedexText[] = _(
+    "Surgió en la era de los dinosaurios. Se\n"
+    "regeneró a partir de material genético\n"
+    "contenido en ámbar. Se cree que fue el\n"
+    "amo de los cielos en épocas pasadas.");
+
+const u8 gSnorlaxPokedexText[] = _(
+    "Se dedica a comer y dormir. Es tan dócil\n"
+    "que es fácil ver a niños usando la gran\n"
+    "panza que tiene como lugar de juegos.");
+
+const u8 gArticunoPokedexText[] = _(
+    "Es un legendario pájaro POKéMON que\n"
+    "puede controlar el hielo. El batir de sus\n"
+    "alas congela el aire. Dicen que consigue\n"
+    "hacer nevar cuando vuela.");
+
+const u8 gZapdosPokedexText[] = _(
+    "Es un legendario pájaro POKéMON que tiene\n"
+    "la habilidad de controlar la electricidad.\n"
+    "Suele vivir en nubarrones. Gana mucha\n"
+    "fuerza si le alcanzan los rayos.");
+
+const u8 gMoltresPokedexText[] = _(
+    "Es un legendario pájaro POKéMON que tiene\n"
+    "la habilidad de controlar el fuego. Dicen\n"
+    "que, si resulta herido, se sumerge en el\n"
+    "magma de un volcán para arder y curarse.");
+
+const u8 gDratiniPokedexText[] = _(
+    "Está mudando la piel continuamente.\n"
+    "Es algo que necesita hacer porque la\n"
+    "energía que tiene en su interior alcanza\n"
+    "niveles que resultan incontrolables.");
+
+const u8 gDragonairPokedexText[] = _(
+    "Acumula gran cantidad de energía.\n"
+    "Dicen que altera el clima descargando\n"
+    "energía por las esferas de cristal\n"
+    "que tiene en el cuello y en la cola.");
+
+const u8 gDragonitePokedexText[] = _(
+    "Es capaz de dar la vuelta al mundo en sólo\n"
+    "16 horas. Tiene buen corazón: guía a tierra\n"
+    "firme a los barcos que se han perdido en\n"
+    "plena tormenta o van a zozobrar.");
+
+const u8 gMewtwoPokedexText[] = _(
+    "Fue creado por manipulación genética,\n"
+    "pero, a pesar de que los científicos\n"
+    "dieron a MEWTWO un cuerpo, no lograron\n"
+    "dotarle de un corazón compasivo.");
+
+const u8 gMewPokedexText[] = _(
+    "Dicen que posee el mapa genético de todos\n"
+    "los POKéMON. Puede hacerse invisible\n"
+    "a voluntad, así que logra pasar\n"
+    "inadvertido aunque haya gente cerca.");
+
+const u8 gChikoritaPokedexText[] = _(
+    "Al luchar, agita la hoja de la cabeza para\n"
+    "impresionar al rival, pero también libera\n"
+    "una suave fragancia que apacigua los\n"
+    "ánimos y crea un ambiente amistoso.");
+
+const u8 gBayleefPokedexText[] = _(
+    "Tiene un collar de hojas alrededor del\n"
+    "cuello y un brote de un árbol en cada\n"
+    "una de ellas. La fragancia que desprenden\n"
+    "estos brotes anima a la gente.");
+
+const u8 gMeganiumPokedexText[] = _(
+    "La fragancia de su flor aplaca y suaviza\n"
+    "los ánimos. Al luchar, libera más cantidad\n"
+    "de esencia calmante para anular el\n"
+    "espíritu de combate de su oponente.");
+
+const u8 gCyndaquilPokedexText[] = _(
+    "Se protege con el fuego que le arde en\n"
+    "el lomo. Si está enfadado, las llamas son\n"
+    "fieras, pero, si está cansado, sólo suelta\n"
+    "chispas que no llegan a inflamarse.");
+
+const u8 gQuilavaPokedexText[] = _(
+    "Intimida a sus rivales con la intensidad\n"
+    "de sus llamas y sus ráfagas de aire ígneo.\n"
+    "Es capaz de esquivar ataques con gran\n"
+    "agilidad al tiempo que abrasa al rival.");
+
+const u8 gTyphlosionPokedexText[] = _(
+    "Se oculta tras un trémulo haz de calor que\n"
+    "crea mediante intensas y sofocantes\n"
+    "llamaradas. Provoca explosiones\n"
+    "abrasadoras que reducen todo a cenizas.");
+
+const u8 gTotodilePokedexText[] = _(
+    "Tiene un cuerpo pequeño, pero fuertes\n"
+    "mandíbulas. A veces, piensa que sólo está\n"
+    "dando un mordisquito de nada y hace\n"
+    "unas heridas bastante considerables.");
+
+const u8 gCroconawPokedexText[] = _(
+    "Si le clava los colmillos a su presa,\n"
+    "es imposible que huya, porque crecen\n"
+    "hacia adentro con forma de anzuelo:\n"
+    "una vez hincados no hay escapatoria.");
+
+const u8 gFeraligatrPokedexText[] = _(
+    "Intimida a su rival abriendo sus grandes\n"
+    "fauces. Al luchar, golpea el suelo con\n"
+    "sus gruesas y fuertes patas traseras, y\n"
+    "carga rápidamente contra el enemigo.");
+
+const u8 gSentretPokedexText[] = _(
+    "No duerme a menos que otro haga guardia.\n"
+    "El que hace de centinela lo despertará\n"
+    "si hay peligro. Si se separa de su manada,\n"
+    "es incapaz de dormir, presa del miedo.");
+
+const u8 gFurretPokedexText[] = _(
+    "Es de constitución delgada, lo que le sirve\n"
+    "en combate para escabullirse con gran\n"
+    "habilidad por cualquier hueco y escapar.\n"
+    "Aunque tiene patas cortas, es ágil y veloz.");
+
+const u8 gHoothootPokedexText[] = _(
+    "Tiene un órgano interno que percibe\n"
+    "la rotación de la tierra. Por esta\n"
+    "razón, HOOTHOOT es capaz de ulular\n"
+    "todos los días a la misma hora.");
+
+const u8 gNoctowlPokedexText[] = _(
+    "Puede cazar en la oscuridad y es que tiene\n"
+    "una vista privilegiada que le permite ver\n"
+    "sin apenas luz. Posee unas alas ligeras y\n"
+    "flexibles que casi no hacen ruido al volar.");
+
+const u8 gLedybaPokedexText[] = _(
+    "Segrega un fluido por los seis puntos de\n"
+    "unión que tiene entre patas y cuerpo.\n"
+    "Al variar la esencia de éste, consigue\n"
+    "expresar abiertamente su estado de ánimo.");
+
+const u8 gLedianPokedexText[] = _(
+    "Dicen que, en zonas de aire puro donde se\n"
+    "ven las estrellas, hay grandes grupos de\n"
+    "LEDIAN. Y es que estos POKéMON usan la luz\n"
+    "de las estrellas como fuente de energía.");
+
+const u8 gSpinarakPokedexText[] = _(
+    "La tela que teje puede considerarse como\n"
+    "su segundo sistema nervioso. Dicen que\n"
+    "adivina qué presa ha caído en su red por\n"
+    "las vibraciones de los hilos de la tela.");
+
+const u8 gAriadosPokedexText[] = _(
+    "ARIADOS tiene unas patas con forma de\n"
+    "garfio que le permiten correr por techos\n"
+    "y superficies verticales. Oprime al rival\n"
+    "con una tela de araña fina y resistente.");
+
+const u8 gCrobatPokedexText[] = _(
+    "Al evolucionar, las patas traseras se le\n"
+    "convirtieron en alas. Si bate de forma\n"
+    "alterna las alas delanteras y las traseras,\n"
+    "puede volar todo el día sin parar.");
+
+const u8 gChinchouPokedexText[] = _(
+    "Cuando detecta peligro, descarga\n"
+    "electricidad positiva y negativa por sus\n"
+    "dos antenas. Vive en zonas profundas\n"
+    "a las que no llega la luz del sol.");
+
+const u8 gLanturnPokedexText[] = _(
+    "Las esferas brillantes que tiene en la\n"
+    "cabeza emiten luz y se forman a partir de\n"
+    "su aleta dorsal. Este POKéMON logra\n"
+    "iluminar las profundidades abisales.");
+
+const u8 gPichuPokedexText[] = _(
+    "Sigue sin conseguir retener electricidad.\n"
+    "Cuando se asusta, descarga energía\n"
+    "de forma accidental. Con todo, a medida\n"
+    "que pasa el tiempo va mejorando.");
+
+const u8 gCleffaPokedexText[] = _(
+    "Cuando hay lluvia de estrellas, se les ve\n"
+    "danzando en círculos durante la noche.\n"
+    "Sólo paran de día; entonces, dejan\n"
+    "de bailar y beben el rocío de la mañana.");
+
+const u8 gIgglybuffPokedexText[] = _(
+    "Es suave, flexible y capaz de botar.\n"
+    "Cuando canta sin parar con todas sus\n"
+    "fuerzas, se va poniendo de un color\n"
+    "rosa cada vez más intenso.");
+
+const u8 gTogepiPokedexText[] = _(
+    "Usa la compasión y la alegría que emanan\n"
+    "de la gente y de los POKéMON como energía.\n"
+    "Almacena sentimientos positivos en su\n"
+    "interior y después los comparte con otros.");
+
+const u8 gTogeticPokedexText[] = _(
+    "Dicen que TOGETIC es un POKéMON\n"
+    "que trae buena suerte y que, si detecta\n"
+    "a alguien que tenga un corazón puro,\n"
+    "viene para compartir su alegría con él.");
+
+const u8 gNatuPokedexText[] = _(
+    "Da saltitos por los árboles bajos de la\n"
+    "sabana para picotear los brotes nuevos.\n"
+    "Los ojos de un NATU dan la sensación\n"
+    "de estar siempre observando algo.");
+
+const u8 gXatuPokedexText[] = _(
+    "Tiene el enigmático poder de prever\n"
+    "el futuro. Gente de distintos sitios ha\n"
+    "creído durante mucho tiempo que los \n"
+    "XATU eran mensajeros de otro mundo.");
+
+const u8 gMareepPokedexText[] = _(
+    "Tiene un pelaje lanudo y suave que\n"
+    "produce carga estática por el roce. Cuanto\n"
+    "más se carga de electricidad estática,\n"
+    "más brilla la bombilla que lleva en la cola.");
+
+const u8 gFlaaffyPokedexText[] = _(
+    "La calidad de su lana varía para generar\n"
+    "electricidad estática con poca cantidad\n"
+    "de lana. Las zonas donde no hay pelaje\n"
+    "están protegidas contra la electricidad.");
+
+const u8 gAmpharosPokedexText[] = _(
+    "Desprende tanta luz que es posible verlo\n"
+    "desde el espacio. Antes, la gente usaba\n"
+    "su luz como sistema de comunicación con\n"
+    "el que enviaba señales a gran distancia.");
+
+const u8 gBellossomPokedexText[] = _(
+    "A los pétalos de las flores se les acentúa\n"
+    "el color si están expuestos a la luz solar.\n"
+    "Cuando persiste el tiempo nublado, dicen\n"
+    "que invoca al sol mediante un baile ritual.");
+
+const u8 gMarillPokedexText[] = _(
+    "Está cubierto de una piel impermeable.\n"
+    "Gracias a ella, puede nadar a gran\n"
+    "velocidad sin que le afecte la resistencia\n"
+    "que pueda ofrecer el agua.");
+
+const u8 gAzumarillPokedexText[] = _(
+    "Está casi todo el día en el agua.\n"
+    "El dibujo y el color que tiene le sirven\n"
+    "de camuflaje, por lo que resulta difícil\n"
+    "que algún rival lo encuentre en el agua.");
+
+const u8 gSudowoodoPokedexText[] = _(
+    "Se camufla adoptando la imagen de un árbol\n"
+    "para que no le ataque ningún enemigo.\n"
+    "El problema viene en invierno: las patas se\n"
+    "le ven verdes y es fácil identificarle.");
+
+const u8 gPolitoedPokedexText[] = _(
+    "El mechón rizado de POLITOED confirma\n"
+    "su condición de rey. Dicen que cuanto\n"
+    "más le crece y más se le riza, mayor es el\n"
+    "respeto que recibe de sus súbditos.");
+
+const u8 gHoppipPokedexText[] = _(
+    "Flota en el aire y se deja llevar. Si percibe\n"
+    "que el viento va a soplar con fuerza,\n"
+    "entrelaza sus hojas con otros para hacer\n"
+    "resistencia y evitar salir volando.");
+
+const u8 gSkiploomPokedexText[] = _(
+    "Florece si la temperatura llega a 18 grados\n"
+    "centígrados. La apertura de los pétalos\n"
+    "varía según la temperatura que haga, por\n"
+    "lo que la gente lo usa como termómetro.");
+
+const u8 gJumpluffPokedexText[] = _(
+    "JUMPLUFF se vale de los cálidos vientos\n"
+    "del sur para volar a tierras lejanas.\n"
+    "Si llega a zonas de aire frío en pleno\n"
+    "vuelo, descenderá y tomará tierra.");
+
+const u8 gAipomPokedexText[] = _(
+    "Su cola termina en una especie de mano\n"
+    "a la que puede dar muy buen uso. Pero,\n"
+    "como se ha acostumbrado a usarla mucho,\n"
+    "las de verdad se le han vuelto algo torpes.");
+
+const u8 gSunkernPokedexText[] = _(
+    "Intenta moverse poco para conservar los\n"
+    "nutrientes que ha guardado en su interior\n"
+    "y poder evolucionar. Ni siquiera come:\n"
+    "sólo se alimenta del rocío de la mañana.");
+
+const u8 gSunfloraPokedexText[] = _(
+    "Transforma la energía solar en nutrientes.\n"
+    "De día, cuando hace calor, está en\n"
+    "continuo movimiento. Sólo se detiene\n"
+    "cuando comienza a anochecer.");
+
+const u8 gYanmaPokedexText[] = _(
+    "Tiene un ángulo de visión de 360 grados.\n"
+    "Es capaz de pararse de repente y cambiar\n"
+    "de dirección mientras vuela, lo que le\n"
+    "resulta útil para dar caza a sus presas.");
+
+const u8 gWooperPokedexText[] = _(
+    "Suele vivir en el agua, pero también es\n"
+    "posible verle en tierra en busca de comida.\n"
+    "Cuando está en terreno firme, se cubre\n"
+    "con una película viscosa y tóxica.");
+
+const u8 gQuagsirePokedexText[] = _(
+    "QUAGSIRE caza dejando las fauces\n"
+    "abiertas en el agua y esperando a que su\n"
+    "presa entre sin darse cuenta. Como se\n"
+    "queda quieto, no pasa mucha hambre.");
+
+const u8 gEspeonPokedexText[] = _(
+    "Un ESPEON es muy leal al ENTRENADOR que\n"
+    "considera digno. Dicen que desarrolló\n"
+    "sus poderes adivinatorios para evitar que\n"
+    "su ENTRENADOR sufriera ningún daño.");
+
+const u8 gUmbreonPokedexText[] = _(
+    "Evolucionó tras haber estado expuesto a\n"
+    "ondas lunares. Se esconde en la oscuridad\n"
+    "en silencio y espera a que su presa se\n"
+    "mueva. Cuando ataca, le brillan los anillos.");
+
+const u8 gMurkrowPokedexText[] = _(
+    "MURKROW ha sido temido y repudiado por\n"
+    "todos porque se cree que da mala suerte.\n"
+    "Le encanta todo lo que resplandece. \n"
+    "A las mujeres les roba los anillos.");
+
+const u8 gSlowkingPokedexText[] = _(
+    "SLOWKING investiga cada día los misterios\n"
+    "del mundo que aún no se han resuelto, pero\n"
+    "al parecer se le olvida lo aprendido cuando\n"
+    "el SHELLDER que lleva encima se suelta.");
+
+const u8 gMisdreavusPokedexText[] = _(
+    "Asusta a la gente gritando y sollozando.\n"
+    "Dicen que usa las esferas rojas para\n"
+    "absorber los sentimientos de temor de\n"
+    "sus enemigos y alimentarse con ellos.");
+
+const u8 gUnownPokedexText[] = _(
+    "Tienen forma de caracteres antiguos.\n"
+    "No se sabe qué surgió primero:\n"
+    "la escritura o los distintos UNOWN,\n"
+    "pero se sigue investigando.");
+
+const u8 gWobbuffetPokedexText[] = _(
+    "Generalmente es dócil, pero si recibe un\n"
+    "ataque en su cola negra, WOBBUFFET se\n"
+    "defenderá con ferocidad. Se guarece\n"
+    "en cuevas hasta que anochece.");
+
+const u8 gGirafarigPokedexText[] = _(
+    "GIRAFARIG es herbívoro: come hierba\n"
+    "y brotes de los árboles. Mientras se\n"
+    "alimenta, mueve la cola como si también\n"
+    "masticara y tragara con ella.");
+
+const u8 gPinecoPokedexText[] = _(
+    "Permanece colgado de la rama de un árbol\n"
+    "esperando a su presa. Si alguien sacude el\n"
+    "árbol en el que está comiendo y le molesta,\n"
+    "se tira al suelo y explota sin más.");
+
+const u8 gForretressPokedexText[] = _(
+    "Se esconde dentro de su concha de acero\n"
+    "reforzado. Sólo la abre para atrapar a su\n"
+    "presa, pero ocurre tan rápido que no da\n"
+    "tiempo a ver su interior.");
+
+const u8 gDunsparcePokedexText[] = _(
+    "La cola es un taladro que usa para\n"
+    "enterrarse de espaldas en el suelo.\n"
+    "Se sabe que su nido tiene una forma muy\n"
+    "compleja y está a gran profundidad.");
+
+const u8 gGligarPokedexText[] = _(
+    "Planea por el aire sin hacer ruido.\n"
+    "Se agarra a la cara del rival con las garras\n"
+    "traseras y las pinzas delanteras,\n"
+    "inyectándole veneno por el aguijón.");
+
+const u8 gSteelixPokedexText[] = _(
+    "Vive a aún mayor profundidad que ONIX. Se\n"
+    "le conoce por cavar hacia el centro de la\n"
+    "tierra. Hay datos que demuestran que ha\n"
+    "llegado a alcanzar 1 km de profundidad.");
+
+const u8 gSnubbullPokedexText[] = _(
+    "Al tener los colmillos por fuera, SNUBBULL\n"
+    "da miedo y espanta, aterrados, a los\n"
+    "POKéMON pequeños. Aunque a él parece que\n"
+    "le da un poco de pena que salgan huyendo.");
+
+const u8 gGranbullPokedexText[] = _(
+    "Tiene una mandíbula inferior enorme y\n"
+    "colmillos pesados que le hacen inclinar\n"
+    "la cabeza hacia atrás para compensar\n"
+    "el peso. Si no le asustan, no muerde.");
+
+const u8 gQwilfishPokedexText[] = _(
+    "Bebe agua, se hincha y usa la presión\n"
+    "del agua que ha tragado para lanzar\n"
+    "plumas tóxicas a través de la piel.\n"
+    "Para QWILFISH, nadar es todo un desafío.");
+
+const u8 gScizorPokedexText[] = _(
+    "SCIZOR tiene un cuerpo duro como el acero\n"
+    "en el que los ataques comunes apenas\n"
+    "hacen mella. Este POKéMON bate las alas\n"
+    "para regular su temperatura corporal.");
+
+const u8 gShucklePokedexText[] = _(
+    "Se esconde bajo las rocas, oculto en su\n"
+    "caparazón, para comerse las bayas que ha\n"
+    "recolectado. Las BAYAS se mezclan con\n"
+    "sus fluidos corporales y originan zumo.");
+
+const u8 gHeracrossPokedexText[] = _(
+    "Va en grupo al bosque en busca de la dulce\n"
+    "savia de los árboles. Cubierto con una\n"
+    "coraza dura como el acero, luce su cuerno\n"
+    "orgulloso y voltea con él a los rivales.");
+
+const u8 gSneaselPokedexText[] = _(
+    "Trepa a los árboles clavando en la\n"
+    "corteza sus garras curvadas. Busca\n"
+    "nidos desprovistos de vigilancia paterna\n"
+    "para robar huevos y comérselos.");
+
+const u8 gTeddiursaPokedexText[] = _(
+    "Le encanta chuparse las palmas, que tiene\n"
+    "llenas de dulce miel. TEDDIURSA fabrica\n"
+    "la suya propia mezclando frutos y el polen\n"
+    "recogido por BEEDRILL.");
+
+const u8 gUrsaringPokedexText[] = _(
+    "En los bosques que habita, dicen que hay\n"
+    "arroyos y árboles gigantes donde guarda\n"
+    "su alimento. A diario, pasea por el bosque\n"
+    "para recolectar comida.");
+
+const u8 gSlugmaPokedexText[] = _(
+    "Es una especie de POKéMON que vive en\n"
+    "zonas volcánicas. Si su cuerpo se enfría,\n"
+    "la piel se le endurece y lo inmoviliza. Para\n"
+    "evitarlo, duerme cerca de donde hay magma.");
+
+const u8 gMagcargoPokedexText[] = _(
+    "El caparazón que lleva es magma\n"
+    "solidificado. Los miles de años que lleva\n"
+    "viviendo en cráteres volcánicos han hecho\n"
+    "del cuerpo de MAGCARGO puro magma.");
+
+const u8 gSwinubPokedexText[] = _(
+    "Busca alimento frotando el hocico contra\n"
+    "el suelo. Su comida preferida es una seta\n"
+    "que crece bajo la hierba marchita. A veces,\n"
+    "al frotar, descubre fuentes termales.");
+
+const u8 gPiloswinePokedexText[] = _(
+    "Está cubierto por un pelaje tupido y de\n"
+    "largas cerdas que le permite soportar el\n"
+    "frío. Usa los colmillos para desenterrar\n"
+    "los alimentos cubiertos por el hielo.");
+
+const u8 gCorsolaPokedexText[] = _(
+    "CORSOLA vive en las cálidas aguas de los\n"
+    "mares del Sur. Cuando hay contaminación,\n"
+    "las bellas ramas coralinas que le cubren\n"
+    "se decoloran y se caen a pedazos.");
+
+const u8 gRemoraidPokedexText[] = _(
+    "Traga agua y usa los abdominales para\n"
+    "lanzarla rápido contra una presa que esté\n"
+    "en el aire. Cuando va a evolucionar, se deja\n"
+    "arrastrar por la corriente de los ríos.");
+
+const u8 gOctilleryPokedexText[] = _(
+    "Se apodera de su enemigo con los\n"
+    "tentáculos y lo deja inmovilizado antes de\n"
+    "propinarle el golpe final. Si el rival es muy\n"
+    "fuerte, le escupe tinta para escapar.");
+
+const u8 gDelibirdPokedexText[] = _(
+    "Usa la cola a modo de saco para llevar su\n"
+    "alimento. Una vez, un escalador consiguió\n"
+    "coronar el Everest porque uno de estos\n"
+    "POKéMON compartió sus alimentos con él.");
+
+const u8 gMantinePokedexText[] = _(
+    "En días soleados, es posible ver bancos de\n"
+    "MANTINE saltando con elegancia sobre\n"
+    "las olas del mar. A este POKéMON no le\n"
+    "molesta que se le pegue un REMORAID.");
+
+const u8 gSkarmoryPokedexText[] = _(
+    "Tiene el cuerpo y las alas de acero.\n"
+    "Hace mucho, la gente usaba las plumas\n"
+    "que se le caían a SKARMORY para\n"
+    "forjar espadas y cuchillos.");
+
+const u8 gHoundourPokedexText[] = _(
+    "Se comunica con sus compañeros de caza\n"
+    "mediante aullidos para acorralar a las\n"
+    "presas. Su capacidad de trabajo en equipo\n"
+    "es sencillamente ejemplar.");
+
+const u8 gHoundoomPokedexText[] = _(
+    "En la manada de HOUNDOOM, el que tiene\n"
+    "los cuernos especialmente orientados\n"
+    "hacia atrás ejerce de líder. Para elegir al\n"
+    "jefe, estos POKéMON se baten entre sí.");
+
+const u8 gKingdraPokedexText[] = _(
+    "Duerme tranquilamente en el fondo\n"
+    "del mar. Cuando sale a la superficie,\n"
+    "crea un enorme torbellino que puede\n"
+    "tragarse barcos enteros.");
+
+const u8 gPhanpyPokedexText[] = _(
+    "Las enormes orejas que tiene PHANPY\n"
+    "le sirven para abanicarse. Cuando tiene\n"
+    "calor, las usa para refrescarse. Ya\n"
+    "desde pequeño tiene mucha fuerza.");
+
+const u8 gDonphanPokedexText[] = _(
+    "DONPHAN es tan fuerte que puede arrastrar\n"
+    "fácilmente un camión de descarga. Tiene\n"
+    "la piel dura como una roca. Para hacerle\n"
+    "daño, no bastan los ataques comunes.");
+
+const u8 gPorygon2PokedexText[] = _(
+    "PORYGON2 fue creado por el hombre gracias\n"
+    "a los avances científicos. Su inteligencia\n"
+    "artificial le permite aprender gestos y\n"
+    "emociones totalmente nuevas.");
+
+const u8 gStantlerPokedexText[] = _(
+    "Antes se comerciaba con la cornamenta de\n"
+    "STANTLER, considerada una obra de arte\n"
+    "de gran valor. Esto provocó que muchos\n"
+    "intentaran darle caza y casi se extingue.");
+
+const u8 gSmearglePokedexText[] = _(
+    "Marca su territorio liberando un fluido\n"
+    "corporal por el extremo de la cola. Hasta\n"
+    "la fecha, se conocen más de 5.000 tipos\n"
+    "de marcas dejadas por este POKéMON.");
+
+const u8 gTyroguePokedexText[] = _(
+    "Se pone demasiado nervioso si no lo sacan\n"
+    "a entrenarse cada día. Por esta razón, su\n"
+    "ENTRENADOR debe mantener una rutina\n"
+    "de entrenamiento regular durante la cría.");
+
+const u8 gHitmontopPokedexText[] = _(
+    "Su técnica de repartir patadas mientras\n"
+    "gira rápidamente cabeza abajo es tanto\n"
+    "ofensiva como defensiva. Se desplaza\n"
+    "más rápido girando que andando.");
+
+const u8 gSmoochumPokedexText[] = _(
+    "SMOOCHUM va corriendo por todos lados,\n"
+    "pero también se cae con frecuencia y, en\n"
+    "cuanto tiene ocasión, se mira en algún\n"
+    "lago para ver si se ha manchado la cara.");
+
+const u8 gElekidPokedexText[] = _(
+    "Acumula electricidad. Si entra en contacto\n"
+    "con metal y descarga accidentalmente\n"
+    "toda la electricidad almacenada, agita\n"
+    "los brazos en círculo para recargarse.");
+
+const u8 gMagbyPokedexText[] = _(
+    "Observando la respiración de MAGBY, se\n"
+    "sabe su estado de salud: si expulsa llamas\n"
+    "amarillas, está bien. Pero si, además de las\n"
+    "llamas, sale humo negro, está cansado.");
+
+const u8 gMiltankPokedexText[] = _(
+    "MILTANK da al día 20 litros de una dulce\n"
+    "leche que gusta a grandes y pequeños.\n"
+    "Aquellos a los que no les agrada la leche,\n"
+    "la toman en forma de yogur.");
+
+const u8 gBlisseyPokedexText[] = _(
+    "Percibe la tristeza a través de su sedoso\n"
+    "pelaje. Si ve que alguien está apenado,\n"
+    "acudirá a su lado y compartirá un\n"
+    "huevo de la felicidad para animarle.");
+
+const u8 gRaikouPokedexText[] = _(
+    "Tiene la velocidad del rayo. Al rugir, emite\n"
+    "ondas de choque que se esparcen vibrando\n"
+    "por el aire y sacuden el suelo como si\n"
+    "fueran auténticas descargas de rayo.");
+
+const u8 gEnteiPokedexText[] = _(
+    "Contiene el furor del magma. Se cree que\n"
+    "nació de la erupción de un volcán. Escupe\n"
+    "ráfagas de llamaradas que devoran todo\n"
+    "lo que tocan, reduciéndolo a cenizas.");
+
+const u8 gSuicunePokedexText[] = _(
+    "Emana la pureza de los manantiales.\n"
+    "Suele ir corriendo por el campo con\n"
+    "gran elegancia. Este POKéMON tiene el\n"
+    "poder de purificar el agua contaminada.");
+
+const u8 gLarvitarPokedexText[] = _(
+    "Nace bajo tierra a gran profundidad y se\n"
+    "abre paso hasta la superficie comiendo lo\n"
+    "que encuentra en su camino. Hasta que\n"
+    "no llega arriba, no conoce a sus padres.");
+
+const u8 gPupitarPokedexText[] = _(
+    "Crea un gas que comprime y expulsa\n"
+    "violentamente para autopropulsarse.\n"
+    "Se mantiene inalterable incluso si\n"
+    "se golpea contra el acero más duro.");
+
+const u8 gTyranitarPokedexText[] = _(
+    "Tiene una fuerza imponente: puede derribar\n"
+    "una montaña para hacer su nido. Suele\n"
+    "merodear por zonas montañosas en busca\n"
+    "de nuevos rivales contra los que luchar.");
+
+const u8 gLugiaPokedexText[] = _(
+    "La fuerza que tiene en las alas es\n"
+    "devastadora. Al batirlas, puede derribar\n"
+    "edificios enteros, por eso prefiere vivir\n"
+    "donde no hay nadie, en el fondo del mar.");
+
+const u8 gHoOhPokedexText[] = _(
+    "Su plumaje contiene siete colores que se\n"
+    "ven según el ángulo desde el que le da la\n"
+    "luz. Se cree que es portador de alegría.\n"
+    "Este POKéMON vive a los pies del arco iris.");
+
+const u8 gCelebiPokedexText[] = _(
+    "Vino del futuro haciendo un viaje en el\n"
+    "tiempo. Hay quien piensa que, mientras\n"
+    "CELEBI siga apareciendo, el futuro\n"
+    "será brillante y esperanzador.");
+
+const u8 gTreeckoPokedexText[] = _(
+    "Hace su nido en un árbol gigante y\n"
+    "defiende ferozmente su territorio\n"
+    "de cualquier peligro. Dicen que es el\n"
+    "protector de los árboles del bosque.");
+
+const u8 gGrovylePokedexText[] = _(
+    "A GROVYLE le crecen hojas que le sirven\n"
+    "de camuflaje e impiden que los enemigos\n"
+    "lo detecten cuando se encuentra en un\n"
+    "bosque cuya vegetación es frondosa.");
+
+const u8 gSceptilePokedexText[] = _(
+    "Cuando está en la selva, posee una fuerza\n"
+    "sin igual. Este POKéMON se ocupa de que los\n"
+    "árboles y las plantas crezcan bien. Regula\n"
+    "su temperatura corporal con la luz del sol.");
+
+const u8 gTorchicPokedexText[] = _(
+    "Si le atacan, se defiende escupiendo bolas\n"
+    "de fuego que forma en el estómago. Los\n"
+    "TORCHIC tienen aversión a la oscuridad\n"
+    "porque les impide ver lo que les rodea.");
+
+const u8 gCombuskenPokedexText[] = _(
+    "Propina hasta diez patadas por segundo.\n"
+    "Tiene un instinto de lucha tan fuerte\n"
+    "que no deja de pelear hasta que el\n"
+    "rival se rinde.");
+
+const u8 gBlazikenPokedexText[] = _(
+    "Aprende artes marciales en las que se dan\n"
+    "puñetazos y patadas. Al cabo de varios\n"
+    "años, se le queman las plumas y le crecen\n"
+    "otras nuevas, muy flexibles, en su lugar.");
+
+const u8 gMudkipPokedexText[] = _(
+    "En tierra firme, puede levantar grandes\n"
+    "cantos rodados haciendo palanca con\n"
+    "sus cuatro patas. Duerme enterrado\n"
+    "en el suelo, cerca del agua.");
+
+const u8 gMarshtompPokedexText[] = _(
+    "Tiene unas patas traseras fortísimas\n"
+    "que le permiten mantenerse erguido.\n"
+    "Como se debilita si se le seca la piel, juega\n"
+    "en el lodo para mantenerse hidratado.");
+
+const u8 gSwampertPokedexText[] = _(
+    "Si detecta que se acerca una tormenta,\n"
+    "protege su nido apilando cantos rodados\n"
+    "para protegerlo del fuerte oleaje.\n"
+    "Nada tan rápido como una moto acuática.");
+
+const u8 gPoochyenaPokedexText[] = _(
+    "Amenaza al enemigo enseñándole con\n"
+    "violencia los colmillos. Persigue a su\n"
+    "presa cuando huye, pero, si le atacan,\n"
+    "sale huyendo a todo correr.");
+
+const u8 gMightyenaPokedexText[] = _(
+    "MIGHTYENA vive con su jauría en estado\n"
+    "salvaje. Siempre obedece a su ENTRENADOR.\n"
+    "Derrota al enemigo gracias a un trabajo\n"
+    "de equipo perfectamente coordinado.");
+
+const u8 gZigzagoonPokedexText[] = _(
+    "Siempre se mueve hacia adelante y hacia\n"
+    "atrás frotando la nariz contra el suelo\n"
+    "en busca de algo. Es fácil identificarlo\n"
+    "por las huellas en zigzag que deja.");
+
+const u8 gLinoonePokedexText[] = _(
+    "Es tremendamente rápido si corre en línea\n"
+    "recta. Cuando detecta a su presa bajo\n"
+    "el agua de una charca, da un veloz salto\n"
+    "y la atrapa con sus afiladas garras.");
+
+const u8 gWurmplePokedexText[] = _(
+    "Se encarama a las ramas de los árboles\n"
+    "y come hojas. El hilo que escupe por la\n"
+    "boca se solidifica al contacto con el aire\n"
+    "y ralentiza los movimientos del enemigo.");
+
+const u8 gSilcoonPokedexText[] = _(
+    "Se prepara para la evolución usando la\n"
+    "energía que almacenó mientras era un\n"
+    "WURMPLE. Los dos ojos que tiene le sirven\n"
+    "para vigilar lo que ocurre en su territorio.");
+
+const u8 gBeautiflyPokedexText[] = _(
+    "Su principal característica son los\n"
+    "dibujos y colores de sus alas. Vuela por\n"
+    "campos cubiertos de flores para recoger\n"
+    "el polen. Si le molestan, ataca sin dudar.");
+
+const u8 gCascoonPokedexText[] = _(
+    "Para evitar que el enemigo lo descubra,\n"
+    "se oculta inmóvil debajo de hojas grandes\n"
+    "o entre ramas. También se recubre\n"
+    "de hojas secas para camuflarse.");
+
+const u8 gDustoxPokedexText[] = _(
+    "Es un POKéMON nocturno que llega\n"
+    "volando a la ciudad desde campos y\n"
+    "montañas atraído por las luces. Al batir\n"
+    "las alas, libera un polvillo muy tóxico.");
+
+const u8 gLotadPokedexText[] = _(
+    "Vive en charcas de agua clara. Se le\n"
+    "conoce por ayudar a POKéMON pequeños\n"
+    "a cruzar las charcas transportándolos\n"
+    "sobre la hoja que tiene en la cabeza.");
+
+const u8 gLombrePokedexText[] = _(
+    "De noche, le encanta surgir de repente\n"
+    "del río para asustar a la gente.\n"
+    "Se alimenta del musgo que crece en\n"
+    "las rocas de las cuencas de los ríos.");
+
+const u8 gLudicoloPokedexText[] = _(
+    "Cuando oye música festiva, las células\n"
+    "se le revolucionan y comienza a bailar\n"
+    "con mucho ritmo. No se acobarda\n"
+    "ni delante del enemigo más fuerte.");
+
+const u8 gSeedotPokedexText[] = _(
+    "Se cuelga de las ramas y absorbe sus\n"
+    "nutrientes. Cuando acaba de comer,\n"
+    "se queda tan lleno que acaba cayéndose\n"
+    "al suelo y dándose un tortazo.");
+
+const u8 gNuzleafPokedexText[] = _(
+    "Vive en los bosques y se le da muy bien\n"
+    "subirse a los árboles. La nariz que tiene,\n"
+    "grande y puntiaguda, es su punto débil.\n"
+    "Si se la pellizcan, pierde fuerza.");
+
+const u8 gShiftryPokedexText[] = _(
+    "Dicen que llega con los fríos vientos de\n"
+    "invierno. Se le considera guardián de los\n"
+    "bosques y se le teme; nadie se atreve\n"
+    "a adentrarse en su morada.");
+
+const u8 gTaillowPokedexText[] = _(
+    "Es pequeño, pero muy valiente. No tiene\n"
+    "problema en enfrentarse a un SKARMORY más\n"
+    "grande en igualdad de condiciones. Pero,\n"
+    "como tenga hambre, pierde determinación.");
+
+const u8 gSwellowPokedexText[] = _(
+    "SWELLOW se lanza al agua para atrapar\n"
+    "a su presa y no se le escapa ni una.\n"
+    "Suele ir volando en busca de tierras\n"
+    "de clima cálido.");
+
+const u8 gWingullPokedexText[] = _(
+    "Hace su nido en acantilados escarpados, a\n"
+    "la orilla del mar. Como le cuesta batir las\n"
+    "alas durante mucho tiempo, se deja llevar\n"
+    "por las corrientes de aire ascendentes.");
+
+const u8 gPelipperPokedexText[] = _(
+    "Va esquivando las crestas de las olas.\n"
+    "Cuando localiza a su presa, usa el enorme\n"
+    "pico que tiene para sacarla del agua.\n"
+    "También protege sus huevos con él.");
+
+const u8 gRaltsPokedexText[] = _(
+    "RALTS tiene la capacidad de detectar las\n"
+    "sensaciones de la gente y de los POKéMON\n"
+    "gracias a los cuernos de la cabeza. Si\n"
+    "percibe energía negativa, se protegerá.");
+
+const u8 gKirliaPokedexText[] = _(
+    "KIRLIA tiene poderes psicoquinéticos con\n"
+    "los que crea un espacio dimensional para\n"
+    "ver el futuro. Dicen que baila con energía\n"
+    "en las mañanas soleadas.");
+
+const u8 gGardevoirPokedexText[] = _(
+    "Al parecer, no siente la fuerza de la\n"
+    "gravedad porque se sostiene gracias a\n"
+    "la energía psicoquinética. Por proteger\n"
+    "a su ENTRENADOR, sería capaz de todo.");
+
+const u8 gSurskitPokedexText[] = _(
+    "Se agrupan en charcos después de la lluvia\n"
+    "de la tarde, moviéndose por la superficie\n"
+    "del agua como si se deslizaran. Segregan\n"
+    "una miel de dulce aroma por la cabeza.");
+
+const u8 gMasquerainPokedexText[] = _(
+    "Intimida al enemigo con los ojos que tiene\n"
+    "dibujados en las antenas. Como no puede\n"
+    "volar si se le mojan las alas, se protege\n"
+    "de la lluvia bajo aleros y grandes árboles.");
+
+const u8 gShroomishPokedexText[] = _(
+    "Le encanta alimentarse de la tierra\n"
+    "abonada y húmeda de los bosques. Si vas a\n"
+    "un bosque después de que haya llovido,\n"
+    "verás a SHROOMISH engullendo tierra.");
+
+const u8 gBreloomPokedexText[] = _(
+    "Libera esporas por los orificios de la\n"
+    "cubierta de la cabeza. Le encanta el clima\n"
+    "cálido y húmedo. Se nutre de árboles y\n"
+    "plantas que hay en el campo y en el bosque.");
+
+const u8 gSlakothPokedexText[] = _(
+    "Duerme prácticamente día y noche.\n"
+    "Nunca cambia de madriguera, aunque\n"
+    "a veces suele recorrer grandes distancias\n"
+    "nadando en las aguas de los ríos.");
+
+const u8 gVigorothPokedexText[] = _(
+    "No puede estarse quieto porque tiene\n"
+    "la sangre en continua ebullición. Se pasa\n"
+    "el día corriendo por campos y montañas\n"
+    "para calmarse y poder dormir por la noche.");
+
+const u8 gSlakingPokedexText[] = _(
+    "Cuando es temporada, los SLAKING\n"
+    "se agrupan cerca de los árboles y esperan\n"
+    "con paciencia a que la fruta madura caiga.");
+
+const u8 gNincadaPokedexText[] = _(
+    "Hace su nido en las raíces de un árbol\n"
+    "resistente. Tiene unas antenas con forma\n"
+    "de bigotes que usa para examinar\n"
+    "el oscuro terreno que le rodea.");
+
+const u8 gNinjaskPokedexText[] = _(
+    "Como se mueve de un lado a otro a una\n"
+    "velocidad de vértigo, es casi imposible\n"
+    "verlo. Oír su zumbido durante mucho\n"
+    "tiempo llega a dar dolor de cabeza.");
+
+const u8 gShedinjaPokedexText[] = _(
+    "Curioso POKéMON que permanece\n"
+    "en suspensión sin mover las alas.\n"
+    "Su interior está hueco y\n"
+    "totalmente oscuro.");
+
+const u8 gWhismurPokedexText[] = _(
+    "Suena con el mismo volumen que un reactor.\n"
+    "Aspira a través de sus canales auditivos,\n"
+    "por eso puede gritar continuamente\n"
+    "sin parar para recuperar el aliento.");
+
+const u8 gLoudredPokedexText[] = _(
+    "Orienta los altavoces redondos que tiene\n"
+    "en la cabeza para atacar a su rival con\n"
+    "ondas ultrasónicas a gran volumen. Genera\n"
+    "energía dando pisotones en el suelo.");
+
+const u8 gExploudPokedexText[] = _(
+    "Tiene órganos que generan sonido por\n"
+    "todo el cuerpo. Se comunica con otros\n"
+    "ajustando el tono y el volumen de los\n"
+    "gritos que emite.");
+
+const u8 gMakuhitaPokedexText[] = _(
+    "Lo que más le gusta es fortalecer su\n"
+    "cuerpo. Si notas que el suelo de una\n"
+    "cueva tiembla y el sonido retumba, es\n"
+    "porque MAKUHITA está entrenándose.");
+
+const u8 gHariyamaPokedexText[] = _(
+    "Tiene la costumbre de desafiar a otros sin\n"
+    "medir la fuerza del adversario. Alguna vez\n"
+    "se ha montado sobre las vías del tren\n"
+    "y parado trenes a base de puñetazos.");
+
+const u8 gAzurillPokedexText[] = _(
+    "Su cola es una especie de pelota de goma\n"
+    "que bota y contiene los nutrientes que\n"
+    "necesita. En días soleados, se reúne con\n"
+    "otros en la orilla para jugar chapoteando.");
+
+const u8 gNosepassPokedexText[] = _(
+    "Su cuerpo emite un magnetismo de gran\n"
+    "alcance. Se alimenta de las presas que\n"
+    "atrae. La fuerza que ejerce se intensifica\n"
+    "en las estaciones frías.");
+
+const u8 gSkittyPokedexText[] = _(
+    "La forma de ser de SKITTY, entrañable y\n"
+    "adorable, lo hace tremendamente popular.\n"
+    "En combate, hincha la cola y amenaza\n"
+    "a su rival con un agudo gruñido.");
+
+const u8 gDelcattyPokedexText[] = _(
+    "Prefiere buscar cada vez sitios cómodos\n"
+    "para dormir a tener una guarida\n"
+    "permanente. Es nocturno y se vuelve\n"
+    "activo al anochecer.");
+
+const u8 gSableyePokedexText[] = _(
+    "Cava conductos en cuevas usando sus\n"
+    "afiladas garras para buscar rocas con las\n"
+    "que alimentarse. SABLEYE permanece al\n"
+    "acecho en la oscuridad; no es fácil verlo.");
+
+const u8 gMawilePokedexText[] = _(
+    "Las gigantescas fauces que tiene fueron\n"
+    "cuernos de acero en su día. Engaña\n"
+    "al enemigo con gestos dóciles y a\n"
+    "continuación abre sus fauces.");
+
+const u8 gAronPokedexText[] = _(
+    "Está cubierto por una coraza de acero\n"
+    "que se regenera cuando evoluciona.\n"
+    "La coraza vieja, ya estropeada, se recicla\n"
+    "para fabricar productos de hierro.");
+
+const u8 gLaironPokedexText[] = _(
+    "Si dos LAIRON se encuentran en su\n"
+    "hábitat natural, luchan por su territorio\n"
+    "golpeándose con sus cuerpos de acero. El\n"
+    "estruendo que forman se oye a kilómetros.");
+
+const u8 gAggronPokedexText[] = _(
+    "Los cuernos de hierro que tiene le crecen\n"
+    "poco a poco. Sirven para determinar la edad\n"
+    "que tiene. Luce los desperfectos de su\n"
+    "coraza en recuerdo de sus combates.");
+
+const u8 gMedititePokedexText[] = _(
+    "Medita sin parar durante muchas horas\n"
+    "al día. Su práctica del yoga es rigurosa;\n"
+    "como resultado, logra canalizar su\n"
+    "energía espiritual hasta llegar a volar.");
+
+const u8 gMedichamPokedexText[] = _(
+    "Gracias a agotadoras sesiones de yoga,\n"
+    "ha adquirido la capacidad de prever las\n"
+    "acciones del enemigo. Lucha realizando\n"
+    "movimientos elegantes y rítmicos.");
+
+const u8 gElectrikePokedexText[] = _(
+    "Genera electricidad usando la fricción\n"
+    "de la atmósfera. En estaciones de vientos\n"
+    "áridos, su cuerpo se inflama y lanza\n"
+    "chispas de forma violenta.");
+
+const u8 gManectricPokedexText[] = _(
+    "Como los rayos caen cerca de donde está,\n"
+    "se pensó que MANECTRIC nacía de ellos.\n"
+    "En combate, crea nubes de tormenta.");
+
+const u8 gPluslePokedexText[] = _(
+    "Siempre anima a sus compañeros POKéMON.\n"
+    "Crea cortocircuitos con la electricidad\n"
+    "que libera por las patas para hacer\n"
+    "pompones de chispas y animar al resto.");
+
+const u8 gMinunPokedexText[] = _(
+    "En una reunión de estudiosos de POKéMON,\n"
+    "se anunció que la exposición simultánea a\n"
+    "la electricidad de un PLUSLE y de un MINUN\n"
+    "mejora la circulación y da más vitalidad.");
+
+const u8 gVolbeatPokedexText[] = _(
+    "Los VOLBEAT vuelan en enjambres dibujando\n"
+    "con la luz de la cola formas geométricas en\n"
+    "el cielo nocturno. Si la charca en la que\n"
+    "viven se ensucia, se mudan a otro sitio.");
+
+const u8 gIllumisePokedexText[] = _(
+    "Este POKéMON nocturno sólo está activo\n"
+    "de noche. Guía a un enjambre de VOLBEAT\n"
+    "para que hagan dibujos en el cielo de la\n"
+    "noche y saben hacer hasta 200 distintos.");
+
+const u8 gRoseliaPokedexText[] = _(
+    "Si ROSELIA absorbe sus nutrientes\n"
+    "de las ricas lluvias primaverales, florece\n"
+    "con gran belleza. La fragancia de sus\n"
+    "flores hace que sus enemigos se confíen.");
+
+const u8 gGulpinPokedexText[] = _(
+    "Con el líquido que tiene en el estómago,\n"
+    "puede digerir hasta hierro de desecho.\n"
+    "Es capaz de tragarse de una sentada\n"
+    "cualquier cosa que lo iguale en tamaño.");
+
+const u8 gSwalotPokedexText[] = _(
+    "Tiene un ácido tan potente en el estómago\n"
+    "que le permite digerir casi cualquier cosa.\n"
+    "Lo único que SWALOT no puede digerir\n"
+    "es su propio estómago.");
+
+const u8 gCarvanhaPokedexText[] = _(
+    "Los CARVANHA van en grupo atacando\n"
+    "barcos hasta que los hunden. Aunque dicen\n"
+    "que es un POKéMON muy violento, huye presa\n"
+    "de la timidez en cuanto se queda solo.");
+
+const u8 gSharpedoPokedexText[] = _(
+    "Este POKéMON, muy violento y astuto, es el\n"
+    "terror de los mares. La textura de su piel\n"
+    "reduce al mínimo la resistencia al agua.\n"
+    "Llega a alcanzar los 120 km por hora.");
+
+const u8 gWailmerPokedexText[] = _(
+    "Aunque este POKéMON vive generalmente\n"
+    "en el mar, puede sobrevivir en tierra,\n"
+    "pero durante poco tiempo.\n"
+    "Si se le seca el cuerpo, pierde vitalidad.");
+
+const u8 gWailordPokedexText[] = _(
+    "Respira a través de los espiráculos que\n"
+    "saca a la superficie. Si toma aire hasta el\n"
+    "máximo de su capacidad, puede sumergirse\n"
+    "a una profundidad de hasta 3.000 m.");
+
+const u8 gNumelPokedexText[] = _(
+    "Un NUMEL almacena magma en ebullición\n"
+    "dentro de la joroba del lomo. Es robusto y\n"
+    "puede cargar hasta con 100 kg. Ayuda a la\n"
+    "gente en su trabajo desde hace mucho.");
+
+const u8 gCameruptPokedexText[] = _(
+    "Vive en el cráter de un volcán. Cada 10\n"
+    "años, los volcanes que tiene en el lomo\n"
+    "entran en erupción de forma violenta. Se\n"
+    "están investigando las posibles causas.");
+
+const u8 gTorkoalPokedexText[] = _(
+    "Lucha usando la energía que obtiene\n"
+    "quemando carbón. Cuando suelta humo por\n"
+    "los orificios nasales, emite un sonido que\n"
+    "recuerda a la chimenea de una locomotora.");
+
+const u8 gSpoinkPokedexText[] = _(
+    "Manipula energía psicoquinética a su\n"
+    "antojo. No deja de botar ni cuando está\n"
+    "dormido. Le encanta comer setas que\n"
+    "crecen bajo tierra.");
+
+const u8 gGrumpigPokedexText[] = _(
+    "Almacena energía en las perlas negras de\n"
+    "la frente. Al usar poderes psíquicos, hace\n"
+    "un curioso paso de baile. Su manera de\n"
+    "bailar se ha hecho de lo más popular.");
+
+const u8 gSpindaPokedexText[] = _(
+    "Se le diferencia por los dibujos del pelaje;\n"
+    "no hay dos iguales. Su forma de andar,\n"
+    "inestable y torpe, logra confundir al\n"
+    "enemigo y hacer que su puntería falle.");
+
+const u8 gTrapinchPokedexText[] = _(
+    "Tiene unas enormes fauces con las que\n"
+    "destruye piedras. Como tiene una cabeza\n"
+    "muy grande, le cuesta conseguir ponerse\n"
+    "de pie si se cae de espaldas.");
+
+const u8 gVibravaPokedexText[] = _(
+    "Cuando frota las alas, emite ondas\n"
+    "ultrasónicas, pero, como aún no están\n"
+    "completamente desarrolladas, sólo\n"
+    "puede volar distancias cortas.");
+
+const u8 gFlygonPokedexText[] = _(
+    "El aleteo de sus alas es muy melódico.\n"
+    "Para evitar que el enemigo lo descubra,\n"
+    "levanta con las alas una nube de arena\n"
+    "del desierto, tras la cual se oculta.");
+
+const u8 gCacneaPokedexText[] = _(
+    "CACNEA vive en desiertos donde nunca\n"
+    "llueve. Para luchar, balancea los brazos,\n"
+    "muy gruesos y cubiertos de pinchos.\n"
+    "Una vez al año, le brota una flor amarilla.");
+
+const u8 gCacturnePokedexText[] = _(
+    "Como ha pasado miles de años en\n"
+    "áridos desiertos, la sangre se le ha\n"
+    "transformado en una especie de arena.\n"
+    "Es nocturno, así que caza de noche.");
+
+const u8 gSwabluPokedexText[] = _(
+    "Tiene unas alas como nubes de algodón.\n"
+    "Transcurrido el invierno, en el que la\n"
+    "comida escasea, bandadas de SWABLU\n"
+    "migran a los pueblos en primavera.");
+
+const u8 gAltariaPokedexText[] = _(
+    "Canturrea con una bella voz de soprano.\n"
+    "Vuela entre las nubes blancas del cielo\n"
+    "azul. Lanza ardientes bolas de fuego\n"
+    "por el pico.");
+
+const u8 gZangoosePokedexText[] = _(
+    "Cuando lucha, se yergue sobre las patas\n"
+    "traseras y ataca con sus afiladas zarpas.\n"
+    "El pelaje se le eriza si se encuentra\n"
+    "con un SEVIPER.");
+
+const u8 gSeviperPokedexText[] = _(
+    "SEVIPER y ZANGOOSE son rivales eternos.\n"
+    "Contrarresta la gran agilidad de ZANGOOSE\n"
+    "con una cola en forma de espada que\n"
+    "además rezuma un veneno terrible.");
+
+const u8 gLunatonePokedexText[] = _(
+    "Llega a ser muy activo en las noches\n"
+    "de luna llena. Este POKéMON fue\n"
+    "descubierto hace 40 años en el lugar\n"
+    "en el que había caído un meteorito.");
+
+const u8 gSolrockPokedexText[] = _(
+    "El origen de la fuerza de este POKéMON\n"
+    "está en la energía solar. En días soleados,\n"
+    "grupos de SOLROCK se alinean de cara\n"
+    "al sol para absorber su luz.");
+
+const u8 gBarboachPokedexText[] = _(
+    "Tiene el cuerpo cubierto de una película\n"
+    "viscosa. Esta capa actúa como barrera y\n"
+    "evita que los gérmenes del agua fangosa\n"
+    "penetren en el cuerpo de BARBOACH.");
+
+const u8 gWhiscashPokedexText[] = _(
+    "Nadie sabe cómo, pero puede predecir\n"
+    "terremotos. De día duerme en el fango del\n"
+    "fondo de una charca. Ya despierto, se\n"
+    "pasa toda la noche alimentándose.");
+
+const u8 gCorphishPokedexText[] = _(
+    "Una vez que agarra a su presa con sus\n"
+    "grandes pinzas, no la suelta pase lo que\n"
+    "pase. Es un POKéMON resistente que\n"
+    "puede subsistir en cualquier medio.");
+
+const u8 gCrawdauntPokedexText[] = _(
+    "Es un POKéMON brutal que disfruta\n"
+    "luchando. Un CRAWDAUNT veterano que\n"
+    "ha salido airoso de miles de combates tiene\n"
+    "enormes pinzas llenas de cicatrices.");
+
+const u8 gBaltoyPokedexText[] = _(
+    "Los BALTOY se mueven haciendo girar\n"
+    "su única extremidad inferior. Aparecen\n"
+    "representados en las pinturas murales\n"
+    "de las ruinas de una antigua ciudad.");
+
+const u8 gClaydolPokedexText[] = _(
+    "CLAYDOL duerme mientras levita.\n"
+    "Tiene los brazos separados del cuerpo\n"
+    "y los mantiene flotando gracias a\n"
+    "sus poderes psicoquinéticos.");
+
+const u8 gLileepPokedexText[] = _(
+    "Se disfraza de alga marina moviendo los\n"
+    "tentáculos. Si una presa se le acerca\n"
+    "despistada, será engullida de golpe.\n"
+    "Se extinguió hace 100 millones de años.");
+
+const u8 gCradilyPokedexText[] = _(
+    "Arrastra su pesado cuerpo por el fondo\n"
+    "marino. Anida cerca de la superficie, en\n"
+    "aguas templadas. Cuando hay marea baja,\n"
+    "es posible ver a CRADILY en la playa.");
+
+const u8 gAnorithPokedexText[] = _(
+    "La ciencia logró regenerarlo a partir de\n"
+    "un fósil. Nada batiendo las ocho alas\n"
+    "que tiene a los lados y que fueron patas\n"
+    "que se adaptaron a su nueva vida en el mar.");
+
+const u8 gArmaldoPokedexText[] = _(
+    "ARMALDO vive generalmente en tierra.\n"
+    "Sin embargo, cuando caza, se zambulle\n"
+    "en el océano y se pone a nadar usando\n"
+    "las dos grandes alas que tiene.");
+
+const u8 gFeebasPokedexText[] = _(
+    "FEEBAS vive en charcas llenas de algas.\n"
+    "Parece que el aspecto terriblemente\n"
+    "descuidado que ofrece sea la causa de\n"
+    "que pocos ENTRENADORES lo críen.");
+
+const u8 gMiloticPokedexText[] = _(
+    "Dicen que vive en el fondo de los grandes\n"
+    "lagos. Se le considera el POKéMON más\n"
+    "bello que existe y se le ha representado\n"
+    "en multitud de pinturas y estatuas.");
+
+const u8 gCastformPokedexText[] = _(
+    "Altera su forma según el tiempo que haga.\n"
+    "Los cambios del clima, como la temperatura\n"
+    "y la humedad, parecen afectar a su\n"
+    "estructura celular.");
+
+const u8 gKecleonPokedexText[] = _(
+    "Este POKéMON tiene la capacidad de alterar\n"
+    "la coloración de su cuerpo para camuflarse\n"
+    "en el medio en el que esté. Si se asusta,\n"
+    "KECLEON recuperará sus colores originales.");
+
+const u8 gShuppetPokedexText[] = _(
+    "Este POKéMON deambula en la oscuridad\n"
+    "de la noche en busca de sentimientos\n"
+    "negativos, como el rencor y la envidia.\n"
+    "Antes del amanecer, se retira a su hogar.");
+
+const u8 gBanettePokedexText[] = _(
+    "Solía ser un muñeco de felpa al que\n"
+    "abandonaron. Dicen que vive en vertederos\n"
+    "de basura y que va buscando al niño\n"
+    "que lo tiró en su día.");
+
+const u8 gDuskullPokedexText[] = _(
+    "Una única mirada lanzada por su ojo\n"
+    "escarlata basta para dejar petrificado\n"
+    "de miedo al rival más fuerte. Deambula\n"
+    "sin rumbo al amparo de la noche.");
+
+const u8 gDusclopsPokedexText[] = _(
+    "Se piensa que su cuerpo es hueco y\n"
+    "que sólo contiene una fantasmagórica\n"
+    "bola de fuego. Con todo, nadie ha\n"
+    "podido confirmar esta teoría.");
+
+const u8 gTropiusPokedexText[] = _(
+    "Logra volar agitando sus amplias hojas.\n"
+    "El racimo de fruta que le crece alrededor\n"
+    "del cuello es de una dulzura exquisita.\n"
+    "En primavera, libera polen por el cuello.");
+
+const u8 gChimechoPokedexText[] = _(
+    "Se ponen a volar sin parar cuando llega\n"
+    "la estación cálida. Se comunica con otros\n"
+    "a través de siete tipos de grito distintos\n"
+    "muy característicos.");
+
+const u8 gAbsolPokedexText[] = _(
+    "Detecta con precisión cualquier cambio\n"
+    "producido en la atmósfera o la tierra y\n"
+    "predice catástrofes naturales. Es un\n"
+    "POKéMON longevo que vive 100 años.");
+
+const u8 gWynautPokedexText[] = _(
+    "WYNAUT disfruta comiendo fruta dulce. Es\n"
+    "vivo al escogerla: usa los brazos con pinta\n"
+    "de oreja que tiene. Se reúne con otros en\n"
+    "huertos frutales, atraído por el aroma.");
+
+const u8 gSnoruntPokedexText[] = _(
+    "Tienden a desplazarse en grupos de cinco\n"
+    "SNORUNT. En las zonas de nieve se dice\n"
+    "que, cuando se les ve entrada la noche, es\n"
+    "porque va a nevar a la mañana siguiente.");
+
+const u8 gGlaliePokedexText[] = _(
+    "Un GLALIE tiene el poder de congelar\n"
+    "al instante la humedad de la atmósfera:\n"
+    "así forma una nube de cristales de hielo\n"
+    "con forma de diamantes a su alrededor.");
+
+const u8 gSphealPokedexText[] = _(
+    "Está cubierto por completo con un grueso\n"
+    "pelaje. Gracias a él, nunca siente frío:\n"
+    "ni cuando rueda sobre placas de hielo\n"
+    "ni cuando bucea en el mar.");
+
+const u8 gSealeoPokedexText[] = _(
+    "SEALEO vive en manadas sobre placas\n"
+    "de hielo. Puede romper el hielo usando\n"
+    "sus potentes aletas y se zambulle en \n"
+    "el mar cinco veces al día para pescar.");
+
+const u8 gWalreinPokedexText[] = _(
+    "Para proteger a su manada, el líder luchará\n"
+    "hasta el final contra todo lo que invada su\n"
+    "territorio. En el transcurso del combate,\n"
+    "es posible que pierda los colmillos.");
+
+const u8 gClamperlPokedexText[] = _(
+    "Un CLAMPERL cierra de golpe la concha\n"
+    "para evitar que escape su presa.\n"
+    "Dicen que la perla que crea al evolucionar\n"
+    "está dotada de una misteriosa energía.");
+
+const u8 gHuntailPokedexText[] = _(
+    "Para soportar la machacante presión\n"
+    "del mar a gran profundidad, desarrolla una\n"
+    "espina dorsal muy gruesa y fuerte. La cola,\n"
+    "con forma de pez, tiene ojos que brillan.");
+
+const u8 gGorebyssPokedexText[] = _(
+    "GOREBYSS absorbe los fluidos corporales\n"
+    "de su presa a través de la boca, que es\n"
+    "fina y tubular. Cuando acaba de comer,\n"
+    "se le acentúa el tono rosado.");
+
+const u8 gRelicanthPokedexText[] = _(
+    "Se llegó a creer que se había extinguido.\n"
+    "La especie no ha cambiado de forma desde\n"
+    "hace 100 millones de años. Camina por el\n"
+    "fondo marino usando las aletas frontales.");
+
+const u8 gLuvdiscPokedexText[] = _(
+    "Para LUVDISC, las ramas de CORSOLA\n"
+    "son su nido. Existe una antigua costumbre\n"
+    "que consiste en regalar un LUVDISC\n"
+    "para expresar un sentimiento amoroso.");
+
+const u8 gBagonPokedexText[] = _(
+    "Aunque pequeño, este POKéMON es muy\n"
+    "fuerte porque su cuerpo es puro músculo.\n"
+    "Propina cabezazos con el cráneo, que\n"
+    "es tan duro como el hierro.");
+
+const u8 gShelgonPokedexText[] = _(
+    "Apenas come cuando va a evolucionar.\n"
+    "Soportar el hambre lo vuelve resistente.\n"
+    "Cuando empieza a evolucionar, comienza\n"
+    "a perder su coraza.");
+
+const u8 gSalamencePokedexText[] = _(
+    "Después de muchos años, su estructura\n"
+    "celular sufrió una mutación repentina y\n"
+    "le crecieron alas. Cuando se enfada, no\n"
+    "se atiene a razones y entra en cólera.");
+
+const u8 gBeldumPokedexText[] = _(
+    "Cuando los BELDUM van en enjambre, se\n"
+    "mueven al unísono en perfecta armonía,\n"
+    "como si fueran un solo POKéMON.\n"
+    "Se comunican por ondas cerebrales.");
+
+const u8 gMetangPokedexText[] = _(
+    "Sus brazos acaban en unas garras que\n"
+    "acumulan energía destructiva con la que\n"
+    "rasga planchas de hierro como si fueran\n"
+    "de papel. Vuela a más de 100 km por hora.");
+
+const u8 gMetagrossPokedexText[] = _(
+    "METAGROSS tiene cuatro cerebros unidos\n"
+    "por una compleja red neuronal. Esta\n"
+    "integración hace que sea más inteligente\n"
+    "que un ordenador de última generación.");
+
+const u8 gRegirockPokedexText[] = _(
+    "Está enteramente formado por rocas\n"
+    "y cantos rodados. Si se le desprendieran\n"
+    "partes del cuerpo en combate, REGIROCK\n"
+    "se repararía agregando rocas nuevas.");
+
+const u8 gRegicePokedexText[] = _(
+    "Está formado en su totalidad por hielo\n"
+    "de la Antártica. Todas las investigaciones\n"
+    "parecen indicar que dicho hielo procede\n"
+    "de alguna glaciación.");
+
+const u8 gRegisteelPokedexText[] = _(
+    "Su cuerpo está compuesto del metal\n"
+    "más duro que hay; una misteriosa\n"
+    "sustancia que, además de ser muy sólida,\n"
+    "se contrae y dilata con facilidad.");
+
+const u8 gLatiasPokedexText[] = _(
+    "Es parte de una manada de pequeño\n"
+    "tamaño. Rara vez entra en contacto con\n"
+    "la gente o con otros POKéMON. Si siente\n"
+    "la presencia del enemigo, desaparece.");
+
+const u8 gLatiosPokedexText[] = _(
+    "Incluso oculto, detecta la ubicación de\n"
+    "los demás y capta sus emociones\n"
+    "telepáticamente. Es tan inteligente\n"
+    "que entiende el lenguaje humano.");
+
+const u8 gKyogrePokedexText[] = _(
+    "En la mitología se considera a KYOGRE\n"
+    "como el creador del mar. Tras largos años\n"
+    "de enfrentamiento con GROUDON,\n"
+    "se echó a dormir en el fondo del mar.");
+
+const u8 gGroudonPokedexText[] = _(
+    "En la mitología se considera a GROUDON\n"
+    "el creador de la tierra. Duerme enterrado\n"
+    "en magma y dicen que, al despertar, hace\n"
+    "que los volcanes entren en erupción.");
+
+const u8 gRayquazaPokedexText[] = _(
+    "Este POKéMON vuela sin parar por la\n"
+    "capa de ozono. Dicen que, si KYOGRE\n"
+    "y GROUDON fueran a luchar, bajaría\n"
+    "a tierra firme.");
+
+const u8 gJirachiPokedexText[] = _(
+    "Dicen que JIRACHI hace que se cumplan\n"
+    "los deseos. Mientras duerme, una\n"
+    "resistente capa cristalina lo envuelve\n"
+    "para protegerlo de los enemigos.");
+
+const u8 gDeoxysPokedexText[] = _(
+    "Es el resultado de la mutación que sufrió\n"
+    "un virus espacial expuesto a un rayo láser.\n"
+    "Se caracteriza por tener una velocidad\n"
+    "y agilidad superiores a las del resto.");
diff --git a/src/data/tilesets/metatiles.h b/src/data/tilesets/metatiles.h
index 48f230b821..8e057b066f 100644
--- a/src/data/tilesets/metatiles.h
+++ b/src/data/tilesets/metatiles.h
@@ -53,6 +53,8 @@ const u16 gMetatileAttributes_InsideBuilding[] = INCBIN_U16("data/tilesets/prima
 const u16 gMetatiles_Shop[] = INCBIN_U16("data/tilesets/secondary/shop/french/metatiles.bin");
 #elif ITALIAN
 const u16 gMetatiles_Shop[] = INCBIN_U16("data/tilesets/secondary/shop/italian/metatiles.bin");
+#elif SPANISH
+const u16 gMetatiles_Shop[] = INCBIN_U16("data/tilesets/secondary/shop/spanish/metatiles.bin");
 #else //ENGLISH
 const u16 gMetatiles_Shop[] = INCBIN_U16("data/tilesets/secondary/shop/metatiles.bin");
 #endif
diff --git a/src/data/trainers.h b/src/data/trainers.h
index 8f4b40e768..5e4f6fd225 100644
--- a/src/data/trainers.h
+++ b/src/data/trainers.h
@@ -18,10 +18,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_HIKER,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER,
         .trainerPic = TRAINER_PIC_HIKER,
-        .trainerName = LANGUAGE_STRING(
-            "SAWYER",
-            "EMILIEN",
-            "DOROTEO"),
+        .trainerName = LANGUAGE_STRING("SAWYER", "EMILIEN", "DOROTEO", "SOREN"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
@@ -33,10 +30,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_TEAM_AQUA,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_AQUA,
         .trainerPic = TRAINER_PIC_AQUA_GRUNT_M,
-        .trainerName = LANGUAGE_STRING(
-            "GRUNT",
-            "SBIRE",
-            "RECLUTA"),
+        .trainerName = LANGUAGE_STRING("GRUNT", "SBIRE", "RECLUTA", "SOLDADO"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -48,10 +42,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_TEAM_AQUA,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_AQUA,
         .trainerPic = TRAINER_PIC_AQUA_GRUNT_M,
-        .trainerName = LANGUAGE_STRING(
-            "GRUNT",
-            "SBIRE",
-            "RECLUTA"),
+        .trainerName = LANGUAGE_STRING("GRUNT", "SBIRE", "RECLUTA", "SOLDADO"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -63,10 +54,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_TEAM_AQUA,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_AQUA,
         .trainerPic = TRAINER_PIC_AQUA_GRUNT_M,
-        .trainerName = LANGUAGE_STRING(
-            "GRUNT",
-            "SBIRE",
-            "RECLUTA"),
+        .trainerName = LANGUAGE_STRING("GRUNT", "SBIRE", "RECLUTA", "SOLDADO"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -78,10 +66,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_TEAM_AQUA,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_AQUA,
         .trainerPic = TRAINER_PIC_AQUA_GRUNT_M,
-        .trainerName = LANGUAGE_STRING(
-            "GRUNT",
-            "SBIRE",
-            "RECLUTA"),
+        .trainerName = LANGUAGE_STRING("GRUNT", "SBIRE", "RECLUTA", "SOLDADO"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -93,10 +78,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_TEAM_AQUA,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_AQUA,
         .trainerPic = TRAINER_PIC_AQUA_GRUNT_M,
-        .trainerName = LANGUAGE_STRING(
-            "GRUNT",
-            "SBIRE",
-            "RECLUTA"),
+        .trainerName = LANGUAGE_STRING("GRUNT", "SBIRE", "RECLUTA", "SOLDADO"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -108,10 +90,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_TEAM_AQUA,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_AQUA,
         .trainerPic = TRAINER_PIC_AQUA_GRUNT_M,
-        .trainerName = LANGUAGE_STRING(
-            "GRUNT",
-            "SBIRE",
-            "RECLUTA"),
+        .trainerName = LANGUAGE_STRING("GRUNT", "SBIRE", "RECLUTA", "SOLDADO"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -123,10 +102,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_TEAM_AQUA,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_AQUA,
         .trainerPic = TRAINER_PIC_AQUA_GRUNT_M,
-        .trainerName = LANGUAGE_STRING(
-            "GRUNT",
-            "SBIRE",
-            "RECLUTA"),
+        .trainerName = LANGUAGE_STRING("GRUNT", "SBIRE", "RECLUTA", "SOLDADO"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -138,10 +114,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_PKMN_BREEDER,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE,
         .trainerPic = TRAINER_PIC_POKEMON_BREEDER_F,
-        .trainerName = LANGUAGE_STRING(
-            "GABRIELLE",
-            "LARA",
-            "GABRY"),
+        .trainerName = LANGUAGE_STRING("GABRIELLE", "LARA", "GABRY", "GABILA"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -153,10 +126,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_TEAM_AQUA,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_AQUA,
         .trainerPic = TRAINER_PIC_AQUA_GRUNT_M,
-        .trainerName = LANGUAGE_STRING(
-            "GRUNT",
-            "SBIRE",
-            "RECLUTA"),
+        .trainerName = LANGUAGE_STRING("GRUNT", "SBIRE", "RECLUTA", "SOLDADO"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -168,10 +138,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_COOLTRAINER,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL,
         .trainerPic = TRAINER_PIC_COOLTRAINER_M,
-        .trainerName = LANGUAGE_STRING(
-            "MARCEL",
-            "MARCEL",
-            "MARCEL"),
+        .trainerName = LANGUAGE_STRING("MARCEL", "MARCEL", "MARCEL", "MARCE"),
         .items = {ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
@@ -183,10 +150,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_BIRD_KEEPER,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL,
         .trainerPic = TRAINER_PIC_BIRD_KEEPER,
-        .trainerName = LANGUAGE_STRING(
-            "ALBERTO",
-            "HUBERT",
-            "ALBERTINO"),
+        .trainerName = LANGUAGE_STRING("ALBERTO", "HUBERT", "ALBERTINO", "ALBER"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -198,10 +162,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_COLLECTOR,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS,
         .trainerPic = TRAINER_PIC_COLLECTOR,
-        .trainerName = LANGUAGE_STRING(
-            "ED",
-            "ED",
-            "ED"),
+        .trainerName = LANGUAGE_STRING("ED", "ED", "ED", "MANU"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -213,10 +174,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_TEAM_AQUA,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_AQUA,
         .trainerPic = TRAINER_PIC_AQUA_GRUNT_F,
-        .trainerName = LANGUAGE_STRING(
-            "GRUNT",
-            "SBIRE",
-            "RECLUTA"),
+        .trainerName = LANGUAGE_STRING("GRUNT", "SBIRE", "RECLUTA", "SOLDADO"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -228,10 +186,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_SWIMMER_M,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SWIMMER,
         .trainerPic = TRAINER_PIC_SWIMMER_M,
-        .trainerName = LANGUAGE_STRING(
-            "DECLAN",
-            "ARNO",
-            "DECLAN"),
+        .trainerName = LANGUAGE_STRING("DECLAN", "ARNO", "DECLAN", "DERO"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -243,10 +198,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_TEAM_AQUA,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_AQUA,
         .trainerPic = TRAINER_PIC_AQUA_GRUNT_M,
-        .trainerName = LANGUAGE_STRING(
-            "GRUNT",
-            "SBIRE",
-            "RECLUTA"),
+        .trainerName = LANGUAGE_STRING("GRUNT", "SBIRE", "RECLUTA", "SOLDADO"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -258,10 +210,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_TEAM_AQUA,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_AQUA,
         .trainerPic = TRAINER_PIC_AQUA_GRUNT_M,
-        .trainerName = LANGUAGE_STRING(
-            "GRUNT",
-            "SBIRE",
-            "RECLUTA"),
+        .trainerName = LANGUAGE_STRING("GRUNT", "SBIRE", "RECLUTA", "SOLDADO"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -273,10 +222,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_TEAM_AQUA,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_AQUA,
         .trainerPic = TRAINER_PIC_AQUA_GRUNT_M,
-        .trainerName = LANGUAGE_STRING(
-            "GRUNT",
-            "SBIRE",
-            "RECLUTA"),
+        .trainerName = LANGUAGE_STRING("GRUNT", "SBIRE", "RECLUTA", "SOLDADO"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -288,10 +234,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_TEAM_AQUA,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_AQUA,
         .trainerPic = TRAINER_PIC_AQUA_GRUNT_M,
-        .trainerName = LANGUAGE_STRING(
-            "GRUNT",
-            "SBIRE",
-            "RECLUTA"),
+        .trainerName = LANGUAGE_STRING("GRUNT", "SBIRE", "RECLUTA", "SOLDADO"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -303,10 +246,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_TEAM_AQUA,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_AQUA,
         .trainerPic = TRAINER_PIC_AQUA_GRUNT_M,
-        .trainerName = LANGUAGE_STRING(
-            "GRUNT",
-            "SBIRE",
-            "RECLUTA"),
+        .trainerName = LANGUAGE_STRING("GRUNT", "SBIRE", "RECLUTA", "SOLDADO"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -318,10 +258,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_TEAM_AQUA,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_AQUA,
         .trainerPic = TRAINER_PIC_AQUA_GRUNT_M,
-        .trainerName = LANGUAGE_STRING(
-            "GRUNT",
-            "SBIRE",
-            "RECLUTA"),
+        .trainerName = LANGUAGE_STRING("GRUNT", "SBIRE", "RECLUTA", "SOLDADO"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -333,10 +270,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_TEAM_MAGMA,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MAGMA,
         .trainerPic = TRAINER_PIC_MAGMA_GRUNT_M,
-        .trainerName = LANGUAGE_STRING(
-            "GRUNT",
-            "SBIRE",
-            "RECLUTA"),
+        .trainerName = LANGUAGE_STRING("GRUNT", "SBIRE", "RECLUTA", "SOLDADO"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -348,10 +282,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_TEAM_AQUA,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_AQUA,
         .trainerPic = TRAINER_PIC_AQUA_GRUNT_M,
-        .trainerName = LANGUAGE_STRING(
-            "GRUNT",
-            "SBIRE",
-            "RECLUTA"),
+        .trainerName = LANGUAGE_STRING("GRUNT", "SBIRE", "RECLUTA", "SOLDADO"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -363,10 +294,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_TEAM_AQUA,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_AQUA,
         .trainerPic = TRAINER_PIC_AQUA_GRUNT_M,
-        .trainerName = LANGUAGE_STRING(
-            "GRUNT",
-            "SBIRE",
-            "RECLUTA"),
+        .trainerName = LANGUAGE_STRING("GRUNT", "SBIRE", "RECLUTA", "SOLDADO"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -378,10 +306,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_TEAM_AQUA,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_AQUA,
         .trainerPic = TRAINER_PIC_AQUA_GRUNT_M,
-        .trainerName = LANGUAGE_STRING(
-            "GRUNT",
-            "SBIRE",
-            "RECLUTA"),
+        .trainerName = LANGUAGE_STRING("GRUNT", "SBIRE", "RECLUTA", "SOLDADO"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -393,10 +318,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_TEAM_AQUA,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_AQUA,
         .trainerPic = TRAINER_PIC_AQUA_GRUNT_F,
-        .trainerName = LANGUAGE_STRING(
-            "GRUNT",
-            "SBIRE",
-            "RECLUTA"),
+        .trainerName = LANGUAGE_STRING("GRUNT", "SBIRE", "RECLUTA", "SOLDADO"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -408,10 +330,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_TEAM_AQUA,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_AQUA,
         .trainerPic = TRAINER_PIC_AQUA_GRUNT_F,
-        .trainerName = LANGUAGE_STRING(
-            "GRUNT",
-            "SBIRE",
-            "RECLUTA"),
+        .trainerName = LANGUAGE_STRING("GRUNT", "SBIRE", "RECLUTA", "SOLDADO"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -423,10 +342,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_TEAM_AQUA,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_AQUA,
         .trainerPic = TRAINER_PIC_AQUA_GRUNT_F,
-        .trainerName = LANGUAGE_STRING(
-            "GRUNT",
-            "SBIRE",
-            "RECLUTA"),
+        .trainerName = LANGUAGE_STRING("GRUNT", "SBIRE", "RECLUTA", "SOLDADO"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -438,10 +354,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_EXPERT,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE,
         .trainerPic = TRAINER_PIC_EXPERT_M,
-        .trainerName = LANGUAGE_STRING(
-            "FREDRICK",
-            "FLORIAN",
-            "FREDRICK"),
+        .trainerName = LANGUAGE_STRING("FREDRICK", "FLORIAN", "FREDRICK", "FREDO"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
@@ -453,10 +366,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_AQUA_ADMIN,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_AQUA,
         .trainerPic = TRAINER_PIC_AQUA_ADMIN_M,
-        .trainerName = LANGUAGE_STRING(
-            "MATT",
-            "MATTHIEU",
-            "ALAN"),
+        .trainerName = LANGUAGE_STRING("MATT", "MATTHIEU", "ALAN", "TOLO"),
         .items = {ITEM_SUPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
@@ -468,10 +378,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_BLACK_BELT,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE,
         .trainerPic = TRAINER_PIC_BLACK_BELT,
-        .trainerName = LANGUAGE_STRING(
-            "ZANDER",
-            "FREDDY",
-            "CRISTOFORO"),
+        .trainerName = LANGUAGE_STRING("ZANDER", "FREDDY", "CRISTOFORO", "ZANDER"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -483,10 +390,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_AQUA_ADMIN,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_AQUA,
         .trainerPic = TRAINER_PIC_AQUA_ADMIN_F,
-        .trainerName = LANGUAGE_STRING(
-            "SHELLY",
-            "SARAH",
-            "ADA"),
+        .trainerName = LANGUAGE_STRING("SHELLY", "SARAH", "ADA", "SILVINA"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
@@ -498,10 +402,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_AQUA_ADMIN,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_AQUA,
         .trainerPic = TRAINER_PIC_AQUA_ADMIN_F,
-        .trainerName = LANGUAGE_STRING(
-            "SHELLY",
-            "SARAH",
-            "ADA"),
+        .trainerName = LANGUAGE_STRING("SHELLY", "SARAH", "ADA", "SILVINA"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
@@ -513,10 +414,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_AQUA_LEADER,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_AQUA,
         .trainerPic = TRAINER_PIC_AQUA_LEADER_ARCHIE,
-        .trainerName = LANGUAGE_STRING(
-            "ARCHIE",
-            "ARTHUR",
-            "IVAN"),
+        .trainerName = LANGUAGE_STRING("ARCHIE", "ARTHUR", "IVAN", "AQUILES"),
         .items = {ITEM_SUPER_POTION, ITEM_SUPER_POTION, ITEM_NONE, ITEM_NONE},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
@@ -528,10 +426,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_HEX_MANIAC,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS,
         .trainerPic = TRAINER_PIC_HEX_MANIAC,
-        .trainerName = LANGUAGE_STRING(
-            "LEAH",
-            "ERIN",
-            "LEAH"),
+        .trainerName = LANGUAGE_STRING("LEAH", "ERIN", "LEAH", "LEA"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -543,10 +438,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_AROMA_LADY,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE,
         .trainerPic = TRAINER_PIC_AROMA_LADY,
-        .trainerName = LANGUAGE_STRING(
-            "DAISY",
-            "NINA",
-            "MARGI"),
+        .trainerName = LANGUAGE_STRING("DAISY", "NINA", "MARGI", "AZUCENA"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -558,10 +450,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_AROMA_LADY,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE,
         .trainerPic = TRAINER_PIC_AROMA_LADY,
-        .trainerName = LANGUAGE_STRING(
-            "ROSE",
-            "ROSE",
-            "ROSITA"),
+        .trainerName = LANGUAGE_STRING("ROSE", "ROSE", "ROSITA", "ROSA"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -573,10 +462,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_COOLTRAINER,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL,
         .trainerPic = TRAINER_PIC_COOLTRAINER_M,
-        .trainerName = LANGUAGE_STRING(
-            "FELIX",
-            "NIELS",
-            "EDMONDO"),
+        .trainerName = LANGUAGE_STRING("FELIX", "NIELS", "EDMONDO", "FEDI"),
         .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
@@ -588,10 +474,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_AROMA_LADY,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE,
         .trainerPic = TRAINER_PIC_AROMA_LADY,
-        .trainerName = LANGUAGE_STRING(
-            "VIOLET",
-            "VIOLETTE",
-            "VIOLA"),
+        .trainerName = LANGUAGE_STRING("VIOLET", "VIOLETTE", "VIOLA", "VIOLETA"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -603,10 +486,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_AROMA_LADY,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE,
         .trainerPic = TRAINER_PIC_AROMA_LADY,
-        .trainerName = LANGUAGE_STRING(
-            "ROSE",
-            "ROSE",
-            "ROSITA"),
+        .trainerName = LANGUAGE_STRING("ROSE", "ROSE", "ROSITA", "ROSA"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -618,10 +498,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_AROMA_LADY,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE,
         .trainerPic = TRAINER_PIC_AROMA_LADY,
-        .trainerName = LANGUAGE_STRING(
-            "ROSE",
-            "ROSE",
-            "ROSITA"),
+        .trainerName = LANGUAGE_STRING("ROSE", "ROSE", "ROSITA", "ROSA"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -633,10 +510,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_AROMA_LADY,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE,
         .trainerPic = TRAINER_PIC_AROMA_LADY,
-        .trainerName = LANGUAGE_STRING(
-            "ROSE",
-            "ROSE",
-            "ROSITA"),
+        .trainerName = LANGUAGE_STRING("ROSE", "ROSE", "ROSITA", "ROSA"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -648,10 +522,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_AROMA_LADY,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE,
         .trainerPic = TRAINER_PIC_AROMA_LADY,
-        .trainerName = LANGUAGE_STRING(
-            "ROSE",
-            "ROSE",
-            "ROSITA"),
+        .trainerName = LANGUAGE_STRING("ROSE", "ROSE", "ROSITA", "ROSA"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -663,10 +534,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_RUIN_MANIAC,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER,
         .trainerPic = TRAINER_PIC_RUIN_MANIAC,
-        .trainerName = LANGUAGE_STRING(
-            "DUSTY",
-            "ARMAND",
-            "ELIO"),
+        .trainerName = LANGUAGE_STRING("DUSTY", "ARMAND", "ELIO", "DACIO"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -678,10 +546,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_RUIN_MANIAC,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER,
         .trainerPic = TRAINER_PIC_RUIN_MANIAC,
-        .trainerName = LANGUAGE_STRING(
-            "CHIP",
-            "ALPHONSE",
-            "BORIS"),
+        .trainerName = LANGUAGE_STRING("CHIP", "ALPHONSE", "BORIS", "CHICHO"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -693,10 +558,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_RUIN_MANIAC,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER,
         .trainerPic = TRAINER_PIC_RUIN_MANIAC,
-        .trainerName = LANGUAGE_STRING(
-            "FOSTER",
-            "EMILE",
-            "ALESSANDRO"),
+        .trainerName = LANGUAGE_STRING("FOSTER", "EMILE", "ALESSANDRO", "FAUSTO"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -708,10 +570,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_RUIN_MANIAC,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER,
         .trainerPic = TRAINER_PIC_RUIN_MANIAC,
-        .trainerName = LANGUAGE_STRING(
-            "DUSTY",
-            "ARMAND",
-            "ELIO"),
+        .trainerName = LANGUAGE_STRING("DUSTY", "ARMAND", "ELIO", "DACIO"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -723,10 +582,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_RUIN_MANIAC,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER,
         .trainerPic = TRAINER_PIC_RUIN_MANIAC,
-        .trainerName = LANGUAGE_STRING(
-            "DUSTY",
-            "ARMAND",
-            "ELIO"),
+        .trainerName = LANGUAGE_STRING("DUSTY", "ARMAND", "ELIO", "DACIO"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -738,10 +594,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_RUIN_MANIAC,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER,
         .trainerPic = TRAINER_PIC_RUIN_MANIAC,
-        .trainerName = LANGUAGE_STRING(
-            "DUSTY",
-            "ARMAND",
-            "ELIO"),
+        .trainerName = LANGUAGE_STRING("DUSTY", "ARMAND", "ELIO", "DACIO"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -753,10 +606,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_RUIN_MANIAC,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER,
         .trainerPic = TRAINER_PIC_RUIN_MANIAC,
-        .trainerName = LANGUAGE_STRING(
-            "DUSTY",
-            "ARMAND",
-            "ELIO"),
+        .trainerName = LANGUAGE_STRING("DUSTY", "ARMAND", "ELIO", "DACIO"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -768,10 +618,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_INTERVIEWER,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTERVIEWER,
         .trainerPic = TRAINER_PIC_INTERVIEWER,
-        .trainerName = LANGUAGE_STRING(
-            "GABBY & TY",
-            "INES & GUY",
-            "TEA & TEO"),
+        .trainerName = LANGUAGE_STRING("GABBY & TY", "INES & GUY", "TEA & TEO", "GABI-TEO"),
         .items = {},
         .doubleBattle = TRUE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -783,10 +630,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_INTERVIEWER,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTERVIEWER,
         .trainerPic = TRAINER_PIC_INTERVIEWER,
-        .trainerName = LANGUAGE_STRING(
-            "GABBY & TY",
-            "INES & GUY",
-            "TEA & TEO"),
+        .trainerName = LANGUAGE_STRING("GABBY & TY", "INES & GUY", "TEA & TEO", "GABI-TEO"),
         .items = {},
         .doubleBattle = TRUE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -798,10 +642,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_INTERVIEWER,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTERVIEWER,
         .trainerPic = TRAINER_PIC_INTERVIEWER,
-        .trainerName = LANGUAGE_STRING(
-            "GABBY & TY",
-            "INES & GUY",
-            "TEA & TEO"),
+        .trainerName = LANGUAGE_STRING("GABBY & TY", "INES & GUY", "TEA & TEO", "GABI-TEO"),
         .items = {},
         .doubleBattle = TRUE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -813,10 +654,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_INTERVIEWER,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTERVIEWER,
         .trainerPic = TRAINER_PIC_INTERVIEWER,
-        .trainerName = LANGUAGE_STRING(
-            "GABBY & TY",
-            "INES & GUY",
-            "TEA & TEO"),
+        .trainerName = LANGUAGE_STRING("GABBY & TY", "INES & GUY", "TEA & TEO", "GABI-TEO"),
         .items = {},
         .doubleBattle = TRUE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -828,10 +666,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_INTERVIEWER,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTERVIEWER,
         .trainerPic = TRAINER_PIC_INTERVIEWER,
-        .trainerName = LANGUAGE_STRING(
-            "GABBY & TY",
-            "INES & GUY",
-            "TEA & TEO"),
+        .trainerName = LANGUAGE_STRING("GABBY & TY", "INES & GUY", "TEA & TEO", "GABI-TEO"),
         .items = {},
         .doubleBattle = TRUE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -843,10 +678,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_INTERVIEWER,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTERVIEWER,
         .trainerPic = TRAINER_PIC_INTERVIEWER,
-        .trainerName = LANGUAGE_STRING(
-            "GABBY & TY",
-            "INES & GUY",
-            "TEA & TEO"),
+        .trainerName = LANGUAGE_STRING("GABBY & TY", "INES & GUY", "TEA & TEO", "GABI-TEO"),
         .items = {},
         .doubleBattle = TRUE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -858,10 +690,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_TUBER_F,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL,
         .trainerPic = TRAINER_PIC_TUBER_F,
-        .trainerName = LANGUAGE_STRING(
-            "LOLA",
-            "LEA",
-            "ALESSANDRA"),
+        .trainerName = LANGUAGE_STRING("LOLA", "LEA", "ALESSANDRA", "LOLA"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -873,10 +702,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_TUBER_F,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL,
         .trainerPic = TRAINER_PIC_TUBER_F,
-        .trainerName = LANGUAGE_STRING(
-            "AUSTINA",
-            "AURELIA",
-            "FELICITA"),
+        .trainerName = LANGUAGE_STRING("AUSTINA", "AURELIA", "FELICITA", "AGUSTINA"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -888,10 +714,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_TUBER_F,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL,
         .trainerPic = TRAINER_PIC_TUBER_F,
-        .trainerName = LANGUAGE_STRING(
-            "GWEN",
-            "GWENAELLE",
-            "CHICCA"),
+        .trainerName = LANGUAGE_STRING("GWEN", "GWENAELLE", "CHICCA", "GEMA"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -903,10 +726,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_TUBER_F,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL,
         .trainerPic = TRAINER_PIC_TUBER_F,
-        .trainerName = LANGUAGE_STRING(
-            "LOLA",
-            "LEA",
-            "ALESSANDRA"),
+        .trainerName = LANGUAGE_STRING("LOLA", "LEA", "ALESSANDRA", "LOLA"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -918,10 +738,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_TUBER_F,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL,
         .trainerPic = TRAINER_PIC_TUBER_F,
-        .trainerName = LANGUAGE_STRING(
-            "LOLA",
-            "LEA",
-            "ALESSANDRA"),
+        .trainerName = LANGUAGE_STRING("LOLA", "LEA", "ALESSANDRA", "LOLA"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -933,10 +750,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_TUBER_F,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL,
         .trainerPic = TRAINER_PIC_TUBER_F,
-        .trainerName = LANGUAGE_STRING(
-            "LOLA",
-            "LEA",
-            "ALESSANDRA"),
+        .trainerName = LANGUAGE_STRING("LOLA", "LEA", "ALESSANDRA", "LOLA"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -948,10 +762,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_TUBER_F,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL,
         .trainerPic = TRAINER_PIC_TUBER_F,
-        .trainerName = LANGUAGE_STRING(
-            "LOLA",
-            "LEA",
-            "ALESSANDRA"),
+        .trainerName = LANGUAGE_STRING("LOLA", "LEA", "ALESSANDRA", "LOLA"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -963,10 +774,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_TUBER_M,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_GIRL,
         .trainerPic = TRAINER_PIC_TUBER_M,
-        .trainerName = LANGUAGE_STRING(
-            "RICKY",
-            "RACHID",
-            "RICKY"),
+        .trainerName = LANGUAGE_STRING("RICKY", "RACHID", "RICKY", "RICHI"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -978,10 +786,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_TUBER_M,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_GIRL,
         .trainerPic = TRAINER_PIC_TUBER_M,
-        .trainerName = LANGUAGE_STRING(
-            "SIMON",
-            "SIMON",
-            "EDOARDO"),
+        .trainerName = LANGUAGE_STRING("SIMON", "SIMON", "EDOARDO", "JANDRO"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -993,10 +798,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_TUBER_M,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_GIRL,
         .trainerPic = TRAINER_PIC_TUBER_M,
-        .trainerName = LANGUAGE_STRING(
-            "CHARLIE",
-            "CHARLES",
-            "CHARLIE"),
+        .trainerName = LANGUAGE_STRING("CHARLIE", "CHARLES", "CHARLIE", "CARMELO"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -1008,10 +810,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_TUBER_M,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_GIRL,
         .trainerPic = TRAINER_PIC_TUBER_M,
-        .trainerName = LANGUAGE_STRING(
-            "RICKY",
-            "RACHID",
-            "RICKY"),
+        .trainerName = LANGUAGE_STRING("RICKY", "RACHID", "RICKY", "RICHI"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -1023,10 +822,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_TUBER_M,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_GIRL,
         .trainerPic = TRAINER_PIC_TUBER_M,
-        .trainerName = LANGUAGE_STRING(
-            "RICKY",
-            "RACHID",
-            "RICKY"),
+        .trainerName = LANGUAGE_STRING("RICKY", "RACHID", "RICKY", "RICHI"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -1038,10 +834,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_TUBER_M,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_GIRL,
         .trainerPic = TRAINER_PIC_TUBER_M,
-        .trainerName = LANGUAGE_STRING(
-            "RICKY",
-            "RACHID",
-            "RICKY"),
+        .trainerName = LANGUAGE_STRING("RICKY", "RACHID", "RICKY", "RICHI"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -1053,10 +846,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_TUBER_M,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_GIRL,
         .trainerPic = TRAINER_PIC_TUBER_M,
-        .trainerName = LANGUAGE_STRING(
-            "RICKY",
-            "RACHID",
-            "RICKY"),
+        .trainerName = LANGUAGE_STRING("RICKY", "RACHID", "RICKY", "RICHI"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -1068,10 +858,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_COOLTRAINER,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL,
         .trainerPic = TRAINER_PIC_COOLTRAINER_M,
-        .trainerName = LANGUAGE_STRING(
-            "RANDALL",
-            "RAPHAEL",
-            "CARLETTO"),
+        .trainerName = LANGUAGE_STRING("RANDALL", "RAPHAEL", "CARLETTO", "ANTONIO"),
         .items = {ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
@@ -1083,10 +870,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_COOLTRAINER,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL,
         .trainerPic = TRAINER_PIC_COOLTRAINER_M,
-        .trainerName = LANGUAGE_STRING(
-            "PARKER",
-            "PATRICK",
-            "CARLO"),
+        .trainerName = LANGUAGE_STRING("PARKER", "PATRICK", "CARLO", "PASCUAL"),
         .items = {ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
@@ -1098,10 +882,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_COOLTRAINER,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL,
         .trainerPic = TRAINER_PIC_COOLTRAINER_M,
-        .trainerName = LANGUAGE_STRING(
-            "GEORGE",
-            "GEORGES",
-            "GIORGINO"),
+        .trainerName = LANGUAGE_STRING("GEORGE", "GEORGES", "GIORGINO", "JORGE"),
         .items = {ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
@@ -1113,10 +894,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_COOLTRAINER,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL,
         .trainerPic = TRAINER_PIC_COOLTRAINER_M,
-        .trainerName = LANGUAGE_STRING(
-            "BERKE",
-            "BERTRAND",
-            "ALDO"),
+        .trainerName = LANGUAGE_STRING("BERKE", "BERTRAND", "ALDO", "BLAS"),
         .items = {ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
@@ -1128,10 +906,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_COOLTRAINER,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL,
         .trainerPic = TRAINER_PIC_COOLTRAINER_M,
-        .trainerName = LANGUAGE_STRING(
-            "BRAXTON",
-            "MAXENCE",
-            "VITTORIO"),
+        .trainerName = LANGUAGE_STRING("BRAXTON", "MAXENCE", "VITTORIO", "PERICO"),
         .items = {ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
@@ -1143,10 +918,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_COOLTRAINER,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL,
         .trainerPic = TRAINER_PIC_COOLTRAINER_M,
-        .trainerName = LANGUAGE_STRING(
-            "VINCENT",
-            "VINCENT",
-            "VINCENT"),
+        .trainerName = LANGUAGE_STRING("VINCENT", "VINCENT", "VINCENT", "VICENTE"),
         .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
@@ -1158,10 +930,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_COOLTRAINER,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL,
         .trainerPic = TRAINER_PIC_COOLTRAINER_M,
-        .trainerName = LANGUAGE_STRING(
-            "LEROY",
-            "LEON",
-            "PINO"),
+        .trainerName = LANGUAGE_STRING("LEROY", "LEON", "PINO", "LORENZO"),
         .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
@@ -1173,10 +942,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_COOLTRAINER,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL,
         .trainerPic = TRAINER_PIC_COOLTRAINER_M,
-        .trainerName = LANGUAGE_STRING(
-            "WILTON",
-            "WILFRIED",
-            "EGIDIO"),
+        .trainerName = LANGUAGE_STRING("WILTON", "WILFRIED", "EGIDIO", "VALENO"),
         .items = {ITEM_SUPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
@@ -1188,10 +954,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_COOLTRAINER,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL,
         .trainerPic = TRAINER_PIC_COOLTRAINER_M,
-        .trainerName = LANGUAGE_STRING(
-            "EDGAR",
-            "EDGARD",
-            "EMILIANO"),
+        .trainerName = LANGUAGE_STRING("EDGAR", "EDGARD", "EMILIANO", "EFRA"),
         .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
@@ -1203,10 +966,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_COOLTRAINER,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL,
         .trainerPic = TRAINER_PIC_COOLTRAINER_M,
-        .trainerName = LANGUAGE_STRING(
-            "ALBERT",
-            "ALBERT",
-            "ALBERT"),
+        .trainerName = LANGUAGE_STRING("ALBERT", "ALBERT", "ALBERT", "ALBERTO"),
         .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
@@ -1218,10 +978,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_COOLTRAINER,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL,
         .trainerPic = TRAINER_PIC_COOLTRAINER_M,
-        .trainerName = LANGUAGE_STRING(
-            "SAMUEL",
-            "SAMUEL",
-            "SAMUEL"),
+        .trainerName = LANGUAGE_STRING("SAMUEL", "SAMUEL", "SAMUEL", "SAMUEL"),
         .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
@@ -1233,10 +990,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_COOLTRAINER,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL,
         .trainerPic = TRAINER_PIC_COOLTRAINER_M,
-        .trainerName = LANGUAGE_STRING(
-            "VITO",
-            "VITO",
-            "ENRICO"),
+        .trainerName = LANGUAGE_STRING("VITO", "VITO", "ENRICO", "MANUEL"),
         .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
@@ -1248,10 +1002,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_COOLTRAINER,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL,
         .trainerPic = TRAINER_PIC_COOLTRAINER_M,
-        .trainerName = LANGUAGE_STRING(
-            "OWEN",
-            "OLIVER",
-            "MARCELLO"),
+        .trainerName = LANGUAGE_STRING("OWEN", "OLIVER", "MARCELLO", "ODI"),
         .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
@@ -1263,10 +1014,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_COOLTRAINER,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL,
         .trainerPic = TRAINER_PIC_COOLTRAINER_M,
-        .trainerName = LANGUAGE_STRING(
-            "WILTON",
-            "WILFRIED",
-            "EGIDIO"),
+        .trainerName = LANGUAGE_STRING("WILTON", "WILFRIED", "EGIDIO", "VALENO"),
         .items = {ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
@@ -1278,10 +1026,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_COOLTRAINER,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL,
         .trainerPic = TRAINER_PIC_COOLTRAINER_M,
-        .trainerName = LANGUAGE_STRING(
-            "WILTON",
-            "WILFRIED",
-            "EGIDIO"),
+        .trainerName = LANGUAGE_STRING("WILTON", "WILFRIED", "EGIDIO", "VALENO"),
         .items = {ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
@@ -1293,10 +1038,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_COOLTRAINER,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL,
         .trainerPic = TRAINER_PIC_COOLTRAINER_M,
-        .trainerName = LANGUAGE_STRING(
-            "WILTON",
-            "WILFRIED",
-            "EGIDIO"),
+        .trainerName = LANGUAGE_STRING("WILTON", "WILFRIED", "EGIDIO", "VALENO"),
         .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
@@ -1308,10 +1050,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_COOLTRAINER,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL,
         .trainerPic = TRAINER_PIC_COOLTRAINER_M,
-        .trainerName = LANGUAGE_STRING(
-            "WILTON",
-            "WILFRIED",
-            "EGIDIO"),
+        .trainerName = LANGUAGE_STRING("WILTON", "WILFRIED", "EGIDIO", "VALENO"),
         .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
@@ -1323,10 +1062,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_COOLTRAINER,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL,
         .trainerPic = TRAINER_PIC_COOLTRAINER_M,
-        .trainerName = LANGUAGE_STRING(
-            "WARREN",
-            "WOLFGANG",
-            "PIERO"),
+        .trainerName = LANGUAGE_STRING("WARREN", "WOLFGANG", "PIERO", "VALERIO"),
         .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
@@ -1338,10 +1074,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_COOLTRAINER,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL,
         .trainerPic = TRAINER_PIC_COOLTRAINER_F,
-        .trainerName = LANGUAGE_STRING(
-            "MARY",
-            "MARIE",
-            "MARY"),
+        .trainerName = LANGUAGE_STRING("MARY", "MARIE", "MARY", "MARI"),
         .items = {ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
@@ -1353,10 +1086,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_COOLTRAINER,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL,
         .trainerPic = TRAINER_PIC_COOLTRAINER_F,
-        .trainerName = LANGUAGE_STRING(
-            "ALEXIA",
-            "MAGALIE",
-            "ALEXIA"),
+        .trainerName = LANGUAGE_STRING("ALEXIA", "MAGALIE", "ALEXIA", "ALEXIA"),
         .items = {ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
@@ -1368,10 +1098,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_COOLTRAINER,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL,
         .trainerPic = TRAINER_PIC_COOLTRAINER_F,
-        .trainerName = LANGUAGE_STRING(
-            "JODY",
-            "JOELLE",
-            "DELIA"),
+        .trainerName = LANGUAGE_STRING("JODY", "JOELLE", "DELIA", "JIMENA"),
         .items = {ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_SETUP_FIRST_TURN,
@@ -1383,10 +1110,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_COOLTRAINER,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL,
         .trainerPic = TRAINER_PIC_COOLTRAINER_F,
-        .trainerName = LANGUAGE_STRING(
-            "WENDY",
-            "WENDY",
-            "BIANCA"),
+        .trainerName = LANGUAGE_STRING("WENDY", "WENDY", "BIANCA", "BRAULIA"),
         .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_SETUP_FIRST_TURN,
@@ -1398,10 +1122,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_COOLTRAINER,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL,
         .trainerPic = TRAINER_PIC_COOLTRAINER_F,
-        .trainerName = LANGUAGE_STRING(
-            "KEIRA",
-            "CLOE",
-            "KEIRA"),
+        .trainerName = LANGUAGE_STRING("KEIRA", "CLOE", "KEIRA", "KEIRA"),
         .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_SETUP_FIRST_TURN,
@@ -1413,10 +1134,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_COOLTRAINER,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL,
         .trainerPic = TRAINER_PIC_COOLTRAINER_F,
-        .trainerName = LANGUAGE_STRING(
-            "BROOKE",
-            "BLANCHE",
-            "GEMMA"),
+        .trainerName = LANGUAGE_STRING("BROOKE", "BLANCHE", "GEMMA", "BERTA"),
         .items = {ITEM_SUPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
@@ -1428,10 +1146,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_COOLTRAINER,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL,
         .trainerPic = TRAINER_PIC_COOLTRAINER_F,
-        .trainerName = LANGUAGE_STRING(
-            "JENNIFER",
-            "JENNIFER",
-            "LUCIANA"),
+        .trainerName = LANGUAGE_STRING("JENNIFER", "JENNIFER", "LUCIANA", "JULIANA"),
         .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
@@ -1443,10 +1158,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_COOLTRAINER,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL,
         .trainerPic = TRAINER_PIC_COOLTRAINER_F,
-        .trainerName = LANGUAGE_STRING(
-            "HOPE",
-            "HORTENSE",
-            "FLAVIA"),
+        .trainerName = LANGUAGE_STRING("HOPE", "HORTENSE", "FLAVIA", "ESPE"),
         .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
@@ -1458,10 +1170,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_COOLTRAINER,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL,
         .trainerPic = TRAINER_PIC_COOLTRAINER_F,
-        .trainerName = LANGUAGE_STRING(
-            "SHANNON",
-            "SAMIA",
-            "CHIARA"),
+        .trainerName = LANGUAGE_STRING("SHANNON", "SAMIA", "CHIARA", "SABRINA"),
         .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
@@ -1473,10 +1182,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_COOLTRAINER,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL,
         .trainerPic = TRAINER_PIC_COOLTRAINER_F,
-        .trainerName = LANGUAGE_STRING(
-            "MICHELLE",
-            "MICHELLE",
-            "MICHELLE"),
+        .trainerName = LANGUAGE_STRING("MICHELLE", "MICHELLE", "MICHELLE", "MICAELA"),
         .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
@@ -1488,10 +1194,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_COOLTRAINER,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL,
         .trainerPic = TRAINER_PIC_COOLTRAINER_F,
-        .trainerName = LANGUAGE_STRING(
-            "CAROLINE",
-            "CAROLINE",
-            "CATERINA"),
+        .trainerName = LANGUAGE_STRING("CAROLINE", "CAROLINE", "CATERINA", "CAROLINA"),
         .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
@@ -1503,10 +1206,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_COOLTRAINER,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL,
         .trainerPic = TRAINER_PIC_COOLTRAINER_F,
-        .trainerName = LANGUAGE_STRING(
-            "JULIE",
-            "JULIE",
-            "FRANCESCA"),
+        .trainerName = LANGUAGE_STRING("JULIE", "JULIE", "FRANCESCA", "JULIA"),
         .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
@@ -1518,10 +1218,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_COOLTRAINER,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL,
         .trainerPic = TRAINER_PIC_COOLTRAINER_F,
-        .trainerName = LANGUAGE_STRING(
-            "BROOKE",
-            "BLANCHE",
-            "GEMMA"),
+        .trainerName = LANGUAGE_STRING("BROOKE", "BLANCHE", "GEMMA", "BERTA"),
         .items = {ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
@@ -1533,10 +1230,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_COOLTRAINER,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL,
         .trainerPic = TRAINER_PIC_COOLTRAINER_F,
-        .trainerName = LANGUAGE_STRING(
-            "BROOKE",
-            "BLANCHE",
-            "GEMMA"),
+        .trainerName = LANGUAGE_STRING("BROOKE", "BLANCHE", "GEMMA", "BERTA"),
         .items = {ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
@@ -1548,10 +1242,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_COOLTRAINER,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL,
         .trainerPic = TRAINER_PIC_COOLTRAINER_F,
-        .trainerName = LANGUAGE_STRING(
-            "BROOKE",
-            "BLANCHE",
-            "GEMMA"),
+        .trainerName = LANGUAGE_STRING("BROOKE", "BLANCHE", "GEMMA", "BERTA"),
         .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
@@ -1563,10 +1254,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_COOLTRAINER,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL,
         .trainerPic = TRAINER_PIC_COOLTRAINER_F,
-        .trainerName = LANGUAGE_STRING(
-            "BROOKE",
-            "BLANCHE",
-            "GEMMA"),
+        .trainerName = LANGUAGE_STRING("BROOKE", "BLANCHE", "GEMMA", "BERTA"),
         .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
@@ -1578,10 +1266,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_HEX_MANIAC,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS,
         .trainerPic = TRAINER_PIC_HEX_MANIAC,
-        .trainerName = LANGUAGE_STRING(
-            "PATRICIA",
-            "PATRICIA",
-            "AMALIA"),
+        .trainerName = LANGUAGE_STRING("PATRICIA", "PATRICIA", "AMALIA", "PATRICIA"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -1593,10 +1278,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_HEX_MANIAC,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS,
         .trainerPic = TRAINER_PIC_HEX_MANIAC,
-        .trainerName = LANGUAGE_STRING(
-            "KINDRA",
-            "SELENA",
-            "ELVIRA"),
+        .trainerName = LANGUAGE_STRING("KINDRA", "SELENA", "ELVIRA", "CLEO"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -1608,10 +1290,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_HEX_MANIAC,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS,
         .trainerPic = TRAINER_PIC_HEX_MANIAC,
-        .trainerName = LANGUAGE_STRING(
-            "TAMMY",
-            "NINON",
-            "TAMARA"),
+        .trainerName = LANGUAGE_STRING("TAMMY", "NINON", "TAMARA", "TAMARA"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -1623,10 +1302,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_HEX_MANIAC,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS,
         .trainerPic = TRAINER_PIC_HEX_MANIAC,
-        .trainerName = LANGUAGE_STRING(
-            "VALERIE",
-            "VALERIA",
-            "VANIA"),
+        .trainerName = LANGUAGE_STRING("VALERIE", "VALERIA", "VANIA", "MARIAU"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -1638,10 +1314,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_HEX_MANIAC,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS,
         .trainerPic = TRAINER_PIC_HEX_MANIAC,
-        .trainerName = LANGUAGE_STRING(
-            "TASHA",
-            "TATIANA",
-            "GISELDA"),
+        .trainerName = LANGUAGE_STRING("TASHA", "TATIANA", "GISELDA", "TIRSA"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -1653,10 +1326,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_HEX_MANIAC,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS,
         .trainerPic = TRAINER_PIC_HEX_MANIAC,
-        .trainerName = LANGUAGE_STRING(
-            "VALERIE",
-            "VALERIA",
-            "VANIA"),
+        .trainerName = LANGUAGE_STRING("VALERIE", "VALERIA", "VANIA", "MARIAU"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -1668,10 +1338,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_HEX_MANIAC,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS,
         .trainerPic = TRAINER_PIC_HEX_MANIAC,
-        .trainerName = LANGUAGE_STRING(
-            "VALERIE",
-            "VALERIA",
-            "VANIA"),
+        .trainerName = LANGUAGE_STRING("VALERIE", "VALERIA", "VANIA", "MARIAU"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -1683,10 +1350,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_HEX_MANIAC,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS,
         .trainerPic = TRAINER_PIC_HEX_MANIAC,
-        .trainerName = LANGUAGE_STRING(
-            "VALERIE",
-            "VALERIA",
-            "VANIA"),
+        .trainerName = LANGUAGE_STRING("VALERIE", "VALERIA", "VANIA", "MARIAU"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -1698,10 +1362,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_HEX_MANIAC,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS,
         .trainerPic = TRAINER_PIC_HEX_MANIAC,
-        .trainerName = LANGUAGE_STRING(
-            "VALERIE",
-            "VALERIA",
-            "VANIA"),
+        .trainerName = LANGUAGE_STRING("VALERIE", "VALERIA", "VANIA", "MARIAU"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -1713,10 +1374,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_LADY,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE,
         .trainerPic = TRAINER_PIC_LADY,
-        .trainerName = LANGUAGE_STRING(
-            "CINDY",
-            "SANDY",
-            "DALIA"),
+        .trainerName = LANGUAGE_STRING("CINDY", "SANDY", "DALIA", "CINTIA"),
         .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -1728,10 +1386,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_LADY,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE,
         .trainerPic = TRAINER_PIC_LADY,
-        .trainerName = LANGUAGE_STRING(
-            "DAPHNE",
-            "DAPHNEE",
-            "DUNIA"),
+        .trainerName = LANGUAGE_STRING("DAPHNE", "DAPHNEE", "DUNIA", "DAFNE"),
         .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -1743,10 +1398,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_TEAM_MAGMA,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MAGMA,
         .trainerPic = TRAINER_PIC_MAGMA_GRUNT_M,
-        .trainerName = LANGUAGE_STRING(
-            "GRUNT",
-            "SBIRE",
-            "RECLUTA"),
+        .trainerName = LANGUAGE_STRING("GRUNT", "SBIRE", "RECLUTA", "SOLDADO"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -1758,10 +1410,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_LADY,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE,
         .trainerPic = TRAINER_PIC_LADY,
-        .trainerName = LANGUAGE_STRING(
-            "CINDY",
-            "SANDY",
-            "DALIA"),
+        .trainerName = LANGUAGE_STRING("CINDY", "SANDY", "DALIA", "CINTIA"),
         .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -1773,10 +1422,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_LADY,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE,
         .trainerPic = TRAINER_PIC_LADY,
-        .trainerName = LANGUAGE_STRING(
-            "BRIANNA",
-            "VIVIANE",
-            "CRISTINA"),
+        .trainerName = LANGUAGE_STRING("BRIANNA", "VIVIANE", "CRISTINA", "EVA"),
         .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -1788,10 +1434,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_LADY,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE,
         .trainerPic = TRAINER_PIC_LADY,
-        .trainerName = LANGUAGE_STRING(
-            "NAOMI",
-            "NAOMI",
-            "NAOMI"),
+        .trainerName = LANGUAGE_STRING("NAOMI", "NAOMI", "NAOMI", "CLAUDIA"),
         .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -1803,10 +1446,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_LADY,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE,
         .trainerPic = TRAINER_PIC_LADY,
-        .trainerName = LANGUAGE_STRING(
-            "CINDY",
-            "SANDY",
-            "DALIA"),
+        .trainerName = LANGUAGE_STRING("CINDY", "SANDY", "DALIA", "CINTIA"),
         .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -1818,10 +1458,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_LADY,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE,
         .trainerPic = TRAINER_PIC_LADY,
-        .trainerName = LANGUAGE_STRING(
-            "CINDY",
-            "SANDY",
-            "DALIA"),
+        .trainerName = LANGUAGE_STRING("CINDY", "SANDY", "DALIA", "CINTIA"),
         .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -1833,10 +1470,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_LADY,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE,
         .trainerPic = TRAINER_PIC_LADY,
-        .trainerName = LANGUAGE_STRING(
-            "CINDY",
-            "SANDY",
-            "DALIA"),
+        .trainerName = LANGUAGE_STRING("CINDY", "SANDY", "DALIA", "CINTIA"),
         .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -1848,10 +1482,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_LADY,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE,
         .trainerPic = TRAINER_PIC_LADY,
-        .trainerName = LANGUAGE_STRING(
-            "CINDY",
-            "SANDY",
-            "DALIA"),
+        .trainerName = LANGUAGE_STRING("CINDY", "SANDY", "DALIA", "CINTIA"),
         .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -1863,10 +1494,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_BEAUTY,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE,
         .trainerPic = TRAINER_PIC_BEAUTY,
-        .trainerName = LANGUAGE_STRING(
-            "MELISSA",
-            "MELISSA",
-            "CARLETTA"),
+        .trainerName = LANGUAGE_STRING("MELISSA", "MELISSA", "CARLETTA", "MELISA"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -1878,10 +1506,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_BEAUTY,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE,
         .trainerPic = TRAINER_PIC_BEAUTY,
-        .trainerName = LANGUAGE_STRING(
-            "SHEILA",
-            "SHEILA",
-            "CLAUDIA"),
+        .trainerName = LANGUAGE_STRING("SHEILA", "SHEILA", "CLAUDIA", "SOL"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -1893,10 +1518,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_BEAUTY,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE,
         .trainerPic = TRAINER_PIC_BEAUTY,
-        .trainerName = LANGUAGE_STRING(
-            "SHIRLEY",
-            "SHIRLEY",
-            "DARIA"),
+        .trainerName = LANGUAGE_STRING("SHIRLEY", "SHIRLEY", "DARIA", "SILVIA"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -1908,10 +1530,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_BEAUTY,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE,
         .trainerPic = TRAINER_PIC_BEAUTY,
-        .trainerName = LANGUAGE_STRING(
-            "JESSICA",
-            "JESSICA",
-            "MARILENA"),
+        .trainerName = LANGUAGE_STRING("JESSICA", "JESSICA", "MARILENA", "GLORIA"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -1923,10 +1542,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_BEAUTY,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE,
         .trainerPic = TRAINER_PIC_BEAUTY,
-        .trainerName = LANGUAGE_STRING(
-            "CONNIE",
-            "CONSTANCE",
-            "DANIELA"),
+        .trainerName = LANGUAGE_STRING("CONNIE", "CONSTANCE", "DANIELA", "CORO"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -1938,10 +1554,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_BEAUTY,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE,
         .trainerPic = TRAINER_PIC_BEAUTY,
-        .trainerName = LANGUAGE_STRING(
-            "BRIDGET",
-            "ELODIE",
-            "STEFANIA"),
+        .trainerName = LANGUAGE_STRING("BRIDGET", "ELODIE", "STEFANIA", "BRIGI"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -1953,10 +1566,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_BEAUTY,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE,
         .trainerPic = TRAINER_PIC_BEAUTY,
-        .trainerName = LANGUAGE_STRING(
-            "OLIVIA",
-            "OLIVIA",
-            "MIRKA"),
+        .trainerName = LANGUAGE_STRING("OLIVIA", "OLIVIA", "MIRKA", "OLIVIA"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -1968,10 +1578,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_BEAUTY,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE,
         .trainerPic = TRAINER_PIC_BEAUTY,
-        .trainerName = LANGUAGE_STRING(
-            "TIFFANY",
-            "SABRINA",
-            "CLELIA"),
+        .trainerName = LANGUAGE_STRING("TIFFANY", "SABRINA", "CLELIA", "TIZIANA"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -1983,10 +1590,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_BEAUTY,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE,
         .trainerPic = TRAINER_PIC_BEAUTY,
-        .trainerName = LANGUAGE_STRING(
-            "JESSICA",
-            "JESSICA",
-            "MARILENA"),
+        .trainerName = LANGUAGE_STRING("JESSICA", "JESSICA", "MARILENA", "GLORIA"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -1998,10 +1602,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_BEAUTY,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE,
         .trainerPic = TRAINER_PIC_BEAUTY,
-        .trainerName = LANGUAGE_STRING(
-            "JESSICA",
-            "JESSICA",
-            "MARILENA"),
+        .trainerName = LANGUAGE_STRING("JESSICA", "JESSICA", "MARILENA", "GLORIA"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -2013,10 +1614,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_BEAUTY,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE,
         .trainerPic = TRAINER_PIC_BEAUTY,
-        .trainerName = LANGUAGE_STRING(
-            "JESSICA",
-            "JESSICA",
-            "MARILENA"),
+        .trainerName = LANGUAGE_STRING("JESSICA", "JESSICA", "MARILENA", "GLORIA"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -2028,10 +1626,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_BEAUTY,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE,
         .trainerPic = TRAINER_PIC_BEAUTY,
-        .trainerName = LANGUAGE_STRING(
-            "JESSICA",
-            "JESSICA",
-            "MARILENA"),
+        .trainerName = LANGUAGE_STRING("JESSICA", "JESSICA", "MARILENA", "GLORIA"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -2043,10 +1638,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_RICH_BOY,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_RICH,
         .trainerPic = TRAINER_PIC_RICH_BOY,
-        .trainerName = LANGUAGE_STRING(
-            "WINSTON",
-            "JEAN-MARIE",
-            "GABRIELE"),
+        .trainerName = LANGUAGE_STRING("WINSTON", "JEAN-MARIE", "GABRIELE", "DANI"),
         .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -2058,10 +1650,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_EXPERT,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE,
         .trainerPic = TRAINER_PIC_EXPERT_F,
-        .trainerName = LANGUAGE_STRING(
-            "MOLLIE",
-            "MATHILDE",
-            "MOLLY"),
+        .trainerName = LANGUAGE_STRING("MOLLIE", "MATHILDE", "MOLLY", "MANUELA"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -2073,10 +1662,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_RICH_BOY,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_RICH,
         .trainerPic = TRAINER_PIC_RICH_BOY,
-        .trainerName = LANGUAGE_STRING(
-            "GARRET",
-            "PAUL-ALAIN",
-            "GAETANO"),
+        .trainerName = LANGUAGE_STRING("GARRET", "PAUL-ALAIN", "GAETANO", "GABRIEL"),
         .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -2088,10 +1674,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_RICH_BOY,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_RICH,
         .trainerPic = TRAINER_PIC_RICH_BOY,
-        .trainerName = LANGUAGE_STRING(
-            "WINSTON",
-            "JEAN-MARIE",
-            "GABRIELE"),
+        .trainerName = LANGUAGE_STRING("WINSTON", "JEAN-MARIE", "GABRIELE", "DANI"),
         .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -2103,10 +1686,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_RICH_BOY,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_RICH,
         .trainerPic = TRAINER_PIC_RICH_BOY,
-        .trainerName = LANGUAGE_STRING(
-            "WINSTON",
-            "JEAN-MARIE",
-            "GABRIELE"),
+        .trainerName = LANGUAGE_STRING("WINSTON", "JEAN-MARIE", "GABRIELE", "DANI"),
         .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -2118,10 +1698,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_RICH_BOY,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_RICH,
         .trainerPic = TRAINER_PIC_RICH_BOY,
-        .trainerName = LANGUAGE_STRING(
-            "WINSTON",
-            "JEAN-MARIE",
-            "GABRIELE"),
+        .trainerName = LANGUAGE_STRING("WINSTON", "JEAN-MARIE", "GABRIELE", "DANI"),
         .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -2133,10 +1710,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_RICH_BOY,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_RICH,
         .trainerPic = TRAINER_PIC_RICH_BOY,
-        .trainerName = LANGUAGE_STRING(
-            "WINSTON",
-            "JEAN-MARIE",
-            "GABRIELE"),
+        .trainerName = LANGUAGE_STRING("WINSTON", "JEAN-MARIE", "GABRIELE", "DANI"),
         .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -2148,10 +1722,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_POKEMANIAC,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS,
         .trainerPic = TRAINER_PIC_POKEMANIAC,
-        .trainerName = LANGUAGE_STRING(
-            "STEVE",
-            "STEPHANE",
-            "JACOPO"),
+        .trainerName = LANGUAGE_STRING("STEVE", "STEPHANE", "JACOPO", "ESTEBAN"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -2163,10 +1734,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_BEAUTY,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE,
         .trainerPic = TRAINER_PIC_BEAUTY,
-        .trainerName = LANGUAGE_STRING(
-            "THALIA",
-            "THALIA",
-            "NEREA"),
+        .trainerName = LANGUAGE_STRING("THALIA", "THALIA", "NEREA", "TALI"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -2178,10 +1746,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_POKEMANIAC,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS,
         .trainerPic = TRAINER_PIC_POKEMANIAC,
-        .trainerName = LANGUAGE_STRING(
-            "MARK",
-            "ACHILLE",
-            "GILBERTO"),
+        .trainerName = LANGUAGE_STRING("MARK", "ACHILLE", "GILBERTO", "MARCO"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -2193,10 +1758,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_TEAM_MAGMA,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_MAGMA,
         .trainerPic = TRAINER_PIC_MAGMA_GRUNT_F,
-        .trainerName = LANGUAGE_STRING(
-            "GRUNT",
-            "SBIRE",
-            "RECLUTA"),
+        .trainerName = LANGUAGE_STRING("GRUNT", "SBIRE", "RECLUTA", "SOLDADO"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -2208,10 +1770,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_POKEMANIAC,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS,
         .trainerPic = TRAINER_PIC_POKEMANIAC,
-        .trainerName = LANGUAGE_STRING(
-            "STEVE",
-            "STEPHANE",
-            "JACOPO"),
+        .trainerName = LANGUAGE_STRING("STEVE", "STEPHANE", "JACOPO", "ESTEBAN"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -2223,10 +1782,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_POKEMANIAC,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS,
         .trainerPic = TRAINER_PIC_POKEMANIAC,
-        .trainerName = LANGUAGE_STRING(
-            "STEVE",
-            "STEPHANE",
-            "JACOPO"),
+        .trainerName = LANGUAGE_STRING("STEVE", "STEPHANE", "JACOPO", "ESTEBAN"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -2238,10 +1794,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_POKEMANIAC,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS,
         .trainerPic = TRAINER_PIC_POKEMANIAC,
-        .trainerName = LANGUAGE_STRING(
-            "STEVE",
-            "STEPHANE",
-            "JACOPO"),
+        .trainerName = LANGUAGE_STRING("STEVE", "STEPHANE", "JACOPO", "ESTEBAN"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -2253,10 +1806,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_POKEMANIAC,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS,
         .trainerPic = TRAINER_PIC_POKEMANIAC,
-        .trainerName = LANGUAGE_STRING(
-            "STEVE",
-            "STEPHANE",
-            "JACOPO"),
+        .trainerName = LANGUAGE_STRING("STEVE", "STEPHANE", "JACOPO", "ESTEBAN"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -2268,10 +1818,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_SWIMMER_M,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SWIMMER,
         .trainerPic = TRAINER_PIC_SWIMMER_M,
-        .trainerName = LANGUAGE_STRING(
-            "LUIS",
-            "LOUIS",
-            "LUIS"),
+        .trainerName = LANGUAGE_STRING("LUIS", "LOUIS", "LUIS", "LUIS"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -2283,10 +1830,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_SWIMMER_M,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SWIMMER,
         .trainerPic = TRAINER_PIC_SWIMMER_M,
-        .trainerName = LANGUAGE_STRING(
-            "DOMINIK",
-            "AURELIEN",
-            "MANUEL"),
+        .trainerName = LANGUAGE_STRING("DOMINIK", "AURELIEN", "MANUEL", "AGUS"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -2298,10 +1842,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_SWIMMER_M,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SWIMMER,
         .trainerPic = TRAINER_PIC_SWIMMER_M,
-        .trainerName = LANGUAGE_STRING(
-            "DOUGLAS",
-            "DOMINIQUE",
-            "VALERIO"),
+        .trainerName = LANGUAGE_STRING("DOUGLAS", "DOMINIQUE", "VALERIO", "DOMINGO"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -2313,10 +1854,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_SWIMMER_M,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SWIMMER,
         .trainerPic = TRAINER_PIC_SWIMMER_M,
-        .trainerName = LANGUAGE_STRING(
-            "DARRIN",
-            "DANIEL",
-            "FULVIO"),
+        .trainerName = LANGUAGE_STRING("DARRIN", "DANIEL", "FULVIO", "DARI"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -2328,10 +1866,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_SWIMMER_M,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SWIMMER,
         .trainerPic = TRAINER_PIC_SWIMMER_M,
-        .trainerName = LANGUAGE_STRING(
-            "TONY",
-            "ANTOINE",
-            "TONY"),
+        .trainerName = LANGUAGE_STRING("TONY", "ANTOINE", "TONY", "TONI"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -2343,10 +1878,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_SWIMMER_M,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SWIMMER,
         .trainerPic = TRAINER_PIC_SWIMMER_M,
-        .trainerName = LANGUAGE_STRING(
-            "JEROME",
-            "JEROME",
-            "MASSIMO"),
+        .trainerName = LANGUAGE_STRING("JEROME", "JEROME", "MASSIMO", "JEROMO"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -2358,10 +1890,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_SWIMMER_M,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SWIMMER,
         .trainerPic = TRAINER_PIC_SWIMMER_M,
-        .trainerName = LANGUAGE_STRING(
-            "MATTHEW",
-            "MATTEO",
-            "MATTHEW"),
+        .trainerName = LANGUAGE_STRING("MATTHEW", "MATTEO", "MATTHEW", "MATEO"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -2373,10 +1902,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_SWIMMER_M,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SWIMMER,
         .trainerPic = TRAINER_PIC_SWIMMER_M,
-        .trainerName = LANGUAGE_STRING(
-            "DAVID",
-            "DAVID",
-            "DAVID"),
+        .trainerName = LANGUAGE_STRING("DAVID", "DAVID", "DAVID", "DAVID"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -2388,10 +1914,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_SWIMMER_M,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SWIMMER,
         .trainerPic = TRAINER_PIC_SWIMMER_M,
-        .trainerName = LANGUAGE_STRING(
-            "SPENCER",
-            "SYLVAIN",
-            "PATRIZIO"),
+        .trainerName = LANGUAGE_STRING("SPENCER", "SYLVAIN", "PATRIZIO", "SERGIO"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -2403,10 +1926,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_SWIMMER_M,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SWIMMER,
         .trainerPic = TRAINER_PIC_SWIMMER_M,
-        .trainerName = LANGUAGE_STRING(
-            "ROLAND",
-            "PACOME",
-            "ROLAND"),
+        .trainerName = LANGUAGE_STRING("ROLAND", "PACOME", "ROLAND", "ROMEO"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -2418,10 +1938,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_SWIMMER_M,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SWIMMER,
         .trainerPic = TRAINER_PIC_SWIMMER_M,
-        .trainerName = LANGUAGE_STRING(
-            "NOLEN",
-            "CHRISTIAN",
-            "MATTIA"),
+        .trainerName = LANGUAGE_STRING("NOLEN", "CHRISTIAN", "MATTIA", "MUN"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -2433,10 +1950,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_SWIMMER_M,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SWIMMER,
         .trainerPic = TRAINER_PIC_SWIMMER_M,
-        .trainerName = LANGUAGE_STRING(
-            "STAN",
-            "STANISLAS",
-            "TRISTAN"),
+        .trainerName = LANGUAGE_STRING("STAN", "STANISLAS", "TRISTAN", "EUSEBIO"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -2448,10 +1962,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_SWIMMER_M,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SWIMMER,
         .trainerPic = TRAINER_PIC_SWIMMER_M,
-        .trainerName = LANGUAGE_STRING(
-            "BARRY",
-            "BENOIT",
-            "TOBIA"),
+        .trainerName = LANGUAGE_STRING("BARRY", "BENOIT", "TOBIA", "BORIS"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -2463,10 +1974,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_SWIMMER_M,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SWIMMER,
         .trainerPic = TRAINER_PIC_SWIMMER_M,
-        .trainerName = LANGUAGE_STRING(
-            "DEAN",
-            "JEAN",
-            "UMBERTO"),
+        .trainerName = LANGUAGE_STRING("DEAN", "JEAN", "UMBERTO", "DINO"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -2478,10 +1986,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_SWIMMER_M,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SWIMMER,
         .trainerPic = TRAINER_PIC_SWIMMER_M,
-        .trainerName = LANGUAGE_STRING(
-            "RODNEY",
-            "RODOLPHE",
-            "AMEDEO"),
+        .trainerName = LANGUAGE_STRING("RODNEY", "RODOLPHE", "AMEDEO", "RODOLFO"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -2493,10 +1998,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_SWIMMER_M,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SWIMMER,
         .trainerPic = TRAINER_PIC_SWIMMER_M,
-        .trainerName = LANGUAGE_STRING(
-            "RICHARD",
-            "RICHARD",
-            "RICHARD"),
+        .trainerName = LANGUAGE_STRING("RICHARD", "RICHARD", "RICHARD", "RICARDO"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -2508,10 +2010,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_SWIMMER_M,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SWIMMER,
         .trainerPic = TRAINER_PIC_SWIMMER_M,
-        .trainerName = LANGUAGE_STRING(
-            "HERMAN",
-            "HERVE",
-            "RAFFAELE"),
+        .trainerName = LANGUAGE_STRING("HERMAN", "HERVE", "RAFFAELE", "HERNANDO"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -2523,10 +2022,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_SWIMMER_M,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SWIMMER,
         .trainerPic = TRAINER_PIC_SWIMMER_M,
-        .trainerName = LANGUAGE_STRING(
-            "SANTIAGO",
-            "AMAURY",
-            "SANTIAGO"),
+        .trainerName = LANGUAGE_STRING("SANTIAGO", "AMAURY", "SANTIAGO", "CHANTI"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -2538,10 +2034,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_SWIMMER_M,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SWIMMER,
         .trainerPic = TRAINER_PIC_SWIMMER_M,
-        .trainerName = LANGUAGE_STRING(
-            "GILBERT",
-            "GILBERT",
-            "GILBERT"),
+        .trainerName = LANGUAGE_STRING("GILBERT", "GILBERT", "GILBERT", "GILBERTO"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -2553,10 +2046,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_SWIMMER_M,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SWIMMER,
         .trainerPic = TRAINER_PIC_SWIMMER_M,
-        .trainerName = LANGUAGE_STRING(
-            "FRANKLIN",
-            "MARIO",
-            "MIMMO"),
+        .trainerName = LANGUAGE_STRING("FRANKLIN", "MARIO", "MIMMO", "FRANCIS"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -2568,10 +2058,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_SWIMMER_M,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SWIMMER,
         .trainerPic = TRAINER_PIC_SWIMMER_M,
-        .trainerName = LANGUAGE_STRING(
-            "KEVIN",
-            "KEVIN",
-            "KEVIN"),
+        .trainerName = LANGUAGE_STRING("KEVIN", "KEVIN", "KEVIN", "QUIQUE"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -2583,10 +2070,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_SWIMMER_M,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SWIMMER,
         .trainerPic = TRAINER_PIC_SWIMMER_M,
-        .trainerName = LANGUAGE_STRING(
-            "JACK",
-            "JACQUES",
-            "MARINO"),
+        .trainerName = LANGUAGE_STRING("JACK", "JACQUES", "MARINO", "OMAR"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -2598,10 +2082,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_SWIMMER_M,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SWIMMER,
         .trainerPic = TRAINER_PIC_SWIMMER_M,
-        .trainerName = LANGUAGE_STRING(
-            "DUDLEY",
-            "DORIAN",
-            "MIRCO"),
+        .trainerName = LANGUAGE_STRING("DUDLEY", "DORIAN", "MIRCO", "DINIO"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -2613,10 +2094,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_SWIMMER_M,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SWIMMER,
         .trainerPic = TRAINER_PIC_SWIMMER_M,
-        .trainerName = LANGUAGE_STRING(
-            "CHAD",
-            "CEDRIC",
-            "TOBIAS"),
+        .trainerName = LANGUAGE_STRING("CHAD", "CEDRIC", "TOBIAS", "CIRO"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -2628,10 +2106,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_SWIMMER_M,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SWIMMER,
         .trainerPic = TRAINER_PIC_SWIMMER_M,
-        .trainerName = LANGUAGE_STRING(
-            "TONY",
-            "ANTOINE",
-            "TONY"),
+        .trainerName = LANGUAGE_STRING("TONY", "ANTOINE", "TONY", "TONI"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -2643,10 +2118,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_SWIMMER_M,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SWIMMER,
         .trainerPic = TRAINER_PIC_SWIMMER_M,
-        .trainerName = LANGUAGE_STRING(
-            "TONY",
-            "ANTOINE",
-            "TONY"),
+        .trainerName = LANGUAGE_STRING("TONY", "ANTOINE", "TONY", "TONI"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -2658,10 +2130,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_SWIMMER_M,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SWIMMER,
         .trainerPic = TRAINER_PIC_SWIMMER_M,
-        .trainerName = LANGUAGE_STRING(
-            "TONY",
-            "ANTOINE",
-            "TONY"),
+        .trainerName = LANGUAGE_STRING("TONY", "ANTOINE", "TONY", "TONI"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -2673,10 +2142,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_SWIMMER_M,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SWIMMER,
         .trainerPic = TRAINER_PIC_SWIMMER_M,
-        .trainerName = LANGUAGE_STRING(
-            "TONY",
-            "ANTOINE",
-            "TONY"),
+        .trainerName = LANGUAGE_STRING("TONY", "ANTOINE", "TONY", "TONI"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -2688,10 +2154,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_BLACK_BELT,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE,
         .trainerPic = TRAINER_PIC_BLACK_BELT,
-        .trainerName = LANGUAGE_STRING(
-            "TAKAO",
-            "BAPTISTE",
-            "TAKAO"),
+        .trainerName = LANGUAGE_STRING("TAKAO", "BAPTISTE", "TAKAO", "TAKAO"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -2703,10 +2166,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_BLACK_BELT,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE,
         .trainerPic = TRAINER_PIC_BLACK_BELT,
-        .trainerName = LANGUAGE_STRING(
-            "HITOSHI",
-            "HITOSHI",
-            "HITOSHI"),
+        .trainerName = LANGUAGE_STRING("HITOSHI", "HITOSHI", "HITOSHI", "HITOSHI"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -2718,10 +2178,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_BLACK_BELT,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE,
         .trainerPic = TRAINER_PIC_BLACK_BELT,
-        .trainerName = LANGUAGE_STRING(
-            "KIYO",
-            "AKIRA",
-            "KIYO"),
+        .trainerName = LANGUAGE_STRING("KIYO", "AKIRA", "KIYO", "HIRO"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -2733,10 +2190,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_BLACK_BELT,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE,
         .trainerPic = TRAINER_PIC_BLACK_BELT,
-        .trainerName = LANGUAGE_STRING(
-            "KOICHI",
-            "KOICHI",
-            "KOICHI"),
+        .trainerName = LANGUAGE_STRING("KOICHI", "KOICHI", "KOICHI", "KOICHI"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -2748,10 +2202,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_BLACK_BELT,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE,
         .trainerPic = TRAINER_PIC_BLACK_BELT,
-        .trainerName = LANGUAGE_STRING(
-            "NOB",
-            "HIRO",
-            "NOB"),
+        .trainerName = LANGUAGE_STRING("NOB", "HIRO", "NOB", "NOBORU"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -2763,10 +2214,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_BLACK_BELT,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE,
         .trainerPic = TRAINER_PIC_BLACK_BELT,
-        .trainerName = LANGUAGE_STRING(
-            "NOB",
-            "HIRO",
-            "NOB"),
+        .trainerName = LANGUAGE_STRING("NOB", "HIRO", "NOB", "NOBORU"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -2778,10 +2226,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_BLACK_BELT,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE,
         .trainerPic = TRAINER_PIC_BLACK_BELT,
-        .trainerName = LANGUAGE_STRING(
-            "NOB",
-            "HIRO",
-            "NOB"),
+        .trainerName = LANGUAGE_STRING("NOB", "HIRO", "NOB", "NOBORU"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -2793,10 +2238,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_BLACK_BELT,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE,
         .trainerPic = TRAINER_PIC_BLACK_BELT,
-        .trainerName = LANGUAGE_STRING(
-            "NOB",
-            "HIRO",
-            "NOB"),
+        .trainerName = LANGUAGE_STRING("NOB", "HIRO", "NOB", "NOBORU"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -2808,10 +2250,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_BLACK_BELT,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE,
         .trainerPic = TRAINER_PIC_BLACK_BELT,
-        .trainerName = LANGUAGE_STRING(
-            "NOB",
-            "HIRO",
-            "NOB"),
+        .trainerName = LANGUAGE_STRING("NOB", "HIRO", "NOB", "NOBORU"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -2823,10 +2262,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_BLACK_BELT,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE,
         .trainerPic = TRAINER_PIC_BLACK_BELT,
-        .trainerName = LANGUAGE_STRING(
-            "YUJI",
-            "YUJI",
-            "YUJI"),
+        .trainerName = LANGUAGE_STRING("YUJI", "YUJI", "YUJI", "YUJI"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -2838,10 +2274,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_BLACK_BELT,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE,
         .trainerPic = TRAINER_PIC_BLACK_BELT,
-        .trainerName = LANGUAGE_STRING(
-            "DAISUKE",
-            "DAISUKE",
-            "DAISUKE"),
+        .trainerName = LANGUAGE_STRING("DAISUKE", "DAISUKE", "DAISUKE", "DAISUKE"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -2853,10 +2286,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_BLACK_BELT,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE,
         .trainerPic = TRAINER_PIC_BLACK_BELT,
-        .trainerName = LANGUAGE_STRING(
-            "ATSUSHI",
-            "TETSUO",
-            "ATSUSHI"),
+        .trainerName = LANGUAGE_STRING("ATSUSHI", "TETSUO", "ATSUSHI", "ATSUSHI"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -2868,10 +2298,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_GUITARIST,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE,
         .trainerPic = TRAINER_PIC_GUITARIST,
-        .trainerName = LANGUAGE_STRING(
-            "KIRK",
-            "CHRIS",
-            "KIRK"),
+        .trainerName = LANGUAGE_STRING("KIRK", "CHRIS", "KIRK", "ALEGRO"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -2883,10 +2310,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_TEAM_AQUA,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_AQUA,
         .trainerPic = TRAINER_PIC_AQUA_GRUNT_F,
-        .trainerName = LANGUAGE_STRING(
-            "GRUNT",
-            "SBIRE",
-            "RECLUTA"),
+        .trainerName = LANGUAGE_STRING("GRUNT", "SBIRE", "RECLUTA", "SOLDADO"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -2898,10 +2322,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_TEAM_AQUA,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_AQUA,
         .trainerPic = TRAINER_PIC_AQUA_GRUNT_M,
-        .trainerName = LANGUAGE_STRING(
-            "GRUNT",
-            "SBIRE",
-            "RECLUTA"),
+        .trainerName = LANGUAGE_STRING("GRUNT", "SBIRE", "RECLUTA", "SOLDADO"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -2913,10 +2334,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_GUITARIST,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE,
         .trainerPic = TRAINER_PIC_GUITARIST,
-        .trainerName = LANGUAGE_STRING(
-            "SHAWN",
-            "ROBERT",
-            "SHAWN"),
+        .trainerName = LANGUAGE_STRING("SHAWN", "ROBERT", "SHAWN", "ISMA"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -2928,10 +2346,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_GUITARIST,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE,
         .trainerPic = TRAINER_PIC_GUITARIST,
-        .trainerName = LANGUAGE_STRING(
-            "FERNANDO",
-            "FERNAND",
-            "FERNANDO"),
+        .trainerName = LANGUAGE_STRING("FERNANDO", "FERNAND", "FERNANDO", "MUN"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -2943,10 +2358,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_GUITARIST,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE,
         .trainerPic = TRAINER_PIC_GUITARIST,
-        .trainerName = LANGUAGE_STRING(
-            "DALTON",
-            "BIBOU",
-            "DALTON"),
+        .trainerName = LANGUAGE_STRING("DALTON", "BIBOU", "DALTON", "RODRIGO"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -2958,10 +2370,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_GUITARIST,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE,
         .trainerPic = TRAINER_PIC_GUITARIST,
-        .trainerName = LANGUAGE_STRING(
-            "DALTON",
-            "BIBOU",
-            "DALTON"),
+        .trainerName = LANGUAGE_STRING("DALTON", "BIBOU", "DALTON", "RODRIGO"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -2973,10 +2382,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_GUITARIST,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE,
         .trainerPic = TRAINER_PIC_GUITARIST,
-        .trainerName = LANGUAGE_STRING(
-            "DALTON",
-            "BIBOU",
-            "DALTON"),
+        .trainerName = LANGUAGE_STRING("DALTON", "BIBOU", "DALTON", "RODRIGO"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -2988,10 +2394,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_GUITARIST,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE,
         .trainerPic = TRAINER_PIC_GUITARIST,
-        .trainerName = LANGUAGE_STRING(
-            "DALTON",
-            "BIBOU",
-            "DALTON"),
+        .trainerName = LANGUAGE_STRING("DALTON", "BIBOU", "DALTON", "RODRIGO"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -3003,10 +2406,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_GUITARIST,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE,
         .trainerPic = TRAINER_PIC_GUITARIST,
-        .trainerName = LANGUAGE_STRING(
-            "DALTON",
-            "BIBOU",
-            "DALTON"),
+        .trainerName = LANGUAGE_STRING("DALTON", "BIBOU", "DALTON", "RODRIGO"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -3018,10 +2418,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_KINDLER,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER,
         .trainerPic = TRAINER_PIC_KINDLER,
-        .trainerName = LANGUAGE_STRING(
-            "COLE",
-            "CYRIL",
-            "VALENTINO"),
+        .trainerName = LANGUAGE_STRING("COLE", "CYRIL", "VALENTINO", "CAMILO"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -3033,10 +2430,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_KINDLER,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER,
         .trainerPic = TRAINER_PIC_KINDLER,
-        .trainerName = LANGUAGE_STRING(
-            "JEFF",
-            "ANTONIO",
-            "FLAVIO"),
+        .trainerName = LANGUAGE_STRING("JEFF", "ANTONIO", "FLAVIO", "GENARO"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -3048,10 +2442,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_KINDLER,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER,
         .trainerPic = TRAINER_PIC_KINDLER,
-        .trainerName = LANGUAGE_STRING(
-            "AXLE",
-            "AXEL",
-            "UGO"),
+        .trainerName = LANGUAGE_STRING("AXLE", "AXEL", "UGO", "ALEJO"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -3063,10 +2454,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_KINDLER,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER,
         .trainerPic = TRAINER_PIC_KINDLER,
-        .trainerName = LANGUAGE_STRING(
-            "JACE",
-            "FLAVIEN",
-            "UBALDO"),
+        .trainerName = LANGUAGE_STRING("JACE", "FLAVIEN", "UBALDO", "JACE"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -3078,10 +2466,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_KINDLER,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER,
         .trainerPic = TRAINER_PIC_KINDLER,
-        .trainerName = LANGUAGE_STRING(
-            "KEEGAN",
-            "IVAN",
-            "KEEGAN"),
+        .trainerName = LANGUAGE_STRING("KEEGAN", "IVAN", "KEEGAN", "FUGUI"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -3093,10 +2478,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_KINDLER,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER,
         .trainerPic = TRAINER_PIC_KINDLER,
-        .trainerName = LANGUAGE_STRING(
-            "BERNIE",
-            "BERNARD",
-            "GRAZIANO"),
+        .trainerName = LANGUAGE_STRING("BERNIE", "BERNARD", "GRAZIANO", "BERNARDO"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -3108,10 +2490,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_KINDLER,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER,
         .trainerPic = TRAINER_PIC_KINDLER,
-        .trainerName = LANGUAGE_STRING(
-            "BERNIE",
-            "BERNARD",
-            "GRAZIANO"),
+        .trainerName = LANGUAGE_STRING("BERNIE", "BERNARD", "GRAZIANO", "BERNARDO"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -3123,10 +2502,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_KINDLER,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER,
         .trainerPic = TRAINER_PIC_KINDLER,
-        .trainerName = LANGUAGE_STRING(
-            "BERNIE",
-            "BERNARD",
-            "GRAZIANO"),
+        .trainerName = LANGUAGE_STRING("BERNIE", "BERNARD", "GRAZIANO", "BERNARDO"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -3138,10 +2514,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_KINDLER,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER,
         .trainerPic = TRAINER_PIC_KINDLER,
-        .trainerName = LANGUAGE_STRING(
-            "BERNIE",
-            "BERNARD",
-            "GRAZIANO"),
+        .trainerName = LANGUAGE_STRING("BERNIE", "BERNARD", "GRAZIANO", "BERNARDO"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -3153,10 +2526,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_KINDLER,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER,
         .trainerPic = TRAINER_PIC_KINDLER,
-        .trainerName = LANGUAGE_STRING(
-            "BERNIE",
-            "BERNARD",
-            "GRAZIANO"),
+        .trainerName = LANGUAGE_STRING("BERNIE", "BERNARD", "GRAZIANO", "BERNARDO"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -3168,10 +2538,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_CAMPER,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
         .trainerPic = TRAINER_PIC_CAMPER,
-        .trainerName = LANGUAGE_STRING(
-            "DREW",
-            "TRISTAN",
-            "RINALDO"),
+        .trainerName = LANGUAGE_STRING("DREW", "TRISTAN", "RINALDO", "DOROTEO"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -3183,10 +2550,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_CAMPER,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
         .trainerPic = TRAINER_PIC_CAMPER,
-        .trainerName = LANGUAGE_STRING(
-            "BEAU",
-            "YANIS",
-            "GIANFRANCO"),
+        .trainerName = LANGUAGE_STRING("BEAU", "YANIS", "GIANFRANCO", "BENITO"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -3198,10 +2562,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_CAMPER,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
         .trainerPic = TRAINER_PIC_CAMPER,
-        .trainerName = LANGUAGE_STRING(
-            "LARRY",
-            "LAURENT",
-            "LARRY"),
+        .trainerName = LANGUAGE_STRING("LARRY", "LAURENT", "LARRY", "LEANDRO"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -3213,10 +2574,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_CAMPER,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
         .trainerPic = TRAINER_PIC_CAMPER,
-        .trainerName = LANGUAGE_STRING(
-            "SHANE",
-            "DJAMEL",
-            "FRANCO"),
+        .trainerName = LANGUAGE_STRING("SHANE", "DJAMEL", "FRANCO", "CHANO"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -3228,10 +2586,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_CAMPER,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
         .trainerPic = TRAINER_PIC_CAMPER,
-        .trainerName = LANGUAGE_STRING(
-            "JUSTIN",
-            "JUSTIN",
-            "MISHA"),
+        .trainerName = LANGUAGE_STRING("JUSTIN", "JUSTIN", "MISHA", "JUSTI"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -3243,10 +2598,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_CAMPER,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
         .trainerPic = TRAINER_PIC_CAMPER,
-        .trainerName = LANGUAGE_STRING(
-            "ETHAN",
-            "DIEGO",
-            "MAURO"),
+        .trainerName = LANGUAGE_STRING("ETHAN", "DIEGO", "MAURO", "EZEQUIEL"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -3258,10 +2610,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_PICNICKER,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL,
         .trainerPic = TRAINER_PIC_PICNICKER,
-        .trainerName = LANGUAGE_STRING(
-            "AUTUMN",
-            "NATHY",
-            "ERMINIA"),
+        .trainerName = LANGUAGE_STRING("AUTUMN", "NATHY", "ERMINIA", "OTI"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -3273,10 +2622,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_CAMPER,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
         .trainerPic = TRAINER_PIC_CAMPER,
-        .trainerName = LANGUAGE_STRING(
-            "TRAVIS",
-            "THIERRY",
-            "PHILIP"),
+        .trainerName = LANGUAGE_STRING("TRAVIS", "THIERRY", "PHILIP", "DUDU"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -3288,10 +2634,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_CAMPER,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
         .trainerPic = TRAINER_PIC_CAMPER,
-        .trainerName = LANGUAGE_STRING(
-            "ETHAN",
-            "DIEGO",
-            "MAURO"),
+        .trainerName = LANGUAGE_STRING("ETHAN", "DIEGO", "MAURO", "EZEQUIEL"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -3303,10 +2646,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_CAMPER,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
         .trainerPic = TRAINER_PIC_CAMPER,
-        .trainerName = LANGUAGE_STRING(
-            "ETHAN",
-            "DIEGO",
-            "MAURO"),
+        .trainerName = LANGUAGE_STRING("ETHAN", "DIEGO", "MAURO", "EZEQUIEL"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -3318,10 +2658,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_CAMPER,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
         .trainerPic = TRAINER_PIC_CAMPER,
-        .trainerName = LANGUAGE_STRING(
-            "ETHAN",
-            "DIEGO",
-            "MAURO"),
+        .trainerName = LANGUAGE_STRING("ETHAN", "DIEGO", "MAURO", "EZEQUIEL"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -3333,10 +2670,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_CAMPER,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
         .trainerPic = TRAINER_PIC_CAMPER,
-        .trainerName = LANGUAGE_STRING(
-            "ETHAN",
-            "DIEGO",
-            "MAURO"),
+        .trainerName = LANGUAGE_STRING("ETHAN", "DIEGO", "MAURO", "EZEQUIEL"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -3348,10 +2682,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_BUG_MANIAC,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS,
         .trainerPic = TRAINER_PIC_BUG_MANIAC,
-        .trainerName = LANGUAGE_STRING(
-            "BRENT",
-            "BRAD",
-            "MARTINO"),
+        .trainerName = LANGUAGE_STRING("BRENT", "BRAD", "MARTINO", "BERNI"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -3363,10 +2694,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_BUG_MANIAC,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS,
         .trainerPic = TRAINER_PIC_BUG_MANIAC,
-        .trainerName = LANGUAGE_STRING(
-            "DONALD",
-            "DONALD",
-            "PAOLINO"),
+        .trainerName = LANGUAGE_STRING("DONALD", "DONALD", "PAOLINO", "DONATO"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -3378,10 +2706,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_BUG_MANIAC,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS,
         .trainerPic = TRAINER_PIC_BUG_MANIAC,
-        .trainerName = LANGUAGE_STRING(
-            "TAYLOR",
-            "THIBAULT",
-            "ERMANNO"),
+        .trainerName = LANGUAGE_STRING("TAYLOR", "THIBAULT", "ERMANNO", "TIRSO"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -3393,10 +2718,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_BUG_MANIAC,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS,
         .trainerPic = TRAINER_PIC_BUG_MANIAC,
-        .trainerName = LANGUAGE_STRING(
-            "JEFFREY",
-            "FLORENT",
-            "MAT"),
+        .trainerName = LANGUAGE_STRING("JEFFREY", "FLORENT", "MAT", "BARTOLO"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -3408,10 +2730,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_BUG_MANIAC,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS,
         .trainerPic = TRAINER_PIC_BUG_MANIAC,
-        .trainerName = LANGUAGE_STRING(
-            "DEREK",
-            "DIDIER",
-            "LEOPOLDO"),
+        .trainerName = LANGUAGE_STRING("DEREK", "DIDIER", "LEOPOLDO", "DANTE"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -3423,10 +2742,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_BUG_MANIAC,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS,
         .trainerPic = TRAINER_PIC_BUG_MANIAC,
-        .trainerName = LANGUAGE_STRING(
-            "JEFFREY",
-            "FLORENT",
-            "MAT"),
+        .trainerName = LANGUAGE_STRING("JEFFREY", "FLORENT", "MAT", "BARTOLO"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -3438,10 +2754,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_BUG_MANIAC,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS,
         .trainerPic = TRAINER_PIC_BUG_MANIAC,
-        .trainerName = LANGUAGE_STRING(
-            "JEFFREY",
-            "FLORENT",
-            "MAT"),
+        .trainerName = LANGUAGE_STRING("JEFFREY", "FLORENT", "MAT", "BARTOLO"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -3453,10 +2766,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_BUG_MANIAC,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS,
         .trainerPic = TRAINER_PIC_BUG_MANIAC,
-        .trainerName = LANGUAGE_STRING(
-            "JEFFREY",
-            "FLORENT",
-            "MAT"),
+        .trainerName = LANGUAGE_STRING("JEFFREY", "FLORENT", "MAT", "BARTOLO"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -3468,10 +2778,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_BUG_MANIAC,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS,
         .trainerPic = TRAINER_PIC_BUG_MANIAC,
-        .trainerName = LANGUAGE_STRING(
-            "JEFFREY",
-            "FLORENT",
-            "MAT"),
+        .trainerName = LANGUAGE_STRING("JEFFREY", "FLORENT", "MAT", "BARTOLO"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -3483,10 +2790,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_PSYCHIC,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE,
         .trainerPic = TRAINER_PIC_PSYCHIC_M,
-        .trainerName = LANGUAGE_STRING(
-            "EDWARD",
-            "EDOUARD",
-            "FABIANO"),
+        .trainerName = LANGUAGE_STRING("EDWARD", "EDOUARD", "FABIANO", "EDUARDO"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -3498,10 +2802,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_PSYCHIC,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE,
         .trainerPic = TRAINER_PIC_PSYCHIC_M,
-        .trainerName = LANGUAGE_STRING(
-            "PRESTON",
-            "POLO",
-            "ALEXANDER"),
+        .trainerName = LANGUAGE_STRING("PRESTON", "POLO", "ALEXANDER", "PATRICIO"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -3513,10 +2814,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_PSYCHIC,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE,
         .trainerPic = TRAINER_PIC_PSYCHIC_M,
-        .trainerName = LANGUAGE_STRING(
-            "VIRGIL",
-            "VIRGILE",
-            "MAURIZIO"),
+        .trainerName = LANGUAGE_STRING("VIRGIL", "VIRGILE", "MAURIZIO", "VIRGILIO"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -3528,10 +2826,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_PSYCHIC,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE,
         .trainerPic = TRAINER_PIC_PSYCHIC_M,
-        .trainerName = LANGUAGE_STRING(
-            "BLAKE",
-            "HUGUES",
-            "BLAKE"),
+        .trainerName = LANGUAGE_STRING("BLAKE", "HUGUES", "BLAKE", "BLAKE"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -3543,10 +2838,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_PSYCHIC,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE,
         .trainerPic = TRAINER_PIC_PSYCHIC_M,
-        .trainerName = LANGUAGE_STRING(
-            "WILLIAM",
-            "WILLIAM",
-            "FIORENZO"),
+        .trainerName = LANGUAGE_STRING("WILLIAM", "WILLIAM", "FIORENZO", "GUILLERMO"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -3558,10 +2850,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_PSYCHIC,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE,
         .trainerPic = TRAINER_PIC_PSYCHIC_M,
-        .trainerName = LANGUAGE_STRING(
-            "JOSHUA",
-            "JOSEPH",
-            "FORTUNATO"),
+        .trainerName = LANGUAGE_STRING("JOSHUA", "JOSEPH", "FORTUNATO", "JOSU"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -3573,10 +2862,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_PSYCHIC,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE,
         .trainerPic = TRAINER_PIC_PSYCHIC_M,
-        .trainerName = LANGUAGE_STRING(
-            "CAMERON",
-            "PROSPER",
-            "MASSIMINO"),
+        .trainerName = LANGUAGE_STRING("CAMERON", "PROSPER", "MASSIMINO", "SILVIO"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -3588,10 +2874,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_PSYCHIC,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE,
         .trainerPic = TRAINER_PIC_PSYCHIC_M,
-        .trainerName = LANGUAGE_STRING(
-            "CAMERON",
-            "PROSPER",
-            "MASSIMINO"),
+        .trainerName = LANGUAGE_STRING("CAMERON", "PROSPER", "MASSIMINO", "SILVIO"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -3603,10 +2886,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_PSYCHIC,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE,
         .trainerPic = TRAINER_PIC_PSYCHIC_M,
-        .trainerName = LANGUAGE_STRING(
-            "CAMERON",
-            "PROSPER",
-            "MASSIMINO"),
+        .trainerName = LANGUAGE_STRING("CAMERON", "PROSPER", "MASSIMINO", "SILVIO"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -3618,10 +2898,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_PSYCHIC,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE,
         .trainerPic = TRAINER_PIC_PSYCHIC_M,
-        .trainerName = LANGUAGE_STRING(
-            "CAMERON",
-            "PROSPER",
-            "MASSIMINO"),
+        .trainerName = LANGUAGE_STRING("CAMERON", "PROSPER", "MASSIMINO", "SILVIO"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -3633,10 +2910,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_PSYCHIC,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE,
         .trainerPic = TRAINER_PIC_PSYCHIC_M,
-        .trainerName = LANGUAGE_STRING(
-            "CAMERON",
-            "PROSPER",
-            "MASSIMINO"),
+        .trainerName = LANGUAGE_STRING("CAMERON", "PROSPER", "MASSIMINO", "SILVIO"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -3648,10 +2922,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_PSYCHIC,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE,
         .trainerPic = TRAINER_PIC_PSYCHIC_F,
-        .trainerName = LANGUAGE_STRING(
-            "JACLYN",
-            "JACQUELINE",
-            "GRETA"),
+        .trainerName = LANGUAGE_STRING("JACLYN", "JACQUELINE", "GRETA", "JACINTA"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -3663,10 +2934,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_PSYCHIC,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE,
         .trainerPic = TRAINER_PIC_PSYCHIC_F,
-        .trainerName = LANGUAGE_STRING(
-            "HANNAH",
-            "SABINE",
-            "ANNINA"),
+        .trainerName = LANGUAGE_STRING("HANNAH", "SABINE", "ANNINA", "ANA"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -3678,10 +2946,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_PSYCHIC,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE,
         .trainerPic = TRAINER_PIC_PSYCHIC_F,
-        .trainerName = LANGUAGE_STRING(
-            "SAMANTHA",
-            "SAMANTHA",
-            "ERIKA"),
+        .trainerName = LANGUAGE_STRING("SAMANTHA", "SAMANTHA", "ERIKA", "SAMANTA"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -3693,10 +2958,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_PSYCHIC,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE,
         .trainerPic = TRAINER_PIC_PSYCHIC_F,
-        .trainerName = LANGUAGE_STRING(
-            "MAURA",
-            "MYRIAM",
-            "ANNALISA"),
+        .trainerName = LANGUAGE_STRING("MAURA", "MYRIAM", "ANNALISA", "MAGDA"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -3708,10 +2970,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_PSYCHIC,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE,
         .trainerPic = TRAINER_PIC_PSYCHIC_F,
-        .trainerName = LANGUAGE_STRING(
-            "KAYLA",
-            "KARINE",
-            "LETIZIA"),
+        .trainerName = LANGUAGE_STRING("KAYLA", "KARINE", "LETIZIA", "CELIA"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -3723,10 +2982,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_PSYCHIC,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE,
         .trainerPic = TRAINER_PIC_PSYCHIC_F,
-        .trainerName = LANGUAGE_STRING(
-            "ALEXIS",
-            "CLAUDIE",
-            "RAMONA"),
+        .trainerName = LANGUAGE_STRING("ALEXIS", "CLAUDIE", "RAMONA", "ALEXA"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -3738,10 +2994,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_PSYCHIC,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE,
         .trainerPic = TRAINER_PIC_PSYCHIC_F,
-        .trainerName = LANGUAGE_STRING(
-            "JACKI",
-            "NORA",
-            "LIVIA"),
+        .trainerName = LANGUAGE_STRING("JACKI", "NORA", "LIVIA", "JADE"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -3753,10 +3006,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_PSYCHIC,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE,
         .trainerPic = TRAINER_PIC_PSYCHIC_F,
-        .trainerName = LANGUAGE_STRING(
-            "JACKI",
-            "NORA",
-            "LIVIA"),
+        .trainerName = LANGUAGE_STRING("JACKI", "NORA", "LIVIA", "JADE"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -3768,10 +3018,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_PSYCHIC,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE,
         .trainerPic = TRAINER_PIC_PSYCHIC_F,
-        .trainerName = LANGUAGE_STRING(
-            "JACKI",
-            "NORA",
-            "LIVIA"),
+        .trainerName = LANGUAGE_STRING("JACKI", "NORA", "LIVIA", "JADE"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -3783,10 +3030,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_PSYCHIC,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE,
         .trainerPic = TRAINER_PIC_PSYCHIC_F,
-        .trainerName = LANGUAGE_STRING(
-            "JACKI",
-            "NORA",
-            "LIVIA"),
+        .trainerName = LANGUAGE_STRING("JACKI", "NORA", "LIVIA", "JADE"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -3798,10 +3042,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_PSYCHIC,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE,
         .trainerPic = TRAINER_PIC_PSYCHIC_F,
-        .trainerName = LANGUAGE_STRING(
-            "JACKI",
-            "NORA",
-            "LIVIA"),
+        .trainerName = LANGUAGE_STRING("JACKI", "NORA", "LIVIA", "JADE"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -3813,10 +3054,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_GENTLEMAN,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_RICH,
         .trainerPic = TRAINER_PIC_GENTLEMAN,
-        .trainerName = LANGUAGE_STRING(
-            "WALTER",
-            "WALTER",
-            "GIANLUIGI"),
+        .trainerName = LANGUAGE_STRING("WALTER", "WALTER", "GIANLUIGI", "GABINO"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -3828,10 +3066,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_GENTLEMAN,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_RICH,
         .trainerPic = TRAINER_PIC_GENTLEMAN,
-        .trainerName = LANGUAGE_STRING(
-            "MICAH",
-            "ANATOLE",
-            "PIERLUIGI"),
+        .trainerName = LANGUAGE_STRING("MICAH", "ANATOLE", "PIERLUIGI", "TITO"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -3843,10 +3078,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_GENTLEMAN,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_RICH,
         .trainerPic = TRAINER_PIC_GENTLEMAN,
-        .trainerName = LANGUAGE_STRING(
-            "THOMAS",
-            "TONY",
-            "PIERLUCA"),
+        .trainerName = LANGUAGE_STRING("THOMAS", "TONY", "PIERLUCA", "TOMEO"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -3858,10 +3090,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_GENTLEMAN,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_RICH,
         .trainerPic = TRAINER_PIC_GENTLEMAN,
-        .trainerName = LANGUAGE_STRING(
-            "WALTER",
-            "WALTER",
-            "GIANLUIGI"),
+        .trainerName = LANGUAGE_STRING("WALTER", "WALTER", "GIANLUIGI", "GABINO"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -3873,10 +3102,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_GENTLEMAN,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_RICH,
         .trainerPic = TRAINER_PIC_GENTLEMAN,
-        .trainerName = LANGUAGE_STRING(
-            "WALTER",
-            "WALTER",
-            "GIANLUIGI"),
+        .trainerName = LANGUAGE_STRING("WALTER", "WALTER", "GIANLUIGI", "GABINO"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -3888,10 +3114,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_GENTLEMAN,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_RICH,
         .trainerPic = TRAINER_PIC_GENTLEMAN,
-        .trainerName = LANGUAGE_STRING(
-            "WALTER",
-            "WALTER",
-            "GIANLUIGI"),
+        .trainerName = LANGUAGE_STRING("WALTER", "WALTER", "GIANLUIGI", "GABINO"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -3903,10 +3126,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_GENTLEMAN,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_RICH,
         .trainerPic = TRAINER_PIC_GENTLEMAN,
-        .trainerName = LANGUAGE_STRING(
-            "WALTER",
-            "WALTER",
-            "GIANLUIGI"),
+        .trainerName = LANGUAGE_STRING("WALTER", "WALTER", "GIANLUIGI", "GABINO"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -3918,10 +3138,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_ELITE_FOUR,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_ELITE_FOUR,
         .trainerPic = TRAINER_PIC_ELITE_FOUR_SIDNEY,
-        .trainerName = LANGUAGE_STRING(
-            "SIDNEY",
-            "DAMIEN",
-            "FOSCO"),
+        .trainerName = LANGUAGE_STRING("SIDNEY", "DAMIEN", "FOSCO", "SIXTO"),
         .items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY | AI_SCRIPT_SETUP_FIRST_TURN,
@@ -3933,10 +3150,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_ELITE_FOUR,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_ELITE_FOUR,
         .trainerPic = TRAINER_PIC_ELITE_FOUR_PHOEBE,
-        .trainerName = LANGUAGE_STRING(
-            "PHOEBE",
-            "SPECTRA",
-            "ESTER"),
+        .trainerName = LANGUAGE_STRING("PHOEBE", "SPECTRA", "ESTER", "FÁTIMA"),
         .items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
@@ -3948,10 +3162,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_ELITE_FOUR,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_ELITE_FOUR,
         .trainerPic = TRAINER_PIC_ELITE_FOUR_GLACIA,
-        .trainerName = LANGUAGE_STRING(
-            "GLACIA",
-            "GLACIA",
-            "FRIDA"),
+        .trainerName = LANGUAGE_STRING("GLACIA", "GLACIA", "FRIDA", "NÍVEA"),
         .items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
@@ -3963,10 +3174,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_ELITE_FOUR,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_ELITE_FOUR,
         .trainerPic = TRAINER_PIC_ELITE_FOUR_DRAKE,
-        .trainerName = LANGUAGE_STRING(
-            "DRAKE",
-            "ARAGON",
-            "DRAKE"),
+        .trainerName = LANGUAGE_STRING("DRAKE", "ARAGON", "DRAKE", "DRACÓN"),
         .items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
@@ -3978,10 +3186,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_LEADER,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE,
         .trainerPic = TRAINER_PIC_LEADER_ROXANNE,
-        .trainerName = LANGUAGE_STRING(
-            "ROXANNE",
-            "ROXANNE",
-            "PETRA"),
+        .trainerName = LANGUAGE_STRING("ROXANNE", "ROXANNE", "PETRA", "PETRA"),
         .items = {ITEM_POTION, ITEM_POTION, ITEM_NONE, ITEM_NONE},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
@@ -3993,10 +3198,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_LEADER,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
         .trainerPic = TRAINER_PIC_LEADER_BRAWLY,
-        .trainerName = LANGUAGE_STRING(
-            "BRAWLY",
-            "BASTIEN",
-            "RUDI"),
+        .trainerName = LANGUAGE_STRING("BRAWLY", "BASTIEN", "RUDI", "MARCIAL"),
         .items = {ITEM_SUPER_POTION, ITEM_SUPER_POTION, ITEM_NONE, ITEM_NONE},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
@@ -4008,10 +3210,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_LEADER,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
         .trainerPic = TRAINER_PIC_LEADER_WATTSON,
-        .trainerName = LANGUAGE_STRING(
-            "WATTSON",
-            "VOLTERE",
-            "WALTER"),
+        .trainerName = LANGUAGE_STRING("WATTSON", "VOLTERE", "WALTER", "ERICO"),
         .items = {ITEM_SUPER_POTION, ITEM_SUPER_POTION, ITEM_NONE, ITEM_NONE},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
@@ -4023,10 +3222,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_LEADER,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE,
         .trainerPic = TRAINER_PIC_LEADER_FLANNERY,
-        .trainerName = LANGUAGE_STRING(
-            "FLANNERY",
-            "ADRIANE",
-            "FIAMMETTA"),
+        .trainerName = LANGUAGE_STRING("FLANNERY", "ADRIANE", "FIAMMETTA", "CANDELA"),
         .items = {ITEM_HYPER_POTION, ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
@@ -4038,10 +3234,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_LEADER,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
         .trainerPic = TRAINER_PIC_LEADER_NORMAN,
-        .trainerName = LANGUAGE_STRING(
-            "NORMAN",
-            "NORMAN",
-            "NORMAN"),
+        .trainerName = LANGUAGE_STRING("NORMAN", "NORMAN", "NORMAN", "NORMAN"),
         .items = {ITEM_HYPER_POTION, ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
@@ -4053,10 +3246,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_LEADER,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE,
         .trainerPic = TRAINER_PIC_LEADER_WINONA,
-        .trainerName = LANGUAGE_STRING(
-            "WINONA",
-            "ALIZEE",
-            "ALICE"),
+        .trainerName = LANGUAGE_STRING("WINONA", "ALIZEE", "ALICE", "ALANA"),
         .items = {ITEM_HYPER_POTION, ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY | AI_SCRIPT_RISKY,
@@ -4068,10 +3258,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_LEADER,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE,
         .trainerPic = TRAINER_PIC_LEADER_TATE_AND_LIZA,
-        .trainerName = LANGUAGE_STRING(
-            "TATE&LIZA",
-            "LEVY&TATIA",
-            "TELL & PAT"),
+        .trainerName = LANGUAGE_STRING("TATE&LIZA", "LEVY&TATIA", "TELL & PAT", "VITO-LETI"),
         .items = {ITEM_HYPER_POTION, ITEM_HYPER_POTION, ITEM_HYPER_POTION, ITEM_HYPER_POTION},
         .doubleBattle = TRUE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
@@ -4083,10 +3270,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_LEADER,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
         .trainerPic = TRAINER_PIC_LEADER_JUAN,
-        .trainerName = LANGUAGE_STRING(
-            "JUAN",
-            "JUAN",
-            "RODOLFO"),
+        .trainerName = LANGUAGE_STRING("JUAN", "JUAN", "RODOLFO", "GALANO"),
         .items = {ITEM_HYPER_POTION, ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
@@ -4098,10 +3282,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_SCHOOL_KID,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
         .trainerPic = TRAINER_PIC_SCHOOL_KID_M,
-        .trainerName = LANGUAGE_STRING(
-            "JERRY",
-            "JULIEN",
-            "JERRY"),
+        .trainerName = LANGUAGE_STRING("JERRY", "JULIEN", "JERRY", "JERONI"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -4113,10 +3294,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_SCHOOL_KID,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
         .trainerPic = TRAINER_PIC_SCHOOL_KID_M,
-        .trainerName = LANGUAGE_STRING(
-            "TED",
-            "THEO",
-            "TED"),
+        .trainerName = LANGUAGE_STRING("TED", "THEO", "TED", "TICO"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -4128,10 +3306,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_SCHOOL_KID,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
         .trainerPic = TRAINER_PIC_SCHOOL_KID_M,
-        .trainerName = LANGUAGE_STRING(
-            "PAUL",
-            "PAUL",
-            "AGOSTINO"),
+        .trainerName = LANGUAGE_STRING("PAUL", "PAUL", "AGOSTINO", "PAULINO"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -4143,10 +3318,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_SCHOOL_KID,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
         .trainerPic = TRAINER_PIC_SCHOOL_KID_M,
-        .trainerName = LANGUAGE_STRING(
-            "JERRY",
-            "JULIEN",
-            "JERRY"),
+        .trainerName = LANGUAGE_STRING("JERRY", "JULIEN", "JERRY", "JERONI"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -4158,10 +3330,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_SCHOOL_KID,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
         .trainerPic = TRAINER_PIC_SCHOOL_KID_M,
-        .trainerName = LANGUAGE_STRING(
-            "JERRY",
-            "JULIEN",
-            "JERRY"),
+        .trainerName = LANGUAGE_STRING("JERRY", "JULIEN", "JERRY", "JERONI"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -4173,10 +3342,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_SCHOOL_KID,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
         .trainerPic = TRAINER_PIC_SCHOOL_KID_M,
-        .trainerName = LANGUAGE_STRING(
-            "JERRY",
-            "JULIEN",
-            "JERRY"),
+        .trainerName = LANGUAGE_STRING("JERRY", "JULIEN", "JERRY", "JERONI"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -4188,10 +3354,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_SCHOOL_KID,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
         .trainerPic = TRAINER_PIC_SCHOOL_KID_M,
-        .trainerName = LANGUAGE_STRING(
-            "JERRY",
-            "JULIEN",
-            "JERRY"),
+        .trainerName = LANGUAGE_STRING("JERRY", "JULIEN", "JERRY", "JERONI"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -4203,10 +3366,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_SCHOOL_KID,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL,
         .trainerPic = TRAINER_PIC_SCHOOL_KID_F,
-        .trainerName = LANGUAGE_STRING(
-            "KAREN",
-            "KARENE",
-            "KAREN"),
+        .trainerName = LANGUAGE_STRING("KAREN", "KARENE", "KAREN", "CORINA"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -4218,10 +3378,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_SCHOOL_KID,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL,
         .trainerPic = TRAINER_PIC_SCHOOL_KID_F,
-        .trainerName = LANGUAGE_STRING(
-            "GEORGIA",
-            "GWENDOLINE",
-            "FLORIANA"),
+        .trainerName = LANGUAGE_STRING("GEORGIA", "GWENDOLINE", "FLORIANA", "GREGORIA"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -4233,10 +3390,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_SCHOOL_KID,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL,
         .trainerPic = TRAINER_PIC_SCHOOL_KID_F,
-        .trainerName = LANGUAGE_STRING(
-            "KAREN",
-            "KARENE",
-            "KAREN"),
+        .trainerName = LANGUAGE_STRING("KAREN", "KARENE", "KAREN", "CORINA"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -4248,10 +3402,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_SCHOOL_KID,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL,
         .trainerPic = TRAINER_PIC_SCHOOL_KID_F,
-        .trainerName = LANGUAGE_STRING(
-            "KAREN",
-            "KARENE",
-            "KAREN"),
+        .trainerName = LANGUAGE_STRING("KAREN", "KARENE", "KAREN", "CORINA"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -4263,10 +3414,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_SCHOOL_KID,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL,
         .trainerPic = TRAINER_PIC_SCHOOL_KID_F,
-        .trainerName = LANGUAGE_STRING(
-            "KAREN",
-            "KARENE",
-            "KAREN"),
+        .trainerName = LANGUAGE_STRING("KAREN", "KARENE", "KAREN", "CORINA"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -4278,10 +3426,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_SCHOOL_KID,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL,
         .trainerPic = TRAINER_PIC_SCHOOL_KID_F,
-        .trainerName = LANGUAGE_STRING(
-            "KAREN",
-            "KARENE",
-            "KAREN"),
+        .trainerName = LANGUAGE_STRING("KAREN", "KARENE", "KAREN", "CORINA"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -4293,10 +3438,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_SR_AND_JR,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_TWINS,
         .trainerPic = TRAINER_PIC_SR_AND_JR,
-        .trainerName = LANGUAGE_STRING(
-            "KATE & JOY",
-            "VIVI & BEA",
-            "KATE & JOY"),
+        .trainerName = LANGUAGE_STRING("KATE & JOY", "VIVI & BEA", "KATE & JOY", "CATI-FELI"),
         .items = {},
         .doubleBattle = TRUE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -4308,10 +3450,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_SR_AND_JR,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_TWINS,
         .trainerPic = TRAINER_PIC_SR_AND_JR,
-        .trainerName = LANGUAGE_STRING(
-            "ANNA & MEG",
-            "ANNA & EVA",
-            "ANNA & IDA"),
+        .trainerName = LANGUAGE_STRING("ANNA & MEG", "ANNA & EVA", "ANNA & IDA", "ANI-MATI"),
         .items = {},
         .doubleBattle = TRUE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -4323,10 +3462,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_SR_AND_JR,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_TWINS,
         .trainerPic = TRAINER_PIC_SR_AND_JR,
-        .trainerName = LANGUAGE_STRING(
-            "ANNA & MEG",
-            "ANNA & EVA",
-            "ANNA & IDA"),
+        .trainerName = LANGUAGE_STRING("ANNA & MEG", "ANNA & EVA", "ANNA & IDA", "ANI-MATI"),
         .items = {},
         .doubleBattle = TRUE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -4338,10 +3474,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_SR_AND_JR,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_TWINS,
         .trainerPic = TRAINER_PIC_SR_AND_JR,
-        .trainerName = LANGUAGE_STRING(
-            "ANNA & MEG",
-            "ANNA & EVA",
-            "ANNA & IDA"),
+        .trainerName = LANGUAGE_STRING("ANNA & MEG", "ANNA & EVA", "ANNA & IDA", "ANI-MATI"),
         .items = {},
         .doubleBattle = TRUE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -4353,10 +3486,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_SR_AND_JR,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_TWINS,
         .trainerPic = TRAINER_PIC_SR_AND_JR,
-        .trainerName = LANGUAGE_STRING(
-            "ANNA & MEG",
-            "ANNA & EVA",
-            "ANNA & IDA"),
+        .trainerName = LANGUAGE_STRING("ANNA & MEG", "ANNA & EVA", "ANNA & IDA", "ANI-MATI"),
         .items = {},
         .doubleBattle = TRUE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -4368,10 +3498,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_SR_AND_JR,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_TWINS,
         .trainerPic = TRAINER_PIC_SR_AND_JR,
-        .trainerName = LANGUAGE_STRING(
-            "ANNA & MEG",
-            "ANNA & EVA",
-            "ANNA & IDA"),
+        .trainerName = LANGUAGE_STRING("ANNA & MEG", "ANNA & EVA", "ANNA & IDA", "ANI-MATI"),
         .items = {},
         .doubleBattle = TRUE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -4383,10 +3510,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_WINSTRATE,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_TWINS,
         .trainerPic = TRAINER_PIC_POKEFAN_M,
-        .trainerName = LANGUAGE_STRING(
-            "VICTOR",
-            "VICTOR",
-            "VINCENZO"),
+        .trainerName = LANGUAGE_STRING("VICTOR", "VICTOR", "VINCENZO", "VITORIO"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -4398,10 +3522,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_POKEFAN,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_TWINS,
         .trainerPic = TRAINER_PIC_POKEFAN_M,
-        .trainerName = LANGUAGE_STRING(
-            "MIGUEL",
-            "MICHEL",
-            "MIGUEL"),
+        .trainerName = LANGUAGE_STRING("MIGUEL", "MICHEL", "MIGUEL", "MIGUEL"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -4413,10 +3534,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_POKEFAN,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_TWINS,
         .trainerPic = TRAINER_PIC_POKEFAN_M,
-        .trainerName = LANGUAGE_STRING(
-            "COLTON",
-            "PIOTR",
-            "RENATO"),
+        .trainerName = LANGUAGE_STRING("COLTON", "PIOTR", "RENATO", "CORNELIO"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -4428,10 +3546,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_POKEFAN,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_TWINS,
         .trainerPic = TRAINER_PIC_POKEFAN_M,
-        .trainerName = LANGUAGE_STRING(
-            "MIGUEL",
-            "MICHEL",
-            "MIGUEL"),
+        .trainerName = LANGUAGE_STRING("MIGUEL", "MICHEL", "MIGUEL", "MIGUEL"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -4443,10 +3558,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_POKEFAN,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_TWINS,
         .trainerPic = TRAINER_PIC_POKEFAN_M,
-        .trainerName = LANGUAGE_STRING(
-            "MIGUEL",
-            "MICHEL",
-            "MIGUEL"),
+        .trainerName = LANGUAGE_STRING("MIGUEL", "MICHEL", "MIGUEL", "MIGUEL"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -4458,10 +3570,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_POKEFAN,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_TWINS,
         .trainerPic = TRAINER_PIC_POKEFAN_M,
-        .trainerName = LANGUAGE_STRING(
-            "MIGUEL",
-            "MICHEL",
-            "MIGUEL"),
+        .trainerName = LANGUAGE_STRING("MIGUEL", "MICHEL", "MIGUEL", "MIGUEL"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -4473,10 +3582,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_POKEFAN,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_TWINS,
         .trainerPic = TRAINER_PIC_POKEFAN_M,
-        .trainerName = LANGUAGE_STRING(
-            "MIGUEL",
-            "MICHEL",
-            "MIGUEL"),
+        .trainerName = LANGUAGE_STRING("MIGUEL", "MICHEL", "MIGUEL", "MIGUEL"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -4488,10 +3594,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_WINSTRATE,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_TWINS,
         .trainerPic = TRAINER_PIC_POKEFAN_F,
-        .trainerName = LANGUAGE_STRING(
-            "VICTORIA",
-            "VICTORIA",
-            "VITTORIA"),
+        .trainerName = LANGUAGE_STRING("VICTORIA", "VICTORIA", "VITTORIA", "VICTORIA"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT,
@@ -4503,10 +3606,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_POKEFAN,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_TWINS,
         .trainerPic = TRAINER_PIC_POKEFAN_F,
-        .trainerName = LANGUAGE_STRING(
-            "VANESSA",
-            "VANESSA",
-            "VANESSA"),
+        .trainerName = LANGUAGE_STRING("VANESSA", "VANESSA", "VANESSA", "VANESA"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -4518,10 +3618,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_POKEFAN,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_TWINS,
         .trainerPic = TRAINER_PIC_POKEFAN_F,
-        .trainerName = LANGUAGE_STRING(
-            "BETHANY",
-            "MARISSA",
-            "MARISA"),
+        .trainerName = LANGUAGE_STRING("BETHANY", "MARISSA", "MARISA", "MARISA"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -4533,10 +3630,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_POKEFAN,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_TWINS,
         .trainerPic = TRAINER_PIC_POKEFAN_F,
-        .trainerName = LANGUAGE_STRING(
-            "ISABEL",
-            "ISABELLE",
-            "ISABELLA"),
+        .trainerName = LANGUAGE_STRING("ISABEL", "ISABELLE", "ISABELLA", "ISABEL"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -4548,10 +3642,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_POKEFAN,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_TWINS,
         .trainerPic = TRAINER_PIC_POKEFAN_F,
-        .trainerName = LANGUAGE_STRING(
-            "ISABEL",
-            "ISABELLE",
-            "ISABELLA"),
+        .trainerName = LANGUAGE_STRING("ISABEL", "ISABELLE", "ISABELLA", "ISABEL"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -4563,10 +3654,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_POKEFAN,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_TWINS,
         .trainerPic = TRAINER_PIC_POKEFAN_F,
-        .trainerName = LANGUAGE_STRING(
-            "ISABEL",
-            "ISABELLE",
-            "ISABELLA"),
+        .trainerName = LANGUAGE_STRING("ISABEL", "ISABELLE", "ISABELLA", "ISABEL"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -4578,10 +3666,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_POKEFAN,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_TWINS,
         .trainerPic = TRAINER_PIC_POKEFAN_F,
-        .trainerName = LANGUAGE_STRING(
-            "ISABEL",
-            "ISABELLE",
-            "ISABELLA"),
+        .trainerName = LANGUAGE_STRING("ISABEL", "ISABELLE", "ISABELLA", "ISABEL"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -4593,10 +3678,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_POKEFAN,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_TWINS,
         .trainerPic = TRAINER_PIC_POKEFAN_F,
-        .trainerName = LANGUAGE_STRING(
-            "ISABEL",
-            "ISABELLE",
-            "ISABELLA"),
+        .trainerName = LANGUAGE_STRING("ISABEL", "ISABELLE", "ISABELLA", "ISABEL"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -4608,10 +3690,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_EXPERT,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE,
         .trainerPic = TRAINER_PIC_EXPERT_M,
-        .trainerName = LANGUAGE_STRING(
-            "TIMOTHY",
-            "TIMOTHEE",
-            "TIMOTHY"),
+        .trainerName = LANGUAGE_STRING("TIMOTHY", "TIMOTHEE", "TIMOTHY", "TIMOTEO"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
@@ -4623,10 +3702,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_EXPERT,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE,
         .trainerPic = TRAINER_PIC_EXPERT_M,
-        .trainerName = LANGUAGE_STRING(
-            "TIMOTHY",
-            "TIMOTHEE",
-            "TIMOTHY"),
+        .trainerName = LANGUAGE_STRING("TIMOTHY", "TIMOTHEE", "TIMOTHY", "TIMOTEO"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
@@ -4638,10 +3714,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_EXPERT,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE,
         .trainerPic = TRAINER_PIC_EXPERT_M,
-        .trainerName = LANGUAGE_STRING(
-            "TIMOTHY",
-            "TIMOTHEE",
-            "TIMOTHY"),
+        .trainerName = LANGUAGE_STRING("TIMOTHY", "TIMOTHEE", "TIMOTHY", "TIMOTEO"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
@@ -4653,10 +3726,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_EXPERT,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE,
         .trainerPic = TRAINER_PIC_EXPERT_M,
-        .trainerName = LANGUAGE_STRING(
-            "TIMOTHY",
-            "TIMOTHEE",
-            "TIMOTHY"),
+        .trainerName = LANGUAGE_STRING("TIMOTHY", "TIMOTHEE", "TIMOTHY", "TIMOTEO"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
@@ -4668,10 +3738,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_EXPERT,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE,
         .trainerPic = TRAINER_PIC_EXPERT_M,
-        .trainerName = LANGUAGE_STRING(
-            "TIMOTHY",
-            "TIMOTHEE",
-            "TIMOTHY"),
+        .trainerName = LANGUAGE_STRING("TIMOTHY", "TIMOTHEE", "TIMOTHY", "TIMOTEO"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
@@ -4683,10 +3750,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_WINSTRATE,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE,
         .trainerPic = TRAINER_PIC_EXPERT_F,
-        .trainerName = LANGUAGE_STRING(
-            "VICKY",
-            "VICKY",
-            "VICKY"),
+        .trainerName = LANGUAGE_STRING("VICKY", "VICKY", "VICKY", "VICKY"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
@@ -4698,10 +3762,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_EXPERT,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE,
         .trainerPic = TRAINER_PIC_EXPERT_F,
-        .trainerName = LANGUAGE_STRING(
-            "SHELBY",
-            "ALIX",
-            "LIA"),
+        .trainerName = LANGUAGE_STRING("SHELBY", "ALIX", "LIA", "SERAFINA"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
@@ -4713,10 +3774,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_EXPERT,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE,
         .trainerPic = TRAINER_PIC_EXPERT_F,
-        .trainerName = LANGUAGE_STRING(
-            "SHELBY",
-            "ALIX",
-            "LIA"),
+        .trainerName = LANGUAGE_STRING("SHELBY", "ALIX", "LIA", "SERAFINA"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
@@ -4728,10 +3786,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_EXPERT,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE,
         .trainerPic = TRAINER_PIC_EXPERT_F,
-        .trainerName = LANGUAGE_STRING(
-            "SHELBY",
-            "ALIX",
-            "LIA"),
+        .trainerName = LANGUAGE_STRING("SHELBY", "ALIX", "LIA", "SERAFINA"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
@@ -4743,10 +3798,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_EXPERT,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE,
         .trainerPic = TRAINER_PIC_EXPERT_F,
-        .trainerName = LANGUAGE_STRING(
-            "SHELBY",
-            "ALIX",
-            "LIA"),
+        .trainerName = LANGUAGE_STRING("SHELBY", "ALIX", "LIA", "SERAFINA"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
@@ -4758,10 +3810,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_EXPERT,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE,
         .trainerPic = TRAINER_PIC_EXPERT_F,
-        .trainerName = LANGUAGE_STRING(
-            "SHELBY",
-            "ALIX",
-            "LIA"),
+        .trainerName = LANGUAGE_STRING("SHELBY", "ALIX", "LIA", "SERAFINA"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
@@ -4773,10 +3822,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_YOUNGSTER,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
         .trainerPic = TRAINER_PIC_YOUNGSTER,
-        .trainerName = LANGUAGE_STRING(
-            "CALVIN",
-            "CALVIN",
-            "MATTEO"),
+        .trainerName = LANGUAGE_STRING("CALVIN", "CALVIN", "MATTEO", "CALIXTO"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -4788,10 +3834,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_YOUNGSTER,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
         .trainerPic = TRAINER_PIC_YOUNGSTER,
-        .trainerName = LANGUAGE_STRING(
-            "BILLY",
-            "WILLY",
-            "BILLY"),
+        .trainerName = LANGUAGE_STRING("BILLY", "WILLY", "BILLY", "BERTO"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -4803,10 +3846,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_YOUNGSTER,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
         .trainerPic = TRAINER_PIC_YOUNGSTER,
-        .trainerName = LANGUAGE_STRING(
-            "JOSH",
-            "JOHN",
-            "ELIA"),
+        .trainerName = LANGUAGE_STRING("JOSH", "JOHN", "ELIA", "JOSEMA"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -4818,10 +3858,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_YOUNGSTER,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
         .trainerPic = TRAINER_PIC_YOUNGSTER,
-        .trainerName = LANGUAGE_STRING(
-            "TOMMY",
-            "TOM",
-            "TOMMY"),
+        .trainerName = LANGUAGE_STRING("TOMMY", "TOM", "TOMMY", "TOMI"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -4833,10 +3870,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_YOUNGSTER,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
         .trainerPic = TRAINER_PIC_YOUNGSTER,
-        .trainerName = LANGUAGE_STRING(
-            "JOEY",
-            "JO",
-            "JOEY"),
+        .trainerName = LANGUAGE_STRING("JOEY", "JO", "JOEY", "PEPE"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -4848,10 +3882,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_YOUNGSTER,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
         .trainerPic = TRAINER_PIC_YOUNGSTER,
-        .trainerName = LANGUAGE_STRING(
-            "BEN",
-            "BEN",
-            "BEN"),
+        .trainerName = LANGUAGE_STRING("BEN", "BEN", "BEN", "BEN"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -4863,10 +3894,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_COOLTRAINER,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL,
         .trainerPic = TRAINER_PIC_COOLTRAINER_M,
-        .trainerName = LANGUAGE_STRING(
-            "QUINCY",
-            "QUENTIN",
-            "QUINCY"),
+        .trainerName = LANGUAGE_STRING("QUINCY", "QUENTIN", "QUINCY", "GUYO"),
         .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
@@ -4878,10 +3906,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_COOLTRAINER,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL,
         .trainerPic = TRAINER_PIC_COOLTRAINER_F,
-        .trainerName = LANGUAGE_STRING(
-            "KATELYNN",
-            "KAREN",
-            "KATELYNN"),
+        .trainerName = LANGUAGE_STRING("KATELYNN", "KAREN", "KATELYNN", "GUYA"),
         .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
@@ -4893,10 +3918,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_YOUNGSTER,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
         .trainerPic = TRAINER_PIC_YOUNGSTER,
-        .trainerName = LANGUAGE_STRING(
-            "JAYLEN",
-            "GILLES",
-            "EDGARDO"),
+        .trainerName = LANGUAGE_STRING("JAYLEN", "GILLES", "EDGARDO", "JAILO"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -4908,10 +3930,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_YOUNGSTER,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
         .trainerPic = TRAINER_PIC_YOUNGSTER,
-        .trainerName = LANGUAGE_STRING(
-            "DILLON",
-            "DENDEN",
-            "FLORIANO"),
+        .trainerName = LANGUAGE_STRING("DILLON", "DENDEN", "FLORIANO", "DIONI"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -4923,10 +3942,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_YOUNGSTER,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
         .trainerPic = TRAINER_PIC_YOUNGSTER,
-        .trainerName = LANGUAGE_STRING(
-            "CALVIN",
-            "CALVIN",
-            "MATTEO"),
+        .trainerName = LANGUAGE_STRING("CALVIN", "CALVIN", "MATTEO", "CALIXTO"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -4938,10 +3954,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_YOUNGSTER,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
         .trainerPic = TRAINER_PIC_YOUNGSTER,
-        .trainerName = LANGUAGE_STRING(
-            "CALVIN",
-            "CALVIN",
-            "MATTEO"),
+        .trainerName = LANGUAGE_STRING("CALVIN", "CALVIN", "MATTEO", "CALIXTO"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -4953,10 +3966,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_YOUNGSTER,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
         .trainerPic = TRAINER_PIC_YOUNGSTER,
-        .trainerName = LANGUAGE_STRING(
-            "CALVIN",
-            "CALVIN",
-            "MATTEO"),
+        .trainerName = LANGUAGE_STRING("CALVIN", "CALVIN", "MATTEO", "CALIXTO"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -4968,10 +3978,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_YOUNGSTER,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
         .trainerPic = TRAINER_PIC_YOUNGSTER,
-        .trainerName = LANGUAGE_STRING(
-            "CALVIN",
-            "CALVIN",
-            "MATTEO"),
+        .trainerName = LANGUAGE_STRING("CALVIN", "CALVIN", "MATTEO", "CALIXTO"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -4983,10 +3990,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_YOUNGSTER,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
         .trainerPic = TRAINER_PIC_YOUNGSTER,
-        .trainerName = LANGUAGE_STRING(
-            "EDDIE",
-            "EDDIE",
-            "EMANUELE"),
+        .trainerName = LANGUAGE_STRING("EDDIE", "EDDIE", "EMANUELE", "EDU"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -4998,10 +4002,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_YOUNGSTER,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
         .trainerPic = TRAINER_PIC_YOUNGSTER,
-        .trainerName = LANGUAGE_STRING(
-            "ALLEN",
-            "ALAIN",
-            "ALLEN"),
+        .trainerName = LANGUAGE_STRING("ALLEN", "ALAIN", "ALLEN", "ALFREDO"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -5013,10 +4014,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_YOUNGSTER,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
         .trainerPic = TRAINER_PIC_YOUNGSTER,
-        .trainerName = LANGUAGE_STRING(
-            "TIMMY",
-            "TIM",
-            "TIMMY"),
+        .trainerName = LANGUAGE_STRING("TIMMY", "TIM", "TIMMY", "TINO"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -5028,10 +4026,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_CHAMPION,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
         .trainerPic = TRAINER_PIC_CHAMPION_WALLACE,
-        .trainerName = LANGUAGE_STRING(
-            "WALLACE",
-            "MARC",
-            "ADRIANO"),
+        .trainerName = LANGUAGE_STRING("WALLACE", "MARC", "ADRIANO", "PLUBIO"),
         .items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
@@ -5043,10 +4038,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_FISHERMAN,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER,
         .trainerPic = TRAINER_PIC_FISHERMAN,
-        .trainerName = LANGUAGE_STRING(
-            "ANDREW",
-            "ALI",
-            "MARCUS"),
+        .trainerName = LANGUAGE_STRING("ANDREW", "ALI", "MARCUS", "ANDONI"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -5058,10 +4050,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_FISHERMAN,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER,
         .trainerPic = TRAINER_PIC_FISHERMAN,
-        .trainerName = LANGUAGE_STRING(
-            "IVAN",
-            "YVAN",
-            "FLAVIANO"),
+        .trainerName = LANGUAGE_STRING("IVAN", "YVAN", "FLAVIANO", "IVANO"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -5073,10 +4062,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_FISHERMAN,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER,
         .trainerPic = TRAINER_PIC_FISHERMAN,
-        .trainerName = LANGUAGE_STRING(
-            "CLAUDE",
-            "CLAUDE",
-            "CLAUDIO"),
+        .trainerName = LANGUAGE_STRING("CLAUDE", "CLAUDE", "CLAUDIO", "CLAUDIO"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -5088,10 +4074,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_FISHERMAN,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER,
         .trainerPic = TRAINER_PIC_FISHERMAN,
-        .trainerName = LANGUAGE_STRING(
-            "ELLIOT",
-            "ELLIOT",
-            "STEFANO"),
+        .trainerName = LANGUAGE_STRING("ELLIOT", "ELLIOT", "STEFANO", "ELOY"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -5103,10 +4086,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_FISHERMAN,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER,
         .trainerPic = TRAINER_PIC_FISHERMAN,
-        .trainerName = LANGUAGE_STRING(
-            "NED",
-            "ERWAN",
-            "NED"),
+        .trainerName = LANGUAGE_STRING("NED", "ERWAN", "NED", "NESTO"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -5118,10 +4098,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_FISHERMAN,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER,
         .trainerPic = TRAINER_PIC_FISHERMAN,
-        .trainerName = LANGUAGE_STRING(
-            "DALE",
-            "FABIO",
-            "RICCARDO"),
+        .trainerName = LANGUAGE_STRING("DALE", "FABIO", "RICCARDO", "DANIEL"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -5133,10 +4110,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_FISHERMAN,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER,
         .trainerPic = TRAINER_PIC_FISHERMAN,
-        .trainerName = LANGUAGE_STRING(
-            "NOLAN",
-            "NOEL",
-            "CHRISTIAN"),
+        .trainerName = LANGUAGE_STRING("NOLAN", "NOEL", "CHRISTIAN", "NARCISO"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -5148,10 +4122,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_FISHERMAN,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER,
         .trainerPic = TRAINER_PIC_FISHERMAN,
-        .trainerName = LANGUAGE_STRING(
-            "BARNY",
-            "BARNEY",
-            "GUGLIELMO"),
+        .trainerName = LANGUAGE_STRING("BARNY", "BARNEY", "GUGLIELMO", "BENICIO"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -5163,10 +4134,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_FISHERMAN,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER,
         .trainerPic = TRAINER_PIC_FISHERMAN,
-        .trainerName = LANGUAGE_STRING(
-            "WADE",
-            "ARISTIDE",
-            "ERMES"),
+        .trainerName = LANGUAGE_STRING("WADE", "ARISTIDE", "ERMES", "GUIDO"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -5178,10 +4146,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_FISHERMAN,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER,
         .trainerPic = TRAINER_PIC_FISHERMAN,
-        .trainerName = LANGUAGE_STRING(
-            "CARTER",
-            "FRANCIS",
-            "FRANCESCO"),
+        .trainerName = LANGUAGE_STRING("CARTER", "FRANCIS", "FRANCESCO", "CAYETANO"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -5193,10 +4158,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_FISHERMAN,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER,
         .trainerPic = TRAINER_PIC_FISHERMAN,
-        .trainerName = LANGUAGE_STRING(
-            "ELLIOT",
-            "ELLIOT",
-            "STEFANO"),
+        .trainerName = LANGUAGE_STRING("ELLIOT", "ELLIOT", "STEFANO", "ELOY"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -5208,10 +4170,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_FISHERMAN,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER,
         .trainerPic = TRAINER_PIC_FISHERMAN,
-        .trainerName = LANGUAGE_STRING(
-            "ELLIOT",
-            "ELLIOT",
-            "STEFANO"),
+        .trainerName = LANGUAGE_STRING("ELLIOT", "ELLIOT", "STEFANO", "ELOY"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -5223,10 +4182,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_FISHERMAN,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER,
         .trainerPic = TRAINER_PIC_FISHERMAN,
-        .trainerName = LANGUAGE_STRING(
-            "ELLIOT",
-            "ELLIOT",
-            "STEFANO"),
+        .trainerName = LANGUAGE_STRING("ELLIOT", "ELLIOT", "STEFANO", "ELOY"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -5238,10 +4194,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_FISHERMAN,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER,
         .trainerPic = TRAINER_PIC_FISHERMAN,
-        .trainerName = LANGUAGE_STRING(
-            "ELLIOT",
-            "ELLIOT",
-            "STEFANO"),
+        .trainerName = LANGUAGE_STRING("ELLIOT", "ELLIOT", "STEFANO", "ELOY"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT,
@@ -5253,10 +4206,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_FISHERMAN,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER,
         .trainerPic = TRAINER_PIC_FISHERMAN,
-        .trainerName = LANGUAGE_STRING(
-            "RONALD",
-            "FABIEN",
-            "AMBROGIO"),
+        .trainerName = LANGUAGE_STRING("RONALD", "FABIEN", "AMBROGIO", "RONALDO"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -5268,10 +4218,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_TRIATHLETE,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
         .trainerPic = TRAINER_PIC_CYCLING_TRIATHLETE_M,
-        .trainerName = LANGUAGE_STRING(
-            "JACOB",
-            "JACOB",
-            "JACOB"),
+        .trainerName = LANGUAGE_STRING("JACOB", "JACOB", "JACOB", "JACOBO"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -5283,10 +4230,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_TRIATHLETE,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
         .trainerPic = TRAINER_PIC_CYCLING_TRIATHLETE_M,
-        .trainerName = LANGUAGE_STRING(
-            "ANTHONY",
-            "ANTHONY",
-            "ANTHONY"),
+        .trainerName = LANGUAGE_STRING("ANTHONY", "ANTHONY", "ANTHONY", "ANTO"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -5298,10 +4242,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_TRIATHLETE,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
         .trainerPic = TRAINER_PIC_CYCLING_TRIATHLETE_M,
-        .trainerName = LANGUAGE_STRING(
-            "BENJAMIN",
-            "BENJAMIN",
-            "BENJAMIN"),
+        .trainerName = LANGUAGE_STRING("BENJAMIN", "BENJAMIN", "BENJAMIN", "BENINO"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -5313,10 +4254,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_TRIATHLETE,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
         .trainerPic = TRAINER_PIC_CYCLING_TRIATHLETE_M,
-        .trainerName = LANGUAGE_STRING(
-            "BENJAMIN",
-            "BENJAMIN",
-            "BENJAMIN"),
+        .trainerName = LANGUAGE_STRING("BENJAMIN", "BENJAMIN", "BENJAMIN", "BENINO"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -5328,10 +4266,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_TRIATHLETE,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
         .trainerPic = TRAINER_PIC_CYCLING_TRIATHLETE_M,
-        .trainerName = LANGUAGE_STRING(
-            "BENJAMIN",
-            "BENJAMIN",
-            "BENJAMIN"),
+        .trainerName = LANGUAGE_STRING("BENJAMIN", "BENJAMIN", "BENJAMIN", "BENINO"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -5343,10 +4278,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_TRIATHLETE,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
         .trainerPic = TRAINER_PIC_CYCLING_TRIATHLETE_M,
-        .trainerName = LANGUAGE_STRING(
-            "BENJAMIN",
-            "BENJAMIN",
-            "BENJAMIN"),
+        .trainerName = LANGUAGE_STRING("BENJAMIN", "BENJAMIN", "BENJAMIN", "BENINO"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -5358,10 +4290,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_TRIATHLETE,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
         .trainerPic = TRAINER_PIC_CYCLING_TRIATHLETE_M,
-        .trainerName = LANGUAGE_STRING(
-            "BENJAMIN",
-            "BENJAMIN",
-            "BENJAMIN"),
+        .trainerName = LANGUAGE_STRING("BENJAMIN", "BENJAMIN", "BENJAMIN", "BENINO"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -5373,10 +4302,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_TRIATHLETE,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE,
         .trainerPic = TRAINER_PIC_CYCLING_TRIATHLETE_F,
-        .trainerName = LANGUAGE_STRING(
-            "ABIGAIL",
-            "GAELLE",
-            "LARA"),
+        .trainerName = LANGUAGE_STRING("ABIGAIL", "GAELLE", "LARA", "ADELA"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -5388,10 +4314,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_TRIATHLETE,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE,
         .trainerPic = TRAINER_PIC_CYCLING_TRIATHLETE_F,
-        .trainerName = LANGUAGE_STRING(
-            "JASMINE",
-            "YASMINA",
-            "JASMINE"),
+        .trainerName = LANGUAGE_STRING("JASMINE", "YASMINA", "JASMINE", "JAZMI"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -5403,10 +4326,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_TRIATHLETE,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE,
         .trainerPic = TRAINER_PIC_CYCLING_TRIATHLETE_F,
-        .trainerName = LANGUAGE_STRING(
-            "ABIGAIL",
-            "GAELLE",
-            "LARA"),
+        .trainerName = LANGUAGE_STRING("ABIGAIL", "GAELLE", "LARA", "ADELA"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -5418,10 +4338,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_TRIATHLETE,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE,
         .trainerPic = TRAINER_PIC_CYCLING_TRIATHLETE_F,
-        .trainerName = LANGUAGE_STRING(
-            "ABIGAIL",
-            "GAELLE",
-            "LARA"),
+        .trainerName = LANGUAGE_STRING("ABIGAIL", "GAELLE", "LARA", "ADELA"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -5433,10 +4350,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_TRIATHLETE,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE,
         .trainerPic = TRAINER_PIC_CYCLING_TRIATHLETE_F,
-        .trainerName = LANGUAGE_STRING(
-            "ABIGAIL",
-            "GAELLE",
-            "LARA"),
+        .trainerName = LANGUAGE_STRING("ABIGAIL", "GAELLE", "LARA", "ADELA"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -5448,10 +4362,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_TRIATHLETE,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE,
         .trainerPic = TRAINER_PIC_CYCLING_TRIATHLETE_F,
-        .trainerName = LANGUAGE_STRING(
-            "ABIGAIL",
-            "GAELLE",
-            "LARA"),
+        .trainerName = LANGUAGE_STRING("ABIGAIL", "GAELLE", "LARA", "ADELA"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -5463,10 +4374,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_TRIATHLETE,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
         .trainerPic = TRAINER_PIC_RUNNING_TRIATHLETE_M,
-        .trainerName = LANGUAGE_STRING(
-            "DYLAN",
-            "REGIS",
-            "NICOLA"),
+        .trainerName = LANGUAGE_STRING("DYLAN", "REGIS", "NICOLA", "DAN"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -5478,10 +4386,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_TRIATHLETE,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
         .trainerPic = TRAINER_PIC_RUNNING_TRIATHLETE_M,
-        .trainerName = LANGUAGE_STRING(
-            "DYLAN",
-            "REGIS",
-            "NICOLA"),
+        .trainerName = LANGUAGE_STRING("DYLAN", "REGIS", "NICOLA", "DAN"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -5493,10 +4398,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_TRIATHLETE,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
         .trainerPic = TRAINER_PIC_RUNNING_TRIATHLETE_M,
-        .trainerName = LANGUAGE_STRING(
-            "DYLAN",
-            "REGIS",
-            "NICOLA"),
+        .trainerName = LANGUAGE_STRING("DYLAN", "REGIS", "NICOLA", "DAN"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -5508,10 +4410,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_TRIATHLETE,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
         .trainerPic = TRAINER_PIC_RUNNING_TRIATHLETE_M,
-        .trainerName = LANGUAGE_STRING(
-            "DYLAN",
-            "REGIS",
-            "NICOLA"),
+        .trainerName = LANGUAGE_STRING("DYLAN", "REGIS", "NICOLA", "DAN"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -5523,10 +4422,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_TRIATHLETE,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
         .trainerPic = TRAINER_PIC_RUNNING_TRIATHLETE_M,
-        .trainerName = LANGUAGE_STRING(
-            "DYLAN",
-            "REGIS",
-            "NICOLA"),
+        .trainerName = LANGUAGE_STRING("DYLAN", "REGIS", "NICOLA", "DAN"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -5538,10 +4434,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_TRIATHLETE,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE,
         .trainerPic = TRAINER_PIC_RUNNING_TRIATHLETE_F,
-        .trainerName = LANGUAGE_STRING(
-            "MARIA",
-            "MARIA",
-            "MARIA"),
+        .trainerName = LANGUAGE_STRING("MARIA", "MARIA", "MARIA", "MIRIAM"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -5553,10 +4446,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_TRIATHLETE,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE,
         .trainerPic = TRAINER_PIC_RUNNING_TRIATHLETE_F,
-        .trainerName = LANGUAGE_STRING(
-            "MARIA",
-            "MARIA",
-            "MARIA"),
+        .trainerName = LANGUAGE_STRING("MARIA", "MARIA", "MARIA", "MIRIAM"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -5568,10 +4458,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_TRIATHLETE,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE,
         .trainerPic = TRAINER_PIC_RUNNING_TRIATHLETE_F,
-        .trainerName = LANGUAGE_STRING(
-            "MARIA",
-            "MARIA",
-            "MARIA"),
+        .trainerName = LANGUAGE_STRING("MARIA", "MARIA", "MARIA", "MIRIAM"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -5583,10 +4470,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_TRIATHLETE,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE,
         .trainerPic = TRAINER_PIC_RUNNING_TRIATHLETE_F,
-        .trainerName = LANGUAGE_STRING(
-            "MARIA",
-            "MARIA",
-            "MARIA"),
+        .trainerName = LANGUAGE_STRING("MARIA", "MARIA", "MARIA", "MIRIAM"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -5598,10 +4482,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_TRIATHLETE,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE,
         .trainerPic = TRAINER_PIC_RUNNING_TRIATHLETE_F,
-        .trainerName = LANGUAGE_STRING(
-            "MARIA",
-            "MARIA",
-            "MARIA"),
+        .trainerName = LANGUAGE_STRING("MARIA", "MARIA", "MARIA", "MIRIAM"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -5613,10 +4494,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_TRIATHLETE,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SWIMMER,
         .trainerPic = TRAINER_PIC_SWIMMING_TRIATHLETE_M,
-        .trainerName = LANGUAGE_STRING(
-            "CAMDEN",
-            "JACKY",
-            "LALO"),
+        .trainerName = LANGUAGE_STRING("CAMDEN", "JACKY", "LALO", "CAMU"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -5628,10 +4506,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_YOUNGSTER,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
         .trainerPic = TRAINER_PIC_YOUNGSTER,
-        .trainerName = LANGUAGE_STRING(
-            "DEMETRIUS",
-            "CHARLIE",
-            "DEMETRIUS"),
+        .trainerName = LANGUAGE_STRING("DEMETRIUS", "CHARLIE", "DEMETRIUS", "DIMITRI"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -5643,10 +4518,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_TRIATHLETE,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SWIMMER,
         .trainerPic = TRAINER_PIC_SWIMMING_TRIATHLETE_M,
-        .trainerName = LANGUAGE_STRING(
-            "ISAIAH",
-            "JEOFFREY",
-            "ISAIA"),
+        .trainerName = LANGUAGE_STRING("ISAIAH", "JEOFFREY", "ISAIA", "ISIDORO"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -5658,10 +4530,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_TRIATHLETE,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SWIMMER,
         .trainerPic = TRAINER_PIC_SWIMMING_TRIATHLETE_M,
-        .trainerName = LANGUAGE_STRING(
-            "PABLO",
-            "PABLO",
-            "DINO"),
+        .trainerName = LANGUAGE_STRING("PABLO", "PABLO", "DINO", "PABLO"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -5673,10 +4542,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_TRIATHLETE,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SWIMMER,
         .trainerPic = TRAINER_PIC_SWIMMING_TRIATHLETE_M,
-        .trainerName = LANGUAGE_STRING(
-            "CHASE",
-            "FERNANDO",
-            "LIBERO"),
+        .trainerName = LANGUAGE_STRING("CHASE", "FERNANDO", "LIBERO", "CONRADO"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -5688,10 +4554,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_TRIATHLETE,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SWIMMER,
         .trainerPic = TRAINER_PIC_SWIMMING_TRIATHLETE_M,
-        .trainerName = LANGUAGE_STRING(
-            "ISAIAH",
-            "JEOFFREY",
-            "ISAIA"),
+        .trainerName = LANGUAGE_STRING("ISAIAH", "JEOFFREY", "ISAIA", "ISIDORO"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -5703,10 +4566,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_TRIATHLETE,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SWIMMER,
         .trainerPic = TRAINER_PIC_SWIMMING_TRIATHLETE_M,
-        .trainerName = LANGUAGE_STRING(
-            "ISAIAH",
-            "JEOFFREY",
-            "ISAIA"),
+        .trainerName = LANGUAGE_STRING("ISAIAH", "JEOFFREY", "ISAIA", "ISIDORO"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -5718,10 +4578,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_TRIATHLETE,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SWIMMER,
         .trainerPic = TRAINER_PIC_SWIMMING_TRIATHLETE_M,
-        .trainerName = LANGUAGE_STRING(
-            "ISAIAH",
-            "JEOFFREY",
-            "ISAIA"),
+        .trainerName = LANGUAGE_STRING("ISAIAH", "JEOFFREY", "ISAIA", "ISIDORO"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -5733,10 +4590,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_TRIATHLETE,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SWIMMER,
         .trainerPic = TRAINER_PIC_SWIMMING_TRIATHLETE_M,
-        .trainerName = LANGUAGE_STRING(
-            "ISAIAH",
-            "JEOFFREY",
-            "ISAIA"),
+        .trainerName = LANGUAGE_STRING("ISAIAH", "JEOFFREY", "ISAIA", "ISIDORO"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -5748,10 +4602,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_TRIATHLETE,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER,
         .trainerPic = TRAINER_PIC_SWIMMING_TRIATHLETE_F,
-        .trainerName = LANGUAGE_STRING(
-            "ISOBEL",
-            "ISABEL",
-            "ISOBEL"),
+        .trainerName = LANGUAGE_STRING("ISOBEL", "ISABEL", "ISOBEL", "MARULI"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -5763,10 +4614,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_TRIATHLETE,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER,
         .trainerPic = TRAINER_PIC_SWIMMING_TRIATHLETE_F,
-        .trainerName = LANGUAGE_STRING(
-            "DONNY",
-            "DONNA",
-            "DONNY"),
+        .trainerName = LANGUAGE_STRING("DONNY", "DONNA", "DONNY", "DANA"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -5778,10 +4626,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_TRIATHLETE,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER,
         .trainerPic = TRAINER_PIC_SWIMMING_TRIATHLETE_F,
-        .trainerName = LANGUAGE_STRING(
-            "TALIA",
-            "TALIA",
-            "TALIA"),
+        .trainerName = LANGUAGE_STRING("TALIA", "TALIA", "TALIA", "TANA"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -5793,10 +4638,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_TRIATHLETE,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER,
         .trainerPic = TRAINER_PIC_SWIMMING_TRIATHLETE_F,
-        .trainerName = LANGUAGE_STRING(
-            "KATELYN",
-            "KATELYN",
-            "MARIELLA"),
+        .trainerName = LANGUAGE_STRING("KATELYN", "KATELYN", "MARIELLA", "CATALINA"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -5808,10 +4650,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_TRIATHLETE,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER,
         .trainerPic = TRAINER_PIC_SWIMMING_TRIATHLETE_F,
-        .trainerName = LANGUAGE_STRING(
-            "ALLISON",
-            "ALLY",
-            "BRUNELLA"),
+        .trainerName = LANGUAGE_STRING("ALLISON", "ALLY", "BRUNELLA", "ARACELI"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -5823,10 +4662,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_TRIATHLETE,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER,
         .trainerPic = TRAINER_PIC_SWIMMING_TRIATHLETE_F,
-        .trainerName = LANGUAGE_STRING(
-            "KATELYN",
-            "KATELYN",
-            "MARIELLA"),
+        .trainerName = LANGUAGE_STRING("KATELYN", "KATELYN", "MARIELLA", "CATALINA"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -5838,10 +4674,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_TRIATHLETE,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER,
         .trainerPic = TRAINER_PIC_SWIMMING_TRIATHLETE_F,
-        .trainerName = LANGUAGE_STRING(
-            "KATELYN",
-            "KATELYN",
-            "MARIELLA"),
+        .trainerName = LANGUAGE_STRING("KATELYN", "KATELYN", "MARIELLA", "CATALINA"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -5853,10 +4686,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_TRIATHLETE,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER,
         .trainerPic = TRAINER_PIC_SWIMMING_TRIATHLETE_F,
-        .trainerName = LANGUAGE_STRING(
-            "KATELYN",
-            "KATELYN",
-            "MARIELLA"),
+        .trainerName = LANGUAGE_STRING("KATELYN", "KATELYN", "MARIELLA", "CATALINA"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -5868,10 +4698,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_TRIATHLETE,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER,
         .trainerPic = TRAINER_PIC_SWIMMING_TRIATHLETE_F,
-        .trainerName = LANGUAGE_STRING(
-            "KATELYN",
-            "KATELYN",
-            "MARIELLA"),
+        .trainerName = LANGUAGE_STRING("KATELYN", "KATELYN", "MARIELLA", "CATALINA"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -5883,10 +4710,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_DRAGON_TAMER,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE,
         .trainerPic = TRAINER_PIC_DRAGON_TAMER,
-        .trainerName = LANGUAGE_STRING(
-            "NICOLAS",
-            "NICOLAS",
-            "DYLAN"),
+        .trainerName = LANGUAGE_STRING("NICOLAS", "NICOLAS", "DYLAN", "RAFAEL"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -5898,10 +4722,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_DRAGON_TAMER,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE,
         .trainerPic = TRAINER_PIC_DRAGON_TAMER,
-        .trainerName = LANGUAGE_STRING(
-            "NICOLAS",
-            "NICOLAS",
-            "DYLAN"),
+        .trainerName = LANGUAGE_STRING("NICOLAS", "NICOLAS", "DYLAN", "RAFAEL"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -5913,10 +4734,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_DRAGON_TAMER,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE,
         .trainerPic = TRAINER_PIC_DRAGON_TAMER,
-        .trainerName = LANGUAGE_STRING(
-            "NICOLAS",
-            "NICOLAS",
-            "DYLAN"),
+        .trainerName = LANGUAGE_STRING("NICOLAS", "NICOLAS", "DYLAN", "RAFAEL"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -5928,10 +4746,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_DRAGON_TAMER,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE,
         .trainerPic = TRAINER_PIC_DRAGON_TAMER,
-        .trainerName = LANGUAGE_STRING(
-            "NICOLAS",
-            "NICOLAS",
-            "DYLAN"),
+        .trainerName = LANGUAGE_STRING("NICOLAS", "NICOLAS", "DYLAN", "RAFAEL"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -5943,10 +4758,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_DRAGON_TAMER,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE,
         .trainerPic = TRAINER_PIC_DRAGON_TAMER,
-        .trainerName = LANGUAGE_STRING(
-            "NICOLAS",
-            "NICOLAS",
-            "DYLAN"),
+        .trainerName = LANGUAGE_STRING("NICOLAS", "NICOLAS", "DYLAN", "RAFAEL"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -5958,10 +4770,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_DRAGON_TAMER,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE,
         .trainerPic = TRAINER_PIC_DRAGON_TAMER,
-        .trainerName = LANGUAGE_STRING(
-            "AARON",
-            "IGOR",
-            "GIACOMO"),
+        .trainerName = LANGUAGE_STRING("AARON", "IGOR", "GIACOMO", "JORDI"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -5973,10 +4782,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_BIRD_KEEPER,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL,
         .trainerPic = TRAINER_PIC_BIRD_KEEPER,
-        .trainerName = LANGUAGE_STRING(
-            "PERRY",
-            "PEDRO",
-            "NICOLINO"),
+        .trainerName = LANGUAGE_STRING("PERRY", "PEDRO", "NICOLINO", "PASTOR"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -5988,10 +4794,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_BIRD_KEEPER,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL,
         .trainerPic = TRAINER_PIC_BIRD_KEEPER,
-        .trainerName = LANGUAGE_STRING(
-            "HUGH",
-            "HUGUES",
-            "CRISTIANO"),
+        .trainerName = LANGUAGE_STRING("HUGH", "HUGUES", "CRISTIANO", "HUGO"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -6003,10 +4806,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_BIRD_KEEPER,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL,
         .trainerPic = TRAINER_PIC_BIRD_KEEPER,
-        .trainerName = LANGUAGE_STRING(
-            "PHIL",
-            "PHIL",
-            "PHIL"),
+        .trainerName = LANGUAGE_STRING("PHIL", "PHIL", "PHIL", "PEDRO"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -6018,10 +4818,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_BIRD_KEEPER,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL,
         .trainerPic = TRAINER_PIC_BIRD_KEEPER,
-        .trainerName = LANGUAGE_STRING(
-            "JARED",
-            "BORIS",
-            "GEROLAMO"),
+        .trainerName = LANGUAGE_STRING("JARED", "BORIS", "GEROLAMO", "JAVIER"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -6033,10 +4830,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_BIRD_KEEPER,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL,
         .trainerPic = TRAINER_PIC_BIRD_KEEPER,
-        .trainerName = LANGUAGE_STRING(
-            "HUMBERTO",
-            "HUMBERT",
-            "CASIMIRO"),
+        .trainerName = LANGUAGE_STRING("HUMBERTO", "HUMBERT", "CASIMIRO", "HUMBI"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -6048,10 +4842,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_BIRD_KEEPER,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL,
         .trainerPic = TRAINER_PIC_BIRD_KEEPER,
-        .trainerName = LANGUAGE_STRING(
-            "PRESLEY",
-            "ELVIS",
-            "PRESLEY"),
+        .trainerName = LANGUAGE_STRING("PRESLEY", "ELVIS", "PRESLEY", "LUSPI"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -6063,10 +4854,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_BIRD_KEEPER,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL,
         .trainerPic = TRAINER_PIC_BIRD_KEEPER,
-        .trainerName = LANGUAGE_STRING(
-            "EDWARDO",
-            "JOACHIM",
-            "MANRICO"),
+        .trainerName = LANGUAGE_STRING("EDWARDO", "JOACHIM", "MANRICO", "JUANPI"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -6078,10 +4866,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_BIRD_KEEPER,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL,
         .trainerPic = TRAINER_PIC_BIRD_KEEPER,
-        .trainerName = LANGUAGE_STRING(
-            "COLIN",
-            "GINO",
-            "OSVALDO"),
+        .trainerName = LANGUAGE_STRING("COLIN", "GINO", "OSVALDO", "CAYO"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -6093,10 +4878,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_BIRD_KEEPER,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL,
         .trainerPic = TRAINER_PIC_BIRD_KEEPER,
-        .trainerName = LANGUAGE_STRING(
-            "ROBERT",
-            "BOB",
-            "ROBERT"),
+        .trainerName = LANGUAGE_STRING("ROBERT", "BOB", "ROBERT", "ROBERTO"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -6108,10 +4890,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_BIRD_KEEPER,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL,
         .trainerPic = TRAINER_PIC_BIRD_KEEPER,
-        .trainerName = LANGUAGE_STRING(
-            "BENNY",
-            "FREDO",
-            "BENNY"),
+        .trainerName = LANGUAGE_STRING("BENNY", "FREDO", "BENNY", "BENI"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -6123,10 +4902,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_BIRD_KEEPER,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL,
         .trainerPic = TRAINER_PIC_BIRD_KEEPER,
-        .trainerName = LANGUAGE_STRING(
-            "CHESTER",
-            "JUSTE",
-            "PRIMO"),
+        .trainerName = LANGUAGE_STRING("CHESTER", "JUSTE", "PRIMO", "CELSO"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -6138,10 +4914,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_BIRD_KEEPER,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL,
         .trainerPic = TRAINER_PIC_BIRD_KEEPER,
-        .trainerName = LANGUAGE_STRING(
-            "ROBERT",
-            "BOB",
-            "ROBERT"),
+        .trainerName = LANGUAGE_STRING("ROBERT", "BOB", "ROBERT", "ROBERTO"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -6153,10 +4926,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_BIRD_KEEPER,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL,
         .trainerPic = TRAINER_PIC_BIRD_KEEPER,
-        .trainerName = LANGUAGE_STRING(
-            "ROBERT",
-            "BOB",
-            "ROBERT"),
+        .trainerName = LANGUAGE_STRING("ROBERT", "BOB", "ROBERT", "ROBERTO"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -6168,10 +4938,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_BIRD_KEEPER,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL,
         .trainerPic = TRAINER_PIC_BIRD_KEEPER,
-        .trainerName = LANGUAGE_STRING(
-            "ROBERT",
-            "BOB",
-            "ROBERT"),
+        .trainerName = LANGUAGE_STRING("ROBERT", "BOB", "ROBERT", "ROBERTO"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -6183,10 +4950,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_BIRD_KEEPER,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL,
         .trainerPic = TRAINER_PIC_BIRD_KEEPER,
-        .trainerName = LANGUAGE_STRING(
-            "ROBERT",
-            "BOB",
-            "ROBERT"),
+        .trainerName = LANGUAGE_STRING("ROBERT", "BOB", "ROBERT", "ROBERTO"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -6198,10 +4962,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_BIRD_KEEPER,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL,
         .trainerPic = TRAINER_PIC_BIRD_KEEPER,
-        .trainerName = LANGUAGE_STRING(
-            "ALEX",
-            "ALEX",
-            "ALEX"),
+        .trainerName = LANGUAGE_STRING("ALEX", "ALEX", "ALEX", "SANDRO"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -6213,10 +4974,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_BIRD_KEEPER,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL,
         .trainerPic = TRAINER_PIC_BIRD_KEEPER,
-        .trainerName = LANGUAGE_STRING(
-            "BECK",
-            "LADISLAS",
-            "NANDO"),
+        .trainerName = LANGUAGE_STRING("BECK", "LADISLAS", "NANDO", "BALDOMERO"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -6228,10 +4986,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_NINJA_BOY,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS,
         .trainerPic = TRAINER_PIC_NINJA_BOY,
-        .trainerName = LANGUAGE_STRING(
-            "YASU",
-            "CHON",
-            "YASU"),
+        .trainerName = LANGUAGE_STRING("YASU", "CHON", "YASU", "YASU"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT,
@@ -6243,10 +4998,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_NINJA_BOY,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS,
         .trainerPic = TRAINER_PIC_NINJA_BOY,
-        .trainerName = LANGUAGE_STRING(
-            "TAKASHI",
-            "TAKASHI",
-            "TAKASHI"),
+        .trainerName = LANGUAGE_STRING("TAKASHI", "TAKASHI", "TAKASHI", "TAKASHI"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT,
@@ -6258,10 +5010,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_COOLTRAINER,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL,
         .trainerPic = TRAINER_PIC_COOLTRAINER_F,
-        .trainerName = LANGUAGE_STRING(
-            "DIANNE",
-            "DIANA",
-            "BRITTA"),
+        .trainerName = LANGUAGE_STRING("DIANNE", "DIANA", "BRITTA", "DIANI"),
         .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE},
         .doubleBattle = FALSE,
         .aiFlags = 0,
@@ -6273,10 +5022,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_TUBER_F,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL,
         .trainerPic = TRAINER_PIC_TUBER_F,
-        .trainerName = LANGUAGE_STRING(
-            "JANI",
-            "MEGAN",
-            "MEGAN"),
+        .trainerName = LANGUAGE_STRING("JANI", "MEGAN", "MEGAN", "VEVA"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = 0,
@@ -6288,10 +5034,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_NINJA_BOY,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS,
         .trainerPic = TRAINER_PIC_NINJA_BOY,
-        .trainerName = LANGUAGE_STRING(
-            "LAO",
-            "LAYO",
-            "LAO"),
+        .trainerName = LANGUAGE_STRING("LAO", "LAYO", "LAO", "LAO"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = 0,
@@ -6303,10 +5046,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_NINJA_BOY,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS,
         .trainerPic = TRAINER_PIC_NINJA_BOY,
-        .trainerName = LANGUAGE_STRING(
-            "LUNG",
-            "VANTEK",
-            "LUNG"),
+        .trainerName = LANGUAGE_STRING("LUNG", "VANTEK", "LUNG", "LUNG"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = 0,
@@ -6318,10 +5058,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_NINJA_BOY,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS,
         .trainerPic = TRAINER_PIC_NINJA_BOY,
-        .trainerName = LANGUAGE_STRING(
-            "LAO",
-            "LAYO",
-            "LAO"),
+        .trainerName = LANGUAGE_STRING("LAO", "LAYO", "LAO", "LAO"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = 0,
@@ -6333,10 +5070,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_NINJA_BOY,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS,
         .trainerPic = TRAINER_PIC_NINJA_BOY,
-        .trainerName = LANGUAGE_STRING(
-            "LAO",
-            "LAYO",
-            "LAO"),
+        .trainerName = LANGUAGE_STRING("LAO", "LAYO", "LAO", "LAO"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = 0,
@@ -6348,10 +5082,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_NINJA_BOY,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS,
         .trainerPic = TRAINER_PIC_NINJA_BOY,
-        .trainerName = LANGUAGE_STRING(
-            "LAO",
-            "LAYO",
-            "LAO"),
+        .trainerName = LANGUAGE_STRING("LAO", "LAYO", "LAO", "LAO"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = 0,
@@ -6363,10 +5094,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_NINJA_BOY,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS,
         .trainerPic = TRAINER_PIC_NINJA_BOY,
-        .trainerName = LANGUAGE_STRING(
-            "LAO",
-            "LAYO",
-            "LAO"),
+        .trainerName = LANGUAGE_STRING("LAO", "LAYO", "LAO", "LAO"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = 0,
@@ -6378,10 +5106,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_BATTLE_GIRL,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE,
         .trainerPic = TRAINER_PIC_BATTLE_GIRL,
-        .trainerName = LANGUAGE_STRING(
-            "JOCELYN",
-            "CHRISTINE",
-            "MATILDE"),
+        .trainerName = LANGUAGE_STRING("JOCELYN", "CHRISTINE", "MATILDE", "CESARINA"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -6393,10 +5118,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_BATTLE_GIRL,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE,
         .trainerPic = TRAINER_PIC_BATTLE_GIRL,
-        .trainerName = LANGUAGE_STRING(
-            "LAURA",
-            "LAURA",
-            "ANGIOLINA"),
+        .trainerName = LANGUAGE_STRING("LAURA", "LAURA", "ANGIOLINA", "LAURA"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -6408,10 +5130,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_BATTLE_GIRL,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE,
         .trainerPic = TRAINER_PIC_BATTLE_GIRL,
-        .trainerName = LANGUAGE_STRING(
-            "CYNDY",
-            "SANDRINE",
-            "LORI"),
+        .trainerName = LANGUAGE_STRING("CYNDY", "SANDRINE", "LORI", "CECILIA"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -6423,10 +5142,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_BATTLE_GIRL,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE,
         .trainerPic = TRAINER_PIC_BATTLE_GIRL,
-        .trainerName = LANGUAGE_STRING(
-            "CORA",
-            "MANON",
-            "DOREEN"),
+        .trainerName = LANGUAGE_STRING("CORA", "MANON", "DOREEN", "CORAL"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -6438,10 +5154,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_BATTLE_GIRL,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE,
         .trainerPic = TRAINER_PIC_BATTLE_GIRL,
-        .trainerName = LANGUAGE_STRING(
-            "PAULA",
-            "PAULA",
-            "PAOLINA"),
+        .trainerName = LANGUAGE_STRING("PAULA", "PAULA", "PAOLINA", "PAULA"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -6453,10 +5166,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_BATTLE_GIRL,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE,
         .trainerPic = TRAINER_PIC_BATTLE_GIRL,
-        .trainerName = LANGUAGE_STRING(
-            "CYNDY",
-            "SANDRINE",
-            "LORI"),
+        .trainerName = LANGUAGE_STRING("CYNDY", "SANDRINE", "LORI", "CECILIA"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -6468,10 +5178,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_BATTLE_GIRL,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE,
         .trainerPic = TRAINER_PIC_BATTLE_GIRL,
-        .trainerName = LANGUAGE_STRING(
-            "CYNDY",
-            "SANDRINE",
-            "LORI"),
+        .trainerName = LANGUAGE_STRING("CYNDY", "SANDRINE", "LORI", "CECILIA"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -6483,10 +5190,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_BATTLE_GIRL,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE,
         .trainerPic = TRAINER_PIC_BATTLE_GIRL,
-        .trainerName = LANGUAGE_STRING(
-            "CYNDY",
-            "SANDRINE",
-            "LORI"),
+        .trainerName = LANGUAGE_STRING("CYNDY", "SANDRINE", "LORI", "CECILIA"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -6498,10 +5202,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_BATTLE_GIRL,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE,
         .trainerPic = TRAINER_PIC_BATTLE_GIRL,
-        .trainerName = LANGUAGE_STRING(
-            "CYNDY",
-            "SANDRINE",
-            "LORI"),
+        .trainerName = LANGUAGE_STRING("CYNDY", "SANDRINE", "LORI", "CECILIA"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -6513,10 +5214,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_PARASOL_LADY,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE,
         .trainerPic = TRAINER_PIC_PARASOL_LADY,
-        .trainerName = LANGUAGE_STRING(
-            "MADELINE",
-            "MADELEINE",
-            "BEATA"),
+        .trainerName = LANGUAGE_STRING("MADELINE", "MADELEINE", "BEATA", "MIRANDA"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -6528,10 +5226,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_PARASOL_LADY,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE,
         .trainerPic = TRAINER_PIC_PARASOL_LADY,
-        .trainerName = LANGUAGE_STRING(
-            "CLARISSA",
-            "CLARISSE",
-            "CARLOTTA"),
+        .trainerName = LANGUAGE_STRING("CLARISSA", "CLARISSE", "CARLOTTA", "CLARISA"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -6543,10 +5238,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_PARASOL_LADY,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE,
         .trainerPic = TRAINER_PIC_PARASOL_LADY,
-        .trainerName = LANGUAGE_STRING(
-            "ANGELICA",
-            "ANGELIQUE",
-            "NICOLETTA"),
+        .trainerName = LANGUAGE_STRING("ANGELICA", "ANGELIQUE", "NICOLETTA", "ANGELINA"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -6558,10 +5250,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_PARASOL_LADY,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE,
         .trainerPic = TRAINER_PIC_PARASOL_LADY,
-        .trainerName = LANGUAGE_STRING(
-            "MADELINE",
-            "MADELEINE",
-            "BEATA"),
+        .trainerName = LANGUAGE_STRING("MADELINE", "MADELEINE", "BEATA", "MIRANDA"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -6573,10 +5262,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_PARASOL_LADY,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE,
         .trainerPic = TRAINER_PIC_PARASOL_LADY,
-        .trainerName = LANGUAGE_STRING(
-            "MADELINE",
-            "MADELEINE",
-            "BEATA"),
+        .trainerName = LANGUAGE_STRING("MADELINE", "MADELEINE", "BEATA", "MIRANDA"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -6588,10 +5274,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_PARASOL_LADY,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE,
         .trainerPic = TRAINER_PIC_PARASOL_LADY,
-        .trainerName = LANGUAGE_STRING(
-            "MADELINE",
-            "MADELEINE",
-            "BEATA"),
+        .trainerName = LANGUAGE_STRING("MADELINE", "MADELEINE", "BEATA", "MIRANDA"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -6603,10 +5286,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_PARASOL_LADY,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE,
         .trainerPic = TRAINER_PIC_PARASOL_LADY,
-        .trainerName = LANGUAGE_STRING(
-            "MADELINE",
-            "MADELEINE",
-            "BEATA"),
+        .trainerName = LANGUAGE_STRING("MADELINE", "MADELEINE", "BEATA", "MIRANDA"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -6618,10 +5298,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_SWIMMER_F,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER,
         .trainerPic = TRAINER_PIC_SWIMMER_F,
-        .trainerName = LANGUAGE_STRING(
-            "BEVERLY",
-            "MARIE-ANGE",
-            "DAMIANA"),
+        .trainerName = LANGUAGE_STRING("BEVERLY", "MARIE-ANGE", "DAMIANA", "BELINDA"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -6633,10 +5310,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_SWIMMER_F,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER,
         .trainerPic = TRAINER_PIC_SWIMMER_F,
-        .trainerName = LANGUAGE_STRING(
-            "IMANI",
-            "MURIEL",
-            "DILETTA"),
+        .trainerName = LANGUAGE_STRING("IMANI", "MURIEL", "DILETTA", "ALBA"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -6648,10 +5322,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_SWIMMER_F,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER,
         .trainerPic = TRAINER_PIC_SWIMMER_F,
-        .trainerName = LANGUAGE_STRING(
-            "KYLA",
-            "IRINA",
-            "KYLA"),
+        .trainerName = LANGUAGE_STRING("KYLA", "IRINA", "KYLA", "NORA"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -6663,10 +5334,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_SWIMMER_F,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER,
         .trainerPic = TRAINER_PIC_SWIMMER_F,
-        .trainerName = LANGUAGE_STRING(
-            "DENISE",
-            "DENISE",
-            "EMANUELA"),
+        .trainerName = LANGUAGE_STRING("DENISE", "DENISE", "EMANUELA", "DELISA"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -6678,10 +5346,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_SWIMMER_F,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER,
         .trainerPic = TRAINER_PIC_SWIMMER_F,
-        .trainerName = LANGUAGE_STRING(
-            "BETH",
-            "BETTY",
-            "EMMA"),
+        .trainerName = LANGUAGE_STRING("BETH", "BETTY", "EMMA", "BEATRIZ"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -6693,10 +5358,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_SWIMMER_F,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER,
         .trainerPic = TRAINER_PIC_SWIMMER_F,
-        .trainerName = LANGUAGE_STRING(
-            "TARA",
-            "TARA",
-            "LIANA"),
+        .trainerName = LANGUAGE_STRING("TARA", "TARA", "LIANA", "TRINI"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -6708,10 +5370,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_SWIMMER_F,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER,
         .trainerPic = TRAINER_PIC_SWIMMER_F,
-        .trainerName = LANGUAGE_STRING(
-            "MISSY",
-            "CLO",
-            "LORELLA"),
+        .trainerName = LANGUAGE_STRING("MISSY", "CLO", "LORELLA", "MERCE"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -6723,10 +5382,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_SWIMMER_F,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER,
         .trainerPic = TRAINER_PIC_SWIMMER_F,
-        .trainerName = LANGUAGE_STRING(
-            "ALICE",
-            "ALICE",
-            "MARIKA"),
+        .trainerName = LANGUAGE_STRING("ALICE", "ALICE", "MARIKA", "ALICIA"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -6738,10 +5394,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_SWIMMER_F,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER,
         .trainerPic = TRAINER_PIC_SWIMMER_F,
-        .trainerName = LANGUAGE_STRING(
-            "JENNY",
-            "JENNY",
-            "MIRELLA"),
+        .trainerName = LANGUAGE_STRING("JENNY", "JENNY", "MIRELLA", "GENO"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -6753,10 +5406,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_SWIMMER_F,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER,
         .trainerPic = TRAINER_PIC_SWIMMER_F,
-        .trainerName = LANGUAGE_STRING(
-            "GRACE",
-            "GRACE",
-            "NELLA"),
+        .trainerName = LANGUAGE_STRING("GRACE", "GRACE", "NELLA", "GRACIA"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -6768,10 +5418,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_SWIMMER_F,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER,
         .trainerPic = TRAINER_PIC_SWIMMER_F,
-        .trainerName = LANGUAGE_STRING(
-            "TANYA",
-            "TANYA",
-            "SILVANA"),
+        .trainerName = LANGUAGE_STRING("TANYA", "TANYA", "SILVANA", "TANIA"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -6783,10 +5430,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_SWIMMER_F,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER,
         .trainerPic = TRAINER_PIC_SWIMMER_F,
-        .trainerName = LANGUAGE_STRING(
-            "SHARON",
-            "MORGANE",
-            "SOFIA"),
+        .trainerName = LANGUAGE_STRING("SHARON", "MORGANE", "SOFIA", "SILVANA"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -6798,10 +5442,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_SWIMMER_F,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER,
         .trainerPic = TRAINER_PIC_SWIMMER_F,
-        .trainerName = LANGUAGE_STRING(
-            "NIKKI",
-            "MYLENE",
-            "TANIA"),
+        .trainerName = LANGUAGE_STRING("NIKKI", "MYLENE", "TANIA", "MONI"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -6813,10 +5454,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_SWIMMER_F,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER,
         .trainerPic = TRAINER_PIC_SWIMMER_F,
-        .trainerName = LANGUAGE_STRING(
-            "BRENDA",
-            "MELANIE",
-            "URSULA"),
+        .trainerName = LANGUAGE_STRING("BRENDA", "MELANIE", "URSULA", "BRENDA"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -6828,10 +5466,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_SWIMMER_F,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER,
         .trainerPic = TRAINER_PIC_SWIMMER_F,
-        .trainerName = LANGUAGE_STRING(
-            "KATIE",
-            "SEGOLENE",
-            "VINCENZA"),
+        .trainerName = LANGUAGE_STRING("KATIE", "SEGOLENE", "VINCENZA", "CHIQUI"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -6843,10 +5478,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_SWIMMER_F,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER,
         .trainerPic = TRAINER_PIC_SWIMMER_F,
-        .trainerName = LANGUAGE_STRING(
-            "SUSIE",
-            "SUZY",
-            "SUSIE"),
+        .trainerName = LANGUAGE_STRING("SUSIE", "SUZY", "SUSIE", "SUSI"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -6858,10 +5490,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_SWIMMER_F,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER,
         .trainerPic = TRAINER_PIC_SWIMMER_F,
-        .trainerName = LANGUAGE_STRING(
-            "KARA",
-            "EDWIGE",
-            "ALLEGRA"),
+        .trainerName = LANGUAGE_STRING("KARA", "EDWIGE", "ALLEGRA", "CIRA"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -6873,10 +5502,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_SWIMMER_F,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER,
         .trainerPic = TRAINER_PIC_SWIMMER_F,
-        .trainerName = LANGUAGE_STRING(
-            "DANA",
-            "CHRISTELLE",
-            "BEA"),
+        .trainerName = LANGUAGE_STRING("DANA", "CHRISTELLE", "BEA", "DORA"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -6888,10 +5514,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_SWIMMER_F,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER,
         .trainerPic = TRAINER_PIC_SWIMMER_F,
-        .trainerName = LANGUAGE_STRING(
-            "SIENNA",
-            "ROSALIE",
-            "CONCETTA"),
+        .trainerName = LANGUAGE_STRING("SIENNA", "ROSALIE", "CONCETTA", "SIENA"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -6903,10 +5526,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_SWIMMER_F,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER,
         .trainerPic = TRAINER_PIC_SWIMMER_F,
-        .trainerName = LANGUAGE_STRING(
-            "DEBRA",
-            "LILIANE",
-            "DANILA"),
+        .trainerName = LANGUAGE_STRING("DEBRA", "LILIANE", "DANILA", "DEBO"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -6918,10 +5538,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_SWIMMER_F,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER,
         .trainerPic = TRAINER_PIC_SWIMMER_F,
-        .trainerName = LANGUAGE_STRING(
-            "LINDA",
-            "LINDA",
-            "EGLE"),
+        .trainerName = LANGUAGE_STRING("LINDA", "LINDA", "EGLE", "LINDA"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -6933,10 +5550,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_SWIMMER_F,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER,
         .trainerPic = TRAINER_PIC_SWIMMER_F,
-        .trainerName = LANGUAGE_STRING(
-            "KAYLEE",
-            "INGRID",
-            "FABIOLA"),
+        .trainerName = LANGUAGE_STRING("KAYLEE", "INGRID", "FABIOLA", "CELESTE"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -6948,10 +5562,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_SWIMMER_F,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER,
         .trainerPic = TRAINER_PIC_SWIMMER_F,
-        .trainerName = LANGUAGE_STRING(
-            "LAUREL",
-            "GRAZIELLA",
-            "GABRIELLA"),
+        .trainerName = LANGUAGE_STRING("LAUREL", "GRAZIELLA", "GABRIELLA", "LORENA"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -6963,10 +5574,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_SWIMMER_F,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER,
         .trainerPic = TRAINER_PIC_SWIMMER_F,
-        .trainerName = LANGUAGE_STRING(
-            "CARLEE",
-            "CARLA",
-            "MARILINA"),
+        .trainerName = LANGUAGE_STRING("CARLEE", "CARLA", "MARILINA", "CARLI"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -6978,10 +5586,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_SWIMMER_F,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER,
         .trainerPic = TRAINER_PIC_SWIMMER_F,
-        .trainerName = LANGUAGE_STRING(
-            "JENNY",
-            "JENNY",
-            "MIRELLA"),
+        .trainerName = LANGUAGE_STRING("JENNY", "JENNY", "MIRELLA", "GENO"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -6993,10 +5598,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_SWIMMER_F,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER,
         .trainerPic = TRAINER_PIC_SWIMMER_F,
-        .trainerName = LANGUAGE_STRING(
-            "JENNY",
-            "JENNY",
-            "MIRELLA"),
+        .trainerName = LANGUAGE_STRING("JENNY", "JENNY", "MIRELLA", "GENO"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -7008,10 +5610,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_SWIMMER_F,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER,
         .trainerPic = TRAINER_PIC_SWIMMER_F,
-        .trainerName = LANGUAGE_STRING(
-            "JENNY",
-            "JENNY",
-            "MIRELLA"),
+        .trainerName = LANGUAGE_STRING("JENNY", "JENNY", "MIRELLA", "GENO"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -7023,10 +5622,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_SWIMMER_F,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER,
         .trainerPic = TRAINER_PIC_SWIMMER_F,
-        .trainerName = LANGUAGE_STRING(
-            "JENNY",
-            "JENNY",
-            "MIRELLA"),
+        .trainerName = LANGUAGE_STRING("JENNY", "JENNY", "MIRELLA", "GENO"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -7038,10 +5634,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_PICNICKER,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL,
         .trainerPic = TRAINER_PIC_PICNICKER,
-        .trainerName = LANGUAGE_STRING(
-            "HEIDI",
-            "HEIDI",
-            "AMATA"),
+        .trainerName = LANGUAGE_STRING("HEIDI", "HEIDI", "AMATA", "HILARIA"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -7053,10 +5646,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_PICNICKER,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL,
         .trainerPic = TRAINER_PIC_PICNICKER,
-        .trainerName = LANGUAGE_STRING(
-            "BECKY",
-            "GENEVIEVE",
-            "BEATRICE"),
+        .trainerName = LANGUAGE_STRING("BECKY", "GENEVIEVE", "BEATRICE", "BETINA"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -7068,10 +5658,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_PICNICKER,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL,
         .trainerPic = TRAINER_PIC_PICNICKER,
-        .trainerName = LANGUAGE_STRING(
-            "CAROL",
-            "GRETA",
-            "CARMEN"),
+        .trainerName = LANGUAGE_STRING("CAROL", "GRETA", "CARMEN", "CARLETA"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -7083,10 +5670,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_PICNICKER,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL,
         .trainerPic = TRAINER_PIC_PICNICKER,
-        .trainerName = LANGUAGE_STRING(
-            "NANCY",
-            "NANCY",
-            "DOMENICA"),
+        .trainerName = LANGUAGE_STRING("NANCY", "NANCY", "DOMENICA", "NEREA"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -7098,10 +5682,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_PICNICKER,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL,
         .trainerPic = TRAINER_PIC_PICNICKER,
-        .trainerName = LANGUAGE_STRING(
-            "MARTHA",
-            "MARTHE",
-            "ELEONORA"),
+        .trainerName = LANGUAGE_STRING("MARTHA", "MARTHE", "ELEONORA", "MARTA"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -7113,10 +5694,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_PICNICKER,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL,
         .trainerPic = TRAINER_PIC_PICNICKER,
-        .trainerName = LANGUAGE_STRING(
-            "DIANA",
-            "DIANE",
-            "FEDERICA"),
+        .trainerName = LANGUAGE_STRING("DIANA", "DIANE", "FEDERICA", "DIANA"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -7128,10 +5706,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_PSYCHIC,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE,
         .trainerPic = TRAINER_PIC_PSYCHIC_M,
-        .trainerName = LANGUAGE_STRING(
-            "CEDRIC",
-            "CYRIL",
-            "GERLANDO"),
+        .trainerName = LANGUAGE_STRING("CEDRIC", "CYRIL", "GERLANDO", "CEDRIC"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -7143,10 +5718,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_PICNICKER,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL,
         .trainerPic = TRAINER_PIC_PICNICKER,
-        .trainerName = LANGUAGE_STRING(
-            "IRENE",
-            "IRENE",
-            "IRENE"),
+        .trainerName = LANGUAGE_STRING("IRENE", "IRENE", "IRENE", "IRENE"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -7158,10 +5730,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_PICNICKER,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL,
         .trainerPic = TRAINER_PIC_PICNICKER,
-        .trainerName = LANGUAGE_STRING(
-            "DIANA",
-            "DIANE",
-            "FEDERICA"),
+        .trainerName = LANGUAGE_STRING("DIANA", "DIANE", "FEDERICA", "DIANA"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -7173,10 +5742,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_PICNICKER,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL,
         .trainerPic = TRAINER_PIC_PICNICKER,
-        .trainerName = LANGUAGE_STRING(
-            "DIANA",
-            "DIANE",
-            "FEDERICA"),
+        .trainerName = LANGUAGE_STRING("DIANA", "DIANE", "FEDERICA", "DIANA"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -7188,10 +5754,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_PICNICKER,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL,
         .trainerPic = TRAINER_PIC_PICNICKER,
-        .trainerName = LANGUAGE_STRING(
-            "DIANA",
-            "DIANE",
-            "FEDERICA"),
+        .trainerName = LANGUAGE_STRING("DIANA", "DIANE", "FEDERICA", "DIANA"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -7203,10 +5766,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_PICNICKER,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL,
         .trainerPic = TRAINER_PIC_PICNICKER,
-        .trainerName = LANGUAGE_STRING(
-            "DIANA",
-            "DIANE",
-            "FEDERICA"),
+        .trainerName = LANGUAGE_STRING("DIANA", "DIANE", "FEDERICA", "DIANA"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -7218,10 +5778,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_TWINS,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_TWINS,
         .trainerPic = TRAINER_PIC_TWINS,
-        .trainerName = LANGUAGE_STRING(
-            "AMY & LIV",
-            "EVE & AWA",
-            "AMY & LIV"),
+        .trainerName = LANGUAGE_STRING("AMY & LIV", "EVE & AWA", "AMY & LIV", "ALI-MAR"),
         .items = {},
         .doubleBattle = TRUE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -7233,10 +5790,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_TWINS,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_TWINS,
         .trainerPic = TRAINER_PIC_TWINS,
-        .trainerName = LANGUAGE_STRING(
-            "AMY & LIV",
-            "EVE & AWA",
-            "AMY & LIV"),
+        .trainerName = LANGUAGE_STRING("AMY & LIV", "EVE & AWA", "AMY & LIV", "ALI-MAR"),
         .items = {},
         .doubleBattle = TRUE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -7248,10 +5802,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_TWINS,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_TWINS,
         .trainerPic = TRAINER_PIC_TWINS,
-        .trainerName = LANGUAGE_STRING(
-            "GINA & MIA",
-            "GINA & MIA",
-            "GINA & MIA"),
+        .trainerName = LANGUAGE_STRING("GINA & MIA", "GINA & MIA", "GINA & MIA", "GINA-MINI"),
         .items = {},
         .doubleBattle = TRUE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -7263,10 +5814,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_TWINS,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_TWINS,
         .trainerPic = TRAINER_PIC_TWINS,
-        .trainerName = LANGUAGE_STRING(
-            "MIU & YUKI",
-            "MIU & YUKI",
-            "MIU & YUKI"),
+        .trainerName = LANGUAGE_STRING("MIU & YUKI", "MIU & YUKI", "MIU & YUKI", "MARU-YOLA"),
         .items = {},
         .doubleBattle = TRUE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -7278,10 +5826,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_TWINS,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_TWINS,
         .trainerPic = TRAINER_PIC_TWINS,
-        .trainerName = LANGUAGE_STRING(
-            "AMY & LIV",
-            "EVE & AWA",
-            "AMY & LIV"),
+        .trainerName = LANGUAGE_STRING("AMY & LIV", "EVE & AWA", "AMY & LIV", "ALI-MAR"),
         .items = {},
         .doubleBattle = TRUE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -7293,10 +5838,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_TWINS,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_TWINS,
         .trainerPic = TRAINER_PIC_TWINS,
-        .trainerName = LANGUAGE_STRING(
-            "GINA & MIA",
-            "GINA & MIA",
-            "GINA & MIA"),
+        .trainerName = LANGUAGE_STRING("GINA & MIA", "GINA & MIA", "GINA & MIA", "GINA-MINI"),
         .items = {},
         .doubleBattle = TRUE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -7308,10 +5850,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_TWINS,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_TWINS,
         .trainerPic = TRAINER_PIC_TWINS,
-        .trainerName = LANGUAGE_STRING(
-            "AMY & LIV",
-            "EVE & AWA",
-            "AMY & LIV"),
+        .trainerName = LANGUAGE_STRING("AMY & LIV", "EVE & AWA", "AMY & LIV", "ALI-MAR"),
         .items = {},
         .doubleBattle = TRUE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -7323,10 +5862,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_TWINS,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_TWINS,
         .trainerPic = TRAINER_PIC_TWINS,
-        .trainerName = LANGUAGE_STRING(
-            "AMY & LIV",
-            "EVE & AWA",
-            "AMY & LIV"),
+        .trainerName = LANGUAGE_STRING("AMY & LIV", "EVE & AWA", "AMY & LIV", "ALI-MAR"),
         .items = {},
         .doubleBattle = TRUE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -7338,10 +5874,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_TWINS,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_TWINS,
         .trainerPic = TRAINER_PIC_TWINS,
-        .trainerName = LANGUAGE_STRING(
-            "AMY & LIV",
-            "EVE & AWA",
-            "AMY & LIV"),
+        .trainerName = LANGUAGE_STRING("AMY & LIV", "EVE & AWA", "AMY & LIV", "ALI-MAR"),
         .items = {},
         .doubleBattle = TRUE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -7353,10 +5886,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_SAILOR,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
         .trainerPic = TRAINER_PIC_SAILOR,
-        .trainerName = LANGUAGE_STRING(
-            "HUEY",
-            "HENRI",
-            "ARMANDO"),
+        .trainerName = LANGUAGE_STRING("HUEY", "HENRI", "ARMANDO", "HUMBERTO"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -7368,10 +5898,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_SAILOR,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
         .trainerPic = TRAINER_PIC_SAILOR,
-        .trainerName = LANGUAGE_STRING(
-            "EDMOND",
-            "EDMOND",
-            "ARRIGO"),
+        .trainerName = LANGUAGE_STRING("EDMOND", "EDMOND", "ARRIGO", "EDMUNDO"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -7383,10 +5910,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_SAILOR,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
         .trainerPic = TRAINER_PIC_SAILOR,
-        .trainerName = LANGUAGE_STRING(
-            "ERNEST",
-            "ERNEST",
-            "ERNEST"),
+        .trainerName = LANGUAGE_STRING("ERNEST", "ERNEST", "ERNEST", "ERNESTO"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -7398,10 +5922,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_SAILOR,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
         .trainerPic = TRAINER_PIC_SAILOR,
-        .trainerName = LANGUAGE_STRING(
-            "DWAYNE",
-            "HAROLD",
-            "AURELIO"),
+        .trainerName = LANGUAGE_STRING("DWAYNE", "HAROLD", "AURELIO", "DIMAS"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -7413,10 +5934,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_SAILOR,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
         .trainerPic = TRAINER_PIC_SAILOR,
-        .trainerName = LANGUAGE_STRING(
-            "PHILLIP",
-            "PHILIPPE",
-            "PHILLIP"),
+        .trainerName = LANGUAGE_STRING("PHILLIP", "PHILIPPE", "PHILLIP", "FELIPE"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -7428,10 +5946,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_SAILOR,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
         .trainerPic = TRAINER_PIC_SAILOR,
-        .trainerName = LANGUAGE_STRING(
-            "LEONARD",
-            "LEONARD",
-            "LEONARD"),
+        .trainerName = LANGUAGE_STRING("LEONARD", "LEONARD", "LEONARD", "LEONARDO"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -7443,10 +5958,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_SAILOR,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
         .trainerPic = TRAINER_PIC_SAILOR,
-        .trainerName = LANGUAGE_STRING(
-            "DUNCAN",
-            "LUDOVIC",
-            "BENIAMINO"),
+        .trainerName = LANGUAGE_STRING("DUNCAN", "LUDOVIC", "BENIAMINO", "DATO"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -7458,10 +5970,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_SAILOR,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
         .trainerPic = TRAINER_PIC_SAILOR,
-        .trainerName = LANGUAGE_STRING(
-            "ERNEST",
-            "ERNEST",
-            "ERNEST"),
+        .trainerName = LANGUAGE_STRING("ERNEST", "ERNEST", "ERNEST", "ERNESTO"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -7473,10 +5982,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_SAILOR,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
         .trainerPic = TRAINER_PIC_SAILOR,
-        .trainerName = LANGUAGE_STRING(
-            "ERNEST",
-            "ERNEST",
-            "ERNEST"),
+        .trainerName = LANGUAGE_STRING("ERNEST", "ERNEST", "ERNEST", "ERNESTO"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -7488,10 +5994,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_SAILOR,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
         .trainerPic = TRAINER_PIC_SAILOR,
-        .trainerName = LANGUAGE_STRING(
-            "ERNEST",
-            "ERNEST",
-            "ERNEST"),
+        .trainerName = LANGUAGE_STRING("ERNEST", "ERNEST", "ERNEST", "ERNESTO"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -7503,10 +6006,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_SAILOR,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
         .trainerPic = TRAINER_PIC_SAILOR,
-        .trainerName = LANGUAGE_STRING(
-            "ERNEST",
-            "ERNEST",
-            "ERNEST"),
+        .trainerName = LANGUAGE_STRING("ERNEST", "ERNEST", "ERNEST", "ERNESTO"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -7518,10 +6018,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_HIKER,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER,
         .trainerPic = TRAINER_PIC_HIKER,
-        .trainerName = LANGUAGE_STRING(
-            "ELI",
-            "ELIE",
-            "LANFRANCO"),
+        .trainerName = LANGUAGE_STRING("ELI", "ELIE", "LANFRANCO", "ELORE"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -7533,10 +6030,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_POKEFAN,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_TWINS,
         .trainerPic = TRAINER_PIC_POKEFAN_F,
-        .trainerName = LANGUAGE_STRING(
-            "ANNIKA",
-            "COLETTE",
-            "COLETTE"),
+        .trainerName = LANGUAGE_STRING("ANNIKA", "COLETTE", "COLETTE", "CONCHI"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -7548,10 +6042,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_COOLTRAINER_2,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL,
         .trainerPic = TRAINER_PIC_COOLTRAINER_F,
-        .trainerName = LANGUAGE_STRING(
-            "JAZMYN",
-            "ASTRID",
-            "PALMIRA"),
+        .trainerName = LANGUAGE_STRING("JAZMYN", "ASTRID", "PALMIRA", "JUAYA"),
         .items = {ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
@@ -7563,10 +6054,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_NINJA_BOY,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS,
         .trainerPic = TRAINER_PIC_NINJA_BOY,
-        .trainerName = LANGUAGE_STRING(
-            "JONAS",
-            "JUSTIN",
-            "YANNIK"),
+        .trainerName = LANGUAGE_STRING("JONAS", "JUSTIN", "YANNIK", "JORECO"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
@@ -7578,10 +6066,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_PARASOL_LADY,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE,
         .trainerPic = TRAINER_PIC_PARASOL_LADY,
-        .trainerName = LANGUAGE_STRING(
-            "KAYLEY",
-            "AGATHE",
-            "KAYLEY"),
+        .trainerName = LANGUAGE_STRING("KAYLEY", "AGATHE", "KAYLEY", "LARITA"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -7593,10 +6078,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_EXPERT,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE,
         .trainerPic = TRAINER_PIC_EXPERT_M,
-        .trainerName = LANGUAGE_STRING(
-            "AURON",
-            "GASPARD",
-            "ONOFRIO"),
+        .trainerName = LANGUAGE_STRING("AURON", "GASPARD", "ONOFRIO", "AURELIO"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -7608,10 +6090,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_SAILOR,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
         .trainerPic = TRAINER_PIC_SAILOR,
-        .trainerName = LANGUAGE_STRING(
-            "KELVIN",
-            "PATRICE",
-            "ALESSIO"),
+        .trainerName = LANGUAGE_STRING("KELVIN", "PATRICE", "ALESSIO", "COQUE"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -7623,10 +6102,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_COOLTRAINER,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL,
         .trainerPic = TRAINER_PIC_COOLTRAINER_F,
-        .trainerName = LANGUAGE_STRING(
-            "MARLEY",
-            "MARGAUX",
-            "MADDALENA"),
+        .trainerName = LANGUAGE_STRING("MARLEY", "MARGAUX", "MADDALENA", "MARLUYA"),
         .items = {ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
@@ -7638,10 +6114,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_BATTLE_GIRL,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE,
         .trainerPic = TRAINER_PIC_BATTLE_GIRL,
-        .trainerName = LANGUAGE_STRING(
-            "REYNA",
-            "VERENA",
-            "CELESTINA"),
+        .trainerName = LANGUAGE_STRING("REYNA", "VERENA", "CELESTINA", "REIRA"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -7653,10 +6126,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_SAILOR,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
         .trainerPic = TRAINER_PIC_SAILOR,
-        .trainerName = LANGUAGE_STRING(
-            "HUDSON",
-            "VALENTIN",
-            "VIDIGULFO"),
+        .trainerName = LANGUAGE_STRING("HUDSON", "VALENTIN", "VIDIGULFO", "TOREL"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -7668,10 +6138,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_EXPERT,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE,
         .trainerPic = TRAINER_PIC_EXPERT_M,
-        .trainerName = LANGUAGE_STRING(
-            "CONOR",
-            "YVES",
-            "CONOR"),
+        .trainerName = LANGUAGE_STRING("CONOR", "YVES", "CONOR", "FERIO"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -7683,10 +6150,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_COLLECTOR,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS,
         .trainerPic = TRAINER_PIC_COLLECTOR,
-        .trainerName = LANGUAGE_STRING(
-            "EDWIN",
-            "MARTIN",
-            "CESARE"),
+        .trainerName = LANGUAGE_STRING("EDWIN", "MARTIN", "CESARE", "EDGARDO"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -7698,10 +6162,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_COLLECTOR,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS,
         .trainerPic = TRAINER_PIC_COLLECTOR,
-        .trainerName = LANGUAGE_STRING(
-            "HECTOR",
-            "HECTOR",
-            "ETTORE"),
+        .trainerName = LANGUAGE_STRING("HECTOR", "HECTOR", "ETTORE", "HENRI"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -7713,10 +6174,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_MAGMA_ADMIN,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MAGMA,
         .trainerPic = TRAINER_PIC_MAGMA_ADMIN,
-        .trainerName = LANGUAGE_STRING(
-            "TABITHA",
-            "KELVIN",
-            "OTTAVIO"),
+        .trainerName = LANGUAGE_STRING("TABITHA", "KELVIN", "OTTAVIO", "TATIANO"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -7728,10 +6186,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_COLLECTOR,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS,
         .trainerPic = TRAINER_PIC_COLLECTOR,
-        .trainerName = LANGUAGE_STRING(
-            "EDWIN",
-            "MARTIN",
-            "CESARE"),
+        .trainerName = LANGUAGE_STRING("EDWIN", "MARTIN", "CESARE", "EDGARDO"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -7743,10 +6198,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_COLLECTOR,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS,
         .trainerPic = TRAINER_PIC_COLLECTOR,
-        .trainerName = LANGUAGE_STRING(
-            "EDWIN",
-            "MARTIN",
-            "CESARE"),
+        .trainerName = LANGUAGE_STRING("EDWIN", "MARTIN", "CESARE", "EDGARDO"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -7758,10 +6210,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_COLLECTOR,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS,
         .trainerPic = TRAINER_PIC_COLLECTOR,
-        .trainerName = LANGUAGE_STRING(
-            "EDWIN",
-            "MARTIN",
-            "CESARE"),
+        .trainerName = LANGUAGE_STRING("EDWIN", "MARTIN", "CESARE", "EDGARDO"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -7773,10 +6222,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_COLLECTOR,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS,
         .trainerPic = TRAINER_PIC_COLLECTOR,
-        .trainerName = LANGUAGE_STRING(
-            "EDWIN",
-            "MARTIN",
-            "CESARE"),
+        .trainerName = LANGUAGE_STRING("EDWIN", "MARTIN", "CESARE", "EDGARDO"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -7788,10 +6234,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_RIVAL,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
         .trainerPic = TRAINER_PIC_WALLY,
-        .trainerName = LANGUAGE_STRING(
-            "WALLY",
-            "TIMMY",
-            "LINO"),
+        .trainerName = LANGUAGE_STRING("WALLY", "TIMMY", "LINO", "BLASCO"),
         .items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
@@ -7803,10 +6246,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_RIVAL,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
         .trainerPic = TRAINER_PIC_BRENDAN,
-        .trainerName = LANGUAGE_STRING(
-            "BRENDAN",
-            "BRICE",
-            "BRENDON"),
+        .trainerName = LANGUAGE_STRING("BRENDAN", "BRICE", "BRENDON", "BRUNO"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
@@ -7818,10 +6258,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_RIVAL,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
         .trainerPic = TRAINER_PIC_BRENDAN,
-        .trainerName = LANGUAGE_STRING(
-            "BRENDAN",
-            "BRICE",
-            "BRENDON"),
+        .trainerName = LANGUAGE_STRING("BRENDAN", "BRICE", "BRENDON", "BRUNO"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
@@ -7833,10 +6270,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_RIVAL,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
         .trainerPic = TRAINER_PIC_BRENDAN,
-        .trainerName = LANGUAGE_STRING(
-            "BRENDAN",
-            "BRICE",
-            "BRENDON"),
+        .trainerName = LANGUAGE_STRING("BRENDAN", "BRICE", "BRENDON", "BRUNO"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
@@ -7848,10 +6282,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_RIVAL,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
         .trainerPic = TRAINER_PIC_BRENDAN,
-        .trainerName = LANGUAGE_STRING(
-            "BRENDAN",
-            "BRICE",
-            "BRENDON"),
+        .trainerName = LANGUAGE_STRING("BRENDAN", "BRICE", "BRENDON", "BRUNO"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_SETUP_FIRST_TURN,
@@ -7863,10 +6294,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_RIVAL,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
         .trainerPic = TRAINER_PIC_BRENDAN,
-        .trainerName = LANGUAGE_STRING(
-            "BRENDAN",
-            "BRICE",
-            "BRENDON"),
+        .trainerName = LANGUAGE_STRING("BRENDAN", "BRICE", "BRENDON", "BRUNO"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
@@ -7878,10 +6306,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_RIVAL,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
         .trainerPic = TRAINER_PIC_BRENDAN,
-        .trainerName = LANGUAGE_STRING(
-            "BRENDAN",
-            "BRICE",
-            "BRENDON"),
+        .trainerName = LANGUAGE_STRING("BRENDAN", "BRICE", "BRENDON", "BRUNO"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
@@ -7893,10 +6318,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_RIVAL,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
         .trainerPic = TRAINER_PIC_BRENDAN,
-        .trainerName = LANGUAGE_STRING(
-            "BRENDAN",
-            "BRICE",
-            "BRENDON"),
+        .trainerName = LANGUAGE_STRING("BRENDAN", "BRICE", "BRENDON", "BRUNO"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
@@ -7908,10 +6330,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_RIVAL,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
         .trainerPic = TRAINER_PIC_BRENDAN,
-        .trainerName = LANGUAGE_STRING(
-            "BRENDAN",
-            "BRICE",
-            "BRENDON"),
+        .trainerName = LANGUAGE_STRING("BRENDAN", "BRICE", "BRENDON", "BRUNO"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
@@ -7923,10 +6342,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_RIVAL,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
         .trainerPic = TRAINER_PIC_BRENDAN,
-        .trainerName = LANGUAGE_STRING(
-            "BRENDAN",
-            "BRICE",
-            "BRENDON"),
+        .trainerName = LANGUAGE_STRING("BRENDAN", "BRICE", "BRENDON", "BRUNO"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
@@ -7938,10 +6354,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_RIVAL,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE,
         .trainerPic = TRAINER_PIC_MAY,
-        .trainerName = LANGUAGE_STRING(
-            "MAY",
-            "FLORA",
-            "VERA"),
+        .trainerName = LANGUAGE_STRING("MAY", "FLORA", "VERA", "AURA"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
@@ -7953,10 +6366,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_RIVAL,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE,
         .trainerPic = TRAINER_PIC_MAY,
-        .trainerName = LANGUAGE_STRING(
-            "MAY",
-            "FLORA",
-            "VERA"),
+        .trainerName = LANGUAGE_STRING("MAY", "FLORA", "VERA", "AURA"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
@@ -7968,10 +6378,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_RIVAL,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE,
         .trainerPic = TRAINER_PIC_MAY,
-        .trainerName = LANGUAGE_STRING(
-            "MAY",
-            "FLORA",
-            "VERA"),
+        .trainerName = LANGUAGE_STRING("MAY", "FLORA", "VERA", "AURA"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
@@ -7983,10 +6390,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_RIVAL,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE,
         .trainerPic = TRAINER_PIC_MAY,
-        .trainerName = LANGUAGE_STRING(
-            "MAY",
-            "FLORA",
-            "VERA"),
+        .trainerName = LANGUAGE_STRING("MAY", "FLORA", "VERA", "AURA"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
@@ -7998,10 +6402,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_RIVAL,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE,
         .trainerPic = TRAINER_PIC_MAY,
-        .trainerName = LANGUAGE_STRING(
-            "MAY",
-            "FLORA",
-            "VERA"),
+        .trainerName = LANGUAGE_STRING("MAY", "FLORA", "VERA", "AURA"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
@@ -8013,10 +6414,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_RIVAL,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE,
         .trainerPic = TRAINER_PIC_MAY,
-        .trainerName = LANGUAGE_STRING(
-            "MAY",
-            "FLORA",
-            "VERA"),
+        .trainerName = LANGUAGE_STRING("MAY", "FLORA", "VERA", "AURA"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
@@ -8028,10 +6426,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_RIVAL,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE,
         .trainerPic = TRAINER_PIC_MAY,
-        .trainerName = LANGUAGE_STRING(
-            "MAY",
-            "FLORA",
-            "VERA"),
+        .trainerName = LANGUAGE_STRING("MAY", "FLORA", "VERA", "AURA"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
@@ -8043,10 +6438,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_RIVAL,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE,
         .trainerPic = TRAINER_PIC_MAY,
-        .trainerName = LANGUAGE_STRING(
-            "MAY",
-            "FLORA",
-            "VERA"),
+        .trainerName = LANGUAGE_STRING("MAY", "FLORA", "VERA", "AURA"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
@@ -8058,10 +6450,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_RIVAL,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE,
         .trainerPic = TRAINER_PIC_MAY,
-        .trainerName = LANGUAGE_STRING(
-            "MAY",
-            "FLORA",
-            "VERA"),
+        .trainerName = LANGUAGE_STRING("MAY", "FLORA", "VERA", "AURA"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
@@ -8073,10 +6462,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_PKMN_BREEDER,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
         .trainerPic = TRAINER_PIC_POKEMON_BREEDER_M,
-        .trainerName = LANGUAGE_STRING(
-            "ISAAC",
-            "ISAAC",
-            "ISAAC"),
+        .trainerName = LANGUAGE_STRING("ISAAC", "ISAAC", "ISAAC", "ISAAC"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -8088,10 +6474,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_BUG_CATCHER,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
         .trainerPic = TRAINER_PIC_BUG_CATCHER,
-        .trainerName = LANGUAGE_STRING(
-            "DAVIS",
-            "KARIM",
-            "DAVIS"),
+        .trainerName = LANGUAGE_STRING("DAVIS", "KARIM", "DAVIS", "DAVISO"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -8103,10 +6486,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_COOLTRAINER,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL,
         .trainerPic = TRAINER_PIC_COOLTRAINER_M,
-        .trainerName = LANGUAGE_STRING(
-            "MITCHELL",
-            "GAULTIER",
-            "MANFREDI"),
+        .trainerName = LANGUAGE_STRING("MITCHELL", "GAULTIER", "MANFREDI", "MIQUELE"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
@@ -8118,10 +6498,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_PKMN_BREEDER,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
         .trainerPic = TRAINER_PIC_POKEMON_BREEDER_M,
-        .trainerName = LANGUAGE_STRING(
-            "ISAAC",
-            "ISAAC",
-            "ISAAC"),
+        .trainerName = LANGUAGE_STRING("ISAAC", "ISAAC", "ISAAC", "ISAAC"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -8133,10 +6510,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_PKMN_BREEDER,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
         .trainerPic = TRAINER_PIC_POKEMON_BREEDER_M,
-        .trainerName = LANGUAGE_STRING(
-            "ISAAC",
-            "ISAAC",
-            "ISAAC"),
+        .trainerName = LANGUAGE_STRING("ISAAC", "ISAAC", "ISAAC", "ISAAC"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -8148,10 +6522,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_PKMN_BREEDER,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
         .trainerPic = TRAINER_PIC_POKEMON_BREEDER_M,
-        .trainerName = LANGUAGE_STRING(
-            "ISAAC",
-            "ISAAC",
-            "ISAAC"),
+        .trainerName = LANGUAGE_STRING("ISAAC", "ISAAC", "ISAAC", "ISAAC"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -8163,10 +6534,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_PKMN_BREEDER,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
         .trainerPic = TRAINER_PIC_POKEMON_BREEDER_M,
-        .trainerName = LANGUAGE_STRING(
-            "ISAAC",
-            "ISAAC",
-            "ISAAC"),
+        .trainerName = LANGUAGE_STRING("ISAAC", "ISAAC", "ISAAC", "ISAAC"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -8178,10 +6546,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_PKMN_BREEDER,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE,
         .trainerPic = TRAINER_PIC_POKEMON_BREEDER_F,
-        .trainerName = LANGUAGE_STRING(
-            "LYDIA",
-            "CLOTILDE",
-            "LIDIA"),
+        .trainerName = LANGUAGE_STRING("LYDIA", "CLOTILDE", "LIDIA", "LIDIA"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -8193,10 +6558,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_COOLTRAINER,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL,
         .trainerPic = TRAINER_PIC_COOLTRAINER_F,
-        .trainerName = LANGUAGE_STRING(
-            "HALLE",
-            "OPHELIE",
-            "AURA"),
+        .trainerName = LANGUAGE_STRING("HALLE", "OPHELIE", "AURA", "ALIA"),
         .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
@@ -8208,10 +6570,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_RUIN_MANIAC,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER,
         .trainerPic = TRAINER_PIC_RUIN_MANIAC,
-        .trainerName = LANGUAGE_STRING(
-            "GARRISON",
-            "RENAUD",
-            "GARRISON"),
+        .trainerName = LANGUAGE_STRING("GARRISON", "RENAUD", "GARRISON", "RUNO"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -8223,10 +6582,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_PKMN_BREEDER,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE,
         .trainerPic = TRAINER_PIC_POKEMON_BREEDER_F,
-        .trainerName = LANGUAGE_STRING(
-            "LYDIA",
-            "CLOTILDE",
-            "LIDIA"),
+        .trainerName = LANGUAGE_STRING("LYDIA", "CLOTILDE", "LIDIA", "LIDIA"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -8238,10 +6594,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_PKMN_BREEDER,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE,
         .trainerPic = TRAINER_PIC_POKEMON_BREEDER_F,
-        .trainerName = LANGUAGE_STRING(
-            "LYDIA",
-            "CLOTILDE",
-            "LIDIA"),
+        .trainerName = LANGUAGE_STRING("LYDIA", "CLOTILDE", "LIDIA", "LIDIA"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -8253,10 +6606,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_PKMN_BREEDER,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE,
         .trainerPic = TRAINER_PIC_POKEMON_BREEDER_F,
-        .trainerName = LANGUAGE_STRING(
-            "LYDIA",
-            "CLOTILDE",
-            "LIDIA"),
+        .trainerName = LANGUAGE_STRING("LYDIA", "CLOTILDE", "LIDIA", "LIDIA"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -8268,10 +6618,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_PKMN_BREEDER,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE,
         .trainerPic = TRAINER_PIC_POKEMON_BREEDER_F,
-        .trainerName = LANGUAGE_STRING(
-            "LYDIA",
-            "CLOTILDE",
-            "LIDIA"),
+        .trainerName = LANGUAGE_STRING("LYDIA", "CLOTILDE", "LIDIA", "LIDIA"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -8283,10 +6630,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_PKMN_RANGER,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL,
         .trainerPic = TRAINER_PIC_POKEMON_RANGER_M,
-        .trainerName = LANGUAGE_STRING(
-            "JACKSON",
-            "MICHAEL",
-            "GUIDO"),
+        .trainerName = LANGUAGE_STRING("JACKSON", "MICHAEL", "GUIDO", "JUACU"),
         .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
@@ -8298,10 +6642,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_PKMN_RANGER,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL,
         .trainerPic = TRAINER_PIC_POKEMON_RANGER_M,
-        .trainerName = LANGUAGE_STRING(
-            "LORENZO",
-            "LUIS",
-            "LORENZO"),
+        .trainerName = LANGUAGE_STRING("LORENZO", "LUIS", "LORENZO", "LORENO"),
         .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
@@ -8313,10 +6654,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_PKMN_RANGER,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL,
         .trainerPic = TRAINER_PIC_POKEMON_RANGER_M,
-        .trainerName = LANGUAGE_STRING(
-            "SEBASTIAN",
-            "SEBASTIEN",
-            "SEBASTIANO"),
+        .trainerName = LANGUAGE_STRING("SEBASTIAN", "SEBASTIEN", "SEBASTIANO", "SEB"),
         .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
@@ -8328,10 +6666,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_PKMN_RANGER,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL,
         .trainerPic = TRAINER_PIC_POKEMON_RANGER_M,
-        .trainerName = LANGUAGE_STRING(
-            "JACKSON",
-            "MICHAEL",
-            "GUIDO"),
+        .trainerName = LANGUAGE_STRING("JACKSON", "MICHAEL", "GUIDO", "JUACU"),
         .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_SETUP_FIRST_TURN,
@@ -8343,10 +6678,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_PKMN_RANGER,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL,
         .trainerPic = TRAINER_PIC_POKEMON_RANGER_M,
-        .trainerName = LANGUAGE_STRING(
-            "JACKSON",
-            "MICHAEL",
-            "GUIDO"),
+        .trainerName = LANGUAGE_STRING("JACKSON", "MICHAEL", "GUIDO", "JUACU"),
         .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
@@ -8358,10 +6690,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_PKMN_RANGER,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL,
         .trainerPic = TRAINER_PIC_POKEMON_RANGER_M,
-        .trainerName = LANGUAGE_STRING(
-            "JACKSON",
-            "MICHAEL",
-            "GUIDO"),
+        .trainerName = LANGUAGE_STRING("JACKSON", "MICHAEL", "GUIDO", "JUACU"),
         .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_SETUP_FIRST_TURN,
@@ -8373,10 +6702,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_PKMN_RANGER,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL,
         .trainerPic = TRAINER_PIC_POKEMON_RANGER_M,
-        .trainerName = LANGUAGE_STRING(
-            "JACKSON",
-            "MICHAEL",
-            "GUIDO"),
+        .trainerName = LANGUAGE_STRING("JACKSON", "MICHAEL", "GUIDO", "JUACU"),
         .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
@@ -8388,10 +6714,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_PKMN_RANGER,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL,
         .trainerPic = TRAINER_PIC_POKEMON_RANGER_F,
-        .trainerName = LANGUAGE_STRING(
-            "CATHERINE",
-            "CATHERINE",
-            "SONIA"),
+        .trainerName = LANGUAGE_STRING("CATHERINE", "CATHERINE", "SONIA", "CRISTINA"),
         .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_SETUP_FIRST_TURN,
@@ -8403,10 +6726,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_PKMN_RANGER,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL,
         .trainerPic = TRAINER_PIC_POKEMON_RANGER_F,
-        .trainerName = LANGUAGE_STRING(
-            "JENNA",
-            "JENNA",
-            "SILVIA"),
+        .trainerName = LANGUAGE_STRING("JENNA", "JENNA", "SILVIA", "GUADA"),
         .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_SETUP_FIRST_TURN,
@@ -8418,10 +6738,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_PKMN_RANGER,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL,
         .trainerPic = TRAINER_PIC_POKEMON_RANGER_F,
-        .trainerName = LANGUAGE_STRING(
-            "SOPHIA",
-            "SOFIA",
-            "KATIA"),
+        .trainerName = LANGUAGE_STRING("SOPHIA", "SOFIA", "KATIA", "SOFI"),
         .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
@@ -8433,10 +6750,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_PKMN_RANGER,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL,
         .trainerPic = TRAINER_PIC_POKEMON_RANGER_F,
-        .trainerName = LANGUAGE_STRING(
-            "CATHERINE",
-            "CATHERINE",
-            "SONIA"),
+        .trainerName = LANGUAGE_STRING("CATHERINE", "CATHERINE", "SONIA", "CRISTINA"),
         .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_SETUP_FIRST_TURN,
@@ -8448,10 +6762,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_PKMN_RANGER,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL,
         .trainerPic = TRAINER_PIC_POKEMON_RANGER_F,
-        .trainerName = LANGUAGE_STRING(
-            "CATHERINE",
-            "CATHERINE",
-            "SONIA"),
+        .trainerName = LANGUAGE_STRING("CATHERINE", "CATHERINE", "SONIA", "CRISTINA"),
         .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
@@ -8463,10 +6774,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_PKMN_RANGER,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL,
         .trainerPic = TRAINER_PIC_POKEMON_RANGER_F,
-        .trainerName = LANGUAGE_STRING(
-            "CATHERINE",
-            "CATHERINE",
-            "SONIA"),
+        .trainerName = LANGUAGE_STRING("CATHERINE", "CATHERINE", "SONIA", "CRISTINA"),
         .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_SETUP_FIRST_TURN,
@@ -8478,10 +6786,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_PKMN_RANGER,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL,
         .trainerPic = TRAINER_PIC_POKEMON_RANGER_F,
-        .trainerName = LANGUAGE_STRING(
-            "CATHERINE",
-            "CATHERINE",
-            "SONIA"),
+        .trainerName = LANGUAGE_STRING("CATHERINE", "CATHERINE", "SONIA", "CRISTINA"),
         .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
@@ -8493,10 +6798,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_TRIATHLETE,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
         .trainerPic = TRAINER_PIC_CYCLING_TRIATHLETE_M,
-        .trainerName = LANGUAGE_STRING(
-            "JULIO",
-            "NATHAN",
-            "JULIO"),
+        .trainerName = LANGUAGE_STRING("JULIO", "NATHAN", "JULIO", "JULNO"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -8508,10 +6810,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_TEAM_AQUA,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_AQUA,
         .trainerPic = TRAINER_PIC_AQUA_GRUNT_M,
-        .trainerName = LANGUAGE_STRING(
-            "GRUNT",
-            "SBIRE",
-            "RECLUTA"),
+        .trainerName = LANGUAGE_STRING("GRUNT", "SBIRE", "RECLUTA", "SOLDADO"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -8523,10 +6822,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_TEAM_MAGMA,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_AQUA,
         .trainerPic = TRAINER_PIC_AQUA_GRUNT_F,
-        .trainerName = LANGUAGE_STRING(
-            "GRUNT",
-            "SBIRE",
-            "RECLUTA"),
+        .trainerName = LANGUAGE_STRING("GRUNT", "SBIRE", "RECLUTA", "SOLDADO"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -8538,10 +6834,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_TEAM_AQUA,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_AQUA,
         .trainerPic = TRAINER_PIC_AQUA_GRUNT_F,
-        .trainerName = LANGUAGE_STRING(
-            "GRUNT",
-            "SBIRE",
-            "RECLUTA"),
+        .trainerName = LANGUAGE_STRING("GRUNT", "SBIRE", "RECLUTA", "SOLDADO"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -8553,10 +6846,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_TEAM_MAGMA,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MAGMA,
         .trainerPic = TRAINER_PIC_MAGMA_GRUNT_M,
-        .trainerName = LANGUAGE_STRING(
-            "GRUNT",
-            "SBIRE",
-            "RECLUTA"),
+        .trainerName = LANGUAGE_STRING("GRUNT", "SBIRE", "RECLUTA", "SOLDADO"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -8568,10 +6858,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_HIKER,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER,
         .trainerPic = TRAINER_PIC_HIKER,
-        .trainerName = LANGUAGE_STRING(
-            "MARC",
-            "MARCUS",
-            "MARC"),
+        .trainerName = LANGUAGE_STRING("MARC", "MARCUS", "MARC", "MARC"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -8583,10 +6870,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_SAILOR,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
         .trainerPic = TRAINER_PIC_SAILOR,
-        .trainerName = LANGUAGE_STRING(
-            "BRENDEN",
-            "YVON",
-            "ARCIBALDO"),
+        .trainerName = LANGUAGE_STRING("BRENDEN", "YVON", "ARCIBALDO", "BRENDEN"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -8598,10 +6882,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_BATTLE_GIRL,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE,
         .trainerPic = TRAINER_PIC_BATTLE_GIRL,
-        .trainerName = LANGUAGE_STRING(
-            "LILITH",
-            "CAMILLE",
-            "GELINDA"),
+        .trainerName = LANGUAGE_STRING("LILITH", "CAMILLE", "GELINDA", "LILITA"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -8613,10 +6894,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_BLACK_BELT,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE,
         .trainerPic = TRAINER_PIC_BLACK_BELT,
-        .trainerName = LANGUAGE_STRING(
-            "CRISTIAN",
-            "ENRIQUE",
-            "GERVASO"),
+        .trainerName = LANGUAGE_STRING("CRISTIAN", "ENRIQUE", "GERVASO", "KATO"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -8628,10 +6906,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_HEX_MANIAC,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS,
         .trainerPic = TRAINER_PIC_HEX_MANIAC,
-        .trainerName = LANGUAGE_STRING(
-            "SYLVIA",
-            "SYLVIA",
-            "SYLVIA"),
+        .trainerName = LANGUAGE_STRING("SYLVIA", "SYLVIA", "SYLVIA", "CHISPI"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -8643,10 +6918,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_SWIMMER_M,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SWIMMER,
         .trainerPic = TRAINER_PIC_SWIMMER_M,
-        .trainerName = LANGUAGE_STRING(
-            "LEONARDO",
-            "LEO",
-            "LEONARDO"),
+        .trainerName = LANGUAGE_STRING("LEONARDO", "LEO", "LEONARDO", "LEONARDI"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -8658,10 +6930,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_COOLTRAINER,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL,
         .trainerPic = TRAINER_PIC_COOLTRAINER_F,
-        .trainerName = LANGUAGE_STRING(
-            "ATHENA",
-            "ADELINE",
-            "ATHENA"),
+        .trainerName = LANGUAGE_STRING("ATHENA", "ADELINE", "ATHENA", "YAGUA"),
         .items = {ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
@@ -8673,10 +6942,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_SWIMMER_M,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SWIMMER,
         .trainerPic = TRAINER_PIC_SWIMMER_M,
-        .trainerName = LANGUAGE_STRING(
-            "HARRISON",
-            "HARRY",
-            "HARRISON"),
+        .trainerName = LANGUAGE_STRING("HARRISON", "HARRY", "HARRISON", "RISONO"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -8688,10 +6954,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_TEAM_MAGMA,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MAGMA,
         .trainerPic = TRAINER_PIC_MAGMA_GRUNT_M,
-        .trainerName = LANGUAGE_STRING(
-            "GRUNT",
-            "SBIRE",
-            "RECLUTA"),
+        .trainerName = LANGUAGE_STRING("GRUNT", "SBIRE", "RECLUTA", "SOLDADO"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -8703,10 +6966,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_SWIMMER_M,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SWIMMER,
         .trainerPic = TRAINER_PIC_SWIMMER_M,
-        .trainerName = LANGUAGE_STRING(
-            "CLARENCE",
-            "CLARENCE",
-            "GASPARE"),
+        .trainerName = LANGUAGE_STRING("CLARENCE", "CLARENCE", "GASPARE", "CLARO"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -8718,10 +6978,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_PSYCHIC,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE,
         .trainerPic = TRAINER_PIC_PSYCHIC_F,
-        .trainerName = LANGUAGE_STRING(
-            "TERRY",
-            "TERRY",
-            "TERESIO"),
+        .trainerName = LANGUAGE_STRING("TERRY", "TERRY", "TERESIO", "TERRI"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -8733,10 +6990,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_GENTLEMAN,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_RICH,
         .trainerPic = TRAINER_PIC_GENTLEMAN,
-        .trainerName = LANGUAGE_STRING(
-            "NATE",
-            "VICENTE",
-            "ADI"),
+        .trainerName = LANGUAGE_STRING("NATE", "VICENTE", "ADI", "NANDO"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -8748,10 +7002,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_HEX_MANIAC,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS,
         .trainerPic = TRAINER_PIC_HEX_MANIAC,
-        .trainerName = LANGUAGE_STRING(
-            "KATHLEEN",
-            "ANNICK",
-            "KATHLEEN"),
+        .trainerName = LANGUAGE_STRING("KATHLEEN", "ANNICK", "KATHLEEN", "CATLIN"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -8763,10 +7014,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_GENTLEMAN,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_RICH,
         .trainerPic = TRAINER_PIC_GENTLEMAN,
-        .trainerName = LANGUAGE_STRING(
-            "CLIFFORD",
-            "BLAISE",
-            "CLIFFORD"),
+        .trainerName = LANGUAGE_STRING("CLIFFORD", "BLAISE", "CLIFFORD", "CLIFO"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -8778,10 +7026,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_PSYCHIC,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE,
         .trainerPic = TRAINER_PIC_PSYCHIC_M,
-        .trainerName = LANGUAGE_STRING(
-            "NICHOLAS",
-            "NICHOLAS",
-            "NICHOLAS"),
+        .trainerName = LANGUAGE_STRING("NICHOLAS", "NICHOLAS", "NICHOLAS", "NICONO"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -8793,10 +7038,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_TEAM_MAGMA,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_MAGMA,
         .trainerPic = TRAINER_PIC_MAGMA_GRUNT_F,
-        .trainerName = LANGUAGE_STRING(
-            "GRUNT",
-            "SBIRE",
-            "RECLUTA"),
+        .trainerName = LANGUAGE_STRING("GRUNT", "SBIRE", "RECLUTA", "SOLDADO"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -8808,10 +7050,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_TEAM_MAGMA,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MAGMA,
         .trainerPic = TRAINER_PIC_MAGMA_GRUNT_M,
-        .trainerName = LANGUAGE_STRING(
-            "GRUNT",
-            "SBIRE",
-            "RECLUTA"),
+        .trainerName = LANGUAGE_STRING("GRUNT", "SBIRE", "RECLUTA", "SOLDADO"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -8823,10 +7062,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_TEAM_MAGMA,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MAGMA,
         .trainerPic = TRAINER_PIC_MAGMA_GRUNT_M,
-        .trainerName = LANGUAGE_STRING(
-            "GRUNT",
-            "SBIRE",
-            "RECLUTA"),
+        .trainerName = LANGUAGE_STRING("GRUNT", "SBIRE", "RECLUTA", "SOLDADO"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -8838,10 +7074,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_TEAM_MAGMA,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MAGMA,
         .trainerPic = TRAINER_PIC_MAGMA_GRUNT_M,
-        .trainerName = LANGUAGE_STRING(
-            "GRUNT",
-            "SBIRE",
-            "RECLUTA"),
+        .trainerName = LANGUAGE_STRING("GRUNT", "SBIRE", "RECLUTA", "SOLDADO"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -8853,10 +7086,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_TEAM_MAGMA,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MAGMA,
         .trainerPic = TRAINER_PIC_MAGMA_GRUNT_M,
-        .trainerName = LANGUAGE_STRING(
-            "GRUNT",
-            "SBIRE",
-            "RECLUTA"),
+        .trainerName = LANGUAGE_STRING("GRUNT", "SBIRE", "RECLUTA", "SOLDADO"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -8868,10 +7098,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_PSYCHIC,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE,
         .trainerPic = TRAINER_PIC_PSYCHIC_F,
-        .trainerName = LANGUAGE_STRING(
-            "MACEY",
-            "MACEY",
-            "MACEY"),
+        .trainerName = LANGUAGE_STRING("MACEY", "MACEY", "MACEY", "MACEI"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -8883,10 +7110,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_RIVAL,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
         .trainerPic = TRAINER_PIC_BRENDAN,
-        .trainerName = LANGUAGE_STRING(
-            "BRENDAN",
-            "BRICE",
-            "BRENDON"),
+        .trainerName = LANGUAGE_STRING("BRENDAN", "BRICE", "BRENDON", "BRUNO"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -8898,10 +7122,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_RIVAL,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
         .trainerPic = TRAINER_PIC_BRENDAN,
-        .trainerName = LANGUAGE_STRING(
-            "BRENDAN",
-            "BRICE",
-            "BRENDON"),
+        .trainerName = LANGUAGE_STRING("BRENDAN", "BRICE", "BRENDON", "BRUNO"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -8913,10 +7134,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_EXPERT,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE,
         .trainerPic = TRAINER_PIC_EXPERT_M,
-        .trainerName = LANGUAGE_STRING(
-            "PAXTON",
-            "KEVIN",
-            "PAXTON"),
+        .trainerName = LANGUAGE_STRING("PAXTON", "KEVIN", "PAXTON", "GUILLE"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
@@ -8928,10 +7146,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_TRIATHLETE,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER,
         .trainerPic = TRAINER_PIC_SWIMMING_TRIATHLETE_F,
-        .trainerName = LANGUAGE_STRING(
-            "ISABELLA",
-            "ISABELLA",
-            "CAROLA"),
+        .trainerName = LANGUAGE_STRING("ISABELLA", "ISABELLA", "CAROLA", "BELIA"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -8943,10 +7158,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_TEAM_AQUA,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_AQUA,
         .trainerPic = TRAINER_PIC_AQUA_GRUNT_F,
-        .trainerName = LANGUAGE_STRING(
-            "GRUNT",
-            "SBIRE",
-            "RECLUTA"),
+        .trainerName = LANGUAGE_STRING("GRUNT", "SBIRE", "RECLUTA", "SOLDADO"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -8958,10 +7170,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_MAGMA_ADMIN,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MAGMA,
         .trainerPic = TRAINER_PIC_MAGMA_ADMIN,
-        .trainerName = LANGUAGE_STRING(
-            "TABITHA",
-            "KELVIN",
-            "OTTAVIO"),
+        .trainerName = LANGUAGE_STRING("TABITHA", "KELVIN", "OTTAVIO", "TATIANO"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
@@ -8973,10 +7182,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_COOLTRAINER,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL,
         .trainerPic = TRAINER_PIC_COOLTRAINER_M,
-        .trainerName = LANGUAGE_STRING(
-            "JONATHAN",
-            "JONATHAN",
-            "JONATHAN"),
+        .trainerName = LANGUAGE_STRING("JONATHAN", "JONATHAN", "JONATHAN", "GUADO"),
         .items = {ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_SETUP_FIRST_TURN,
@@ -8988,10 +7194,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_RIVAL,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
         .trainerPic = TRAINER_PIC_BRENDAN,
-        .trainerName = LANGUAGE_STRING(
-            "BRENDAN",
-            "BRICE",
-            "BRENDON"),
+        .trainerName = LANGUAGE_STRING("BRENDAN", "BRICE", "BRENDON", "BRUNO"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
@@ -9003,10 +7206,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_RIVAL,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE,
         .trainerPic = TRAINER_PIC_MAY,
-        .trainerName = LANGUAGE_STRING(
-            "MAY",
-            "FLORA",
-            "VERA"),
+        .trainerName = LANGUAGE_STRING("MAY", "FLORA", "VERA", "AURA"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_SETUP_FIRST_TURN,
@@ -9018,10 +7218,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_MAGMA_LEADER,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MAGMA,
         .trainerPic = TRAINER_PIC_MAGMA_LEADER_MAXIE,
-        .trainerName = LANGUAGE_STRING(
-            "MAXIE",
-            "MAX",
-            "MAX"),
+        .trainerName = LANGUAGE_STRING("MAXIE", "MAX", "MAX", "MAGNO"),
         .items = {ITEM_SUPER_POTION, ITEM_SUPER_POTION, ITEM_NONE, ITEM_NONE},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
@@ -9033,10 +7230,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_MAGMA_LEADER,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MAGMA,
         .trainerPic = TRAINER_PIC_MAGMA_LEADER_MAXIE,
-        .trainerName = LANGUAGE_STRING(
-            "MAXIE",
-            "MAX",
-            "MAX"),
+        .trainerName = LANGUAGE_STRING("MAXIE", "MAX", "MAX", "MAGNO"),
         .items = {ITEM_SUPER_POTION, ITEM_SUPER_POTION, ITEM_NONE, ITEM_NONE},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
@@ -9048,10 +7242,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_LASS,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE,
         .trainerPic = TRAINER_PIC_LASS,
-        .trainerName = LANGUAGE_STRING(
-            "TIANA",
-            "MARIANNE",
-            "SIMONA"),
+        .trainerName = LANGUAGE_STRING("TIANA", "MARIANNE", "SIMONA", "TINA"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -9063,10 +7254,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_LASS,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE,
         .trainerPic = TRAINER_PIC_LASS,
-        .trainerName = LANGUAGE_STRING(
-            "HALEY",
-            "AUDE",
-            "ELISABETTA"),
+        .trainerName = LANGUAGE_STRING("HALEY", "AUDE", "ELISABETTA", "HERMINIA"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -9078,10 +7266,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_LASS,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE,
         .trainerPic = TRAINER_PIC_LASS,
-        .trainerName = LANGUAGE_STRING(
-            "JANICE",
-            "PERRINE",
-            "ANTONELLA"),
+        .trainerName = LANGUAGE_STRING("JANICE", "PERRINE", "ANTONELLA", "LUCRECIA"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -9093,10 +7278,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_WINSTRATE,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE,
         .trainerPic = TRAINER_PIC_LASS,
-        .trainerName = LANGUAGE_STRING(
-            "VIVI",
-            "VIVI",
-            "VIVIANA"),
+        .trainerName = LANGUAGE_STRING("VIVI", "VIVI", "VIVIANA", "VIVI"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
@@ -9108,10 +7290,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_LASS,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE,
         .trainerPic = TRAINER_PIC_LASS,
-        .trainerName = LANGUAGE_STRING(
-            "HALEY",
-            "AUDE",
-            "ELISABETTA"),
+        .trainerName = LANGUAGE_STRING("HALEY", "AUDE", "ELISABETTA", "HERMINIA"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -9123,10 +7302,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_LASS,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE,
         .trainerPic = TRAINER_PIC_LASS,
-        .trainerName = LANGUAGE_STRING(
-            "HALEY",
-            "AUDE",
-            "ELISABETTA"),
+        .trainerName = LANGUAGE_STRING("HALEY", "AUDE", "ELISABETTA", "HERMINIA"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -9138,10 +7314,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_LASS,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE,
         .trainerPic = TRAINER_PIC_LASS,
-        .trainerName = LANGUAGE_STRING(
-            "HALEY",
-            "AUDE",
-            "ELISABETTA"),
+        .trainerName = LANGUAGE_STRING("HALEY", "AUDE", "ELISABETTA", "HERMINIA"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -9153,10 +7326,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_LASS,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE,
         .trainerPic = TRAINER_PIC_LASS,
-        .trainerName = LANGUAGE_STRING(
-            "HALEY",
-            "AUDE",
-            "ELISABETTA"),
+        .trainerName = LANGUAGE_STRING("HALEY", "AUDE", "ELISABETTA", "HERMINIA"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -9168,10 +7338,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_LASS,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE,
         .trainerPic = TRAINER_PIC_LASS,
-        .trainerName = LANGUAGE_STRING(
-            "SALLY",
-            "SALLY",
-            "SERENA"),
+        .trainerName = LANGUAGE_STRING("SALLY", "SALLY", "SERENA", "SUSANA"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -9183,10 +7350,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_LASS,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE,
         .trainerPic = TRAINER_PIC_LASS,
-        .trainerName = LANGUAGE_STRING(
-            "ROBIN",
-            "SUZETTE",
-            "DOMINIQUE"),
+        .trainerName = LANGUAGE_STRING("ROBIN", "SUZETTE", "DOMINIQUE", "ROBERTA"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -9198,10 +7362,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_LASS,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE,
         .trainerPic = TRAINER_PIC_LASS,
-        .trainerName = LANGUAGE_STRING(
-            "ANDREA",
-            "VALENTINE",
-            "ANTONIETTA"),
+        .trainerName = LANGUAGE_STRING("ANDREA", "VALENTINE", "ANTONIETTA", "ANDREA"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -9213,10 +7374,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_LASS,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE,
         .trainerPic = TRAINER_PIC_LASS,
-        .trainerName = LANGUAGE_STRING(
-            "CRISSY",
-            "RACHEL",
-            "SUSANNA"),
+        .trainerName = LANGUAGE_STRING("CRISSY", "RACHEL", "SUSANNA", "CRISTI"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -9228,10 +7386,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_BUG_CATCHER,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
         .trainerPic = TRAINER_PIC_BUG_CATCHER,
-        .trainerName = LANGUAGE_STRING(
-            "RICK",
-            "OMAR",
-            "RICK"),
+        .trainerName = LANGUAGE_STRING("RICK", "OMAR", "RICK", "JANO"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -9243,10 +7398,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_BUG_CATCHER,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
         .trainerPic = TRAINER_PIC_BUG_CATCHER,
-        .trainerName = LANGUAGE_STRING(
-            "LYLE",
-            "FELIX",
-            "RUGGERO"),
+        .trainerName = LANGUAGE_STRING("LYLE", "FELIX", "RUGGERO", "LALO"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -9258,10 +7410,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_BUG_CATCHER,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
         .trainerPic = TRAINER_PIC_BUG_CATCHER,
-        .trainerName = LANGUAGE_STRING(
-            "JOSE",
-            "JOSE",
-            "JOSE"),
+        .trainerName = LANGUAGE_STRING("JOSE", "JOSE", "JOSE", "JOSE"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -9273,10 +7422,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_BUG_CATCHER,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
         .trainerPic = TRAINER_PIC_BUG_CATCHER,
-        .trainerName = LANGUAGE_STRING(
-            "DOUG",
-            "ALFRED",
-            "SILVIO"),
+        .trainerName = LANGUAGE_STRING("DOUG", "ALFRED", "SILVIO", "DOMIN"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -9288,10 +7434,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_BUG_CATCHER,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
         .trainerPic = TRAINER_PIC_BUG_CATCHER,
-        .trainerName = LANGUAGE_STRING(
-            "GREG",
-            "GREGORY",
-            "GREG"),
+        .trainerName = LANGUAGE_STRING("GREG", "GREGORY", "GREG", "GREGORIO"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -9303,10 +7446,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_BUG_CATCHER,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
         .trainerPic = TRAINER_PIC_BUG_CATCHER,
-        .trainerName = LANGUAGE_STRING(
-            "KENT",
-            "KEN",
-            "MIRO"),
+        .trainerName = LANGUAGE_STRING("KENT", "KEN", "MIRO", "CASIMIRO"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -9318,10 +7458,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_BUG_CATCHER,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
         .trainerPic = TRAINER_PIC_BUG_CATCHER,
-        .trainerName = LANGUAGE_STRING(
-            "JAMES",
-            "JAMES",
-            "JAMES"),
+        .trainerName = LANGUAGE_STRING("JAMES", "JAMES", "JAMES", "JAIME"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -9333,10 +7470,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_BUG_CATCHER,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
         .trainerPic = TRAINER_PIC_BUG_CATCHER,
-        .trainerName = LANGUAGE_STRING(
-            "JAMES",
-            "JAMES",
-            "JAMES"),
+        .trainerName = LANGUAGE_STRING("JAMES", "JAMES", "JAMES", "JAIME"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -9348,10 +7482,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_BUG_CATCHER,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
         .trainerPic = TRAINER_PIC_BUG_CATCHER,
-        .trainerName = LANGUAGE_STRING(
-            "JAMES",
-            "JAMES",
-            "JAMES"),
+        .trainerName = LANGUAGE_STRING("JAMES", "JAMES", "JAMES", "JAIME"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -9363,10 +7494,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_BUG_CATCHER,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
         .trainerPic = TRAINER_PIC_BUG_CATCHER,
-        .trainerName = LANGUAGE_STRING(
-            "JAMES",
-            "JAMES",
-            "JAMES"),
+        .trainerName = LANGUAGE_STRING("JAMES", "JAMES", "JAMES", "JAIME"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -9378,10 +7506,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_BUG_CATCHER,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
         .trainerPic = TRAINER_PIC_BUG_CATCHER,
-        .trainerName = LANGUAGE_STRING(
-            "JAMES",
-            "JAMES",
-            "JAMES"),
+        .trainerName = LANGUAGE_STRING("JAMES", "JAMES", "JAMES", "JAIME"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -9393,10 +7518,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_HIKER,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER,
         .trainerPic = TRAINER_PIC_HIKER,
-        .trainerName = LANGUAGE_STRING(
-            "BRICE",
-            "BASILE",
-            "MINO"),
+        .trainerName = LANGUAGE_STRING("BRICE", "BASILE", "MINO", "BALTASAR"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -9408,10 +7530,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_HIKER,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER,
         .trainerPic = TRAINER_PIC_HIKER,
-        .trainerName = LANGUAGE_STRING(
-            "TRENT",
-            "GUILLAUME",
-            "GIUSEPPE"),
+        .trainerName = LANGUAGE_STRING("TRENT", "GUILLAUME", "GIUSEPPE", "TARSI"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -9423,10 +7542,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_HIKER,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER,
         .trainerPic = TRAINER_PIC_HIKER,
-        .trainerName = LANGUAGE_STRING(
-            "LENNY",
-            "JEAN-LUC",
-            "GIORDANO"),
+        .trainerName = LANGUAGE_STRING("LENNY", "JEAN-LUC", "GIORDANO", "LUCIANO"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -9438,10 +7554,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_HIKER,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER,
         .trainerPic = TRAINER_PIC_HIKER,
-        .trainerName = LANGUAGE_STRING(
-            "LUCAS",
-            "LUCAS",
-            "LUCAS"),
+        .trainerName = LANGUAGE_STRING("LUCAS", "LUCAS", "LUCAS", "LUCAS"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -9453,10 +7566,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_HIKER,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER,
         .trainerPic = TRAINER_PIC_HIKER,
-        .trainerName = LANGUAGE_STRING(
-            "ALAN",
-            "AL",
-            "ALAIN"),
+        .trainerName = LANGUAGE_STRING("ALAN", "AL", "ALAIN", "ALFONSO"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -9468,10 +7578,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_HIKER,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER,
         .trainerPic = TRAINER_PIC_HIKER,
-        .trainerName = LANGUAGE_STRING(
-            "CLARK",
-            "LUIGI",
-            "NATHAN"),
+        .trainerName = LANGUAGE_STRING("CLARK", "LUIGI", "NATHAN", "CARLO"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -9483,10 +7590,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_HIKER,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER,
         .trainerPic = TRAINER_PIC_HIKER,
-        .trainerName = LANGUAGE_STRING(
-            "ERIC",
-            "ERIC",
-            "ERIC"),
+        .trainerName = LANGUAGE_STRING("ERIC", "ERIC", "ERIC", "EVARISTO"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -9498,10 +7602,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_HIKER,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER,
         .trainerPic = TRAINER_PIC_HIKER,
-        .trainerName = LANGUAGE_STRING(
-            "LUCAS",
-            "LUCAS",
-            "LUCAS"),
+        .trainerName = LANGUAGE_STRING("LUCAS", "LUCAS", "LUCAS", "LUCAS"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -9513,10 +7614,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_HIKER,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER,
         .trainerPic = TRAINER_PIC_HIKER,
-        .trainerName = LANGUAGE_STRING(
-            "MIKE",
-            "MAXIME",
-            "MIKE"),
+        .trainerName = LANGUAGE_STRING("MIKE", "MAXIME", "MIKE", "MIGUE"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -9528,10 +7626,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_HIKER,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER,
         .trainerPic = TRAINER_PIC_HIKER,
-        .trainerName = LANGUAGE_STRING(
-            "MIKE",
-            "MAXIME",
-            "MIKE"),
+        .trainerName = LANGUAGE_STRING("MIKE", "MAXIME", "MIKE", "MIGUE"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -9543,10 +7638,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_HIKER,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER,
         .trainerPic = TRAINER_PIC_HIKER,
-        .trainerName = LANGUAGE_STRING(
-            "TRENT",
-            "GUILLAUME",
-            "GIUSEPPE"),
+        .trainerName = LANGUAGE_STRING("TRENT", "GUILLAUME", "GIUSEPPE", "TARSI"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -9558,10 +7650,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_HIKER,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER,
         .trainerPic = TRAINER_PIC_HIKER,
-        .trainerName = LANGUAGE_STRING(
-            "TRENT",
-            "GUILLAUME",
-            "GIUSEPPE"),
+        .trainerName = LANGUAGE_STRING("TRENT", "GUILLAUME", "GIUSEPPE", "TARSI"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -9573,10 +7662,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_HIKER,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER,
         .trainerPic = TRAINER_PIC_HIKER,
-        .trainerName = LANGUAGE_STRING(
-            "TRENT",
-            "GUILLAUME",
-            "GIUSEPPE"),
+        .trainerName = LANGUAGE_STRING("TRENT", "GUILLAUME", "GIUSEPPE", "TARSI"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -9588,10 +7674,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_HIKER,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER,
         .trainerPic = TRAINER_PIC_HIKER,
-        .trainerName = LANGUAGE_STRING(
-            "TRENT",
-            "GUILLAUME",
-            "GIUSEPPE"),
+        .trainerName = LANGUAGE_STRING("TRENT", "GUILLAUME", "GIUSEPPE", "TARSI"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -9603,10 +7686,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_YOUNG_COUPLE,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_GIRL,
         .trainerPic = TRAINER_PIC_YOUNG_COUPLE,
-        .trainerName = LANGUAGE_STRING(
-            "DEZ & LUKE",
-            "ANNIE&KARL",
-            "DESI & KEN"),
+        .trainerName = LANGUAGE_STRING("DEZ & LUKE", "ANNIE&KARL", "DESI & KEN", "DULCE-LEO"),
         .items = {},
         .doubleBattle = TRUE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -9618,10 +7698,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_YOUNG_COUPLE,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_GIRL,
         .trainerPic = TRAINER_PIC_YOUNG_COUPLE,
-        .trainerName = LANGUAGE_STRING(
-            "LEA & JED",
-            "LISE & ALI",
-            "LEA & JED"),
+        .trainerName = LANGUAGE_STRING("LEA & JED", "LISE & ALI", "LEA & JED", "LIZ-JOEL"),
         .items = {},
         .doubleBattle = TRUE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -9633,10 +7710,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_YOUNG_COUPLE,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_GIRL,
         .trainerPic = TRAINER_PIC_YOUNG_COUPLE,
-        .trainerName = LANGUAGE_STRING(
-            "KIRA & DAN",
-            "RITA & JOE",
-            "CIRA & DAN"),
+        .trainerName = LANGUAGE_STRING("KIRA & DAN", "RITA & JOE", "CIRA & DAN", "LUCI-FITO"),
         .items = {},
         .doubleBattle = TRUE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -9648,10 +7722,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_YOUNG_COUPLE,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_GIRL,
         .trainerPic = TRAINER_PIC_YOUNG_COUPLE,
-        .trainerName = LANGUAGE_STRING(
-            "KIRA & DAN",
-            "RITA & JOE",
-            "CIRA & DAN"),
+        .trainerName = LANGUAGE_STRING("KIRA & DAN", "RITA & JOE", "CIRA & DAN", "LUCI-FITO"),
         .items = {},
         .doubleBattle = TRUE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -9663,10 +7734,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_YOUNG_COUPLE,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_GIRL,
         .trainerPic = TRAINER_PIC_YOUNG_COUPLE,
-        .trainerName = LANGUAGE_STRING(
-            "KIRA & DAN",
-            "RITA & JOE",
-            "CIRA & DAN"),
+        .trainerName = LANGUAGE_STRING("KIRA & DAN", "RITA & JOE", "CIRA & DAN", "LUCI-FITO"),
         .items = {},
         .doubleBattle = TRUE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -9678,10 +7746,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_YOUNG_COUPLE,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_GIRL,
         .trainerPic = TRAINER_PIC_YOUNG_COUPLE,
-        .trainerName = LANGUAGE_STRING(
-            "KIRA & DAN",
-            "RITA & JOE",
-            "CIRA & DAN"),
+        .trainerName = LANGUAGE_STRING("KIRA & DAN", "RITA & JOE", "CIRA & DAN", "LUCI-FITO"),
         .items = {},
         .doubleBattle = TRUE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -9693,10 +7758,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_YOUNG_COUPLE,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_GIRL,
         .trainerPic = TRAINER_PIC_YOUNG_COUPLE,
-        .trainerName = LANGUAGE_STRING(
-            "KIRA & DAN",
-            "RITA & JOE",
-            "CIRA & DAN"),
+        .trainerName = LANGUAGE_STRING("KIRA & DAN", "RITA & JOE", "CIRA & DAN", "LUCI-FITO"),
         .items = {},
         .doubleBattle = TRUE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -9708,10 +7770,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_BEAUTY,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE,
         .trainerPic = TRAINER_PIC_BEAUTY,
-        .trainerName = LANGUAGE_STRING(
-            "JOHANNA",
-            "FLAVIE",
-            "LILIANA"),
+        .trainerName = LANGUAGE_STRING("JOHANNA", "FLAVIE", "LILIANA", "JUANA"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -9723,10 +7782,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_COOLTRAINER,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL,
         .trainerPic = TRAINER_PIC_COOLTRAINER_M,
-        .trainerName = LANGUAGE_STRING(
-            "GERALD",
-            "GERALD",
-            "GERALD"),
+        .trainerName = LANGUAGE_STRING("GERALD", "GERALD", "GERALD", "GERARDO"),
         .items = {ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
@@ -9738,10 +7794,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_BATTLE_GIRL,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE,
         .trainerPic = TRAINER_PIC_BATTLE_GIRL,
-        .trainerName = LANGUAGE_STRING(
-            "VIVIAN",
-            "VIVIANNE",
-            "SELENE"),
+        .trainerName = LANGUAGE_STRING("VIVIAN", "VIVIANNE", "SELENE", "VIVIANA"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -9753,10 +7806,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_BATTLE_GIRL,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE,
         .trainerPic = TRAINER_PIC_BATTLE_GIRL,
-        .trainerName = LANGUAGE_STRING(
-            "DANIELLE",
-            "DANIELLE",
-            "SABRINA"),
+        .trainerName = LANGUAGE_STRING("DANIELLE", "DANIELLE", "SABRINA", "DANIELA"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -9768,10 +7818,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_NINJA_BOY,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS,
         .trainerPic = TRAINER_PIC_NINJA_BOY,
-        .trainerName = LANGUAGE_STRING(
-            "HIDEO",
-            "HIDEO",
-            "HIDEO"),
+        .trainerName = LANGUAGE_STRING("HIDEO", "HIDEO", "HIDEO", "HIDEO"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT,
@@ -9783,10 +7830,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_NINJA_BOY,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS,
         .trainerPic = TRAINER_PIC_NINJA_BOY,
-        .trainerName = LANGUAGE_STRING(
-            "KEIGO",
-            "KENEDA",
-            "KEIGO"),
+        .trainerName = LANGUAGE_STRING("KEIGO", "KENEDA", "KEIGO", "KEIGO"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT,
@@ -9798,10 +7842,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_NINJA_BOY,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS,
         .trainerPic = TRAINER_PIC_NINJA_BOY,
-        .trainerName = LANGUAGE_STRING(
-            "RILEY",
-            "MARCEL",
-            "GIULIANO"),
+        .trainerName = LANGUAGE_STRING("RILEY", "MARCEL", "GIULIANO", "ROCO"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT,
@@ -9813,10 +7854,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_CAMPER,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
         .trainerPic = TRAINER_PIC_CAMPER,
-        .trainerName = LANGUAGE_STRING(
-            "FLINT",
-            "FREDERIC",
-            "TIM"),
+        .trainerName = LANGUAGE_STRING("FLINT", "FREDERIC", "TIM", "FIDEL"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -9828,10 +7866,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_PICNICKER,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL,
         .trainerPic = TRAINER_PIC_PICNICKER,
-        .trainerName = LANGUAGE_STRING(
-            "ASHLEY",
-            "CONNIE",
-            "ASHLEY"),
+        .trainerName = LANGUAGE_STRING("ASHLEY", "CONNIE", "ASHLEY", "ALIS"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -9843,10 +7878,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_RIVAL,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
         .trainerPic = TRAINER_PIC_WALLY,
-        .trainerName = LANGUAGE_STRING(
-            "WALLY",
-            "TIMMY",
-            "LINO"),
+        .trainerName = LANGUAGE_STRING("WALLY", "TIMMY", "LINO", "BLASCO"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
@@ -9858,10 +7890,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_RIVAL,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
         .trainerPic = TRAINER_PIC_WALLY,
-        .trainerName = LANGUAGE_STRING(
-            "WALLY",
-            "TIMMY",
-            "LINO"),
+        .trainerName = LANGUAGE_STRING("WALLY", "TIMMY", "LINO", "BLASCO"),
         .items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
@@ -9873,10 +7902,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_RIVAL,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
         .trainerPic = TRAINER_PIC_WALLY,
-        .trainerName = LANGUAGE_STRING(
-            "WALLY",
-            "TIMMY",
-            "LINO"),
+        .trainerName = LANGUAGE_STRING("WALLY", "TIMMY", "LINO", "BLASCO"),
         .items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
@@ -9888,10 +7914,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_RIVAL,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
         .trainerPic = TRAINER_PIC_WALLY,
-        .trainerName = LANGUAGE_STRING(
-            "WALLY",
-            "TIMMY",
-            "LINO"),
+        .trainerName = LANGUAGE_STRING("WALLY", "TIMMY", "LINO", "BLASCO"),
         .items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
@@ -9903,10 +7926,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_RIVAL,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
         .trainerPic = TRAINER_PIC_WALLY,
-        .trainerName = LANGUAGE_STRING(
-            "WALLY",
-            "TIMMY",
-            "LINO"),
+        .trainerName = LANGUAGE_STRING("WALLY", "TIMMY", "LINO", "BLASCO"),
         .items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
@@ -9918,10 +7938,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_RIVAL,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
         .trainerPic = TRAINER_PIC_BRENDAN,
-        .trainerName = LANGUAGE_STRING(
-            "BRENDAN",
-            "BRICE",
-            "BRENDON"),
+        .trainerName = LANGUAGE_STRING("BRENDAN", "BRICE", "BRENDON", "BRUNO"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
@@ -9933,10 +7950,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_RIVAL,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
         .trainerPic = TRAINER_PIC_BRENDAN,
-        .trainerName = LANGUAGE_STRING(
-            "BRENDAN",
-            "BRICE",
-            "BRENDON"),
+        .trainerName = LANGUAGE_STRING("BRENDAN", "BRICE", "BRENDON", "BRUNO"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
@@ -9948,10 +7962,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_RIVAL,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
         .trainerPic = TRAINER_PIC_BRENDAN,
-        .trainerName = LANGUAGE_STRING(
-            "BRENDAN",
-            "BRICE",
-            "BRENDON"),
+        .trainerName = LANGUAGE_STRING("BRENDAN", "BRICE", "BRENDON", "BRUNO"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
@@ -9963,10 +7974,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_RIVAL,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE,
         .trainerPic = TRAINER_PIC_MAY,
-        .trainerName = LANGUAGE_STRING(
-            "MAY",
-            "FLORA",
-            "VERA"),
+        .trainerName = LANGUAGE_STRING("MAY", "FLORA", "VERA", "AURA"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
@@ -9978,10 +7986,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_RIVAL,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE,
         .trainerPic = TRAINER_PIC_MAY,
-        .trainerName = LANGUAGE_STRING(
-            "MAY",
-            "FLORA",
-            "VERA"),
+        .trainerName = LANGUAGE_STRING("MAY", "FLORA", "VERA", "AURA"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
@@ -9993,10 +7998,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_RIVAL,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE,
         .trainerPic = TRAINER_PIC_MAY,
-        .trainerName = LANGUAGE_STRING(
-            "MAY",
-            "FLORA",
-            "VERA"),
+        .trainerName = LANGUAGE_STRING("MAY", "FLORA", "VERA", "AURA"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
@@ -10008,10 +8010,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_FISHERMAN,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER,
         .trainerPic = TRAINER_PIC_FISHERMAN,
-        .trainerName = LANGUAGE_STRING(
-            "JONAH",
-            "JONAS",
-            "JONAH"),
+        .trainerName = LANGUAGE_STRING("JONAH", "JONAS", "JONAH", "JONI"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -10023,10 +8022,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_FISHERMAN,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER,
         .trainerPic = TRAINER_PIC_FISHERMAN,
-        .trainerName = LANGUAGE_STRING(
-            "HENRY",
-            "HENRY",
-            "HENRY"),
+        .trainerName = LANGUAGE_STRING("HENRY", "HENRY", "HENRY", "ENRIQUE"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -10038,10 +8034,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_FISHERMAN,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER,
         .trainerPic = TRAINER_PIC_FISHERMAN,
-        .trainerName = LANGUAGE_STRING(
-            "ROGER",
-            "ROGER",
-            "ROGER"),
+        .trainerName = LANGUAGE_STRING("ROGER", "ROGER", "ROGER", "ROGE"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -10053,10 +8046,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_COOLTRAINER,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL,
         .trainerPic = TRAINER_PIC_COOLTRAINER_F,
-        .trainerName = LANGUAGE_STRING(
-            "ALEXA",
-            "ALEXIA",
-            "ALEXA"),
+        .trainerName = LANGUAGE_STRING("ALEXA", "ALEXIA", "ALEXA", "ALEJANDRA"),
         .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
@@ -10068,10 +8058,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_COOLTRAINER,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL,
         .trainerPic = TRAINER_PIC_COOLTRAINER_M,
-        .trainerName = LANGUAGE_STRING(
-            "RUBEN",
-            "STEVEN",
-            "RUBEN"),
+        .trainerName = LANGUAGE_STRING("RUBEN", "STEVEN", "RUBEN", "RUBE"),
         .items = {ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
@@ -10083,10 +8070,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_BLACK_BELT,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE,
         .trainerPic = TRAINER_PIC_BLACK_BELT,
-        .trainerName = LANGUAGE_STRING(
-            "KOJI",
-            "KOJI",
-            "KOJI"),
+        .trainerName = LANGUAGE_STRING("KOJI", "KOJI", "KOJI", "KOJI"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -10098,10 +8082,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_FISHERMAN,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER,
         .trainerPic = TRAINER_PIC_FISHERMAN,
-        .trainerName = LANGUAGE_STRING(
-            "WAYNE",
-            "JEREMY",
-            "MANOLO"),
+        .trainerName = LANGUAGE_STRING("WAYNE", "JEREMY", "MANOLO", "UBALDO"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -10113,10 +8094,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_BIRD_KEEPER,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL,
         .trainerPic = TRAINER_PIC_BIRD_KEEPER,
-        .trainerName = LANGUAGE_STRING(
-            "AIDAN",
-            "LUC",
-            "SIMONE"),
+        .trainerName = LANGUAGE_STRING("AIDAN", "LUC", "SIMONE", "ADRIANO"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -10128,10 +8106,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_SWIMMER_M,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SWIMMER,
         .trainerPic = TRAINER_PIC_SWIMMER_M,
-        .trainerName = LANGUAGE_STRING(
-            "REED",
-            "ALBIN",
-            "ORLANDO"),
+        .trainerName = LANGUAGE_STRING("REED", "ALBIN", "ORLANDO", "REMO"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -10143,10 +8118,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_SWIMMER_F,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER,
         .trainerPic = TRAINER_PIC_SWIMMER_F,
-        .trainerName = LANGUAGE_STRING(
-            "TISHA",
-            "KATIA",
-            "CAROLINA"),
+        .trainerName = LANGUAGE_STRING("TISHA", "KATIA", "CAROLINA", "TALINA"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -10158,10 +8130,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_TWINS,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_TWINS,
         .trainerPic = TRAINER_PIC_TWINS,
-        .trainerName = LANGUAGE_STRING(
-            "TORI & TIA",
-            "LILA&NELLY",
-            "TINA & TIA"),
+        .trainerName = LANGUAGE_STRING("TORI & TIA", "LILA&NELLY", "TINA & TIA", "TEA-BEA"),
         .items = {},
         .doubleBattle = TRUE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -10173,10 +8142,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_SR_AND_JR,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_TWINS,
         .trainerPic = TRAINER_PIC_SR_AND_JR,
-        .trainerName = LANGUAGE_STRING(
-            "KIM & IRIS",
-            "KIM & IRIS",
-            "KIM & IRIS"),
+        .trainerName = LANGUAGE_STRING("KIM & IRIS", "KIM & IRIS", "KIM & IRIS", "BETH-IRIS"),
         .items = {},
         .doubleBattle = TRUE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -10188,10 +8154,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_SR_AND_JR,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_TWINS,
         .trainerPic = TRAINER_PIC_SR_AND_JR,
-        .trainerName = LANGUAGE_STRING(
-            "TYRA & IVY",
-            "TYRA & IVY",
-            "AVA & ADA"),
+        .trainerName = LANGUAGE_STRING("TYRA & IVY", "TYRA & IVY", "AVA & ADA", "TULA-ILDA"),
         .items = {},
         .doubleBattle = TRUE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -10203,10 +8166,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_YOUNG_COUPLE,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_GIRL,
         .trainerPic = TRAINER_PIC_YOUNG_COUPLE,
-        .trainerName = LANGUAGE_STRING(
-            "MEL & PAUL",
-            "MEL & PAUL",
-            "EVA & PAUL"),
+        .trainerName = LANGUAGE_STRING("MEL & PAUL", "MEL & PAUL", "EVA & PAUL", "MELI-LINO"),
         .items = {},
         .doubleBattle = TRUE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -10218,10 +8178,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_OLD_COUPLE,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE,
         .trainerPic = TRAINER_PIC_OLD_COUPLE,
-        .trainerName = LANGUAGE_STRING(
-            "JOHN & JAY",
-            "JOHN & JAY",
-            "IVO & IVA"),
+        .trainerName = LANGUAGE_STRING("JOHN & JAY", "JOHN & JAY", "IVO & IVA", "JULI-NELA"),
         .items = {},
         .doubleBattle = TRUE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
@@ -10233,10 +8190,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_OLD_COUPLE,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE,
         .trainerPic = TRAINER_PIC_OLD_COUPLE,
-        .trainerName = LANGUAGE_STRING(
-            "JOHN & JAY",
-            "JOHN & JAY",
-            "IVO & IVA"),
+        .trainerName = LANGUAGE_STRING("JOHN & JAY", "JOHN & JAY", "IVO & IVA", "JULI-NELA"),
         .items = {},
         .doubleBattle = TRUE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
@@ -10248,10 +8202,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_OLD_COUPLE,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE,
         .trainerPic = TRAINER_PIC_OLD_COUPLE,
-        .trainerName = LANGUAGE_STRING(
-            "JOHN & JAY",
-            "JOHN & JAY",
-            "IVO & IVA"),
+        .trainerName = LANGUAGE_STRING("JOHN & JAY", "JOHN & JAY", "IVO & IVA", "JULI-NELA"),
         .items = {},
         .doubleBattle = TRUE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
@@ -10263,10 +8214,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_OLD_COUPLE,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE,
         .trainerPic = TRAINER_PIC_OLD_COUPLE,
-        .trainerName = LANGUAGE_STRING(
-            "JOHN & JAY",
-            "JOHN & JAY",
-            "IVO & IVA"),
+        .trainerName = LANGUAGE_STRING("JOHN & JAY", "JOHN & JAY", "IVO & IVA", "JULI-NELA"),
         .items = {},
         .doubleBattle = TRUE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_SETUP_FIRST_TURN,
@@ -10278,10 +8226,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_OLD_COUPLE,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE,
         .trainerPic = TRAINER_PIC_OLD_COUPLE,
-        .trainerName = LANGUAGE_STRING(
-            "JOHN & JAY",
-            "JOHN & JAY",
-            "IVO & IVA"),
+        .trainerName = LANGUAGE_STRING("JOHN & JAY", "JOHN & JAY", "IVO & IVA", "JULI-NELA"),
         .items = {},
         .doubleBattle = TRUE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
@@ -10293,10 +8238,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_SIS_AND_BRO,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SWIMMER,
         .trainerPic = TRAINER_PIC_SIS_AND_BRO,
-        .trainerName = LANGUAGE_STRING(
-            "RELI & IAN",
-            "IAN & LANA",
-            "MELY & IAN"),
+        .trainerName = LANGUAGE_STRING("RELI & IAN", "IAN & LANA", "MELY & IAN", "IGOR-RUTH"),
         .items = {},
         .doubleBattle = TRUE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -10308,10 +8250,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_SIS_AND_BRO,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SWIMMER,
         .trainerPic = TRAINER_PIC_SIS_AND_BRO,
-        .trainerName = LANGUAGE_STRING(
-            "LILA & ROY",
-            "RITA & SAM",
-            "LILA & ROY"),
+        .trainerName = LANGUAGE_STRING("LILA & ROY", "RITA & SAM", "LILA & ROY", "SARO-RITA"),
         .items = {},
         .doubleBattle = TRUE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -10323,10 +8262,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_SIS_AND_BRO,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SWIMMER,
         .trainerPic = TRAINER_PIC_SIS_AND_BRO,
-        .trainerName = LANGUAGE_STRING(
-            "LILA & ROY",
-            "RITA & SAM",
-            "LILA & ROY"),
+        .trainerName = LANGUAGE_STRING("LILA & ROY", "RITA & SAM", "LILA & ROY", "SARO-RITA"),
         .items = {},
         .doubleBattle = TRUE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -10338,10 +8274,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_SIS_AND_BRO,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SWIMMER,
         .trainerPic = TRAINER_PIC_SIS_AND_BRO,
-        .trainerName = LANGUAGE_STRING(
-            "LILA & ROY",
-            "RITA & SAM",
-            "LILA & ROY"),
+        .trainerName = LANGUAGE_STRING("LILA & ROY", "RITA & SAM", "LILA & ROY", "SARO-RITA"),
         .items = {},
         .doubleBattle = TRUE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -10353,10 +8286,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_SIS_AND_BRO,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SWIMMER,
         .trainerPic = TRAINER_PIC_SIS_AND_BRO,
-        .trainerName = LANGUAGE_STRING(
-            "LILA & ROY",
-            "RITA & SAM",
-            "LILA & ROY"),
+        .trainerName = LANGUAGE_STRING("LILA & ROY", "RITA & SAM", "LILA & ROY", "SARO-RITA"),
         .items = {},
         .doubleBattle = TRUE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -10368,10 +8298,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_SIS_AND_BRO,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SWIMMER,
         .trainerPic = TRAINER_PIC_SIS_AND_BRO,
-        .trainerName = LANGUAGE_STRING(
-            "LILA & ROY",
-            "RITA & SAM",
-            "LILA & ROY"),
+        .trainerName = LANGUAGE_STRING("LILA & ROY", "RITA & SAM", "LILA & ROY", "SARO-RITA"),
         .items = {},
         .doubleBattle = TRUE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -10383,10 +8310,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_SIS_AND_BRO,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SWIMMER,
         .trainerPic = TRAINER_PIC_SIS_AND_BRO,
-        .trainerName = LANGUAGE_STRING(
-            "LISA & RAY",
-            "RAY & LISA",
-            "LISA & RAY"),
+        .trainerName = LANGUAGE_STRING("LISA & RAY", "RAY & LISA", "LISA & RAY", "ROY-LISA"),
         .items = {},
         .doubleBattle = TRUE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -10398,10 +8322,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_FISHERMAN,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER,
         .trainerPic = TRAINER_PIC_FISHERMAN,
-        .trainerName = LANGUAGE_STRING(
-            "CHRIS",
-            "CHRISTOPHE",
-            "IGOR"),
+        .trainerName = LANGUAGE_STRING("CHRIS", "CHRISTOPHE", "IGOR", "CRIS"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -10413,10 +8334,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_RICH_BOY,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_RICH,
         .trainerPic = TRAINER_PIC_RICH_BOY,
-        .trainerName = LANGUAGE_STRING(
-            "DAWSON",
-            "ADRIEN",
-            "DAWSON"),
+        .trainerName = LANGUAGE_STRING("DAWSON", "ADRIEN", "DAWSON", "ISRAEL"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -10428,10 +8346,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_LADY,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE,
         .trainerPic = TRAINER_PIC_LADY,
-        .trainerName = LANGUAGE_STRING(
-            "SARAH",
-            "PAOLA",
-            "SARAH"),
+        .trainerName = LANGUAGE_STRING("SARAH", "PAOLA", "SARAH", "SARITA"),
         .items = {ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -10443,10 +8358,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_FISHERMAN,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER,
         .trainerPic = TRAINER_PIC_FISHERMAN,
-        .trainerName = LANGUAGE_STRING(
-            "DARIAN",
-            "REMY",
-            "DARIAN"),
+        .trainerName = LANGUAGE_STRING("DARIAN", "REMY", "DARIAN", "DARIAN"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -10458,10 +8370,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_TUBER_F,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL,
         .trainerPic = TRAINER_PIC_TUBER_F,
-        .trainerName = LANGUAGE_STRING(
-            "HAILEY",
-            "VERO",
-            "HAILEY"),
+        .trainerName = LANGUAGE_STRING("HAILEY", "VERO", "HAILEY", "MARITA"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -10473,10 +8382,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_TUBER_M,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_GIRL,
         .trainerPic = TRAINER_PIC_TUBER_M,
-        .trainerName = LANGUAGE_STRING(
-            "CHANDLER",
-            "JEANNOT",
-            "AURELIANO"),
+        .trainerName = LANGUAGE_STRING("CHANDLER", "JEANNOT", "AURELIANO", "NARIM"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -10488,10 +8394,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_POKEFAN,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_TWINS,
         .trainerPic = TRAINER_PIC_POKEFAN_M,
-        .trainerName = LANGUAGE_STRING(
-            "KALEB",
-            "KALEB",
-            "KALEB"),
+        .trainerName = LANGUAGE_STRING("KALEB", "KALEB", "KALEB", "FANIO"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -10503,10 +8406,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_GUITARIST,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE,
         .trainerPic = TRAINER_PIC_GUITARIST,
-        .trainerName = LANGUAGE_STRING(
-            "JOSEPH",
-            "JOSEPH",
-            "JOSEPH"),
+        .trainerName = LANGUAGE_STRING("JOSEPH", "JOSEPH", "JOSEPH", "FREDI"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -10518,10 +8418,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_TRIATHLETE,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE,
         .trainerPic = TRAINER_PIC_CYCLING_TRIATHLETE_F,
-        .trainerName = LANGUAGE_STRING(
-            "ALYSSA",
-            "ALYSSA",
-            "ALYSSA"),
+        .trainerName = LANGUAGE_STRING("ALYSSA", "ALYSSA", "ALYSSA", "ALISA"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -10533,10 +8430,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_GUITARIST,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE,
         .trainerPic = TRAINER_PIC_GUITARIST,
-        .trainerName = LANGUAGE_STRING(
-            "MARCOS",
-            "JEREMIA",
-            "MARCOS"),
+        .trainerName = LANGUAGE_STRING("MARCOS", "JEREMIA", "MARCOS", "MARCHO"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -10548,10 +8442,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_BLACK_BELT,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE,
         .trainerPic = TRAINER_PIC_BLACK_BELT,
-        .trainerName = LANGUAGE_STRING(
-            "RHETT",
-            "YORICK",
-            "LIVIO"),
+        .trainerName = LANGUAGE_STRING("RHETT", "YORICK", "LIVIO", "RET"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -10563,10 +8454,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_CAMPER,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
         .trainerPic = TRAINER_PIC_CAMPER,
-        .trainerName = LANGUAGE_STRING(
-            "TYRON",
-            "JIM",
-            "TYRON"),
+        .trainerName = LANGUAGE_STRING("TYRON", "JIM", "TYRON", "TIRTO"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -10578,10 +8466,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_AROMA_LADY,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE,
         .trainerPic = TRAINER_PIC_AROMA_LADY,
-        .trainerName = LANGUAGE_STRING(
-            "CELINA",
-            "CELINA",
-            "CELINA"),
+        .trainerName = LANGUAGE_STRING("CELINA", "CELINA", "CELINA", "ANABEL"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -10593,10 +8478,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_PICNICKER,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL,
         .trainerPic = TRAINER_PIC_PICNICKER,
-        .trainerName = LANGUAGE_STRING(
-            "BIANCA",
-            "BIANCA",
-            "GUADA"),
+        .trainerName = LANGUAGE_STRING("BIANCA", "BIANCA", "GUADA", "BIANCA"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -10608,10 +8490,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_KINDLER,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER,
         .trainerPic = TRAINER_PIC_KINDLER,
-        .trainerName = LANGUAGE_STRING(
-            "HAYDEN",
-            "JERRY",
-            "GREGORIO"),
+        .trainerName = LANGUAGE_STRING("HAYDEN", "JERRY", "GREGORIO", "AIRO"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -10623,10 +8502,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_PICNICKER,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL,
         .trainerPic = TRAINER_PIC_PICNICKER,
-        .trainerName = LANGUAGE_STRING(
-            "SOPHIE",
-            "SOPHIA",
-            "SOPHIE"),
+        .trainerName = LANGUAGE_STRING("SOPHIE", "SOPHIA", "SOPHIE", "FIFI"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -10638,10 +8514,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_BIRD_KEEPER,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL,
         .trainerPic = TRAINER_PIC_BIRD_KEEPER,
-        .trainerName = LANGUAGE_STRING(
-            "COBY",
-            "WALTER",
-            "COBY"),
+        .trainerName = LANGUAGE_STRING("COBY", "WALTER", "COBY", "BUTRO"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -10653,10 +8526,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_CAMPER,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
         .trainerPic = TRAINER_PIC_CAMPER,
-        .trainerName = LANGUAGE_STRING(
-            "LAWRENCE",
-            "ZACHARIE",
-            "LAWRENCE"),
+        .trainerName = LANGUAGE_STRING("LAWRENCE", "ZACHARIE", "LAWRENCE", "LAURENO"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -10668,10 +8538,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_POKEMANIAC,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS,
         .trainerPic = TRAINER_PIC_POKEMANIAC,
-        .trainerName = LANGUAGE_STRING(
-            "WYATT",
-            "KERWIN",
-            "OLIVIERO"),
+        .trainerName = LANGUAGE_STRING("WYATT", "KERWIN", "OLIVIERO", "GUANE"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -10683,10 +8550,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_PICNICKER,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL,
         .trainerPic = TRAINER_PIC_PICNICKER,
-        .trainerName = LANGUAGE_STRING(
-            "ANGELINA",
-            "ANGELINA",
-            "ANGELINA"),
+        .trainerName = LANGUAGE_STRING("ANGELINA", "ANGELINA", "ANGELINA", "ANGELITA"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -10698,10 +8562,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_FISHERMAN,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER,
         .trainerPic = TRAINER_PIC_FISHERMAN,
-        .trainerName = LANGUAGE_STRING(
-            "KAI",
-            "KAI",
-            "KRISTOFER"),
+        .trainerName = LANGUAGE_STRING("KAI", "KAI", "KRISTOFER", "POL"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -10713,10 +8574,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_PICNICKER,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL,
         .trainerPic = TRAINER_PIC_PICNICKER,
-        .trainerName = LANGUAGE_STRING(
-            "CHARLOTTE",
-            "CHARLEEN",
-            "CHARLOTTE"),
+        .trainerName = LANGUAGE_STRING("CHARLOTTE", "CHARLEEN", "CHARLOTTE", "LOTA"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -10728,10 +8586,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_YOUNGSTER,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
         .trainerPic = TRAINER_PIC_YOUNGSTER,
-        .trainerName = LANGUAGE_STRING(
-            "DEANDRE",
-            "LINO",
-            "GELINDO"),
+        .trainerName = LANGUAGE_STRING("DEANDRE", "LINO", "GELINDO", "DEANDRE"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -10743,10 +8598,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_TEAM_MAGMA,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MAGMA,
         .trainerPic = TRAINER_PIC_MAGMA_GRUNT_M,
-        .trainerName = LANGUAGE_STRING(
-            "GRUNT",
-            "SBIRE",
-            "RECLUTA"),
+        .trainerName = LANGUAGE_STRING("GRUNT", "SBIRE", "RECLUTA", "SOLDADO"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -10758,10 +8610,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_TEAM_MAGMA,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MAGMA,
         .trainerPic = TRAINER_PIC_MAGMA_GRUNT_M,
-        .trainerName = LANGUAGE_STRING(
-            "GRUNT",
-            "SBIRE",
-            "RECLUTA"),
+        .trainerName = LANGUAGE_STRING("GRUNT", "SBIRE", "RECLUTA", "SOLDADO"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -10773,10 +8622,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_TEAM_MAGMA,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MAGMA,
         .trainerPic = TRAINER_PIC_MAGMA_GRUNT_M,
-        .trainerName = LANGUAGE_STRING(
-            "GRUNT",
-            "SBIRE",
-            "RECLUTA"),
+        .trainerName = LANGUAGE_STRING("GRUNT", "SBIRE", "RECLUTA", "SOLDADO"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -10788,10 +8634,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_TEAM_MAGMA,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MAGMA,
         .trainerPic = TRAINER_PIC_MAGMA_GRUNT_M,
-        .trainerName = LANGUAGE_STRING(
-            "GRUNT",
-            "SBIRE",
-            "RECLUTA"),
+        .trainerName = LANGUAGE_STRING("GRUNT", "SBIRE", "RECLUTA", "SOLDADO"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -10803,10 +8646,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_TEAM_MAGMA,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MAGMA,
         .trainerPic = TRAINER_PIC_MAGMA_GRUNT_M,
-        .trainerName = LANGUAGE_STRING(
-            "GRUNT",
-            "SBIRE",
-            "RECLUTA"),
+        .trainerName = LANGUAGE_STRING("GRUNT", "SBIRE", "RECLUTA", "SOLDADO"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -10818,10 +8658,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_TEAM_MAGMA,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MAGMA,
         .trainerPic = TRAINER_PIC_MAGMA_GRUNT_M,
-        .trainerName = LANGUAGE_STRING(
-            "GRUNT",
-            "SBIRE",
-            "RECLUTA"),
+        .trainerName = LANGUAGE_STRING("GRUNT", "SBIRE", "RECLUTA", "SOLDADO"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -10833,10 +8670,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_TEAM_MAGMA,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MAGMA,
         .trainerPic = TRAINER_PIC_MAGMA_GRUNT_M,
-        .trainerName = LANGUAGE_STRING(
-            "GRUNT",
-            "SBIRE",
-            "RECLUTA"),
+        .trainerName = LANGUAGE_STRING("GRUNT", "SBIRE", "RECLUTA", "SOLDADO"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -10848,10 +8682,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_TEAM_MAGMA,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MAGMA,
         .trainerPic = TRAINER_PIC_MAGMA_GRUNT_M,
-        .trainerName = LANGUAGE_STRING(
-            "GRUNT",
-            "SBIRE",
-            "RECLUTA"),
+        .trainerName = LANGUAGE_STRING("GRUNT", "SBIRE", "RECLUTA", "SOLDADO"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -10863,10 +8694,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_TEAM_MAGMA,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MAGMA,
         .trainerPic = TRAINER_PIC_MAGMA_GRUNT_M,
-        .trainerName = LANGUAGE_STRING(
-            "GRUNT",
-            "SBIRE",
-            "RECLUTA"),
+        .trainerName = LANGUAGE_STRING("GRUNT", "SBIRE", "RECLUTA", "SOLDADO"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -10878,10 +8706,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_TEAM_MAGMA,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MAGMA,
         .trainerPic = TRAINER_PIC_MAGMA_GRUNT_M,
-        .trainerName = LANGUAGE_STRING(
-            "GRUNT",
-            "SBIRE",
-            "RECLUTA"),
+        .trainerName = LANGUAGE_STRING("GRUNT", "SBIRE", "RECLUTA", "SOLDADO"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -10893,10 +8718,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_TEAM_MAGMA,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MAGMA,
         .trainerPic = TRAINER_PIC_MAGMA_GRUNT_M,
-        .trainerName = LANGUAGE_STRING(
-            "GRUNT",
-            "SBIRE",
-            "RECLUTA"),
+        .trainerName = LANGUAGE_STRING("GRUNT", "SBIRE", "RECLUTA", "SOLDADO"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -10908,10 +8730,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_TEAM_MAGMA,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MAGMA,
         .trainerPic = TRAINER_PIC_MAGMA_GRUNT_M,
-        .trainerName = LANGUAGE_STRING(
-            "GRUNT",
-            "SBIRE",
-            "RECLUTA"),
+        .trainerName = LANGUAGE_STRING("GRUNT", "SBIRE", "RECLUTA", "SOLDADO"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -10923,10 +8742,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_TEAM_MAGMA,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MAGMA,
         .trainerPic = TRAINER_PIC_MAGMA_GRUNT_M,
-        .trainerName = LANGUAGE_STRING(
-            "GRUNT",
-            "SBIRE",
-            "RECLUTA"),
+        .trainerName = LANGUAGE_STRING("GRUNT", "SBIRE", "RECLUTA", "SOLDADO"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -10938,10 +8754,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_TEAM_MAGMA,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_MAGMA,
         .trainerPic = TRAINER_PIC_MAGMA_GRUNT_F,
-        .trainerName = LANGUAGE_STRING(
-            "GRUNT",
-            "SBIRE",
-            "RECLUTA"),
+        .trainerName = LANGUAGE_STRING("GRUNT", "SBIRE", "RECLUTA", "SOLDADO"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -10953,10 +8766,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_TEAM_MAGMA,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_MAGMA,
         .trainerPic = TRAINER_PIC_MAGMA_GRUNT_F,
-        .trainerName = LANGUAGE_STRING(
-            "GRUNT",
-            "SBIRE",
-            "RECLUTA"),
+        .trainerName = LANGUAGE_STRING("GRUNT", "SBIRE", "RECLUTA", "SOLDADO"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -10968,10 +8778,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_TEAM_MAGMA,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_MAGMA,
         .trainerPic = TRAINER_PIC_MAGMA_GRUNT_F,
-        .trainerName = LANGUAGE_STRING(
-            "GRUNT",
-            "SBIRE",
-            "RECLUTA"),
+        .trainerName = LANGUAGE_STRING("GRUNT", "SBIRE", "RECLUTA", "SOLDADO"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -10983,10 +8790,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_MAGMA_ADMIN,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MAGMA,
         .trainerPic = TRAINER_PIC_MAGMA_ADMIN,
-        .trainerName = LANGUAGE_STRING(
-            "TABITHA",
-            "KELVIN",
-            "OTTAVIO"),
+        .trainerName = LANGUAGE_STRING("TABITHA", "KELVIN", "OTTAVIO", "TATIANO"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -10998,10 +8802,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_COOLTRAINER,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL,
         .trainerPic = TRAINER_PIC_COOLTRAINER_F,
-        .trainerName = LANGUAGE_STRING(
-            "DARCY",
-            "SEVERINE",
-            "ILARIA"),
+        .trainerName = LANGUAGE_STRING("DARCY", "SEVERINE", "ILARIA", "DORIS"),
         .items = {ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
@@ -11013,10 +8814,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_MAGMA_LEADER,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MAGMA,
         .trainerPic = TRAINER_PIC_MAGMA_LEADER_MAXIE,
-        .trainerName = LANGUAGE_STRING(
-            "MAXIE",
-            "MAX",
-            "MAX"),
+        .trainerName = LANGUAGE_STRING("MAXIE", "MAX", "MAX", "MAGNO"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
@@ -11028,10 +8826,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_SWIMMER_M,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SWIMMER,
         .trainerPic = TRAINER_PIC_SWIMMER_M,
-        .trainerName = LANGUAGE_STRING(
-            "PETE",
-            "LASZLO",
-            "JAMOS"),
+        .trainerName = LANGUAGE_STRING("PETE", "LASZLO", "JAMOS", "PETE"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -11043,10 +8838,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_SWIMMER_F,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER,
         .trainerPic = TRAINER_PIC_SWIMMER_F,
-        .trainerName = LANGUAGE_STRING(
-            "ISABELLE",
-            "ISABEAU",
-            "BELLA"),
+        .trainerName = LANGUAGE_STRING("ISABELLE", "ISABEAU", "BELLA", "CHABELI"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -11058,10 +8850,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_RUIN_MANIAC,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER,
         .trainerPic = TRAINER_PIC_RUIN_MANIAC,
-        .trainerName = LANGUAGE_STRING(
-            "ANDRES",
-            "LENI",
-            "ANDRES"),
+        .trainerName = LANGUAGE_STRING("ANDRES", "LENI", "ANDRES", "ANDRI"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -11073,10 +8862,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_BIRD_KEEPER,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL,
         .trainerPic = TRAINER_PIC_BIRD_KEEPER,
-        .trainerName = LANGUAGE_STRING(
-            "JOSUE",
-            "JOSHUA",
-            "ASTOLFO"),
+        .trainerName = LANGUAGE_STRING("JOSUE", "JOSHUA", "ASTOLFO", "JOCHU"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -11088,10 +8874,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_TRIATHLETE,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SWIMMER,
         .trainerPic = TRAINER_PIC_SWIMMING_TRIATHLETE_M,
-        .trainerName = LANGUAGE_STRING(
-            "CAMRON",
-            "YANN",
-            "CAMRON"),
+        .trainerName = LANGUAGE_STRING("CAMRON", "YANN", "CAMRON", "CADEL"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -11103,10 +8886,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_SAILOR,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
         .trainerPic = TRAINER_PIC_SAILOR,
-        .trainerName = LANGUAGE_STRING(
-            "CORY",
-            "LAMBERT",
-            "CARONTE"),
+        .trainerName = LANGUAGE_STRING("CORY", "LAMBERT", "CARONTE", "CORENO"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -11118,10 +8898,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_COOLTRAINER,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL,
         .trainerPic = TRAINER_PIC_COOLTRAINER_F,
-        .trainerName = LANGUAGE_STRING(
-            "CAROLINA",
-            "CAROLINA",
-            "CONNY"),
+        .trainerName = LANGUAGE_STRING("CAROLINA", "CAROLINA", "CONNY", "CAROLI"),
         .items = {ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
@@ -11133,10 +8910,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_BIRD_KEEPER,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL,
         .trainerPic = TRAINER_PIC_BIRD_KEEPER,
-        .trainerName = LANGUAGE_STRING(
-            "ELIJAH",
-            "ELLIAH",
-            "ADELMO"),
+        .trainerName = LANGUAGE_STRING("ELIJAH", "ELLIAH", "ADELMO", "ELIDO"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -11148,10 +8922,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_PICNICKER,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL,
         .trainerPic = TRAINER_PIC_PICNICKER,
-        .trainerName = LANGUAGE_STRING(
-            "CELIA",
-            "CELIA",
-            "CELIA"),
+        .trainerName = LANGUAGE_STRING("CELIA", "CELIA", "CELIA", "CELIA"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -11163,10 +8934,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_RUIN_MANIAC,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER,
         .trainerPic = TRAINER_PIC_RUIN_MANIAC,
-        .trainerName = LANGUAGE_STRING(
-            "BRYAN",
-            "KENZO",
-            "BRYAN"),
+        .trainerName = LANGUAGE_STRING("BRYAN", "KENZO", "BRYAN", "BRIAN"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -11178,10 +8946,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_CAMPER,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
         .trainerPic = TRAINER_PIC_CAMPER,
-        .trainerName = LANGUAGE_STRING(
-            "BRANDEN",
-            "JULIO",
-            "AGAMENNONE"),
+        .trainerName = LANGUAGE_STRING("BRANDEN", "JULIO", "AGAMENNONE", "BRANDEN"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -11193,10 +8958,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_KINDLER,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER,
         .trainerPic = TRAINER_PIC_KINDLER,
-        .trainerName = LANGUAGE_STRING(
-            "BRYANT",
-            "RAOUL",
-            "SATURNINO"),
+        .trainerName = LANGUAGE_STRING("BRYANT", "RAOUL", "SATURNINO", "BRIANO"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -11208,10 +8970,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_AROMA_LADY,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE,
         .trainerPic = TRAINER_PIC_AROMA_LADY,
-        .trainerName = LANGUAGE_STRING(
-            "SHAYLA",
-            "LEONIE",
-            "SHAYLA"),
+        .trainerName = LANGUAGE_STRING("SHAYLA", "LEONIE", "SHAYLA", "SHAILA"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -11223,10 +8982,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_TRIATHLETE,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE,
         .trainerPic = TRAINER_PIC_RUNNING_TRIATHLETE_F,
-        .trainerName = LANGUAGE_STRING(
-            "KYRA",
-            "KYRA",
-            "KYRA"),
+        .trainerName = LANGUAGE_STRING("KYRA", "KYRA", "KYRA", "QUIRA"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -11238,10 +8994,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_NINJA_BOY,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS,
         .trainerPic = TRAINER_PIC_NINJA_BOY,
-        .trainerName = LANGUAGE_STRING(
-            "JAIDEN",
-            "RALPH",
-            "ALBERICO"),
+        .trainerName = LANGUAGE_STRING("JAIDEN", "RALPH", "ALBERICO", "JAIDEN"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -11253,10 +9006,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_PSYCHIC,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE,
         .trainerPic = TRAINER_PIC_PSYCHIC_F,
-        .trainerName = LANGUAGE_STRING(
-            "ALIX",
-            "FABY",
-            "ALINA"),
+        .trainerName = LANGUAGE_STRING("ALIX", "FABY", "ALINA", "ALIX"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -11268,10 +9018,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_BATTLE_GIRL,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE,
         .trainerPic = TRAINER_PIC_BATTLE_GIRL,
-        .trainerName = LANGUAGE_STRING(
-            "HELENE",
-            "EMILIE",
-            "HELENE"),
+        .trainerName = LANGUAGE_STRING("HELENE", "EMILIE", "HELENE", "ELINA"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -11283,10 +9030,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_PSYCHIC,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE,
         .trainerPic = TRAINER_PIC_PSYCHIC_F,
-        .trainerName = LANGUAGE_STRING(
-            "MARLENE",
-            "MARLENE",
-            "MARLENE"),
+        .trainerName = LANGUAGE_STRING("MARLENE", "MARLENE", "MARLENE", "MARLENE"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -11298,10 +9042,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_HIKER,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER,
         .trainerPic = TRAINER_PIC_HIKER,
-        .trainerName = LANGUAGE_STRING(
-            "DEVAN",
-            "MARCELIN",
-            "DEVAN"),
+        .trainerName = LANGUAGE_STRING("DEVAN", "MARCELIN", "DEVAN", "DEVAN"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -11313,10 +9054,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_YOUNGSTER,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
         .trainerPic = TRAINER_PIC_YOUNGSTER,
-        .trainerName = LANGUAGE_STRING(
-            "JOHNSON",
-            "BRYAN",
-            "JOHNSON"),
+        .trainerName = LANGUAGE_STRING("JOHNSON", "BRYAN", "JOHNSON", "FLAVIO"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -11328,10 +9066,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_TRIATHLETE,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE,
         .trainerPic = TRAINER_PIC_RUNNING_TRIATHLETE_F,
-        .trainerName = LANGUAGE_STRING(
-            "MELINA",
-            "MELINA",
-            "FIORENZA"),
+        .trainerName = LANGUAGE_STRING("MELINA", "MELINA", "FIORENZA", "MELINA"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -11343,10 +9078,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_PSYCHIC,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE,
         .trainerPic = TRAINER_PIC_PSYCHIC_F,
-        .trainerName = LANGUAGE_STRING(
-            "BRANDI",
-            "ANAIS",
-            "FIORELLA"),
+        .trainerName = LANGUAGE_STRING("BRANDI", "ANAIS", "FIORELLA", "BRANI"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -11358,10 +9090,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_BATTLE_GIRL,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE,
         .trainerPic = TRAINER_PIC_BATTLE_GIRL,
-        .trainerName = LANGUAGE_STRING(
-            "AISHA",
-            "AISHA",
-            "AISHA"),
+        .trainerName = LANGUAGE_STRING("AISHA", "AISHA", "AISHA", "AISHA"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -11373,10 +9102,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_EXPERT,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE,
         .trainerPic = TRAINER_PIC_EXPERT_F,
-        .trainerName = LANGUAGE_STRING(
-            "MAKAYLA",
-            "ANGELE",
-            "SIMONETTA"),
+        .trainerName = LANGUAGE_STRING("MAKAYLA", "ANGELE", "SIMONETTA", "NORINA"),
         .items = {ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
@@ -11388,10 +9114,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_GUITARIST,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE,
         .trainerPic = TRAINER_PIC_GUITARIST,
-        .trainerName = LANGUAGE_STRING(
-            "FABIAN",
-            "FABIAN",
-            "FABIAN"),
+        .trainerName = LANGUAGE_STRING("FABIAN", "FABIAN", "FABIAN", "MUNO"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -11403,10 +9126,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_KINDLER,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER,
         .trainerPic = TRAINER_PIC_KINDLER,
-        .trainerName = LANGUAGE_STRING(
-            "DAYTON",
-            "MELVIL",
-            "DAYTON"),
+        .trainerName = LANGUAGE_STRING("DAYTON", "MELVIL", "DAYTON", "DAREO"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -11418,10 +9138,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_PARASOL_LADY,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE,
         .trainerPic = TRAINER_PIC_PARASOL_LADY,
-        .trainerName = LANGUAGE_STRING(
-            "RACHEL",
-            "ARLETTE",
-            "RACHELE"),
+        .trainerName = LANGUAGE_STRING("RACHEL", "ARLETTE", "RACHELE", "RURITA"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -11433,10 +9150,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_COOLTRAINER,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL,
         .trainerPic = TRAINER_PIC_COOLTRAINER_M,
-        .trainerName = LANGUAGE_STRING(
-            "LEONEL",
-            "MAXIM",
-            "LEONEL"),
+        .trainerName = LANGUAGE_STRING("LEONEL", "MAXIM", "LEONEL", "LEONEL"),
         .items = {ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
@@ -11448,10 +9162,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_BATTLE_GIRL,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE,
         .trainerPic = TRAINER_PIC_BATTLE_GIRL,
-        .trainerName = LANGUAGE_STRING(
-            "CALLIE",
-            "ARMELLE",
-            "APOLLONIA"),
+        .trainerName = LANGUAGE_STRING("CALLIE", "ARMELLE", "APOLLONIA", "CALIRA"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -11463,10 +9174,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_BUG_MANIAC,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS,
         .trainerPic = TRAINER_PIC_BUG_MANIAC,
-        .trainerName = LANGUAGE_STRING(
-            "CALE",
-            "AYMERIC",
-            "FAUSTO"),
+        .trainerName = LANGUAGE_STRING("CALE", "AYMERIC", "FAUSTO", "BUDI"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -11478,10 +9186,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_PKMN_BREEDER,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
         .trainerPic = TRAINER_PIC_POKEMON_BREEDER_M,
-        .trainerName = LANGUAGE_STRING(
-            "MYLES",
-            "NORBERT",
-            "MYLES"),
+        .trainerName = LANGUAGE_STRING("MYLES", "NORBERT", "MYLES", "MILO"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -11493,10 +9198,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_PKMN_BREEDER,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE,
         .trainerPic = TRAINER_PIC_POKEMON_BREEDER_F,
-        .trainerName = LANGUAGE_STRING(
-            "PAT",
-            "PATHY",
-            "PATRIZIA"),
+        .trainerName = LANGUAGE_STRING("PAT", "PATHY", "PATRIZIA", "PAT"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -11508,10 +9210,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_COOLTRAINER,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL,
         .trainerPic = TRAINER_PIC_COOLTRAINER_F,
-        .trainerName = LANGUAGE_STRING(
-            "CRISTIN",
-            "CHRISTINE",
-            "CRISTIN"),
+        .trainerName = LANGUAGE_STRING("CRISTIN", "CHRISTINE", "CRISTIN", "CRISTIN"),
         .items = {ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
@@ -11523,10 +9222,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_RIVAL,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE,
         .trainerPic = TRAINER_PIC_MAY,
-        .trainerName = LANGUAGE_STRING(
-            "MAY",
-            "FLORA",
-            "VERA"),
+        .trainerName = LANGUAGE_STRING("MAY", "FLORA", "VERA", "AURA"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
@@ -11538,10 +9234,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_RIVAL,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE,
         .trainerPic = TRAINER_PIC_MAY,
-        .trainerName = LANGUAGE_STRING(
-            "MAY",
-            "FLORA",
-            "VERA"),
+        .trainerName = LANGUAGE_STRING("MAY", "FLORA", "VERA", "AURA"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
@@ -11553,10 +9246,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_LEADER,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE,
         .trainerPic = TRAINER_PIC_LEADER_ROXANNE,
-        .trainerName = LANGUAGE_STRING(
-            "ROXANNE",
-            "ROXANNE",
-            "PETRA"),
+        .trainerName = LANGUAGE_STRING("ROXANNE", "ROXANNE", "PETRA", "PETRA"),
         .items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE},
         .doubleBattle = TRUE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
@@ -11568,10 +9258,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_LEADER,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE,
         .trainerPic = TRAINER_PIC_LEADER_ROXANNE,
-        .trainerName = LANGUAGE_STRING(
-            "ROXANNE",
-            "ROXANNE",
-            "PETRA"),
+        .trainerName = LANGUAGE_STRING("ROXANNE", "ROXANNE", "PETRA", "PETRA"),
         .items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE},
         .doubleBattle = TRUE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
@@ -11583,10 +9270,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_LEADER,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE,
         .trainerPic = TRAINER_PIC_LEADER_ROXANNE,
-        .trainerName = LANGUAGE_STRING(
-            "ROXANNE",
-            "ROXANNE",
-            "PETRA"),
+        .trainerName = LANGUAGE_STRING("ROXANNE", "ROXANNE", "PETRA", "PETRA"),
         .items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE},
         .doubleBattle = TRUE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
@@ -11598,10 +9282,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_LEADER,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE,
         .trainerPic = TRAINER_PIC_LEADER_ROXANNE,
-        .trainerName = LANGUAGE_STRING(
-            "ROXANNE",
-            "ROXANNE",
-            "PETRA"),
+        .trainerName = LANGUAGE_STRING("ROXANNE", "ROXANNE", "PETRA", "PETRA"),
         .items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE},
         .doubleBattle = TRUE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
@@ -11613,10 +9294,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_LEADER,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
         .trainerPic = TRAINER_PIC_LEADER_BRAWLY,
-        .trainerName = LANGUAGE_STRING(
-            "BRAWLY",
-            "BASTIEN",
-            "RUDI"),
+        .trainerName = LANGUAGE_STRING("BRAWLY", "BASTIEN", "RUDI", "MARCIAL"),
         .items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE},
         .doubleBattle = TRUE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
@@ -11628,10 +9306,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_LEADER,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
         .trainerPic = TRAINER_PIC_LEADER_BRAWLY,
-        .trainerName = LANGUAGE_STRING(
-            "BRAWLY",
-            "BASTIEN",
-            "RUDI"),
+        .trainerName = LANGUAGE_STRING("BRAWLY", "BASTIEN", "RUDI", "MARCIAL"),
         .items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE},
         .doubleBattle = TRUE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
@@ -11643,10 +9318,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_LEADER,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
         .trainerPic = TRAINER_PIC_LEADER_BRAWLY,
-        .trainerName = LANGUAGE_STRING(
-            "BRAWLY",
-            "BASTIEN",
-            "RUDI"),
+        .trainerName = LANGUAGE_STRING("BRAWLY", "BASTIEN", "RUDI", "MARCIAL"),
         .items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE},
         .doubleBattle = TRUE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
@@ -11658,10 +9330,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_LEADER,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
         .trainerPic = TRAINER_PIC_LEADER_BRAWLY,
-        .trainerName = LANGUAGE_STRING(
-            "BRAWLY",
-            "BASTIEN",
-            "RUDI"),
+        .trainerName = LANGUAGE_STRING("BRAWLY", "BASTIEN", "RUDI", "MARCIAL"),
         .items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE},
         .doubleBattle = TRUE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
@@ -11673,10 +9342,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_LEADER,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
         .trainerPic = TRAINER_PIC_LEADER_WATTSON,
-        .trainerName = LANGUAGE_STRING(
-            "WATTSON",
-            "VOLTERE",
-            "WALTER"),
+        .trainerName = LANGUAGE_STRING("WATTSON", "VOLTERE", "WALTER", "ERICO"),
         .items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE},
         .doubleBattle = TRUE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
@@ -11688,10 +9354,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_LEADER,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
         .trainerPic = TRAINER_PIC_LEADER_WATTSON,
-        .trainerName = LANGUAGE_STRING(
-            "WATTSON",
-            "VOLTERE",
-            "WALTER"),
+        .trainerName = LANGUAGE_STRING("WATTSON", "VOLTERE", "WALTER", "ERICO"),
         .items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE},
         .doubleBattle = TRUE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
@@ -11703,10 +9366,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_LEADER,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
         .trainerPic = TRAINER_PIC_LEADER_WATTSON,
-        .trainerName = LANGUAGE_STRING(
-            "WATTSON",
-            "VOLTERE",
-            "WALTER"),
+        .trainerName = LANGUAGE_STRING("WATTSON", "VOLTERE", "WALTER", "ERICO"),
         .items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE},
         .doubleBattle = TRUE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
@@ -11718,10 +9378,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_LEADER,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
         .trainerPic = TRAINER_PIC_LEADER_WATTSON,
-        .trainerName = LANGUAGE_STRING(
-            "WATTSON",
-            "VOLTERE",
-            "WALTER"),
+        .trainerName = LANGUAGE_STRING("WATTSON", "VOLTERE", "WALTER", "ERICO"),
         .items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE},
         .doubleBattle = TRUE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
@@ -11733,10 +9390,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_LEADER,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE,
         .trainerPic = TRAINER_PIC_LEADER_FLANNERY,
-        .trainerName = LANGUAGE_STRING(
-            "FLANNERY",
-            "ADRIANE",
-            "FIAMMETTA"),
+        .trainerName = LANGUAGE_STRING("FLANNERY", "ADRIANE", "FIAMMETTA", "CANDELA"),
         .items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE},
         .doubleBattle = TRUE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
@@ -11748,10 +9402,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_LEADER,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE,
         .trainerPic = TRAINER_PIC_LEADER_FLANNERY,
-        .trainerName = LANGUAGE_STRING(
-            "FLANNERY",
-            "ADRIANE",
-            "FIAMMETTA"),
+        .trainerName = LANGUAGE_STRING("FLANNERY", "ADRIANE", "FIAMMETTA", "CANDELA"),
         .items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE},
         .doubleBattle = TRUE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
@@ -11763,10 +9414,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_LEADER,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE,
         .trainerPic = TRAINER_PIC_LEADER_FLANNERY,
-        .trainerName = LANGUAGE_STRING(
-            "FLANNERY",
-            "ADRIANE",
-            "FIAMMETTA"),
+        .trainerName = LANGUAGE_STRING("FLANNERY", "ADRIANE", "FIAMMETTA", "CANDELA"),
         .items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE},
         .doubleBattle = TRUE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
@@ -11778,10 +9426,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_LEADER,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE,
         .trainerPic = TRAINER_PIC_LEADER_FLANNERY,
-        .trainerName = LANGUAGE_STRING(
-            "FLANNERY",
-            "ADRIANE",
-            "FIAMMETTA"),
+        .trainerName = LANGUAGE_STRING("FLANNERY", "ADRIANE", "FIAMMETTA", "CANDELA"),
         .items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE},
         .doubleBattle = TRUE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
@@ -11793,10 +9438,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_LEADER,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
         .trainerPic = TRAINER_PIC_LEADER_NORMAN,
-        .trainerName = LANGUAGE_STRING(
-            "NORMAN",
-            "NORMAN",
-            "NORMAN"),
+        .trainerName = LANGUAGE_STRING("NORMAN", "NORMAN", "NORMAN", "NORMAN"),
         .items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE},
         .doubleBattle = TRUE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
@@ -11808,10 +9450,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_LEADER,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
         .trainerPic = TRAINER_PIC_LEADER_NORMAN,
-        .trainerName = LANGUAGE_STRING(
-            "NORMAN",
-            "NORMAN",
-            "NORMAN"),
+        .trainerName = LANGUAGE_STRING("NORMAN", "NORMAN", "NORMAN", "NORMAN"),
         .items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE},
         .doubleBattle = TRUE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
@@ -11823,10 +9462,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_LEADER,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
         .trainerPic = TRAINER_PIC_LEADER_NORMAN,
-        .trainerName = LANGUAGE_STRING(
-            "NORMAN",
-            "NORMAN",
-            "NORMAN"),
+        .trainerName = LANGUAGE_STRING("NORMAN", "NORMAN", "NORMAN", "NORMAN"),
         .items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE},
         .doubleBattle = TRUE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
@@ -11838,10 +9474,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_LEADER,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
         .trainerPic = TRAINER_PIC_LEADER_NORMAN,
-        .trainerName = LANGUAGE_STRING(
-            "NORMAN",
-            "NORMAN",
-            "NORMAN"),
+        .trainerName = LANGUAGE_STRING("NORMAN", "NORMAN", "NORMAN", "NORMAN"),
         .items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE},
         .doubleBattle = TRUE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
@@ -11853,10 +9486,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_LEADER,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE,
         .trainerPic = TRAINER_PIC_LEADER_WINONA,
-        .trainerName = LANGUAGE_STRING(
-            "WINONA",
-            "ALIZEE",
-            "ALICE"),
+        .trainerName = LANGUAGE_STRING("WINONA", "ALIZEE", "ALICE", "ALANA"),
         .items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE},
         .doubleBattle = TRUE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY | AI_SCRIPT_RISKY,
@@ -11868,10 +9498,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_LEADER,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE,
         .trainerPic = TRAINER_PIC_LEADER_WINONA,
-        .trainerName = LANGUAGE_STRING(
-            "WINONA",
-            "ALIZEE",
-            "ALICE"),
+        .trainerName = LANGUAGE_STRING("WINONA", "ALIZEE", "ALICE", "ALANA"),
         .items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE},
         .doubleBattle = TRUE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY | AI_SCRIPT_RISKY,
@@ -11883,10 +9510,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_LEADER,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE,
         .trainerPic = TRAINER_PIC_LEADER_WINONA,
-        .trainerName = LANGUAGE_STRING(
-            "WINONA",
-            "ALIZEE",
-            "ALICE"),
+        .trainerName = LANGUAGE_STRING("WINONA", "ALIZEE", "ALICE", "ALANA"),
         .items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE},
         .doubleBattle = TRUE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY | AI_SCRIPT_RISKY,
@@ -11898,10 +9522,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_LEADER,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE,
         .trainerPic = TRAINER_PIC_LEADER_WINONA,
-        .trainerName = LANGUAGE_STRING(
-            "WINONA",
-            "ALIZEE",
-            "ALICE"),
+        .trainerName = LANGUAGE_STRING("WINONA", "ALIZEE", "ALICE", "ALANA"),
         .items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE},
         .doubleBattle = TRUE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY | AI_SCRIPT_RISKY,
@@ -11913,10 +9534,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_LEADER,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE,
         .trainerPic = TRAINER_PIC_LEADER_TATE_AND_LIZA,
-        .trainerName = LANGUAGE_STRING(
-            "TATE&LIZA",
-            "LEVY&TATIA",
-            "TELL & PAT"),
+        .trainerName = LANGUAGE_STRING("TATE&LIZA", "LEVY&TATIA", "TELL & PAT", "VITO-LETI"),
         .items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE},
         .doubleBattle = TRUE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
@@ -11928,10 +9546,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_LEADER,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE,
         .trainerPic = TRAINER_PIC_LEADER_TATE_AND_LIZA,
-        .trainerName = LANGUAGE_STRING(
-            "TATE&LIZA",
-            "LEVY&TATIA",
-            "TELL & PAT"),
+        .trainerName = LANGUAGE_STRING("TATE&LIZA", "LEVY&TATIA", "TELL & PAT", "VITO-LETI"),
         .items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE},
         .doubleBattle = TRUE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
@@ -11943,10 +9558,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_LEADER,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE,
         .trainerPic = TRAINER_PIC_LEADER_TATE_AND_LIZA,
-        .trainerName = LANGUAGE_STRING(
-            "TATE&LIZA",
-            "LEVY&TATIA",
-            "TELL & PAT"),
+        .trainerName = LANGUAGE_STRING("TATE&LIZA", "LEVY&TATIA", "TELL & PAT", "VITO-LETI"),
         .items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE},
         .doubleBattle = TRUE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
@@ -11958,10 +9570,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_LEADER,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_FEMALE,
         .trainerPic = TRAINER_PIC_LEADER_TATE_AND_LIZA,
-        .trainerName = LANGUAGE_STRING(
-            "TATE&LIZA",
-            "LEVY&TATIA",
-            "TELL & PAT"),
+        .trainerName = LANGUAGE_STRING("TATE&LIZA", "LEVY&TATIA", "TELL & PAT", "VITO-LETI"),
         .items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE},
         .doubleBattle = TRUE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
@@ -11973,10 +9582,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_LEADER,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
         .trainerPic = TRAINER_PIC_LEADER_JUAN,
-        .trainerName = LANGUAGE_STRING(
-            "JUAN",
-            "JUAN",
-            "RODOLFO"),
+        .trainerName = LANGUAGE_STRING("JUAN", "JUAN", "RODOLFO", "GALANO"),
         .items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE},
         .doubleBattle = TRUE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
@@ -11988,10 +9594,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_LEADER,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
         .trainerPic = TRAINER_PIC_LEADER_JUAN,
-        .trainerName = LANGUAGE_STRING(
-            "JUAN",
-            "JUAN",
-            "RODOLFO"),
+        .trainerName = LANGUAGE_STRING("JUAN", "JUAN", "RODOLFO", "GALANO"),
         .items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE},
         .doubleBattle = TRUE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
@@ -12003,10 +9606,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_LEADER,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
         .trainerPic = TRAINER_PIC_LEADER_JUAN,
-        .trainerName = LANGUAGE_STRING(
-            "JUAN",
-            "JUAN",
-            "RODOLFO"),
+        .trainerName = LANGUAGE_STRING("JUAN", "JUAN", "RODOLFO", "GALANO"),
         .items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE},
         .doubleBattle = TRUE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
@@ -12018,10 +9618,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_LEADER,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
         .trainerPic = TRAINER_PIC_LEADER_JUAN,
-        .trainerName = LANGUAGE_STRING(
-            "JUAN",
-            "JUAN",
-            "RODOLFO"),
+        .trainerName = LANGUAGE_STRING("JUAN", "JUAN", "RODOLFO", "GALANO"),
         .items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE},
         .doubleBattle = TRUE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
@@ -12033,10 +9630,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_BUG_MANIAC,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS,
         .trainerPic = TRAINER_PIC_BUG_MANIAC,
-        .trainerName = LANGUAGE_STRING(
-            "ANGELO",
-            "OLIVIERO",
-            "ANGELO"),
+        .trainerName = LANGUAGE_STRING("ANGELO", "OLIVIERO", "ANGELO", "ANTULO"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
@@ -12048,10 +9642,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_BIRD_KEEPER,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_COOL,
         .trainerPic = TRAINER_PIC_BIRD_KEEPER,
-        .trainerName = LANGUAGE_STRING(
-            "DARIUS",
-            "PLACIDE",
-            "DARIUS"),
+        .trainerName = LANGUAGE_STRING("DARIUS", "PLACIDE", "DARIUS", "DARERO"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
@@ -12063,10 +9654,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_RIVAL,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
         .trainerPic = TRAINER_PIC_STEVEN,
-        .trainerName = LANGUAGE_STRING(
-            "STEVEN",
-            "PIERRE",
-            "ROCCO"),
+        .trainerName = LANGUAGE_STRING("STEVEN", "PIERRE", "ROCCO", "MÁXIMO"),
         .items = {ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
@@ -12078,10 +9666,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_SALON_MAIDEN,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_MALE,
         .trainerPic = TRAINER_PIC_SALON_MAIDEN_ANABEL,
-        .trainerName = LANGUAGE_STRING(
-            "ANABEL",
-            "CATHY",
-            "ALBERTA"),
+        .trainerName = LANGUAGE_STRING("ANABEL", "CATHY", "ALBERTA", "DESTRA"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
@@ -12093,10 +9678,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_DOME_ACE,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
         .trainerPic = TRAINER_PIC_DOME_ACE_TUCKER,
-        .trainerName = LANGUAGE_STRING(
-            "TUCKER",
-            "TAKIM",
-            "TOLOMEO"),
+        .trainerName = LANGUAGE_STRING("TUCKER", "TAKIM", "TOLOMEO", "TACTIO"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
@@ -12108,10 +9690,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_PALACE_MAVEN,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
         .trainerPic = TRAINER_PIC_PALACE_MAVEN_SPENSER,
-        .trainerName = LANGUAGE_STRING(
-            "SPENSER",
-            "ESTEBAN",
-            "SPARTACO"),
+        .trainerName = LANGUAGE_STRING("SPENSER", "ESTEBAN", "SPARTACO", "ANICETO"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
@@ -12123,10 +9702,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_ARENA_TYCOON,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_MALE,
         .trainerPic = TRAINER_PIC_ARENA_TYCOON_GRETA,
-        .trainerName = LANGUAGE_STRING(
-            "GRETA",
-            "CAROLE",
-            "VALENTINA"),
+        .trainerName = LANGUAGE_STRING("GRETA", "CAROLE", "VALENTINA", "CORO"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
@@ -12138,10 +9714,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_FACTORY_HEAD,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
         .trainerPic = TRAINER_PIC_FACTORY_HEAD_NOLAND,
-        .trainerName = LANGUAGE_STRING(
-            "NOLAND",
-            "SAM",
-            "SAVINO"),
+        .trainerName = LANGUAGE_STRING("NOLAND", "SAM", "SAVINO", "SABINO"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
@@ -12153,10 +9726,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_PIKE_QUEEN,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_MALE,
         .trainerPic = TRAINER_PIC_PIKE_QUEEN_LUCY,
-        .trainerName = LANGUAGE_STRING(
-            "LUCY",
-            "CHARLINE",
-            "FORTUNATA"),
+        .trainerName = LANGUAGE_STRING("LUCY", "CHARLINE", "FORTUNATA", "FORTUNIA"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
@@ -12168,10 +9738,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_PYRAMID_KING,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
         .trainerPic = TRAINER_PIC_PYRAMID_KING_BRANDON,
-        .trainerName = LANGUAGE_STRING(
-            "BRANDON",
-            "BAYAR",
-            "BALDO"),
+        .trainerName = LANGUAGE_STRING("BRANDON", "BAYAR", "BALDO", "VALENTE"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
@@ -12183,10 +9750,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_RUIN_MANIAC,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER,
         .trainerPic = TRAINER_PIC_RUIN_MANIAC,
-        .trainerName = LANGUAGE_STRING(
-            "ANDRES",
-            "LENI",
-            "ANDRES"),
+        .trainerName = LANGUAGE_STRING("ANDRES", "LENI", "ANDRES", "ANDRI"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -12198,10 +9762,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_RUIN_MANIAC,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER,
         .trainerPic = TRAINER_PIC_RUIN_MANIAC,
-        .trainerName = LANGUAGE_STRING(
-            "ANDRES",
-            "LENI",
-            "ANDRES"),
+        .trainerName = LANGUAGE_STRING("ANDRES", "LENI", "ANDRES", "ANDRI"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -12213,10 +9774,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_RUIN_MANIAC,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER,
         .trainerPic = TRAINER_PIC_RUIN_MANIAC,
-        .trainerName = LANGUAGE_STRING(
-            "ANDRES",
-            "LENI",
-            "ANDRES"),
+        .trainerName = LANGUAGE_STRING("ANDRES", "LENI", "ANDRES", "ANDRI"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -12228,10 +9786,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_RUIN_MANIAC,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER,
         .trainerPic = TRAINER_PIC_RUIN_MANIAC,
-        .trainerName = LANGUAGE_STRING(
-            "ANDRES",
-            "LENI",
-            "ANDRES"),
+        .trainerName = LANGUAGE_STRING("ANDRES", "LENI", "ANDRES", "ANDRI"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -12243,10 +9798,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_SAILOR,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
         .trainerPic = TRAINER_PIC_SAILOR,
-        .trainerName = LANGUAGE_STRING(
-            "CORY",
-            "LAMBERT",
-            "CARONTE"),
+        .trainerName = LANGUAGE_STRING("CORY", "LAMBERT", "CARONTE", "CORENO"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -12258,10 +9810,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_SAILOR,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
         .trainerPic = TRAINER_PIC_SAILOR,
-        .trainerName = LANGUAGE_STRING(
-            "CORY",
-            "LAMBERT",
-            "CARONTE"),
+        .trainerName = LANGUAGE_STRING("CORY", "LAMBERT", "CARONTE", "CORENO"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -12273,10 +9822,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_SAILOR,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
         .trainerPic = TRAINER_PIC_SAILOR,
-        .trainerName = LANGUAGE_STRING(
-            "CORY",
-            "LAMBERT",
-            "CARONTE"),
+        .trainerName = LANGUAGE_STRING("CORY", "LAMBERT", "CARONTE", "CORENO"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -12288,10 +9834,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_SAILOR,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
         .trainerPic = TRAINER_PIC_SAILOR,
-        .trainerName = LANGUAGE_STRING(
-            "CORY",
-            "LAMBERT",
-            "CARONTE"),
+        .trainerName = LANGUAGE_STRING("CORY", "LAMBERT", "CARONTE", "CORENO"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -12303,10 +9846,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_TRIATHLETE,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SWIMMER,
         .trainerPic = TRAINER_PIC_SWIMMING_TRIATHLETE_M,
-        .trainerName = LANGUAGE_STRING(
-            "PABLO",
-            "PABLO",
-            "DINO"),
+        .trainerName = LANGUAGE_STRING("PABLO", "PABLO", "DINO", "PABLO"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -12318,10 +9858,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_TRIATHLETE,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SWIMMER,
         .trainerPic = TRAINER_PIC_SWIMMING_TRIATHLETE_M,
-        .trainerName = LANGUAGE_STRING(
-            "PABLO",
-            "PABLO",
-            "DINO"),
+        .trainerName = LANGUAGE_STRING("PABLO", "PABLO", "DINO", "PABLO"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -12333,10 +9870,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_TRIATHLETE,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SWIMMER,
         .trainerPic = TRAINER_PIC_SWIMMING_TRIATHLETE_M,
-        .trainerName = LANGUAGE_STRING(
-            "PABLO",
-            "PABLO",
-            "DINO"),
+        .trainerName = LANGUAGE_STRING("PABLO", "PABLO", "DINO", "PABLO"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -12348,10 +9882,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_TRIATHLETE,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_SWIMMER,
         .trainerPic = TRAINER_PIC_SWIMMING_TRIATHLETE_M,
-        .trainerName = LANGUAGE_STRING(
-            "PABLO",
-            "PABLO",
-            "DINO"),
+        .trainerName = LANGUAGE_STRING("PABLO", "PABLO", "DINO", "PABLO"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -12363,10 +9894,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_BLACK_BELT,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE,
         .trainerPic = TRAINER_PIC_BLACK_BELT,
-        .trainerName = LANGUAGE_STRING(
-            "KOJI",
-            "KOJI",
-            "KOJI"),
+        .trainerName = LANGUAGE_STRING("KOJI", "KOJI", "KOJI", "KOJI"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -12378,10 +9906,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_BLACK_BELT,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE,
         .trainerPic = TRAINER_PIC_BLACK_BELT,
-        .trainerName = LANGUAGE_STRING(
-            "KOJI",
-            "KOJI",
-            "KOJI"),
+        .trainerName = LANGUAGE_STRING("KOJI", "KOJI", "KOJI", "KOJI"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -12393,10 +9918,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_BLACK_BELT,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE,
         .trainerPic = TRAINER_PIC_BLACK_BELT,
-        .trainerName = LANGUAGE_STRING(
-            "KOJI",
-            "KOJI",
-            "KOJI"),
+        .trainerName = LANGUAGE_STRING("KOJI", "KOJI", "KOJI", "KOJI"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -12408,10 +9930,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_BLACK_BELT,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE,
         .trainerPic = TRAINER_PIC_BLACK_BELT,
-        .trainerName = LANGUAGE_STRING(
-            "KOJI",
-            "KOJI",
-            "KOJI"),
+        .trainerName = LANGUAGE_STRING("KOJI", "KOJI", "KOJI", "KOJI"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -12423,10 +9942,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_COOLTRAINER,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL,
         .trainerPic = TRAINER_PIC_COOLTRAINER_F,
-        .trainerName = LANGUAGE_STRING(
-            "CRISTIN",
-            "CHRISTINE",
-            "CRISTIN"),
+        .trainerName = LANGUAGE_STRING("CRISTIN", "CHRISTINE", "CRISTIN", "CRISTIN"),
         .items = {ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
@@ -12438,10 +9954,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_COOLTRAINER,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL,
         .trainerPic = TRAINER_PIC_COOLTRAINER_F,
-        .trainerName = LANGUAGE_STRING(
-            "CRISTIN",
-            "CHRISTINE",
-            "CRISTIN"),
+        .trainerName = LANGUAGE_STRING("CRISTIN", "CHRISTINE", "CRISTIN", "CRISTIN"),
         .items = {ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
@@ -12453,10 +9966,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_COOLTRAINER,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL,
         .trainerPic = TRAINER_PIC_COOLTRAINER_F,
-        .trainerName = LANGUAGE_STRING(
-            "CRISTIN",
-            "CHRISTINE",
-            "CRISTIN"),
+        .trainerName = LANGUAGE_STRING("CRISTIN", "CHRISTINE", "CRISTIN", "CRISTIN"),
         .items = {ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
@@ -12468,10 +9978,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_COOLTRAINER,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL,
         .trainerPic = TRAINER_PIC_COOLTRAINER_F,
-        .trainerName = LANGUAGE_STRING(
-            "CRISTIN",
-            "CHRISTINE",
-            "CRISTIN"),
+        .trainerName = LANGUAGE_STRING("CRISTIN", "CHRISTINE", "CRISTIN", "CRISTIN"),
         .items = {ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
@@ -12483,10 +9990,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_GUITARIST,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE,
         .trainerPic = TRAINER_PIC_GUITARIST,
-        .trainerName = LANGUAGE_STRING(
-            "FERNANDO",
-            "FERNAND",
-            "FERNANDO"),
+        .trainerName = LANGUAGE_STRING("FERNANDO", "FERNAND", "FERNANDO", "MUN"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -12498,10 +10002,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_GUITARIST,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE,
         .trainerPic = TRAINER_PIC_GUITARIST,
-        .trainerName = LANGUAGE_STRING(
-            "FERNANDO",
-            "FERNAND",
-            "FERNANDO"),
+        .trainerName = LANGUAGE_STRING("FERNANDO", "FERNAND", "FERNANDO", "MUN"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -12513,10 +10014,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_GUITARIST,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE,
         .trainerPic = TRAINER_PIC_GUITARIST,
-        .trainerName = LANGUAGE_STRING(
-            "FERNANDO",
-            "FERNAND",
-            "FERNANDO"),
+        .trainerName = LANGUAGE_STRING("FERNANDO", "FERNAND", "FERNANDO", "MUN"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -12528,10 +10026,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_GUITARIST,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE,
         .trainerPic = TRAINER_PIC_GUITARIST,
-        .trainerName = LANGUAGE_STRING(
-            "FERNANDO",
-            "FERNAND",
-            "FERNANDO"),
+        .trainerName = LANGUAGE_STRING("FERNANDO", "FERNAND", "FERNANDO", "MUN"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -12543,10 +10038,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_HIKER,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER,
         .trainerPic = TRAINER_PIC_HIKER,
-        .trainerName = LANGUAGE_STRING(
-            "SAWYER",
-            "EMILIEN",
-            "DOROTEO"),
+        .trainerName = LANGUAGE_STRING("SAWYER", "EMILIEN", "DOROTEO", "SOREN"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
@@ -12558,10 +10050,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_HIKER,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER,
         .trainerPic = TRAINER_PIC_HIKER,
-        .trainerName = LANGUAGE_STRING(
-            "SAWYER",
-            "EMILIEN",
-            "DOROTEO"),
+        .trainerName = LANGUAGE_STRING("SAWYER", "EMILIEN", "DOROTEO", "SOREN"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
@@ -12573,10 +10062,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_HIKER,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER,
         .trainerPic = TRAINER_PIC_HIKER,
-        .trainerName = LANGUAGE_STRING(
-            "SAWYER",
-            "EMILIEN",
-            "DOROTEO"),
+        .trainerName = LANGUAGE_STRING("SAWYER", "EMILIEN", "DOROTEO", "SOREN"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
@@ -12588,10 +10074,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_HIKER,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_HIKER,
         .trainerPic = TRAINER_PIC_HIKER,
-        .trainerName = LANGUAGE_STRING(
-            "SAWYER",
-            "EMILIEN",
-            "DOROTEO"),
+        .trainerName = LANGUAGE_STRING("SAWYER", "EMILIEN", "DOROTEO", "SOREN"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE | AI_SCRIPT_TRY_TO_FAINT | AI_SCRIPT_CHECK_VIABILITY,
@@ -12603,10 +10086,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_PKMN_BREEDER,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE,
         .trainerPic = TRAINER_PIC_POKEMON_BREEDER_F,
-        .trainerName = LANGUAGE_STRING(
-            "GABRIELLE",
-            "LARA",
-            "GABRY"),
+        .trainerName = LANGUAGE_STRING("GABRIELLE", "LARA", "GABRY", "GABILA"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -12618,10 +10098,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_PKMN_BREEDER,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE,
         .trainerPic = TRAINER_PIC_POKEMON_BREEDER_F,
-        .trainerName = LANGUAGE_STRING(
-            "GABRIELLE",
-            "LARA",
-            "GABRY"),
+        .trainerName = LANGUAGE_STRING("GABRIELLE", "LARA", "GABRY", "GABILA"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -12633,10 +10110,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_PKMN_BREEDER,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE,
         .trainerPic = TRAINER_PIC_POKEMON_BREEDER_F,
-        .trainerName = LANGUAGE_STRING(
-            "GABRIELLE",
-            "LARA",
-            "GABRY"),
+        .trainerName = LANGUAGE_STRING("GABRIELLE", "LARA", "GABRY", "GABILA"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -12648,10 +10122,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_PKMN_BREEDER,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE,
         .trainerPic = TRAINER_PIC_POKEMON_BREEDER_F,
-        .trainerName = LANGUAGE_STRING(
-            "GABRIELLE",
-            "LARA",
-            "GABRY"),
+        .trainerName = LANGUAGE_STRING("GABRIELLE", "LARA", "GABRY", "GABILA"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -12663,10 +10134,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_BEAUTY,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE,
         .trainerPic = TRAINER_PIC_BEAUTY,
-        .trainerName = LANGUAGE_STRING(
-            "THALIA",
-            "THALIA",
-            "NEREA"),
+        .trainerName = LANGUAGE_STRING("THALIA", "THALIA", "NEREA", "TALI"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -12678,10 +10146,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_BEAUTY,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE,
         .trainerPic = TRAINER_PIC_BEAUTY,
-        .trainerName = LANGUAGE_STRING(
-            "THALIA",
-            "THALIA",
-            "NEREA"),
+        .trainerName = LANGUAGE_STRING("THALIA", "THALIA", "NEREA", "TALI"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -12693,10 +10158,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_BEAUTY,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE,
         .trainerPic = TRAINER_PIC_BEAUTY,
-        .trainerName = LANGUAGE_STRING(
-            "THALIA",
-            "THALIA",
-            "NEREA"),
+        .trainerName = LANGUAGE_STRING("THALIA", "THALIA", "NEREA", "TALI"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -12708,10 +10170,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_BEAUTY,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE,
         .trainerPic = TRAINER_PIC_BEAUTY,
-        .trainerName = LANGUAGE_STRING(
-            "THALIA",
-            "THALIA",
-            "NEREA"),
+        .trainerName = LANGUAGE_STRING("THALIA", "THALIA", "NEREA", "TALI"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = AI_SCRIPT_CHECK_BAD_MOVE,
@@ -12723,10 +10182,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_PSYCHIC,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE,
         .trainerPic = TRAINER_PIC_PSYCHIC_F,
-        .trainerName = LANGUAGE_STRING(
-            "MARIELA",
-            "ANTONIA",
-            "MARZIA"),
+        .trainerName = LANGUAGE_STRING("MARIELA", "ANTONIA", "MARZIA", "MARIELA"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = 0,
@@ -12738,10 +10194,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_PSYCHIC,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_INTENSE,
         .trainerPic = TRAINER_PIC_PSYCHIC_M,
-        .trainerName = LANGUAGE_STRING(
-            "ALVARO",
-            "ALVARO",
-            "ALVARO"),
+        .trainerName = LANGUAGE_STRING("ALVARO", "ALVARO", "ALVARO", "ARANO"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = 0,
@@ -12753,10 +10206,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_GENTLEMAN,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_RICH,
         .trainerPic = TRAINER_PIC_GENTLEMAN,
-        .trainerName = LANGUAGE_STRING(
-            "EVERETT",
-            "LAZARE",
-            "METELLO"),
+        .trainerName = LANGUAGE_STRING("EVERETT", "LAZARE", "METELLO", "ERISTO"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = 0,
@@ -12768,10 +10218,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_RIVAL,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
         .trainerPic = TRAINER_PIC_RED,
-        .trainerName = LANGUAGE_STRING(
-            "RED",
-            "RED",
-            "ROSSO"),
+        .trainerName = LANGUAGE_STRING("RED", "RED", "ROSSO", "JORO"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = 0,
@@ -12783,10 +10230,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_RIVAL,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_MALE,
         .trainerPic = TRAINER_PIC_LEAF,
-        .trainerName = LANGUAGE_STRING(
-            "LEAF",
-            "LEAF",
-            "LEAF"),
+        .trainerName = LANGUAGE_STRING("LEAF", "LEAF", "LEAF", "JAHO"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = 0,
@@ -12798,10 +10242,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_RS_PROTAG,
         .encounterMusic_gender = TRAINER_ENCOUNTER_MUSIC_MALE,
         .trainerPic = TRAINER_PIC_RS_BRENDAN,
-        .trainerName = LANGUAGE_STRING(
-            "BRENDAN",
-            "BRICE",
-            "BRENDON"),
+        .trainerName = LANGUAGE_STRING("BRENDAN", "BRICE", "BRENDON", "BRUNO"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = 0,
@@ -12813,10 +10254,7 @@ const struct Trainer gTrainers[] = {
         .trainerClass = TRAINER_CLASS_RS_PROTAG,
         .encounterMusic_gender = F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_MALE,
         .trainerPic = TRAINER_PIC_RS_MAY,
-        .trainerName = LANGUAGE_STRING(
-            "MAY",
-            "FLORA",
-            "VERA"),
+        .trainerName = LANGUAGE_STRING("MAY", "FLORA", "VERA", "AURA"),
         .items = {},
         .doubleBattle = FALSE,
         .aiFlags = 0,
diff --git a/src/decoration.c b/src/decoration.c
index 93c338e3a1..335b1ff7dc 100644
--- a/src/decoration.c
+++ b/src/decoration.c
@@ -209,6 +209,8 @@ static void TossDecoration(u8 taskId);
 #include "data/decoration/description_fr.h"
 #elif ITALIAN
 #include "data/decoration/description_it.h"
+#elif SPANISH
+#include "data/decoration/description_es.h"
 #else //ENGLISH
 #include "data/decoration/description.h"
 #endif
diff --git a/src/fonts.c b/src/fonts.c
index 010257cf1b..5477653295 100644
--- a/src/fonts.c
+++ b/src/fonts.c
@@ -4,6 +4,8 @@
 ALIGNED(4) const u16 gFontSmallNarrowLatinGlyphs[] = INCBIN_U16("graphics/fonts/french/small_narrow.latfont");
 #elif ITALIAN
 ALIGNED(4) const u16 gFontSmallNarrowLatinGlyphs[] = INCBIN_U16("graphics/fonts/italian/small_narrow.latfont");
+#elif SPANISH
+ALIGNED(4) const u16 gFontSmallNarrowLatinGlyphs[] = INCBIN_U16("graphics/fonts/spanish/small_narrow.latfont");
 #else //ENGLISH
 ALIGNED(4) const u16 gFontSmallNarrowLatinGlyphs[] = INCBIN_U16("graphics/fonts/small_narrow.latfont");
 #endif
@@ -61,6 +63,8 @@ ALIGNED(4) const u8 gFontSmallNarrowLatinGlyphWidths[] = {
 ALIGNED(4) const u16 gFontSmallLatinGlyphs[] = INCBIN_U16("graphics/fonts/french/small.latfont");
 #elif ITALIAN
 ALIGNED(4) const u16 gFontSmallLatinGlyphs[] = INCBIN_U16("graphics/fonts/italian/small.latfont");
+#elif SPANISH
+ALIGNED(4) const u16 gFontSmallLatinGlyphs[] = INCBIN_U16("graphics/fonts/spanish/small.latfont");
 #else //ENGLISH
 ALIGNED(4) const u16 gFontSmallLatinGlyphs[] = INCBIN_U16("graphics/fonts/small.latfont");
 #endif
@@ -118,6 +122,8 @@ ALIGNED(4) const u8 gFontSmallLatinGlyphWidths[] = {
 ALIGNED(4) const u16 gFontNarrowLatinGlyphs[] = INCBIN_U16("graphics/fonts/french/narrow.latfont");
 #elif ITALIAN
 ALIGNED(4) const u16 gFontNarrowLatinGlyphs[] = INCBIN_U16("graphics/fonts/italian/narrow.latfont");
+#elif SPANISH
+ALIGNED(4) const u16 gFontNarrowLatinGlyphs[] = INCBIN_U16("graphics/fonts/spanish/narrow.latfont");
 #else //ENGLISH
 ALIGNED(4) const u16 gFontNarrowLatinGlyphs[] = INCBIN_U16("graphics/fonts/narrow.latfont");
 #endif
@@ -180,6 +186,8 @@ ALIGNED(4) const u8 gFontNarrowLatinGlyphWidths[] = {
 ALIGNED(4) const u16 gFontShortLatinGlyphs[] = INCBIN_U16("graphics/fonts/french/short.latfont");
 #elif ITALIAN
 ALIGNED(4) const u16 gFontShortLatinGlyphs[] = INCBIN_U16("graphics/fonts/italian/short.latfont");
+#elif SPANISH
+ALIGNED(4) const u16 gFontShortLatinGlyphs[] = INCBIN_U16("graphics/fonts/spanish/short.latfont");
 #else //ENGLISH
 ALIGNED(4) const u16 gFontShortLatinGlyphs[] = INCBIN_U16("graphics/fonts/short.latfont");
 #endif
@@ -240,6 +248,8 @@ ALIGNED(4) const u8 gFontShortLatinGlyphWidths[] = {
 ALIGNED(4) const u16 gFontNormalLatinGlyphs[] = INCBIN_U16("graphics/fonts/french/normal.latfont");
 #elif ITALIAN
 ALIGNED(4) const u16 gFontNormalLatinGlyphs[] = INCBIN_U16("graphics/fonts/italian/normal.latfont");
+#elif SPANISH
+ALIGNED(4) const u16 gFontNormalLatinGlyphs[] = INCBIN_U16("graphics/fonts/spanish/normal.latfont");
 #else //ENGLISH
 ALIGNED(4) const u16 gFontNormalLatinGlyphs[] = INCBIN_U16("graphics/fonts/normal.latfont");
 #endif
diff --git a/src/graphics.c b/src/graphics.c
index c343eb7d09..699fa3d1eb 100644
--- a/src/graphics.c
+++ b/src/graphics.c
@@ -1797,6 +1797,8 @@ const u16 gTilesetPalettes_General[][16] =
 const u32 gTilesetTiles_General[] = INCBIN_U32("data/tilesets/primary/general/french/tiles.4bpp.lz");
 #elif ITALIAN
 const u32 gTilesetTiles_General[] = INCBIN_U32("data/tilesets/primary/general/italian/tiles.4bpp.lz");
+#elif SPANISH
+const u32 gTilesetTiles_General[] = INCBIN_U32("data/tilesets/primary/general/spanish/tiles.4bpp.lz");
 #else //ENGLISH
 const u32 gTilesetTiles_General[] = INCBIN_U32("data/tilesets/primary/general/tiles.4bpp.lz");
 #endif
diff --git a/src/pokedex.c b/src/pokedex.c
index 519a51a393..a0fb6f20b2 100644
--- a/src/pokedex.c
+++ b/src/pokedex.c
@@ -875,6 +875,8 @@ ALIGNED(4) static const u8 sExpandedPlaceholder_PokedexDescription[] = _("");
 #include "data/pokemon/french/pokedex_text.h"
 #elif ITALIAN
 #include "data/pokemon/italian/pokedex_text.h"
+#elif SPANISH
+#include "data/pokemon/spanish/pokedex_text.h"
 #else //ENGLISH
 #include "data/pokemon/pokedex_text.h"
 #endif