From f3b774ad7f67411fe6781da9c184f39119651433 Mon Sep 17 00:00:00 2001 From: aerinon Date: Mon, 28 Apr 2025 12:34:19 -0600 Subject: [PATCH] fix: attempt at fixing moth conveyor room timing --- RELEASENOTES.md | 1 + Rom.py | 2 +- data/base2current.bps | Bin 117954 -> 117959 bytes source/enemizer/Bossmizer.py | 4 ++-- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/RELEASENOTES.md b/RELEASENOTES.md index 3fbbb257..fc754596 100644 --- a/RELEASENOTES.md +++ b/RELEASENOTES.md @@ -1,6 +1,7 @@ # Patch Notes * 1.4.9 + * Attempted fix for Moth conveyor room timing. THank for many people's input. Unsure if Helmacopter is still acceptable. * Mirror scroll will show up on file start screen if enabled (thanks Clearmouse!) * Fixes for HMG by Muffins * Various fixes for Enemizer by Codemann (gfx fixes, more randomization options) diff --git a/Rom.py b/Rom.py index 04b08fb2..0961df7c 100644 --- a/Rom.py +++ b/Rom.py @@ -42,7 +42,7 @@ from source.enemizer.Enemizer import write_enemy_shuffle_settings JAP10HASH = '03a63945398191337e896e5771f77173' -RANDOMIZERBASEHASH = '403d349584246fd845c3a9c78a55b3d4' +RANDOMIZERBASEHASH = '54eaa40cc69c54b9d790b9c4ea107f4d' class JsonRom(object): diff --git a/data/base2current.bps b/data/base2current.bps index 0292d6f7bd5188d22f912d6816b65e3388782b64..d0cdd7d679a902d0d1b30607297ef54cbdf0ebed 100644 GIT binary patch delta 1291 zcmWNNYfO`87>1t*YALqVic~7dp$Nh_h?Q9nsKA(rb0```L;_53tH-MI00GAP0Ts&p z5cpPK0in?{h*pBJLC`9Na{NFC`fKxtbD43D7{L&xZfMtk_jTv`ap$(zyA9X7-Ewgi zocfOyScI+u1OxEC$pa$-A$bFpTRLi4r+VahE(|ojX^Hfnd%EhQY$4-kz6}t(aa4p(Y zd}^81nq4r$a`jY@00%7tXRo_pQrYo>uHyxGAQ5Njj+u`tYq z7~)_9gn?c57bja>-sZLWZO4{4AXFlzslDipAym_g2R(|?M(Zj&s`T&)+KTDZUR>dp z>>(jWaWP%chXtsn`aV=)F17aI<#3x|bKH#C9@t~mG+%?f|S#ydCI zs|`RP0alt8(qcR6Fq69W<8~~hyZUjN=k_li+WnLDb@PhOGiy!TNTZxq^y5Ld`O%9= zA~{B9`f;r+-p7j=3r=0u%c9;Lit=1|@RaL)KGoR3e!~e8i z;PR-?Ao}@dYtx8<0XsYd`-Qq=1%}!LC;fb5S%|wS_8_S7F3(E>C`aB zxUUEs*DGLyC4okaU^#}xzZ+t!rzQexYlDJAyAc{e%t3>wMfCM=>ycvSinpAZw8 z?}V(?3GMbE!l`I0kJ*dT_T6J8;1Bj11GvEtz?$|_#VCG-c{FzvqnG&# zy@@^>9Ij0I?#09&8eUbm?iA0=aN#z#AIiY!5lTBpv1rGxC{JRqw))<^C~Lb>!|mC> zm>3o6A=Vpw!M69X)tD0~Ax$&z0e*#7V9Rw9^*SmhmqJ!q4IiNp-o3xHUhzkxtFvnq zC@2|2xp09x#c9#TF^s?%Iy{DJwqzaYW=c3MF&AEGy=-#d7fskt-~hT?U4Q#0P9l?& zi@{d9wVat73;D9DOTDp52Vh&GkrEnwP)eGW-<36FO?%VL5AlpB#@5xWvRQ-w2RxPx AH2?qr delta 1290 zcmWNPdrXsO7{#BbR4!7Wa%%;-qacb>QA8Ahp#hv2G>QV7#0!ET)C(#I!uxU2mRUr; zl~+LMMjcKncCk?ywOoo^3OdlmWLp+=(M&W(Fbu^_{nr1^?<6OAa-K6(Z)L2v`iW=3 zkLG$nXKBF~_qJWXNKW{l$#t>^p{!HiS>5G`6 zTjLdGX>&$)=T!~n__A#N;=A~al`L6_FLnEtsOMuRJ5Lgf{cNaYHQv-^N!D+~QTD1d z34hhiN;N$6*L{E7myg}Ld#A4RFseMSup_S!_s8NJ`tU9uTkt2ChBf?hWeS>>j=QQ@ z15GiY_jctTG~F2YP+d@JkqMg?wCwx3y6Me~pzJM}EcL%D{LwU_p$a*eu4?8KmS|d} z47=kA9BPU)(o( z#>;Ex6`y0m)nAfED|(?HGpveNIFVSAPUreDT)4{3nW%D(-5#v&h{(RJ4yDoe@Sgjb z%$LnJF5j>LQXf)P)o-6QpU{}>cdZxLWa>459=M%G4xq>~ydar0?xU##=!aWr$p8l7 zQhI#=4=+#6=#m3OHRfEY%P-Pa3Iuhfxwo6wxohjP9T-W~DWv69hUiA792789b zxsblu*`w2Qb5}k-TJagd+~zC2SNR`>)#~l^pCJsj@eUl5i(!KTiUsK*Fy!DN~>f-C*(EJZ|~ z4x9zEWv44K1_V{rt~+jGX4s$}ML(2-s&onM8o}c1O~H=DSgm*e`J(VzTMZkR=1NrJ zut9|g+@WW8wqCWv+q~-;_yE7bB=qbu6SX{IOX?P{(knkf5xk$PixB_ScrwS9G@cTf z51xQ}uwo-fv(v$=7yZxG%G4N^Xb#cuMsXP~ruRp2ZCp}LCsWEwiKggE>t%J(o|Q!L z+5BX>GpzpBw`_@n3%Tg8rwJ9z$5GLys*b?Os!D(!+bnxRT{G-SvrlGu!`|soy5&Be Pv|j!E)~3fT`40aB&|e%t diff --git a/source/enemizer/Bossmizer.py b/source/enemizer/Bossmizer.py index 85b8a3c2..6c262e38 100644 --- a/source/enemizer/Bossmizer.py +++ b/source/enemizer/Bossmizer.py @@ -110,8 +110,8 @@ def add_kholdstare_to_list(sprite_list, room_id): def add_vitreous_to_list(sprite_list, room_id): - sprite_list.clear() # vitreous does not play nice which other sprites on the tile, just kill them - sprite_list.append(create_sprite(room_id, EnemySprite.Vitreous, 0x00, 0, 0x07, 0x05)) + sprite_list[:] = [x for x in sprite_list if x.sub_type == SpriteType.Overlord] # vitreous does not play nice which other sprites on the tile, just kill them + sprite_list.insert(0, create_sprite(room_id, EnemySprite.Vitreous, 0x00, 0, 0x07, 0x05)) def add_trinexx_to_list(sprite_list, room_id):