From ade82e3d60cbb5786d9e62efb19f6605b12441ea Mon Sep 17 00:00:00 2001
From: lordlou <87331798+lordlou@users.noreply.github.com>
Date: Tue, 6 Sep 2022 13:56:23 -0400
Subject: [PATCH] SM: varia tracker fix (#1006)

---
 .../multiworld-basepatch.ips                  | Bin 18193 -> 18193 bytes
 .../data/SMBasepatch_prebuilt/multiworld.sym  | 704 +++++++++---------
 .../sm-basepatch-symbols.json                 |  70 +-
 3 files changed, 387 insertions(+), 387 deletions(-)

diff --git a/worlds/sm/data/SMBasepatch_prebuilt/multiworld-basepatch.ips b/worlds/sm/data/SMBasepatch_prebuilt/multiworld-basepatch.ips
index 7ac3ea018475a0db495d6d540c9dda5f66f1391f..f8fba9b0cfba91ed4adfc2c8d8032796683271d7 100644
GIT binary patch
delta 200
zcmbQ($2hT%ae}d2%MONy?+h$4H(GZvY-VO)Q<6Ec<JBuh?#&D=N(Wmv2C6eLwr;Lu
za#9j%-XX)x!1VBt!Fq=O=RU9~2{unYtD-I5vcu<9bN5OHhD8ht3m6o>6cnspt@OTm
zGQX<2c5^Gk0#SyQ3<j;tN`ISoJW^QM(8{#3pq2HI!pZ~xA(EmH$;pYTQj9H|Yg8vQ
xGPX<>P!|W18tMiDEj#uzJlOGpdq2~I9jlbOTPA0y8?d%yE0wfto~vFW4*=dmO!oi)

delta 200
zcmbQ($2hT%ae}d2;|_*~?+h$4H=1@ZY-VO)Q<6Ec<JBuh?#&D=N(Y-Z2C6eLHf^qC
za#9j%*dfEf!1VBt!Fq=O=RU9~2{ueVtD-I5xWngFL-$GshD8ht3m6o>6cnspt@OTO
zGQX<2c0((}0#SyQ3<j;tN`D)6JW^QM(8{#3pq2HI!pZ~xA(EmH$;pYTQjCq8Yg8vQ
xGB!>YP!|W18tMiDjXU-;JlOGpdq2~I9jlbO8z*O|8?ZKJE0r{Eo~vFW4*<vbOuGO8

diff --git a/worlds/sm/data/SMBasepatch_prebuilt/multiworld.sym b/worlds/sm/data/SMBasepatch_prebuilt/multiworld.sym
index 5def2b7d..e507501c 100644
--- a/worlds/sm/data/SMBasepatch_prebuilt/multiworld.sym
+++ b/worlds/sm/data/SMBasepatch_prebuilt/multiworld.sym
@@ -2,14 +2,14 @@
 ; generated by asar
 
 [labels]
-B8:80C1 :neg_1_1
+B8:83C1 :neg_1_1
 85:B9B4 :neg_1_2
 85:B9E6 :neg_1_3
 B8:C81F :neg_1_4
 B8:C831 :neg_1_5
 B8:C843 :neg_1_6
-B8:800C :pos_1_0
-B8:82D7 :pos_1_1
+B8:830C :pos_1_0
+B8:85D7 :pos_1_1
 84:FA6B :pos_1_2
 84:FA75 :pos_1_3
 B8:C862 :pos_1_4
@@ -20,7 +20,7 @@ B8:C87C :pos_1_6
 85:990F CLIPLEN_end
 85:990C CLIPLEN_no_multi
 85:FF1D CLIPSET
-B8:81E8 COLLECTTANK
+B8:84E8 COLLECTTANK
 85:FF45 MISCFX
 84:8BF2 NORMAL
 85:FF4E SETFX
@@ -38,11 +38,11 @@ CE:FF00 config_multiworld
 CE:FF08 config_player_id
 CE:FF06 config_remote_items
 CE:FF02 config_sprite
-B8:8119 copy_config_to_sram
-B8:80FD copy_memory
-B8:8117 copy_memory_done
-B8:8109 copy_memory_even
-B8:810F copy_memory_loop
+B8:8419 copy_config_to_sram
+B8:83FD copy_memory
+B8:8417 copy_memory_done
+B8:8409 copy_memory_even
+B8:840F copy_memory_loop
 84:F894 h_item
 84:F8AD i_chozo_item
 84:F8B4 i_hidden_item
@@ -51,11 +51,11 @@ B8:885C i_item_setup_shared
 B8:8878 i_item_setup_shared_all_items
 B8:8883 i_item_setup_shared_alwaysloaded
 84:FA79 i_live_pickup
-B8:8278 i_live_pickup_multiworld
-B8:82BD i_live_pickup_multiworld_end
-B8:8294 i_live_pickup_multiworld_local_item_or_offworld
-B8:82A9 i_live_pickup_multiworld_own_item
-B8:82B5 i_live_pickup_multiworld_own_item1
+B8:8578 i_live_pickup_multiworld
+B8:85BD i_live_pickup_multiworld_end
+B8:8594 i_live_pickup_multiworld_local_item_or_offworld
+B8:85A9 i_live_pickup_multiworld_own_item
+B8:85B5 i_live_pickup_multiworld_own_item1
 84:FA1E i_load_custom_graphics
 84:FA39 i_load_custom_graphics_all_items
 84:FA49 i_load_custom_graphics_alwaysloaded
@@ -90,27 +90,27 @@ B8:82B5 i_live_pickup_multiworld_own_item1
 85:B9CA message_write_placeholders_loop
 85:B9DC message_write_placeholders_notfound
 85:B9DF message_write_placeholders_value_ok
-B8:818B mw_display_item_sent
-B8:81F8 mw_handle_queue
-B8:8271 mw_handle_queue_end
-B8:81FA mw_handle_queue_loop
-B8:824A mw_handle_queue_new_remote_item
-B8:8266 mw_handle_queue_next
-B8:825C mw_handle_queue_perform_receive
-B8:82C1 mw_hook_main_game
-B8:8011 mw_init
-B8:8066 mw_init_continuereset
-B8:80EA mw_init_end
-B8:8000 mw_init_memory
-B8:803B mw_init_reset_sram
-B8:8051 mw_init_smstringdata
-B8:8174 mw_load_sram
-B8:8182 mw_load_sram_done
-B8:8185 mw_load_sram_setnewgame
-B8:81A9 mw_receive_item
-B8:81E1 mw_receive_item_end
-B8:8169 mw_save_sram
-B8:8142 mw_write_message
+B8:848B mw_display_item_sent
+B8:84F8 mw_handle_queue
+B8:8571 mw_handle_queue_end
+B8:84FA mw_handle_queue_loop
+B8:854A mw_handle_queue_new_remote_item
+B8:8566 mw_handle_queue_next
+B8:855C mw_handle_queue_perform_receive
+B8:85C1 mw_hook_main_game
+B8:8311 mw_init
+B8:8366 mw_init_continuereset
+B8:83EA mw_init_end
+B8:8300 mw_init_memory
+B8:833B mw_init_reset_sram
+B8:8351 mw_init_smstringdata
+B8:8474 mw_load_sram
+B8:8482 mw_load_sram_done
+B8:8485 mw_load_sram_setnewgame
+B8:84A9 mw_receive_item
+B8:84E1 mw_receive_item_end
+B8:8469 mw_save_sram
+B8:8442 mw_write_message
 84:F888 nonprog_item_eight_palette_indices
 89:9200 offworld_graphics_data_item
 89:9100 offworld_graphics_data_progression_item
@@ -135,7 +135,7 @@ B8:8142 mw_write_message
 84:F96E p_visible_item_end
 84:F95B p_visible_item_loop
 84:F967 p_visible_item_trigger
-B8:82D8 patch_load_multiworld
+B8:85D8 patch_load_multiworld
 84:FA7E perform_item_pickup
 84:F886 plm_graphics_entry_offworld_item
 84:F87C plm_graphics_entry_offworld_progression_item
@@ -154,19 +154,19 @@ B8:C808 start_item_data_minor
 B8:C818 start_item_data_reserve
 B8:C856 update_graphic
 84:F890 v_item
-B8:80EF write_repeated_memory
-B8:80F4 write_repeated_memory_loop
+B8:83EF write_repeated_memory
+B8:83F4 write_repeated_memory_loop
 
 [source files]
-0000 e25029c5 main.asm
+0000 f30c3fdc main.asm
 0001 06780555 ../common/nofanfare.asm
 0002 4f9a780e ../common/multiworld.asm
-0003 613d24e1 ../common/itemextras.asm
+0003 f7e9db95 ../common/itemextras.asm
 0004 d6616c0c ../common/items.asm
-0005 440b54fe ../common/startitem.asm
+0005 dbfcb38d ../common/startitem.asm
 
 [rom checksum]
-ad81eda1
+b526d5c7
 
 [addr-to-line mapping]
 ff:ffff 0000:00000001
@@ -216,316 +216,316 @@ ff:ffff 0000:00000001
 84:8bf2 0001:00000152
 84:8bf6 0001:00000153
 84:8bf7 0001:00000153
-b8:8000 0002:0000005a
-b8:8002 0002:0000005b
-b8:8006 0002:0000005c
-b8:8008 0002:0000005d
-b8:800c 0002:00000061
-b8:800e 0002:00000062
-b8:8010 0002:00000063
-b8:8011 0002:00000066
-b8:8012 0002:00000066
-b8:8013 0002:00000066
-b8:8014 0002:00000066
-b8:8015 0000:00000013
-b8:8017 0002:0000006a
-b8:801b 0002:0000006b
-b8:801e 0002:0000006c
-b8:8020 0002:0000006d
-b8:8024 0002:0000006e
-b8:8028 0002:0000006f
-b8:802a 0002:00000070
-b8:802e 0002:00000071
-b8:8032 0002:00000072
-b8:8034 0002:00000074
-b8:8038 0002:00000075
-b8:803b 0002:00000078
-b8:803c 0002:00000079
-b8:803f 0002:0000007a
-b8:8042 0002:0000007b
-b8:8045 0002:0000007c
-b8:8048 0002:0000007d
-b8:8049 0002:0000007e
-b8:804a 0002:0000007f
-b8:804e 0002:00000080
-b8:804f 0002:00000082
-b8:8066 0002:00000086
-b8:8068 0002:00000087
-b8:8069 0002:00000088
-b8:806a 0002:00000089
-b8:806c 0002:0000008a
-b8:806e 0002:0000008b
-b8:8070 0002:0000008c
-b8:8072 0002:0000008d
-b8:8075 0002:0000008e
-b8:8077 0002:0000008f
-b8:807a 0002:00000090
-b8:807d 0002:00000091
-b8:807f 0002:00000092
-b8:8083 0002:00000094
-b8:8085 0002:00000095
-b8:8087 0002:00000096
-b8:8089 0002:00000097
-b8:808b 0002:00000098
-b8:808d 0002:00000099
-b8:808f 0002:0000009a
-b8:8092 0002:0000009b
-b8:8094 0002:0000009c
-b8:8097 0002:0000009d
-b8:809a 0002:0000009e
-b8:809c 0002:0000009f
-b8:80a0 0002:000000a1
-b8:80a3 0002:000000a2
-b8:80a7 0002:000000a3
-b8:80ab 0002:000000a4
-b8:80af 0002:000000a5
-b8:80b3 0002:000000a6
-b8:80b7 0002:000000a8
-b8:80bb 0002:000000b0
-b8:80be 0002:000000b1
-b8:80c1 0002:000000b3
-b8:80c2 0002:000000b4
-b8:80c3 0002:000000b5
-b8:80c7 0002:000000b6
-b8:80cb 0002:000000b7
-b8:80cd 0002:000000c4
-b8:80d1 0002:000000c5
-b8:80d4 0002:000000c6
-b8:80d6 0002:000000c7
-b8:80da 0002:000000c8
-b8:80dd 0002:000000c9
-b8:80df 0002:000000ce
-b8:80e2 0002:000000cf
-b8:80e6 0002:000000d0
-b8:80ea 0002:000000d3
-b8:80eb 0002:000000d3
-b8:80ec 0002:000000d3
-b8:80ed 0002:000000d3
-b8:80ee 0002:000000d4
-b8:80ef 0002:000000db
-b8:80f0 0002:000000dc
-b8:80f1 0002:000000dd
-b8:80f2 0002:000000de
-b8:80f3 0002:000000df
-b8:80f4 0002:000000e1
-b8:80f7 0002:000000e2
-b8:80f8 0002:000000e3
-b8:80f9 0002:000000e4
-b8:80fa 0002:000000e5
-b8:80fc 0002:000000e7
-b8:80fd 0002:000000ee
-b8:80fe 0002:000000ef
-b8:80ff 0002:000000f0
-b8:8100 0002:000000f1
-b8:8102 0002:000000f3
-b8:8104 0002:000000f4
-b8:8105 0002:000000f5
-b8:8107 0002:000000f6
-b8:8109 0002:000000f8
-b8:810b 0002:000000f9
-b8:810c 0002:000000fa
-b8:810d 0002:000000fb
-b8:810f 0002:000000fd
-b8:8111 0002:000000fe
-b8:8113 0002:000000ff
-b8:8114 0002:00000100
-b8:8115 0002:00000101
-b8:8117 0002:00000103
-b8:8118 0002:00000104
-b8:8119 0002:00000108
-b8:811d 0002:00000109
-b8:8121 0002:0000010a
-b8:8125 0002:0000010b
-b8:8129 0002:0000010c
-b8:812d 0002:0000010d
-b8:8131 0002:0000010e
-b8:8135 0002:0000010f
-b8:8139 0002:00000110
-b8:813d 0002:00000111
-b8:8141 0002:00000112
-b8:8142 0002:00000118
-b8:8143 0002:00000118
-b8:8144 0002:00000119
-b8:8145 0002:00000119
-b8:8146 0002:0000011a
-b8:814a 0002:0000011b
-b8:814d 0002:0000011b
-b8:814e 0002:0000011c
-b8:814f 0002:0000011d
-b8:8153 0002:0000011e
-b8:8154 0002:0000011f
-b8:8158 0002:00000120
-b8:8159 0002:00000121
-b8:815d 0002:00000123
-b8:8161 0002:00000124
-b8:8162 0002:00000125
-b8:8166 0002:00000126
-b8:8167 0002:00000126
-b8:8168 0002:00000127
-b8:8169 0002:0000012c
-b8:816a 0002:0000012c
-b8:816b 0000:00000013
-b8:816d 0002:0000012f
-b8:816e 0002:0000012f
-b8:816f 0002:00000131
-b8:8170 0002:00000132
-b8:8173 0002:00000133
-b8:8174 0002:00000138
-b8:8175 0002:00000138
-b8:8176 0000:00000013
-b8:8178 0002:0000013a
-b8:817c 0002:0000013b
-b8:8180 0002:0000013c
-b8:8182 0002:0000013e
-b8:8183 0002:0000013e
-b8:8184 0002:0000013f
-b8:8185 0002:00000147
-b8:8189 0002:00000148
-b8:818b 0002:0000014e
-b8:818d 0002:0000014f
-b8:818f 0002:00000152
-b8:8192 0002:00000153
-b8:8194 0002:00000154
-b8:8197 0002:00000155
-b8:8199 0002:00000156
-b8:819c 0002:00000157
-b8:81a0 0002:00000158
-b8:81a2 0002:00000159
-b8:81a4 0002:0000015a
-b8:81a6 0002:0000015b
-b8:81a8 0002:0000015c
-b8:81a9 0002:00000160
-b8:81aa 0002:00000160
-b8:81ab 0002:00000161
-b8:81ae 0002:00000162
-b8:81b0 0002:00000163
-b8:81b3 0002:00000164
-b8:81b5 0002:00000165
-b8:81b6 0002:00000166
-b8:81b7 0002:00000168
-b8:81ba 0002:00000169
-b8:81bc 0002:0000016a
-b8:81bf 0002:0000016b
-b8:81c0 0002:0000016c
-b8:81c3 0002:0000016d
-b8:81c4 0002:0000016d
-b8:81c5 0002:0000016e
-b8:81c9 0002:0000016f
-b8:81ca 0002:00000170
-b8:81cd 0002:00000171
-b8:81d1 0002:00000172
-b8:81d3 0002:00000174
-b8:81d6 0002:00000175
-b8:81d8 0002:00000176
-b8:81db 0002:00000177
-b8:81dd 0002:00000179
-b8:81e1 0002:0000017b
-b8:81e3 0002:0000017c
-b8:81e5 0002:0000017d
-b8:81e6 0002:0000017d
-b8:81e7 0002:0000017e
-b8:81e8 0002:00000189
-b8:81e9 0002:0000018a
-b8:81ed 0002:0000018b
-b8:81ee 0002:0000018c
-b8:81f2 0002:0000018d
-b8:81f3 0002:0000018f
-b8:81f7 0002:00000190
-b8:81f8 0002:000001c2
-b8:81f9 0002:000001c2
-b8:81fa 0002:000001c5
-b8:81fe 0002:000001c6
-b8:8202 0002:000001c7
-b8:8204 0002:000001c9
-b8:8206 0002:000001c9
-b8:8207 0002:000001cc
-b8:820b 0002:000001cd
-b8:820d 0002:000001ce
-b8:8211 0002:000001cf
-b8:8213 0002:000001d0
-b8:8217 0002:000001d1
-b8:821a 0002:000001d2
-b8:821c 0002:000001d3
-b8:821e 0002:000001d4
-b8:8222 0002:000001d5
-b8:8224 0002:000001d6
-b8:8226 0002:000001d7
-b8:8229 0002:000001d8
-b8:822c 0002:000001d9
-b8:822e 0002:000001da
-b8:8236 0002:000001de
-b8:8237 0002:000001df
-b8:8238 0002:000001e0
-b8:823c 0002:000001e3
-b8:8240 0002:000001e4
-b8:8244 0002:000001e5
-b8:8246 0002:000001e7
-b8:8247 0002:000001e8
-b8:8248 0002:000001e9
-b8:824a 0002:000001ee
-b8:824b 0002:000001ef
-b8:824f 0002:000001f2
-b8:8253 0002:000001f3
-b8:8257 0002:000001f4
-b8:825b 0002:000001f5
-b8:825c 0002:000001f9
-b8:825e 0002:000001fa
-b8:8261 0002:000001fb
-b8:8263 0002:000001fc
-b8:8266 0002:000001ff
-b8:826a 0002:00000200
-b8:826b 0002:00000201
-b8:826f 0002:00000203
-b8:8271 0002:00000206
-b8:8273 0002:00000207
-b8:8275 0002:00000208
-b8:8276 0002:00000208
-b8:8277 0002:00000209
-b8:8278 0002:0000020d
-b8:8279 0002:0000020d
-b8:827a 0002:0000020d
-b8:827b 0002:0000020e
-b8:827f 0002:0000020f
-b8:8282 0002:0000020f
-b8:8283 0002:00000211
-b8:8287 0002:00000212
-b8:8288 0002:00000213
-b8:828c 0002:00000214
-b8:828f 0002:00000215
-b8:8291 0002:00000217
-b8:8294 0002:0000021a
-b8:8298 0002:0000021b
-b8:829c 0002:0000021c
-b8:829e 0002:0000021e
-b8:82a2 0002:0000021f
-b8:82a3 0002:00000221
-b8:82a7 0002:00000222
-b8:82a9 0002:00000225
-b8:82ad 0002:00000226
-b8:82b0 0002:00000227
-b8:82b2 0002:00000228
-b8:82b5 0002:0000022b
-b8:82b6 0002:0000022c
-b8:82b7 0002:0000022d
-b8:82bb 0002:0000022e
-b8:82bd 0002:00000231
-b8:82be 0002:00000231
-b8:82bf 0002:00000231
-b8:82c0 0002:00000232
-b8:82c1 0002:00000236
-b8:82c5 0002:00000237
-b8:82c9 0002:00000238
-b8:82cb 0002:00000239
-b8:82cf 0002:0000023a
-b8:82d2 0002:0000023b
-b8:82d4 0002:0000023c
-b8:82d7 0002:0000023e
-b8:82d8 0002:00000241
-b8:82dc 0002:00000243
-b8:82dd 0002:00000244
-b8:82de 0002:00000245
-b8:82df 0002:00000246
-b8:82e0 0002:00000247
+b8:8300 0002:0000005a
+b8:8302 0002:0000005b
+b8:8306 0002:0000005c
+b8:8308 0002:0000005d
+b8:830c 0002:00000061
+b8:830e 0002:00000062
+b8:8310 0002:00000063
+b8:8311 0002:00000066
+b8:8312 0002:00000066
+b8:8313 0002:00000066
+b8:8314 0002:00000066
+b8:8315 0000:00000013
+b8:8317 0002:0000006a
+b8:831b 0002:0000006b
+b8:831e 0002:0000006c
+b8:8320 0002:0000006d
+b8:8324 0002:0000006e
+b8:8328 0002:0000006f
+b8:832a 0002:00000070
+b8:832e 0002:00000071
+b8:8332 0002:00000072
+b8:8334 0002:00000074
+b8:8338 0002:00000075
+b8:833b 0002:00000078
+b8:833c 0002:00000079
+b8:833f 0002:0000007a
+b8:8342 0002:0000007b
+b8:8345 0002:0000007c
+b8:8348 0002:0000007d
+b8:8349 0002:0000007e
+b8:834a 0002:0000007f
+b8:834e 0002:00000080
+b8:834f 0002:00000082
+b8:8366 0002:00000086
+b8:8368 0002:00000087
+b8:8369 0002:00000088
+b8:836a 0002:00000089
+b8:836c 0002:0000008a
+b8:836e 0002:0000008b
+b8:8370 0002:0000008c
+b8:8372 0002:0000008d
+b8:8375 0002:0000008e
+b8:8377 0002:0000008f
+b8:837a 0002:00000090
+b8:837d 0002:00000091
+b8:837f 0002:00000092
+b8:8383 0002:00000094
+b8:8385 0002:00000095
+b8:8387 0002:00000096
+b8:8389 0002:00000097
+b8:838b 0002:00000098
+b8:838d 0002:00000099
+b8:838f 0002:0000009a
+b8:8392 0002:0000009b
+b8:8394 0002:0000009c
+b8:8397 0002:0000009d
+b8:839a 0002:0000009e
+b8:839c 0002:0000009f
+b8:83a0 0002:000000a1
+b8:83a3 0002:000000a2
+b8:83a7 0002:000000a3
+b8:83ab 0002:000000a4
+b8:83af 0002:000000a5
+b8:83b3 0002:000000a6
+b8:83b7 0002:000000a8
+b8:83bb 0002:000000b0
+b8:83be 0002:000000b1
+b8:83c1 0002:000000b3
+b8:83c2 0002:000000b4
+b8:83c3 0002:000000b5
+b8:83c7 0002:000000b6
+b8:83cb 0002:000000b7
+b8:83cd 0002:000000c4
+b8:83d1 0002:000000c5
+b8:83d4 0002:000000c6
+b8:83d6 0002:000000c7
+b8:83da 0002:000000c8
+b8:83dd 0002:000000c9
+b8:83df 0002:000000ce
+b8:83e2 0002:000000cf
+b8:83e6 0002:000000d0
+b8:83ea 0002:000000d3
+b8:83eb 0002:000000d3
+b8:83ec 0002:000000d3
+b8:83ed 0002:000000d3
+b8:83ee 0002:000000d4
+b8:83ef 0002:000000db
+b8:83f0 0002:000000dc
+b8:83f1 0002:000000dd
+b8:83f2 0002:000000de
+b8:83f3 0002:000000df
+b8:83f4 0002:000000e1
+b8:83f7 0002:000000e2
+b8:83f8 0002:000000e3
+b8:83f9 0002:000000e4
+b8:83fa 0002:000000e5
+b8:83fc 0002:000000e7
+b8:83fd 0002:000000ee
+b8:83fe 0002:000000ef
+b8:83ff 0002:000000f0
+b8:8400 0002:000000f1
+b8:8402 0002:000000f3
+b8:8404 0002:000000f4
+b8:8405 0002:000000f5
+b8:8407 0002:000000f6
+b8:8409 0002:000000f8
+b8:840b 0002:000000f9
+b8:840c 0002:000000fa
+b8:840d 0002:000000fb
+b8:840f 0002:000000fd
+b8:8411 0002:000000fe
+b8:8413 0002:000000ff
+b8:8414 0002:00000100
+b8:8415 0002:00000101
+b8:8417 0002:00000103
+b8:8418 0002:00000104
+b8:8419 0002:00000108
+b8:841d 0002:00000109
+b8:8421 0002:0000010a
+b8:8425 0002:0000010b
+b8:8429 0002:0000010c
+b8:842d 0002:0000010d
+b8:8431 0002:0000010e
+b8:8435 0002:0000010f
+b8:8439 0002:00000110
+b8:843d 0002:00000111
+b8:8441 0002:00000112
+b8:8442 0002:00000118
+b8:8443 0002:00000118
+b8:8444 0002:00000119
+b8:8445 0002:00000119
+b8:8446 0002:0000011a
+b8:844a 0002:0000011b
+b8:844d 0002:0000011b
+b8:844e 0002:0000011c
+b8:844f 0002:0000011d
+b8:8453 0002:0000011e
+b8:8454 0002:0000011f
+b8:8458 0002:00000120
+b8:8459 0002:00000121
+b8:845d 0002:00000123
+b8:8461 0002:00000124
+b8:8462 0002:00000125
+b8:8466 0002:00000126
+b8:8467 0002:00000126
+b8:8468 0002:00000127
+b8:8469 0002:0000012c
+b8:846a 0002:0000012c
+b8:846b 0000:00000013
+b8:846d 0002:0000012f
+b8:846e 0002:0000012f
+b8:846f 0002:00000131
+b8:8470 0002:00000132
+b8:8473 0002:00000133
+b8:8474 0002:00000138
+b8:8475 0002:00000138
+b8:8476 0000:00000013
+b8:8478 0002:0000013a
+b8:847c 0002:0000013b
+b8:8480 0002:0000013c
+b8:8482 0002:0000013e
+b8:8483 0002:0000013e
+b8:8484 0002:0000013f
+b8:8485 0002:00000147
+b8:8489 0002:00000148
+b8:848b 0002:0000014e
+b8:848d 0002:0000014f
+b8:848f 0002:00000152
+b8:8492 0002:00000153
+b8:8494 0002:00000154
+b8:8497 0002:00000155
+b8:8499 0002:00000156
+b8:849c 0002:00000157
+b8:84a0 0002:00000158
+b8:84a2 0002:00000159
+b8:84a4 0002:0000015a
+b8:84a6 0002:0000015b
+b8:84a8 0002:0000015c
+b8:84a9 0002:00000160
+b8:84aa 0002:00000160
+b8:84ab 0002:00000161
+b8:84ae 0002:00000162
+b8:84b0 0002:00000163
+b8:84b3 0002:00000164
+b8:84b5 0002:00000165
+b8:84b6 0002:00000166
+b8:84b7 0002:00000168
+b8:84ba 0002:00000169
+b8:84bc 0002:0000016a
+b8:84bf 0002:0000016b
+b8:84c0 0002:0000016c
+b8:84c3 0002:0000016d
+b8:84c4 0002:0000016d
+b8:84c5 0002:0000016e
+b8:84c9 0002:0000016f
+b8:84ca 0002:00000170
+b8:84cd 0002:00000171
+b8:84d1 0002:00000172
+b8:84d3 0002:00000174
+b8:84d6 0002:00000175
+b8:84d8 0002:00000176
+b8:84db 0002:00000177
+b8:84dd 0002:00000179
+b8:84e1 0002:0000017b
+b8:84e3 0002:0000017c
+b8:84e5 0002:0000017d
+b8:84e6 0002:0000017d
+b8:84e7 0002:0000017e
+b8:84e8 0002:00000189
+b8:84e9 0002:0000018a
+b8:84ed 0002:0000018b
+b8:84ee 0002:0000018c
+b8:84f2 0002:0000018d
+b8:84f3 0002:0000018f
+b8:84f7 0002:00000190
+b8:84f8 0002:000001c2
+b8:84f9 0002:000001c2
+b8:84fa 0002:000001c5
+b8:84fe 0002:000001c6
+b8:8502 0002:000001c7
+b8:8504 0002:000001c9
+b8:8506 0002:000001c9
+b8:8507 0002:000001cc
+b8:850b 0002:000001cd
+b8:850d 0002:000001ce
+b8:8511 0002:000001cf
+b8:8513 0002:000001d0
+b8:8517 0002:000001d1
+b8:851a 0002:000001d2
+b8:851c 0002:000001d3
+b8:851e 0002:000001d4
+b8:8522 0002:000001d5
+b8:8524 0002:000001d6
+b8:8526 0002:000001d7
+b8:8529 0002:000001d8
+b8:852c 0002:000001d9
+b8:852e 0002:000001da
+b8:8536 0002:000001de
+b8:8537 0002:000001df
+b8:8538 0002:000001e0
+b8:853c 0002:000001e3
+b8:8540 0002:000001e4
+b8:8544 0002:000001e5
+b8:8546 0002:000001e7
+b8:8547 0002:000001e8
+b8:8548 0002:000001e9
+b8:854a 0002:000001ee
+b8:854b 0002:000001ef
+b8:854f 0002:000001f2
+b8:8553 0002:000001f3
+b8:8557 0002:000001f4
+b8:855b 0002:000001f5
+b8:855c 0002:000001f9
+b8:855e 0002:000001fa
+b8:8561 0002:000001fb
+b8:8563 0002:000001fc
+b8:8566 0002:000001ff
+b8:856a 0002:00000200
+b8:856b 0002:00000201
+b8:856f 0002:00000203
+b8:8571 0002:00000206
+b8:8573 0002:00000207
+b8:8575 0002:00000208
+b8:8576 0002:00000208
+b8:8577 0002:00000209
+b8:8578 0002:0000020d
+b8:8579 0002:0000020d
+b8:857a 0002:0000020d
+b8:857b 0002:0000020e
+b8:857f 0002:0000020f
+b8:8582 0002:0000020f
+b8:8583 0002:00000211
+b8:8587 0002:00000212
+b8:8588 0002:00000213
+b8:858c 0002:00000214
+b8:858f 0002:00000215
+b8:8591 0002:00000217
+b8:8594 0002:0000021a
+b8:8598 0002:0000021b
+b8:859c 0002:0000021c
+b8:859e 0002:0000021e
+b8:85a2 0002:0000021f
+b8:85a3 0002:00000221
+b8:85a7 0002:00000222
+b8:85a9 0002:00000225
+b8:85ad 0002:00000226
+b8:85b0 0002:00000227
+b8:85b2 0002:00000228
+b8:85b5 0002:0000022b
+b8:85b6 0002:0000022c
+b8:85b7 0002:0000022d
+b8:85bb 0002:0000022e
+b8:85bd 0002:00000231
+b8:85be 0002:00000231
+b8:85bf 0002:00000231
+b8:85c0 0002:00000232
+b8:85c1 0002:00000236
+b8:85c5 0002:00000237
+b8:85c9 0002:00000238
+b8:85cb 0002:00000239
+b8:85cf 0002:0000023a
+b8:85d2 0002:0000023b
+b8:85d4 0002:0000023c
+b8:85d7 0002:0000023e
+b8:85d8 0002:00000241
+b8:85dc 0002:00000243
+b8:85dd 0002:00000244
+b8:85de 0002:00000245
+b8:85df 0002:00000246
+b8:85e0 0002:00000247
 8b:914a 0002:0000024c
 81:80f7 0002:0000024f
 81:8027 0002:00000252
diff --git a/worlds/sm/data/SMBasepatch_prebuilt/sm-basepatch-symbols.json b/worlds/sm/data/SMBasepatch_prebuilt/sm-basepatch-symbols.json
index 222548ba..949b60f5 100644
--- a/worlds/sm/data/SMBasepatch_prebuilt/sm-basepatch-symbols.json
+++ b/worlds/sm/data/SMBasepatch_prebuilt/sm-basepatch-symbols.json
@@ -4,7 +4,7 @@
     "CLIPLEN_end": "85:990F",
     "CLIPLEN_no_multi": "85:990C",
     "CLIPSET": "85:FF1D",
-    "COLLECTTANK": "B8:81E8",
+    "COLLECTTANK": "B8:84E8",
     "MISCFX": "85:FF45",
     "NORMAL": "84:8BF2",
     "SETFX": "85:FF4E",
@@ -22,11 +22,11 @@
     "config_player_id": "CE:FF08",
     "config_remote_items": "CE:FF06",
     "config_sprite": "CE:FF02",
-    "copy_config_to_sram": "B8:8119",
-    "copy_memory": "B8:80FD",
-    "copy_memory_done": "B8:8117",
-    "copy_memory_even": "B8:8109",
-    "copy_memory_loop": "B8:810F",
+    "copy_config_to_sram": "B8:8419",
+    "copy_memory": "B8:83FD",
+    "copy_memory_done": "B8:8417",
+    "copy_memory_even": "B8:8409",
+    "copy_memory_loop": "B8:840F",
     "h_item": "84:F894",
     "i_chozo_item": "84:F8AD",
     "i_hidden_item": "84:F8B4",
@@ -35,11 +35,11 @@
     "i_item_setup_shared_all_items": "B8:8878",
     "i_item_setup_shared_alwaysloaded": "B8:8883",
     "i_live_pickup": "84:FA79",
-    "i_live_pickup_multiworld": "B8:8278",
-    "i_live_pickup_multiworld_end": "B8:82BD",
-    "i_live_pickup_multiworld_local_item_or_offworld": "B8:8294",
-    "i_live_pickup_multiworld_own_item": "B8:82A9",
-    "i_live_pickup_multiworld_own_item1": "B8:82B5",
+    "i_live_pickup_multiworld": "B8:8578",
+    "i_live_pickup_multiworld_end": "B8:85BD",
+    "i_live_pickup_multiworld_local_item_or_offworld": "B8:8594",
+    "i_live_pickup_multiworld_own_item": "B8:85A9",
+    "i_live_pickup_multiworld_own_item1": "B8:85B5",
     "i_load_custom_graphics": "84:FA1E",
     "i_load_custom_graphics_all_items": "84:FA39",
     "i_load_custom_graphics_alwaysloaded": "84:FA49",
@@ -74,27 +74,27 @@
     "message_write_placeholders_loop": "85:B9CA",
     "message_write_placeholders_notfound": "85:B9DC",
     "message_write_placeholders_value_ok": "85:B9DF",
-    "mw_display_item_sent": "B8:818B",
-    "mw_handle_queue": "B8:81F8",
-    "mw_handle_queue_end": "B8:8271",
-    "mw_handle_queue_loop": "B8:81FA",
-    "mw_handle_queue_new_remote_item": "B8:824A",
-    "mw_handle_queue_next": "B8:8266",
-    "mw_handle_queue_perform_receive": "B8:825C",
-    "mw_hook_main_game": "B8:82C1",
-    "mw_init": "B8:8011",
-    "mw_init_continuereset": "B8:8066",
-    "mw_init_end": "B8:80EA",
-    "mw_init_memory": "B8:8000",
-    "mw_init_reset_sram": "B8:803B",
-    "mw_init_smstringdata": "B8:8051",
-    "mw_load_sram": "B8:8174",
-    "mw_load_sram_done": "B8:8182",
-    "mw_load_sram_setnewgame": "B8:8185",
-    "mw_receive_item": "B8:81A9",
-    "mw_receive_item_end": "B8:81E1",
-    "mw_save_sram": "B8:8169",
-    "mw_write_message": "B8:8142",
+    "mw_display_item_sent": "B8:848B",
+    "mw_handle_queue": "B8:84F8",
+    "mw_handle_queue_end": "B8:8571",
+    "mw_handle_queue_loop": "B8:84FA",
+    "mw_handle_queue_new_remote_item": "B8:854A",
+    "mw_handle_queue_next": "B8:8566",
+    "mw_handle_queue_perform_receive": "B8:855C",
+    "mw_hook_main_game": "B8:85C1",
+    "mw_init": "B8:8311",
+    "mw_init_continuereset": "B8:8366",
+    "mw_init_end": "B8:83EA",
+    "mw_init_memory": "B8:8300",
+    "mw_init_reset_sram": "B8:833B",
+    "mw_init_smstringdata": "B8:8351",
+    "mw_load_sram": "B8:8474",
+    "mw_load_sram_done": "B8:8482",
+    "mw_load_sram_setnewgame": "B8:8485",
+    "mw_receive_item": "B8:84A9",
+    "mw_receive_item_end": "B8:84E1",
+    "mw_save_sram": "B8:8469",
+    "mw_write_message": "B8:8442",
     "nonprog_item_eight_palette_indices": "84:F888",
     "offworld_graphics_data_item": "89:9200",
     "offworld_graphics_data_progression_item": "89:9100",
@@ -119,7 +119,7 @@
     "p_visible_item_end": "84:F96E",
     "p_visible_item_loop": "84:F95B",
     "p_visible_item_trigger": "84:F967",
-    "patch_load_multiworld": "B8:82D8",
+    "patch_load_multiworld": "B8:85D8",
     "perform_item_pickup": "84:FA7E",
     "plm_graphics_entry_offworld_item": "84:F886",
     "plm_graphics_entry_offworld_progression_item": "84:F87C",
@@ -138,8 +138,8 @@
     "start_item_data_reserve": "B8:C818",
     "update_graphic": "B8:C856",
     "v_item": "84:F890",
-    "write_repeated_memory": "B8:80EF",
-    "write_repeated_memory_loop": "B8:80F4",
+    "write_repeated_memory": "B8:83EF",
+    "write_repeated_memory_loop": "B8:83F4",
     "ITEM_RAM": "7E:09A2",
     "SRAM_MW_ITEMS_RECV": "70:2000",
     "SRAM_MW_ITEMS_RECV_WCOUNT": "70:2602",