From dcc4121c43e92ca76717e872ea1ec8f18e18bb37 Mon Sep 17 00:00:00 2001 From: Kara Alexandra Date: Wed, 3 Jun 2026 20:52:25 -0500 Subject: [PATCH] Separate map and hud loot icons --- Rom.py | 37 +++++++++++++++++++----------------- data/base2current.bps | Bin 157832 -> 157910 bytes resources/app/cli/args.json | 3 ++- 3 files changed, 22 insertions(+), 18 deletions(-) diff --git a/Rom.py b/Rom.py index 476e1199..926dd74b 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 = '5c4c3cbe6d3fee849e66d4ac4a059792' +RANDOMIZERBASEHASH = 'cd81a8bfc1d67c6a13fe806c7f35a15f' class JsonRom(object): @@ -1505,33 +1505,36 @@ def patch_rom(world, rom, player, team, is_mystery=False, rom_header=None): loot_source |= 0x02 if world.dropshuffle[player] != 'none': loot_source |= 0x04 - rom.write_byte(0x1CFF10, loot_source) + rom.write_byte(0x1CFF20, loot_source) if world.loothud[player] == 'never': - rom.write_byte(0x1CFF13, 0x00) + rom.write_bytes(0x1CFF10, [0x00, 0x00, 0x00, 0x00]) + rom.write_byte(0x1CFF17, 0x00) elif world.loothud[player] == 'presence': - rom.write_byte(0x1CFF13, 0x01) - rom.write_bytes(0x1CFF0E, [0x01, 0x01]) + rom.write_bytes(0x1CFF10, [0x01, 0x01, 0x00, 0x00]) + rom.write_byte(0x1CFF17, 0x01) elif world.loothud[player] == 'value': - rom.write_byte(0x1CFF13, 0x01) - rom.write_bytes(0x1CFF0E, [0xFF, 0xFF]) + rom.write_bytes(0x1CFF10, [0x03, 0x03, 0x00, 0x00]) + rom.write_byte(0x1CFF17, 0x01) elif world.loothud[player] == 'dungeon_value': - rom.write_byte(0x1CFF13, 0x01) - rom.write_bytes(0x1CFF0E, [0xFF, 0x01]) + rom.write_bytes(0x1CFF10, [0x01, 0x03, 0x00, 0x00]) + rom.write_byte(0x1CFF17, 0x01) + elif world.loothud[player] == 'cave_value': + rom.write_bytes(0x1CFF10, [0x03, 0x01, 0x00, 0x00]) + rom.write_byte(0x1CFF17, 0x01) if world.showloot[player] == 'never': - rom.write_bytes(0x1CFF08, [0x02, 0x00, 0x00, 0x00]) - rom.write_byte(0x1CFF11, 0x00) - rom.write_byte(0x1CFF12, 0x00) + rom.write_bytes(0x1CFF08, [0x00, 0x00, 0x00, 0x00]) + rom.write_byte(0x1CFF0F, 0x00) elif world.showloot[player] == 'presence': rom.write_bytes(0x1CFF08, [0x01, 0x00, 0x00, 0x00]) - rom.write_byte(0x1CFF11, 0x00) + rom.write_byte(0x1CFF0F, 0x01) elif world.showloot[player] == 'compass': - rom.write_bytes(0x1CFF08, [0x01, 0x00, 0x02, 0x00]) - rom.write_byte(0x1CFF11, 0x01) + rom.write_bytes(0x1CFF08, [0x02, 0x00, 0x03, 0x00]) + rom.write_byte(0x1CFF0F, 0x01) elif world.showloot[player] == 'always': - rom.write_bytes(0x1CFF08, [0x02, 0x00, 0x00, 0x00]) - rom.write_byte(0x1CFF11, 0x00) + rom.write_bytes(0x1CFF08, [0x03, 0x00, 0x00, 0x00]) + rom.write_byte(0x1CFF0F, 0x01) if world.showmap[player] == 'visited': rom.write_bytes(0x1CFF00, [0x01, 0x00, 0x00, 0x05]) diff --git a/data/base2current.bps b/data/base2current.bps index 14ff761359a43f387a1ef70545c95db2549d6463..76f9c6d626cb628677fb5deed8b182fe543b7667 100644 GIT binary patch delta 2320 zcmW-gc~nzZ9>?#y2@nE=C|VE|A1Nq{bs}{^1Pq7>3KF*}jA9f<5!|ZPK}7Oi@L9tm zgeP1fVpIqTi7`=X<5Sx>oC6x9PMFRamvJjqhjC4-&Y5D5nVb3N`}wVRdB6LP4Eg_K z$lq4SFR0Z)$n|G<#ns4aqJYoG~R|C#-1X-*97sPXNCX1F~o3>GyGpdUxs+o zaJ!YYN6TPRUC(dPc?5B}Cwp4R_$j5`-1BQ{$%$_3_Ibw6ddc%{ZY^CedEd=Vr#0(n z_CRtCT-n{@my)vqFShE$zEzW%8C_&PDBx{z0Wjpx_&@$$$1%as{Sp-;%R%EH|bfBk;=>XY(v zAOPdYS>-tke?Jsdo+Xuv1>!(y;4aa=n1#t=5N02~PiP4LKm2uixgTYpF&I}%K&C<*G~%ogdmzCi8bad*!DGBWa=*(P>;h2^t&M7wBQw*6~1y3v32& z_kh5&oY)foUB8_=BW^^`{52i#&*)7Skt zD9bU$#!-UqVQg(gzNyd}cgDg|Vn;Prq2nl4z5`kQe=P-)WVWKQTRx*Wc;f~aW|R{RZkE_%NkV7s6v~eVr=Gy zLz-e-cY)2KG@G&U4Q?#K{1&ql^Actk=4G~qHr`C3Xkb^aq|`u{VJ@KP4ECAEL@2pT z_KD^!W)`k~j=2Q$C1wumLu=x2`!cqco^E(%-e27lNHqhU3Mfal6)JiXyMWd_#|06r zZ?)znHb_=kt%>6)ISE^ISCYYj1I}TD-eEKlu zQ!CdB1Xg^9Fy%9Je-Vr$nvq{7j3rvo%uE;>g4m2Jt>JyJaf0JG`n6#(O}EP#Qe6N^0$h$&Yy~*UWBLR=1bn4;Yt|MXpA0~33{cq>@?%WVrV5joSFb` z9+}<2rkY!!*EDsqM`=EOz7=}*&}jj1`;sjkCr$QoDq;} zwDCtvD4h-zA)Xv2&Dh(eFkE2gZgrt`n_cZ%J3pM^cN@)LpWHr`xtNpMW#`9&$4>Cr z9ex8XScb~vP`*vHJcg=$b9$Z8<}+H7)2`PQQB27ub|0nTdtL33Zmf!XCTBEo3)6KGcs8E%K8Pwm5bpv+@+1SNKRkP85PNbN=TWI>GXNFZF zL-gO@s+cgt8;)N0_Ivu&P1X5(v4HmiKlVGvDP~X?@WKAoTPAEoySKMKde9ZvF{fYs zf&vX$#rXk4F`ky&>2YPg&T zP*g~$wyN01j)hav(=T8etSmq=Yv2=6*_`WaKopN+#h) z;x1z{8KTI$x-_bJjI#7~dVfPB)AXNjr@deNsr`B(Oz;oaZj(2$vULqjk^>j4c}X2D j%KU~cK8C>jOe89S(|Bz7` delta 2287 zcmW-he^e7!7RP5^0we(;^5cM5HKZUvM2(1wN+cj4_MqUeN>PytRS>l5?z*68-k{SO z5W_IVw~%5~2q6O)l+%XMT}P>)LDbN*$76Bzu-Lk+KWO~9m37U&^pClp@BPlb@7$R; zZ|)9Bj}1w?j*Gypu6R+N98JUzJ^jUc*v5aEnh2ob1YfMHb59LBM zjxr%0N3o#p{QaTxkutpj`R|wwd2r(ff4KuqN&?}LvwNH}DIs4;5XLL6!~9%xQQC;9 z*L4^cFL5aNL*^>x1Gcp&Ckd!y=X9(j!6M>rncuo`U$5G zfDA`!`Dbh%#dKgXj_aRbIx(MNzGSj)%rh+d+1Zs$j7ZDhV5^x}%mMZSvlDZWt)@#w*AGL)YJfc~veUgoJ|?_f zd~hc_^_wRA6$H3VL&4{-hJNTkhmt{vY=%&IV#P*C^EZ((8KkUj3{P&UFK!{42uUl) z6sHnRB+5$zP*A76seer5pYstLRB_G*2boX%o>dt(ujsD|gH0X-1M(O7ql&s^bv2@1 zMSgqvo<;DVy$Ye#g65}y1@cx4Px}gH9Q{sMa@)WReRVv5JSKD3A0-eSY9__~o z4vyyr#)LMGS7i;$IALDz;R!pTdhT{;63)>n9DeS)`#2?pyBrT$jgk6=tz>l3ZMsQj7kA;ItbBy8Gr{C- z7uUvd;X9iTK`S0NL|bj;8wiON4;`XCj%4W|hFppkq=RTO5p7Ke!2xPE^-@DdVYwxa>KRbmT!qCxCdJ|^~rNkTY16;aKKnr58H-F9!Y;(asw z<%a5Ncg;!s*_X>0%b z)UKKIcbN{8O&m>(*ohHm=nYhmiEd_tY;9at6s-RB%p-G`$3#))T$8Z?(nZ_Y{g4s6 zQ^PR}j`_o!J%Vsb8fU3HbyDkOqsCzwF079psC+k50C`dwC8-NDLD-g2*#83Ko$7>|x zY%=w0v@6~A;|8#X^o}i8!p6hVwatDJXwF8E3^G1LdpClgeHSgb&U%N7Ae{|_^deh9 z4p>Km6`!J>&%id2x&eKZ3;qGNmZFJVFcqYi+JZNMDWb{$>)|(b$5Z rU197nC6!Uhd#}wEn-3g}Lz|00q)4@@2YpopG9-7aHLL2&61M*zgB$B- diff --git a/resources/app/cli/args.json b/resources/app/cli/args.json index a728cb10..0918413b 100644 --- a/resources/app/cli/args.json +++ b/resources/app/cli/args.json @@ -491,7 +491,8 @@ "never", "presence", "value", - "dungeon_value" + "dungeon_value", + "cave_value" ] }, "showmap": {