From e6d133f7a6a527de6c910a5ebcd12d746eaa4db8 Mon Sep 17 00:00:00 2001 From: infinitefusion Date: Sun, 30 Jun 2024 17:37:28 -0400 Subject: [PATCH] Fixes roaming weather appearing even when legendaries have been caught --- Data/Map562.rxdata | Bin 57845 -> 57855 bytes .../005_Overworld_RoamingPokemon.rb | 2 +- Data/Scripts/051_AddOns/New Items effects.rb | 19 +++++++++++++++--- Data/System.rxdata | Bin 29761 -> 29762 bytes 4 files changed, 17 insertions(+), 4 deletions(-) diff --git a/Data/Map562.rxdata b/Data/Map562.rxdata index 3283be048eb0408dfc946720e9851638f2c3abbd..9776aefd0120bcbc939ec57cbbfa64ebb03ccc6f 100644 GIT binary patch literal 57855 zcmeHwYjhmPmEH^l3@{+U;Y+e8=+PVsBq2f&0Fn}g5hXkbfUrP<20(GSloo2tG=LTd z)8m-|L9FauE%gXx%ZXmeksmq7@jvgLlf>(dAN#{=SsU4w9j_!aIg-7}%Jyb$uM%gy zo9t1TSjl&*y1J@+x@QK1hbS8u0MlJlU3Kfe>fT$oYHAy-?xwL5L*3oS^z7#DXwTHl zoYlRJmGsW1Ol#0g8x7qXd(K(u`8mThyBm8l`kWDON}76R!Lm}_8+x*4AvueWHun@z zJ8u*w&6IgP9x~1unL_^I7PHanjF{?&&;IIyct3ZNh@WTzh@=3G$gj32_?3f zp~QB45bK$<&KZ-1#jJt5Z9OS7XCw=zm6@D2&ky3`q?JjTRA6;$vU3hucXz+|bQ7M< zFVMKVCeP_SyhNNQJLQw-^qi?rr41^X zC&)hFYRv9oOOI2JHMCvc+ciW_UA(8we6%@hzF-Kd9>e&@sGuRS`AkIMpGs{E*E581 zWaZDA*(?Dz2<+yJtf3bsx|@0mIdf*l$eBcpe8I?0>KStmb++^VrgO%J=Z#Eq5f!%e z=;;N0F+T|u7p&|co}S6+*;zAbb>CQw;359mMpU!1deST`n&JP4c9XN9c@iX_B<>rI zha!n)f+VXKP?!P602P>z#!Xaq=xWvjMhqa6l0=t{%`#+f?pe^&XZawAT8u^VS;I(S z0BCm>2%MQ6v=Xtc3}+suN?Z-*x@Iu(0V{Fsro@iH#C44H05EYqv1a0iiNuYla?@Z! zGb4$egNZoac3Fv=ISCRi4$2d|2NQcH5_?g*bue*@*^t;bm}s*Sw{A?d0}+Ya?2#ur zP@@xnU1oh^Ki&`E@8Cq@c06&%U?MskZydO&d8E6(=R9Pxp$7$Kc*sy8wOVpPn-HqjZQrT;m$K~JAf#Tu%=>!RYh3|@5CC@ zwexm1q(kQ6#GPhmqT9UM)I0)-w<9`+jRMT`?CgfgV|t41+~6o7e}l_ zeM6$bG>MHGW)|mIXN|bG$@)vXV!e6U=3%gr!^4mQ=Q_mrc~Cs~n&_eDlwDNwE5SYy zbBA4KiCV+)tFu%6V8Filsl8ooUAMPtzMKc9Z6DV1^VzJGH?+d6nb+{E=d~G3Pnxb} z(|XdNdp)z*uC(w_6&>9+T-bw#v?;TI9#fcZ+O(kGHl>>*>7F*1_LZg;9`5-{SN?kV)Aij$oE{ zjrfL}ZJ64p^c0y4om~$cF68Eopa+6@rl{qfqjPiZ?d=#$+R7L1(T-XRnm&b@5iFz^ zc51z#Cg!=>Lc4a_n%|Q%v;`|ym|fJYX~BoorpiTySwkBySh+c^kAM{{z`A}$aC*IY zlPxweTU3O^on(sp6s(v#*yu>+wws-Ht$OnvOdH$HZQ?1j33uDYoh`NH+PLg#V|x{C zyklNg;2^{5MjHxdWH~}l(1xYZhc7_F87`#M_k^GDE4=7e_%Xl2f9hBGv|r(~eue+S zukeN9Lh~-WOlT*6<%fCINBMd2@F&IX565>~Qw0bkW1M45PU(fSv;QLpvG@*>elS(!bB0CvB27WTLXMMyGZ z=y@}}=+E&>f$<1*OFD093wj2EXlXO%IfJwd)9dY8Z$`7yDJ`#?X)CAA==cx-px&Ip z6|tfg6v^xwrsp$fsq!4jv^IqYGx$&DqecVCYcS_$sVgx@Fho0Ii$QccrqP&@GyoWx zMbbLzJvlZy);lrWfA7FVYg7TmrO+y-R{!`cG!h>j5zHR5PWp*WacMw}$q1G)v{nwY zTS}WX_CRYD^s`0)&F)~Rw47Nni8%`z{5TMq*2b*l*>-JW)_|_d&sy_9G|;3DM8!r+ z-kLMCoQ}$v(q8&J<}?jnL=NDg0cckL2hEsAlHkJq1zb4%k>N;47j9bvjFvl4!b_Ez zBM67}c-V#PyM`={z{>CmN>7pdIiE9jg0-iNv zla|r6c@C2%6A@-;5W5mC78v4mI18WzQEc2eXPRnTH7fp^hVw+hyucF!-l;&ippuY1 zUkcpRd`8YAn8RC~=`k}u$7e|G?!(&glgB3edXEeZj4MQ_27x`NEPZw-n*f0-uA;y% zz*}xn`yiPcT#-Om>`B4k(x!6yj6IF|Be6qpG_X#hd?IH}L)}4|M|H^OG$^w`45$d= zQZdtDcHt#3Cb&u5s~DyEN@5hou&+T}WSXj0^<@x>nh{ntb;GB@l5SybO*L*|WI1kO zRbEb4HDIoY_u9pcphM zcSk3zjL{OJpSP^9`@W;l++Y(k{8yqU7+svc!VrM^dKu~qe}eLY;Wj{h)fhEq46hJV zW5gHXZ#z&V5*z~7z5l;r2t+TTl3@qwoGu~guoBz_5^)@phjHT!Vu4PyWp77oyOm)P zz8<0cc7P*p4{Ufm6xf5`#^xT4EE4J>-T`Q;J1eGZD56r6VfT zMEG?Z2vHEMH((mn9Gi{nBZszev)Ib(IDllR2lu6s}Z|~HH0tbRv^iwn z4zW83vD<7md&F*oAkR|8PB8p3MUDwps>a;3E?6ukdIbvBC)Wkb8;$MivIXl72v!FK ztJ&OX3l@|W3oSPa!5WTpGn~bmGFAbmSB9CCDNJkKit<#f(*z86m}HC7^J#4eL2|9% zLLfIsCMw*NtOZLQ9-5X!w8KbI;A7m%qfNuI zEi70*G;1*H(O9Fmu~kG@Wp-Ij!*2g|1)EE+bC9vYyzJORVj7nyVw0_cqW$CgG(0Fo z84z6P*2dwGo0*w5Z3u3FklGG;EZL>A4PGZ|a-$=GRy=wD;PxCvSs+vmi8ikHTY4)l&qjQ97Byib72R_4kFf3p#Nrr_8$1)T31z{fmpuM}2^Eo__T*QL$ zd|sPI_6ge2wcJaepGRtmnKyVq$u@7*XR94djoQc#&F4oMxvO$~7fnGL2kfQK+hY?W zP@Yoo#Z|ryzPf;P>&-Lp7m$0zlaTUf4m_Y8)|{*lIkhS6*8H;?Nr_uU$H&RAh^_O0j*qJIP^TCcGvrjnZbvv<)W7Sn zw%-Pl)l>1e8MTO>Xf?3T2aI%HZBFa#2x@MNY)(56R4Iz~gme}Gq_)74h=fv9p>BY5 z1+{(+(*k?DI@;`!xp1Vma)5IE4r^x|cIzD;>+2mE867>|Cd>N9N5}g5PLA}osXeN= zZg(p84~&fT^-fF-jGdM(92*^_-{FyaT`j1Pv^p&u>;0{PiK7E!@^Q$(#Mo$m@WcC@ zhmZ6gJHe_tCFAIM;%LdoW#7a7r`=DF3=bWh=pX4l9SFDtb7*Y%1gf5rC4Ixkj|?9l z>gzpzB=C9JdEfBR7+{r;j~^vu;xF)FS@+lgP;`9s*nm=Wa=d?Jpk(K_I%qmIJU%cq z(mOsrFfLmd>;3J~F*YQX@G99P<_AanPmYiGjvtkev!asyA8`8r&`B)ay0JF~)J^n` z4Gl~@(4L>2pPo(!icFCb?L5>)I*g^VcC>M2(bduVK+rg@=7J!!N|#GwR8GIit1P=Z zL`S}DOI;@%HdkgI3BT%&vYFBGoT2ho4KM*tQSXlbh~BqS!siHd1aKMm&t^ic>nO~^ zW_g$Z4z6uvE`JINpn||| zMjER#?|_xsaX(X-RjaFf!Y#4A``b`$pEF6hfnkYY&64NrCTR_sTYcPI5R)S?eZ88K z$1}WkgkA*WMpzLBAp89+BphW62=jww6sDF%kL~?rf{+d zsi5S%252-p%>)c2f$)sFT>nzffg+YHvRIn#V1yMVF5!FVyYYw(36y!3C;}aHJ zQK$Iqi8PXG3^MIthRz^2NQ_#IGf~IB0VP#}uOZdqa1IocVDF;-x0p_~gRV*{Yws*# zU!i}_m;zC(W%Z#}A~IQn=)hLFj>Opl>)3}yV8y*X?x!9_i#D&gyJVaV5g^NRf2(#_ z(H>NBiG*tK66)Gf1dy7l+TVlrCun>~C_)wx3El(jKP+=NSl~>NxT5w}e+IKn!wG$na4{T@ zaS1vG38DgKh*R~mw(n4HhI(qwUS%Vx=2_v7G2-1Ol3n}s8Kk3sXdWqHh#X6A;_kz? z;u4%1Mbi#pU5k_BX{(U$w@e=IYcx~nvJthzA}0W7+U11z)buVdZ_-mPk?nAUdBjL# zYsxT~-2v2|{5u`~E^0%#X6yr1YJ%q8qKY?=h_|O$=aYKD?)#v-OSR?g+(L&kXro63 z3f&D8`%;O@zJ%nOrLr$;R-K%>NPdR*%pr3Mt57V()=oBL6NHhWEf+SwIVn=qijb@d z`MRj%{g{KS3>L!lWYWkM1WO}5JgYCxAw3L9bVy&*>_l%{rae7xhf>bc9G11xX3|+i zW1Ts(Lm=`T^M+~=It6;`%}7s8x>y`494n)YisTYXis}kfdcmN3rf;4X@+e9KpmfjF zm}@9hqSj!xfK#KwK@=Gfhe0p|610r5fUHC_OEk)BDP({ywt;(KOJI7>BdL$(_~fjS zJj-WG5$W+v^ZN?c99Ryim8hOKkk!qs1=}#801^_o9ZkxhaZ!{?)IlJXXh}OEH=5Xg=%VEnA!OP0EMT#L`wCq1wQ4aVGqcE*vqmMq zv01<(CvH0gYaayb1Lh4b!MYkA!satK+q1a3A;P=O7&Ck`7Or>%haZH1ZJc)=xg%u@tv8p`7oAvC=fQyZB^p;3vRG59mwS`a)X?c;lM|;;42)0qj*a!6w(ZxV zM@j{5ujeb01==d)EC3#K!f8cqwa`Hm!w7SpM|Ajnxb$O#VRCbU;W%OLofXhU5Sr4jLdFQAF?-#p*DB(0qyPe2VThNivfo;F`rdjyd z@UO75a27kNqyTa#(u(HzT+C6d^?w>TT9(@3Y(?i`$}A;k@+h~c>(=)1>gg*H22e^G4>`x9QD@B-`SMHl{ihgfOx1|n5g z2X9`Jhnc`PrE^T)#W^N^=W|>$;T&b69s_Zsd;g91SQGV3lXz3#DSprZjx}j0I@V<0 zpgh@x`P8(pj*hP34y3?J$p2IkAkT4wT`nLFY^m@F78TY~=dY-MCZh3B;*hCf_N27Z z8_caizTeW7;2{djYtvw03SyBiX@f@5=+qk80ZhV2ySn?0w2tlDd@Hx2`yFmxde3(q zMWn5u=L+Zuk~?c<`KD>wj|?{*dL)PZD^j97pv!_hmD-uc8UlAMM>h|lC35rh&eAJN^(UwFZYr2f|VLmgrR<2w=fFAbcpa3ov#xE zVd_n&3YS-@L+QkA3qaWGKlYchED?3_P~% z#7zxo%K)v|oYZkH#XL4@896!-geOP%E5K?@P%_%B1=<*02Dt-9KMYj1(t_fE}(g4!>}g zj?Q68?RGWyDjJCbl@u)u1}#;sjZ)u0HpwAjl0Z9K>Wrs$-v{D(yv5Kgdg*sTt(c3CPjhk|vK(c|eH_yxJk`f#F`=jph!Q zXmH0=Y>$n^aeSANW&R6`?;z5lQ>f(}j*&CY-(#-=i`f*JQ}Kq=Mm}DD++ulB6zDkX zXe;DN{i@D>M9q_e#$m^Zs>HgbX!wJ+ep1iAs3UXU9rczQzg4dYn|&N??o+Pi>5eQ? z{+bOdQdnZeO`~*+PpRoW4GJKDyE$OtzYxQBA{}p8JuIx@eMccXppro%4{M<_C8@|c zKE#gT;B3qI_UZXN9sHXk`vzO$6FiE;TKJ_Hi_@rRft@|^60MnTqOBzY(xn~hA_nao zDYO)3l8)b7jrcd65qi2SUHMT zm|NjLp<`>6<7nAwv|Swth{PZ|WNqy*H@QS-^BHGWslo(DRCp?9Q78mq1Zx2qnJk8| zNGU#jCJt@1H{&a|cru4cJ-`ItokwOVMP*rZlF2NNct-9uOk@-L!V0Q2EW;61SmW)A z^MJ#%&Y9?0n>G1ad^mPEBhD1?3r7m#lb=|L{kd+K*y> z@j2?elh@@*JzGHj?R3hn%Q{}h1e3VZ*RzeFj?#X2{%Ni?>?W0S)J;=IEqw-5^^ZB;z|apD_!Dt5FhJ2_{BhSSUXv)@OV>dNk~5iw5;Pz8C2@pc$4RNQ+Ea8 zKPnLhui!^{4vr`x>n4~(%N$R+M*PWq^dz0!&RB)#eBKHzbd%ZQ(n8$SaTX8a6~+~X zmG5L>RJ3~FUBV5rpURp4PNtsA{Fh-w*iXgZt)SXZOJB8>pt_9K>P$W1xXXz|1|n22 z;S-X*y1xtNT|3OXTR^}TGv*@T<}*m*wGX(w48G)ZyW^-!O1c|I_hRXQt%5Lh2*ZRW zQ}9({Bm;eL9*1*a8#Q*6VJicjy^Mp%0ffJXy#XhKK}qAFIwX_OjvE8}zdZRcQlD0V zmp)SZu#09ae49f7;>!&=ob+K@I09roo670ag*J^ey-7R$cqM39%3tvZdM6_#JB=GH zV=)Kkr_;6yxDCz*&Sl$t_s}89{D5>?DnggoC_0|a0qeJ>E$pF9(Wz>LI~+xa-7;)q z!j>l-hvELb8h;AiQF#i1ms(@R10!hG{Dj9Zr&td;S1+!pRnMU zo%Uu}KSuQrTB(tY;uUhpS<0PU&KeM^(RrG`&w(b3mP zNBSm?JI0@wpnuO+h~nOVGfpq#JLD0)EWZ!QrQ3x`sS-|_k@mKf4aMJwL<@fh`3kR8 z@Y0WWqEOXEn!i~Uw9br)=|!D1OU*cmNI4{w9H%@a2C!B<;Dcs zXY)~`nZt`tyAgy?POWJvci57m6~ys5(5HuvAqNL)I%%YFoRV|c5F%mNxSug8&1Ynf zl}n)towAfN=FhA8#dTuQ4t<`Q%3^}R2~7xrV>ho$iKu5GEd^dzFU|NGAk3uGlt@Y6 z95H3&a;A~@AKvxj*m49Lo!5rom8`v$2N+A%*-ZJbC2MRSGiK(~n9oYqYGm~ChdM^* z577zy8Fk6hg@vNWU7wcmFPI8+EKP7hFLr_-HQ-dhQh{edyZ7)-cWJUF;NOg3+FaBI zW@cDEXV*bjCPACZ4vtBKRaKVgg$;+)MqXbOM>4R!9WR1yCdYCJ;Q_nKu{c6k@Ef?E zb}f$lxud+CP2}Yb0_KybL)|=jmbN-#K6U15sv{sL$x^)*7N-CA#XYm_>uv6R;m-E; zZh4+o>)nUD)Z>*DC-7GH)5@-L<@vTQ_aP1HQ1;UK04I*K?>2!sz`mKoLmeT0v~O1o z5lFk$Sru3J!8^y~jGXMh_w>NfknKW#^hns>b6*}xeQ;td# zo0i*b0~p`>SCMN%gZ<5+8NU>OQ$*9V3vwO%*4n%@rIC4!rQGhV zJ+L?|q}we{;!ABO@SU(Jy`ax`H%`zOn$~>fp{uZH+>5_K{L%H;!BFVI_18KE)-kY- zf%i2AQlXDHui5utB&pC7p{|N z`r6$>>AFjSz};@;ckc%XRvQoHaj@DD_|wY^mw&C*EPd}G;G>gptn_HLnqvQm>|?cb zrTcWZ7vvw+?xt7WZm+fMz5jNLc)8oH{4U5}-ng4yO}qWPY0;0NExJ2##W?Je?#Mg8JWIHkSx z4!V~xh!*MH3&9lTcP~9f{UAQ@)-QiATJ(c}=65e$Mg3~{AUMh*TJ_?9An>Q77D(Zs z`oZO*_aGbu(Q)O<%Rx|{j{Z@T%AYF-ftL@ezgK$-x>ossdyr2A@3pE}6m;!|V7c^lKOfYmyW9mA*e_$5o_1C$Er_v;MP=fprY5 zW8i&^fs5fUu-C`J@68}ChM%^3em4AGz(D;=2-Y43-oFaL+QK0Ee?jylvOEU0xo%7!h3&mh4JvX0>KO6PqNnqdz9aDVzm^l zdj${(ZLyMEszM;}FC^mCme-Wm>wtj&JR7FhN^zwd0!{&f;E!uVA@1XIi}5jZ{t6nd`isk$$O zpQ?Mlj<@UgUqHZVaDmNDTq`{5$`__A!WWqKrdDW%D*p{AgJSME_!L z;yB=vK(aV%%Y(3CDy2Z>5OC~J`+WQo0vbC(LOwRpfotsYQ-SyY2q+I90b2A$HZQB~UQjSYR{P3ffZG7PFX}(&=V===go#&LzF50*5QsTW zg@oYoN<5d43k(kO8>GajnBv#++2YTNOT@SZBmxJ1JzQWiP~3*Qq#7Q5HT)VZ9?^I3 zyB}2U-nooO3VA=Jdx;_0(;MM8D}sQYAYDPS5DI+@-V=FH>fhTfq^(Lp5R4(hf$&GD zeg0Fdn=aWNEJ5%;T7KdABNh0B7YFM5P3B6ScD)UC@O*A({&%M z6VQZ0L_ew7NG4uoEvY?n>6g#IMs9wt`T6F5-mFG;RM<=7fb1dZm5>)Kx%&?R0dI*k zp7WwRRDkra8&!-=9D`TlsFd%oqL5C?w60|DnsNf!N^qdo7uR2`mpwMDbkldwB>Xzq?1m=Odbv#Ea8~_aXRRa3Y^k z{bs)M5cuO&wL*l(;aKt05(Jfyp<*lqm5>KXcAgxK8?zk063bt#Eyjw#&WqtcRPw2QS(Y|PZ^hk6dIvABS78Zzn=bTWiA!VC{Yk61M)#G(Xqr=e;M(>S|M2|&} z1A^uJR0qL{=!c?X(eda+^knqD=)=sLBMnt*tU*v#2f=SePe*?{dM0{*^nvK_L?30^ zku;QqLD;K)Jnk<0Y*kcvFsetVqRD6~YDA|M2xPyXTLNvX;e*+z8GR^vHkyvkMKd-8 z+_&~hcO}uZ#q0nFs{_k*TVl8e%F@9 zca=U~5B+86&Covy^H(TzDSQdnE7hyo&X>cN75#g;_HymNW^lZPO7tgwR!<|jA)x-g z6eel>dFV%>pN2>x)wKZuPx<$M8-Azmk1N6%r~O|kb-xt;ILqSUqkfJ_L-`)PH4q(+ z{HfBa_jB*Pstt+bNfJmFpRW`0;C-UpJ;kRhgMc_J6e@;*kNwd)iiK4}2cC;l4o?0# zLGW@|(t-HkGi>biPIaoqLuLJoS`rIiVp&8qb`kq~Zy*qm(L0BL)@aqzmA>}kKy9Bx zKx?#W=}KP*Lm=knmG05oo(ciYjq)YtW_n_^D8Z%Sd-m+$oqxpKOc1OlB_s~0C-sNt z3ahh+`svDD3kalrD%$2H5(2KR#i!N0OIlJ}-->-Z_DbwKvG2zIL+pF8((OqoO4lp* zsY=UB;a6j?#a@qnKXxhhA7lS1_F35Ms#QYvJI8^*%~CNS$Loemw(~~p&DalOKaBll z>_5l;OA!tPZQM^U<&MTHd*e^K@8633DE8ynPhx)^`>(OTu_5ShI?^=IG}uJ*1z|+> zWR}vqyKWFReir+A>~CXl$NpRFzsG(N+rjLmdz(g@jx`-`+EIHgyB9tcK||h?_s`vv z_m0oLT$0_R=QaN>_RHAc$NnMqKV$zZ_K&fhwVP|Ns~vBeXgb++U(?Q7&9>mUS0_9N ziZ7^tKWXvy>VNOoKfKb||BhXb{h!$Xjr}V2Zmbm$#B0wq-QV;;)9*C3*6vkoNNV+G zEq~+mreeas$MU8AFx}$mmD>5;=7*a<()>|m!u$ddP%aMF)dCa#Sa@XDAMEl%q0Tb? z{qrY;?1}mpnjdX`toiX~8QCFh{M5-xdfUN_+T+DtPZmL-&N6CUaV>fl_oDvCnm^wB zRI{3k!!aQ;lSF;@`vq73)RYc%DLWZ50N;u@pbSONu#-xQ;kE=!u|m6#})63XOU# z>J)QYFt>?k{NIBh;I)ILvY69|>)v)G!oN4a($Ww}sq{X}c~#{!x~@cey)9kXRVwOH zER|eqd0Sb%`=v?cYQXUZqw5c=pzg{*vywS2l|odCCn{}YdG$(5#`4;(6Gg~n4?cUyFWRliAeUt2DzF=g{UELdc7R(gB P#dpy4VcN_W&V>Fybrx1O literal 57845 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

+b9P>AR!H5#QerL@xdE9{9-3FE+o_{D;kIW=Dm6 zejJcLB%>0Ff+ctVF(BYQk;W50gcYfY>FURuKhgZj=09pyGdq$ZZ+JLS^dq02T<5m8 z{1f89FM1&0Tq)_o;ox?X%Yy7xeN_t%)b`@_=ju2FL{ph5k#iH=COA>tSNU8W0?F_0 znQ(hVHc31XKY}}aT z_?1}xTwNtr1a`g}{$oY&1&!#v{^YvuXiu~^+7~?yAZ-qVJ2|A03V!kDdSoOZizG1Sg~KkB&yiqN(Vq=mXJ5Su{r)YQDJ!LAf{x zek*z=`rFa7(FdasMSmyyIMa@#p(G5#U-jd0_q9(giV6=$_2@)29nD0I=%fOH9QV@; zpzUJ#U^;3>ABmoeW}`FFoDBhwt-aD+OSX355QsQl*lHQiKNo%)86lP8wfIX5hd>>{ z{koE?t~>c(zUavt=YYeJ-m$kpHjfT=wtG(x1Th<1_TB|h- ztYKgc16L~sz8wDAwpX_Or)_`k@>y0B+AoA(+xE?E-`e*1D+s}x+rGQ)k`2MzE#GVT zeoMao1NDXaVtolU7%Ttt1$*v_wSTZ{-otkoZQx1EnGU5n;V|C$NPyht{*jMjzT(CiW@2+;4war^eEC7I9NRh z9$)u_^Pot7^>OeK;AMRoN?O! zKxzB=@JCn`51;jmOd6_>=xu@QaQ&Yty?Q_QzE`y&aXd)^$>K}vggkifsP>-n)3rfB z92N>yLcr(#_&UmkErt%f7N;7V{Bwff)v%-k@xdqA-07LxEEW&7jW1eBEPS3-5z*X5 z?(fP#ARwb>4gsyvs#ll$wHF6!{~Q8ZqgAgi_v>H?gl%5#5xxDX5Rh$@4`G|>j+LSW zmxgcK*1>Ckgl#4WR+17D2Q-rU!)t|A>!E(Se6Ixr(mxe_^D7bpuC2wVi+Pr`q`tl$ z`$p`w*f(R}iv4Bm+p+oklTggxuG*(6EiZ*%kG&ClGxpusrPzOt{g>FM;Ipe<3Hk3F z2Ld+>#ekfz8!p+;Td}ue--~@e_E)jLj{VmP90=OD?_S6|ny(y<-|2q;PV9%VAH{wg z`}RpRi@h8B``CYv{XDjl`AhdV z4L2QcI?=SV?t1oK#8d4!cF&%-{D;^tV*eQXr`Z3D{jb!b~*NcV*fYxFR@?7 zS^+`4?rhV8O%FBwPE%{$KE;QmUVqy1x6WuPCj3XNe$^kQ+dQLEKfl}jX!8e~KZHt{ zp92D_#o@YIV8R~@kL~`0-CihEE8{;tzeC8LXn(Q!@#ZI*pKO+y9m2*>oT{XE9n7dB zKE3;y3J6pyqqY^V#mM5lX#e5nk2F8qtk&XiOo+-P(cb-h(KS9r0+;K^%7}TnTl>FL ztrE51wK%+o>U`jafR8{{M$C((-G5wpm0P8Ma&XLRaojw>GjH-9`N|Ih`qVowy5_|` zT?_uz4DqLY?s26ZBzebd-YWi1Zo@pTIid~Pinow>l7+mt1$S@ zrScAbrIOQ#>xh$s?g+ZBLZG%$p;2FpHkF(f%x&Tx|K}hGciiH$sr25e3dV9LKd%mnkrBrgQ0Bh n{fX_}MlNlY>Fe*tizOp(?oMpzo;5T0>cIimhgq{&Ive``$_qY8 diff --git a/Data/Scripts/012_Overworld/002_Battle triggering/005_Overworld_RoamingPokemon.rb b/Data/Scripts/012_Overworld/002_Battle triggering/005_Overworld_RoamingPokemon.rb index 8af0f6fc8..6f21bfdcd 100644 --- a/Data/Scripts/012_Overworld/002_Battle triggering/005_Overworld_RoamingPokemon.rb +++ b/Data/Scripts/012_Overworld/002_Battle triggering/005_Overworld_RoamingPokemon.rb @@ -72,7 +72,7 @@ end def applyRoamWeather() return if $game_screen.weather_type != :None - currently_roaming = $PokemonGlobal.roamPosition.keys + currently_roaming = getAllCurrentlyRoamingPokemon() currently_roaming.each do |roamer_id| roamerOnCurrentMap = $PokemonGlobal.roamPosition[roamer_id] == $game_map.map_id if roamerOnCurrentMap diff --git a/Data/Scripts/051_AddOns/New Items effects.rb b/Data/Scripts/051_AddOns/New Items effects.rb index 8814a0912..9d2fe8237 100644 --- a/Data/Scripts/051_AddOns/New Items effects.rb +++ b/Data/Scripts/051_AddOns/New Items effects.rb @@ -1868,13 +1868,27 @@ ItemHandlers::UseInField.add(:DEVONSCOPE, proc { |item| #TRACKER (for roaming legendaries) ItemHandlers::UseInField.add(:REVEALGLASS, proc { |item| track_pokemon() + next true }) ItemHandlers::UseFromBag.add(:REVEALGLASS, proc { |item| track_pokemon() + next true }) +def getAllCurrentlyRoamingPokemon + currently_roaming = [] + Settings::ROAMING_SPECIES.each_with_index do |data, i| + next if !GameData::Species.exists?(data[0]) + next if data[2] > 0 && !$game_switches[data[2]] # Isn't roaming + next if $PokemonGlobal.roamPokemon[i] == true # Roaming Pokémon has been caught + currently_roaming << i + end + return currently_roaming +end + def track_pokemon() - currently_roaming = $PokemonGlobal.roamPosition.keys + currently_roaming = getAllCurrentlyRoamingPokemon() + echoln currently_roaming weather_data = [] mapinfos = $RPGVX ? load_data("Data/MapInfos.rvdata") : load_data("Data/MapInfos.rxdata") currently_roaming.each do |roamer_id| @@ -1891,12 +1905,11 @@ def track_pokemon() end weather_data << forecast_msg if forecast_msg && !weather_data.include?(forecast_msg) end - + weather_data << _INTL("No unusual weather patterns have been detected.") if weather_data.empty? weather_data.each do |message| Kernel.pbMessage(message) end - # nbRoaming = 0 # if Settings::ROAMING_SPECIES.length == 0 # Kernel.pbMessage(_INTL("No roaming Pokémon defined.")) diff --git a/Data/System.rxdata b/Data/System.rxdata index 594ddaaa8defbe53df37468c20d5638396a0a73a..6ce8bb616b2f51eeab4901fc6c856e0214cfc2de 100644 GIT binary patch delta 28 kcmX^3g7MG`#tjRkSXLi&W!}6*YHt`blM&PA