From 2d6b80e74f469f50a61d3ec8cc427a285041457c Mon Sep 17 00:00:00 2001 From: codemann8 Date: Mon, 7 Jul 2025 02:23:55 -0500 Subject: [PATCH] Fix HUD to show prize, key count, and compass count if seen by player --- Rom.py | 12 ++++++++---- data/base2current.bps | Bin 136438 -> 136460 bytes 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/Rom.py b/Rom.py index 32f07e22..a497cd50 100644 --- a/Rom.py +++ b/Rom.py @@ -43,7 +43,7 @@ from source.enemizer.Enemizer import write_enemy_shuffle_settings JAP10HASH = '03a63945398191337e896e5771f77173' -RANDOMIZERBASEHASH = 'b0a70c07792884cbe3d87e99c8325e41' +RANDOMIZERBASEHASH = 'b0f449244740c00c8d0c801e24df891f' class JsonRom(object): @@ -1292,6 +1292,9 @@ def patch_rom(world, rom, player, team, is_mystery=False): | (0x04 if world.mapshuffle[player] != 'none' else 0x00) | (0x08 if world.bigkeyshuffle[player] != 'none' else 0x00))) # free roaming item text boxes rom.write_byte(0x18003B, 0x01 if world.mapshuffle[player] not in ['none', 'nearby'] else 0x00) # maps showing crystals on overworld + if (world.mapshuffle[player] not in ['none', 'nearby'] or world.doorShuffle[player] != 'vanilla' or world.dropshuffle[player] != 'none' + or world.pottery[player] not in ['none', 'cave']): + rom.write_byte(0x18003A, 0x01) # show key counts on map pickup # compasses showing dungeon count compass_mode = 0x80 if world.compassshuffle[player] not in ['none', 'nearby'] else 0x00 @@ -1447,9 +1450,10 @@ def patch_rom(world, rom, player, team, is_mystery=False): | (0x10 if world.logic[player] == 'nologic' else 0))) # boss icon def get_reveal_bytes(itemName): - for dungeon in world.dungeons: - if dungeon.player == player and dungeon.prize and dungeon.prize.name == itemName: - return reveal_bytes.get(dungeon.name, 0x0000) + if world.prizeshuffle[player] != 'wild': + for dungeon in world.dungeons: + if dungeon.player == player and dungeon.prize and dungeon.prize.name == itemName: + return reveal_bytes.get(dungeon.name, 0x0000) return 0x0000 write_int16(rom, 0x18017A, get_reveal_bytes('Green Pendant')) # Sahasrahla reveal diff --git a/data/base2current.bps b/data/base2current.bps index 834435ae96e8a07882b66dd8e261ac3e3b2f0d00..156d1f0f38e70f41fe726c9af26c64c764e317ce 100644 GIT binary patch delta 2299 zcmW+%3sh5A7UksS2jLUG1%>kRkbo8eZPof2i;5P7ih_(5bwsLDX|!6=s@TT&kU$=i z2DpYB%)&^3hCns6&-RHHakPH0T5&oKBduCNN5RhuijJk|n>VxWT6dj&_PuM}eb(9M zK6fcAT9lO+VO!OYU%_E+Cwv3ab33P(p+sV;tjp@8ZlMAq1v*g+k*oAS;EeymLd9^t zQVW0%Ib>IraSt4WjdfHG+AYrjBX>dW53q&nQGgWIbJtZJ1Y~nKpv(s*q3AL764fK_ z^q9GzNPXxS>}D&GDsnGy$Q=0)zCoWw%~BnC=)kjsi!W7CQQVoRdVnNueRPx}>`kll zkcIl;+vdT+{S3RGF|DFa)N{_N)evwI9UtF5cHbihO{Bl9TS3=S8vc++I%q}H*3lPC zQ~>wIgjWR2MW)1=-q-Fp&iQ*x6oalNVi@HLk{kdlknbc?;`5M8oJ14iyWMZ;RkA9Y zI^54qO2I@3ch^y=$}rv{7xe1}2M1G`Dk=#5IxiC9(eLv}XR03JIPLr{ zkTObR6*s)VFj=Y-`bo`9?kcOPb5eym`qUl#MQrM!^tzF#0Z(qBmb^U>nMLsZnj}?`<(ZGB7^9*e&9O~a%IAm}aqV%Ib&OK_-r6J;&thc8q^b|(I%LI6W5?+NzJn2789$cj{FuIn-^K6WNOL6t;CA5Nm zAFY0s4*AISDh(pglUL&uqAuNtEgVG&Bv{dGfq@UvDPaygut*>SiY%G%Zmh18$*}1= zzNQ1a)ZI$z(Z3zEBD`kD{>%hBi))kyv$MRM(b<9n zEJL7)_~~9-HaYu#+hVu%l)hUiDgWzUE6_nkVYmJ6*IBsV)Ms)@rJQR zMvIqsFj{+22TIq7NF=r9Vpcn>$H_RJfax$1=Myjomf=Rx24Keb2v{p2dhjACq)C)1 zc)t|>B#|w^KTBcx!d0Q=hE?YpK1pZWbuO>EQ+{cW6BO?O{ZkChUPT$Gc*Sm${-E$@b@x^ONj16>wZDOv1QkF zhervIf)cHo5%c))N@6^86Jmtl`=c(oX{?9HAaQ^k$e3}D9S=%b?PEs_t;;u_ZH+I| zdDLFPhkd2Vau;bz0#RL-9LC4Wba&ZA(Al;fJ(~nNSBYt|-1XS>rrhN)y(O<9W%M=D z)rJqrVIoB0pX3lT?%f%^cKn%RYKUKg$5IpB^jDa|SbyyY&OJNRP9to7F zy(kjifC>DUkzgmJsqOY~ejy2FNvOiFq`h0^xLSSaH#OP6kDlbN!2bLr3ak>DBC5nL z=gVVZ%S735*A8e7jIb&e%`X^BpNT_oqvVz6%w@;um2bd;1mAJ z$G`zB;P-BUVkM}sd>2fBFn-c5$WaA(TTPDhuH<-Ag&_Ecb(#`z`dA`{M3?E5;HZeatq4P)JVLrA)K$Uxf6^;{#$&KP0{+lI`cE^Tk8 zdfA@0g|=aRUott(dOEqOVFzPqQs63fL^O7Z;lc%b9%CmMd&%YDn)sp-U2kV2cD9iJ zz+zaw2qhFFzpQ6H{`uFhX~(^W%Ss{A=OlKH&K&a;Qa>F@+Crdg$X*j#Gp*0`4z9Y7n2DucvRGe4*q z&nkn3s__TfROH`l+h&n>aAg_9ueej&w#B|`O&D$XA;ex-5JuO^NxkcAh`l=ZSW}8! zDuVkV_G0{zNLflm^dhA7wY)I;|92Q=wKA5rR~W**-6fooW?iFoow1(>(YB>u;Z!5UB#b{W(nd6S>0IJ(T9D$E5pbX-D-bg)aABUc z-m5#)J>qeCG+3EuMe{H+!WPA5L&@T1fKCj9^2WA&9<}aDxi6qc_Y^gyU z|4WNa=9poys6Iz;ZW?}F zReW2yWKXx8>f$ffKqE-hJMk7PXdsTSw!&hGOkVihwwb?s073}p!XtICT;jVCXCH(L ziNcS+eGoRr2PJH%bOpf_VW~Vz$d)h5KB?r_oQEEjxAxO!mJ-5ktNC|+hE%Ei{p|LJ z(3w2j1CM1vdCQww)t-jxH7pZQ6ByCakb~J9z$&!6o0(|)TpV!|EGnP;W>d5fE!c^C zzWpX#16l4z&3HPGeuEhhuv~MzzF&AM+!NQ8hROKX+feAcBK4+45PAe8i0)e12WYY~ Mb@ZqYgltXxFZeCi=>Px# delta 2217 zcmW-hdr(t%7RPgP^MXJK2+FhE+yDk2fZFwekNUtiB8q^lin@U9x?ohSkFJ8o8zexK z81QHO1tGiT0sKEFTCW4@=N zRr1a*sr)zORo(ms8kpU11_VEpEGj~A#B|{WOEcAl@`?G-hFXa%30K{$I&7u_86SZe zARF0)cO+piYy&6is3oXKlmdI18zLFN7tDPz2w)BKK-xh-5`+E9ydfGzhBolIm(1nR zg&>~!(l*d#C_&Qj1JI02;V}a9c`or7)y+TfQ#rtYH`}Z8H`_It%Si1)cj7R(nEZGfKnn7iLh?snFmY38!c({7W35!6qsw*7 z)cKeQY<_C1l%|wFCO_@d3=9k;>8dCZdblVY!jXH?K9Hf^N%3GsElFAkW5zG;1Yv`O zTJwS#`cywvnDNR+?P9chGypU+Q24zcBr**Ly@X?w{kBtT(R00z$yt(1(+&yM!E~6A z48obT<4y?_GXBj3-}5`jUgYDML)E!d02|ZueK6mn+~=<*df25uZg~_kzIzXgn9@Jf z1hFBPLLul6-R6HC%{%H>x+S|BgR(Z9EntaRFn}Bzwmm5wMx=jxo z=wH=#o~dBPel#2XG8_R<(YxW#pb*U)QNTKsGop~@_I0Xu#_YE!bI0qxtR1iQjvZ*)*_#v2>NRSlY1hxlLt5s6(s6%C>ykTu z8PZzki?!4t~89fjwxBVByj&%1T+to}v)%lp^%@9x+4JJN@=p(amoYaG!y zE3QlzZIyMPY_ePzjf!>Aref3919(MPxh@8O(xHp7Zs26vMMY6%4>aEn6D~33v1H1)!Ee_RvCu_$GQ8|VT|!fs zi%1E?p&}r~!GpFJrG`+vKm=hBjMs}GHhRmZr-nGt)b2ccH6Aqf-NvaR`=D`}$Zj)! zEILLC>3gL81U@B#$soWFM4*g{Pwd87v$~B3xDOm2muWE^;GDHHGcDKys;+QOuIy9} zCdKf%EO)kuu6A%%&cU&@Q*o6T7KtJxcDz@NyTzb{0(Mjk{Q)q*J`aWQp5uV!;gANg zctbc)o;LO2FcB8Ar^CTY2qv{#6WEm`nD{}Fz9sElQrn#)^-ttv-ywR6qXNgU?{@){j_oG;EtJOpPc#rDDA^V5tNSv433)OZc#btzQqmUcwpiG|pqsY=j@g{N2%b z+g8YjHEj1*U;q-?!`q-(0!r+^2PQxqJ7*7MN(0>3XuEDtP#I5LcgkIDq#NVL5_k{y z@Yi~n4nFv<9+vIjhwTdXWZl~+<8Nb)QR5m*l=KmUh^#P`GAC-*1eM;QT`}EG`O5t> zxwau~Zvv^ZTux|eJg;vO<0^yOW7HD;jT_cvoplRsExG;rn5xjN>2{iNb1Qijd(wl+ zNLGvr(%#;eZFq1mCTg52SQVlQRfVa-RS_!uO)2<8gV2L!ercFv- zscxG?-oq!$Kqb3Z-L}m-FMBMl|1r>-iT_gup$RGZV`*~g2a+EL<+F&29bBgzkq5lq>RFUCk~9-jr=Y(b!%N+r$$Mn~P|?h9wQq zF7WbAs?yW`8O0mfUL(BW`zyjq^`2v$R%|pWhqSdk0sFKPZWHo!zk`RWb#has;o|ug zYe4|Md=y$d>(`j!a|jsQYwONZjUQz;eDY zZ~MF2H1