diff --git a/patches/ips/mb_barrier_clear.ips b/patches/ips/mb_barrier_clear.ips index 2a23a4e699..584a790204 100644 Binary files a/patches/ips/mb_barrier_clear.ips and b/patches/ips/mb_barrier_clear.ips differ diff --git a/patches/patch_manifest.json b/patches/patch_manifest.json index 8a1fa596bd..779b26052f 100644 --- a/patches/patch_manifest.json +++ b/patches/patch_manifest.json @@ -1 +1 @@ -{"ultra_low_qol_saveload": [[32768, 32771], [32901, 32904], [39495, 39499], [39506, 39510], [39521, 39524], [40110, 40114], [40126, 40129], [61216, 61635]], "gray_doors": [[91748, 91752], [133287, 133290], [145996, 146045], [152379, 152387], [162304, 162631], [493122, 493124], [493127, 493128], [505420, 505422], [521984, 521998], [1079552, 1079667], [1181322, 1181326], [1217869, 1217875], [1240563, 1240569], [1258129, 1258141], [1291124, 1291128], [1301826, 1301832], [1397690, 1397696], [1406931, 1406945], [1679396, 1679400]], "no_beeping": [[551570, 551574], [551584, 551588], [553788, 553792], [583386, 583390]], "elevators_speed": [[1152385, 1152410], [1152432, 1152433], [1152466, 1152467], [1152492, 1152493], [1176352, 1176395]], "spin_lock": [[169984, 170024], [557488, 557492]], "rng_fix": [[91754, 91764], [112384, 112571]], "disable_map_icons": [[79474, 79475], [80688, 80689]], "respin": [[555392, 555423], [558180, 558254], [564962, 567310], [567348, 567350], [567412, 567540], [567548, 569358], [588953, 588958]], "etank_refill_full": [[133490, 133493], [160896, 160906]], "alternate_door_colors": [[68908, 68911], [91282, 91285], [92112, 92115], [96768, 96876]], "fix_kraid_hud": [[89629, 89632], [97200, 97263]], "hyper_beam": [[146734, 146739], [146776, 146781], [146832, 146837], [148822, 148825], [148853, 148856], [151272, 151275], [151356, 151359], [151413, 151416], [162048, 162134]], "max_ammo_display_fast": [[6625, 6646], [6857, 6871], [6938, 6941], [6952, 6955], [7168, 7171], [19872, 20359], [165969, 165975], [166033, 166039], [166225, 166231], [166291, 166295], [166479, 166483], [166543, 166547], [865602, 865664], [865728, 865887], [865937, 865984]], "oob_death": [[20800, 20888], [68527, 68531]], "escape_autosave": [[19019, 19033], [109926, 109938], [162880, 162974], [515494, 515496], [515498, 515502], [515508, 515510], [522240, 522380], [1111552, 1111587], [1345262, 1345266], [1345338, 1345341], [1356279, 1356282], [1375552, 1375637]], "escape_timer": [[551176, 551179], [555264, 555277], [1125319, 1125322], [1125525, 1125526]], "fast_mother_brain_cutscene": [[1346931, 1346934], [1346949, 1346952], [1346990, 1346993], [1350957, 1350959], [1350961, 1350963], [1355527, 1355529], [1355598, 1355600], [1355715, 1355717], [1355789, 1355791], [1356190, 1356193], [1356210, 1356212], [1358598, 1358618], [1359565, 1359568], [1359646, 1359649], [1359945, 1359955], [1375488, 1375506]], "pause_menu_objectives": [[69898, 69901], [70443, 70446], [75013, 75019], [75293, 75296], [75309, 75315], [75675, 75681], [75808, 75811], [75838, 75841], [82406, 82408], [98176, 98264], [170784, 171937], [1776128, 1776160], [1776480, 1776544], [1776608, 1776640], [1777856, 1777888], [1778016, 1778144], [1778560, 1778656], [1780736, 1781056]], "fix_hyper_slowlock": [[170752, 170780], [583172, 583178]], "vanilla_bugfixes": [[11817, 11820], [17523, 17526], [17532, 17535], [20992, 21014], [68842, 68845], [77824, 77826], [78196, 78199], [79044, 79047], [88960, 88963], [97264, 97320], [131880, 131883], [131939, 131955], [132492, 132517], [132887, 132891], [134412, 134415], [144852, 144855], [157902, 157903], [159234, 159235], [207101, 207104], [210692, 210695], [570921, 570922], [1051365, 1051368], [1079328, 1079340], [1372012, 1372032], [1394972, 1394974], [1719715, 1719717]], "nothing_item": [[161536, 161570]], "escape_items": [[133378, 133381], [133417, 133420], [133456, 133459], [160512, 160525], [386607, 386610], [391008, 391018], [1363218, 1363222], [1375088, 1375122]], "walljump_item": [[159744, 159984], [164432, 164435], [164436, 164439], [164593, 164596], [164598, 164601], [169648, 169898], [532043, 532053], [532076, 532086]], "constants": [], "saveload": [[32768, 32771], [32901, 32904], [39495, 39499], [39506, 39510], [39521, 39524], [40110, 40114], [40126, 40129], [61216, 61622], [516865, 516868], [516880, 516883], [523840, 523854]], "stats": [[843, 846], [861, 864], [1109, 1113], [1203, 1208], [1885, 1887], [4003, 4031], [5513, 5516], [5605, 5625], [5634, 5639], [21056, 21250], [65959, 65961], [89237, 89243], [134405, 134409], [155830, 155832], [155867, 155869], [155904, 155906], [155941, 155943], [155986, 155988], [156032, 156034], [156078, 156080], [156124, 156126], [156170, 156172], [156216, 156218], [156262, 156264], [156308, 156310], [156360, 156362], [156413, 156415], [156464, 156466], [156509, 156511], [156555, 156557], [156600, 156602], [156646, 156648], [156692, 156694], [156738, 156740], [156786, 156788], [156836, 156838], [156886, 156888], [156936, 156938], [156994, 156996], [157053, 157055], [157112, 157114], [157171, 157173], [157230, 157232], [157298, 157300], [157357, 157359], [157416, 157418], [157477, 157479], [157543, 157545], [157607, 157609], [157665, 157667], [157724, 157726], [157782, 157784], [157841, 157843], [157900, 157902], [157959, 157961], [158013, 158015], [158069, 158071], [158125, 158127], [158181, 158183], [158245, 158247], [158310, 158312], [158375, 158377], [158440, 158442], [158505, 158507], [158570, 158572], [158635, 158637], [158700, 158702], [158767, 158769], [158839, 158841], [158909, 158911], [158973, 158975], [159038, 159040], [159102, 159104], [159167, 159169], [159232, 159234], [159297, 159299], [161584, 161778], [170368, 170522], [364907, 364909], [549106, 549112], [1125139, 1125143], [1125180, 1125184]], "aim_anything": [[95690, 95691], [557556, 557720]], "all_items_spawn": [[498358, 498360], [499397, 499399], [510388, 510390], [510676, 510678], [511053, 511055], [511438, 511440], [511511, 511513], [511590, 511592]], "map_area": [[1423, 1426], [1447, 1450], [1481, 1484], [1510, 1513], [6283, 6563], [7132, 7135], [7615, 7655], [8724, 8727], [65635, 65639], [66292, 66309], [68932, 68935], [69255, 69272], [69319, 69336], [69691, 69694], [69898, 69901], [69925, 69928], [69936, 69939], [69978, 69981], [70144, 70147], [70155, 70158], [70199, 70202], [70491, 70494], [70506, 70509], [70683, 70686], [70720, 70723], [70773, 70776], [70957, 70960], [71010, 71013], [71211, 71214], [73255, 73260], [73272, 73275], [73429, 73432], [73473, 73476], [75322, 75325], [75352, 75355], [75382, 75385], [75412, 75415], [75688, 75691], [75718, 75721], [75748, 75751], [75778, 75781], [89728, 89735], [90041, 90045], [90615, 90618], [90654, 90657], [91242, 91244], [91250, 91252], [91272, 91282], [91298, 91301], [91497, 91500], [92004, 92007], [92105, 92112], [96015, 96763], [98302, 98304], [134289, 134292], [143772, 143775], [164176, 164201], [164902, 164918], [306018, 306022], [306026, 306030], [306034, 306038], [306043, 306047], [306181, 306185], [306189, 306193], [306197, 306201], [306206, 306210], [510220, 510223], [534513, 534516], [534974, 534977], [535155, 535158], [535160, 535163], [535293, 535296], [535370, 535376], [535382, 535385], [1294906, 1294923], [1296267, 1296270], [1296272, 1296275], [1296305, 1296308], [1296310, 1296313], [1296343, 1296346], [1296348, 1296351], [1296381, 1296384], [1296386, 1296389], [1297019, 1297021], [1297047, 1297049], [1310656, 1310664], [1798194, 1798200], [3407872, 3408175]], "decompression": [[12543, 12868]], "zebes_asleep_music": [[89930, 89933], [97920, 98040]], "ultra_low_qol_new_game": [[17633, 17647], [65565, 65569], [65639, 65643], [93914, 93915], [1110544, 1110633]], "sram_check_disable": [[0, 2]], "reserve_hud": [[5736, 5739], [6896, 6899], [6990, 6996], [21312, 22304], [68939, 68942], [70556, 70559], [77529, 77532], [77622, 77638], [91651, 91654], [98048, 98056], [98096, 98172], [133510, 133513], [160912, 160922], [263132, 263136], [3228464, 3228480], [3228768, 3228784], [3228864, 3228896], [3261232, 3261248], [3261536, 3261552], [3261632, 3261664], [3294000, 3294016], [3294304, 3294320], [3294400, 3294432], [3326768, 3326784], [3327072, 3327088], [3327168, 3327200], [3359536, 3359552], [3359840, 3359856], [3359936, 3359968], [3392304, 3392320], [3392608, 3392624], [3392704, 3392736]], "buffed_drops": [[225467, 225470], [225497, 225500], [1733192, 1733234]], "unexplore": [[534908, 534911], [554554, 554590]], "etank_refill_disabled": [[133490, 133493]], "energy_free_shinesparks": [[544974, 544977], [545021, 545024], [545065, 545068], [545469, 545472], [545590, 545592]], "tourian_blue_hopper": [[1157981, 1157984], [1176416, 1176442]], "seed_hash_display": [[93371, 93374], [96912, 97199]], "samus_tiles_optim_animated_tiles_fix": [[5142, 5198], [5537, 5540], [8405, 8409], [25088, 25246], [67930, 67939], [70546, 70550], [74430, 74431], [589888, 589900], [589950, 589962]], "mb_left_entrance": [[109283, 109284], [109290, 109292], [136393, 136417], [142337, 142339], [145007, 145011], [161152, 161166], [519680, 519689], [1500113, 1500117]], "escape": [[7712, 7715], [89948, 89952], [90106, 90109], [98064, 98088], [134387, 134390], [146734, 146739], [146776, 146781], [146832, 146837], [148822, 148825], [148853, 148856], [151272, 151275], [151356, 151359], [151413, 151416], [160640, 160791], [162048, 162190], [386651, 386654], [386657, 386660], [391424, 391448], [518294, 518297], [518333, 518336], [521728, 521970], [1110016, 1110930], [1296414, 1296418], [1308818, 1308821], [1310594, 1310609], [1356400, 1356403], [1375232, 1375297]], "fast_pause_menu": [[20527, 20569], [68914, 68917], [69994, 69998], [70031, 70035], [70093, 70096], [70128, 70131], [70161, 70165], [70205, 70209], [70237, 70346], [75023, 75026], [75194, 75197], [75212, 75215], [80164, 80176], [80288, 80328]], "subtitle": [], "vertical_door_fix": [[91452, 91460]], "gravity_palette": [[552118, 552146], [579355, 579357], [581226, 581232], [581306, 581386]], "disable_walljump": [[531978, 531980], [531988, 531990], [532032, 532034], [532041, 532043]], "ultra_low_qol_map_area": [[1423, 1426], [1447, 1450], [1481, 1484], [1510, 1513], [70683, 70686], [70720, 70723], [70773, 70776], [70957, 70960], [71010, 71013], [71211, 71214], [73429, 73432], [73473, 73476], [89728, 89735], [96015, 96046], [134289, 134292], [143772, 143775], [510220, 510223], [534974, 534977], [535155, 535158], [535160, 535163]], "credits": [[366966, 366970], [367003, 367007], [367077, 367081], [367112, 367116], [367129, 367133], [385233, 385237], [391024, 391186], [2568768, 2577282], [3134687, 3135319], [3135771, 3137307], [3137536, 3137824]], "new_game": [[17633, 17647], [65565, 65569], [65639, 65643], [93914, 93915], [1111040, 1111400]], "mother_brain_no_drain": [[1361220, 1361222]], "samus_dma_fix": [[5033, 5036], [5061, 5064], [5106, 5109], [5134, 5137], [24960, 25022]], "shaktool": [[145584, 145617]], "complementary_suits": [[451449, 451464], [524763, 524768], [551374, 551452], [554624, 554675], [1057891, 1057908], [1175256, 1175281]], "fast_saves": [[134390, 134399], [142726, 142786], [142833, 142901], [142971, 143039], [143336, 143374], [164130, 164133], [222853, 222855], [1123774, 1123862], [1124929, 1124932], [1124998, 1125001], [1125035, 1125038], [1125042, 1125045], [1125202, 1125205], [1125271, 1125274]], "ultra_low_qol_hud_expansion_opaque": [[5682, 5689], [5729, 5734], [6030, 6033], [6154, 6157], [6819, 6831], [7341, 7351], [7361, 7364], [7615, 7655], [8429, 8432], [8724, 8727], [8860, 8953], [36404, 36407], [42926, 42929], [45387, 45771], [69329, 69331], [69558, 69561], [69569, 69572], [69579, 69582], [71040, 71043], [71279, 71447], [78779, 78782], [78790, 78793], [78800, 78803], [81670, 81964], [87329, 88417], [91497, 91500], [163840, 163968], [163984, 163987], [164010, 164013], [164072, 164075], [164902, 164918], [165759, 169539], [169552, 169652], [230063, 230065], [230093, 230095], [230123, 230125], [230145, 230147], [264984, 264994], [271080, 271090], [301056, 305666], [306225, 306228], [306944, 306994], [327680, 340352], [458752, 482304], [864768, 872960], [1769472, 1798144], [1859584, 1867776]], "item_dots_disappear": [[8409, 8413], [70512, 70516], [70748, 70751], [90050, 90054], [97536, 97554], [112128, 112297], [133816, 133820], [164973, 164978], [535155, 535169]], "map_progress_maintain": [[433, 437], [1685, 1688], [1703, 1706], [1717, 1724], [1732, 1735], [1746, 1749], [32728, 32729], [70717, 70746], [70748, 70892], [73414, 73432], [134310, 134316], [534819, 534821], [534923, 534926], [534977, 534992], [535212, 535214], [535220, 535223], [535251, 535253], [535259, 535262], [535312, 535314], [535320, 535323], [535405, 535408], [554752, 554999], [1183940, 1183943], [1210064, 1210095], [1217239, 1217243], [1296421, 1296425], [1301374, 1301378], [1356405, 1356411]], "fast_doors": [[11868, 11871], [20736, 20747], [90917, 90927], [90937, 90947], [97664, 97713]], "itemsounds": [[90406, 90412], [134130, 134133], [155827, 155830], [155864, 155867], [155901, 155904], [155938, 155941], [155983, 155986], [156029, 156032], [156075, 156078], [156121, 156124], [156167, 156170], [156213, 156216], [156259, 156262], [156305, 156308], [156355, 156358], [156408, 156411], [156461, 156464], [156506, 156509], [156552, 156555], [156597, 156600], [156643, 156646], [156689, 156692], [156735, 156738], [156783, 156786], [156833, 156836], [156883, 156886], [156933, 156936], [156991, 156994], [157050, 157053], [157109, 157112], [157168, 157171], [157227, 157230], [157295, 157298], [157354, 157357], [157413, 157416], [157472, 157475], [157538, 157541], [157604, 157607], [157662, 157665], [157721, 157724], [157779, 157782], [157838, 157841], [157897, 157900], [157956, 157959], [158010, 158013], [158066, 158069], [158122, 158125], [158178, 158181], [158242, 158245], [158307, 158310], [158372, 158375], [158437, 158440], [158502, 158505], [158567, 158570], [158632, 158635], [158697, 158700], [158762, 158765], [158834, 158837], [158906, 158909], [158970, 158973], [159035, 159038], [159099, 159102], [159164, 159167], [159229, 159232], [159294, 159297], [161024, 161105], [163977, 163979], [165009, 165011]], "fast_reload": [[8328, 8334], [8341, 8345], [8398, 8402], [8467, 8471], [67962, 67966], [89543, 89575], [90889, 90895], [97792, 97796], [97916, 97920], [134422, 134426], [164126, 164130], [170112, 170250], [581988, 581994], [1080832, 1081120]], "mb_barrier_clear": [[109266, 109268], [146958, 146962], [153195, 153199], [160256, 160401], [518912, 519058], [519104, 519120], [519328, 519363]], "msu1": [[3879, 3882], [23040, 23425]], "no_map_select": [[37150, 37153], [61696, 61712]], "boss_exit": [[522224, 522228]], "sound_effect_disables": [[275526, 275530]], "fast_big_boy_cutscene": [[1366294, 1366297], [1366353, 1366369], [1372209, 1372212], [1372233, 1372236], [1372840, 1372843], [1372858, 1372861], [1372902, 1372905], [1372958, 1372961], [1373002, 1373005]], "beam_doors": [[163008, 163800]], "horizontal_door_fix": [[132232, 132235], [132320, 132323], [161168, 161180]], "title_map_animation": [[368945, 368961], [369463, 369493], [369497, 369499], [697825, 698415]], "music": [[496329, 496331], [496408, 496410], [496571, 496573], [496754, 496756], [496797, 496799], [496995, 496997], [497038, 497040], [497081, 497083], [497125, 497127], [497168, 497170], [497260, 497262], [497365, 497367], [497521, 497523], [497907, 497909], [497950, 497952], [498042, 498044], [498085, 498087], [498126, 498128], [498186, 498188], [498266, 498268], [498292, 498294], [498342, 498344], [498368, 498370], [498606, 498608], [498649, 498651], [498758, 498760], [498799, 498801], [498842, 498844], [498884, 498886], [499234, 499236], [499495, 499497], [499521, 499523], [499578, 499580], [499604, 499606], [499702, 499704], [499746, 499748], [499810, 499812], [499852, 499854], [499939, 499941], [499992, 499994], [500033, 500035], [500076, 500078], [500158, 500160], [500201, 500203], [500388, 500390], [500488, 500490], [500621, 500623], [500718, 500720], [500761, 500763], [500866, 500868], [500930, 500932], [501116, 501118], [501199, 501201], [501289, 501291], [501330, 501332], [501614, 501616], [501657, 501659], [501700, 501702], [501798, 501800], [501878, 501880], [501962, 501964], [502025, 502027], [502303, 502305], [502354, 502356], [502511, 502513], [502552, 502554], [502604, 502606], [502645, 502647], [502688, 502690], [502755, 502757], [502801, 502803], [502891, 502893], [502932, 502934], [502980, 502982], [503041, 503043], [503230, 503232], [503320, 503322], [503363, 503365], [503429, 503431], [503493, 503495], [503536, 503538], [503589, 503591], [503683, 503685], [503732, 503734], [503775, 503777], [503820, 503822], [503863, 503865], [503906, 503908], [503947, 503949], [504005, 504007], [504087, 504089], [504138, 504140], [504758, 504760], [504859, 504861], [504936, 504938], [504979, 504981], [505022, 505024], [505078, 505080], [505121, 505123], [505195, 505197], [505238, 505240], [505318, 505320], [505404, 505406], [505513, 505515], [510660, 510662], [510686, 510688], [510881, 510883], [510907, 510909], [511201, 511203], [511227, 511229], [511346, 511348], [511372, 511374], [511422, 511424], [511448, 511450], [511495, 511497], [511521, 511523], [511574, 511576], [511600, 511602], [511845, 511847], [512040, 512042], [512102, 512104], [512202, 512204], [512332, 512334], [512382, 512384], [512494, 512496], [512611, 512613], [512655, 512657], [512699, 512701], [512746, 512748], [512849, 512851], [512920, 512922], [512967, 512969], [513049, 513051], [513092, 513094], [513138, 513140], [513183, 513185], [513235, 513237], [513280, 513282], [513327, 513329], [513374, 513376], [513419, 513421], [513533, 513535], [513623, 513625], [513707, 513709], [513761, 513763], [513806, 513808], [513851, 513853], [513957, 513959], [514134, 514136], [514175, 514177], [514217, 514219], [514267, 514269], [514293, 514295], [514340, 514342], [514533, 514535], [514575, 514577], [514620, 514622], [514807, 514809], [514833, 514835], [514887, 514889], [514913, 514915], [514963, 514965], [514989, 514991], [515271, 515273], [515297, 515299], [515391, 515393], [515442, 515444], [515468, 515470], [515541, 515543], [515678, 515680], [515723, 515725], [515768, 515770], [515823, 515825]], "missile_refill_all": [[134354, 134360], [134369, 134375], [143039, 143045], [144104, 144110], [144155, 144161], [160000, 160042]], "hazard_markers": [[91182, 91189], [92091, 92095], [92229, 92236], [161792, 162016], [518291, 518294], [523904, 523909], [1835008, 1835032]], "enable_moonwalk": [[45917, 45926]], "fix_water_fx_bug": [[91737, 91741], [96896, 96904]], "ultra_low_qol_vanilla_bugfixes": [[131946, 131948], [132887, 132891], [157902, 157903], [159234, 159235], [1372012, 1372032]], "flashing_placebo": [[1182941, 1182955], [1210048, 1210064], [1301887, 1301890], [1310688, 1310720]], "fix_kraid_vomit": [[132634, 132637], [155796, 155799], [162816, 162831]], "hud_expansion_opaque": [[5682, 5689], [5729, 5734], [6030, 6033], [6154, 6157], [6819, 6831], [7341, 7351], [7361, 7364], [7615, 7655], [8429, 8432], [8724, 8727], [8860, 8953], [36404, 36407], [42926, 42929], [45387, 45771], [69329, 69331], [69558, 69561], [69569, 69572], [69579, 69582], [71040, 71043], [71279, 71447], [78779, 78782], [78790, 78793], [78800, 78803], [81670, 81964], [87329, 88417], [91497, 91500], [163840, 163968], [163984, 163987], [164010, 164013], [164072, 164075], [164902, 164918], [165759, 169639], [230063, 230065], [230093, 230095], [230123, 230125], [230145, 230147], [264984, 264994], [271080, 271090], [301056, 305666], [306225, 306228], [306944, 306994], [327680, 340352], [458752, 482304], [864768, 872960], [1769472, 1798144], [1859584, 1867776]], "momentum_conservation": [[533450, 533453], [555008, 555086]], "Area FX": [[89853, 89857], [112640, 113076], [137425, 137791], [138765, 138793], [138821, 138933], [138961, 139045], [229818, 229825], [230009, 230011], [230015, 230017], [230021, 230023], [230027, 230029], [230033, 230035], [248164, 248446], [274595, 274599], [274690, 274698], [306064, 306067], [306083, 306086], [306168, 306171], [306213, 306216], [306263, 306266], [306274, 306282], [306328, 306336], [307040, 307387], [341250, 341509], [341760, 343919], [444038, 444053], [453721, 453727], [456561, 456565], [456597, 456605], [458697, 458701], [508187, 508192]], "Area Palette Glows": [[443647, 443681], [443687, 443723], [451674, 451677], [456549, 456553], [456557, 456561], [456565, 456597], [456605, 456613], [456849, 457022], [458701, 458733], [1933312, 1965719]], "Ceres Enable": [[92211, 92219], [92891, 92899], [551511, 551519]], "Area Map Debug": [[81571, 81600], [89847, 89850]], "Fake Lava": [[275684, 275687], [524760, 524766], [524810, 524812], [530241, 530247], [530626, 530632], [530908, 530914], [530991, 530997], [531412, 531418], [531547, 531553], [533561, 533567], [556032, 556065], [580018, 580024], [587402, 587408], [587499, 587505], [588406, 588413], [588558, 588564], [589806, 589819]], "Bowling": [[138437, 138447], [152527, 152533], [152556, 152562], [341536, 341709]], "Area Palettes": [[89885, 89897], [305666, 305671], [306011, 306014], [306171, 306174], [306177, 306181], [306185, 306189], [306193, 306197], [344066, 347433], [1185901, 1185908], [1239164, 1239170], [1239269, 1239319], [1239324, 1239398], [1254614, 1254627], [1301617, 1301621], [1503819, 1503832], [2097152, 2126232], [2129920, 2150587]], "Scrolling Sky v1.6": [[272344, 272406], [273782, 274227], [292352, 293631], [340352, 341223], [496073, 496083], [508182, 508187], [508192, 508196]]} \ No newline at end of file +{"ultra_low_qol_saveload": [[32768, 32771], [32901, 32904], [39495, 39499], [39506, 39510], [39521, 39524], [40110, 40114], [40126, 40129], [61216, 61635]], "gray_doors": [[91748, 91752], [133287, 133290], [145996, 146045], [152379, 152387], [162304, 162631], [493122, 493124], [493127, 493128], [505420, 505422], [521984, 521998], [1079552, 1079667], [1181322, 1181326], [1217869, 1217875], [1240563, 1240569], [1258129, 1258141], [1291124, 1291128], [1301826, 1301832], [1397690, 1397696], [1406931, 1406945], [1679396, 1679400]], "no_beeping": [[551570, 551574], [551584, 551588], [553788, 553792], [583386, 583390]], "elevators_speed": [[1152385, 1152410], [1152432, 1152433], [1152466, 1152467], [1152492, 1152493], [1176352, 1176395]], "spin_lock": [[169984, 170024], [557488, 557492]], "rng_fix": [[91754, 91764], [112384, 112571]], "disable_map_icons": [[79474, 79475], [80688, 80689]], "respin": [[555392, 555423], [558180, 558254], [564962, 567310], [567348, 567350], [567412, 567540], [567548, 569358], [588953, 588958]], "etank_refill_full": [[133490, 133493], [160896, 160906]], "alternate_door_colors": [[68908, 68911], [91282, 91285], [92112, 92115], [96768, 96876]], "fix_kraid_hud": [[89629, 89632], [97200, 97263]], "hyper_beam": [[146734, 146739], [146776, 146781], [146832, 146837], [148822, 148825], [148853, 148856], [151272, 151275], [151356, 151359], [151413, 151416], [162048, 162134]], "max_ammo_display_fast": [[6625, 6646], [6857, 6871], [6938, 6941], [6952, 6955], [7168, 7171], [19872, 20359], [165969, 165975], [166033, 166039], [166225, 166231], [166291, 166295], [166479, 166483], [166543, 166547], [865602, 865664], [865728, 865887], [865937, 865984]], "oob_death": [[20800, 20888], [68527, 68531]], "escape_autosave": [[19019, 19033], [109926, 109938], [162880, 162974], [515494, 515496], [515498, 515502], [515508, 515510], [522240, 522380], [1111552, 1111587], [1345262, 1345266], [1345338, 1345341], [1356279, 1356282], [1375552, 1375637]], "escape_timer": [[551176, 551179], [555264, 555277], [1125319, 1125322], [1125525, 1125526]], "fast_mother_brain_cutscene": [[1346931, 1346934], [1346949, 1346952], [1346990, 1346993], [1350957, 1350959], [1350961, 1350963], [1355527, 1355529], [1355598, 1355600], [1355715, 1355717], [1355789, 1355791], [1356190, 1356193], [1356210, 1356212], [1358598, 1358618], [1359565, 1359568], [1359646, 1359649], [1359945, 1359955], [1375488, 1375506]], "pause_menu_objectives": [[69898, 69901], [70443, 70446], [75013, 75019], [75293, 75296], [75309, 75315], [75675, 75681], [75808, 75811], [75838, 75841], [82406, 82408], [98176, 98264], [170784, 171937], [1776128, 1776160], [1776480, 1776544], [1776608, 1776640], [1777856, 1777888], [1778016, 1778144], [1778560, 1778656], [1780736, 1781056]], "fix_hyper_slowlock": [[170752, 170780], [583172, 583178]], "vanilla_bugfixes": [[11817, 11820], [17523, 17526], [17532, 17535], [20992, 21014], [68842, 68845], [77824, 77826], [78196, 78199], [79044, 79047], [88960, 88963], [97264, 97320], [131880, 131883], [131939, 131955], [132492, 132517], [132887, 132891], [134412, 134415], [144852, 144855], [157902, 157903], [159234, 159235], [207101, 207104], [210692, 210695], [570921, 570922], [1051365, 1051368], [1079328, 1079340], [1372012, 1372032], [1394972, 1394974], [1719715, 1719717]], "nothing_item": [[161536, 161570]], "escape_items": [[133378, 133381], [133417, 133420], [133456, 133459], [160512, 160525], [386607, 386610], [391008, 391018], [1363218, 1363222], [1375088, 1375122]], "walljump_item": [[159744, 159984], [164432, 164435], [164436, 164439], [164593, 164596], [164598, 164601], [169648, 169898], [532043, 532053], [532076, 532086]], "constants": [], "saveload": [[32768, 32771], [32901, 32904], [39495, 39499], [39506, 39510], [39521, 39524], [40110, 40114], [40126, 40129], [61216, 61622], [516865, 516868], [516880, 516883], [523840, 523854]], "stats": [[843, 846], [861, 864], [1109, 1113], [1203, 1208], [1885, 1887], [4003, 4031], [5513, 5516], [5605, 5625], [5634, 5639], [21056, 21250], [65959, 65961], [89237, 89243], [134405, 134409], [155830, 155832], [155867, 155869], [155904, 155906], [155941, 155943], [155986, 155988], [156032, 156034], [156078, 156080], [156124, 156126], [156170, 156172], [156216, 156218], [156262, 156264], [156308, 156310], [156360, 156362], [156413, 156415], [156464, 156466], [156509, 156511], [156555, 156557], [156600, 156602], [156646, 156648], [156692, 156694], [156738, 156740], [156786, 156788], [156836, 156838], [156886, 156888], [156936, 156938], [156994, 156996], [157053, 157055], [157112, 157114], [157171, 157173], [157230, 157232], [157298, 157300], [157357, 157359], [157416, 157418], [157477, 157479], [157543, 157545], [157607, 157609], [157665, 157667], [157724, 157726], [157782, 157784], [157841, 157843], [157900, 157902], [157959, 157961], [158013, 158015], [158069, 158071], [158125, 158127], [158181, 158183], [158245, 158247], [158310, 158312], [158375, 158377], [158440, 158442], [158505, 158507], [158570, 158572], [158635, 158637], [158700, 158702], [158767, 158769], [158839, 158841], [158909, 158911], [158973, 158975], [159038, 159040], [159102, 159104], [159167, 159169], [159232, 159234], [159297, 159299], [161584, 161778], [170368, 170522], [364907, 364909], [549106, 549112], [1125139, 1125143], [1125180, 1125184]], "aim_anything": [[95690, 95691], [557556, 557720]], "all_items_spawn": [[498358, 498360], [499397, 499399], [510388, 510390], [510676, 510678], [511053, 511055], [511438, 511440], [511511, 511513], [511590, 511592]], "map_area": [[1423, 1426], [1447, 1450], [1481, 1484], [1510, 1513], [6283, 6563], [7132, 7135], [7615, 7655], [8724, 8727], [65635, 65639], [66292, 66309], [68932, 68935], [69255, 69272], [69319, 69336], [69691, 69694], [69898, 69901], [69925, 69928], [69936, 69939], [69978, 69981], [70144, 70147], [70155, 70158], [70199, 70202], [70491, 70494], [70506, 70509], [70683, 70686], [70720, 70723], [70773, 70776], [70957, 70960], [71010, 71013], [71211, 71214], [73255, 73260], [73272, 73275], [73429, 73432], [73473, 73476], [75322, 75325], [75352, 75355], [75382, 75385], [75412, 75415], [75688, 75691], [75718, 75721], [75748, 75751], [75778, 75781], [89728, 89735], [90041, 90045], [90615, 90618], [90654, 90657], [91242, 91244], [91250, 91252], [91272, 91282], [91298, 91301], [91497, 91500], [92004, 92007], [92105, 92112], [96015, 96763], [98302, 98304], [134289, 134292], [143772, 143775], [164176, 164201], [164902, 164918], [306018, 306022], [306026, 306030], [306034, 306038], [306043, 306047], [306181, 306185], [306189, 306193], [306197, 306201], [306206, 306210], [510220, 510223], [534513, 534516], [534974, 534977], [535155, 535158], [535160, 535163], [535293, 535296], [535370, 535376], [535382, 535385], [1294906, 1294923], [1296267, 1296270], [1296272, 1296275], [1296305, 1296308], [1296310, 1296313], [1296343, 1296346], [1296348, 1296351], [1296381, 1296384], [1296386, 1296389], [1297019, 1297021], [1297047, 1297049], [1310656, 1310664], [1798194, 1798200], [3407872, 3408175]], "decompression": [[12543, 12868]], "zebes_asleep_music": [[89930, 89933], [97920, 98040]], "ultra_low_qol_new_game": [[17633, 17647], [65565, 65569], [65639, 65643], [93914, 93915], [1110544, 1110633]], "sram_check_disable": [[0, 2]], "reserve_hud": [[5736, 5739], [6896, 6899], [6990, 6996], [21312, 22304], [68939, 68942], [70556, 70559], [77529, 77532], [77622, 77638], [91651, 91654], [98048, 98056], [98096, 98172], [133510, 133513], [160912, 160922], [263132, 263136], [3228464, 3228480], [3228768, 3228784], [3228864, 3228896], [3261232, 3261248], [3261536, 3261552], [3261632, 3261664], [3294000, 3294016], [3294304, 3294320], [3294400, 3294432], [3326768, 3326784], [3327072, 3327088], [3327168, 3327200], [3359536, 3359552], [3359840, 3359856], [3359936, 3359968], [3392304, 3392320], [3392608, 3392624], [3392704, 3392736]], "buffed_drops": [[225467, 225470], [225497, 225500], [1733192, 1733234]], "unexplore": [[534908, 534911], [554554, 554590]], "etank_refill_disabled": [[133490, 133493]], "energy_free_shinesparks": [[544974, 544977], [545021, 545024], [545065, 545068], [545469, 545472], [545590, 545592]], "tourian_blue_hopper": [[1157981, 1157984], [1176416, 1176442]], "seed_hash_display": [[93371, 93374], [96912, 97199]], "samus_tiles_optim_animated_tiles_fix": [[5142, 5198], [5537, 5540], [8405, 8409], [25088, 25246], [67930, 67939], [70546, 70550], [74430, 74431], [589888, 589900], [589950, 589962]], "mb_left_entrance": [[109283, 109284], [109290, 109292], [136393, 136417], [142337, 142339], [145007, 145011], [161152, 161166], [519680, 519689], [1500113, 1500117]], "escape": [[7712, 7715], [89948, 89952], [90106, 90109], [98064, 98088], [134387, 134390], [146734, 146739], [146776, 146781], [146832, 146837], [148822, 148825], [148853, 148856], [151272, 151275], [151356, 151359], [151413, 151416], [160640, 160791], [162048, 162190], [386651, 386654], [386657, 386660], [391424, 391448], [518294, 518297], [518333, 518336], [521728, 521970], [1110016, 1110930], [1296414, 1296418], [1308818, 1308821], [1310594, 1310609], [1356400, 1356403], [1375232, 1375297]], "fast_pause_menu": [[20527, 20569], [68914, 68917], [69994, 69998], [70031, 70035], [70093, 70096], [70128, 70131], [70161, 70165], [70205, 70209], [70237, 70346], [75023, 75026], [75194, 75197], [75212, 75215], [80164, 80176], [80288, 80328]], "subtitle": [], "vertical_door_fix": [[91452, 91460]], "gravity_palette": [[552118, 552146], [579355, 579357], [581226, 581232], [581306, 581386]], "disable_walljump": [[531978, 531980], [531988, 531990], [532032, 532034], [532041, 532043]], "ultra_low_qol_map_area": [[1423, 1426], [1447, 1450], [1481, 1484], [1510, 1513], [70683, 70686], [70720, 70723], [70773, 70776], [70957, 70960], [71010, 71013], [71211, 71214], [73429, 73432], [73473, 73476], [89728, 89735], [96015, 96046], [134289, 134292], [143772, 143775], [510220, 510223], [534974, 534977], [535155, 535158], [535160, 535163]], "credits": [[366966, 366970], [367003, 367007], [367077, 367081], [367112, 367116], [367129, 367133], [385233, 385237], [391024, 391186], [2568768, 2577282], [3134687, 3135319], [3135771, 3137307], [3137536, 3137824]], "new_game": [[17633, 17647], [65565, 65569], [65639, 65643], [93914, 93915], [1111040, 1111400]], "mother_brain_no_drain": [[1361220, 1361222]], "samus_dma_fix": [[5033, 5036], [5061, 5064], [5106, 5109], [5134, 5137], [24960, 25022]], "shaktool": [[145584, 145617]], "complementary_suits": [[451449, 451464], [524763, 524768], [551374, 551452], [554624, 554675], [1057891, 1057908], [1175256, 1175281]], "fast_saves": [[134390, 134399], [142726, 142786], [142833, 142901], [142971, 143039], [143336, 143374], [164130, 164133], [222853, 222855], [1123774, 1123862], [1124929, 1124932], [1124998, 1125001], [1125035, 1125038], [1125042, 1125045], [1125202, 1125205], [1125271, 1125274]], "ultra_low_qol_hud_expansion_opaque": [[5682, 5689], [5729, 5734], [6030, 6033], [6154, 6157], [6819, 6831], [7341, 7351], [7361, 7364], [7615, 7655], [8429, 8432], [8724, 8727], [8860, 8953], [36404, 36407], [42926, 42929], [45387, 45771], [69329, 69331], [69558, 69561], [69569, 69572], [69579, 69582], [71040, 71043], [71279, 71447], [78779, 78782], [78790, 78793], [78800, 78803], [81670, 81964], [87329, 88417], [91497, 91500], [163840, 163968], [163984, 163987], [164010, 164013], [164072, 164075], [164902, 164918], [165759, 169539], [169552, 169652], [230063, 230065], [230093, 230095], [230123, 230125], [230145, 230147], [264984, 264994], [271080, 271090], [301056, 305666], [306225, 306228], [306944, 306994], [327680, 340352], [458752, 482304], [864768, 872960], [1769472, 1798144], [1859584, 1867776]], "item_dots_disappear": [[8409, 8413], [70512, 70516], [70748, 70751], [90050, 90054], [97536, 97554], [112128, 112297], [133816, 133820], [164973, 164978], [535155, 535169]], "map_progress_maintain": [[433, 437], [1685, 1688], [1703, 1706], [1717, 1724], [1732, 1735], [1746, 1749], [32728, 32729], [70717, 70746], [70748, 70892], [73414, 73432], [134310, 134316], [534819, 534821], [534923, 534926], [534977, 534992], [535212, 535214], [535220, 535223], [535251, 535253], [535259, 535262], [535312, 535314], [535320, 535323], [535405, 535408], [554752, 554999], [1183940, 1183943], [1210064, 1210095], [1217239, 1217243], [1296421, 1296425], [1301374, 1301378], [1356405, 1356411]], "fast_doors": [[11868, 11871], [20736, 20747], [90917, 90927], [90937, 90947], [97664, 97713]], "itemsounds": [[90406, 90412], [134130, 134133], [155827, 155830], [155864, 155867], [155901, 155904], [155938, 155941], [155983, 155986], [156029, 156032], [156075, 156078], [156121, 156124], [156167, 156170], [156213, 156216], [156259, 156262], [156305, 156308], [156355, 156358], [156408, 156411], [156461, 156464], [156506, 156509], [156552, 156555], [156597, 156600], [156643, 156646], [156689, 156692], [156735, 156738], [156783, 156786], [156833, 156836], [156883, 156886], [156933, 156936], [156991, 156994], [157050, 157053], [157109, 157112], [157168, 157171], [157227, 157230], [157295, 157298], [157354, 157357], [157413, 157416], [157472, 157475], [157538, 157541], [157604, 157607], [157662, 157665], [157721, 157724], [157779, 157782], [157838, 157841], [157897, 157900], [157956, 157959], [158010, 158013], [158066, 158069], [158122, 158125], [158178, 158181], [158242, 158245], [158307, 158310], [158372, 158375], [158437, 158440], [158502, 158505], [158567, 158570], [158632, 158635], [158697, 158700], [158762, 158765], [158834, 158837], [158906, 158909], [158970, 158973], [159035, 159038], [159099, 159102], [159164, 159167], [159229, 159232], [159294, 159297], [161024, 161105], [163977, 163979], [165009, 165011]], "fast_reload": [[8328, 8334], [8341, 8345], [8398, 8402], [8467, 8471], [67962, 67966], [89543, 89575], [90889, 90895], [97792, 97796], [97916, 97920], [134422, 134426], [164126, 164130], [170112, 170250], [581988, 581994], [1080832, 1081120]], "mb_barrier_clear": [[109266, 109268], [146958, 146962], [153195, 153199], [160256, 160401], [518912, 519056], [519104, 519204], [519328, 519331]], "msu1": [[3879, 3882], [23040, 23425]], "no_map_select": [[37150, 37153], [61696, 61712]], "boss_exit": [[522224, 522228]], "sound_effect_disables": [[275526, 275530]], "fast_big_boy_cutscene": [[1366294, 1366297], [1366353, 1366369], [1372209, 1372212], [1372233, 1372236], [1372840, 1372843], [1372858, 1372861], [1372902, 1372905], [1372958, 1372961], [1373002, 1373005]], "beam_doors": [[163008, 163800]], "horizontal_door_fix": [[132232, 132235], [132320, 132323], [161168, 161180]], "title_map_animation": [[368945, 368961], [369463, 369493], [369497, 369499], [697825, 698415]], "music": [[496329, 496331], [496408, 496410], [496571, 496573], [496754, 496756], [496797, 496799], [496995, 496997], [497038, 497040], [497081, 497083], [497125, 497127], [497168, 497170], [497260, 497262], [497365, 497367], [497521, 497523], [497907, 497909], [497950, 497952], [498042, 498044], [498085, 498087], [498126, 498128], [498186, 498188], [498266, 498268], [498292, 498294], [498342, 498344], [498368, 498370], [498606, 498608], [498649, 498651], [498758, 498760], [498799, 498801], [498842, 498844], [498884, 498886], [499234, 499236], [499495, 499497], [499521, 499523], [499578, 499580], [499604, 499606], [499702, 499704], [499746, 499748], [499810, 499812], [499852, 499854], [499939, 499941], [499992, 499994], [500033, 500035], [500076, 500078], [500158, 500160], [500201, 500203], [500388, 500390], [500488, 500490], [500621, 500623], [500718, 500720], [500761, 500763], [500866, 500868], [500930, 500932], [501116, 501118], [501199, 501201], [501289, 501291], [501330, 501332], [501614, 501616], [501657, 501659], [501700, 501702], [501798, 501800], [501878, 501880], [501962, 501964], [502025, 502027], [502303, 502305], [502354, 502356], [502511, 502513], [502552, 502554], [502604, 502606], [502645, 502647], [502688, 502690], [502755, 502757], [502801, 502803], [502891, 502893], [502932, 502934], [502980, 502982], [503041, 503043], [503230, 503232], [503320, 503322], [503363, 503365], [503429, 503431], [503493, 503495], [503536, 503538], [503589, 503591], [503683, 503685], [503732, 503734], [503775, 503777], [503820, 503822], [503863, 503865], [503906, 503908], [503947, 503949], [504005, 504007], [504087, 504089], [504138, 504140], [504758, 504760], [504859, 504861], [504936, 504938], [504979, 504981], [505022, 505024], [505078, 505080], [505121, 505123], [505195, 505197], [505238, 505240], [505318, 505320], [505404, 505406], [505513, 505515], [510660, 510662], [510686, 510688], [510881, 510883], [510907, 510909], [511201, 511203], [511227, 511229], [511346, 511348], [511372, 511374], [511422, 511424], [511448, 511450], [511495, 511497], [511521, 511523], [511574, 511576], [511600, 511602], [511845, 511847], [512040, 512042], [512102, 512104], [512202, 512204], [512332, 512334], [512382, 512384], [512494, 512496], [512611, 512613], [512655, 512657], [512699, 512701], [512746, 512748], [512849, 512851], [512920, 512922], [512967, 512969], [513049, 513051], [513092, 513094], [513138, 513140], [513183, 513185], [513235, 513237], [513280, 513282], [513327, 513329], [513374, 513376], [513419, 513421], [513533, 513535], [513623, 513625], [513707, 513709], [513761, 513763], [513806, 513808], [513851, 513853], [513957, 513959], [514134, 514136], [514175, 514177], [514217, 514219], [514267, 514269], [514293, 514295], [514340, 514342], [514533, 514535], [514575, 514577], [514620, 514622], [514807, 514809], [514833, 514835], [514887, 514889], [514913, 514915], [514963, 514965], [514989, 514991], [515271, 515273], [515297, 515299], [515391, 515393], [515442, 515444], [515468, 515470], [515541, 515543], [515678, 515680], [515723, 515725], [515768, 515770], [515823, 515825]], "missile_refill_all": [[134354, 134360], [134369, 134375], [143039, 143045], [144104, 144110], [144155, 144161], [160000, 160042]], "hazard_markers": [[91182, 91189], [92091, 92095], [92229, 92236], [161792, 162016], [518291, 518294], [523904, 523909], [1835008, 1835032]], "enable_moonwalk": [[45917, 45926]], "fix_water_fx_bug": [[91737, 91741], [96896, 96904]], "ultra_low_qol_vanilla_bugfixes": [[131946, 131948], [132887, 132891], [157902, 157903], [159234, 159235], [1372012, 1372032]], "flashing_placebo": [[1182941, 1182955], [1210048, 1210064], [1301887, 1301890], [1310688, 1310720]], "fix_kraid_vomit": [[132634, 132637], [155796, 155799], [162816, 162831]], "hud_expansion_opaque": [[5682, 5689], [5729, 5734], [6030, 6033], [6154, 6157], [6819, 6831], [7341, 7351], [7361, 7364], [7615, 7655], [8429, 8432], [8724, 8727], [8860, 8953], [36404, 36407], [42926, 42929], [45387, 45771], [69329, 69331], [69558, 69561], [69569, 69572], [69579, 69582], [71040, 71043], [71279, 71447], [78779, 78782], [78790, 78793], [78800, 78803], [81670, 81964], [87329, 88417], [91497, 91500], [163840, 163968], [163984, 163987], [164010, 164013], [164072, 164075], [164902, 164918], [165759, 169639], [230063, 230065], [230093, 230095], [230123, 230125], [230145, 230147], [264984, 264994], [271080, 271090], [301056, 305666], [306225, 306228], [306944, 306994], [327680, 340352], [458752, 482304], [864768, 872960], [1769472, 1798144], [1859584, 1867776]], "momentum_conservation": [[533450, 533453], [555008, 555086]], "Area FX": [[89853, 89857], [112640, 113076], [137425, 137791], [138765, 138793], [138821, 138933], [138961, 139045], [229818, 229825], [230009, 230011], [230015, 230017], [230021, 230023], [230027, 230029], [230033, 230035], [248164, 248446], [274595, 274599], [274690, 274698], [306064, 306067], [306083, 306086], [306168, 306171], [306213, 306216], [306263, 306266], [306274, 306282], [306328, 306336], [307040, 307387], [341250, 341509], [341760, 343919], [444038, 444053], [453721, 453727], [456561, 456565], [456597, 456605], [458697, 458701], [508187, 508192]], "Area Palette Glows": [[443647, 443681], [443687, 443723], [451674, 451677], [456549, 456553], [456557, 456561], [456565, 456597], [456605, 456613], [456849, 457022], [458701, 458733], [1933312, 1965719]], "Ceres Enable": [[92211, 92219], [92891, 92899], [551511, 551519]], "Area Map Debug": [[81571, 81600], [89847, 89850]], "Fake Lava": [[275684, 275687], [524760, 524766], [524810, 524812], [530241, 530247], [530626, 530632], [530908, 530914], [530991, 530997], [531412, 531418], [531547, 531553], [533561, 533567], [556032, 556065], [580018, 580024], [587402, 587408], [587499, 587505], [588406, 588413], [588558, 588564], [589806, 589819]], "Bowling": [[138437, 138447], [152527, 152533], [152556, 152562], [341536, 341709]], "Area Palettes": [[89885, 89897], [305666, 305671], [306011, 306014], [306171, 306174], [306177, 306181], [306185, 306189], [306193, 306197], [344066, 347433], [1185901, 1185908], [1239164, 1239170], [1239269, 1239319], [1239324, 1239398], [1254614, 1254627], [1301617, 1301621], [1503819, 1503832], [2097152, 2126232], [2129920, 2150587]], "Scrolling Sky v1.6": [[272344, 272406], [273782, 274227], [292352, 293631], [340352, 341223], [496073, 496083], [508182, 508187], [508192, 508196]]} \ No newline at end of file diff --git a/patches/rom_map/Bank 82.txt b/patches/rom_map/Bank 82.txt index 30a52ea1e6..2eb1d096e1 100644 --- a/patches/rom_map/Bank 82.txt +++ b/patches/rom_map/Bank 82.txt @@ -13,5 +13,5 @@ FF00 - FF10: reserve_hud.asm FF10 - FF30: escape.asm FF30 - FF80: reserve_hud.asm FF80 - FFFC: pause_menu_objectives.asm -FFFC - FFFE: fast_pause_menu +FFFC - FFFE: objectives/fast_pause_menu FFFE - end: custom etank color \ No newline at end of file diff --git a/patches/src/constants.asm b/patches/src/constants.asm index 1c47f8f121..69f02283be 100644 --- a/patches/src/constants.asm +++ b/patches/src/constants.asm @@ -33,3 +33,9 @@ !nmi_area4 = $1F86 !nmi_area5 = $1F87 !nmi_area6 = $1F88 + +; Objectives +!objectives_max = $0014 +!objectives_num = $82FFFC ; bits 0-15 +!objectives_addrs = $8FEBC0 +!objectives_bitmasks #= !objectives_addrs+(2*!objectives_max) diff --git a/patches/src/mb_barrier_clear.asm b/patches/src/mb_barrier_clear.asm index d08de397ee..b00c58c1f6 100644 --- a/patches/src/mb_barrier_clear.asm +++ b/patches/src/mb_barrier_clear.asm @@ -4,34 +4,68 @@ lorom !bank_84_freespace_start = $84F200 !bank_84_freespace_end = $84F300 -org $83AAD2 - dw $EB00 ; Set door ASM for Rinka Room toward Mother Brain - -macro check_objective(i,plm) - lda.w #$007E - sta.b $02 - lda.l ObjectiveAddrs+ - sta.b $00 - lda.l ObjectiveBitmasks+ - sta.b $04 - lda.b [$00] - bit.b $04 - beq ?skip ; skip clearing if objective not done +incsrc "constants.asm" +macro clear_plm(plm) jsl $8483D7 db db $04 dw clear_barrier_plm -?skip: endmacro +org $83AAD2 + dw $EB00 ; Set door ASM for Rinka Room toward Mother Brain + ; Free space in bank $8F org $8FEB00 - ; clear barriers in mother brain room based on main bosses killed: - %check_objective(0,$39) - %check_objective(2,$38) - %check_objective(4,$37) - %check_objective(6,$36) +door_asm_start: +; 2 potential scenarios for barriers: +; obj_num <= 4, clear individually from left to right +; obj_num > 4, maintain all 4 until all obj's cleared + lda !objectives_num : and $7FFF + cmp #$0005 + bcc normal_objs ; <= 4 ? + + ldx #$0000 + tay +; iterate through all obj's +.check_lp + jsr check_objective + beq motherbrain + dey + bne .check_lp + +; either none or all cleared +clear_all: + ldx #$FFFB + bra start_obj_checks + +; # obj's - 4 +normal_objs: + sec + sbc #$0004 + tax + +; starting value of X determines check/clear behavior +; X = 0 for stock behavior (4 objs) +; X < 0 will clear until 0, then check (for 0-3 objs) +; X = -4 will clear all objs +start_obj_checks: + jsr check_objective + beq .skip_1 + %clear_plm($36) +.skip_1 + jsr check_objective + beq .skip_2 + %clear_plm($37) +.skip_2 + jsr check_objective + beq .skip_3 + %clear_plm($38) +.skip_3 + jsr check_objective + beq motherbrain + %clear_plm($39) motherbrain: lda $7ed82d @@ -46,43 +80,55 @@ motherbrain: jsl remove_spikes done: rts + +check_objective: +; X >= 0 obj to check; X < 0 = return obj cleared +; also increments X + phx + txa + bmi .bypass_check + asl + tax + lda.w #$007E + sta.b $02 + lda.l ObjectiveAddrs, X + sta.b $00 + lda.l ObjectiveBitmasks, X + plx + inx + sta.b $04 + lda.b [$00] + bit.b $04 + rts +.bypass_check + plx + inx + lda #$0001 + rts -warnpc $8FEBC0 -org $8FEBC0 +warnpc !objectives_addrs + +org !objectives_addrs ObjectiveAddrs: - dw $D829, $D82A, $D82B, $D82C + dw $0000, $0000, $0000, $0000, $0000 + dw $0000, $0000, $0000, $0000, $0000 + dw $0000, $0000, $0000, $0000, $0000 + dw $0000, $0000, $0000, $0000, $0000 + dw $0000, $0000, $0000, $0000, $0000 ObjectiveBitmasks: - dw $0001, $0001, $0001, $0001 + dw $0001, $0001, $0001, $0001, $0001 + dw $0001, $0001, $0001, $0001, $0001 + dw $0001, $0001, $0001, $0001, $0001 + dw $0001, $0001, $0001, $0001, $0001 + dw $0001, $0001, $0001, $0001, $0001 ; OBJECTIVE: None (must match address in patch.rs) warnpc $8FECA0 org $8FECA0 - - jsl $8483D7 - db $39 - db $04 - dw clear_barrier_plm - - jsl $8483D7 - db $38 - db $04 - dw clear_barrier_plm - - jsl $8483D7 - db $37 - db $04 - dw clear_barrier_plm - - jsl $8483D7 - db $36 - db $04 - dw clear_barrier_plm - - jmp motherbrain - + jmp clear_all ; this section can be removed once patch.rs is updated + warnpc $8FED00 - ; Remove invisible spikes where Mother Brain used to be (common routine used by both the left and right door ASMs) org !bank_84_freespace_start diff --git a/patches/src/pause_menu_objectives.asm b/patches/src/pause_menu_objectives.asm index eeac0c8a69..ce00b6596d 100644 --- a/patches/src/pause_menu_objectives.asm +++ b/patches/src/pause_menu_objectives.asm @@ -20,6 +20,8 @@ arch 65816 math pri on +incsrc "constants.asm" + !bank_82_free_space_start = $82FF80 !bank_82_free_space_end = $82FFFC @@ -72,11 +74,6 @@ org $82A61D !n_lines = #$0012 -!ObjectiveAddrs = $8FEBC0 -!ObjectiveBitmasks = $8FEBE8 - -!n_objectives = $82fffc - ;;; character conversion table table "tables/pause_menu_objectives_chars.tbl",RTL @@ -313,7 +310,7 @@ pad_0: check_objs: ;;; check objectives and add check marks LDY.w #!line_size*2 ; start of 1st line - LDA !n_objectives : AND $7FFF + LDA !objectives_num : AND $7FFF STA !tmp_tile_offset ; # objectives BEQ .check_animals LDX #$0000 @@ -355,9 +352,9 @@ check_objective: ; X = index TAX LDA.w #$007E STA.b $02 - LDA.l !ObjectiveAddrs, X + LDA.l !objectives_addrs, X STA.b $00 - LDA.l !ObjectiveBitmasks, X + LDA.l !objectives_bitmasks, X STA.b $04 LDA.b [$00] PLX diff --git a/rust/maprando/src/patch.rs b/rust/maprando/src/patch.rs index 3aac0f8073..03b9fee3bb 100644 --- a/rust/maprando/src/patch.rs +++ b/rust/maprando/src/patch.rs @@ -396,39 +396,31 @@ fn apply_orig_ips_patches(rom: &mut Rom, randomization: &Randomization) -> Resul apply_ips_patch(rom, &patch_path)?; } - // Overwrite door ASM for entering Mother Brain room from right, used for clearing objective barriers: - if randomization.objectives.len() == 0 { - // Check for None objectives - rom.write_u16(snes2pc(0x83AAD2), 0xECA0)?; - } else if randomization.objectives.len() == 4 { - for (i, obj) in randomization.objectives.iter().enumerate() { - use Objective::*; - let (var, mask) = match obj { - Kraid => (0xD829, 1), - Ridley => (0xD82A, 1), - Phantoon => (0xD82B, 1), - Draygon => (0xD82C, 1), - SporeSpawn => (0xD829, 2), - Crocomire => (0xD82A, 2), - Botwoon => (0xD82C, 2), - GoldenTorizo => (0xD82A, 4), - MetroidRoom1 => (0xD822, 1), - MetroidRoom2 => (0xD822, 2), - MetroidRoom3 => (0xD822, 4), - MetroidRoom4 => (0xD822, 8), - BombTorizo => (0xD828, 4), - BowlingStatue => (0xD823, 1), - AcidChozoStatue => (0xD821, 0x10), - PitRoom => (0xD823, 2), - BabyKraidRoom => (0xD823, 4), - PlasmaRoom => (0xD823, 8), - MetalPiratesRoom => (0xD823, 0x10), - }; - rom.write_u16(snes2pc(0x8FEBC0) + i * 2, var)?; - rom.write_u16(snes2pc(0x8FEBC8) + i * 2, mask)?; - } - } else { - panic!("Unimplemented objective count != 4") + for (i, obj) in randomization.objectives.iter().enumerate() { + use Objective::*; + let (var, mask) = match obj { + Kraid => (0xD829, 1), + Ridley => (0xD82A, 1), + Phantoon => (0xD82B, 1), + Draygon => (0xD82C, 1), + SporeSpawn => (0xD829, 2), + Crocomire => (0xD82A, 2), + Botwoon => (0xD82C, 2), + GoldenTorizo => (0xD82A, 4), + MetroidRoom1 => (0xD822, 1), + MetroidRoom2 => (0xD822, 2), + MetroidRoom3 => (0xD822, 4), + MetroidRoom4 => (0xD822, 8), + BombTorizo => (0xD828, 4), + BowlingStatue => (0xD823, 1), + AcidChozoStatue => (0xD821, 0x10), + PitRoom => (0xD823, 2), + BabyKraidRoom => (0xD823, 4), + PlasmaRoom => (0xD823, 8), + MetalPiratesRoom => (0xD823, 0x10), + }; + rom.write_u16(snes2pc(0x8FEBC0) + i * 2, var)?; + rom.write_u16(snes2pc(0x8FEBE8) + i * 2, mask)?; } Ok(()) }