From 16734d9ee5766f49a0fa1b5bae37f872ee6f5f6c Mon Sep 17 00:00:00 2001 From: codemann8 Date: Thu, 3 Jun 2021 07:37:35 -0500 Subject: [PATCH] Added convenient portals on WDM for OW Shuffle --- Rom.py | 8 ++++++-- data/base2current.bps | Bin 137206 -> 137238 bytes 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/Rom.py b/Rom.py index 953d31f8..8d1df167 100644 --- a/Rom.py +++ b/Rom.py @@ -27,7 +27,7 @@ from EntranceShuffle import door_addresses, exit_ids JAP10HASH = '03a63945398191337e896e5771f77173' -RANDOMIZERBASEHASH = '1d9b62cedf002fdb9aebc750d75543ef' +RANDOMIZERBASEHASH = '14051d4a1af47ef5df279ec6c4329d6d' class JsonRom(object): @@ -594,6 +594,9 @@ def patch_rom(world, rom, player, team, enemized, is_mystery=False): # patch overworld edges if world.owShuffle[player] != 'vanilla': rom.write_byte(0x18004C, 0x01) #patch for allowing Frogsmith to enter multi-entrance caves + #patches maps of WDM and WDDM to include a convenient portal + rom.buffer[0x153B03] = rom.buffer[0x153B03] | 0x2 + rom.buffer[0x153B43] = rom.buffer[0x153B43] | 0x2 if world.owShuffle[player] == 'parallel': owMode = 1 @@ -2198,7 +2201,8 @@ def write_strings(rom, world, player, team): def set_inverted_mode(world, player, rom): # flip inverted map flags for b in range(0x00, 0x80): - rom.buffer[0x153B00 + b] = (rom.buffer[0x153B00 + b] + 1) % 2 + v = rom.buffer[0x153B00 + b] + rom.buffer[0x153B00 + b] = (v & 0xFE) | ((v + 1) % 2) rom.write_byte(snes_to_pc(0x0283E0), 0xF0) # residual portals rom.write_byte(snes_to_pc(0x02B34D), 0xF0) diff --git a/data/base2current.bps b/data/base2current.bps index b415a1fc712fc8a2fce87ba391ae5e16581d4371..10ae46efb46cfd95c2de8293f1a2f5cc5f2d941a 100644 GIT binary patch delta 2334 zcmX9h@4^M2wIdjC`di9Q00on3l*)RqKl1|T6L?o4Kt}h6FM2f zCyY47q%r{##GoTZE&~;mfJd~tBJFDJ?p7;R$Ci4q``C@UfBcT;eSd$w-}AoTGn=@k zRa_YjGzP3N(4(96Q)|rKD<}h&O0f^coy0{$r5^ObC=ekm7_g+lbTAz>!R_FUsLTO2 z?>*cA#KAxmQe{}T{%iK(2#Njk5-Zbbqb|U9Py<@w60{cVhYwIS$c0M5o060L?5`TE zfcDm56J0#-3og(j8i31iwr3Rh7#4Vb02abNPaU`m z^Sm~KA$Za&c>d`DMz!Ua;UjkmcihJbKsmQd zGJ=AWT;8Ow;-$y3H#5{zVvJD}|90X38Z`L_;@4*RnY%d(=$p0|jkv-cN^24X_&Qk1 zY5347!W6X5Q0mezxy<>+ZsGO|tObz2pf*S(@ow0qK~~9nrz)i(hcN}$pK%(1McgOv z-bd5u>;+@Y9{3 z24R+5;GS`Vb7akT^N|d)xF@#6#X^ka0+*cf7S|+Z)iZ&~2jS(yQo%?2C~m>p9w4dN zmt`bzv897q`}xm|FZ6nU2AIjEz27MWYVMDXD+H6D53nu$!mH7E63@&_DnI2A@nM+9 z1z5Bt81=Zo?cFjF4lLX*b!HrB;m$UFFY?j1vlxQgv2Hz!?SiJ(1HjD1p2`NGk1IXB zRs<%v;f{|5Li)YsFW|zSD8aJCm)xeF3?PV<-{YFj1*2u_tijfTW?I|$6=7zK#0icf zhR-vN)tb^4TWw24OR!aO%E<*=Z*j)fYTq-#)_=6xn#>1WCZH|Y`t*#wM-$pclSDKV ziPLj%VjedGzkh_3v`4hVH3ZonY>lB;6J6QFO1#J>=&~jNgnz>lijvc>?ubP-rX_@CC{Y7<$dG6l(Q~pUXdjXC65`SU~!f?C>^7QH-@EX!W{0| za1jc2!Btn{^ZYv-gu0_u+6Fh>Q600cgx6Iu<%WWbs-L8ALnKbfAx%W-2W`obxUQ2a zCpI;zE2iN@DD~yPev;b$LL@l_d8g0XLdI3nJUDb^iA)kt)?s8P>*|)mSPg+0GZRV8 zkCir&SkHVW(i2;a?gX6f3Dd6z&Eh+LlGc0zaL2bv$8p3Qn&6G( z2j5|ryz)u-^9i-+qRQ@1mrVAAhpsLYX-t)RPrMD@ySfRyf|<@)K6^IcL=rqpC?79h zWq{?*=GDc?RBdy~aRkvRYo=&Aj&`%ByV+~q?DZb@K@a;)SdDhEk)<=o?uOJB2^{RSJZBTI|I|z%s zNu)uwd1E~y2cD=Wg2II7u=&PPboO)j>P8IM!%e+89iW91T>jsZfS*D|nKQ;!P7hn+ zxGIfS!OB|^;1hWAR<7%Nn79=q-@ZXl9VX3Typ)M8)ZaUZI0I#crWma4lF5ePGN(Yg zbYMRYWQ}o!dP?nvE2T@}(vcaHBnA5OoY@iMbT4dr9brC%hLLc0MXH{br9y5*wmPFw zPo&XmLx~dGc$WF=8oePZYt$CcEX>wdbXIg#oV4g9@#8AWg^7~J&lc+khJIJ^9=5b` zRVd}6lDxitdKpdx(mNOaQs-lP`*r$@IASoz zjjKXRQ}W9aB(NM#4Taq8a*=dSC9xjvg6X4i?norQ6yFNBj~>omTPVVBuDi^;Rpd5X zM0NQR=`RlK{&=J`VaPaF{>T_6ze{-3Pb(&@d#CfTaOX&af6{s4MSY1|op~r7L0>Nn z?+a&r%w>N+2bG8CQq@mP;fU=!xU{M|&G9GFx`6hYJbJr#F4F36|IgjGM!SrwdsPz; z9t;lR54-Gf(_q`*|7fQF06R*H&YkkgvD#Z*k7jhyL@6FHORFt3A+}=#()dm7{vwTu)C=h)#a!;w z8DgM-`(MURQ4FvXB}#{lf9iclIUp^Gxxn3QMY49A3GleWfR0 deBD2fus$hDYJV02Uc3_bzV&$7-Acbr{{<#<9P9u9 delta 2332 zcmWkveOMEB65ih?A>qpe#mI-0xI!ROF&0!x5x?a_RBX{JSQR{5p*f_qRcX~^Hx@Oa znAIhVoj|ITEFUD)k@V^sjc2!ZG4`2XWnP#{cGl#nfgPL zXAVjAB=C+ID+nDr&dT(aww^r7jHOWQ14%bgXRbB@3Pyt{VcL~`6`Ttaz!vxq@Ot!E z7n`#jHv@?rh{I~k@2&kO`(T*F4iB>NM#DoFJPPW87A`{@KqkD8>OnZv2&PN7pJsol z#EM_0<3hawBVn81Ir_gr*dnxoem+C=DF9ut$FEmfl32Bw4f5p@kF%l1o4S?8$|-4$6@krj zx9JUykj*qUVSnFi#q1CbI^gR-OOO)1-wnSFS`5~~@xiOm|98XE;3Qw*_Xm3b$m2he z4x?Z@pEGt}oYJDnxo-aVO93*%e7fYiY0+=g9%6*i6aQt#PqVG( zk@LJh^`Id1`T$FL>Na`ASfm?%X)g1T0)BS-2GKa!gyxxs)fI@P0wl(fhZ#aj%;!s^+=y+BH@-f@@2C0tkIXPFj82L0D0g6Vw9nrTrv_k=T$6u6zW}IQYGzEQa7ttjEM+^I-F# zFTf}K|su&AV!&5{@Khs)Qxw75S&|cmywLcz$jvm{G-^lGh`r!P= zISD83Gi!0;F;7(n9=Vr=JA^oSqjRK_GMN9wJj?vLeS0jW@ON}xfe4VVkUG11GHZfsh6Y+t?kANBe zu;{}0q`s~@iu$bpcb`)4#}QkEDhSEW_NKZ4;$2_=iNev<*X5M{8LWEwm|A>B>kOek zih*qx-WH#?R=e*Ds-e)c9t^^bo*BU*>u^F1j}e+j%B+2m^R&H-BvTD-#rqM&sHrcr zb`|%qcn@poVXeJvr_a)M8Zs;_y-t1eh(_V;+c2=fjScj&oaW;2YiGTkALPE7OCF@68i`S3T#8sF} ziKQ)W=k{J!mf-e!gm**mMeZjakz&sYJlXxLk8Fd|i?c*iPbls<;gXAsLbvptm5nwp z{7l8uz+Jp;R0^` zWW3p2cuHX#pc9szKk~Vg4J-MgaD+lb5SyD0%{boP2oHZ>ho)!3tV@&8gkreqQr7tN zsLMnu)Z2;9`wWr8F-ekjCaRXSMS2y?ynNG-yAe-le1SCvJ2Gf>Ab7k- zpon&Tj)VBt`S~VFFTyp7X!!APVsgStQ$KHW$9Vh-4!)8w0ozSxA=dG|)nX>4j?$;p zCY;Ek^kmkkwwNiIWuh0(f|rKl-(8n)B2sC+xmbf09b?Ako6OOf*Bo)onoLtwch&K# zuQ{VMZd6P8@S?aiEW_kF`&8@occhMLBPgFM&Y@1zZ{tKL9X#*nreMcgukvrv2+X@W zCD>Qmp{lN*wxs=P4h5^O&K#GbtF|dewP9tma&;;x+y&=^!%J6piPKW5iM3D)i>@jC zCPv{a@MK6{tIgV)FUBvwcitz z*>W3hF3`7xsQZaO4hTg}wzG2)^wn;8$G{ck{D(ihiB3q#rs^JBCnApT;fk8NRQF5d z&>T8W4!dtepz~Gm$_-_b{|9)b<4tCYI-JAs`z>PQG5e1GnRwVJxo0|fI6>F;NG!8#JPQ#R}=2IWc7f$tE zVMQOLbyKT23F6f_Cj0i?PXE4k4$ic|DS3tl1bE^c=}+6{)3{L%+j3(sdIb% zsyWqgx%c6;Tc_D;w79P$Fx&1tEW{V_lM9LfT8V`_BjdR;^{IJ!9i dFk}3RUb8=5IQ^(R9Q^U8WVll{T~V8v@fYB591Q>f