From c4687a3be602cb83285700b9f11b8274ee030f32 Mon Sep 17 00:00:00 2001 From: Kara Alexandra Date: Mon, 11 May 2026 22:49:15 -0500 Subject: [PATCH] Update baserom, add hashes to meta --- BaseClasses.py | 1 + Rom.py | 29 +++++++++++++++-------------- data/base2current.bps | Bin 157460 -> 157463 bytes 3 files changed, 16 insertions(+), 14 deletions(-) diff --git a/BaseClasses.py b/BaseClasses.py index fe0dce2a..8f4df302 100644 --- a/BaseClasses.py +++ b/BaseClasses.py @@ -3184,6 +3184,7 @@ class Spoiler(object): 'race': self.world.settings.world_rep['meta']['race'], 'user_notes': self.world.settings.world_rep['meta']['user_notes'], 'code': {p: Settings.make_code(self.world, p) for p in range(1, self.world.players + 1)}, + 'hashes': [{p: self.hashes[p, t] for p in range(1, self.world.players + 1)} for t in range(self.world.teams)], 'seed': self.world.seed } diff --git a/Rom.py b/Rom.py index b0cdb22a..06903808 100644 --- a/Rom.py +++ b/Rom.py @@ -85,7 +85,7 @@ from Utils import int16_as_bytes, int32_as_bytes, local_path, snes_to_pc from Versions import DRVersion, GKVersion, ORVersion JAP10HASH = '03a63945398191337e896e5771f77173' -RANDOMIZERBASEHASH = 'c5e123bcd2723114e1ecc8b42d0c5efa' +RANDOMIZERBASEHASH = 'beae4c06c4841030709639215e2b03c3' class JsonRom(object): @@ -1503,19 +1503,6 @@ def patch_rom(world, rom, player, team, is_mystery=False, rom_header=None): loot_source |= 0x04 rom.write_byte(0x1CFF10, loot_source) - if world.showloot[player] == 'never': - rom.write_bytes(0x1CFF08, [0x00, 0x00, 0x00, 0x00]) - rom.write_byte(0x1CFF11, 0x00) - elif world.showloot[player] == 'presence': - rom.write_bytes(0x1CFF08, [0x01, 0x00, 0x00, 0x00]) - rom.write_byte(0x1CFF11, 0x00) - elif world.showloot[player] == 'compass': - rom.write_bytes(0x1CFF08, [0x01, 0x00, 0x02, 0x00]) - rom.write_byte(0x1CFF11, 0x01) - elif world.showloot[player] == 'always': - rom.write_bytes(0x1CFF08, [0x02, 0x00, 0x00, 0x00]) - rom.write_byte(0x1CFF11, 0x00) - if world.loothud[player] == 'never': rom.write_byte(0x1CFF12, 0x00) elif world.showloot[player] == 'presence': @@ -1528,6 +1515,20 @@ def patch_rom(world, rom, player, team, is_mystery=False, rom_header=None): rom.write_byte(0x1CFF12, 0x01) rom.write_bytes(0x1CFF0E, [0xFF, 0x01]) + if world.showloot[player] == 'never': + rom.write_bytes(0x1CFF08, [0x00, 0x00, 0x00, 0x00]) + rom.write_byte(0x1CFF11, 0x00) + rom.write_byte(0x1CFF12, 0x00) # turn off hud icon too just to be safe + elif world.showloot[player] == 'presence': + rom.write_bytes(0x1CFF08, [0x01, 0x00, 0x00, 0x00]) + rom.write_byte(0x1CFF11, 0x00) + elif world.showloot[player] == 'compass': + rom.write_bytes(0x1CFF08, [0x01, 0x00, 0x02, 0x00]) + rom.write_byte(0x1CFF11, 0x01) + elif world.showloot[player] == 'always': + rom.write_bytes(0x1CFF08, [0x02, 0x00, 0x00, 0x00]) + rom.write_byte(0x1CFF11, 0x00) + if world.showmap[player] == 'visited': rom.write_bytes(0x1CFF00, [0x01, 0x00, 0x00, 0x05]) elif world.showmap[player] == 'map': diff --git a/data/base2current.bps b/data/base2current.bps index 6c4f49c018f6950a6983d0a7664b7d7a666e4a43..c8a8949ce58305efbe596e81f84129ff35ad6d82 100644 GIT binary patch delta 1450 zcmWlZdrVVT9LMiDEtJxNAmG4ftum}ssVpLof}kKe9FK{UImuAEO;}()CTdiAZs8gW zvT}D}XRgzlL7`lpj=Ao}$8}893KGbc4NMHqY=()BDmpWCcBlXRKHu{@-*0lx`6Z`e zNREf(JtrhmOV^&f-jkAA37G5+m#tX6Xp=*DaK)@X;^;0*a5UGcT@Imuu2cWw5VSPA zqlh!;Yd~!8lzzwsI-Qq&L30CPu@&3_glVV2)vrM?_DzImm(+CVLi?50%+S$uk0&NB z)pYP8)!#Z(H0eKgl+kuxsBY9^S0ap6?Cusc9%_aeR8?W$B*@PHxm}nkQnQR;@HN1* zkiw}x3CLE#Bp}sqxHkzdRvd042?jP(!T~&<1oK0(J4wSKQfKh~q(aosP(lpepoi-D z&sypWx7%TONf_l%_Ip~r!JA&8D#O)!_&QjR+x76$oR?jK%j0qT_fwWzwc8Aa%0tym$k?Jp&kt!7{@Xiz%2A<=CDKIiB%jx!) zQ$d?3%67$5DZJI1nsL|O=cz;`iNh+v+FHZDBJI=orxcj1{iuBt6=W%gMxlgDrP)11 ze9YCb`v}Vjy9hra>>=EXwQJ!*qlLFrvj(zexs8bZkO+<#b`v%dHWOmP7Q$0p4ec06 zMl|Kzg3OdHy?r~PmvHx49vFp4?hm$uFp8KT5NZe?5=L`AG`pOnS8%now)KAd;i_IG zYNTu?$~a?PMn}^x@KID7jp+Zd7S)C#+Ji$-ox~^r4pgyPA|zZbTT1AIr`N)f^+g@t zXII+E420YcPS$XmjBc~HY0cR=J@T@hJeG~3j5XmODES*Vt_22777geQP16OU>9fpj z$Sg>)EDdsC99z?1oNU}7FoEJ-JememHy>*gg0fv6cdVZd3~Y0z)<2WUO=4IMla+{Y=qOW4yHgbiJQ`4O3Gtw zqGjBI4t7|wIi_J+-C;dWH*q=j++kGN<%=OPPM^&Pd70k z#^6O6aPb?@TJGuUH`x7M(jIc+E+I0|9dB2-r1i1*~sP&c_txbbS2aEkKlzU$Tf zcz*_54nDyKri5Kdg@s58@}5OqxFA ze3AiGejvmdk_`g^ScTO&FcXyF(i~U~a`03R)I^x&-NBsv!TDjiJxXcK+JTaI~)aS?jW)X5Cm2Q+TV9ipnTb4#l@#r}B2 z^bg^b;`^=30!QfU(J=62zAS4?Fzg)51t44 z&dEGT18@MBZGmw>iJP}T1IWYje3%CI;H-SOS{Y_|iv4-#(S)b?edo!1_%={1tWcw` zDmC>@K#l*}O00=E`W^UZfF|}jr&uaMOfD4ToeQ?Xd;k*gz5-Yb;_$Bp@Xo@#k}Ndl zp#b#pl`B1fIwY->=0PMiNl!?v@p$B2SOU|(bLzK~4=Z@y4+3wKtwc=fUQ2adkhlgv z+5yYJZv0*$T)&_sVvOPWR_(koTN-K%HkSUq?wX~Z`TU>nqn@pCUMPfla=*dxiYW2h H^2YxG`_*~d delta 1435 zcmWlZYfw{16vua$5MBX6(Bh*tL{NhfQ+$lbLl6NK3Zhsa11*;50IgOBDV^N zNxa~yXya5u;PP~sHtwigrDBaB12cXQN7{~Uos6iYLT$y4>E_G%o%7%GpE-MWX32n0 z?SN0`2@jd7b0n+lq(`*}baaJ!Em}4wwTV8vS*beI)Ui9Jsi8)7r-^RmYE(l_RKuBa z^8{U76fs1vOu7hfUw{Ebz7k!Ud%RT}(yORX3we0uFNfpC z@m5g+z1GS6QQw&ld3D>hiaIs1uSC&)J3FY_1t$4^B_{G%WSTwLLMQW8CZ6i#I&=vE zlIR(O&82({Rz4tIu_(;1w3#`0)Bxyy@@p*02~KZgLX!l(BPFqUxR(c1LsH|AYWAx} zW8QWP3N4xjeA#)Y)or}zPL#!@A`Z=iiKHbC-I)HSo!VV4r*AJX+`sQ|;1}NmAjOih zcr@MbZ9B!@%}@N-O7X-Tk2-?OS}6{cK4sBYDrQk8m5?0?Xd0X#UnQW3`D<-XUmp;- z4gm8_R~cPzO-%XC(&H+_MJorD^sKeY^p45r$xjI=UZZPS2LcUyke==m5;@aemJ|wA zru~e?jO~nHFm^KTA(~a_1N}+SP+`)s`joI1n|86p$QlY6Pct?!)-pCSo)N0JroMR0 z0ox{A3CwF+wqs5yJT-|>PgTMnrdGyq*8Gfd9^-Sy1%fAMie&Ccp_~ zC~S6m8xGqTk@*$iPo5E@wLl3*;wr~BEY%A z;%Ao`qs8^PmZP|X4IHY!)lSa=?~W07-a`(gph&onm{X8?;eP8ai`@mBaf{@@sWtQ% z{I8o(XM|KDXs?}{*^7)bqyyxYA&uh>+Qw6m(i;ZaLNZYRgi&N}7D|J~K z#=ALVU-^|sYTz--_WtlJ=KIb1*S5kjKGacvw7Vvve^7Bbp{H^b14AI@yh%jyu%%Z8enZKw!6xN2Lqo&8Wjp;xJBhEbSL+-In$36z!+XD-?eKO>*yq2%`qW(@P9Xq`7} n*qnsxg7n2NSKl!h`O~j|od0*Stve58`*=ql^#8|jH?{D8vxamA