From 37fd1ab5ef8904b871dc4a5b68b4ca3989df8038 Mon Sep 17 00:00:00 2001 From: aerinon Date: Wed, 3 Jan 2024 11:58:17 -0700 Subject: [PATCH] fix: Aga1 defeatable in rain state for glitched mode fix: Terrorpin AI code excised --- RELEASENOTES.md | 3 +++ Rom.py | 6 ++++-- data/base2current.bps | Bin 117551 -> 117530 bytes 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/RELEASENOTES.md b/RELEASENOTES.md index bd95dd40..5d8f02b2 100644 --- a/RELEASENOTES.md +++ b/RELEASENOTES.md @@ -141,6 +141,9 @@ These are now independent of retro mode and have three options: None, Random, an # Bug Fixes and Notes +* 1.4.1.0v + * Glitched modes: Aga 1 should be vulnerable in rain state for glitched modes + * Enemy AI: Terrorpin AI code removed. May help with unusual enemy behavior? * 1.4.0.1v * Key logic: Vanilla key logic fixes. Statically set some HC logic and PoD front door * Generation: Fix a broken tile pattern diff --git a/Rom.py b/Rom.py index 376e3695..b4ed05f4 100644 --- a/Rom.py +++ b/Rom.py @@ -40,7 +40,7 @@ from source.enemizer.Enemizer import write_enemy_shuffle_settings JAP10HASH = '03a63945398191337e896e5771f77173' -RANDOMIZERBASEHASH = '65b433946c72953780d82cdc0bb8fe8e' +RANDOMIZERBASEHASH = '3640741f6e51a98a0d2962f6bc03636a' class JsonRom(object): @@ -1300,7 +1300,9 @@ def patch_rom(world, rom, player, team, is_mystery=False): rom.write_byte(0x1800A3, 0x01) # enable correct world setting behaviour after agahnim kills rom.write_byte(0x1800A4, 0x01 if world.logic[player] != 'nologic' else 0x00) # enable POD EG fix rom.write_byte(0x180042, 0x01 if world.save_and_quit_from_boss else 0x00) # Allow Save and Quit after boss kill - rom.write_byte(0x180358, 0x01 if (world.logic[player] in ['owglitches', 'nologic']) else 0x00) + glitches_enabled = world.logic[player] in ['owglitches', 'hybridglitches', 'nologic'] + rom.write_byte(0x180358, 0x01 if glitches_enabled else 0x00) + rom.write_byte(0x18008B, 0x01 if glitches_enabled else 0x00) # remove shield from uncle rom.write_bytes(0x6D253, [0x00, 0x00, 0xf6, 0xff, 0x00, 0x0E]) diff --git a/data/base2current.bps b/data/base2current.bps index 82ba7e59286cfe2e14a4d035c37e95edf38084d6..89a5327e66be132ab6071f7ca07a42a72efe78f2 100644 GIT binary patch delta 2796 zcmW+&2~bnl8a{s(LK2n;2$9W8L<9r`3W~_)(t=B^3km@gr=o&ru~^Zfg%c!5q7le7 z97BYwLS!oqn$d_LfdC4&R$e=G9N%cIzL`h+Y)PxNmD=XrcIGbM_nq(m&-ULl*VHIz zY82G3fgdify~^Q@ZeI2&&EqcSpF7(wyF#aO6NH+&_8-zNYh+p)b90=()3=A7*2!L( zpK_Zypf+QtXn-U1Wx-;WObLd8eRT=tJW$g-w*lB_9(G&k46WuLy}fwwtC{0>ivucp zA|M$a(1O4%Z0NSYdmuMQ&fU(382VK317UgXwIAxCSVq(P=MS*9@Q_9Dy*VdjNC^3~ zU-W;VM;j9f*XgL3I5zRln0SB`vp#mj6-v$9(y}>lmcF(k3>f;!3jc`h_uHmS=g0eh zdNBPcuUeDme825T6*H<+y5-g1ZyQjYKJ(8Nq1NOL(4i~mLA!a~%J>KvqN_?az}M!l zOS(A_Y_2Tj@PgiNYOnX{FY~2aGfM|ac#KM-P+%TbG)u5vGqXcBXueqXIY1m;cH|MH znlnFMt%0SM7AF`?g8gLMN{GuUaFMNlfQt)U8Y^QNeMXpMLSpC9iLUq&C|wG}1R_!K z!?Pk$m-UzXZ7M*M0W*(d4_*5;&-UuH_2vDx8EFwZr$p=%GCIvj$thHFJI#hD@@6H> z2Mv*}f)muDw@>ERZueIxvHe--UhH!sBH_e^NfF>D?0ug2k%?8%%_-eT%HD<+PI@5m zeg}SnQNmA$Q0Jir%r^q{2Z>Jy3hZQSI?Ux~kSayBr92%B0+);irL6NM7PF>mOVE43 za6=7FsP3wh=_HP}b2=r(o$gAVAw|qCj2Gc|6YjAlWxZ45f_?ucPd7nPd~&GNDwG?Av7Q?d4q*V$Ma8nn=jrEpSf!KN@=t@#|LMyT6cGTfx`W{S2N% zYW2ZqusbzF61Kv^AlC#Q?ioY9f+=Yc7vW#khFDfnaG5FvpRO{9b4m492$A~hXy3hf zY?+CJ+b6{~$@xm^RQ>IB{=~KwQaLMO!R^%^>)iWY7n5poEH0kTC7DUeCd$YDF|A}{0+B7URq6;noiZxUr8 z!8x#?(xUG@z;N=tv2xUlnN#GA^-fep=a?6x&ADz&V|Xl?@?xrpgl*DQv+Q@T?qt^f zPmID@>pUMbr<78msoLy}Rh@5|t!s~Y;{MX3o>&#p!D!_&d@=^>gDN^BJJ>X(3QcuT zMKRewTdxxuMH6lkM9Py-X^iJ57F(RM$b%e^&3dDs>E#+xaVJ1=Q5stJl!$X77W_y` zF63~RsiG~0TwuWY*m4e5a7eOc#Wv`55iMEJ;I+$iaPzrUmN!Lk#v@>!n`+qk0V;bb zK!CztauH(j8hj|}TR*(d(sPVG93-=nPZ>8BAc2Ezgw2NCmPen!XGyNKcbW3aPN|}# zAv6#Zas#3&OO97Xq9J#?>(DH_a7be3_Z>Wr{Y@fXMTfyTmY#6=8&0J4@}x!e9er~Z z-Q_dHf3*T|?}kcya2QOAOe_lHOuAuj*}Up&ov4oGSR~Ui9?7FUp@kjky>lsP!hd_uRyZd1hn#hs?SeRTHAA@@eo2BBZC(e^k zs=h+q8(2j}xk^cHVJg-~yGo0oIr{boENPI4S<$d`k#%QZ=UM_X%B ztI%JlT~5-h5akr?>Vla)%NcJfZ> zrn8^tJkRMW9gv0*LgAAxzWn0z|| z;owO`qwp?Y1_pWq$r}Y<*hdbJ!rWltVT*2O$&=}!Z%NAR>kW7i4@$I4Bk%^*-wgBJs@t#}UWlrPFg9&c8Vyu033PPe@#E zK_tk?vRmNKPA2;nyd@Nc-cw0Yk~x5!xdqA~r(`eO_0hp@?Vb!q^$GgJynCSQgA9h= zxcj=QAN8B}k;K~&l(=BoJtoQTUX$DK4x~Vq02L|7RcYNa zuJnf`x?yX0o*TBUFV8Q`1qryvHWPw46xB zA>T7renaDe0+Fp=hXkksX6lz^to=B?R*zDV5As9SO>0z462(^Z z3-lU2KvT$?$})1GSd1H&9KEdj6CFjr{oa@;{mzijYK9#??2sQLJrdA~xW%)etuDAm zTiaS3|1KLe=Ur@5x5~7NY1;Fafc;Y#B))fG4!D!JJFp}@vG}^8k}kpBN6%e4+qx@z z5!U?0ZZOGQtiN)GE_9!b>w^2q>T1QC&ta9?;*qRYB4j{HJ%_WfsSl9@kBC*h{(E#t!lObUZuSN+Oq;U8fJ()Cn-oXd$Pt51X z27Y?@{Bcf&DktDU`%$^!mPX-`V|>s)D647sv(Bqh<$O#_l0#t7l9s$=9^9nm#T(&M z%ioK;STM&@Uc%x8=QMSweFqNv(QO$eH%LU3QXrFI4wf|wuue6-Q*5=g9{vzqbOKLt z<7e$pMfCook0HU5c5ICb-t5yl!HrlrNwy@z;-XYz)C4a-oZUR>UX-t0R;)7R7wzVY zH$23Q(QZjn>r%r7;{rQ}j&aA2LBY=t=efETJ!*7y?X>bfZ&w1E2$=qA(Ysfsa%?Ya ztS+CoPm2oBIR#>RNHtlIf|ajen=JZmWHK4%Kr3-t1!t(N)n{`ncg&V4u>BiJA@)6! z8GYux30J_AOgm3jlkQc}#hRT?q^qHYbufTTuZExC2KnJFkT_qf!(1a!Q)E^OQ1Fz* zq(BfiiO6MTeLGS>&*LZ6Da5854o=R^^n8PrBro{I$lS4tD|>{cK#`G z>KW;1y)`Ys7t4HV<*H3})LObyV`MANS2zvtA$T+R#?xwQm%`wD$#U{)GbbERh>RQs z9oVX{yBbp7(_j%LmG7i~=yL7QoU*;MGdIK6A;BE4>m*K(p~*BZj(e* z|GM+KeI(q0E*cR<(+ZZ6#}Ec}8oA+~=wiQq@wH|a)kiCkkx%?dL^`whsPYvtWs zBZo>N*%>eo%1C7fh~XOP%78GKBA;YHi6F|a$=K7wX?4M@R@W-RAsJiXoZG)?>^;P- zU4`#GBfo6{KX;b~Jd0H70voU=^$QVa!rWkp=HTuT)WdrsDqtf#RizJO6dBtfmvL#i zzFbQ7XF`}rsGUgXD22#MN6bR2t>jq1*) zQ;E(VR<*X%Ttf1My4M2h0i5@1cMsZiNsh51%>%+k+Hth236* zT3RYM^3Vi3ZBT2PAu)5vllEY@_0$~S5{E?RfmJ9MjrV`HYNP{y|M)$ch|UlIml zL0fq!3Eu_*0q=x)WBr;_GEco*SyP?eiJIBi70A*nA6-CgA!OG!2o8~~wCgZTkBv>b z*S?@f>JKeAt@B4c?6hf(emOQV>sOEt#&H8(d)m_8lI3$+X%BnU;hFxkE|OZ98c)shzisf`ziAEH3-ZIt+--BwLKflv8z~X@Q%CHEy+J? zLMS`uGmKJS?~YluzOoH>|N2PcwzA7*M?`epO7o2sH$u zkWN+)L2ks+l-Cz_an5L-Z+j+vChg4UoT0Nr?~&Mud#VIxbG8}{!YC0%wiT0)hCl%^ zB;zJ?kSx-66GFVAlkVCAQ&b;-2!UvFXBZ;DhfEE_`gKCk(>Wo=D-9aNLSi(d zDQ@M6f{nDXjET1z_GdRJ5sKFrozosFH7odhZTY^-EzAAQ+Cop6jML_Jq))S}c=Gws z*Cc_cZh)hkdXtsA*aH6Z2vQDjW{F+@L_XEtk+Eu)%l3 z?)mt7fa9p+tL4vUIh=oWK2mw4^1d5+H3IVkLsNY4&8eva_E)dY{r<^d~>9wm6b}8{Tx`OYSR0DAp20%5Q@r*g4J{cOE*}RiBq?P@Y7;S@sTg?oTz)oA+K- z4xj^C8Ux1SA%~sZXq+S}B z8{>hk^Kv|}Et&g1ok#E}#DkO!G1K^EA8=!CycZwW+0iumueqrdCwAM!n9e4@jY96s z#aY)>d=!XmY7OF{GNfu-LiUZpT1X;S$6%rO7}pmobCH8BTbd!nwl^ZG>X(;{%U;kC zR@E>%g$zZ+WgJeHN6z=cwweL|{#rptr<#5RN zw(VQ8o(Y<@9^0zg#Pzc0^vv5l=Ere^aPPn@m_dT>z_OIsqN}oUx)^trp1aW4mbYyo zR{g=Gon$Q4U232UJ$-O(=m1$$A^ZJ9_NuBr@3<-jLe?XB9+