From b7437fa9fd45692aa78bcb4b5a4142432941e375 Mon Sep 17 00:00:00 2001 From: codemann8 Date: Thu, 2 Jan 2025 03:41:42 -0600 Subject: [PATCH] Restoring some native dungeon item behavior for glitched modes Also fixes issues with HC BK (item collection in other dungeons, acting like a small key on BnC) --- Rom.py | 4 +++- data/base2current.bps | Bin 134014 -> 133996 bytes source/dungeon/EnemyList.py | 4 ++++ 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/Rom.py b/Rom.py index 261db448..67369cfa 100644 --- a/Rom.py +++ b/Rom.py @@ -43,7 +43,7 @@ from source.enemizer.Enemizer import write_enemy_shuffle_settings JAP10HASH = '03a63945398191337e896e5771f77173' -RANDOMIZERBASEHASH = '1fde4fa24bc9d3efe450c3bc30e4cf2c' +RANDOMIZERBASEHASH = 'e2e7241bfb0085ab7ba12167565e814a' class JsonRom(object): @@ -439,6 +439,8 @@ def patch_rom(world, rom, player, team, is_mystery=False): location.pot.item = valid_pot_items[location.item.name] else: code = itemid + if world.pottery[player] == 'none' or location.locked: + code = handle_native_dungeon(location, itemid) standing_item_flag = 0x80 if location.item.player != player: standing_item_flag |= 0x40 diff --git a/data/base2current.bps b/data/base2current.bps index b8544acb14b79983294fa51d205def14fdd139ac..30a30355cec10c78c85615ae6f4c6f967a314bc2 100644 GIT binary patch delta 1865 zcmWkudr(t%7S74zCIkf$VF^fxk%UFXB1E)45Vx$NqENBz_`nBSTh_3kQWaSX_a>mZ z!I0?B@PlS)Fp-krreu4y*C0qnySmIcEACip*|p=NyJ&o+qmB|Dchhrb&iUqi-<+BA z{c$E+Bu`r;mdmi`Z&y|UI2kEF9)w@q+C3Mg3Uu%>(y_2K&z)3^{G;Sdx&*;#erXgj8H!L)|IHtXzl8-D!=D7;51*%9(029-gb{e1$rKS7eb96sl27t!WUrW|pa0M=ylv|u{=LkT9Ml=2c&zalv z9RO?5;YO$iWf) zNYBPsb&2M132A#&SeSNjfPpR$2{b*~LREJ5m zSx2j1)!{sJZ}eS=L5ZP!AkdD`Z(s*H6iSPy9=UTf+P>qoK0lYvy=e1uzRO5~&V>qL zGlH=-P=VHsb z@oKu!RbYONc9$5eU@j`IFSiw~cuW=GwegRinNi-j288Iqcv{AR`)J9((T?@>k6O>T zAShO@n`keLd+OOLNQWUo7~#EHWP4`VaY5m9G&rsh$3JyEIZ7v>;P|HagQhIP{nV6A zxE&@9(V`HM-z(e>v}Ga#c*rm@J9Tc>F#d4Cuu0F2aX5B;E3M}SY?}40I82xJ)E8E;aJ;zlsEaFSjKbXntB&9PAcILm{Mlz;Ew})+R zfa`oHz*~=jN+OtjwDIyZ^ge4i2HD|O;ci_WM_3EKMSuq4x5Ru*t0toS8(TX zK%!H9E~OhUH^F|W!d??7lPh`$Q-hMh4vTWo>y@7=^~)@TKgr7{r=P9ZgIW>Ld!`+SIo~q*dpdbteco!YPIJT~8(p>DJd&yY#15X5bS>Zm3 z*O_7Ato^;D+)r2}t&1NMJQpeQ)%B87JBhUxk*}eb6!?tzv>9^biDf41&%7aNr}2x= zi@&56;5C(BQZrlfrnFFTwvG6;8EW7oTxo$N{Qb*uw*}_K?Z|Dh$86VA1$Oy%eapca z&9MpkLiULTE(t+{yRDD|pRo6>5D*c$QFeRP2kcE7M9hznR=Q{EUk7?DfaES{}x!Km786r6fT9c zf68wA9&Upux6Fl;*+oCV5{Rx&?>+sHd&!N2^M-Q+ChtJ?lx53)vU1!H9OCdCmb(Mb d(#1vl&R=b2B0$d;@ z@HhNW7K4dMD2vd!>LpYPrR`E?nKkaP*0QBjAG_FyN?kjZ@VI;Z|C#@M|M|W-XU>^( zW||~RO%m$}oc#RjZ2+IsQeFfIvPQ3MKnlJQKBhbQUVuZWQFv1l_lv`Ou}!`M=|ws? zOZSTc0Y0Kf#VS6WMUSPEkV}vG|0j?K59z+>)ga#Jb$C5gC4DdED1Zy?j!X5w=yl+< zFynZGJdAFQ+YDevQ}MAO41)x}w!XZ_Y_2K4=B=h4B5A^_prkh@90HKhf00EBC5NxN zyx!)X6X?29v9gSD^@+VN4(TUi1fXq zK+?&5m-wJZlk_;(j?ODP0WQ+NU!B_Q7c?!i{P(U*#-OR+2cvV0Z{7{=h?!08StiiF zc7uJ==aCGrolP3HqrT_g791x{zJoX?rrIFKI%d(sBZH)$o!&IPb$ZwI2h*j~Rnxt1 zKRX+3;U1s9SBV9QRR*P9Fo=SpstrnHG$<`bOK~|S!mAA`ynfK2vcEToKIBLhN2)AF zO7-k4&O|@Xy$(?*!j};hXlY0#HDf}1TaT6)(-O04GI}h4zy+wpml$Ds(3PfX`G(cI zhgmiIq-B_OkD!&P&!^)?ZPAwne@5Hq(;x{|&c6l|=*xLomL#yow12`GmqEGpT}0b( zK<4As;@;km1+46 z6`{n1ELet)EhK8r+(B>t8x`bGKj?cF__Jd9j>R@z)J#t^zHOa+;}fcBnNq zrx|lZ!`JK(Th;wX^!LRN1M`zbWJ@n=XM0(uH3g+EZ4s{^x-da>p~@vW6wqBu)!~qa z*M`9>kj5Mcg8&}rnZwKB90=rY`)cM%1T^rLp9-&Vd;A^4jqN`N%l=tQCiT`~g0V$` zjVC&#sIZ?@Fxpr+rV*-@mEAn%QWhMIfz$YT{Fd=TVct2Pg77FNX`az6 zly%~#6sUy9->@SMj;jH4W_pENZk36nT)tNR6M?K;D`NNlk5wA=qN2#`|6NWdE7~ z^4-C7@tDFB+tEHodi=N$9zmCa3@F_3%#Dq;PzFVKsTQ=sUtLcZb4w^4wtK=}6pz={ z!9LLyru(4mCPsCDgpTVjIfGv@!^dz2pErXXO7T}_h~`Q1@RS*}+&8cu*6;!Xa9TZV zic|!&*WT~(6_Pq9{B>5`@~aq8hDqlc+)xh@VsgMm3Wn-l{nY}QNb-EvaY@X zGK{J4BRSZPU$?;e732UJKP<9Jnm7C+B3z`hCo!5>vlpi6Y~#vEDY7{bW#52oQ;2=3_(pHQG?FSIA#JUacGIlkYL|~yC=XV zJ-*LnPGA#Q`w=GlUvLYA+wxpk$tb^vjS!?)4_vs%{*RsJ?hWTQTznf!mSv>=WMkRy lS;S&F^XN7_Qj51AyZX0!CW5)c