From d9f9ca1dfa5b553f7a79dce1ece56771857d2720 Mon Sep 17 00:00:00 2001 From: infinitefusion Date: Sun, 4 Sep 2022 14:03:13 -0400 Subject: [PATCH] indoor rain fix --- Data/Map532.rxdata | Bin 21820 -> 23345 bytes Data/Map566.rxdata | Bin 9175 -> 9183 bytes Data/MapInfos.rxdata | Bin 37233 -> 37233 bytes Data/Scripts/012_Overworld/001_Overworld.rb | 38 ++++++++++++-------- Data/System.rxdata | Bin 27257 -> 27257 bytes 5 files changed, 24 insertions(+), 14 deletions(-) diff --git a/Data/Map532.rxdata b/Data/Map532.rxdata index c2706d59fefa3373da6a801290158f17ec732b09..493eb7555a79c5319a954a8120b003e82b318a21 100644 GIT binary patch literal 23345 zcmeHPd2Afld0(!iyrFLaKw*M%uteilQyh{?W833MVa)7U&5VO%sDC1&pPQM12{mCP&+syRw zZY~m}n;K~)-CjzWnZrIjlbHkb0D7%3+gZYFj`$ZR&1zLMis?*0a4n3A!O($ve8xFp zE1FW(YKpn4IAvW~(62G3%-9vQw=oT76fr7GpyPsB)Y-FUwm+TS59I#Z%0k&($8t}e z${t{e>_L_+bhwujE+moZ%T>*5`m(c8)6vVpT#;FN!C|JcyvnXm;c~$=ii`keM)9XC z)|1Ih%B%Z;Yp)Y|#+I*X6;_0^vzWG0 z(FszgIo%fO#_fB5&TGdzI^_R$TgZ{d#7O;Oot9a5bh+_QVde7#NN4-}{UWHlBb}fm z5st`Yud!N4KTY62`oP1_)&aqgjq+4i$0Uf=ztQo9|HiyJ`tCs#;T{j9FERDr# zm33{yUIuX;vo;0nlBLzktYBu2MM--}Tc1_odm^=C{gLb9z zRJKd)zWDUW$eB!MZi98ps!Q zh1nx!_O^Z5qf^=2!6ex`SaM-k_Rgv7UFhKMsq8V9%HA`TRq%0mDm!3iRk2~&L2rYy z$EULQ=Ck(!;lxz-Bui)SH?t4)W`{tt?1O6W#G-QY!q}$_4bYL2cvr5V|?0G?w#+4Jl$>vz|N_3*W&u(ocwHubLB%A{7QOw?CS zjtvRvfL%DHM2=ocedKa^NZBy!CoCO@+jcC?00${$-O>k?X*QrN(pRO(iquLem{na_ zwan^cZeRWxZ)4DVhlhvfFhSi>^5(knm@=ajP2+^4tQqFI!kmGI&OHec*_+gk?o9W@ z;>gH_P4|Vd%Hdq=+K4-4|!7Ei0 z)LAsO@_^htpWp-evPLqQq`y)%fx?V}g%g6aB`KKvTtv$9lK|F@usH*p=VRD>i#!g_ z4Y4^9bM$m9F@qdV=XZ1z%-!QMcR$0-_`wy--M4gnTZA6>xtSPNnKpI9P;9eORKUYd znSpYp(vY%Jcd!cujrh;j^=g#R`yEpOsS9PW=CC|N9${1M9Jdc$onDwZQK={;b`AUG zDCnBb)v9SJXOwAOvm9lipjC8xSa}BUb8m_H;xQ^Z-%1>sdFOJXW7beG_ym;!-N6r8@1x4d{ zWFHFSJ+9;A>NAdB4Pp+RA=Ta)Qtc`A1QvXCZWi=|aZpsC&LRtSu_R;DLwN(U`aU}wAZ#n=ah^m@E-9}aAY~g^}rZ( zJu>Fc$}tIpW)W;bTbJ}^)wD&Z55kdsbh1?L8v5l%n#VpZxttH_*>fqiFK?R4idKY} zM@Mv35|^eE9E^VRfqo*mByQ$3lT%GZ{=n8WajcX&ACOXAo+|dFRKR}Nmdwx2nhxw{ zV?(LwX04(t6@K^)&IchQT1caHT`55|x}=e$OR1+E@DeO`n`>YN%0kg#2N^})k)@Yl z7`GDqjS}CdWPS(C8ZPh8#Zt1tsNo|297KLEME;$yXO6I*kgXQ5(>C=x8mJ^0D)IiX zPa?2h--z=#N7|=nvDhvwwi}D>Vfz~vyFI1~Dhu#|4zJ9CAyBs=X33mT3U$jOYo8l) zB#KDvG>|K$o(nPHumbyp6w-=LRy^btX(U^_#*7l-SCx9L6^oIT9b;SgoE9>mw|Qo{ z0e$v#(17lVo?4goqhp}`UeNv!XuqGq8HhLqU_Rlen%T~DHqEX8b>GG7(9VyWrj_kx z%%xh#cionq^-NdZH1vBD^zU2dmt#KxgjFL1T*o)%Aef8*nJ%Pqoy9RDCRKlY)`*wmXz#djW&#r&zRNPlz=TbpPtO)En6Czn#sUM|C`;=X}! znYq2G8x#%+vIG1F*FB6-V1M0!yW!LgnAK#T@gY2Srs;fJ8jQ*FQJ!eIu11rwf7Vpi zP0M0BH^{eZGwzhEYZ1A5_-s%#_~v3z2l^_zv6`r9?g~oQbOE z=1cab&D)~!95VTCMG=ST(OguHKI|&u+aM~zbs_mLqI26(#8NqapoBMzCGtoqSwp0R z_hAz{+1`-8+Nns(6~nxSSmOVWNK5k7sN~zaHv9pIwH)^pTPW5tH@-MKGd};gRJ*>u z{vg~ULnS0`xgxv8a7*%cqde4>_Wa)#aET8Scy99t0T-dfTj!D53%HD&chxTiT=p`U zCILUVZ|VQA>fK4N(er^DQyU6piIK9J&{vRNd#0RkUK2 z83>3XL4f>;8{t}DhGCW!KOD-b67p{d5|rUQ0`2)XobJ++4tRhq^d9dZ5CDISre4-7 zH6rVzUSTF?hgcd#Y!yRaM;_HML}>#V@?y%M3y9!a@ILJiFJN(~*8rXaPhjm9Gf>$@ zo#%QhRnw+$fdOhF)<+XXz^h)9A!uq;Wj1FF_#BaG-Oj2t_$8E|LQ=SfevDg9jy)dxUA0|LB<`^EctI8{4Gbi;f_uA zYn#)S@(IaDh%sRnb$rEJON+D9D6~#fghQD$>*VB8mUcxX%p^0q#{h?4t06>90j#iu zXk#p82H91cOCnJKQDLh(qTM7VZ>8UdrcpF8q)>qaa?Q_zJG}GHmt^T$MR~5y3j8#O zr{B&NhiM1eyGbzkbzV8jQTKZaisv9Z6u5GqcV%zGl@s2TzJ@Eu0{97D=rSdD`)hKy zbIH#qU10M29`ELozYq)k#aQSs#X?_+g?=#>`YSO|Ht5bvo`JR$*dv$MhLGA_Cz0*w zw5O|7d|_>1Pa!@@INN^2*05J8fkFi{5mtK8Q? zfAn3RLZH15oH}>sVb^&(AN(%4fP{j-Z#>2s*tf3|&3HU8xNmPop(HV=T~Ld1X7oIv zPKIO&uZ;>$1L+rUdRv>)+tI;Ox#T-BP-NJ|q~zxM=OH+S;P> zvn^8I*2zhNB3{yIKWS2w07BpChMRXHs``1SAD9!~y~}0l& z70M*y_@roZ6}HBs&LN6$(}Ez9=$%VxwKre4oOM=G_fD2sl?pu7o;g;l)N2qxf~0Gn zy^+WzANO|C%POVRdul7=#iCoabTX5_GM`_ZximC3!iyQXr1H$}Zr1Sz{ZG&fBhb~G z?g;X?lvh;blDrrTqRvvF0kzOX}APC_I3%17;Q_P+YZQ# z)oWBa0Br_t=Z-{(choVuXyOk%I8jPIL^d@~eDdTL^@MIpCY0 zYw&&X2pkazi}pJX+xfPe=eDdIi%M|3MdPvr^~xAsu`kzP4W};@5x$*~Lu< zf4~d>lf2L*42&2^yzsb{oOm;)@Z!NPN5D^SUpkD1YnWFN40Nt;{H+Zd(ubxSiYX{KWSTe(DL4KBE9<}lRE zK8AA9KFub<+fbweRw$v$yHc?c=vs9)m4b3Lq%`SHCaMGMqJUKB zW)D~v{786pSj4?v6n@i62Zd1G^5I)6X1EBNWlZ*m0@>eFI{B&z>Qkq?!dglxC zsyu`D7tl&u8DpW6olR|<^sSX^j-GM1iOO{jvAz(~^(}RL##`_)uYdrBb*`%>Rv%e= zN*##3HEqbT>U!+`X&0`3Y#P3XImAttb-e<+0r6mQ6O|W56T=N(U3ZqohR=L7B7NE& z^^vO|TcmKDxLpGR!%`gFi%JOuaZ?t}V6_e(sEl*qly`3A`xklOTe{jb4o!ocEXx~R z7HvwQzIn;!<=t{G0?zejR3U#NSbO;JDtm&laqwg zi8=5-GcqU~AEA>`xfFMAgAr>#a>;$2K;&|n7RWmfMlQ7|R8FGfEy=*Hv&SHx4!P`0 zm6Rmjf-$)NknPn$UP5~E?9g#Hr8>;-?-|A|ttF>S1v6pFb;IGNB5$7pe%uzqoCis9 zzC4EtRxAIWf^XqR?7P&XVWEqgeajBI?c#pjaJxt}$F`9u-q1D@-NPi2gp8xY2Fe>y zcO8LUyiWT?z))226S2@AiiO^cg+3n({d6q!g;?lkVxd14g%W?!3W9z&X9q7b-n511 znM;Pj@oCN?Sv{PQ<<@N(X&X$^!*7I>BeiCdFGY!tVBW9ALVrCL z`kS%P--(638VmisSm^IZp-ne?8|;wYId<5)9d_8e9d_8uPlMdqE%FfRlLFk@njPMW z5*_UD_p#7_h=u-BEc9Puq5m2S{dO$$J5lIPvIEI|p=!1+9b)YEO*Kd}oK^~?8BQzF z&q#EOa3j`gAPxBeBq>Sm;Ni(4Axj+Q6NW3axcS{I<4M5zTPgXN7hY z#1BUa4p#V7Ec8cWp)bZle>4{Q*;weyvCz*&p*z6}DfXbt0y4YQ4gZ5Y5Rn)q!7bB% zofJ;u9!M~ygGc9h-bizw>o;in+_v?6uBby7b>gG}wHdd%A?~dAgfMIT{DcT(zEL zj)SsBL@uc$)=;z+lm_tds5^>+9IIX<5N`8CG?nLi!o!}Y+rX==V3~Hotg!;J^{e`W zxY@6Yz$c;M(M$;D^6;%2$RIDB&&Df|ZJ$)5SFOb|p7i9=X2^?F@Eg-@de99586^ub zS$902R!7CUc$5}Tzd?wn5}g#Pq4AQ3L#9UM@8-T%`-{0V99>`6@VqgRcMj8fv*1bN z7LTIt7PYKyOo=~DDG)tr2q#5|)b41<5WXrS{7q!XLv6&p!zIMoDe@g$NK+De&M38@ zLoSKTODE>Yv?aSdc?=l|J(ih~42oiYbbC-b~&|{v@!(`{m@z$(Qh^ zm*_+E7>7%JzQ9`(hImsiFX2U>@)d_m{fn__{OGF{E{){l629o;ru*3nSBxuYCFW1x zZ(t?jvlZ_4#~n*Nj#nOgB*qcr)AxCPMf{~UqmexlJTeAsNn`Oj@3w7*A$f~F3ESUe zi5YCs>bsad&93?UTH(Kc*Te~WI`OPv+nh>`ugDOgW?Ryzw(;wLEwrJ1?*({RQmq3yx!_l;08x* z)jE7l;D%va{T0Riw(_p>9VHI`&tqv7Z26w@J>~l@?$^~XslTfJnTzwyO>uV(>>k)N zAbR_T`djL6tAE`Bm$*2O#y4CHIg6Y8w>W_k7W}03`fCni3(Q19$hRPl{4R0D3Cd&a zFARQh@RtW~4v6vOd6MmepAuJmiXP(5U=T-sACX^Ld{V!0|H9)o{}qQDh4rWRrw?q2 zpToE}cHi86G<|#e4iEP|^?MB*5ylArQqluy)x~{H-8Hy-@a>L2PQQ_UGyNxCk70~I z-1A4!S2&+qv>-Y(B1_!k$;~ekp|et@Pif-%kHsEH2IUy-@4M**E|F&YomySE~8-R#*Oc zPj{+ko4Bp|{ovY8P#|o<+VrI2vd&YMhw$KFJeUkmu0w^yGCio64dPMN>#T?xroqrf J{($Ple*xqQ-)aB= literal 21820 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 diff --git a/Data/Map566.rxdata b/Data/Map566.rxdata index 09f35877e131fa07e2464ea0ca749b09b217b736..2b4f2975093061d903edfb3a54189f74a84dfbb0 100644 GIT binary patch delta 722 zcmb7=+e$(~6o&VhjGL_O?q~CE_5Jgleak-X7-q)73;WV`j3Z;dyXq+x45*h)?SREy z&8=3iv7VLR9sH=F=h}k?nzYjt0eeyaN@%>Wc4nD*F4KK`yV-PlM_$|OvQ#RRi#|$1 z)D6}aU}m5j`lyPT_baxDH)MSGWbaDa^3HB3=}ooa*r_^8rTpaLzqx!@usTsMn2|g5 zyLWCeH-rX32?GWU3K)v=H5f(?ApsWgg>x`Mr-*=2TKWYTqYiNii4K@W_5pKI4dzk1gCrSK=z|4X7irE2SjxdNxmSdQ=7;Din2%7Xp!$Ft krRr$WaOGR2woYO}DEF1*^q*1m)=~aSQqS;kqr}gwPgKyKwg3PC delta 794 zcmb7>K~EDw7>0MN?vAZ&YY{9EofNTLh?0YGJZcije7h+P;RN2E9Y^Tw+!I;pi zHzoZk{T2QKkNg2IT)F5MIzvJlNXTY)X20*9civ~_xb~;^YwPIk50MkNTerO8(ch_e zrFrDZz$m3Yni8rr-v019PD(5O>S9~&$8~@AT=g?GtXdnW%EPK&%UpOf>_2+uU+u)L zB%)?KlpsR}r8+5cD91BH_08XEYgOoz?*?LB2m#_r{ZR57*R1YXAY)bhVX(GMV=|I_Q++3;-@|(wcF^wpdRF#Wy zE$yM>+F$WvuGh#Fx|Gp9ZKl}_+?N=4FcIQ`XRYHQS(pql#j)K8)BHCRqQJvgh({8h zU>ZxJs5n_R8)7cPW0pJ#Q6hn-5({^*NajB*c?O=5(Zw#JafRRc5UUZ^Sp7Vd zI6o($z-*4fhUx&mtEwQEA6-6F)yqj-Oh#uU-D{$V%TcZ*;ag2tcYMDb*p+XT=kEc{ b1ftSwTeqBCC81C8mpFM(dsOTv*1r26y>hcz diff --git a/Data/MapInfos.rxdata b/Data/MapInfos.rxdata index aa58a790e46a9c62e4f657f09bd02f8943a12f44..2f39df27cc375b6dc736d51e89568f7138c2809d 100644 GIT binary patch delta 36 pcmeyki0R`ZrVSiCjBcAbdAc1KLncr4*#P9Y`8u%xsm{O`_5k+^4G;hT delta 36 pcmeyki0R`ZrVSiCj3JvjdAc1K-6l`<*#P9Y`8u%xsm{O`_5k>H4J-fv diff --git a/Data/Scripts/012_Overworld/001_Overworld.rb b/Data/Scripts/012_Overworld/001_Overworld.rb index 466b05f27..aace47ac2 100644 --- a/Data/Scripts/012_Overworld/001_Overworld.rb +++ b/Data/Scripts/012_Overworld/001_Overworld.rb @@ -271,18 +271,8 @@ Events.onMapChanging += proc { |_sender, e| end $game_screen.weather(:None, 0, 0) } -Events.onMapChange += proc { |_sender, e| - next if !Settings::SEVII_ROAMING.include?($game_map.map_id) - new_map_ID = e[0] - new_map_metadata = GameData::MapMetadata.try_get(new_map_ID) - next if new_map_metadata && new_map_metadata.weather - feebas_map = $PokemonGlobal.roamPosition[4] - if $game_map.map_id == feebas_map - $game_screen.weather(:Rain, 4, 0) - else - $game_screen.weather(:None, 0, 0) - end -} + + # Set up various data related to the new map Events.onMapChange += proc { |_sender, e| @@ -295,17 +285,37 @@ Events.onMapChange += proc { |_sender, e| $PokemonEncounters.setup($game_map.map_id) if $PokemonEncounters $PokemonGlobal.visitedMaps[$game_map.map_id] = true next if old_map_ID == 0 || old_map_ID == $game_map.map_id - next if !new_map_metadata || !new_map_metadata.weather + + if !new_map_metadata || !new_map_metadata.weather + $game_screen.weather(:None, 0, 0) + next + end map_infos = pbLoadMapInfos if $game_map.name == map_infos[old_map_ID].name old_map_metadata = GameData::MapMetadata.try_get(old_map_ID) next if old_map_metadata && old_map_metadata.weather end new_weather = new_map_metadata.weather + + if !new_map_metadata.outdoor_map + $game_screen.weather(:None, 0, 0) + next + end $game_screen.weather(new_weather[0], 9, 0) if rand(100) < new_weather[1] } - +Events.onMapChange += proc { |_sender, e| + next if !Settings::SEVII_ROAMING.include?($game_map.map_id) + new_map_ID = e[0] + new_map_metadata = GameData::MapMetadata.try_get(new_map_ID) + next if new_map_metadata && new_map_metadata.weather + feebas_map = $PokemonGlobal.roamPosition[4] + if $game_map.map_id == feebas_map + $game_screen.weather(:Rain, 4, 0) + else + $game_screen.weather(:None, 0, 0) + end +} Events.onMapSceneChange += proc { |_sender, e| diff --git a/Data/System.rxdata b/Data/System.rxdata index ae7f88bcb672f3509cf638e726eb68d80f5bbf9f..ed5db79831d6461540b37000514ca31a7bda1f0c 100644 GIT binary patch delta 25 hcmex)h4JSV#tj_e%=*kJo4LjN0vJU$&q}|~1OSCG31R>M delta 25 hcmex)h4JSV#tj_e%y*kPH*<^k1u*{GJS+V^69AV$3m*Ug