From 8fd50e4d7d5332b5b40f1bbd4de3d543d12c9735 Mon Sep 17 00:00:00 2001 From: Chris Muncey Date: Sun, 27 May 2018 15:09:16 -0400 Subject: [PATCH 1/2] Updated Decompressor for Mac/Linux, changed graves --- Decompress/Decompress | Bin 13552 -> 17648 bytes Decompress/Decompress.out | Bin 13944 -> 13944 bytes Rom.py | 4 ++++ 3 files changed, 4 insertions(+) diff --git a/Decompress/Decompress b/Decompress/Decompress index f5be39060dfd83415b132ff52787dbc9d0f09004..84f51cd5e7049293f4bbd3bedb519cd016c8617b 100755 GIT binary patch delta 3115 zcmdT`|8G-O6u-CIT)QuAH&)gaM;~-sw?VhAY>WYwZH{n9793xeAR>lkARtk6 zz}V!iluWKBiv$Hp6cU0+6EPTZ#H z=X`nR-gDmT9b7gj)1DF<{GjynKyyA3Lzjd|0#lfugMa1|5Tqm)%*RdCo29YyHFmy_ zPo|5qVtEPUVafN?R^8SR!DU*W)3##Q_Ja*8J{?$NzoNLd-s`Hac13$lB_`^R9#8&) zwrioyiI9Y3CKk=l@O>Ex-t3peLbuoP#qtD?n=uKC#1u2|x({j;jc-SXw1lmg2MrD* z4EzHFpJU)9Euj?P90tBsvrh#MPgx&J4SW(I?K)3F21W8POUQZyj}OtuMgxzV(8pE- zj}O;JkAb)7BtE~_phzE95VG6AYo{-?`wYBREx{i$@K!^dZw$Q6!1p1K`^PNp2E`eJ zLzaObF!0$1o^{+bvv5k4S0b#lZ;eSEU>zsTCx}|rT_h2;a2w1vcP*?CFGbIIOodUn zxu_ioEKhtu5O1Ra_D{S|;MItsOeB6t;N^(1I`Q2Cw;{%=#Crr@fEcS0-ze}L#Holw z0?$N@eHd>QxPCDbSdMtJASNTmevH=&96*d!iTedEMU2&mO9GEYj8%x+1$H5}A|{$Y zKWXvTl}bdJ2LubhV`g&7V#GNRrlL;?LUa}m&H{>sGhaf{%V*v`nOpaRnojCVH3F(4XT$v_2wVqwQP)V%IAH^>i! zDuZ>Lus7A*uyroRtRhtvkTZ(}eIS&w$Czl)UBYLidz{6P>Y^dR+{g7CTt|Y}`R4S} zN(uG=;pGBD78?*eoy9Vw;PH^qq5>XE4@`E!nXyRbUi6Oy4?s-S@wG=HcWmwkL0tmS z!Xhc>L9!Y+i|cFhz`fhUn=*>cNJgr5c=(14iF)|1jG_{t$l7w&5%l7!1syVA7o~ud z-yf-}!r&RFQ))c?W=8QiV3*i#Usz&W<$G7;&_j|5P^+rm0|>IPDQST;9Bk@C5wS=mS5o3*q0+ z`&}bSeuDTfYAV#=ft&BBYU1D%xEFao!^8)^8REQSvmCs+<;b#AfKi-&M9jMf9Hkuf|4voU?!qAV? zm4Kw##}DVX)ADFwbS^ddBz~Scc&mFqTyD~&PbjVA{bL+Sb|_B&m|PkYD4T@%A7h;Q z#Yc-IL=wq?kdl$ocn8t%U`AyU8A+J-qxdwR3k@V0DX~r>PNLse_|~y|@-!Q0BQaWF zrXmMk?hpoA@4&|JiI$3(J3JgZqUZD3}5BWigK}EOSY)PaI7NK^(%(Mk@38^1_MPqDw(_7U(S4d#j%x zE_@3jlopjkZ59+^w9kslXe~cq6Z4qC8FSCCH__Vxpy1+es}yTTyM%&mqPwfoe-g>!%QJ z3{0|U4FFg0ZqR86I_=yO1Q+qN3Dp*@^sJoE1f&<-&%2)>yPuz%Fb(octHgOG%#(O` QS5l-f#6Om9s&Cji5zthWsYoHzELH=ib|zcW)J>Xg0EJ94XFgn9$6REAV&Q+8#x z0l@Sq0|LB_4p=`*uh3gjLz;-vBXl!r%#LzE=(VUZD@vEpD^O!Lly;$)pvLnltwJwA zjdiFr30=Jg0j5J~5MUN+tVg9v=u*^}6~!lX0cy;KA_+YSHD*Cc721OupT0u0^}OHW z3wk6HT?T-K-Z3*dX$|TO*rud68i3tdD6kL^3#BYV)6Hlfqhm}?@u8HHEScPIeZ`S2 zTrPmA4<%j9=7+3orAs1m)NxKe0~wfyV!FFl9s*G7Nd#01h=p9!aAuR+Tq}=>DI4oJ zomyY{mt*%Dj4JHE4QF8Cz~5k^MUOGiKyEglpZvVr4WX`nB*=XnFTrs*@CDzMTrhJ; z1n-hF3{mVrF+Pfoh~V}R(CQ36lw3M%5Dw46DX$6>I0}2JuH#OLj5=~_MI={2G_r8g zC9td#p2f{=*|5CR$?I)X%?QK({Z78aCQ&E<)b>I?AhNxfbp-No)QAggaEby@(cd4c zYLvk}&L&kl`LJ#3G@$Dpw=S=Dv=jzJ3|$1u3Z#DyNU&30idpZ%$lR2pl&0}v`%>tu z93Rru$S;oBraU|D(Nb6g^~J*R^|c^zeSOS&mqjYmyD2S>Tz2lF)WI8FpG>e~_yIe= z?<#700Oj7el*x~xfq&u2!VjpW`3KP{6u1aRI4U0nh10F*C9vO# zWxpZ`1)3}vq-zU=!DL132-P|mck6)>l;K+`d`i~Bc^2@l4JV$0`x1G?ajsfU+zI7; z$BaRZ1jDVA^+hG9y~J-IjNbqU!^|WPAo+mF15l%9&5;vXnN&KSC^BD&c4?h_uTK8C zKL4h8$@D!+h~DS_xF0W;ZmH@OxR*4ds`!5Qf$fJ-n;@#gz+2&=xq(;RRn_TWyTDd~ zmF}tPGO!I}s(KA<&jav-b?rRhSxS5OK2I^N;(eaHY&YBi-xPYoH{?pV8aT~y=G#V9 zwMLu5nRnr0z|dkt+YMJg59GX0H}Nw$FVZefCuU7%|EX#(%#dn(>RuDGyWdL)+NF*} z(;BPY9ki!b+s(`Q?1`=PHU9O)YrL+oymZu!{)A}%`|!0O37sQ)Li8{_nr`s&V})%r zH&R-ZMNM9bU!pGFRD1;f^R2$mXtute<}OSE{sr*9k}P@vdRIa^@$uUwZvFdUylV#0 zzYoT97tude#`8?VwEvFrJPQ&c8Ic$#5I5i$=X**IW@}?emuQX9Q-U$@>KVn<%eT%b zqBeeThVSWU&kE0HqxwIN&J}q4cMWete8&bE6Q-U z&&!G^;g`zX?#Yty*OUG+R4>NR&S|+1+)K-G(OT#skn$p^y1w%H)WdXInsSSldX~!fJ!~mO4k!_-m;wjI(r61CK=#66v4FNxqzJttUVt`SLR11& zK)2VmXQpZNhsh;2rm#={8jc(k zsy4EyXwPYbMY<<_V%O#l@Ob08T6>;b^^lXAi645JwRn)7>@NB^DRsYu4HV`t79leZcMZM)!|I{gp_8`$Cq39-v zAf+#|SCWqwXb@GXF|WF!cY`a7m+qn82EKTyZwmbbCjT$`Ugq3V(=Xj0^q1}apat;P z2hEziG3a~napo@oaprFkgTgzwFzCq>mC=BxygrrEC?ArWaSXHPGN>Um|FEr4on2)9|OP*FT_Cz=c5TP!2pjs?Fp8S zgC5QY?yaKU)E5oKEqx3SlKORwH6hoWOdn?#QuF$8&$S+P4JuE=X#FUP)v21{+v3p2 zP|3Y=8FmRXF6bSQLTooA)9w}b42E?O%7ZZwS;S!twc3vN;9hxxeWX%dGwzI6UG}Q; zdK!)lHW^h`p)7PUKnC{i3T$_O<1@ZIF=Gfyz`=}Jt4HR1slQ?$76gffF0j@8Ew*boj z9y$L|C8cBRkF*BrVHK`w8ekz;XI>(xV%d^mlMK7bu*rr^F>I<~)4;NOu3UI|yqfD> zSczO0%T^<8>Gkw+e3zbtwc(G?5q{{y!ia+iBoh$7kcChQZc?{{(AorcMab&!<t z$y>C!r{zWe5psvdk-2R^Rvqan_mq?Kw7kXNTE4%WT!hS07VL2JVMzBjw;pdL*Jx*3 zy)o`KWW$d_Hk^;974Z7IMa+vxk^ei<0>B4y3BY#kHeeHxN$v(pF delta 1630 zcmX|BYfKzf6ux)a-7e)ZJBW0pUBJ3qu`28?tWwKkM@pF0C2Cn{v8_O%*u+hnHcM<` zD-cC89misBe~9{Hqee7MCFz=qH32G3@rRnxA0~z$P@hAM&nPyAvYs<@x0B5I&iT&c zo_o*Dy^*+)7}rHzAcPV^?kxlXpZ@B#rlK{kMLub9WX;P$v{Bq!X3_6*dM_KHO(H3` z*a&9{`wG|yXXBiWusdx{;#to2bM|cdm~G1D{wzFG@!>y#3m*-LttD)_kOdr-R8My~ zS~oJ?5nw67wao{O2ImHZqqlDdZ9w>a5p;hQ=(1KY=|<}4{nhC&1)0)Lwn^MYMYdnu zYWuB_4T}rZpO%Xfws2)0#H&PBT6Bmn$laJNDu9+PdK>6a^ks;}qQ&WzVi)b&oJ)vt zeFGs;iO(iN!yU_yp@y& zHJdaEdN%0|i#L6+G4no|qOsmyZYIoP|x>jfb(Y=A8siR&t{1kjwbQ z2B){p0YPe^+^5T$U6i%(DKo+;t2IEB$Xdfmmg~8jzQ%%{5X`UNGnO}EPRu21jxo0C z`J&=u9FAHSqZy#yL?b5C!{WiWgJ zQF9!$mXE5nJ_vZ+_!VdzjyW3K*mpq8;zcvYF++7s;KtQDXmSNs49-ECF?K8H8PJ4s zbBIv=W_o&a3#AKeeM<-JVsY=Ibd;sMM_6N7Wn;#F9|ULoRi+G>GGxkHQ$AqII#WIb z5-)-GeP~5$&-f?O$+9?&;M-CU9{ll1!4GxljN}t1@tH3VA<#P|dBmo}r~~=8w*Cjwd<3#BrSC>m1+V_yNahj-PV;oZ~kfmpNYN_%}yv7QXbkiVguD zq5KPhw`oF$_sdojBCpWyWbeVmA+kbq$oN(uTMs3hqs`V&Vwg)7wmP} z2ksNyeaHLAReGd9Zsz>}Ui}{M>eVR1AW{#47_I}cyaU7>6GBo@FQ2oG(>eNweb_nd z)M?K$?ZLM2#05C*o+9h<#n&6{6dMVZ_qs)ktwk1Ye5%5-n|Ku2V%e?Sj_~(>H@Ed- l%fByc!yutJ8Q^w`(VA*eFSXdy*(fH}RMX}3v6>Az{{wnvn}7fS diff --git a/Rom.py b/Rom.py index 4f19ced9c..c0dc458ff 100644 --- a/Rom.py +++ b/Rom.py @@ -134,6 +134,10 @@ def patch_rom(world, rom): rom.write_bytes(0x00C6ED86, [0x00, 0xA2]) rom.write_bytes(0x00C6ED8A, [0x00, 0x18]) + # Change graveyard graves to not allow grabbing on to the ledge + rom.write_byte(0x0202039D, 0x20) + rom.write_byte(0x0202043C, 0x24) + # Fix Link the Goron to always work rom.write_bytes(0xED2FAC, [0x80, 0x6E, 0x0F, 0x18]) rom.write_bytes(0xED2FEC, [0x24, 0x0A, 0x00, 0x00]) From c8b71e9b255c44b9cc481ad30e5c7bb80860760f Mon Sep 17 00:00:00 2001 From: CMuncey <33033897+CMuncey@users.noreply.github.com> Date: Mon, 28 May 2018 19:00:25 -0400 Subject: [PATCH 2/2] Update Rom.py --- Rom.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Rom.py b/Rom.py index c0dc458ff..18b8651c3 100644 --- a/Rom.py +++ b/Rom.py @@ -135,8 +135,8 @@ def patch_rom(world, rom): rom.write_bytes(0x00C6ED8A, [0x00, 0x18]) # Change graveyard graves to not allow grabbing on to the ledge - rom.write_byte(0x0202039D, 0x20) - rom.write_byte(0x0202043C, 0x24) + # rom.write_byte(0x0202039D, 0x20) + # rom.write_byte(0x0202043C, 0x24) # Fix Link the Goron to always work rom.write_bytes(0xED2FAC, [0x80, 0x6E, 0x0F, 0x18])