From 71902753c33a298edf3bf5b015d39ce0f253514b Mon Sep 17 00:00:00 2001 From: infinitefusion Date: Mon, 27 Jun 2022 19:08:12 -0400 Subject: [PATCH] removes lance from saffron gates --- Data/Map015.rxdata | Bin 15144 -> 16395 bytes Data/Map018.rxdata | Bin 12409 -> 14534 bytes Data/Map066.rxdata | Bin 10205 -> 15869 bytes Data/Map415.rxdata | Bin 10239 -> 12480 bytes Data/Map542.rxdata | Bin 24338 -> 24259 bytes Data/MapInfos.rxdata | Bin 36501 -> 36501 bytes Data/Scripts/048_Fusion/PokemonFusion.rb | 37 +++++++++++++++++------ Data/System.rxdata | Bin 27266 -> 27244 bytes Data/Tilesets.rxdata | Bin 341716 -> 341716 bytes 9 files changed, 28 insertions(+), 9 deletions(-) diff --git a/Data/Map015.rxdata b/Data/Map015.rxdata index 50076074e701025017e46c221adbc1974c506e9c..3b176289c17e1a6d0c216bb199ac43449a353c6d 100644 GIT binary patch delta 1578 zcmeHHPe>F|8262YCVnMBYIifKqi#6mdjzTFuaXJ~!vvK`6_ z>ChpU4-tv#5TO4+W0oShMr#03Y_5pNUd`SKKM<_A!Z20p zwt51G5E_E>b@lKzSPjc1nIPVQtJqdop{{8VF(@>fL9#HY=4C`B+;2{sLaGpdO-BcbUurBD*bW;%scEl$idWpP0K63}&6 z3ws5Wa|j%ob!g6^d05}GPjqYOy}gQ9@}=x&F2H6(2aNjtFe25$)PV+w>?(&Zb)9h3 zABN4mZOJcNv5I#kFfDpvKs+q;B6!$x&e{+si_t}R;`5gd5kE+n`FCa3#5kdahbCv0`{Uq`$_Z5=HlVNhUN zsS$=8I_A)bL&qIDDQv5wVTei*rk^Hw!!icf8Db% zBOXll{&CNeNn#YnOkPR9Cxcg2;(V-(v$>Kj^r(=tWBp}wvrqZz6n?{@Zw`HT=%+(P z#oK?16_o@RiouzdVKi%&2y~=d5R!q7FMa`jo)r6#^S(0^H7K))DG0m2e z*}I1NPG?)L$iWz_+gg`+QaWxB2!ldE9LVGXHR;j$(OEgAOP*Uo@o!jaSDA&*p(Jd4b6bOkOCa0DPA1@FE_DC8q*yO+JttB5>311=X<+_IFo7zv6=L@n*fd`Ynf|;BcqG?w0gP z_d6?^gEg;YRq<6L=8U*t#6=S8pyYXu?i-oB5g!_{V8o)n=G}`c%xJ|Mh}dxtlpJ2@ zNYHr(;pHLzKiCsX*gUqsG$=d?`Tm_fM|ap0chdi$$?XRDrSW(5C$1}>$Zifjy2GJ3 zMf?89q7Cf|v8NLjBYtAhD!s$6*^rYwMse~GdEnxKuox>pKna?F!`wJ*1nnRvT<}Tm zAvX5F1tp}fwBNImn|nN(Mos#y=zEM#!1Y)?I?3=9!!r!eGE5Vc;HgJ~AF*{b$#PQ+ rXBf^h%o3E~Ra-5b?|KGbWGA~i$KnfH-{or*<{Zf$&8bHZez5-pofKj5 diff --git a/Data/Map018.rxdata b/Data/Map018.rxdata index 134d962629b864f9c392ebc0b5b770ffdd9d5686..820d696a27a4be9bd15ea1311279e75ce5e99286 100644 GIT binary patch literal 14534 zcmeHO-*X#B9hc;eB-@hgIL1eO_$|0piV(w z8nx^P<4iu;zPQX94Xjs_@+91A!dNyjc?U`&sU+ze%BYlCc|>h=i!oCfbB3pS6-J{G z=&-`7ghv0(l*y!W>_MU_kCvEDE=2gxU)XO$k3gj3$`p+#$7%G>-mP((_DIa5jME4` zL66f69OI(-@BNXKX?GN7i14r8Q6gSH5qTotU|XbYw+sRkIi9allT>WV^m2_pD#GOo z)2oydn2g%1=gxYyd|l36ToVU1Rc@^s!JTCMC-%N13M--N|=PZ!FxO5^@L z3+;Qhuu1WTMmVL(c{A*oEX zRfSVMWk`T5xpeq4S)0@_IAcXnJd+p%+a)=jw@q5F6BFhF1KPwWW1Tjj&9pmS%_I+- zM6a}H5+;kaZQQcTu(&oeig0(`#D+>MOg`7Uw71=BDQLzFT%mT0M*j=_R#Z^W3TS89 zvxqb(tPSTn@Cgio(#cT+x@7{I#1@ev9{^*UxMb2URVYpRp1@^ zRblPwY7q=!Y~{3G|-=dT7{fK7dWFCebqmxWYjVWnvHkm0{)N!HJea%QHblY@< zLhpguJfxTD(tenYassUOWKlWAl+zjIOi}p^D7W$~*yq`z@>#fcuBbc*XQ-&mz(Hcl ztgB9sC=F&*_84ENLrbfBFbgxDhHnhnot(ucm+OJ zOUjGT_?nQ!!h*5{=hx|ka)VA%SaL@MNk;^n&xr?VAqMHJv9XLbtfQ- ziv36|i|;rG6+I})lcgUK((e%ciNgKGvdJo&#GY$lja&*<1yC4Y8$63U67}ATx{t9( zf2^D>4Q=hdyt}P^Fp+o58$7KOa6qr5oO^3)g z`N-7ao5DpO;)`ZH-AvG99snj-8vp@2yTGt0f`LB>xXDLibj*fZF~3-^hpWjWMxE~=zPb!ro>g>(k! zNNn51Kqr_3+IAN4EJ`d*4;CI*an+ei118g&7t-(naWJMXuj;4Nj8_QVa)=hbu%(s=wPV2 z#UU#Q21~CLm}Mbqxgm(N#0+f^q+-K>2t^>LP%;&;p3x!xkJIRfFdFi1>7U<1qlG}f5#>Tjd7fJ+=O`Mm z(7y^U+ZLLS{w<97_b}o=!ifJ2BmS$GNY8jQkt`=+di;;WA!qdM06g;ZNZ_1jcCnub zx3V*U?h5XG7upT?;a>ER!8=bqIJ{>7-s9ZMAHn+}f_Fa@?SS{e;?NMdf6n)qLnMiN zgVRF{_%XuuFkF4ys67O4hZ?-6gR$auCscGGHBjjI^kR4Ho6%lO&BwkSN_{(&`khef z_d==fgisGYg8N>w8^H&2l!pt^7ZyE4PXnSKqYz~V>bY()5eke>#o-B|qqnDV$ZEO+ z7ISy3==mXE2dsw2dqEf#mGvdBp38%(6or&IAcBbpV`BM-spZbxtDy>Ho|c=J^71Dn zE07jzlyqlY@nJe%DnKf;da=P1O`^ko4yl-he$E_g^@$EQ>!pXfHQGiHbcf+-Y7j`3#XYZ+5o>W7E z4tYAlaC~#^wHffm!Ic?G5HGFT$Rea+fk-zADiPd3>rVX`a!?D|coR}k*x52WYUA@f z`|KQZ7HTFfUOM3Q0?5{#dI3n0*D`2GRU*N2Dkmik7I#i}rjD@F5mMZVJrnbWkNLS{ zf`ZrBWp|n0?uJ^!IoS5&MVl-n>YCw{DPY+^mti$n&B@q%WhCL3gXM^oJFBIY;=MQ4 z%XhF|A!2@kaAVfkSSNMZfF|Y|Hf^YC%;Bu$w3f0tQGSU1Fy?F4lw0;db+ZZE-Cmau z{ma+Rudz)6^_klm+rZkqP9E9r9fjL>UzUQZ;F6^tt`0zzr6W+g_Wupk0OA}Kgri@g z+^NX&6onPfI=Tugv1?qNonY0sj(9$HJ(MbkQeO(Cej$WPXT7mRAtf#iB9J?TZ=ls# z7HVBJ24+I}xy=~Tpx8N&-0KYjMZczju#H})nxUd)#_fntO`t&AivYe2yyo0<1?2)o zsy=J^)sQ*oV{e91-wLIEJ%rj5ygo4|a^x#wqPTS0*ti7<(BTP$zU810=j+rZC33~N%Cmx@M!DsXzP&MU*E06 zSZYKBJi!Pz6H1*7rA~!Xr$ebHL#RCw++J)T_JlHhb`Ez8WqceRvXT_=qyq$6eI5+j zkvqS}G9-5bE!3j{Vw->*9FO+WpR(hd74w$7TB7?9XO@KFj|LZ}Ul`UO69$ zT!qh0KkmBh)avMZzZLjC=+h4lkWR@R=xOn{xl}^ys!gZi)7j-hlr*PIUf~j!J61(d&qjn z-CZZO5J)E>c(?}yx;J=6+;I;acL*VP;DHyOfCs1$Lhu*x-jfh~XLe_IZLb}-O}KKG zB+hzgzdQ4t@8|n__hU(>rgyeCRCNnCC)LsXZmq%8X)$uGRiUgvb&^z5`F*Ch8iZ1H zEN|cjQ6lPizDezJ9fl_JHc(l_F3}1-2gGEb7`F9|Njk>V2{G3?9~tBK;2N>+#F;wl zkE`l7jGj^_@(s36N_M+RXapA0sb$|8XX-OP=^AS^uu)0EnoVp1BQ`PlbXp>*CF!f$ zsFGQ~Pi=IaF;g1@-cosLRA6l}VVPA3jlR#cQ%P<5PNJob7MVewkMN&=vfqXtVUUh% zGc=;j(&#_jTjMnC4l#FRoJQy@ou(N$#wGdhy_K|QoK?gU;s1J9iMaDbKr&@!RH#jv z!Bpgn!;ze-uF0zzbvkbya9mbO`&g%yf;yA8h+Zu@qos0PiC+WhIj74UvAB27vVYG$ zHYwiK2_I>3IG*j8#+`dA@6m~gX8d!PLawwTSE^8xl=((VReHYwoCwTK*0PCIye-gz z9X^oMrhHZ5qb~djK#$|W1!L{eW|MPT0IW^YB-k#h>AY>yT8)^nIpDx1%@Q_f188QP z^{OVh*CIx_O_M-eGjX#{%S=7jE7}d`S_;Tm6PKyorqTbvH03(zUm4V|7p#!+%lA%W4u* z5xm=VkX@}_0M#E`|8g$(lA6f3=_LHWPcv#V4?K*~Nv5U8v&(HH5J<1iNOS*D%NXlDxA$3fM#=fE7#7PL>mp3fDuPr?~0XmfB- z3fer=&O17$J@4t1_NjulP}CNIVz&fM?3`Rd9(FbTd6kvAs_DacQ?pb$VsoJlZ0&VbCjVopKE+doOs=c8}SAn@;AZ`Z9%#~0_uL*twq z$QE2~lb}fNdwH=f_b@2D#UY0a3vYaUsPNW3!Nt29PJmk;HogUyO58~($!*+LCT>Cn zW1=l69U#WfKqfFt_uLI7Xe1x~gF6`efrKSV&3&ug;cXg&@yt3>L&ph&lPVMdzkK3|isYjJvcxKR%SEp8Qqs1#%gSC@ysKInvTEhxJ zkp^oR2PhI0Dk%X4K;rc?UU(cRp1W1gau7@+LMw*j-R+y*Qh6kFKeuTki;#u|aPARQ zB)EZgM7fCS*g`hmBL;$Amf2AeFQFdb=ZkgHUI2~^W+R>0wgAp(L(39TL-Od?!H}7R z|5+MD8zOhx5(d9a4iPGcmWZX~S)cII9S1 zC7Zh-@AzKK)2vgg(Bjhxs+lclaJvNeyvvu*Z?iqpV8({dcCo%>ko&fC$Lhw`%Suoc zoMA<-;c=CqQ;ON#b+_SAEe5w$T)(!pb8GF3>&4PmR=G|LgIY?qw7ICUf_wSa`c-PPve^%@)b#vQ?~G(7teh_w&-3U_a`z=tGH=z~eEle14T#7Wgcu zyCXU{4DAw7@MaU5J9W@-aBOvgO>k?%)o{qNpvhd#`D{LH8K691FcU{qEEGs~#$Anu zqgO4B9`Zd-Az;r^rDwXO)*p2TO7AgHTshs`y$%te z!xKorJ*7|5=mY*Iv)ymGRxi(o$$q`bOtZ@a$EZ&9cFm+nrVr#B1k z;qt+garsycbjN2qF`qZ7(i9r!J?R&?1<_#}VB?N=^UzMTPM%>5{|qB{(anH41WB54 zA&}27PI`n#)zA)4wm_{t5A1tX?rVe5X)^}Ssxx=vPKl31`W4*AS5En9yjRf%lJt*Y zvoNM}d_?x(HJ47hgu3}n!NYvtaRvJi0pB%5rqriVcqn(_O_E?6)9+FRxs%(JpZK4mcI|S` zg@9YZgm{}+BL-p-qW&jft< z_iw|$gSq4TeRJfkkyMQT{$%9Mk^bwvGxBqn?q?(K44{j~9!8z{9!4KV`_K1Lqx(|i zs}V;oso2+!7191O@4f=+b*w+{&hg))TH-y$ndv>{wfLYpf8)~0V?SDXT^^q{y5G6` zkjHTTIHqsS|8)NCdHyY&=EF96@q8q52|kDYIC43R>g0Mq3490i>AO#nPN^Ny)8cPj q*9ooFZ8`&QM8oUU3?7TX8`1oQYdQ~a`ybE>H2%+YToiBhNB#>w)3DnB diff --git a/Data/Map066.rxdata b/Data/Map066.rxdata index 19754280768268ef64f2aeb335f2ee3fbf4dde47..ffebcb784173e52f9df8d77d7e13af0d605911c8 100644 GIT binary patch delta 1926 zcmeH{TWkzb7{`0gw7bjf_O{bqUE7^gR!S`5){Bv#A}(=x5z;owu&3QqV~%WR+bq(C zH;D&)5^p3TA`*g$OX7tW5y2xbBioLfJBT59S9 z0`p?wx~4@mUrSbIXqMJ>6P;MxFbL})d7dM^x@idm>7*94hiWRn?V`VVQ7$uwEVjgY zv8tA|@LXM%5-URqH!11OaKg+EW>{I>qG`f&S(0IC%5#>m6RnaJX<^nioMvb~HS{z$ zYd_53J!p9D%MzSlU_q>`zj-w^jFc1K37w`L%w!fd^2FqplfT8xPLWZT=Q=aO)|(=< zhnj^#zsez+<|L!{ctvayRpcjsHyhu_9i2X9u}M1g4OWU6)FPXN52|m-xErbygIShA z#Y}fMHw!+y?15MWjd;T~C7_kH1^31$f*N0g(OtL{4`X!ClLwv*dh*zlr_hiXTM=OB zrt=huEPY}(`(TZq!0kjBwnfV^+6O1p2#`n%ypbWwJl0Vz59DX8h3mJ??>{ZHDNvdW=wmNDq!kZ<~tC!&| zl6|uJI>v`2m*c~p9P#9+C&wiFR@{g1W$*KfCs#eW=E)67bkXxpuY{d~m6b3Mo`Gao isHR|vQX$&c1URlnMFVwmnhgmOC?q delta 406 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 H5)k_jWv4=j literal 10239 zcmeHN%WoUU87HZRq$J9+9=7AgwMQ!@l4@En*N^Pl2`yQag<7^C(+&!`Aco|SoNBqV z-d&0&iuTld(W1Ae_d2I0=N<~=)Kif|67@&SyBb2H`83WgdlHOr; zhoGzI3fg9SpT4Lu1KlIoayFP=y7GwC^+#0SCzd*#F{x9m!jq{C*(Zi$|8$5BF?Cev zSm%@>&V(z(-UVyU1awv12I{yvnyImUl6RUWp%E}Zr?#`JGWBf0y2ffXY?PAfX^>=r zfex|k-MDhWEUaN&U#%DBR?@EiJT1*5Foqf>&@BWOS&7hCG0L>Dq&5zZ4c;ToDQ$vA zv`P9CpW02B#~2o{yy?u^Xy)1yT3T8{w2YdpjvCl-ki$@gA*X7wdZmi0#3HSVk~BqQ z+n<7R*8ry<1L9z5*nrzlH+}>vi`bZTghGZM;d0r6G_6smi5k?YLI#nEo7AX)Jp?S% z^#uej}Ol3J2J)&_-dCEV18D3uDnk_wcw zPdA=!KY*Ch63;#Scsw$iNgAgSo?Q9t&jQ6vJL9??xOOS*rgko?z1hJlNeaB`UiO~a zaG~6Ky0&}c$G6J%?Uj}HHobx=5S>Ckk|CPj_1lx*0O4Hj8U7)1nXivWQ1H z93pLVR@X%!AWCAIU@%u$sDd4`M_@2oFnKVf6ATr_=RvGPP4O^=^A#Rsr`DfS2i;}N z>NL(0b#*WY65fvRpTDy|b^H%RI_&9){!I>1I^vO-M@iD?7yMUd<>zuh*0uAl0wKNg zpLPXOOgPzMviyw?c>h>{yU@rD2DQ;(I>WzNrxgE?> zT?64)A?M(s;WK=Z871maW-t{6%f5>cRCP_>J*7@$Y*^ch)s_4{)@doLPG)SPm-8+) zU#u$eJAe}0kIMiCXxx8hIe2CtTa+&-oKoko}x21=#z`Rbw_5Md`mA|O@)vS#I_uEbI;+jVzjwOVg*FTK=d#*7tT0!z+V`1uIi;l`pV}2AqAh@^MR+a2M7s?CSK#%7 zoOTVEugma4u?ft3xOHC~$GXTdtplVrwEkpi>6)6zG-(R{KBwbqG6Mw&3p>+NL)r)+ zM7Kn)AE!i4Aie}BapmPg{OCWR_Qg8oV|-p+tvEaS&o(wl>}w3PW2va;MzDzWgl?@s z>HiP4V;BBQ7f!(TON0MD%sEmGy?U@MaqtPyeq{|6K3#U)BltCQ=yDy`E@h95CAzNG zXI4L0$y=iZEq@&pX>o8{B7f5!$mxHa9_$va$h>k z`$WHs(wlUKH!+|f!~=i!EDH2=-kA!j*q$EH6O>JB7P{2Sp-J%J=P{G8;w2#gNl4J- z>z9OQbd1h^t5a~*OTk%4L6Q!(fa^s$29C1-dh1~|%{xKRC=(4I_z#WI*8Nq_g^$;5 zcuRL{)8Tu$nvHb2M^KL78rl&v5~^ZoFyTF7Am|iZ2m0KiEyzU$V0SuKB~9MKGnfNS zDaYacZ)`MqpOYHW##qqZ=B=8x&gQv(c7d_KaJVHr@wb7UHF&G{$_4H`|$Bj{ysK}MEVzM zNllxD9a4ca8e(n3fe<`4htrDSR?)n{&zoHpQF1UT3_-&u*~elB&F;39U^yM43|N(~eaq>7{fT>o%;AZsLQc z^JMraYIz<3Lu)hd{Z(e$h}!O%jX0NKs6e2=O%s~XRj6<{gsH+Yn~iXRAK&nlrJ<6g zv>OhgMta?h}4UR$*yK zSee0qqT_}biK&9tf?5bAJSZ*FAu18@2adUV5GaC9dO-K~T8<*V+|xod!n zqsIV03_?GbcZzM|@MiHv@r?pIl;{XQ(NV`UxDLHw9XIpvg@YWN>6fsB>*`RB_uOL_ z5(5BWC*d^;FaG`)@TW2Lzqo!s@S@B0(Lh+=9|k_|a(xow`)D8;>wdlPIX@Xl#kyY~ z`+VJb+&j|3e);|t?R`mkjj3LI0oS+T9hBE=|1&f5_4L2HT;EJj&jb#C_XQg!Gg9OJ?nFoRtb9OLp+ WVmb}qt!vN{>=Vu(xGBCv7x@n@@$iEH diff --git a/Data/Map542.rxdata b/Data/Map542.rxdata index b7a38a84c0dd5513561033f83d4cd3806735fdb9..a4d5930a66ec88fc7c95d20347e07b3eaad03484 100644 GIT binary patch delta 39 xcmV+?0NDSMz5&C%0kC5-0YkH&6Qu#O2{cIrv!OWZ29q2P3X{JK6SJs4Y9BD}4toFq delta 80 zcmX@SmvPcQ#tq3vjINvK3om8d%xU7u!pxq@Fj+}iRl&_#B$M4*G?VdSzO@jCwQw|> g0}~qyRFLT}<7RJ*k8G1~b8=0Nm*?3WWM3!`0IH=HoB#j- diff --git a/Data/MapInfos.rxdata b/Data/MapInfos.rxdata index 6eebe95a00b48a9085625d8ddd9b759a900b871e..05beebc6c7ad1e085e29aeba36af44b6f0fd5956 100644 GIT binary patch delta 108 zcmbO_muc!;rVXzc8QnI&X8g|#qF7I>0jcdep^S_nn|bxP1%NzBI~yh-FU&!g3CL@4 znjiw?iH7HL0C~;v`#{>A5;yVzsW18BtW23qlX**JnCzK0YnNt;14XCx{AUCJyeT6> delta 110 zcmbO_muc!;rVXzcC+l~!Zhp`Bo0&0W^J~`AYCvkcPADUz+h$%pZUG=q($0nn$P07O zWdibAoF<3>d7|OD96(-k{60n?<&?OQ4@iB<7iVP(W0}lbD#KLFyji<6OB^UVt>-@@ E06Nbkw*UYD diff --git a/Data/Scripts/048_Fusion/PokemonFusion.rb b/Data/Scripts/048_Fusion/PokemonFusion.rb index dc0e69ed5..976b3ed3c 100644 --- a/Data/Scripts/048_Fusion/PokemonFusion.rb +++ b/Data/Scripts/048_Fusion/PokemonFusion.rb @@ -630,6 +630,8 @@ class PokemonFusionScene end # Opens the fusion screen + + def pbFusionScreen(cancancel = false, superSplicer = false) metaplayer1 = SpriteMetafilePlayer.new(@metafile1, @sprites["rsprite1"]) metaplayer2 = SpriteMetafilePlayer.new(@metafile2, @sprites["rsprite2"]) @@ -706,13 +708,15 @@ class PokemonFusionScene hiddenAbility1 = @pokemon1.ability == @pokemon1.getAbilityList[0][-1] hiddenAbility2 = @pokemon2.ability == @pokemon2.getAbilityList[0][-1] - setFusionMoves(@pokemon1, @pokemon2) if !noMoves + #change species @pokemon1.species = newSpecies - @pokemon1.ability = pbChooseAbility(@pokemon1, hiddenAbility1, hiddenAbility2) - if superSplicer - @pokemon1.nature = pbChooseNature(@pokemon1.nature, @pokemon2.nature) - end + #@pokemon1.ability = pbChooseAbility(@pokemon1, hiddenAbility1, hiddenAbility2) + setFusionMoves(@pokemon1, @pokemon2) if !noMoves + + # if superSplicer + # @pokemon1.nature = pbChooseNature(@pokemon1.nature, @pokemon2.nature) + # end #Check moves for new species # movelist = @pokemon1.getMoveList # for i in movelist @@ -750,6 +754,16 @@ def clearUIForMoves end +def setAbilityAndNature(abilitiesList, naturesList) + scene = FusionSelectOptionsScene.new(abilitiesList,naturesList) + screen = PokemonOptionScreen.new(scene) + screen.pbStartScreen + + @pokemon1.ability = scene.selectedAbility + @pokemon1.nature = scene.selectedNature + +end + def setFusionMoves(fusedPoke, poke2) clearUIForMoves @@ -818,11 +832,16 @@ def pbChooseAbility(poke, hidden1 = false, hidden2 = false) ability1_name = GameData::Ability.get(abID1).name ability2_name = GameData::Ability.get(abID2).name + availableNatures = [] + availableNatures << @pokemon1.nature + availableNatures << @pokemon2.nature - if (Kernel.pbMessage("Choose an ability. ???", [_INTL("{1}", ability1_name), _INTL("{1}", ability2_name)], 2)) == 0 - return abID1 #hidden1 ? 4 : 0 - end - return abID2 #hidden2 ? 5 : 1 + setAbilityAndNature([GameData::Ability.get(abID1),GameData::Ability.get(abID2)],availableNatures) + + # if (Kernel.pbMessage("Choose an ability. ???", [_INTL("{1}", ability1_name), _INTL("{1}", ability2_name)], 2)) == 0 + # return abID1 #hidden1 ? 4 : 0 + # end + # return abID2 #hidden2 ? 5 : 1 end def pbChooseNature(species1_nature, species2_nature) diff --git a/Data/System.rxdata b/Data/System.rxdata index e2270342406d7764fa1836d267b34692aa02bd60..3da4de85bd7dafcb6ba45d7a0dd610e138fd4327 100644 GIT binary patch delta 102 zcmZp=%J}9Am>q&9_BL`gh2F)ghqKTp9uu_RR?IVUx-X!CyUnbwT%o1@d! FnE_aGBNPAt delta 143 zcmaEJg|X=>{xGvlR}g2+0ZFh;pYoGY VY5D~vCcgGlHO$*j)v$2w0swfh8N&bo delta 48 zcmV-00MGx_?G)7Q6o7;QgaWh!