From d7abf2a3aae1bdaff061f7a486d76aa729fe0266 Mon Sep 17 00:00:00 2001 From: Eddoursul Date: Tue, 23 Jan 2024 20:01:02 +0100 Subject: [PATCH] Do not start combat music when brawling --- scripts/_00E_BrawlControl.pex | Bin 1224 -> 1361 bytes scripts/_00E_CombatMusicControl.pex | Bin 5886 -> 6125 bytes source/scripts/_00E_BrawlControl.psc | 2 ++ source/scripts/_00E_CombatMusicControl.psc | 21 +++++++++++++++++++++ 4 files changed, 23 insertions(+) diff --git a/scripts/_00E_BrawlControl.pex b/scripts/_00E_BrawlControl.pex index 016a8e278557cb22e780f4e15a63262cee46f6bd..fc6554e61bff3d40207d2e7fdc5387e71a2ca037 100644 GIT binary patch literal 1361 zcmZ`&*>ck`6g^7frfHg#E}@jwtZgZDVIA^Dp#>gb2Ey{#aqZjG)Ri)l+)V$9A7F+r z;X`=hO12r6A&!%~oO|xkmGtA&x9{~D1o%T=S|8Bc+uYpQ+t$%Id#0q-DqA0!7*jh* zqH=BWEJT+odwrbB5Dzf>PZ85iz92iWktMWVD60xH@XVMU9ICN5-{)58G|Dh>m?jBH zv|}Zc)TT;uFnF7jvFP>tyU~f#zGCNuq}@A-G@3_rI#xPC*zbD<&r=iaXEZoUv#cUE z9@-sdYCp=jDs>1fl@%4LSaHF6OvXe*!ukJmV&*SBnD^j6>CkwiB;mluM zG~?99hh*4GO{n%iQ*1-4*rm{nC{7PjN4u@~0L^~CaHo~rreP`zZ~0FFnryD6>rY{vYt7><+i|_6M_b^k8RMP?R(qgJI_p#vVMp<-9 z`k>qsgC5I&=3BgWEy`1mxmSj#r!5cNA3Hbv?ttYDSn;Vpgw?Hif(D;=fttHT&Zt)g z$0rc*(<~pC4ft-LP zjG_oi=KW);BsZ3W!nWOxM5e|Mkztm&|o)o zsX80iyumy-1z4Sz*`esIm|cr(LTh1=Q&C81+3SO zXa6I=L@pc{yWxc1hSzj7Os4n+!Q&7NHI;JA#9>^(icMuKAdQ^1dE{d=FbAY4+6sLQ zznI-=Hi}Znpol^eLEsKbC}WwAzynmUf>l)c)R-a)#28;IgcAR% zgyjn1At6Vosg^A!=ycVbstKYotb2K;U=8c2Avp}dPJ}cH0 zIJZj35;o(v$j}WnRLbOTn%ZHV$Ak>wLN_FsL}A`r-LoD8B+6^T-+f% ajUQ0mbO~FGKKl>l6}7P)Rci%aL-#MPk5NGY diff --git a/scripts/_00E_CombatMusicControl.pex b/scripts/_00E_CombatMusicControl.pex index d4fab48cdd50047e1f277e14449d71e9db61c352..97ea8b4323387f26f7bc6fdbcefc8cb18268cf4f 100644 GIT binary patch literal 6125 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 literal 5886 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 z