From eb9dc8df75dd04241fdf2ec4e7898fc2178f5bc7 Mon Sep 17 00:00:00 2001 From: codemann8 Date: Fri, 20 Aug 2021 20:44:13 -0500 Subject: [PATCH] Fixed Flute crashes --- Rom.py | 2 +- asm/owrando.asm | 2 +- data/base2current.bps | Bin 141165 -> 141164 bytes 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Rom.py b/Rom.py index 67077dc6..1001fb0b 100644 --- a/Rom.py +++ b/Rom.py @@ -33,7 +33,7 @@ from source.classes.SFX import randomize_sfx JAP10HASH = '03a63945398191337e896e5771f77173' -RANDOMIZERBASEHASH = '6d8c7d1f0530c1ed1da5afa60e7a6d98' +RANDOMIZERBASEHASH = '23f0983f5dfd93490aacab9a60bc6a28' class JsonRom(object): diff --git a/asm/owrando.asm b/asm/owrando.asm index 63107a0e..aca29b3b 100644 --- a/asm/owrando.asm +++ b/asm/owrando.asm @@ -353,7 +353,7 @@ OWNewDestination: ; turn into bunny lda $5d : cmp #$17 : beq .return lda #$17 : sta $5d - lda #$01 : sta $2e0 + lda #$01 : sta $02e0 bra .return .nobunny lda $5d : cmp #$17 : bne .return diff --git a/data/base2current.bps b/data/base2current.bps index 7246d99df4b6f3c211066d371982a23d9bbc0803..f717a4b10abbd4cb8ed3f68aaca62caa67bd0f18 100644 GIT binary patch delta 1634 zcmWkseNa;e5`X*h67oSq1mx=w!jnVGpduo8d`Q&l#Q;LFL#ZNQ3sY)5m=h2Xg!iJ6 z#w12q(-Z>a@l_hY2Ko-YUI!6+)a1FfpbW#T7+EYGHAOv^=3#gay3Uh_OC=woUPYujG z7sOuI=>KZaV6o_c->Z2pR@XuQzK2^Ri`+4KGyOG=iFQE{z7XAo6L`z(bWFl5cak;J znptkxOm`Z4)ix`A>|(Fmt+-^S7mU5j&2-)a&aG-{rj7W%nDNSb&M_4I5TA();SL^> z>x`09^ITETMT5^Y=ig*_ii)HG zxreQ)-*A75BTSxy@!uo`13bXFt^o6zfgu)!P6S5a zEE^=ySREd?{cUz^k(wfhC8bVp4)TNNgr$j0JWf<=APc=~cECHRswt5AJkd^(#7w%< z2S2ST1vRd#T`w0TzPzd)7+2|jr7gtx+V?zO{kS$1GI6xF7GiMQnJ`GkLucOJVn32N z-Qu<5+|?QJYH9n|l#|e|mUc&xGZR|c+s)^ zYN;o7J%V#kS`4&YVBA>Sd?!(kFZ3hN+dB1gO8XJb z3%&1X%ele26RfqUkLV}H`M5GxKN)LJWAuWb?7hZ##^(1cY)e1XWZQ$g8}_VMt+3S& z9b0YDIX0|V-d%oHCHg!auQW_}OCGhP9n`;VJ23MUs|bBCumD;5f#S1sq99NQ=yyC z+K%$MLxmvp&0%^}_?N2}BpZ*KE`_8rjs*VTXEmf~Ys-FyUcuYL+d;tpJp83Vn3iR7 z$oVh+)K1ByHB7T&ikgx22>7Be?g?ZED^0BQlbxykw(WfCSP6)Cmrd(ueC_o(aN`an z^3~&NfNK8c%_!18FvvVAa{^dm=mtv;-QfC-Er(y7^cF(|dVQ;blYGv%T>`)38Ric9 z!j0ZJrK=o&t7mCP05AG(XC&EBi>XVs5XE0#(ujmqIcqz}i&pa_u+>&5fISd(y-NVw gNO;foy%1>7G%X9^`m&JxV}v;2P2IHd-9GvM0ZxXm$N&HU delta 1657 zcmWksdsI`08Nc66Zb$;ADGxzfAzTMIn3X>59D{rLX-e_cj z#2CKD91|f|9%6Vj=&hwa9YvU}MmL*zx^s4lJ?qlSY*ri=i;nf!rQi3*?{~g)zW49D zJK}{q;)z#5*zpQ;2lHV!OyWE6K8X2TG7v~&fiD(N0K2eE_ym5$ebh5~%02EoJv+}u zu#-8u>-t=*6zvZAah^-m_R`q{+#*@wOVAnV8#pCOg*CV=x&vzbB%moFWsW<{8tL3Q zZo)|Sbq}hn7P_=+(C3q%Hqr~-gOAPhZ|`xw%uX|Hz(ZmtpzsmL2x%`q6qmza@HI&h zjN=7KjC|SOyrMgI^oCSl>@d>5!@H6+$?ZALSIC%Yz%Xg7*tEzcuon7nm?_;T^Vgx* zE^uegdHrM@k4xiWGxkfj1y0=Oe7-Te$w)8r52WoRkbKpuCuI1#@9oN#a|2NuIzQ0S z**7AEXB!wD9n9Cu{|7H#y3fURW5L0mRDa&=mt2K^Sw9pqe!#BaWVnmhg3F?If6ECS zdfN6cYvhZk^gjQVT62l{Th6zh{b$Kbm>#kY=J?8xzIYim&s9Wp>7TpBg?8!}P@Xm- z^G};OtpD825eEOk_?u~K0KP=;whX93I^6@`;8OZdh~!h0w#{&zzgwpzgWM%$E|E*X zjQmnaVEM7Fl&bg}j7HnB1Jb%Vx9|+4sTFnj>{vZjyqCdjY^whi{2C|f_dzKJG(^Ex zjBil--(T5~8W`hd<4ozy(8%;O4mZ%@TW_+VwtezbY!LR~5x03l+_o}`wfI%T??d-k zVi?7&{BvT6RJm%{M2{fPhNX>hk$FYHSX^fdJJQljMvGIcBb?f8%u{_{7up*m17h|8 zldFx#KQ_|PkN;?V9c-A?v;n%Xtmy(A>1ocV{Hn4iU{P~ySjWuNJHV{cGsGh0L|_EY z+EEg_nxn&$_OnxqLN_@fsdff&P_o8LRi`jp@mg~Z?7_g6BshQ>EoD;q1GSqZJh=)v z4!2Z84$51@WK_zNan;ClruOHlMVQq3X4K(CNZS3!^cn>$IG-n~kkA?L~UE7fYR!a!zSe6H$>ZYgmisY3R{sWMA}}UflaUgDShz|8H`T&y?wBI3u6uWnc8w+>$L7frDjK1)(>p6L(4Xsw2tT> zOqGuxHj1ufBWh-X0>19aDAnpp6uE3UU(sKom? z5l)gYX$m{=E!^La0ei#-_M~GkKI)GSI3zK!e{j_B;R7@Y&6qaifDHbNp#N{SvBVG$~<$+&&=ajYcDfMk?` zRpCb#VYL&~)z;|x?jd(!hhM{BOp}feI~R2Dame