From fc404d0cf7c55a1878e25ddf1ad77653723ea396 Mon Sep 17 00:00:00 2001
From: Silvris <58583688+Silvris@users.noreply.github.com>
Date: Tue, 14 Oct 2025 02:27:41 -0500
Subject: [PATCH] =?UTF-8?q?MM2:=20fix=20Heat=20Man=20always=20being=20invu?=
 =?UTF-8?q?lnerable=20to=20Atomic=20Fire=C2=A0#5546?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 worlds/mm2/archipelago.json           |   2 +-
 worlds/mm2/data/mm2_basepatch.bsdiff4 | Bin 1440 -> 1443 bytes
 worlds/mm2/rom.py                     |   2 --
 worlds/mm2/src/mm2_basepatch.asm      |   4 ++++
 4 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/worlds/mm2/archipelago.json b/worlds/mm2/archipelago.json
index 75c098fd..9144dc29 100644
--- a/worlds/mm2/archipelago.json
+++ b/worlds/mm2/archipelago.json
@@ -1,5 +1,5 @@
 {
   "game": "Mega Man 2",
-  "world_version": "0.3.2",
+  "world_version": "0.3.3",
   "minimum_ap_version": "0.6.4"
 }
diff --git a/worlds/mm2/data/mm2_basepatch.bsdiff4 b/worlds/mm2/data/mm2_basepatch.bsdiff4
index 8f3c17c3c7af32fa06906208f5d94058d7c2cea8..d593ef49102c8961ce663ad79e07a212d80b937d 100644
GIT binary patch
delta 724
zcmV;_0xSKX3!@7WLQ_OZMn*I+r2qf`00000-;oi%1R(bS@{!Xif9|buP(pemOpi!C
zL8gEJ00T`7fb|*x2cia>NE#Ys0MVvR0D6X+X`sm2Pf*G~N_v?MsAM!AhyXHZ2AXMz
z8U}y^BTR$Q05oao836S$Hl~>x44PtkjWGceN_i=e(drF7Mt}_(007VfL7)Ht00000
z41fRt4KxR&8&amBf0Wt+FbLBlCP2}EO)_L)38qal0{|lg(?HNL2r@D;83v4oGC}Gy
zb@vlih43>Bbx>Xq;8E1A6cE@SOi^SC192BZIRIM{g1M4H2oq{5pdzT9a9mtyu0=El
z<4xl0+SR#K%1RTO;t#tdp0fTjNgwt=Mz9Jck|fwj5{P69e+`6xm_iSmB!oU-cEFSN
zLP$h=$57%C)nt(UfgnjJRs;YWEC`h1!?=*0Fd{A$)3#A5gpdI4{{iJ$(r4<T8KFTr
z;)57+`3MpT62b@)gh)nXE+EMw%;A+s>1u=#aAiJju?sL0imAml+eZh1ziLzvC|j%H
z=rIyl&_2!Se|V27%ya_ny3ooZ*kqz&k8x@+h0b~e9`<&4cWr^+7y%Ht3}nzHtId33
zGwAM>_7Est$YP`tbP`EKJLHT41Ylsx1uO(p6q#uU1EB-w1OY@X>7Qhxk7grYzEVKE
zOd@st`k(yVnPU9tWR;*<^1RF~WOo{yrEiUhFWG?%f3~n%mAm52@(Mcd!&}sV(Wm@i
zsCv;i<V~i2^lhQV>8oIlfor$v=Mp?pBPQPs#x?L8_apg#zP)+<zciDn_eTXtF>bZ6
z-krBOfm2xNvCoA#CiTF&2fYU~7m$%<GUEiCCr20(qJ~URYw95h;cCQXkh7ElbZCc!
z97eyVEx#QK^sajr9g39ZE*wB04oaS8P0xK{YW~6N>K?>59vYP27ji{7P>>+^0P?e;
G1OEY#OfVV%

delta 721
zcmV;?0xtcd3!n=TLQ_OZMn*I+r2qf`00000+>sH!1mXouh>_DNf9EyDNtDs)4^ty1
zjRu+l>NEfV(?cKzfCip~7$C@L=zuZ}GzOX;r>UlcBV{xyru3(xG-5Iu8X5*nAkm;?
z$j|}$ki^p<$PEmQ0qQhl28^0$(V!U`3`~I&Ns^fX>J2?cfDHfu0MIlV000000002U
z0002fKzczWsD_57e;N}_41)m;7z8xQrb7TAXkrZwF)&OKfif~=$Y{hg!7^aU3$6pA
zxSO?Uz|7(l(4M4nA{45G1Vz!Rh-i>N8IrCUvB5T)5!}JhL7_!T{S`jqA;}*VC)j?~
z(1AO(^v-Em<#9SLP`|8`wm-}X8?2DH%!E8)9L5p=hh%~ce}DkcU=W_LAbh|jyuv^W
zj_JfQ5USV&`H}>HAsHbglGtR0&E>+m1UO`c#dzV<4+cOal6C91fu?^=m#Pq~$_h^u
z7(*AxK#(aG3_z43LNXa~1}T<n45)sVs6i&?Gv@0MvjI4(UaGrj;O;l=3W_BQcP<`-
z5jBj%?B17&e{!tHL@wJcLGczR6Amp4RHp~|HR1uAug4nWfIV@-0vQFNBuS6sK`9;&
z=Sv4<76(w}Crb1POsF1l%z{>24BBFrhD_~VQBy$Y2`6BNFm)ey{Ro+zFzi3%5E-4n
zc*+kcUv|Q=DHx9*XZ=pT@{n5H9wh%F*Y#nm+zmPHe=sl|u*e+^s6nO^S_1{8@q~%<
zQ~!~6+54w)5=oMU$A?wYS_&x_sY7Dp;E_xy1oxi#FMN1|`+jLDQ|^`upkUc+QN24}
za{{)J(}SM~a8c)hbO(AaCNCi(%4NnP0J+V85@H2DLB*Aj!+&zTRWR5h0=Yor1ad2X
z*u|kbDzImLs!hrm)$T+RLP>Lp)?ua|)>po)cK4~@kc6UKBJN113KASZsgVG)qyzr}
DhI=lQ

diff --git a/worlds/mm2/rom.py b/worlds/mm2/rom.py
index e37c5bc2..97e33bf3 100644
--- a/worlds/mm2/rom.py
+++ b/worlds/mm2/rom.py
@@ -327,8 +327,6 @@ def patch_rom(world: "MM2World", patch: MM2ProcedurePatch) -> None:
         patch.write_byte(0x36089, pool[18])  # Intro
         patch.write_byte(0x361F1, pool[19])  # Title
 
-
-
     from Utils import __version__
     patch.name = bytearray(f'MM2{__version__.replace(".", "")[0:3]}_{world.player}_{world.multiworld.seed:11}\0',
                            'utf8')[:21]
diff --git a/worlds/mm2/src/mm2_basepatch.asm b/worlds/mm2/src/mm2_basepatch.asm
index 00c8500f..a43f12bb 100644
--- a/worlds/mm2/src/mm2_basepatch.asm
+++ b/worlds/mm2/src/mm2_basepatch.asm
@@ -58,6 +58,10 @@ FlashFixTarget1:
 %org($808D, $0B)
 FlashFixTarget2:
 
+%org($A65C, $0B)
+HeatFix:
+    CMP #$FF
+
 %org($8015, $0D)
 ClearRefreshHook:
     ; if we're already doing a fresh load of the stage select