From 8ee743ac8a1e782e7bdb36ccff4c9078a4d77cf3 Mon Sep 17 00:00:00 2001
From: lordlou <87331798+lordlou@users.noreply.github.com>
Date: Thu, 14 Sep 2023 15:49:11 -0400
Subject: [PATCH] SM: 0.4.2 fixes (#2175)

## What is this fixing or adding?
- fixed failing generation with disabled layout patch by moving door_indicators_plms.ips to AP instead of the base patch (reported at https://discord.com/channels/731205301247803413/1149509811529072751/1149509811529072751)
(part of the fix is in the Basepatch with this commit https://github.com/lordlou/SMBasepatch/commit/46bbda980cd6eec69c59c71355bd3f975b827456)

- fixed broken map data saving when using fast_save (reported at https://discord.com/channels/731205301247803413/1138163133089849344/1138163133089849344)
(part of the fix is in the Basepatch with this commit https://github.com/lordlou/SMBasepatch/commit/54a82774c9287274bdee70da8401d14d8d3720b9)
---
 .../multiworld-basepatch.ips                  | Bin 19126 -> 19144 bytes
 .../data/SMBasepatch_prebuilt/multiworld.sym  | 315 +++++++++---------
 .../sm-basepatch-symbols.json                 |   5 +-
 .../SMBasepatch_prebuilt/variapatches.ips     | Bin 35247 -> 34458 bytes
 worlds/sm/variaRandomizer/rom/rompatcher.py   |   4 +-
 5 files changed, 167 insertions(+), 157 deletions(-)

diff --git a/worlds/sm/data/SMBasepatch_prebuilt/multiworld-basepatch.ips b/worlds/sm/data/SMBasepatch_prebuilt/multiworld-basepatch.ips
index 0455364d8a7b68251975be054fbb7e8ffbde4791..67863bb9f00228aee09d1c8257bf41cbd17e8a90 100644
GIT binary patch
delta 62
zcmdlsmGQ(>#t9P`uTGp8q_aMVvrdVjp%FxDGIOokuie;~8OFFO!$Xtd|Lgfo3<VjQ
R{~6{pFcc`MZ~VK{69E3l7#08k

delta 45
zcmV+|0Mh@+l>xSu0g#XZ!;z6v8Yuw(>y4iWXh<pl0F8?WXs=QUej)&Xfg%;N4*|JJ
Dv+xmV

diff --git a/worlds/sm/data/SMBasepatch_prebuilt/multiworld.sym b/worlds/sm/data/SMBasepatch_prebuilt/multiworld.sym
index 2d231bc8..470b7a8a 100644
--- a/worlds/sm/data/SMBasepatch_prebuilt/multiworld.sym
+++ b/worlds/sm/data/SMBasepatch_prebuilt/multiworld.sym
@@ -2,7 +2,7 @@
 ; generated by asar
 
 [labels]
-82:FA23 :neg_1_1
+82:FA35 :neg_1_1
 B8:83C1 :neg_1_2
 B8:85DA :neg_1_3
 B8:85F9 :neg_1_4
@@ -177,7 +177,7 @@ A0:FE00 setup_music
 A0:FE0B setup_music_quick
 A0:FE94 setup_samus
 A0:FEA5 setup_samus_normal
-82:FA15 sm_fix_checksum
+82:FA27 sm_fix_checksum
 B8:8800 sm_item_graphics
 B8:882E sm_item_plm_pickup_sequence_pointers
 B8:847B sm_save_done_hook
@@ -192,7 +192,7 @@ B8:83F4 write_repeated_memory_loop
 
 [source files]
 0000 fe019f55 main.asm
-0001 91a745e3 ../common/fast_reload.asm
+0001 be17692f ../common/fast_reload.asm
 0002 06780555 ../common/nofanfare.asm
 0003 7a8904b6 ../common/multiworld.asm
 0004 f7e9db95 ../common/itemextras.asm
@@ -200,163 +200,170 @@ B8:83F4 write_repeated_memory_loop
 0006 dbfcb38d ../common/startitem.asm
 
 [rom checksum]
-f95f09a7
+979ac031
 
 [addr-to-line mapping]
 ff:ffff 0000:00000001
-ce:ff0a 0001:00000012
-82:f990 0001:00000016
-82:f991 0001:00000017
-82:f993 0001:00000018
-82:f994 0001:00000019
-82:f996 0001:0000001a
-82:f999 0001:0000001b
-82:f99c 0001:0000001c
-82:f99e 0001:0000001d
-82:f9a2 0001:0000001e
-82:f9a4 0001:0000001f
-82:f9a7 0001:00000020
-82:f9a9 0001:00000021
-82:f9ac 0001:00000022
-82:f9af 0001:00000023
-82:f9b1 0001:00000024
-82:f9b5 0001:00000025
-82:f9b8 0001:00000026
-82:f9ba 0001:00000027
-82:f9bd 0001:00000028
-82:f9c1 0001:00000029
-82:f9c3 0001:0000002a
-82:f9c4 0001:0000002b
-82:f9c5 0001:0000002c
-82:f9c8 0001:0000002d
-82:f9c9 0001:0000002f
-82:f9ca 0001:00000030
-82:f9cb 0001:00000031
-82:f9cc 0001:00000034
-82:f9cd 0001:00000035
-82:f9cf 0001:00000036
-82:f9d2 0001:00000037
-82:f9d5 0001:00000039
-82:f9d9 0001:0000003a
-82:f9dc 0001:0000003a
-82:f9de 0001:0000003b
-82:f9e1 0001:0000003d
-82:f9e2 0001:0000003e
-82:f9e5 0001:0000003e
-82:f9e6 0001:0000003e
-82:f9e9 0001:0000003f
-82:f9ea 0001:0000003f
-82:f9eb 0001:00000040
-82:f9ee 0001:00000040
-82:f9f1 0001:00000041
-82:f9f2 0001:00000042
-82:f9f6 0001:00000043
-82:f9fa 0001:00000044
-82:f9fe 0001:00000046
-82:fa02 0001:00000047
-82:fa05 0001:00000048
-82:fa09 0001:00000049
-82:fa0d 0001:0000004a
-82:fa10 0001:0000004b
-82:fa13 0001:0000004c
-82:fa14 0001:0000004d
-82:fa15 0001:00000050
-82:fa16 0001:00000051
+ce:ff0a 0001:00000013
+82:f990 0001:00000017
+82:f991 0001:00000018
+82:f993 0001:00000019
+82:f994 0001:0000001a
+82:f996 0001:0000001b
+82:f999 0001:0000001c
+82:f99c 0001:0000001d
+82:f99e 0001:0000001e
+82:f9a2 0001:0000001f
+82:f9a4 0001:00000020
+82:f9a7 0001:00000021
+82:f9a9 0001:00000022
+82:f9ac 0001:00000023
+82:f9af 0001:00000024
+82:f9b1 0001:00000025
+82:f9b5 0001:00000026
+82:f9b8 0001:00000027
+82:f9ba 0001:00000028
+82:f9bd 0001:00000029
+82:f9c1 0001:0000002a
+82:f9c3 0001:0000002b
+82:f9c4 0001:0000002c
+82:f9c5 0001:0000002d
+82:f9c8 0001:0000002e
+82:f9c9 0001:00000030
+82:f9ca 0001:00000031
+82:f9cb 0001:00000032
+82:f9cc 0001:00000035
+82:f9cd 0001:00000036
+82:f9cf 0001:00000037
+82:f9d2 0001:00000038
+82:f9d5 0001:0000003a
+82:f9d9 0001:0000003b
+82:f9dc 0001:0000003b
+82:f9de 0001:0000003c
+82:f9e1 0001:0000003e
+82:f9e2 0001:0000003f
+82:f9e6 0001:00000040
+82:f9ea 0001:00000042
+82:f9ee 0001:00000043
+82:f9f0 0001:00000044
+82:f9f1 0001:00000045
+82:f9f2 0001:00000046
+82:f9f6 0001:00000047
+82:f9f9 0001:00000048
+82:f9fa 0001:00000049
+82:f9fb 0001:0000004a
+82:f9fc 0001:0000004b
+82:f9ff 0001:0000004b
+82:fa00 0001:0000004b
+82:fa04 0001:0000004c
+82:fa05 0001:0000004d
+82:fa08 0001:0000004d
+82:fa0c 0001:0000004e
+82:fa10 0001:00000050
+82:fa14 0001:00000051
 82:fa17 0001:00000052
-82:fa18 0001:00000053
-82:fa19 0000:00000013
-82:fa1b 0001:00000057
-82:fa1d 0001:00000058
-82:fa1e 0001:00000059
-82:fa20 0001:0000005a
-82:fa23 0001:0000005c
-82:fa27 0001:0000005d
-82:fa28 0001:0000005e
-82:fa2a 0001:0000005f
-82:fa2c 0001:00000060
+82:fa1b 0001:00000053
+82:fa1f 0001:00000054
+82:fa22 0001:00000055
+82:fa25 0001:00000056
+82:fa26 0001:00000057
+82:fa27 0001:0000005a
+82:fa28 0001:0000005b
+82:fa29 0001:0000005c
+82:fa2a 0001:0000005d
+82:fa2b 0000:00000013
 82:fa2d 0001:00000061
-82:fa2e 0001:00000062
-82:fa31 0001:00000063
-82:fa33 0001:00000065
-82:fa36 0001:00000066
-82:fa38 0001:00000067
-82:fa3c 0001:00000068
-82:fa40 0001:00000069
-82:fa43 0001:0000006a
-82:fa47 0001:0000006b
-82:fa4b 0001:0000006c
-82:fa4c 0001:0000006d
-82:fa4e 0001:0000006f
-82:fa4f 0001:00000070
-82:fa50 0001:00000071
-82:fa51 0001:00000072
+82:fa2f 0001:00000062
+82:fa30 0001:00000063
+82:fa32 0001:00000064
+82:fa35 0001:00000066
+82:fa39 0001:00000067
+82:fa3a 0001:00000068
+82:fa3c 0001:00000069
+82:fa3e 0001:0000006a
+82:fa3f 0001:0000006b
+82:fa40 0001:0000006c
+82:fa43 0001:0000006d
+82:fa45 0001:0000006f
+82:fa48 0001:00000070
+82:fa4a 0001:00000071
+82:fa4e 0001:00000072
 82:fa52 0001:00000073
-80:a088 0001:00000079
-80:a08c 0001:00000079
-80:a08d 0001:00000079
-80:a095 0001:0000007c
-80:a0ce 0001:0000007f
-80:a113 0001:00000082
-91:e164 0001:00000085
-91:e168 0001:00000085
-91:e169 0001:00000085
-a0:fe00 0001:0000008a
-a0:fe03 0001:0000008b
-a0:fe05 0001:0000008c
-a0:fe08 0001:0000008d
-a0:fe0b 0001:0000008f
-a0:fe0c 0001:00000092
-a0:fe10 0001:00000093
-a0:fe13 0001:00000094
-a0:fe15 0001:00000095
-a0:fe18 0001:00000096
-a0:fe1b 0001:00000097
-a0:fe1f 0001:00000099
-a0:fe23 0001:0000009a
-a0:fe27 0001:0000009b
-a0:fe2b 0001:0000009c
-a0:fe2f 0001:0000009f
-a0:fe33 0001:000000a0
-a0:fe36 0001:000000a1
-a0:fe38 0001:000000a2
-a0:fe3c 0001:000000a3
-a0:fe40 0001:000000a5
-a0:fe44 0001:000000a8
-a0:fe48 0001:000000a9
-a0:fe49 0001:000000aa
-a0:fe4c 0001:000000ab
-a0:fe4e 0001:000000ac
-a0:fe4f 0001:000000ad
-a0:fe53 0001:000000ae
-a0:fe57 0001:000000b0
-a0:fe58 0001:000000b1
-a0:fe5c 0001:000000b2
-a0:fe5f 0001:000000b3
-a0:fe62 0001:000000b4
-a0:fe65 0001:000000b5
-a0:fe67 0001:000000b6
-a0:fe6a 0001:000000b7
-a0:fe6d 0001:000000b8
-a0:fe6f 0001:000000b9
-a0:fe73 0001:000000bc
-a0:fe76 0001:000000bd
-a0:fe79 0001:000000be
-a0:fe7c 0001:000000bf
-a0:fe7f 0001:000000c1
-a0:fe82 0001:000000c2
-a0:fe85 0001:000000c3
-a0:fe89 0001:000000c4
-a0:fe8c 0001:000000c5
-a0:fe90 0001:000000c7
-a0:fe94 0001:000000ca
-a0:fe97 0001:000000cb
-a0:fe99 0001:000000cc
-a0:fe9c 0001:000000cd
-a0:fe9f 0001:000000ce
-a0:fea2 0001:000000cf
-a0:fea5 0001:000000d1
-a0:fea8 0001:000000d2
-a0:feab 0001:000000d3
+82:fa55 0001:00000074
+82:fa59 0001:00000075
+82:fa5d 0001:00000076
+82:fa5e 0001:00000077
+82:fa60 0001:00000079
+82:fa61 0001:0000007a
+82:fa62 0001:0000007b
+82:fa63 0001:0000007c
+82:fa64 0001:0000007d
+80:a088 0001:00000083
+80:a08c 0001:00000083
+80:a08d 0001:00000083
+80:a095 0001:00000086
+80:a0ce 0001:00000089
+80:a113 0001:0000008c
+91:e164 0001:0000008f
+91:e168 0001:0000008f
+91:e169 0001:0000008f
+a0:fe00 0001:00000094
+a0:fe03 0001:00000095
+a0:fe05 0001:00000096
+a0:fe08 0001:00000097
+a0:fe0b 0001:00000099
+a0:fe0c 0001:0000009c
+a0:fe10 0001:0000009d
+a0:fe13 0001:0000009e
+a0:fe15 0001:0000009f
+a0:fe18 0001:000000a0
+a0:fe1b 0001:000000a1
+a0:fe1f 0001:000000a3
+a0:fe23 0001:000000a4
+a0:fe27 0001:000000a5
+a0:fe2b 0001:000000a6
+a0:fe2f 0001:000000a9
+a0:fe33 0001:000000aa
+a0:fe36 0001:000000ab
+a0:fe38 0001:000000ac
+a0:fe3c 0001:000000ad
+a0:fe40 0001:000000af
+a0:fe44 0001:000000b2
+a0:fe48 0001:000000b3
+a0:fe49 0001:000000b4
+a0:fe4c 0001:000000b5
+a0:fe4e 0001:000000b6
+a0:fe4f 0001:000000b7
+a0:fe53 0001:000000b8
+a0:fe57 0001:000000ba
+a0:fe58 0001:000000bb
+a0:fe5c 0001:000000bc
+a0:fe5f 0001:000000bd
+a0:fe62 0001:000000be
+a0:fe65 0001:000000bf
+a0:fe67 0001:000000c0
+a0:fe6a 0001:000000c1
+a0:fe6d 0001:000000c2
+a0:fe6f 0001:000000c3
+a0:fe73 0001:000000c6
+a0:fe76 0001:000000c7
+a0:fe79 0001:000000c8
+a0:fe7c 0001:000000c9
+a0:fe7f 0001:000000cb
+a0:fe82 0001:000000cc
+a0:fe85 0001:000000cd
+a0:fe89 0001:000000ce
+a0:fe8c 0001:000000cf
+a0:fe90 0001:000000d1
+a0:fe94 0001:000000d4
+a0:fe97 0001:000000d5
+a0:fe99 0001:000000d6
+a0:fe9c 0001:000000d7
+a0:fe9f 0001:000000d8
+a0:fea2 0001:000000d9
+a0:fea5 0001:000000db
+a0:fea8 0001:000000dc
+a0:feab 0001:000000dd
 85:ff00 0002:0000010b
 85:ff03 0002:0000010c
 85:ff06 0002:0000010d
diff --git a/worlds/sm/data/SMBasepatch_prebuilt/sm-basepatch-symbols.json b/worlds/sm/data/SMBasepatch_prebuilt/sm-basepatch-symbols.json
index 1e5dcccb..813937d3 100644
--- a/worlds/sm/data/SMBasepatch_prebuilt/sm-basepatch-symbols.json
+++ b/worlds/sm/data/SMBasepatch_prebuilt/sm-basepatch-symbols.json
@@ -158,7 +158,7 @@
     "setup_music_quick": "A0:FE0B",
     "setup_samus": "A0:FE94",
     "setup_samus_normal": "A0:FEA5",
-    "sm_fix_checksum": "82:FA15",
+    "sm_fix_checksum": "82:FA27",
     "sm_item_graphics": "B8:8800",
     "sm_item_plm_pickup_sequence_pointers": "B8:882E",
     "sm_save_done_hook": "B8:847B",
@@ -172,10 +172,11 @@
     "write_repeated_memory_loop": "B8:83F4",
     "deathhook82": "82:DDC7",
     "freespace82_start": "82:F990",
-    "freespace82_end": "82:FA53",
+    "freespace82_end": "82:FA65",
     "freespacea0": "a0:fe00",
     "SRAM_SAVING": "70:2604",
     "current_save_slot": "7e:0952",
+    "sram_save_slot_addresses": "81:812B",
     "ITEM_RAM": "7E:09A2",
     "SRAM_MW_ITEMS_RECV": "70:2000",
     "SRAM_MW_ITEMS_RECV_WCOUNT": "70:2602",
diff --git a/worlds/sm/data/SMBasepatch_prebuilt/variapatches.ips b/worlds/sm/data/SMBasepatch_prebuilt/variapatches.ips
index 37139ae5785d1516de3c5565ff326428925be96a..efc38e262f19657272d940dbf03d47a2f03fd2da 100644
GIT binary patch
delta 13
UcmZ2KnQ2xp(}wA7%&z`!04J&i7ytkO

delta 808
zcma*lze@sP9LMo5Pl4T3AR$2%(LsYmqgzBjAtJYm{sD<-F+!XkLh|S;8VZeCB0{?(
zs-qzYLImXoX_nTOpn|sQd7h<Dr)&8vAD0)$o3GFD9=kqZH~B1QX=>|YlqxW)J3YG{
zjA{;}l9RN(ifM0G%Gu5bgKiyzUM@_lUogsmhTVXMTt*7?8T7tMKR_dnY0ZM}gT@<l
z0yO3(?Qqq!-<mY)8k}ZeH(*a-cN&(%uES2k_EsAO3D=+$=qad1>=0sW8nGO;i?E+s
zwPb+~NUhjA&^gfmV|j4eMA5WTuo|b$gPwu5J}vp6k1b+3{@mZwe!+gXtPNs|1=AW-
zTCsJ|dC<ROdGNgO5GaI#G_1xuh=HCf&kqX{o<Az0*cGvWJrtYRlDNdaiaNGiGU@qa
nau~ZRm#{gR!ItF}_PtL&;U}Wn@wss|f?ZR~*dw*2rsC5-w9in9

diff --git a/worlds/sm/variaRandomizer/rom/rompatcher.py b/worlds/sm/variaRandomizer/rom/rompatcher.py
index 913d0d8d..1120eacf 100644
--- a/worlds/sm/variaRandomizer/rom/rompatcher.py
+++ b/worlds/sm/variaRandomizer/rom/rompatcher.py
@@ -25,7 +25,9 @@ class RomPatcher:
             # faster MB cutscene transitions
             'Mother_Brain_Cutscene_Edits',
             # "Balanced" suit mode
-            'Removes_Gravity_Suit_heat_protection'
+            'Removes_Gravity_Suit_heat_protection',
+            # new PLMs for indicating the color of the door on the other side
+            'door_indicators_plms.ips'
         ],
         # VARIA tweaks
         'VariaTweaks' : ['WS_Etank', 'LN_Chozo_SpaceJump_Check_Disable', 'ln_chozo_platform.ips', 'bomb_torizo.ips'],