From 69ff38521ed84dfb503bb59bce3d86be088aa4d0 Mon Sep 17 00:00:00 2001
From: codemann8 <codemann8@gmail.com>
Date: Thu, 5 Jun 2025 19:53:01 -0500
Subject: [PATCH] Restoring water floor in Arrghus' room in boss shuffle

---
 Rom.py                       |   2 +-
 data/base2current.bps        | Bin 136391 -> 136415 bytes
 source/enemizer/Bossmizer.py |   8 --------
 3 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/Rom.py b/Rom.py
index 41ce2b06..42540d7d 100644
--- a/Rom.py
+++ b/Rom.py
@@ -43,7 +43,7 @@ from source.enemizer.Enemizer import write_enemy_shuffle_settings
 
 
 JAP10HASH = '03a63945398191337e896e5771f77173'
-RANDOMIZERBASEHASH = 'f1979456c6fc9e3a3a826b94a8065c64'
+RANDOMIZERBASEHASH = '516242b1897da709d9bad09e99d55819'
 
 
 class JsonRom(object):
diff --git a/data/base2current.bps b/data/base2current.bps
index eaa71206a3d6c819e1dba7d9595e0406b51a0685..16f98477b08fbc8432a0d00511c825f51e8b3075 100644
GIT binary patch
delta 1152
zcmWNPdrXsO7{#CODVDGHLTM`nD_{!>f<V=I!7-uJg*M1E8zSq}IUPa}6_km{Sl>>8
zwpw8QR$isjnsloJUFvAGYG<l7VHY*9EW7=KF59A8Oz1-5UBC6eb53%SlbqkTBkY|K
z_I!aL$<g{@U#M81$v~woR5gzgFxR>2>}-_VLwmDZ8Nq<Po%?Hk8>SV7%-Zo;$?PXi
zUA*@qmz%d-bi#J=-vMT~?rUyG-V7$&LYwnvW;1_tRm+N)IM=bPjQz!SQ9?e|-3nb@
zmQlex4*h!I88WYjemXcMWVRj|>k5x`F_K<J6OJa~btY#I!T$3bEhB>AYtr4(iHE~+
z`CZYZB%q12fzx+|lQ;t5<3c>fFcmbN#jF*Ti;%d>p$zgNCcnqY(~h1|z42eLvK$Dl
z6HCZ&91cMgrhtCww%wOc$|py^^R&`t7VD*|x*uG&pu-L?;f#q+u~;lr$t1+LnJPqh
z7*S38M5t#<XjFtJ3U(Qv1a>C%x~J<Nm>-x&8<ToD(}LTypzyY{0xBTZ=LP}>(EGPi
z>ul`C{N<DtV>MGrYsHwO$Xa?UmSwcNW_{FSUFEMLp7-f7F_sr^TkxZI1LKaZXWS7}
zk&=uL48Gm$I>~|&Sb*5ZW>-M0>haZ<D9Kt<N*{}HRjNdzB0ll{3*&uZbJGRCw1OHW
zctcau_>WgK=NQMdXo<sdL)JK(P(#zhz;RAbv!$4cg)MZA6w`!?j#}b*m71lPg9|gL
zMT(11FrSV}v2pP$yRO&)%00VJ4YqX#yCsrA%bp9~QcZBMDaC3{@^`d{-8=W)oxXO5
z7SlB{R5J%?tqccJ^S3|$;u1fPM_xTGpQf4h^pOlR^-Xzc<SOvM2YH^4^ABc*|D1cz
zm)AarShI&#zI8vSOUQ1X=PbT%ApUB)E(PCI*X$@FS2OuT{8Z_52G2fX+imT(oAq=g
z1&dK(q`#-21`EyfVG1r09nPPyr$brDK=pDwsy+Ccij1}$IO}RK`s`isEVS#J(Y;0=
zXK1)&k3b}}h5jr@?P_(|gm3Y@iJ`eBZy?p=9g-TlDbo||SZ{aoV1;m|oz`rzyJW_(
zNXDx&5}mtMMq+Dco#Qr9eJYkSM%t2!T8*hyOz1jg0`fRKg%`o0PGa~frXyUkke*A$
zZ7QAlic<nv5F2nqGJFh9e@-RMQlN>^(?$iB=o*A-Vt)^Kfi-ti8j0l<I9#RszqihC
z1ySb>I0C+R=w$_VHDwhmNUSfSx!f;5GdjR&x1<qY`igO<8Z;2y+!XOG)+TtLfhX`A
z+=pmM!qM%`Vlud3X~g{kI^ogd!PV)1cs3+5&&Kq`;wd-@$=qt<Retb!e{PS<=6`oZ
zb)rO1E3uHV&|6AeX)I{IWVLYn$l1<QffN3mnj+$SnfR0Hme8@!xH|b9(w`flrlZ#9
sH(S>^!nnrK4G^twlo8reFC$)U!;ztFamzkhrNTCL>ghsTU3kp%Kl5t7*8l(j

delta 1099
zcmWNPeNfYN9LGQ34^NwWU}G>~6UHWp4ndR>Aw4C^#sOJr3QF1qDyfMNh=?NJsmL~+
zz<$k-La^&*m{f=7PDkxzIy!n#Qt!IU`UA7N%RIYLlxC^F_TT&7ckjE`-TQU>tmKQc
zl5^&$Xj#i&?Y_JyeJVcg@Rd(zQEX7CG#K!a&9}|4gT=TiJMC`@KV>vx)nZ?jaV#b}
z@u0O&$jW|JYPDUw*TuG&dW72SDV*%^Rn3~3#=a3M3Ub-^LQBCSNzist&bv()d?N*^
zOW7UYtzG{i%kh2NG!e^|9rCsMeXUI1!J_?_qwxxpt2uU_d!_AcRNrNV|8y)KWh{a6
zC78}qX}JXTI<rj9`zE0of-nK}q1$#>bwhPy@XOv(IxN8rijAwkcG-p;c6bVB^z=Z2
zd9fQ6a_*T;W+}GdN-YgYF`qH|PKqbZ3oVZZYNI>c;i~&<?yniFkM0okS>v?dJnmcy
zOCfaJ4ID}!-#eF1O~ZC<d4@7%SQ&xYCc_yC+vi;irCaQ-nEgkr3%%vMw}8AdT%yR&
zy4k;+xkDAq9ne!)hPt>}b2Yq_%Sa{1h3a*>MDBTG$Az)u{yCd3c-JqXYB`STXV(AL
zFHJfstY|QDhhtP(KaEq#<_81E1f)U*rlq$wtm1Afgy0&4j=A31>+UXrgAhw~&8v8?
zf_5r!1~#V<DR4HvZlI6?>sc)2DAABvzQ^ybZTK;K`8I)exSNmg5tXZG4u3xbGQbF>
zuzd7I+NQ)Vb<6t49}J7rMHG|6sxURwQG7h6<uA(C@=G9sI3$YVq<DX-?`Pewp1n;;
z+-m44eC_T~V<fhVqR{4P2ktdcO+3DwJoBwweko0C7AK0rsiNeeWRGo+?P?)iiN`#w
zdx`#tM?JPylTwBAq!qKS+f!hXPeT?J9%dFAS7EYLvuW5KfPgQLepjKf`0eMedk*NY
z_vp&{2h?T#J&KZcVn>F`E9_1Ytl&?x)65#XOKCYD*ix+I!L2n)9x9FbSjZ-e8kaB~
z+0<y%>vzaFX*CfyC*fasGSst=mwXa3aiKbfK3C(q#K!8+oN`EqP?sCx-~c$iyO+^|
z1T14nJOSsLiei(weLaX#)~1zO9?CX5Ttz#-vQ7!+pmP)sfhUJ<CSYsZ_S^&>Iv&t}
z+NnA-*d^>*tL2`Q1!K-+&_i(b=78rwMnvf;cm%iLE(DoT&T0Nu89$LVKj3}>`{3a}
zCyG<<^co{wuPG%$JOQU5PAKO6n!3}SnMYhUZ|;K1$VgYoLk_RWWep3Ou{diYjr=(d
zG_FA{dzF6CV4-FImSJm~(7-?1_ujxs@9q`3-1#)}DVgTc`F91gDv5Vy2B_??_3_ox
s7aabTiyiF%!NPhar{^~)dB1Vfp`LY<YqwKvA~s6O(|?%yyX@ZJ|33Jry8r+H

diff --git a/source/enemizer/Bossmizer.py b/source/enemizer/Bossmizer.py
index 2ddcb7b4..7b10262e 100644
--- a/source/enemizer/Bossmizer.py
+++ b/source/enemizer/Bossmizer.py
@@ -148,8 +148,6 @@ def boss_writes(world, player, rom):
     rom.write_byte(snes_to_pc(0x368102), eye_number)  # enemizer flag
     rom.write_byte(snes_to_pc(0x1DDBB3), eye_number)  # loop variable
     data_tables = world.data_tables[player]
-    arrghus_can_swim = True
-    water_tiles_on = True
     for dungeon in world.get_dungeons(player):
         for level, boss in dungeon.bosses.items():
             if not boss or boss.name in ['Agahnim', 'Agahnim2']:
@@ -159,10 +157,6 @@ def boss_writes(world, player, rom):
             # room changes
             if boss.name == 'Arrghus' and (dungeon.name != 'Swamp Palace' or level is not None):
                 rom.write_byte(snes_to_pc(0x0DB6BE), 0)   # arrghus can stand on ground
-                arrghus_can_swim = False
-            if boss.name != 'Arrghus' and dungeon.name == 'Swamp Palace' and level is None:
-                remove_water_tiles(data_tables)
-                water_tiles_on = False
             if boss.name == 'Trinexx' and (dungeon.name != 'Turtle Rock' or level is not None):
                 add_shell_to_boss_room(data_tables, dungeon.name, level, 0xFF2)
                 data_tables.room_headers[room_id].byte_0 = 0x60
@@ -183,8 +177,6 @@ def boss_writes(world, player, rom):
                 if not world.shuffle_followers[player]:
                     # maiden is deleted
                     del data_tables.uw_enemy_table.room_map[0x45][0]
-        if not arrghus_can_swim and water_tiles_on:
-            remove_water_tiles(data_tables)
 
 
 boss_defaults = {