From e003c25dc0865bd97810929e82a426962b550316 Mon Sep 17 00:00:00 2001 From: codemann8 Date: Tue, 9 Dec 2025 18:00:56 -0600 Subject: [PATCH] Merged in DR v1.5.2 --- Rom.py | 2 +- data/base2current.bps | Bin 138598 -> 138619 bytes 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/Rom.py b/Rom.py index 1fb5434b..687805ab 100644 --- a/Rom.py +++ b/Rom.py @@ -43,7 +43,7 @@ from source.enemizer.Enemizer import write_enemy_shuffle_settings JAP10HASH = '03a63945398191337e896e5771f77173' -RANDOMIZERBASEHASH = '209b3984c9238e7b37b8f39e783eabd9' +RANDOMIZERBASEHASH = 'b2b8b42d575dd9825f2d8c424a4abb21' class JsonRom(object): diff --git a/data/base2current.bps b/data/base2current.bps index 8b81a644d83bea73e87a40713eab6198007809d1..5ec6d04bb9922f4431f4ef9b1adee07a008182d4 100644 GIT binary patch delta 6082 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 NpNNJupP9NK;{S$|ot*#x delta 6020 zcmW+(30xD$_s?t&!Vw6kKoG)mt6biA4u zFZ%)z3!i||4&Ogx()$wgOVY-f{0J|=`HkoC5sqb#<$9Lak;CD3b{yZaye_;{MK-}^ z_F{f&MP2xj5^}4_gA)Y60XUvJ0|dZtxq%=CR&gOnfw8_>My> zC=MK>S1RCh`!gULe&K-2}JhXM@)Ya zMc%&zRRR(B=SK{=9X1Jm1j#Vl*#N3xw95)SaiL38;4LfDQAFy>>iYaHm5?V3j`#H~ zkr$E8zcPJ^iXzhTtEtOng*_0O#`=5(1ZJnaqI0(yO3RJ6)J`Zd$n_lc$?G+h-#EAPH$8eO&ZG-ai!dgV&^qeuky!aqcVVb7FH?l5H~ zWL+s^4MZuq7YmtnfCHt%s#0kIi_=B zn(%jejbh4F>E!4h7^YH({#QH8Hd?OUu#l=$k$=B|OM`AZX7w>Q>AVLeV)$-g_v9Cb;*i@+S0b!ne#Ir` zQI!!Jo?bYw@tT7&hB`)8ov+7h?~8d!(;8a)Go5#{h@6Lc=T&6d`TFs>T7S9&p7blE z^Ch{ol0~ZnKYLRuQfzuYd>G&l{e>Apmym0rd*oebJQvyY6Qe2LcAp_9!T!kYM8_|1 zW7J0HowvT&t0m)0RHX4Xd=%w3v^ezrF|zprbDg~RvihpCO-0hLs=rr|*Iy(>(I&6x z&jiSUUL$7_zxTqGBj_=vs zmR9#eulfhH)<|o6l;jZjbWWg8#7|5gLu)H(Z5s7F&17Zz3g$L+i^(MDGxrSGV!Ao^ zmvG|7EqHtfNu0iAy1qlnA)0KO>y7O;(#hsUiK8=wXcUU9&>ul zXzacf$K|46GOm}= zC~=VdXpzsm9_E>D&A6)LG!;kFs^96nG&xP3S60Df+RL}Gx5a(m|1>3e8h7%1Z#!%A zk$#%`Sw%kVg%lk<1aH0XXvK9pxbEQehxD7v{PE8oRFMneRXUP5`^GdtiyZKQ;d;0+ zd|x*sC2>={dlThKNmY(Bx`j<%z>;8fuU%>3Yq%CiBao7BO)n3B!}dyOsqYM|WmRk^ z&@D3UQ6A+mC?ONzW{ngqGCj~d=YvJ?LU|-eF!hwL;qyx)6Kk|tYxCfu>c#AB`_!iT z>N*}sfXR9>*59tb#`fZ0Vw%3^+zF(NHtn>PiqjT5n~3yo1>(xTuIuW<@w_6Et3gNLuzg{K~kLu*-wB#^t~pel}hQJk#~l4Q%ih?l_yBT_WWt zc6AHk@HLbtwW=f7W?vTJVj(oK6dzA(VQa$YDp(Eewtktf4mX{`!7k`Ahk71oi|rPk zV6{K{BEStr8s1`3{nnIHt`Hd1hfCC$t9}kEswCmkL~>bgwQhN?%Ehqdoq9J#&r!?q zyN`m*Ie#Kb0XxnG6M}sB`rK5)c|8m@2N5CpaGqI2q$!}p>`w$l!$an&5#%8_+mBLD z^r3nKebqDjW#qlyYD3nSiE(3a>6h8;4U^S(@4>g`A;h9w=x|=f^*M${9EYm&E5erC z!Y*anWQI)I7y)eA24kDd5^UY0Z_p0ez@n6A6hsi^u@Sm7dk4kef{qkTXyrvASYh-= zc>&GQ%9W$6duk45vZ#4-LJH?L2ZE7sbMtbJ=EnRb(9$fym)yt;zYsxs=+Khtq@6b8 zqY~dGHN&z$!mTY)q1q`sUSv?1gM*3>4i_7ar%$&cxIg*5As*)i-!Si;%m!OqL_Yg> zyr2a-dFjH~qqMC!l~O-bN*T|Zpi$7)vIcm-#TS*)d+;^o(J3|@FdZ1vr#y6vVCM)i${+wL6BqkbAr{ zX8)j(qX#UhL5(6t!9}g11i2LMZ;c`{mcWMA0J~Bbr!$-A3TSOzAxQK(=|$Lvhl8HX>;NhGUGy7=v*F#_<@ZV~oQ%2V)|}g&31DF2|UHF#}^d#!VO{ zNdu+XE3Q-tZS47%e=^w6Myf<@yCO6Esdc7{{=6cC4jo0r=ew|~Bih*~X+Tv*W!4t6 zC|%Y<*wvBhID6A`RocnHd@Z>NPP;UJNygfNiq-Zd1x8)NsTxJx{l=rGDxvebftp=w z2Mlt|sJNi$7HjvW4=CKu7UwiBUr3jv*RtwZ?Iz(;TG1I(;Z7-v?^m2CJcq`uAE1j- z=sNiHQjLJ$#b_L?d_!fM><$mAJBJBI1>&XRuHh&gyBA*V9L86CdRUj+JNOX3@AMZ9 zK4jD)s&Fc$`rju^?x5(4>I*chQBMB@V=nuJa2m(R%LzPcbW@owUS3qu=BuiJ1$3F# zjw(!|bPK3LF$JZU=i*}U+-2+7KkrKoH1s?MTI%;R_0SzA2Zh;Gs~VZubwbFpEA2((^VhB zcRjp*HDOe&+uwi3xcyB#I8t)$PWjzk^3t(!uSAq9#NX?{# zet)#PkA~B)`4Z=z!IjrSzkuS}Lc;tCKDaiNNXmlmuZ?w_wUoXh(KsZMm_7dbE`Fkv zrl)8lN5He!XGE}Hw2GZA6ReJ{G0s*GGUpXzBq*m=p-W$%m8*BE61w0m_ZxZl1r%F` zh!4DEEWqk4`AwfAE_;DNKELdRh4U{b7iEovUt8u1%3gGJiW4i=@pRe=`{60eY!Ccd zVpqctwLGq!jjJ{DC{FuUX#c}hV)s@!=LZonXExmM!(K8B=EVL1ngSQmx z;Nd7v&Hl{Z@`H(AjQo#IB<-!8BesYsSIb$et8Ru%?~xgn+DwUtkV>#!_PVT_r={2& zPFhweV}ZIG6V?ZYQO&mJ3W>KA`veOrU*>5ikEZm|Z}YsRwT#8h7O4HYsLJh&=QKbH zy^j=0B>i)LFCDqE6|Fr;*IEcE8H~#c556`O$eSGgp#?9pXMP~xz0_YJE92g zsmWE{dt~@Qd*~QY@T7qC;qzy$`>Y=N`kl~OaQm$h!BsjItuWk0E;&_cAAZeaVGUhI z+ztA_HNu%UplBF{WUlbit>B2DUTo8-UiA^x^KQd0jfaZ9sGe$E?U7&1UHhz@$LI6- zEWR#50G)5o00-g1+g@&wub5J4h^BNu_nuPP8Phm!8Qga}VCnc}-6iBooV{Eq$k%Q! zDdtKZ!C9J?srvGTeR!6PKJ5|umgyj6W{35ZZrG`P?Ci|Kk2B7D8_st@;=fUfqkK+G z8KJA0==ih*S2KUy4smu^*++|D&>`qXBhhv!zT=gca^U4d{GG+g=4N48T@5$oMoja_ zgRhw4N%7Qwx5mR!ArvR)EP0lqNQds@{LYxfZZTZCiz*t0Z@4J+YKo46TcGTYFEKp_ zR@@m)5K3shlM%Q${>JPkzldAc7ISVWiOK9PKcQ(){(k~OsjT5Y>_NdQ(;_R^%WqkF z`Usr6)$tUy*gD~Z*)b6p9X!!hl6eVXkUyybBl*X^7;HGh^Vx^KP%7y%FT zhZ2G<@Ob}7V#*Tupnob@1BVPe96DiK{ymLrLp$qnb-l~FcQQ48=RbX@XLT4j(;j9;kW=@@oe-v!52@a z#wdY-0Tk`4U2vUlHA_4T6ltlbh6kF7c|mBE9S9}3XUutaK<`SpevM*%fETee0L}3M zv%QaAVz3Eey5Px2UKCVi(MHAm!L(LbhV(u_N_ekEUcO)%kvI=!`GOQ8*cV;*1@nm% z4)PL#WWsARl88VWkdeyufP?@Js6G&k0B_N~ zK(Nd+VyNn@P~j&f@4q^(=PHEK#F~gbD2@aw(131};1qk48{XhSVCv|7mzXr+uMCM_ z81d{6uHHl8DyNY@WzVrOWg*p9u$IHZf@=`gu6^^62H}Ps710Zg6WDBfrRxA+PE5=Bm@VLXF3QWzTJT)r-QYw(^HQWUac}JYd8%| zrWAqwW@9?YWP=4}(Yh~LJTVjPUk}2G;8Et|>p`;!95t_^K^X839rNiD@9=Tb{G2gx zsJaNk=44o`&GbT5auCW3*C*fpgF3SOH3H#(=O5sp|CND8_ z^1yT8YU>vVm8q(sRQ~+N!jI8iymZcvie-OivB1t3WDvaHTv`&@U0u?Y=- z!jZI+Z|GO&DXf8pwdiF5Sn9Z|!ssaWuP{y)$DsH^5SATNVce$MneIg?zW2~MO1-FZ zo>->8;-M=}JzpEAFZ(HUOUzu(aOVtxpvJFM`wH{_c5lv4kx zs(p&gooZQk(4A6_sMi%QC#k|%sytApkF3YTd_${p17%V)?VB>CeXRo&WU7mocp@cZ z8EekWK<^6ynXs#3(8#W3N%a6oH^s5$uc&AcD#K*FJL#1U-P@jyKnq00Izu$ zU1(@5bd%ScrYTEHqarvhYf!&~dgDacR(;)L^LM~}tXkz{vuS85_k zn1w!9fM7dzOASC1zCpvZz|W7>f(PSU7!7GL8vT#2?C{a>Iz+gFbZhiLYqTJiV6~tU zErSbP*+sap92(HR5&e2zJFlf4SB7qAbS22hc50P$ zH7M*1Tk#Ra#zZ@-rP}6c7ViD099KhQTPSyP?k!A(wkY`X_UAe zQ0!*^7UWR{#`veCsY+h5tPZsW6<@76O2?vETaVIyrEyNBw5K)+ZL9)Y?L`??igkAA z>qzvp3QPcL$mb}C^t78^s&ieHLnrF|SLKxM_Bb-rJ!hwR#Ziz9c**_`v_pN&r*+^o z!A)u4lj<)DZfFosCto6|9}iPe0BPJlpS+ZywQ6F^9~@63FnO0Omo+cLZ~ zO6(sLz5qS02bp%0$5W2ih3m~pdQch03y95yk#=UA73_EAZC>>pZSXg5>jvB0$dZ|W x#bvQ@#g#LS#Vr+h