From 3e6e955070edc7c86b3b6eb912f3f912b46300a5 Mon Sep 17 00:00:00 2001 From: chardub Date: Tue, 10 Jun 2025 12:45:27 -0400 Subject: [PATCH] 6.6.1 patch --- Data/.DS_Store | Bin 63492 -> 63492 bytes Data/.idea/.gitignore | 8 ---- Data/.idea/Data.iml | 11 ------ Data/.idea/modules.xml | 8 ---- Data/.idea/vcs.xml | 6 --- Data/CommonEvents.rxdata | Bin 161100 -> 161386 bytes Data/Map129.rxdata | Bin 33893 -> 33893 bytes Data/Map418.rxdata | Bin 31321 -> 31842 bytes Data/Map703.rxdata | Bin 21521 -> 21521 bytes Data/MapInfos.rxdata | Bin 39144 -> 39144 bytes Data/Scripts/001_Settings.rb | 4 +- .../006_Map renderer/001_TilemapRenderer.rb | 37 ++++++++++++++++++ .../001_Non-interactive UI/005_UI_Trading.rb | 1 + .../006_UI_HallOfFame.rb | 4 +- Data/Scripts/016_UI/005_UI_Party.rb | 3 +- .../Scripts/052_InfiniteFusion/Wondertrade.rb | 4 ++ .../DynamicWeather/DynamicWeather_TownMap.rb | 1 + Data/Scripts/053_PIF_Hoenn/SurfingSplashes.rb | 13 ++++-- Data/System.rxdata | Bin 31837 -> 31839 bytes Data/Tilesets.rxdata | Bin 410244 -> 410184 bytes 20 files changed, 58 insertions(+), 42 deletions(-) delete mode 100644 Data/.idea/.gitignore delete mode 100644 Data/.idea/Data.iml delete mode 100644 Data/.idea/modules.xml delete mode 100644 Data/.idea/vcs.xml diff --git a/Data/.DS_Store b/Data/.DS_Store index d883dced5b82ab220ebf5368debeb8d73efb7479..959cc3a4ca32344ae3d28bc048febe00c9a41a0a 100644 GIT binary patch delta 1068 zcmZqqz})hId4fNq{lFjO#?Hz2A6QKG zz9_}Y8xa;6F*)m^*JQ`5!jt!3RAY}ytO!Z1D4G1>rsQPaOLCL{Kh&@jWc>;0L2Dac>4@a~+}zZ>l43zd9jLH_qqKA!$Q3?`#U=g)sd+$moB+B|3S_@4P%^4G zBe5vezdSFs2iON_S}?=U`{YmI5_w$A;snJm1Fn4Ay&|F$QW7`A1h*1>?7=hsh&P?9e zq-pJ(o56i%#1}C`!7Xy>5Az|$n42WS?Jcmf=1wyhaC?g_q!312q=c*|n~9%9NR%8Q zC&&lnQ*xdRkzdIzGC}T7+iZ}5V-o`t45AWk+#P9{a#8)_vAMq39Vd9SrmL7Amh4$Ezj4_*9 zBZ(AJL`)JOhR_#1HjlPVCxVbz2EXixrRz5x;#-$HmR>xQcxRG^nPk^Y(lhE<=o zWm`^&t(p*e$?6xQhyI+sc5IH?yK~e|&rv(~&_SoCWAvBAD(J{koDoMGdh@ad28um; zS^1zxA1GT@>d{x1t{NOvSeAQvMN@lcS9dV$~(Q^9<{p>8t(rY(vtgYKLo3h-(JJyl9Rl1DvqA2?9@hDG=|3EgZW#=q@ z(yi(|g$I&w=`smZ0n4cmVgLXD diff --git a/Data/.idea/.gitignore b/Data/.idea/.gitignore deleted file mode 100644 index 906bf8738..000000000 --- a/Data/.idea/.gitignore +++ /dev/null @@ -1,8 +0,0 @@ -# Default ignored files -/shelf/ -/workspace.xml -# Datasource local storage ignored files -/../../../../../../../../../../../:\Users\charl\Documents\Jeux\rpgmaker\infinitefusion\dev\infinitefusion-e18\Data\.idea/dataSources/ -/dataSources.local.xml -# Editor-based HTTP Client requests -/httpRequests/ diff --git a/Data/.idea/Data.iml b/Data/.idea/Data.iml deleted file mode 100644 index c3cd732c0..000000000 --- a/Data/.idea/Data.iml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/Data/.idea/modules.xml b/Data/.idea/modules.xml deleted file mode 100644 index b708111c7..000000000 --- a/Data/.idea/modules.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/Data/.idea/vcs.xml b/Data/.idea/vcs.xml deleted file mode 100644 index 6c0b86358..000000000 --- a/Data/.idea/vcs.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/Data/CommonEvents.rxdata b/Data/CommonEvents.rxdata index 73af1ea9e14b6b64842b5a3e6913b5460db69c1a..014934234ec5e3403365a72ba01cb87cd30219a7 100644 GIT binary patch delta 2732 zcmZ8jYgARo74EmWz`cOsaW4qSK7*Q+_fdFBN(h_+HOW zGCOka+%ymSkJ3Et4a?Gu#xzrzTja#N>c#eIdxOndUsGu>x7F2Kr&t@SE0>iowJowP zY;3SrFSE+wDrxB^Eo*g4b+(wAg++}EsvGPLD`TeR<;}{?o0V5GeRg4fUe5I5*;8Vz z=^54p-R{|p(KQQ;ZRIxma$BBsD-C~W#~sa>z^vZMN^#X=7bLL4+ES#kCv_qGY!k9r zMZJXu)a6pTiDmZX@Qd|u#bl{uVaMxUMwwJRO>>-M?(TN?ESh3syIT6#a6<>$m356r zflij%l#HWFZBqzQhdNxU^sjsi2v8bV#R8+1oh@z#TI<0lhr-N`wa%qhU5* zB>$t8`16ZB@w&qPQA>2pm(@&)QxdLj2mQpV* z@L-$2GP5skM3bi<^Xb`v`|NPfBE&Mw%_m-|esbqba>r>4c-95@v&7yqOk-`msd6*A zxb{Z-h<3T~gkC(L`G1!vf=2a@rr^6|iI!n-W+O9vUvtfkpZAu-#6L_SAMO)C2Bm!@ zk;rUO*S>}BR_bA14KhQIjoVQ!+?WC z$^M$p6o03^NHXF$QLD~6bhh6UCy2Uqwp(XAydemFJRuZoVdh6dQ75v@I7TSbxH%ek zHvsPw-q*Oj8uzPU>?hpSxFI2JBV8zIv@;ka^QYtBFDfDs;6iJ4vQvzbipBxp zs)&if18>~nlT%=J$)X`u_?!$u{MHaGB@>f5M!Y0w2iLHb#5%4k+ zfo}1W9Jw}FxJNFE;Lqpe;#*1zc2pxbxGW z$rP59%NZh7_C8+H2KTMTXqNSwkJXgL?Hq3MZ<4-Cup56{o ztC(MG#Wc}iN1u^qg{m#XA}Z?;4J_svjR@g~>k)+|s=S1~)f2?6>W(gHkQ1zbPGN(P z3a*|Scj`Mq_BqQ|3{F03Ap8zSH=)_{7(YWl%lNDx=LPzeeh$Fo<< zs`Jp7%92B36Y0KK3Cp5GNKq z#7#ma&whkqtQV8N!8K2E#K?Onk!Ks|XS7+9&#UroO@7r?%AHQRBU)ZTy`OvV5m(B` zX_4bbE5NytN?qNus5eGy6MZ`N>o}m}7dj5=ct^(}9q(y~2jZ%cDnR37HGi=>PSA0p zhL|L_ddM3bBfKz>{Kba>M8z6i`8&dLi%=VpHO22Po=Da<&LkQ_XprzGpBGL=XycvXG>C(In^orJ zkP6|#7(s!+B_0t;pJG6TTs40pbu1Nl;qT&&Np!%4tnqxC2PKQ@L>lXYD!wI&(oiif zB$1u4Po$($IB=4`HjVbvsd%*w<~Uz2e~ecj42j&7NzpvkM85pbY4j($@1&iN8$96e mrqln(b>g#!1i4Lg*8K1PmO(F&@x|vxOfNb|gm*q=#Qq-yfs{J{ delta 2510 zcmZ8iYgAO%753Z1%rML#Zv=S`C?kpuD6I%mhngi|G!Y-Ix{R1sO*LQ?@QGj`t2HJX z8BXLFQ&VgkZMw99T=gUx6`O~N5ChtkrO2Ba8#IL&ki;nT+nNIOG&w24?RB;A7nJ$X%gj=W4kJr?WmBYuohj*J-W#iIWtKFr)t+hA)l>=Y%0rZL zapMcX0rsoSQ}DX7XLC4Fx$3@9q2daF6t*oMFes->Odj-%7x%MCMOVt6q&)X}R{3Je z_u}iFu(Q4ZDIgFNcURcaWaYhY*QMk~|y8bNn8 z2RpB8K)CW;Rh$QkmBahLu)~AB{9Y}Liu3eVPn=dxeVAj!c;;Pymf7k9SbIH3jOhO~ zW@|R+jvwo9OQAtO_LKJ4(aP-CgIRa`;|OAtI)*ToC3O}fjveis3J1F(pX2^)?}Ge# zO!rjGWA?5&>@BZQmRN42V1GSPE!}r%l>ZOOVRgNsCi7}fC$-7oIrtqby#5kiVZ+z+ zv6tn4aTc{~;*D*1oBi#^6evp9jroM%v!C^pQNO=_7#e!|VPWTPI^e~=y!jywxcT>Q zt&|Gmzd9rpp1T>t6Y~&bHm{cHzN2{rDv$gp3^eF3YdeGO={3@hAL(+UNkLz}2mYWu z+kchlKmc!yrrEsCNdercW=|QMOf(#z{#YqSC{N!FHOTW-c7Hpv6%5%8aA`&*!%%?; zA{-$!YmCggWR4keln~2(ZP<=6yuyY8vA}{;ggl+g7m`ad;J9v{&|QxCLJ)>@Zdm7* z1>z)8X0RrOvVytGhV{Z4g1-<|=qy|!F$@s~y6X07c6&LaP(z5}U)!aOSg}3^6AXAp zH}kkOgT$mbtOE9nR~;syhb=Kl4oEta612#7_0FjB^&dA#p0z|kd3;8OAHr@v+=Yqy%46>D3s^A5W=0+Fk+`@T#5oSyt!+o zjCr&aW}dqO(=k#fj;%lo#;fZL*`*S~dGAW>f>YmitwI7aw6(ar3Rwo)9E|N(&5bw@u5JX1^P51RS{c(l>6X&l4-GS4v;~{6Pc&|UKTKT_QjCe&i$<}I0uOE| zMvkfb0T;$M6r+&R-13Hs@gjLf>RLOt$(+2g4P(jjklBZ5zNG{iWRFx+x{&*oVm4Cv zvQkW?sk)z#*)$kXz-!Ckpu$M4AH`Q?5Jvj9JJiV?NT4s>{`YoBz2qIGe|P6jxiwNZ zMEy<-6FnBCPKG#|9i>eRE@P#N-BmCV-r-u0P^k zIv&lNmLh;Jsm5+P;WqA7;|&tJAx<1bi36XA;kU^oI!d*}?f+#b3Ly(3{?g(;N7d2<*c= z4^yB+1{}c~TM){92av>1^drp_^ka4{1v|7{X!nvhJ%EFRMLhRg^rBEa@g1&Nk z@fez8!#Qy{k&YP1mcUP1X^PmDOtA(m<~36&4NJtWDYTkQdlMd%Gf1pUB_m8nRmP+i zIEYuIk&FJGpf>jmUb9n<$|_!wPBCg({dx5?>P4$cIMBx5NvH4mo^&$u%h436XX18( cmb}A#Kc|t@KT(Zi*LMac>S>)ghtlK!3zKtK)Bpeg diff --git a/Data/Map129.rxdata b/Data/Map129.rxdata index f8d5d8df522ca943fc58715b540b090a100df6c7..c1a79f90d88e200c75cf8fac9e6cb08501a995e7 100644 GIT binary patch literal 33893 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 delta 459 zcmaF#gYo7U#tnBR7#%0ikCC7JS3-bYI5jyVKPPW;jEzvx%bD1jz|8rwYnfyq%v$G_Ook9 diff --git a/Data/Map703.rxdata b/Data/Map703.rxdata index 02fc83a83e478922443746579b4ed2df7567f524..a212824335b316f0c1a5e03547b0848b306005cf 100644 GIT binary patch delta 3642 zcmchZO>Y}z6oqXE#^afI>~Rzjahea;iA&-(QzMZ_cYf#Sz4%Y*fyy>%YFllh@6|pcpR4pbzfQmB zAK-&}W50gTs^NpSep98j#8gbm(8Gi=mm(3!tMGyjLlR_F7|wB*;T(yr$6%xiqxf`8 zg>k|`PKEO%R*1p`{Y1#VIf+jSDqJ8u%&PFB4paRwO`=brm>YcU{mZQuX|?Nn?b>d= zp}|G`@FjfB5D^r7FX3yh3T6EAOY~P^TFeE#qv>ld*nOgPkE~^a0G)R zZ$f<6R(rM)OxVe{MIR3yjjk=z;&WemX3szMY!`HL7D!{b8$2~NQ>EdDo+eKrVgLHj9q2! zEMwbQwCxn;x}(QtRhhG#Wy_c+lFM28M0kuSdEXl&ctFiUUo-tYF7#eucAw6MujAwR zV>f&Q=S$DExoDC;Z}p)@bPa$cR+}n@@=(T#Pcf%L<(~Cvr~B z@6>m-T5I39f8hfzFoc|aB}mFbDRg8a&S?v$Kse*K1*wnzoVrNwzOrKcSl*4f|HA9+)=fD_f$v{< z+l8`gJi^+|;pqMgOr!D3!Z(87i5V)!?EL@Q)b!?kxMCA_c=A!SF{g{Hf)1rA-=I eOKaE2HW^t?RBr6Fbcpl7lXd)t@zq;*D)E7{`64IiJt*o$U;1ozOT=9H+!-&Pm!N{v?#7=?Rqrs&LyO5|&9WNMR`R>_%=QyYxEK9z~@1NiI z|Np<|qlePbL+R_QT4KFPYF5K)R>&?nf3#Kl{;R*_@qPOftI|BYYmrcCWPO*^t(_*Z z4=Q`)Q0QwJ%@`_Iy*A4fX@tk6-f*h@qGzjZUa)^3DK;2r*2sXutGFgB}rH#2@RvyPGFh^E=W;ctgw+!PlvQUwQhAd(v$+KYg zg~awem1dS(n~BGglxWST(r0>Y9PFM!Y&_-LChFOS*UHSBoLZw3qn|OC3uY4*+lK|o zNl`j@J}gLEA_bmtnQahNaS>7Jh$@Asl0U3(Wfhqxpg4`r0i46e_pVh=+HSq&ScsA=hFCvse;m7)OB- z66a>tlszT@Fy_zq#Lf8K2OR667677P-mR8;! zZiFPW=JcKFe(Uqu59CvmJK+L0>+g*~WGPgmve42W7Jg=zH9@O{*_LpxUmc5nkma@R zi|}*GGjn{kjL71MjQJ``bQhV*s=2jNd^RLdw#9C!y1&0ptt{s&^YM7f+FPOZ)5enAcUI6jr8WR8j diff --git a/Data/MapInfos.rxdata b/Data/MapInfos.rxdata index 1de416d093271cdc7103c0d077d383cddeb57981..3d17bed18142ea45744933869801dc6f0e778dc1 100644 GIT binary patch delta 46 zcmV+}0MY;Gu>$C^0$C^0 "flowers_red[10]", 1031 => "flowers_grey[10]", 1039 => "flowers_white[10]", + + #water cliffs + 1363 => "water_rock10", 1364 => "water_rock11", + 1389 => "water_rock01", 1391 => "water_rock09", + 1381 => "water_rock_shore08", 1382 => "water_rock_shore09", + + 1377 => "water_rock08", 1379 => "water_rock07", + 1384 => "water_rock_shore01", 1385 => "water_rock02", 1387 => "water_rock06", 1397 => "water_rock_shore07", + 1392 => "water_rock_shore02", 1393 =>"water_rock03", 1394 => "water_rock04", 1395 => "water_rock05", 1396 => "water_rock_shore06", + 1401 =>"water_rock_shore03", 1402 =>"water_rock_shore04", 1403 =>"water_rock_shore05", + }, 2 => { #small-town 996 => "flowers_orange[10]", @@ -67,6 +78,32 @@ class TilemapRenderer }, + 6 => { #Dewford Town + + #water cliffs + 1363 => "water_rock10", 1364 => "water_rock11", + 1389 => "water_rock01", 1391 => "water_rock09", + 1381 => "water_rock_shore08", 1382 => "water_rock_shore09", + + 1377 => "water_rock08", 1379 => "water_rock07", + 1384 => "water_rock_shore01", 1385 => "water_rock02", 1387 => "water_rock06", 1397 => "water_rock_shore07", + 1392 => "water_rock_shore02", 1393 =>"water_rock03", 1394 => "water_rock04", 1395 => "water_rock05", 1396 => "water_rock_shore06", + 1401 =>"water_rock_shore03", 1402 =>"water_rock_shore04", 1403 =>"water_rock_shore05", + }, + + 7 => { #Sea Route + + #water cliffs + 1363 => "water_rock10", 1364 => "water_rock11", + 1389 => "water_rock01", 1391 => "water_rock09", + 1381 => "water_rock_shore08", 1382 => "water_rock_shore09", + + 1377 => "water_rock08", 1379 => "water_rock07", + 1384 => "water_rock_shore01", 1385 => "water_rock02", 1387 => "water_rock06", 1397 => "water_rock_shore07", + 1392 => "water_rock_shore02", 1393 =>"water_rock03", 1394 => "water_rock04", 1395 => "water_rock05", 1396 => "water_rock_shore06", + 1401 =>"water_rock_shore03", 1402 =>"water_rock_shore04", 1403 =>"water_rock_shore05", + }, + 23 => { #outdoor 1232 => "flowers_orange[10]", diff --git a/Data/Scripts/016_UI/001_Non-interactive UI/005_UI_Trading.rb b/Data/Scripts/016_UI/001_Non-interactive UI/005_UI_Trading.rb index 7ae4a0e39..b69f4b342 100644 --- a/Data/Scripts/016_UI/001_Non-interactive UI/005_UI_Trading.rb +++ b/Data/Scripts/016_UI/001_Non-interactive UI/005_UI_Trading.rb @@ -251,4 +251,5 @@ def pbStartTrade(pokemonIndex,newpoke,nickname,trainerName,trainerGender=0,saveg $Trainer.party[pokemonIndex] = yourPokemon setDialogIconOff(@event_id) if @event_id + return yourPokemon end diff --git a/Data/Scripts/016_UI/001_Non-interactive UI/006_UI_HallOfFame.rb b/Data/Scripts/016_UI/001_Non-interactive UI/006_UI_HallOfFame.rb index 043b60394..0982088ba 100644 --- a/Data/Scripts/016_UI/001_Non-interactive UI/006_UI_HallOfFame.rb +++ b/Data/Scripts/016_UI/001_Non-interactive UI/006_UI_HallOfFame.rb @@ -180,8 +180,8 @@ class HallOfFame_Scene if !@singlerow ret = 92 + 128 * ypositionformula(battlernumber) / 2 else - y_position_base = 200 - height_increase = 30 + y_position_base = 125 + height_increase = 20 # Calculate the decrement based on the battlernumber: # Each pair (1-2, 3-4, etc.) will decrease y by height_increase y_decrement = 40 - height_increase * (battlernumber / 2) diff --git a/Data/Scripts/016_UI/005_UI_Party.rb b/Data/Scripts/016_UI/005_UI_Party.rb index 6652c2f16..b2f9ebe26 100644 --- a/Data/Scripts/016_UI/005_UI_Party.rb +++ b/Data/Scripts/016_UI/005_UI_Party.rb @@ -1231,7 +1231,8 @@ class PokemonPartyScreen splicerItem = selectSplicer() return unless splicerItem if pbDNASplicing(pokemon,@scene,splicerItem) - $PokemonBag.pbDeleteItem(splicerItem, 1) unless splicerItem == :INFINITESPLICERS || splicerItem == :INFINITESPLICER2 + echoln splicerItem + $PokemonBag.pbDeleteItem(splicerItem, 1) unless splicerItem == :INFINITESPLICERS || splicerItem == :INFINITESPLICERS2 end end diff --git a/Data/Scripts/052_InfiniteFusion/Wondertrade.rb b/Data/Scripts/052_InfiniteFusion/Wondertrade.rb index b79f42444..66c2f8c97 100644 --- a/Data/Scripts/052_InfiniteFusion/Wondertrade.rb +++ b/Data/Scripts/052_InfiniteFusion/Wondertrade.rb @@ -128,6 +128,10 @@ def pbWonderTrade(lvl, except = [], except2 = [], premiumWonderTrade = true) tname = getSpriterCreditForDexNumber(species) tname = randTrainerNames[rand(randTrainerNames.size)] if ! tname newpoke = pbStartTrade(pbGet(1), species, pname, tname, 0, true) # Starts the trade + + echoln newpoke + echholn newpoke.species + #lower level by 1 to prevent abuse if poke.level > 25 newpoke.level = poke.level - 1 diff --git a/Data/Scripts/053_PIF_Hoenn/DynamicWeather/DynamicWeather_TownMap.rb b/Data/Scripts/053_PIF_Hoenn/DynamicWeather/DynamicWeather_TownMap.rb index 20caee932..d2b6e414e 100644 --- a/Data/Scripts/053_PIF_Hoenn/DynamicWeather/DynamicWeather_TownMap.rb +++ b/Data/Scripts/053_PIF_Hoenn/DynamicWeather/DynamicWeather_TownMap.rb @@ -76,6 +76,7 @@ end def get_current_map_weather_icon return if !$game_weather current_weather= $game_weather.current_weather[$game_map.map_id] + return if !current_weather weather_type = current_weather[0] weather_intensity = current_weather[1] icon = get_full_weather_icon_name(weather_type,weather_intensity) diff --git a/Data/Scripts/053_PIF_Hoenn/SurfingSplashes.rb b/Data/Scripts/053_PIF_Hoenn/SurfingSplashes.rb index aead4c985..bdf463f31 100644 --- a/Data/Scripts/053_PIF_Hoenn/SurfingSplashes.rb +++ b/Data/Scripts/053_PIF_Hoenn/SurfingSplashes.rb @@ -125,10 +125,15 @@ Events.onStepTaken += proc { |sender, e| $game_temp.surf_patches.delete_at(index) echoln "surf patch encounter!" wild_pokemon = $PokemonEncounters.choose_wild_pokemon(:Water) - species = wild_pokemon[0] - level = wild_pokemon[1] - pbWildBattle(species, level) - break + if wild_pokemon + species = wild_pokemon[0] + level = wild_pokemon[1] + pbWildBattle(species, level) + break + else + pbItemBall(:OLDBOOT) + end + end end end diff --git a/Data/System.rxdata b/Data/System.rxdata index a0fb19d8df25061118a43ee3ec1745b5d0cebac7..c9c26a3e6466b8c0feb015bba853c9eccd97c1b9 100644 GIT binary patch delta 28 kcmccngYo_k#tl}oEL+51FmAS!b% delta 26 icmccrgYoVU#tl}oEdLhVX4-5g>kz{jwz;wL9uokr2Mfah diff --git a/Data/Tilesets.rxdata b/Data/Tilesets.rxdata index 847d675f32adcd7f7894079617e76dbfc2917258..d16d8dd06a41e901407ef5ff58149093cb4099c3 100644 GIT binary patch delta 46 xcmZo^l|0cRxnZ8&<_`-B*cf>>Ge+LxY*zJeSM_HEVkRJF24a@&s{X9;p8=qn5IFz< delta 46 ycmX@nBH7X^xnZ8&=J@6{Y>Ygc4I6H8Hox?1f9b~v#7scU48$zkU;44ee+B^Fg%q#=