diff --git a/worlds/sm/data/SMBasepatch_prebuilt/multiworld-basepatch.ips b/worlds/sm/data/SMBasepatch_prebuilt/multiworld-basepatch.ips index d7fd1761..7ac3ea01 100644 Binary files a/worlds/sm/data/SMBasepatch_prebuilt/multiworld-basepatch.ips and b/worlds/sm/data/SMBasepatch_prebuilt/multiworld-basepatch.ips differ diff --git a/worlds/sm/data/SMBasepatch_prebuilt/multiworld.sym b/worlds/sm/data/SMBasepatch_prebuilt/multiworld.sym index 751f470f..5def2b7d 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:8026 :neg_1_1 +B8:80C1 :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:81DE :pos_1_1 +B8:82D7 :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:80EF COLLECTTANK +B8:81E8 COLLECTTANK 85:FF45 MISCFX 84:8BF2 NORMAL 85:FF4E SETFX @@ -38,6 +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 84:F894 h_item 84:F8AD i_chozo_item 84:F8B4 i_hidden_item @@ -46,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:817F i_live_pickup_multiworld -B8:81C4 i_live_pickup_multiworld_end -B8:819B i_live_pickup_multiworld_local_item_or_offworld -B8:81B0 i_live_pickup_multiworld_own_item -B8:81BC i_live_pickup_multiworld_own_item1 +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 84:FA1E i_load_custom_graphics 84:FA39 i_load_custom_graphics_all_items 84:FA49 i_load_custom_graphics_alwaysloaded @@ -85,22 +90,27 @@ B8:81BC 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:8092 mw_display_item_sent -B8:80FF mw_handle_queue -B8:8178 mw_handle_queue_end -B8:8101 mw_handle_queue_loop -B8:8151 mw_handle_queue_new_remote_item -B8:816D mw_handle_queue_next -B8:8163 mw_handle_queue_perform_receive -B8:81C8 mw_hook_main_game +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:8044 mw_init_end +B8:8066 mw_init_continuereset +B8:80EA mw_init_end B8:8000 mw_init_memory -B8:8083 mw_load_sram -B8:80B0 mw_receive_item -B8:80E8 mw_receive_item_end -B8:8070 mw_save_sram -B8:8049 mw_write_message +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 84:F888 nonprog_item_eight_palette_indices 89:9200 offworld_graphics_data_item 89:9100 offworld_graphics_data_progression_item @@ -125,7 +135,7 @@ B8:8049 mw_write_message 84:F96E p_visible_item_end 84:F95B p_visible_item_loop 84:F967 p_visible_item_trigger -B8:81DF patch_load_multiworld +B8:82D8 patch_load_multiworld 84:FA7E perform_item_pickup 84:F886 plm_graphics_entry_offworld_item 84:F87C plm_graphics_entry_offworld_progression_item @@ -144,17 +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 [source files] 0000 e25029c5 main.asm 0001 06780555 ../common/nofanfare.asm -0002 e76d1f83 ../common/multiworld.asm +0002 4f9a780e ../common/multiworld.asm 0003 613d24e1 ../common/itemextras.asm 0004 d6616c0c ../common/items.asm 0005 440b54fe ../common/startitem.asm [rom checksum] -09b134c5 +ad81eda1 [addr-to-line mapping] ff:ffff 0000:00000001 @@ -204,330 +216,423 @@ ff:ffff 0000:00000001 84:8bf2 0001:00000152 84:8bf6 0001:00000153 84:8bf7 0001:00000153 -b8:8000 0002:00000019 -b8:8002 0002:0000001a -b8:8006 0002:0000001b -b8:8008 0002:0000001c -b8:800c 0002:00000020 -b8:800e 0002:00000021 -b8:8010 0002:00000022 -b8:8011 0002:00000025 -b8:8012 0002:00000025 -b8:8013 0002:00000025 -b8:8014 0002:00000025 +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:00000029 -b8:801b 0002:0000002a -b8:801e 0002:0000002b -b8:8020 0002:0000002d -b8:8023 0002:0000002e -b8:8026 0002:00000031 -b8:802a 0002:00000032 -b8:802e 0002:00000033 -b8:8032 0002:00000034 -b8:8036 0002:00000035 -b8:8037 0002:00000035 -b8:8038 0002:00000036 -b8:803b 0002:00000037 -b8:803d 0002:00000039 -b8:8040 0002:0000003a -b8:8044 0002:0000003d -b8:8045 0002:0000003d -b8:8046 0002:0000003d -b8:8047 0002:0000003d -b8:8048 0002:0000003e -b8:8049 0002:00000043 -b8:804a 0002:00000043 -b8:804b 0002:00000044 -b8:804c 0002:00000044 -b8:804d 0002:00000045 -b8:8051 0002:00000046 -b8:8054 0002:00000046 -b8:8055 0002:00000047 -b8:8056 0002:00000048 -b8:805a 0002:00000049 -b8:805b 0002:0000004a -b8:805f 0002:0000004b -b8:8060 0002:0000004c -b8:8064 0002:0000004e -b8:8068 0002:0000004f -b8:8069 0002:00000050 -b8:806d 0002:00000051 -b8:806e 0002:00000051 -b8:806f 0002:00000052 -b8:8070 0002:00000055 -b8:8071 0002:00000055 -b8:8072 0000:00000013 -b8:8074 0002:00000057 -b8:8078 0002:00000058 -b8:807c 0002:00000059 -b8:807d 0002:00000059 -b8:807e 0002:0000005b -b8:807f 0002:0000005c -b8:8082 0002:0000005d -b8:8083 0002:00000060 -b8:8084 0002:00000060 -b8:8085 0000:00000013 -b8:8087 0002:00000062 -b8:808b 0002:00000063 -b8:808f 0002:00000064 -b8:8090 0002:00000064 -b8:8091 0002:00000065 -b8:8092 0002:0000006a -b8:8094 0002:0000006b -b8:8096 0002:0000006e -b8:8099 0002:0000006f -b8:809b 0002:00000070 -b8:809e 0002:00000071 -b8:80a0 0002:00000072 -b8:80a3 0002:00000073 -b8:80a7 0002:00000074 -b8:80a9 0002:00000075 -b8:80ab 0002:00000076 -b8:80ad 0002:00000077 -b8:80af 0002:00000078 -b8:80b0 0002:0000007c -b8:80b1 0002:0000007c -b8:80b2 0002:0000007d -b8:80b5 0002:0000007e -b8:80b7 0002:0000007f -b8:80ba 0002:00000080 -b8:80bc 0002:00000081 -b8:80bd 0002:00000082 -b8:80be 0002:00000084 -b8:80c1 0002:00000085 -b8:80c3 0002:00000086 -b8:80c6 0002:00000087 -b8:80c7 0002:00000088 -b8:80ca 0002:00000089 -b8:80cb 0002:00000089 -b8:80cc 0002:0000008a -b8:80d0 0002:0000008b -b8:80d1 0002:0000008c -b8:80d4 0002:0000008d -b8:80d8 0002:0000008e -b8:80da 0002:00000090 -b8:80dd 0002:00000091 -b8:80df 0002:00000092 -b8:80e2 0002:00000093 -b8:80e4 0002:00000095 -b8:80e8 0002:00000097 -b8:80ea 0002:00000098 -b8:80ec 0002:00000099 -b8:80ed 0002:00000099 -b8:80ee 0002:0000009a -b8:80ef 0002:000000a5 -b8:80f0 0002:000000a6 -b8:80f4 0002:000000a7 -b8:80f5 0002:000000a8 -b8:80f9 0002:000000a9 -b8:80fa 0002:000000ab -b8:80fe 0002:000000ac -b8:80ff 0002:000000de -b8:8100 0002:000000de -b8:8101 0002:000000e1 -b8:8105 0002:000000e2 -b8:8109 0002:000000e3 -b8:810b 0002:000000e5 -b8:810d 0002:000000e5 -b8:810e 0002:000000e8 -b8:8112 0002:000000e9 -b8:8114 0002:000000ea -b8:8118 0002:000000eb -b8:811a 0002:000000ec -b8:811e 0002:000000ed -b8:8121 0002:000000ee -b8:8123 0002:000000ef -b8:8125 0002:000000f0 -b8:8129 0002:000000f1 -b8:812b 0002:000000f2 -b8:812d 0002:000000f3 -b8:8130 0002:000000f4 -b8:8133 0002:000000f5 -b8:8135 0002:000000f6 -b8:813d 0002:000000fa -b8:813e 0002:000000fb -b8:813f 0002:000000fc -b8:8143 0002:000000ff -b8:8147 0002:00000100 -b8:814b 0002:00000101 -b8:814d 0002:00000103 -b8:814e 0002:00000104 -b8:814f 0002:00000105 -b8:8151 0002:0000010a -b8:8152 0002:0000010b -b8:8156 0002:0000010e -b8:815a 0002:0000010f -b8:815e 0002:00000110 -b8:8162 0002:00000111 -b8:8163 0002:00000115 -b8:8165 0002:00000116 -b8:8168 0002:00000117 -b8:816a 0002:00000118 -b8:816d 0002:0000011b -b8:8171 0002:0000011c -b8:8172 0002:0000011d -b8:8176 0002:0000011f -b8:8178 0002:00000122 -b8:817a 0002:00000123 -b8:817c 0002:00000124 -b8:817d 0002:00000124 -b8:817e 0002:00000125 -b8:817f 0002:00000129 -b8:8180 0002:00000129 -b8:8181 0002:00000129 -b8:8182 0002:0000012a -b8:8186 0002:0000012b -b8:8189 0002:0000012b -b8:818a 0002:0000012d -b8:818e 0002:0000012e -b8:818f 0002:0000012f -b8:8193 0002:00000130 -b8:8196 0002:00000131 -b8:8198 0002:00000133 -b8:819b 0002:00000136 -b8:819f 0002:00000137 -b8:81a3 0002:00000138 -b8:81a5 0002:0000013a -b8:81a9 0002:0000013b -b8:81aa 0002:0000013d -b8:81ae 0002:0000013e -b8:81b0 0002:00000141 -b8:81b4 0002:00000142 -b8:81b7 0002:00000143 -b8:81b9 0002:00000144 -b8:81bc 0002:00000147 -b8:81bd 0002:00000148 -b8:81be 0002:00000149 -b8:81c2 0002:0000014a -b8:81c4 0002:0000014d -b8:81c5 0002:0000014d -b8:81c6 0002:0000014d -b8:81c7 0002:0000014e -b8:81c8 0002:00000152 -b8:81cc 0002:00000153 -b8:81d0 0002:00000154 -b8:81d2 0002:00000155 -b8:81d6 0002:00000156 -b8:81d9 0002:00000157 -b8:81db 0002:00000158 -b8:81de 0002:0000015a -b8:81df 0002:0000015d -b8:81e3 0002:0000015e -b8:81e4 0002:0000015f -b8:81e7 0002:00000160 -b8:81eb 0002:00000162 -b8:81ec 0002:00000163 -b8:81ed 0002:00000164 -b8:81ee 0002:00000165 -b8:81ef 0002:00000166 -8b:914a 0002:0000016b -81:80f7 0002:0000016e -81:8027 0002:00000171 -82:8bb3 0002:00000174 -85:b9a3 0002:0000020e -85:b9a4 0002:0000020e -85:b9a5 0002:00000211 -85:b9a7 0002:00000212 -85:b9ad 0002:00000212 -85:b9ae 0002:00000213 -85:b9b1 0002:00000214 -85:b9b2 0002:00000215 -85:b9b3 0002:00000215 -85:b9b4 0002:00000219 -85:b9b7 0002:0000021a -85:b9bb 0002:0000021b -85:b9bd 0002:0000021b -85:b9bf 0002:0000021c -85:b9c2 0002:0000021d -85:b9c4 0002:0000021f -85:b9c5 0002:00000220 -85:b9c7 0002:00000224 -85:b9ca 0002:00000226 -85:b9cd 0002:00000227 -85:b9cf 0002:00000228 -85:b9d1 0002:00000229 -85:b9d5 0002:0000022a -85:b9d7 0002:0000022b -85:b9d9 0002:0000022c -85:b9da 0002:0000022d -85:b9dc 0002:0000022f -85:b9df 0002:00000231 -85:b9e2 0002:00000231 -85:b9e3 0002:00000232 -85:b9e6 0002:00000234 -85:b9ea 0002:00000235 -85:b9ed 0002:00000236 -85:b9ee 0002:00000237 -85:b9ef 0002:00000237 -85:b9f0 0002:00000238 -85:b9f4 0002:00000239 -85:b9f5 0002:0000023a -85:b9f9 0002:0000023b -85:b9fb 0002:0000023c -85:b9fc 0002:0000023d -85:b9fd 0002:0000023e -85:ba00 0002:0000023f -85:ba02 0002:00000240 -85:ba04 0002:00000243 -85:ba05 0002:00000243 -85:ba06 0002:00000244 -85:ba09 0002:00000245 -85:ba8a 0002:00000253 -85:ba8c 0002:00000254 -85:ba8f 0002:00000255 -85:ba92 0002:00000256 -85:ba95 0002:0000025e -85:ba96 0002:0000025f -85:ba98 0002:00000260 -85:ba9b 0002:00000261 -85:ba9d 0002:00000262 -85:ba9f 0002:00000263 -85:baa2 0002:00000264 -85:baa4 0002:00000265 -85:baa7 0002:00000266 -85:baa9 0002:00000269 -85:baaa 0002:0000026a -85:baab 0002:0000026b -85:baac 0002:0000026c -85:baae 0002:0000026d -85:baaf 0002:0000026e -85:bab0 0002:0000026f -85:bab1 0002:00000274 -85:bab4 0002:00000275 -85:bab5 0002:00000276 -85:bab8 0002:00000277 -85:bab9 0002:00000278 -85:baba 0002:00000279 -85:babb 0002:0000027a -85:babc 0002:00000285 -85:babd 0002:00000286 -85:babf 0002:00000287 -85:bac2 0002:00000288 -85:bac4 0002:00000289 -85:bac7 0002:0000028a -85:bac9 0002:0000028d -85:baca 0002:0000028e -85:bacb 0002:0000028f -85:bacd 0002:00000290 -85:bace 0002:00000292 -85:bacf 0002:00000293 -85:bad1 0002:00000294 -85:bad4 0002:00000295 -85:bad6 0002:00000296 -85:bad9 0002:00000297 -85:badb 0002:00000298 -85:badc 0002:0000029a -85:badd 0002:0000029b -85:badf 0002:0000029c -85:bae2 0002:0000029d -85:bae4 0002:0000029e -85:bae7 0002:0000029f -85:bae9 0002:000002a0 -85:8246 0002:000002a5 -85:8249 0002:000002a6 -85:824b 0002:000002a7 -85:82f9 0002:000002ab +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 +8b:914a 0002:0000024c +81:80f7 0002:0000024f +81:8027 0002:00000252 +82:8bb3 0002:00000255 +85:b9a3 0002:000002ef +85:b9a4 0002:000002ef +85:b9a5 0002:000002f2 +85:b9a7 0002:000002f3 +85:b9ad 0002:000002f3 +85:b9ae 0002:000002f4 +85:b9b1 0002:000002f5 +85:b9b2 0002:000002f6 +85:b9b3 0002:000002f6 +85:b9b4 0002:000002fa +85:b9b7 0002:000002fb +85:b9bb 0002:000002fc +85:b9bd 0002:000002fc +85:b9bf 0002:000002fd +85:b9c2 0002:000002fe +85:b9c4 0002:00000300 +85:b9c5 0002:00000301 +85:b9c7 0002:00000305 +85:b9ca 0002:00000307 +85:b9cd 0002:00000308 +85:b9cf 0002:00000309 +85:b9d1 0002:0000030a +85:b9d5 0002:0000030b +85:b9d7 0002:0000030c +85:b9d9 0002:0000030d +85:b9da 0002:0000030e +85:b9dc 0002:00000310 +85:b9df 0002:00000312 +85:b9e2 0002:00000312 +85:b9e3 0002:00000313 +85:b9e6 0002:00000315 +85:b9ea 0002:00000316 +85:b9ed 0002:00000317 +85:b9ee 0002:00000318 +85:b9ef 0002:00000318 +85:b9f0 0002:00000319 +85:b9f4 0002:0000031a +85:b9f5 0002:0000031b +85:b9f9 0002:0000031c +85:b9fb 0002:0000031d +85:b9fc 0002:0000031e +85:b9fd 0002:0000031f +85:ba00 0002:00000320 +85:ba02 0002:00000321 +85:ba04 0002:00000324 +85:ba05 0002:00000324 +85:ba06 0002:00000325 +85:ba09 0002:00000326 +85:ba8a 0002:00000334 +85:ba8c 0002:00000335 +85:ba8f 0002:00000336 +85:ba92 0002:00000337 +85:ba95 0002:0000033f +85:ba96 0002:00000340 +85:ba98 0002:00000341 +85:ba9b 0002:00000342 +85:ba9d 0002:00000343 +85:ba9f 0002:00000344 +85:baa2 0002:00000345 +85:baa4 0002:00000346 +85:baa7 0002:00000347 +85:baa9 0002:0000034a +85:baaa 0002:0000034b +85:baab 0002:0000034c +85:baac 0002:0000034d +85:baae 0002:0000034e +85:baaf 0002:0000034f +85:bab0 0002:00000350 +85:bab1 0002:00000355 +85:bab4 0002:00000356 +85:bab5 0002:00000357 +85:bab8 0002:00000358 +85:bab9 0002:00000359 +85:baba 0002:0000035a +85:babb 0002:0000035b +85:babc 0002:00000366 +85:babd 0002:00000367 +85:babf 0002:00000368 +85:bac2 0002:00000369 +85:bac4 0002:0000036a +85:bac7 0002:0000036b +85:bac9 0002:0000036e +85:baca 0002:0000036f +85:bacb 0002:00000370 +85:bacd 0002:00000371 +85:bace 0002:00000373 +85:bacf 0002:00000374 +85:bad1 0002:00000375 +85:bad4 0002:00000376 +85:bad6 0002:00000377 +85:bad9 0002:00000378 +85:badb 0002:00000379 +85:badc 0002:0000037b +85:badd 0002:0000037c +85:badf 0002:0000037d +85:bae2 0002:0000037e +85:bae4 0002:0000037f +85:bae7 0002:00000380 +85:bae9 0002:00000381 +85:8246 0002:00000386 +85:8249 0002:00000387 +85:824b 0002:00000388 +85:82f9 0002:0000038c b8:885c 0003:00000045 b8:885d 0003:00000045 b8:885e 0003:00000046 diff --git a/worlds/sm/data/SMBasepatch_prebuilt/sm-basepatch-symbols.json b/worlds/sm/data/SMBasepatch_prebuilt/sm-basepatch-symbols.json index 63198cde..222548ba 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:80EF", + "COLLECTTANK": "B8:81E8", "MISCFX": "85:FF45", "NORMAL": "84:8BF2", "SETFX": "85:FF4E", @@ -22,6 +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", "h_item": "84:F894", "i_chozo_item": "84:F8AD", "i_hidden_item": "84:F8B4", @@ -30,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:817F", - "i_live_pickup_multiworld_end": "B8:81C4", - "i_live_pickup_multiworld_local_item_or_offworld": "B8:819B", - "i_live_pickup_multiworld_own_item": "B8:81B0", - "i_live_pickup_multiworld_own_item1": "B8:81BC", + "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_load_custom_graphics": "84:FA1E", "i_load_custom_graphics_all_items": "84:FA39", "i_load_custom_graphics_alwaysloaded": "84:FA49", @@ -69,22 +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:8092", - "mw_handle_queue": "B8:80FF", - "mw_handle_queue_end": "B8:8178", - "mw_handle_queue_loop": "B8:8101", - "mw_handle_queue_new_remote_item": "B8:8151", - "mw_handle_queue_next": "B8:816D", - "mw_handle_queue_perform_receive": "B8:8163", - "mw_hook_main_game": "B8:81C8", + "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_end": "B8:8044", + "mw_init_continuereset": "B8:8066", + "mw_init_end": "B8:80EA", "mw_init_memory": "B8:8000", - "mw_load_sram": "B8:8083", - "mw_receive_item": "B8:80B0", - "mw_receive_item_end": "B8:80E8", - "mw_save_sram": "B8:8070", - "mw_write_message": "B8:8049", + "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", "nonprog_item_eight_palette_indices": "84:F888", "offworld_graphics_data_item": "89:9200", "offworld_graphics_data_progression_item": "89:9100", @@ -109,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:81DF", + "patch_load_multiworld": "B8:82D8", "perform_item_pickup": "84:FA7E", "plm_graphics_entry_offworld_item": "84:F886", "plm_graphics_entry_offworld_progression_item": "84:F87C", @@ -128,14 +138,24 @@ "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", "ITEM_RAM": "7E:09A2", "SRAM_MW_ITEMS_RECV": "70:2000", - "SRAM_MW_ITEMS_RECV_RPTR": "70:2600", - "SRAM_MW_ITEMS_RECV_WPTR": "70:2602", - "SRAM_MW_ITEMS_RECV_SPTR": "70:2604", - "SRAM_MW_ITEMS_SENT_RPTR": "70:2680", - "SRAM_MW_ITEMS_SENT_WPTR": "70:2682", + "SRAM_MW_ITEMS_RECV_WCOUNT": "70:2602", + "ReceiveQueueCompletedCount_InRamThatGetsSavedToSaveSlot": "7e:d8ae", + "SRAM_MW_ITEMS_SENT_RCOUNT": "70:2680", + "SRAM_MW_ITEMS_SENT_WCOUNT": "70:2682", "SRAM_MW_ITEMS_SENT": "70:2700", - "SRAM_MW_INITIALIZED": "70:26fe", + "SRAM_MW_SM": "70:3000", + "SRAM_MW_ROMTITLE": "70:3015", + "SRAM_MW_SEEDINT": "70:3060", + "SRAM_MW_INITIALIZED": "70:3064", + "SRAM_MW_CONFIG_ENABLED": "70:3070", + "SRAM_MW_CONFIG_CUSTOM_SPRITE": "70:3072", + "SRAM_MW_CONFIG_DEATHLINK": "70:3074", + "SRAM_MW_CONFIG_REMOTE_ITEMS": "70:3076", + "SRAM_MW_CONFIG_PLAYER_ID": "70:3078", + "varia_seedint_location": "df:ff00", "CollectedItems": "7E:D86E" } \ No newline at end of file