From efad9179e44a0ba7836e295089be3efe97f36052 Mon Sep 17 00:00:00 2001 From: codemann8 Date: Thu, 3 Jun 2021 10:55:07 -0500 Subject: [PATCH] Added map terrain changes specific to OW Shuffle --- Rom.py | 16 ++++++++++++---- data/base2current.bps | Bin 137235 -> 137644 bytes 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/Rom.py b/Rom.py index e2322ca1..db87f11f 100644 --- a/Rom.py +++ b/Rom.py @@ -27,7 +27,7 @@ from EntranceShuffle import door_addresses, exit_ids JAP10HASH = '03a63945398191337e896e5771f77173' -RANDOMIZERBASEHASH = 'c92a4c56df18241a90e586324b800064' +RANDOMIZERBASEHASH = 'e5d8410de046832272951f3e6b4fade2' class JsonRom(object): @@ -594,9 +594,17 @@ 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 + #patches map data specific for OW Shuffle + rom.buffer[0x153B03] = rom.buffer[0x153B03] | 0x2 #convenient portal on WDM + rom.buffer[0x153B1A] = rom.buffer[0x153B1A] | 0x2 #rocks added to prevent OWG hardlock + rom.buffer[0x153B1B] = rom.buffer[0x153B1B] | 0x2 #rocks added to prevent OWG hardlock + rom.buffer[0x153B22] = rom.buffer[0x153B22] | 0x2 #rocks added to prevent OWG hardlock + rom.buffer[0x153B3F] = rom.buffer[0x153B3F] | 0x2 #added C to terrain + rom.buffer[0x153B43] = rom.buffer[0x153B43] | 0x2 #convenient portal on WDDM + rom.buffer[0x153B5A] = rom.buffer[0x153B5A] | 0x2 #rocks added to prevent OWG hardlock + rom.buffer[0x153B5B] = rom.buffer[0x153B5B] | 0x2 #rocks added to prevent OWG hardlock + rom.buffer[0x153B62] = rom.buffer[0x153B62] | 0x2 #rocks added to prevent OWG hardlock + rom.buffer[0x153B7F] = rom.buffer[0x153B7F] | 0x2 #added C to terrain if world.owShuffle[player] == 'parallel': owMode = 1 diff --git a/data/base2current.bps b/data/base2current.bps index 504d464f145617f43d5993cd4491c1c4dc94d52e..dbbeda64d59c4f676abc5c638283d643b0946624 100644 GIT binary patch delta 3213 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 delta 2731 zcmW+%Yg7~07EVqQ62dDWLIi<0f*^uM166~FmTEz?B37x0hzb^pT*SVt^@bTVx)M4W z!VyM@2$l&tJR0Z}Q62^{0TKmcEv=$0)vjAhxk^xOrS#r^t=lIqLvqC~|?eb>8$7Fk75zY97r^Es?X3rm2}1SRbGTp#n89Ij(8 z0re)B&t4MrrkUEj71go@K5V|YOq-r@f%^R(jy%3ag{f5meXyNf0lw;kTftdy)C9)> z1`_+=A&ykkWTO79L~>rOMY+W)q`MC`ai&4UAgt%sf)}@#1m1^iFm?lWJ9UYi2C27B zWAk*$0Fw|Ziv_Cq=fN8{;bMWzd9H~PRp7`G6U-JAg9CkVOt3)6J*oQPOf8uedxG(H zUcd%72jNO#AUJG=slr?kHwb%$D)8eV+~Sf62F%dlGB>WptWy-8eiy@$=fkz!Vw?u7 z-|aY3s-;{Vxr|QATm4hf4z)6TP1RAC^Xon@R#ibNL0yd;I9rR1m>|bBLNq6>lvrK& zkZ@`L2-O{0t%Yy89-Mur2GH<`mRdN&&zoa|#h_4omR zCKHqFB?|-oLyS^>i8I&LLJ>CYKWuy?iBxL~99~VTnfSH)c>&#h6wSuRfB|AsI}foA zPGxQ??el2XEJw5# zYKh7o1+uKFwiz!Q! z?}~YctIGv;XL?Z>5r-r}K_F4R59ua1MV)FtNMa zoB(QOruJ>;`2NRCHJiA%7obwRE>?P~)xx*?Bm6#?k?jNceat7>GxNbkD|4hcei3Nw zW7;n{g1~NE{2&1)}6?6pLY&qEF7^Ztec<#2!@Z-R{$Xzzo!wh;2b( z#Pw*9fie59uVDkv5?I?C17G$k*fczLBU?sCvG6b{9wDWpS$MbMOSol&Y{g{PI zrSw)VK3_76ff9NL7e6WKIiExu?i;!lsi4;Tub7q)P(>)H5m%*z8n>+%N z?UkA^yeteq1C?{j883?&@Z!nfm3C;jB>@@b@Xjq6?<2xcco8}euIB`t%7kfyAH(6n zLw>WDx)yUjHw4?E=CEu|v=?y1bT9{pdxj)jdXa;mLjfVQ4B$O-yjPB!m{$oQ z%)0&V-p5jdCAr8JWQc#EkQ8?GO6r}|RpP)(RXty=`O=);uRz^x zIL4euM?F_vRi>)vsjJkw_j2s>kZd&VI#X3EUlsVlqf#L7D-BG!VXH^K)*wVh~R$ zB%3;5p>0c?ODJBAlyp#!C58eRqQsDzb&e1u#!izzbNNyes&f9&*nFeTu>-LuRgnK^!VFt@v8}9W52@aNoM&9;nF)Pd}VE^ zMu@h-(|7iR|8~IfJ5g?hdr?dZuV8u4wx?=g#J7#9nNdV#W6qZ>mO4+DyZooNE~=%A zy4^+Dx~X5gsmr0~RBzW%gbyn5i!-3@c=uUSP?=Qn=T@iA&k zF0xuh(~`z(FzmZ%5c?GF{qAhsJHKIoD8@uJd!vZ!^l2Q#)4ez+o~CeaJiUJ*dS08^ zE71>-E>7CE1|ucTJ()R908f_QLgLLf+|{aCe|A!aroLuRgl4@VZeJI?lmmsTuGYQFE#!8s42=ZINa z{h}#_xL{>+(P9sH3I_SX-49L)=C3ZrGGIXf9D5MLKOTT?L$j=K?n9WEn#MTqZq#~JPT_$y2K9C3h&i>N^fA(by>V>y>%T6 z7~XfRId{1H2s8O`HSiTD5#Rz_)gp1}zX z&C?~OGri+KvIQF1LgwU9?W#%^+ZJkA z`=aqpax~}=jI(bCo=NbGT`JDWL9bK&if*Z0@;*t__bVDR|9(Yo3xyBu54d0QB6P5G z(%;>0rCqn>gv!HsydvRH6a3d?v!~wIxXvDG#JQCPNh{*!m+srr?&`{}a(7|} YHcVtm+nfB@(|-#*uBTe>;U5hDA0o%qZ2$lO