From e0201bf021f4ca459de768c9180883e9c1d64e06 Mon Sep 17 00:00:00 2001 From: infinitefusion Date: Fri, 31 Jan 2025 16:09:57 -0500 Subject: [PATCH] Adds option to swap base color in hair dye menu --- Data/Map010.rxdata | Bin 27996 -> 28063 bytes Data/Map341.rxdata | Bin 7720 -> 7720 bytes Data/MapInfos.rxdata | Bin 42771 -> 42771 bytes .../050_Outfits/UI/LayeredClothes_Menus.rb | 30 ++++++++++++++---- .../050_Outfits/utils/OutfitsGameplayUtils.rb | 2 ++ Data/Scripts/052_AddOns/WonderTrade_names.rb | 3 -- Data/Scripts/DownloadedSettings.rb | 2 +- Data/System.rxdata | Bin 31659 -> 31658 bytes Data/messages.dat | Bin 30287381 -> 30287453 bytes 9 files changed, 27 insertions(+), 10 deletions(-) diff --git a/Data/Map010.rxdata b/Data/Map010.rxdata index 66fae00126273b4a59a9320ecd37a388acdedfcd..7d6ea2bca413b2bbe7ac24baab5fcbd6bd0363be 100644 GIT binary patch literal 28063 zcmeG_TW}lKbqh!ULGUfUZGmR#K7gW}Rq|Ttks&Ioi7tJRB$h<6kG!mu<^dgImnRZ4P`U-i%+ZpD zmA!W5F?DrS&SxVqNbQcpzMG9RJA*Ei`O zLE1_MX&ZgitYObWqHAJRJ*zBeYXt>>ZJo%{qLR_5nqOF==TlIfQS(`f1!_XHF*49i zB#yD#PUu@Yhs+pTI4kF9HkH^mQBrbC3r6WeW+fJ$1Okl5II<~h^@-bk&dNn9FXj|1 zDJwwLb{7~EcF%;>P6xEjel}aMk;aUXx(zyuICE^)PXXonR7Rxk`4%=ESZXr71(=9z z+pS9b**&tXbcPlRh-3=bUsMW;tfdnj6IzijFDpgB83xys!h)QqtI%efG4@hXc~@D< zXV!E^%eiy%T4@0ot*M0+^jtLo>A?XQ;MD1OE$fGbf zu_sk(iAWLpfYcgm19lxNu1Qf!p+($mfym;dZ*{&hkkaQv35Rc8UUlOM zG~=4ER8k!VQ`dEklj@Wcmo>4LqbcsKxX@f=n=3MGuE;iPMOu_QbTA{2ql2%3y4~Rr zJzL#&081^c=2VJxt6QgFI7OOwe@hMD&}uk-H!R2P=5i#o-=%+1ZJ_5>x4T-ehHzi=|{-OO3B#nB{XQnXxgTst>5@10~Z>yIoZAjG~W%3??`8eVXbj(lU(>T`>;E zyK_lZHS|17U?rKtX!R(JG?>VCY&KHLnRIjm9o_VxiwSc$%d zvGKK7hhb!El4BJK&@n*4k~?Ond%nvGg?eHlEuB^%^Oj#uEAr~BnmMCr(`9XmYJ)>& zl*EGK@KkJ9Vey!p%N;E*4vq~QnNG+t4T<4IIGJV(FvG&caO}uwMa(HnnwXFPk&zK`Ca1_HY#^Uiph%Q+YF^oEf_d2CepHW+tKlUjcxc^zR1q_BQCTYI zL>baq`K*Z4LwXm<9~RHhEaF!$CY)vJ=k{%Hn%k!<>Gq?i#li9TkRvz32@^qAcP-J< zic*ARavVgwA4D8QBTPX#yF>#NxbF0U$XMC3&g6NjiT9~$QBP}`p)+J8jCi`7XidYs z9T4#6=jtWyHxxp`$?Wu$V5&`O=b7oGTZXKs*QI<41<$ zcMspg#4>2fSxZ@xjN$dM`MetPIG*ZkbHigoM|P_+Z7!mw!< z1vRKk9fb8(5}741)}5be+%h(hn_+PZFI8%PW3CCi@bOw)HISR;Ec!KwZ# z=;Ci@1TO~7A?*zf3yD`vBv^rGH^cIh!m%B&U7l7}3v>Fu@pOJLHW~Ap^_up%e?2L* z$Od;AFhuAwEm=DS33B;Qz*BuH>)TMcVfIeq7{+7Z(*a6gI|V9qsthI2Jr8>+hF9nt z0GPsQ`()wR_UVT}Lcf1l{Oy_h(X~g*z+C%qBj6^d#EiPCh?*+GNrF`oyjewr zvlhiQaaDyq@BA`WDd&}9hL)6Jaj~q4Q(~58^8=db8F;&Lz5vG^bZCkmnK0ynPuSs$ zU%11e_H7SAa8r`kkl2B&5$^y#D;V0yVo_O@;e-TR!|P(euY)5Dbe+S{B`;=GQCpF< zz2a|{OPa+QZAB4Nba_QXc1#wPye!hZm->MRArzpw931WtkHMJ&5zd&1Qvr_qG)=lj3cjoN(7EI2p8t=V?|Qfu5Zi*Zqwa*a0`~3814dSH?BpZCYS2kKnLH zu#+$kqTb|n?VOnACsk?8a(+yr-;d|bQr85m}cEg-7<8O5JY$&XDpHO?t1j^NtC3cj|k|j4wpnPZ) zGzkXEm^s}?;q;ZmM>g~$TZK+TGNmc2MdA7Pt;s z^``4J->!K=+udRwHR>==4veEKQn?;)=u;=77|3AybSq3!2kmpI`N;aMk8 z)klXoq8GJ7wEb2F-4eaTsfXs$Q^!tErjxT?xdS&lwORi#hmpD2;n;Y3g_gusj4_PR zK+M45Y(4Z4ljRc4E8;o1B<58042B#_YLP__EXHa0w6EXEn03l^=h4&Ciw{Grheu;7 z1>8Q}if4QrDKD=J?eC?zcH3)iyn2qlRM~BJu0GRCJA@mr=m+$JC=6ke)#IgIpAGlh zHiMginI$_H1iRaNy`?Br)i?0$loXI-1xyVeZwb3TL}|5p?$HFO>_BvshZf7g!+QvZxe`R4I8#*)^xh8f-Hg z4MAP`HQb_N62!N<8_czd+*%83@`G)TQ0`yE~WYS=soYem$A&+)C|Y& zoVQ$tV<(ccQ%94tvkwhB%jVM4Mj`8cA!yCp9ah7cwUUk|Yi zsC}+C9P3YGG7(b1d00_;iq@H2WG;eD0(xkiJ;8+i^~By*iqPF~v0~;g)kBE+B9qH$s7}ZRcP!$V0qF$G(E^rZD~03w9*?1sT?>Cd z=(^g&F?`zt&#_=8aSz?kp{lkI=bO}N+>5K@oR-6zt2nBK8Bw(B`)Q|1hq3e0NK~0T zIrUpp9PhqS|NB-{=?HmEr+XCRFI+;qV3Im1y#4Z)SVEZ4z)%90&<=ca$3d0-hFlA6 z+9^T)X}qJ;D_|dn(MA|Y1eax+-^)%1K8&%abwm)4vEh~$ym^~ZFx*666Qc`eOTw|J zn$PI_S9)+_?O&m8t{#Roeva^7$EiU$Gzf(MTMgCiN0~21aN{DA3GYnF^(T%Iv$f~+bC>`Ib_aIch@I;O@n<4d3p|CenfR5-urfgl}S z`d?-#IgXhKc-}m*Wdc%1Y9S}DEx;dcNy8sI$;z5sPDIoAhd6@Tz$Q57HwvG9@WK1% zwhF?PP%|ze@P@#@ngRVv=ob9ye7wb<_44Q0z?T9S178k!zx^Qg2YU1?9N27K|L!CG zZwTKEJQw(S;2Qz&w;%i~p^vm;T`p!=(_|G8mzpL||X;b98-QSpJ`?=a(eejY049W|hxi%z(_q&=- zX1L=w@}I$f#;a>?oZ^6IlS!-VSTg+Jv1v=_jU2nMT<3-O}GvG6rs1KO5 zMCw{ymGCRqngO3Tlk0=;Tx~XQng^e)HXAnH@!nv^3w|X>+|M^Ve{5;3$G*F1U(Zu@ zeysxDKRfM&vfvhB}2 zV;Jy%9{T5ouU}N)F9=V!{W%x@dY~gdYy^Wpd=6a>trxmI0)x-v&qkoL5g2?Pe;Vg| zWshHk7<`@tRkn6MzY_9F+@r1D>uFs+1%byOCp`E4<2?hrL}}dB=w@2*#RyRpe0zju!T&JWbmwLJ5gQ)?@vo%Xme-pbK5A>;RY|Y=`SJeq zWR1L=JVM?>-b)@O?%It%J=Om{@_zCG^1I~s$Op-XnhswO{($@;`6Kej)W>UN$ws z^W+8c9r9iBJ@S3>g9`jnBcLs)1{>@Cwe@Fk-4``3y#JXw;^qEJv=eJk{BkFK<9H-7iM z(D$z?{2zyY(iHeFn;x4}?vVc*=YSi6VVN$4ei-^uQ}A{}H+&mGFyKEPeS(u2sO-_$ zv(vUd75zjMa}UiN#|a-X`z6c(j?);H{;du82-W^^KiTE$xnubMvXz&WSr0^a9|qsx zxjo82lQ?9+zZ5lieo3F-X2C{E82)am*pm@AIoBYosrUP82%|6m2+V-p_y{Zu_Bz0> z*4yiO)`vNRkFBf0s8&~Pq+9T-aR>8Dc6~J-v$|B@@jmCr?#;h*!soXzN*Vn7`=JKg8}RKp4D8ioHmeG7fgPqX1K^)2@~KMcMfpWLVNO8D=vRuugYPYuF< kr-J`=1%Ff*|2q}_vjO<8Xl)bcXckVsA9hvh|L{!sKWJh-z5oCK literal 27996 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 diff --git a/Data/Map341.rxdata b/Data/Map341.rxdata index 9538d3d4f5a0ec4438f10ff4c910ed697e19d499..b7d7c47f79dde4608c99887c9f277c6c3bed117d 100644 GIT binary patch literal 7720 zcmeHMTXWk)6qXGmDbCGJ(<>z?ZVPQmOKv5JmV(j{HKk3P>6ii&W{hlY>?N{R)g@`T zw7-Ej9{2(9!f#-PCoV7W1brxlC!i0!cZPwpl2*1WB>_4NWg2gkmA?JU zWvcdGSvsexi-uEFyR>S(N!8sUG8>qL>cqmb+M}&eD`;Xu)PiOkOEM%VmnZ~ zHHY}M2DJ5Pcn#aW_pU@ls`iIg<{468B%_YKWx)5ea8+FbbO4N6#PgRWs_tzy&e3Mm zuuWMlLSGl0`q=fBWg?W0j!sUGn^O}rQv|BTYi)%iic4dWJ*P*#aZIdv7 zs!A)eC~Q@oQj91nSio61B-lZkH(9mG(Ic9KAgdqB?ix;m)Tla?miAoK)&n%^7&YQ=klY_&x7L7Es6i%F!ZZ}1-7$Q4wm~ci z2-1}enN4jnnM8u{Aa>hq&2-C7BhdY{#ll8C zz-N3nz;Qa}Yq^AcJR#e7y;6tduQ*oVRRY_hwN-3p_mfF}CKp~}Z1YBJQ6{^f@WgMS z`Hz7Q*Zuqg$$iLv1St1nTQ_4{5)mjWv8>rm(P5q?T@Ts)P+L3#I-;YadOVKYH(X|I zj7$G}BE2?|ft}94rZTXZ3=CypXELytGO*bUY%T+v&%n-QVCPeqMDG0$CUalsWR^20 zb2T+MQEO&kGy}Vqfq5BNkb$jdU>h0OyBXN~8Q9GXEcad(cq0vxr5K|;$xDZv>YQO& zXM^go@sVhUh9&a2!aKJuJHzwt$p&r?E3mV{>g)%W!8Sind2{K~shI!vKQTN~ZV*pd zu_$#FxbYiUS-N~-e(~}pWnuQ>Mdh-t=(CIS!w=%)#U;A>`6o?kD;LAHRe?3W>4f1M zE>;?_iM!ZTRv-lMPh16GcPvVLk1Np{nbyEA9#+aBEiuci7?wvBI3!Tl1Y2+fVnbN~ zc@?^%=&(+6nerbbO9~l$kU4n)v>#U9pn=jb*02J*7&g|zk-%1HDn3=J5Ka?^k-%=j zN1u|ikL$rzZVU16B*~fkl4FEr$B4245yEke)vnT^8J8y&Q4bT$_0sXQwiwt`lPzX{ z+x@0XdhV;(O+H!Er9kZ}QyU)@*yj$_GHU?Ifw*t(2cF~!lzg8kl4K;4SK%noW5Y~1 z*hU3-jLwufSWd%3rWBwV?(nnNVQ0-8@*O#G2pjLG>_>!+mv72^<1GLRO#*@Ab?nYh z;$%rI!lCw^7-5##GwjtJhu-{0JTKcL)Zz%ETEkHdU^4zB!fps4|686ENiW0X?CkLtyqv9Sy+%p3;#5 z)gB!U$NLnVu9A$1vY?EfCNg?PN5@DvIziF1J!k|@i|Ayj`|N8csj-Sqfx+kC8YR7G z4C-;Xj_YWmj3%MyX?CoW8Si;Agr-P8nhuYQ>@ewJpPeU%!at3?wz(Hz(uq2t83CMT zEn}kse>s)mPYu)XjX*7w*=kBS25$%lWW z)8dS%ib&ipQcau{&x&)K^1hS4mu^XduppinUlA_=k0YIy??^vNKLM}xNh7T7XXzK| z*A8A9;Wi>q>|B@aGveJXMxGciy1QHC7CLL@>8)y1v>vb;jveD@DI&;!zah!O&YwHqk+xd Yq_H=5jBAO|`c!xyu{pMYSQkN^Mx literal 7720 zcmeHMTXWk)6qXGmDR<{W+i(erOCc#~$*m;OQcxPK254xeV+u@|F|xI>m&jV7OVV&@ ze*8_`*Vf%K zRr{{2UsTmK!zrj;TD9J!>TrlG2PUC9v9PT6YTMKbnwSu^TeFQOF7~e(#8%d@9jHB; zL;P9;+6tNvbPxL#Vv;fFg}1Todv8iar0PIuw8W5Z*2k!0Zv*gqTDYpN13IJ*Xid6} zEB>y7i2xog;`tjARgbl(E40}(Y*PlGj^RQ?K6bqgnFz&G)ANh7=EB_4!hCh^+?+XG zt)8nH7|+aBXK;04aT84TYQ#1nkkERKnwaE1r)Wq~fh`tc4kvF$-E;f01qTJK{9_cY5rnZ(64Hjv6Dxu!!Tp}sB+e9UKi4HUn^02vLo zriG!g)KVx;B#gI39EU}!gOo0Iu;G{0KFxPYy^dYd#m4Gmr()Qo37nD0-=>RS53pU^ zB{GofuHiIDjjCg5X)i`?y+EUmQ6v5?$^8aqY7Lm{8ccO1OhN(L9m9wBHi!lOA^X^n z+1w>VCK5ygq1q--sNps{jZo)d&9HWiU9SQP`P5+w?HJZp6n~lPz7s0aAG?*=$dzHkW~&%fJ>gu%!$PWnkwsu%|Mx{_Id{9Wne)Dwv&PFW?*k-U~gw&H!`r?TUp@sG)UHCjPfKe z-tSab49mI@R3~Pqq8%F6%t?iJZd-Q7OYWHlZjLLk)xmP@2bRG$5l?w#{rR&o|Fyqj zc&gkWp0a6C>MC&KH?XpP`MJ{C<>!^vDI>|G^wpz3fEQz zHjkzghHto7X~3@TVpG|K5Wqii6@1OHDDge6L~CSP1G{)!DTlPgEVE)*9#vp(rLGCK z;6%iRvI_DlbW_n`o#ry--$|AfGV*ukwK*rD_89+;LhGbujytc^}V3vtGq!|Gm7%gMB z0^gj<@Lk0;d?Qf1%j|TVf2(j8h&BS(Nx0bkyetUQN98~T=7mccWii!fRroZYE?Nff z%Y3?I@owhRC5v|}9~GLX@!hTbKhK*L%EDg1SA?0=c&7!<x+pG* zs))qHBGtrY@q)OrFYhbqYw4yW2&>{V;(dZiK8_Jj1J^iu~f zjc^;0Cw8vO_8IYR7a~uL7v0@1a0{I^^Ym&D<%&g1{v*W44=IUzXKdboNxdD diff --git a/Data/MapInfos.rxdata b/Data/MapInfos.rxdata index 6aee65d37d65713681b17205cc35735a9db7ee04..fdb3d043667f8c61669539f56a47b79996ab1af2 100644 GIT binary patch delta 25 hcmbPyj%o5arVZ!Bnbt6Fz92qbj;V-gbEes<0sxGH3OoP+ delta 25 fcmbPyj%o5arVZ!BnG~2eUl5-z2ck30RuupMf-(tV diff --git a/Data/Scripts/050_Outfits/UI/LayeredClothes_Menus.rb b/Data/Scripts/050_Outfits/UI/LayeredClothes_Menus.rb index 7f307858f..3f1fa4155 100644 --- a/Data/Scripts/050_Outfits/UI/LayeredClothes_Menus.rb +++ b/Data/Scripts/050_Outfits/UI/LayeredClothes_Menus.rb @@ -43,32 +43,49 @@ def selectHairstyle(all_unlocked = false) $Trainer.hat = hat end +def swapToNextHairVersion() + split_hair = getSplitHairFilenameAndVersionFromID($Trainer.hair) + hair_version = split_hair[0] + hair_style = split_hair[1] + current_version = hair_version + pbSEPlay("GUI party switch", 80, 100) + newVersion = current_version.to_i + 1 + lastVersion = findLastHairVersion(hair_style) + newVersion = lastVersion if newVersion <= 0 + newVersion = 1 if newVersion > lastVersion + $Trainer.hair = getFullHairId(hair_style,newVersion) +end def selectHairColor original_color = $Trainer.hair_color + original_hair = $Trainer.hair $game_switches[SWITCH_SELECTING_CLOTHES]=true $game_map.update display_outfit_preview() hat = $Trainer.hat - commands = ["Shift up", "Shift down", "Toggle hat", "Reset", "Confirm", "Never Mind"] + commands = ["Swap base color", "Shift up", "Shift down", "Toggle hat", "Remove dye", "Confirm", "Never Mind"] previous_input = 0 while (true) choice = pbShowCommands(nil, commands, commands.length, previous_input) previous_input = choice case choice - when 0 #NEXT + when 0 #change base + swapToNextHairVersion() + display_outfit_preview() + ret = false + when 1 #NEXT #playOutfitChangeAnimation() pbSEPlay("GUI storage pick up", 80, 100) shiftHairColor(10) display_outfit_preview() ret = true - when 1 #PREVIOUS + when 2 #PREVIOUS pbSEPlay("GUI storage pick up", 80, 100) shiftHairColor(-10) display_outfit_preview() ret = true - when 2 #Toggle hat + when 3 #Toggle hat pbSEPlay("GUI storage put down", 80, 100) if hat == $Trainer.hat $Trainer.hat = nil @@ -76,15 +93,16 @@ def selectHairColor $Trainer.hat = hat end display_outfit_preview() - when 3 #Reset + when 4 #Reset pbSEPlay("GUI storage put down", 80, 100) $Trainer.hair_color = 0 display_outfit_preview() ret = false - when 4 #Confirm + when 5 #Confirm break else $Trainer.hair_color = original_color + $Trainer.hair = original_hair ret = false break end diff --git a/Data/Scripts/050_Outfits/utils/OutfitsGameplayUtils.rb b/Data/Scripts/050_Outfits/utils/OutfitsGameplayUtils.rb index 83c03b918..5224b63af 100644 --- a/Data/Scripts/050_Outfits/utils/OutfitsGameplayUtils.rb +++ b/Data/Scripts/050_Outfits/utils/OutfitsGameplayUtils.rb @@ -156,6 +156,8 @@ def findLastHairVersion(hairId) last_version = 0 possible_versions.each { |version| hair_id = getFullHairId(hairId, version) + echoln hair_id + echoln pbResolveBitmap(getOverworldHairFilename(hair_id)) if pbResolveBitmap(getOverworldHairFilename(hair_id)) last_version = version else diff --git a/Data/Scripts/052_AddOns/WonderTrade_names.rb b/Data/Scripts/052_AddOns/WonderTrade_names.rb index 0af42e3d9..3b0d20cc8 100644 --- a/Data/Scripts/052_AddOns/WonderTrade_names.rb +++ b/Data/Scripts/052_AddOns/WonderTrade_names.rb @@ -476,9 +476,6 @@ RandPokeNick = [ "Carlos", "hm_slave", "Varicelle", - "Google", - "Twitter", - "Facebook", "Mia", "miam", "Lame-o", diff --git a/Data/Scripts/DownloadedSettings.rb b/Data/Scripts/DownloadedSettings.rb index 2e82bc22e..cfe4f8b7f 100644 --- a/Data/Scripts/DownloadedSettings.rb +++ b/Data/Scripts/DownloadedSettings.rb @@ -14,7 +14,7 @@ module Settings VERSION_FILE_URL = "https://raw.githubusercontent.com/infinitefusion/infinitefusion-e18/main/Data/VERSION" - CUSTOM_DEX_FILE_URL = "https://raw.githubusercontent.com/infinitefusion/infinitefusion-e18/main/Data/dex.json" + CUSTOM_DEX_FILE_URL = "https://raw.githubusercontent.com/infinitefusion/pif-downloadables/refs/heads/master/dex.json" # CUSTOM SPRITES AUTOGEN_SPRITES_REPO_URL = "" diff --git a/Data/System.rxdata b/Data/System.rxdata index 70001652e4ce27d48f21bc35bead34e2893a395b..640d3789a1068791cddb7b761e6c732e1fb03a3f 100644 GIT binary patch delta 25 hcmZ4eopIH7#tovf%${1>n9%nK3j2*2>^nK39tYF delta 26 icmZ4WopJSd#tovf%rkzx-z*`!Ihu*_*XA=7_m}{xRt$6i diff --git a/Data/messages.dat b/Data/messages.dat index 537065e87ea33e25daed13cb88e39702971be76a..cdfc15e3b880da7621e2d1985c17fd721704cc28 100644 GIT binary patch delta 2545 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 K^Dnb*%=rs*+MeA2