From a61a3d3693bad8cbdffc6524b6bdfd701a4e8351 Mon Sep 17 00:00:00 2001 From: codemann8 Date: Wed, 19 Jan 2022 02:31:54 -0600 Subject: [PATCH] Fixed Hera boss music to correctly read boss defeated flag --- Rom.py | 2 +- data/base2current.bps | Bin 87396 -> 87514 bytes 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/Rom.py b/Rom.py index 743d5409..0d948695 100644 --- a/Rom.py +++ b/Rom.py @@ -33,7 +33,7 @@ from source.classes.SFX import randomize_sfx JAP10HASH = '03a63945398191337e896e5771f77173' -RANDOMIZERBASEHASH = '3e62bf77f3b6be521c932b66a9931602' +RANDOMIZERBASEHASH = 'ea4215dbf86da55ffa1255fa5e687b62' class JsonRom(object): diff --git a/data/base2current.bps b/data/base2current.bps index 765a831ebebba7b41f225a7cc86d55897a57594c..138034ba6448e44a08823633503bfcbaeb7f9a05 100644 GIT binary patch delta 6935 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 M>u*Tbm-&GV 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 P&^T%t!dxU^c5<_m!;#GHTh!zly4(!g?1#+_l zkvBOjYV4V}g=N!Q=%_?3*$lQizWS@=X0>e;oi>liD|yny{DdDI+VR@}t?=%6&QZxh z*NzvKjML62ng+6t+`@cwOQ*DY`xrPY&u((>bx{N@u!4CPg?InaHW+nJTQN9ntbDQ)@9Wn9W@ z>u?~*%C5zPF2A{^jkPo=YudZZX;(sZ#IL;za6)&oJ-@m4LYXe%cs9$UdEb{WAR=Ma znbFRnWp+X9gDC39(b;hD%yt-gwx4fKKqwg2>C5}}i$^fFa}VZC!mZAPQQ78K7=?$J zUt?5Ah`AW0Oq!P}vl7*`>q0`aSwDJ5to@XW`8`IRj5UA2sME38tUvt*Qo9sbk{T{_ ztrhtybm3AeTB;ol6VLq-@O{a+qEeg^22-WMlrV%U4WZN_<}VSdBsd$s{wdZkh_VNn zuOd{ognA^QRs@-gP|7BuW(Jwz%1=^JR0(a+9`YtG;;{RtP|<(Oo_Z6v!zoz=IG@Ld zG^HpOhEsRL&0A1vCT@O=P_uC=3x~AxU*p#h>Je_nc+{`B`68md2$i&@e!*Fi7p5@39P} zvO~-Qlv)--JqV#>p|H1mI2sDQ-7&%^0?HOjWekVEx@SUG&ko+i;yG}wXPP)F+k73R zNIG&`jCv5oPP!jgP<~`Lk1~duaR5zN1w%`I*1mle?|47u!uLdUTm zj)LU#^4h6E4-V{hSobHtD6R2w^xExXLbA<5;M7^xL zfN<-Sm`8$=^wXAC1{0JRR@?kXu8Jqfc%aEZO%IzCPpFUUOUPwSin2&zfbYp83A>7v z+IZDSK*3pNqNIK3z=QTWKZ18V& ze7jep)hExXtAP}1TlMoczG#}e@kM3W7TsEM#y)F@nocBCrl(* zUvuE_ISBpvOa6*;5?@&I^HlHF&R+4`y;C zX#58f<4z}H!}etDS+j=1CYjH}-s?VIhq@S_yyEN^TFe7!w9-`Tl`gPe--SglfF(DA zV|};2s!WuX%_4aFkd7P^vyWFN5OZ+Vzfd>;^Ztcy15gf!ZUlHo$6P1Jf}(M00}_vl zFcE@*w-6rPn2q5=`0{2bw$#zG=w=j(O?3wKtv8rsAQb)*_=O-&Lyn-mT`L+Vy)Cdg zu_N9VjHQ!YD;{zeBf_0u^10@wKVfUW zR;gXrkdO~+?tJOr(vwCzhiK>((Hi>u+0W}-*~9^566w+DaOzHkTT2feIHsaHc6#eC z>6~_N?|k7k*i+Xy{B40x{wVH(<_;wg8VyNzON1`dD#*n!PYS(vLmgL0iCM&Nm*L%A zC|tD0k+?3qWOv|pZL?!thP!0-W&F3d!z9g@4N38T7-pSAM`G4>CvC zdFiSvu=oBVOc)D)-&fB+L`9?NgRYoAb&B^O6ZNSQ58}xCJ;_0>$w9XFW|BfC(ggt? z#M$IVvDMN3mDSBY#p+~>eI(W|NpK>XW)nIG>v|jaKJs;4gBT&IGyhR`io5-!aPL8u zWV)l)jBs{n;>^xR?A0SDn6w+}br=z58&13BXdv@pANH^hLLRNbj{OXkk9J_$*FgL@ zOLFV_@A0VpjTw0{pn}~M{BPD1Z1FEazVF(%;i#^MN#R#rX0r1)9Jonc;FTWw;QrDVcD}CV&BRC zN9O)#ONrmYSF0o{(K^eY&r(IA_$j3-cU-Iw^tDWQ6N#c1VfEWlf>Coz^+6fX^!9+i zkC%w3^^4g}E~s9PE9((k2K&(-W}ilniLtEvpN97p_g*0R2=t;VvkdShjkz=meCYxPr-V9JMb zpUqo{vrKovDXCpzqqY0G3tF=O`An~khvy&ej4(Mw>mLft!^3MP5ANxC;KyC&cl+ce zA^S@Z^|WUFn$dRsj3SkL$Byc>H3#7J$3L)7J@D|8H?}ks-hT>qnwLc=IWHkmmXQCG zI|y?E%fFdO6ryc3iuRzQEh(RlaSkRWoL&u@mC@a06kB0b-vNGJGp_R42vWD3I z_-IHN{Zf@XR!(R6&`!@PN%nh=YUSo