Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

SM: 0.4.2 fixes #2175

Merged
merged 226 commits into from
Sep 14, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
226 commits
Select commit Hold shift + click to select a range
ae5fa5b
first working (most of the time) progression generation for SM using …
lordlou Jul 23, 2021
52fb517
first working single-world randomized SM rom patches
lordlou Jul 24, 2021
4af5199
- SM now displays message when getting an item outside for someone el…
lordlou Jul 28, 2021
067bf83
First working MultiWorld SM
lordlou Jul 30, 2021
dfaf1bf
some missing things:
lordlou Aug 1, 2021
7a14a66
replaced CollectionState inheritance from SMBoolManager with a compos…
lordlou Aug 1, 2021
e51ba5b
- reenabled balancing
lordlou Aug 1, 2021
472ff36
post rebase fixes
lordlou Aug 1, 2021
b275706
updated SmClient.py
lordlou Aug 2, 2021
be0b190
+ added VariaRandomizer LICENSE
lordlou Aug 7, 2021
c327f21
+ added sm_randomizer_rom project (which builds sm.ips)
lordlou Aug 7, 2021
6389df8
Moved VariaRandomizer and sm_randomizer_rom projects inside worlds/sm…
lordlou Aug 8, 2021
f227519
properly revert change made to CollectionState and more cleaning
lordlou Aug 8, 2021
4b95263
Fixed multiworld support patch not working with VariaRandomizer's
lordlou Aug 8, 2021
9752260
missing file commit
lordlou Aug 8, 2021
f35a93c
Fixed syntax error in unused code to satisfy Linter
lordlou Aug 9, 2021
a2f3321
Revert "Fixed multiworld support patch not working with VariaRandomiz…
lordlou Aug 10, 2021
f038100
many fixes and improovement
lordlou Aug 14, 2021
e37b465
first working (most of the time) progression generation for SM using …
lordlou Jul 23, 2021
db17501
first working single-world randomized SM rom patches
lordlou Jul 24, 2021
9e92900
- SM now displays message when getting an item outside for someone el…
lordlou Jul 28, 2021
7c521be
First working MultiWorld SM
lordlou Jul 30, 2021
7e26c8b
some missing things:
lordlou Aug 1, 2021
c39f972
replaced CollectionState inheritance from SMBoolManager with a compos…
lordlou Aug 1, 2021
1cb8829
- reenabled balancing
lordlou Aug 1, 2021
695c9c3
post rebase fixes
lordlou Aug 1, 2021
605fbe3
updated SmClient.py
lordlou Aug 2, 2021
8010ccd
+ added VariaRandomizer LICENSE
lordlou Aug 7, 2021
6b5331d
+ added sm_randomizer_rom project (which builds sm.ips)
lordlou Aug 7, 2021
aec748e
Moved VariaRandomizer and sm_randomizer_rom projects inside worlds/sm…
lordlou Aug 8, 2021
f86d140
properly revert change made to CollectionState and more cleaning
lordlou Aug 8, 2021
ca732df
Fixed multiworld support patch not working with VariaRandomizer's
lordlou Aug 8, 2021
262e03f
missing file commit
lordlou Aug 8, 2021
df57f4d
Fixed syntax error in unused code to satisfy Linter
lordlou Aug 9, 2021
2eea867
Revert "Fixed multiworld support patch not working with VariaRandomiz…
lordlou Aug 10, 2021
9bef993
many fixes and improovement
lordlou Aug 14, 2021
a3eec29
Fixed multiworld support patch not working with VariaRandomizer's
lordlou Aug 21, 2021
a6474d9
+ added missing files from variaRandomizer project
lordlou Aug 22, 2021
91b52e1
+ added missing variaRandomizer files (custom sprites)
lordlou Aug 24, 2021
7b54dcd
Some fixes for player and server name display
lordlou Aug 24, 2021
057cc72
Fixed Goal completion not triggering in smClient
lordlou Aug 26, 2021
74faec7
integrated VariaRandomizer's options into AP (WIP)
lordlou Aug 31, 2021
2f985f3
- fixed itemsounds.ips crash by always including nofanfare.ips into m…
lordlou Sep 1, 2021
6f91194
skillset are now instanced per player instead of being a singleton class
lordlou Sep 2, 2021
44f9d86
RomPatches are now instanced per player instead of being a singleton …
lordlou Sep 2, 2021
3010fa9
DoorManager is now instanced per player instead of being a singleton …
lordlou Sep 3, 2021
8df3a62
- fixed the last bugs that prevented generation of >1 SM world
lordlou Sep 3, 2021
82bf9e5
fixed crash when no skillset preset is specified in randoPreset (defa…
lordlou Sep 3, 2021
d6f65bd
maxDifficulty support and itemsounds removal
lordlou Sep 4, 2021
f0dbb8b
Merge branch 'variaOptionsIntegration'
lordlou Sep 4, 2021
e1c30c4
Fixed bad merge
lordlou Sep 4, 2021
2413617
Merge branch 'main' of https://github.com/ArchipelagoMW/Archipelago
lordlou Sep 4, 2021
8972874
Post merge adaptation
lordlou Sep 4, 2021
4a67aee
fixed player name length fix that got lost with the merge
lordlou Sep 5, 2021
afb5904
fixed generation with other game type than SM
lordlou Sep 5, 2021
c4bcdac
added default randoPreset json for SM in playerSettings.yaml
lordlou Sep 5, 2021
f3846b8
fixed broken SM client following merge
lordlou Sep 5, 2021
4729355
beautified json skillset presets
lordlou Sep 7, 2021
8f02b71
Fixed ArchipelagoSmClient not building
lordlou Sep 7, 2021
fc9d390
Fixed conflict between mutliworld patch and beam_doors_plms patch
lordlou Sep 7, 2021
8941af9
SM generation now outputs APBP
lordlou Sep 7, 2021
36dc99d
added missing file and fixed multithreading issue
lordlou Sep 8, 2021
47f55ba
temporarily set data_version = 0
lordlou Sep 8, 2021
9575a56
Merge branch 'main' of https://github.com/ArchipelagoMW/Archipelago
lordlou Sep 11, 2021
d8f549d
more work
lordlou Sep 16, 2021
767e671
commited missing asm files
lordlou Sep 17, 2021
0b8b15b
Nothing item are now handled game-side. the game will now skip displa…
lordlou Sep 18, 2021
3b951bb
fixed No Energy Item missing its ID
lordlou Sep 19, 2021
876dc39
Merge branch 'main' of https://github.com/ArchipelagoMW/Archipelago
lordlou Sep 20, 2021
bdf671f
merge post fixes
lordlou Sep 20, 2021
6c289d8
Merge branch 'main' of https://github.com/ArchipelagoMW/Archipelago
lordlou Sep 23, 2021
57b139b
fixed start item Grapple, XRay and Reserve HUD, as well as graphic be…
lordlou Sep 23, 2021
46e1e86
fixed freeze in blue brinstar caused by Varia's custom PLM not being …
lordlou Sep 24, 2021
efe8d0a
fixed start item x-ray HUD display
lordlou Sep 25, 2021
d88a8c7
Fixed start items being sent by the server (is all handled in ROM)
lordlou Sep 26, 2021
1de52c5
Merge branch 'main' of https://github.com/ArchipelagoMW/Archipelago
lordlou Sep 26, 2021
c1efffc
fixed settings that could be applied to any SM players
lordlou Sep 27, 2021
28047cb
fixed auth to server only using player name (now does as ALTTP to aut…
lordlou Sep 29, 2021
d579814
- fixed End Credits broken text
lordlou Oct 1, 2021
33ac23e
Merge branch 'main' of https://github.com/ArchipelagoMW/Archipelago
lordlou Oct 1, 2021
a6bccbf
added non SM item name display
lordlou Oct 2, 2021
e1d018a
added all supported SM options in playerSettings.yaml
lordlou Oct 4, 2021
1482bae
Merge branch 'main' of https://github.com/ArchipelagoMW/Archipelago
lordlou Oct 4, 2021
6461a82
fixed locations needing a list of parent regions (now generate a regi…
lordlou Oct 8, 2021
cd8077c
minor setting fixes and tweaks
lordlou Oct 8, 2021
d42ab88
added option start_inventory_removes_from_pool
lordlou Oct 9, 2021
1f1b4d7
Hopefully fixed ROR2 that could not send any items
lordlou Oct 10, 2021
a141ab1
Merge branch 'main' of https://github.com/ArchipelagoMW/Archipelago
lordlou Oct 10, 2021
eaa8e67
- fixed missing required change to ROR2
lordlou Oct 10, 2021
efc849e
fixed 0 hp when respawning without having ever saved (start items wer…
lordlou Oct 12, 2021
65c1366
fixed typo with doors_colors_rando
lordlou Oct 12, 2021
db799c9
fixed checksum
lordlou Oct 13, 2021
f33acac
added custom sprites for off-world items (progression or not)
lordlou Oct 19, 2021
cf756cc
Merge branch 'main' of https://github.com/ArchipelagoMW/Archipelago
lordlou Oct 19, 2021
b75755d
- added missing change following upstream merge
lordlou Oct 19, 2021
c151f19
Merge branch 'main' of https://github.com/ArchipelagoMW/Archipelago
lordlou Oct 22, 2021
8734231
added morph placement options: early means local and sphere 1
lordlou Oct 22, 2021
63979db
fixed failing unit tests
lordlou Oct 22, 2021
5fdb9ea
- fixed broken custom_preset options
lordlou Oct 24, 2021
6c2a453
- big cleanup to remove unnecessary or unsupported features
lordlou Oct 24, 2021
71cc1a8
- more cleanup
lordlou Oct 24, 2021
e36e0c0
- moved sm_randomizer_rom and all always applied patches into an exte…
lordlou Oct 24, 2021
8058ded
- added comment to refer to project for generating basepatch.ips (htt…
lordlou Oct 24, 2021
aad65ef
Merge branch 'main' of https://github.com/ArchipelagoMW/Archipelago
lordlou Oct 24, 2021
3f5795c
fixed g4_skip patch that can be not applied if hud is enabled
lordlou Oct 25, 2021
ca3470e
- fixed off world sprite that can have broken graphics (restricted to…
lordlou Oct 25, 2021
272fe40
- updated basepatch to reflect g4_skip removal
lordlou Oct 25, 2021
4df71d6
- tourian grey doors at baby metroid are now always flashing (allowin…
lordlou Oct 29, 2021
be0c005
Merge branch 'main' of https://github.com/ArchipelagoMW/Archipelago
lordlou Oct 29, 2021
332030e
fixed wrong path if using built as exe
lordlou Oct 29, 2021
efc89d3
- cleaned exposed maxDifficulty options
lordlou Oct 29, 2021
a1cf495
Merged LttPClient and SMClient into SNIClient
lordlou Oct 31, 2021
4308443
Merge branch 'main' of https://github.com/ArchipelagoMW/Archipelago
lordlou Oct 31, 2021
2baf457
added varia_custom Preset Option that fetch a preset (read from a new…
lordlou Nov 1, 2021
8bf976f
small doc precision
lordlou Nov 4, 2021
ec9024b
Merge branch 'main' of https://github.com/ArchipelagoMW/Archipelago
lordlou Nov 4, 2021
182947f
- added death_link support
lordlou Nov 5, 2021
186dca1
- removed now useless presets
lordlou Nov 6, 2021
090cfab
- fixed bad internal mapping with maxDiff
lordlou Nov 6, 2021
2ba3b9c
- added support for lowercase custom preset sections (knows, settings…
lordlou Nov 8, 2021
1cc271c
- fixed death loop when dying with Door rando, bomb or speed booster …
lordlou Nov 9, 2021
9146966
Merge branch 'main' of https://github.com/ArchipelagoMW/Archipelago
lordlou Nov 9, 2021
d2f5eaf
-added docstring for generated yaml
lordlou Nov 9, 2021
63ee5fe
Merge branch 'main' of https://github.com/ArchipelagoMW/Archipelago
lordlou Nov 12, 2021
fb5ba87
fixed bad merge
lordlou Nov 12, 2021
83130d5
fixed broken infinity max difficulty
lordlou Nov 12, 2021
534f285
commented debug prints
lordlou Nov 12, 2021
2bf555e
adjusted credits to mark progression speed and difficulty as Non Avai…
lordlou Nov 13, 2021
23b9ea7
added support for more than 255 players (will print Archipelago for h…
lordlou Nov 13, 2021
2755836
Merge branch 'main' of https://github.com/ArchipelagoMW/Archipelago
lordlou Nov 13, 2021
dc027fc
fixed missing cleanup
lordlou Nov 13, 2021
b99145a
added support for 65535 different player names in ROM
lordlou Nov 14, 2021
265f49c
Merge branch 'main' of https://github.com/ArchipelagoMW/Archipelago
lordlou Nov 14, 2021
bc5ce7e
fixed generations failing when only bosses are unreachable
lordlou Nov 24, 2021
90ef9e2
- replaced setting maxDiff to infinity with a bool only affecting bos…
lordlou Nov 26, 2021
808a1b7
fixed failling generations when using 'fun' settings
lordlou Nov 27, 2021
e43626d
fixed debug logger
lordlou Nov 27, 2021
2d12a89
removed unsupported "suits_restriction" option
lordlou Nov 27, 2021
63fb461
fixed generations failing when only bosses are unreachable (using a l…
lordlou Nov 30, 2021
0874506
Merge branch 'main' of https://github.com/ArchipelagoMW/Archipelago
lordlou Dec 2, 2021
cda843f
Merge branch 'fix/onlyBossLeft'
lordlou Dec 2, 2021
cdea398
- fixed deathlink emptying reserves
lordlou Dec 2, 2021
8ac1405
- merged death_link and death_link_survive options
lordlou Dec 2, 2021
54ed17e
Merge branch 'main' of https://github.com/ArchipelagoMW/Archipelago
lordlou Jan 4, 2022
958a016
fixed death_link
lordlou Jan 5, 2022
74f153d
added a fallback default starting location instead of failing generat…
lordlou Jan 5, 2022
f1d5a29
added Nothing and NoEnergy as hint blacklist
lordlou Jan 5, 2022
98f11c2
Merge branch 'main' of https://github.com/ArchipelagoMW/Archipelago
lordlou Jan 17, 2022
1589660
Merge branch 'main' of https://github.com/ArchipelagoMW/Archipelago
lordlou Jan 21, 2022
7ffd3dd
Merge branch 'main' of https://github.com/ArchipelagoMW/Archipelago
lordlou Jan 22, 2022
cc47e63
Merge branch 'main' of https://github.com/ArchipelagoMW/Archipelago
lordlou Jan 23, 2022
2c2afb4
Merge branch 'main' of https://github.com/ArchipelagoMW/Archipelago
lordlou Jan 23, 2022
792a8cf
Merge branch 'main' of https://github.com/ArchipelagoMW/Archipelago
lordlou Feb 5, 2022
bea27db
Merge branch 'main' of https://github.com/ArchipelagoMW/Archipelago
lordlou Feb 6, 2022
d4b7ded
Merge branch 'main' of https://github.com/ArchipelagoMW/Archipelago
lordlou Feb 6, 2022
0a40a95
Merge branch 'main' of https://github.com/ArchipelagoMW/Archipelago
lordlou Feb 8, 2022
c7dd84b
Merge branch 'main' of https://github.com/ArchipelagoMW/Archipelago
lordlou Feb 12, 2022
31d6952
Merge branch 'main' of https://github.com/ArchipelagoMW/Archipelago
lordlou Feb 13, 2022
029b4f6
Merge branch 'main' of https://github.com/ArchipelagoMW/Archipelago
lordlou Feb 16, 2022
09a4ad0
Merge branch 'main' of https://github.com/ArchipelagoMW/Archipelago
lordlou Feb 19, 2022
92bd79c
Merge branch 'main' of https://github.com/ArchipelagoMW/Archipelago
lordlou Feb 21, 2022
6396de3
Merge branch 'main' of https://github.com/ArchipelagoMW/Archipelago
lordlou Feb 26, 2022
c8487a0
Merge branch 'main' of https://github.com/ArchipelagoMW/Archipelago
lordlou Mar 2, 2022
218c374
Merge branch 'main' of https://github.com/ArchipelagoMW/Archipelago
lordlou Mar 4, 2022
1f33a83
Merge branch 'main' of https://github.com/ArchipelagoMW/Archipelago
lordlou Mar 13, 2022
284aae7
Merge branch 'main' of https://github.com/ArchipelagoMW/Archipelago
lordlou Mar 13, 2022
59f6390
Merge branch 'main' of https://github.com/ArchipelagoMW/Archipelago
lordlou Mar 17, 2022
3fd3075
Merge branch 'main' of https://github.com/ArchipelagoMW/Archipelago
lordlou Mar 19, 2022
bfd0e9e
Merge branch 'main' of https://github.com/ArchipelagoMW/Archipelago
lordlou Mar 24, 2022
4865509
Merge branch 'main' of https://github.com/ArchipelagoMW/Archipelago
lordlou Mar 26, 2022
4209035
Merge branch 'main' of https://github.com/ArchipelagoMW/Archipelago
lordlou Apr 2, 2022
7a83bdc
Merge branch 'main' of https://github.com/ArchipelagoMW/Archipelago
lordlou Apr 2, 2022
c3723bc
Merge branch 'main' of https://github.com/ArchipelagoMW/Archipelago
lordlou Apr 22, 2022
4b307f3
Merge branch 'main' of https://github.com/ArchipelagoMW/Archipelago
lordlou May 14, 2022
0c18c4d
Merge branch 'main' of https://github.com/ArchipelagoMW/Archipelago
lordlou May 16, 2022
c4f7cb5
Merge branch 'main' of https://github.com/ArchipelagoMW/Archipelago
lordlou May 19, 2022
3609d7a
Merge branch 'main' of https://github.com/ArchipelagoMW/Archipelago
lordlou May 25, 2022
785f67d
Merge branch 'main' of https://github.com/ArchipelagoMW/Archipelago
lordlou May 30, 2022
a955588
Merge branch 'main' of https://github.com/ArchipelagoMW/Archipelago
lordlou Jun 18, 2022
86475cc
Merge branch 'main' of https://github.com/ArchipelagoMW/Archipelago
lordlou Jun 25, 2022
e563908
Merge branch 'main' of https://github.com/ArchipelagoMW/Archipelago
lordlou Jul 7, 2022
f8d006c
Merge branch 'main' of https://github.com/ArchipelagoMW/Archipelago
lordlou Jul 16, 2022
c21a741
Merge branch 'main' of https://github.com/ArchipelagoMW/Archipelago
lordlou Jul 17, 2022
5ae0467
Merge branch 'main' of https://github.com/ArchipelagoMW/Archipelago
lordlou Jul 22, 2022
7cd64df
Merge branch 'main' of https://github.com/ArchipelagoMW/Archipelago
lordlou Jul 29, 2022
d0f3d18
Merge branch 'main' of https://github.com/ArchipelagoMW/Archipelago
lordlou Jul 30, 2022
406dd8d
Merge branch 'main' of https://github.com/ArchipelagoMW/Archipelago
lordlou Aug 7, 2022
9a8dec2
Merge branch 'main' of https://github.com/ArchipelagoMW/Archipelago
lordlou Aug 9, 2022
3759939
Merge branch 'main' of https://github.com/ArchipelagoMW/Archipelago
lordlou Aug 12, 2022
6c9ffa3
Merge branch 'main' of https://github.com/ArchipelagoMW/Archipelago
lordlou Aug 18, 2022
6ae4624
Merge branch 'main' of https://github.com/ArchipelagoMW/Archipelago
lordlou Aug 20, 2022
d008de2
Merge branch 'main' of https://github.com/ArchipelagoMW/Archipelago
lordlou Aug 27, 2022
a81035f
Merge branch 'main' of https://github.com/ArchipelagoMW/Archipelago
lordlou Aug 30, 2022
ae47002
Merge branch 'main' of https://github.com/ArchipelagoMW/Archipelago
lordlou Sep 3, 2022
c52769f
Merge branch 'main' of https://github.com/ArchipelagoMW/Archipelago
lordlou Sep 6, 2022
20f4b9b
Merge branch 'main' of https://github.com/ArchipelagoMW/Archipelago
lordlou Oct 8, 2022
a645fe4
Merge branch 'main' of https://github.com/ArchipelagoMW/Archipelago
lordlou Oct 10, 2022
baacaf9
Merge branch 'main' of https://github.com/ArchipelagoMW/Archipelago
lordlou Oct 18, 2022
84847db
Merge branch 'main' of https://github.com/ArchipelagoMW/Archipelago
lordlou Oct 24, 2022
b70a311
Merge branch 'main' of https://github.com/ArchipelagoMW/Archipelago
lordlou Nov 25, 2022
6fa9572
Merge branch 'main' of https://github.com/ArchipelagoMW/Archipelago
lordlou Nov 30, 2022
b854c75
Merge branch 'main' of https://github.com/ArchipelagoMW/Archipelago
lordlou Jan 21, 2023
50e4a4a
Merge branch 'main' of https://github.com/ArchipelagoMW/Archipelago
lordlou Jan 28, 2023
cb1948d
Merge branch 'main' of https://github.com/ArchipelagoMW/Archipelago
lordlou Feb 1, 2023
205e268
Merge branch 'main' of https://github.com/ArchipelagoMW/Archipelago
lordlou Feb 24, 2023
6779da5
Merge branch 'main' of https://github.com/ArchipelagoMW/Archipelago
lordlou Mar 3, 2023
ce32da2
Merge branch 'main' of https://github.com/ArchipelagoMW/Archipelago
lordlou Mar 24, 2023
9b16991
Merge branch 'main' of https://github.com/ArchipelagoMW/Archipelago
lordlou Apr 3, 2023
d4b4db8
Merge branch 'main' of https://github.com/ArchipelagoMW/Archipelago
lordlou Apr 8, 2023
992ca2f
Merge branch 'main' of https://github.com/ArchipelagoMW/Archipelago
lordlou Apr 8, 2023
050d14a
Merge branch 'main' of https://github.com/ArchipelagoMW/Archipelago
lordlou Apr 10, 2023
b47a629
Merge branch 'main' of https://github.com/ArchipelagoMW/Archipelago
lordlou Apr 15, 2023
d7fc291
Merge branch 'main' of https://github.com/ArchipelagoMW/Archipelago
lordlou Apr 18, 2023
836b1e4
Merge branch 'main' of https://github.com/ArchipelagoMW/Archipelago
lordlou Apr 20, 2023
8a647a7
Merge branch 'main' of https://github.com/ArchipelagoMW/Archipelago
lordlou Apr 22, 2023
3da86c4
Merge branch 'main' of https://github.com/ArchipelagoMW/Archipelago
lordlou Apr 27, 2023
f0412e7
Merge branch 'main' of https://github.com/ArchipelagoMW/Archipelago
lordlou Apr 27, 2023
31f99ee
Merge branch 'main' of https://github.com/ArchipelagoMW/Archipelago
lordlou May 7, 2023
a85a351
Merge branch 'main' of https://github.com/ArchipelagoMW/Archipelago
lordlou May 9, 2023
df40e3d
Merge branch 'main' of https://github.com/ArchipelagoMW/Archipelago
lordlou May 30, 2023
5ac7aa4
Merge branch 'main' of https://github.com/ArchipelagoMW/Archipelago
lordlou Jul 2, 2023
a0cdac0
Merge branch 'main' of https://github.com/ArchipelagoMW/Archipelago
lordlou Jul 6, 2023
15f92d6
Merge branch 'main' of https://github.com/ArchipelagoMW/Archipelago
lordlou Aug 13, 2023
8d8b587
Merge branch 'main' of https://github.com/ArchipelagoMW/Archipelago
lordlou Sep 12, 2023
f136dab
moved door_indicators_plms.ips to AP to fix disabling layout patch
lordlou Sep 12, 2023
90856db
fixed broken map data saving when using fast_save
lordlou Sep 13, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file modified worlds/sm/data/SMBasepatch_prebuilt/multiworld-basepatch.ips
Binary file not shown.
315 changes: 161 additions & 154 deletions worlds/sm/data/SMBasepatch_prebuilt/multiworld.sym
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
; generated by asar

[labels]
82:FA23 :neg_1_1
82:FA35 :neg_1_1
B8:83C1 :neg_1_2
B8:85DA :neg_1_3
B8:85F9 :neg_1_4
Expand Down Expand Up @@ -177,7 +177,7 @@ A0:FE00 setup_music
A0:FE0B setup_music_quick
A0:FE94 setup_samus
A0:FEA5 setup_samus_normal
82:FA15 sm_fix_checksum
82:FA27 sm_fix_checksum
B8:8800 sm_item_graphics
B8:882E sm_item_plm_pickup_sequence_pointers
B8:847B sm_save_done_hook
Expand All @@ -192,171 +192,178 @@ B8:83F4 write_repeated_memory_loop

[source files]
0000 fe019f55 main.asm
0001 91a745e3 ../common/fast_reload.asm
0001 be17692f ../common/fast_reload.asm
0002 06780555 ../common/nofanfare.asm
0003 7a8904b6 ../common/multiworld.asm
0004 f7e9db95 ../common/itemextras.asm
0005 b0dd378a ../common/items.asm
0006 dbfcb38d ../common/startitem.asm

[rom checksum]
f95f09a7
979ac031

[addr-to-line mapping]
ff:ffff 0000:00000001
ce:ff0a 0001:00000012
82:f990 0001:00000016
82:f991 0001:00000017
82:f993 0001:00000018
82:f994 0001:00000019
82:f996 0001:0000001a
82:f999 0001:0000001b
82:f99c 0001:0000001c
82:f99e 0001:0000001d
82:f9a2 0001:0000001e
82:f9a4 0001:0000001f
82:f9a7 0001:00000020
82:f9a9 0001:00000021
82:f9ac 0001:00000022
82:f9af 0001:00000023
82:f9b1 0001:00000024
82:f9b5 0001:00000025
82:f9b8 0001:00000026
82:f9ba 0001:00000027
82:f9bd 0001:00000028
82:f9c1 0001:00000029
82:f9c3 0001:0000002a
82:f9c4 0001:0000002b
82:f9c5 0001:0000002c
82:f9c8 0001:0000002d
82:f9c9 0001:0000002f
82:f9ca 0001:00000030
82:f9cb 0001:00000031
82:f9cc 0001:00000034
82:f9cd 0001:00000035
82:f9cf 0001:00000036
82:f9d2 0001:00000037
82:f9d5 0001:00000039
82:f9d9 0001:0000003a
82:f9dc 0001:0000003a
82:f9de 0001:0000003b
82:f9e1 0001:0000003d
82:f9e2 0001:0000003e
82:f9e5 0001:0000003e
82:f9e6 0001:0000003e
82:f9e9 0001:0000003f
82:f9ea 0001:0000003f
82:f9eb 0001:00000040
82:f9ee 0001:00000040
82:f9f1 0001:00000041
82:f9f2 0001:00000042
82:f9f6 0001:00000043
82:f9fa 0001:00000044
82:f9fe 0001:00000046
82:fa02 0001:00000047
82:fa05 0001:00000048
82:fa09 0001:00000049
82:fa0d 0001:0000004a
82:fa10 0001:0000004b
82:fa13 0001:0000004c
82:fa14 0001:0000004d
82:fa15 0001:00000050
82:fa16 0001:00000051
ce:ff0a 0001:00000013
82:f990 0001:00000017
82:f991 0001:00000018
82:f993 0001:00000019
82:f994 0001:0000001a
82:f996 0001:0000001b
82:f999 0001:0000001c
82:f99c 0001:0000001d
82:f99e 0001:0000001e
82:f9a2 0001:0000001f
82:f9a4 0001:00000020
82:f9a7 0001:00000021
82:f9a9 0001:00000022
82:f9ac 0001:00000023
82:f9af 0001:00000024
82:f9b1 0001:00000025
82:f9b5 0001:00000026
82:f9b8 0001:00000027
82:f9ba 0001:00000028
82:f9bd 0001:00000029
82:f9c1 0001:0000002a
82:f9c3 0001:0000002b
82:f9c4 0001:0000002c
82:f9c5 0001:0000002d
82:f9c8 0001:0000002e
82:f9c9 0001:00000030
82:f9ca 0001:00000031
82:f9cb 0001:00000032
82:f9cc 0001:00000035
82:f9cd 0001:00000036
82:f9cf 0001:00000037
82:f9d2 0001:00000038
82:f9d5 0001:0000003a
82:f9d9 0001:0000003b
82:f9dc 0001:0000003b
82:f9de 0001:0000003c
82:f9e1 0001:0000003e
82:f9e2 0001:0000003f
82:f9e6 0001:00000040
82:f9ea 0001:00000042
82:f9ee 0001:00000043
82:f9f0 0001:00000044
82:f9f1 0001:00000045
82:f9f2 0001:00000046
82:f9f6 0001:00000047
82:f9f9 0001:00000048
82:f9fa 0001:00000049
82:f9fb 0001:0000004a
82:f9fc 0001:0000004b
82:f9ff 0001:0000004b
82:fa00 0001:0000004b
82:fa04 0001:0000004c
82:fa05 0001:0000004d
82:fa08 0001:0000004d
82:fa0c 0001:0000004e
82:fa10 0001:00000050
82:fa14 0001:00000051
82:fa17 0001:00000052
82:fa18 0001:00000053
82:fa19 0000:00000013
82:fa1b 0001:00000057
82:fa1d 0001:00000058
82:fa1e 0001:00000059
82:fa20 0001:0000005a
82:fa23 0001:0000005c
82:fa27 0001:0000005d
82:fa28 0001:0000005e
82:fa2a 0001:0000005f
82:fa2c 0001:00000060
82:fa1b 0001:00000053
82:fa1f 0001:00000054
82:fa22 0001:00000055
82:fa25 0001:00000056
82:fa26 0001:00000057
82:fa27 0001:0000005a
82:fa28 0001:0000005b
82:fa29 0001:0000005c
82:fa2a 0001:0000005d
82:fa2b 0000:00000013
82:fa2d 0001:00000061
82:fa2e 0001:00000062
82:fa31 0001:00000063
82:fa33 0001:00000065
82:fa36 0001:00000066
82:fa38 0001:00000067
82:fa3c 0001:00000068
82:fa40 0001:00000069
82:fa43 0001:0000006a
82:fa47 0001:0000006b
82:fa4b 0001:0000006c
82:fa4c 0001:0000006d
82:fa4e 0001:0000006f
82:fa4f 0001:00000070
82:fa50 0001:00000071
82:fa51 0001:00000072
82:fa2f 0001:00000062
82:fa30 0001:00000063
82:fa32 0001:00000064
82:fa35 0001:00000066
82:fa39 0001:00000067
82:fa3a 0001:00000068
82:fa3c 0001:00000069
82:fa3e 0001:0000006a
82:fa3f 0001:0000006b
82:fa40 0001:0000006c
82:fa43 0001:0000006d
82:fa45 0001:0000006f
82:fa48 0001:00000070
82:fa4a 0001:00000071
82:fa4e 0001:00000072
82:fa52 0001:00000073
80:a088 0001:00000079
80:a08c 0001:00000079
80:a08d 0001:00000079
80:a095 0001:0000007c
80:a0ce 0001:0000007f
80:a113 0001:00000082
91:e164 0001:00000085
91:e168 0001:00000085
91:e169 0001:00000085
a0:fe00 0001:0000008a
a0:fe03 0001:0000008b
a0:fe05 0001:0000008c
a0:fe08 0001:0000008d
a0:fe0b 0001:0000008f
a0:fe0c 0001:00000092
a0:fe10 0001:00000093
a0:fe13 0001:00000094
a0:fe15 0001:00000095
a0:fe18 0001:00000096
a0:fe1b 0001:00000097
a0:fe1f 0001:00000099
a0:fe23 0001:0000009a
a0:fe27 0001:0000009b
a0:fe2b 0001:0000009c
a0:fe2f 0001:0000009f
a0:fe33 0001:000000a0
a0:fe36 0001:000000a1
a0:fe38 0001:000000a2
a0:fe3c 0001:000000a3
a0:fe40 0001:000000a5
a0:fe44 0001:000000a8
a0:fe48 0001:000000a9
a0:fe49 0001:000000aa
a0:fe4c 0001:000000ab
a0:fe4e 0001:000000ac
a0:fe4f 0001:000000ad
a0:fe53 0001:000000ae
a0:fe57 0001:000000b0
a0:fe58 0001:000000b1
a0:fe5c 0001:000000b2
a0:fe5f 0001:000000b3
a0:fe62 0001:000000b4
a0:fe65 0001:000000b5
a0:fe67 0001:000000b6
a0:fe6a 0001:000000b7
a0:fe6d 0001:000000b8
a0:fe6f 0001:000000b9
a0:fe73 0001:000000bc
a0:fe76 0001:000000bd
a0:fe79 0001:000000be
a0:fe7c 0001:000000bf
a0:fe7f 0001:000000c1
a0:fe82 0001:000000c2
a0:fe85 0001:000000c3
a0:fe89 0001:000000c4
a0:fe8c 0001:000000c5
a0:fe90 0001:000000c7
a0:fe94 0001:000000ca
a0:fe97 0001:000000cb
a0:fe99 0001:000000cc
a0:fe9c 0001:000000cd
a0:fe9f 0001:000000ce
a0:fea2 0001:000000cf
a0:fea5 0001:000000d1
a0:fea8 0001:000000d2
a0:feab 0001:000000d3
82:fa55 0001:00000074
82:fa59 0001:00000075
82:fa5d 0001:00000076
82:fa5e 0001:00000077
82:fa60 0001:00000079
82:fa61 0001:0000007a
82:fa62 0001:0000007b
82:fa63 0001:0000007c
82:fa64 0001:0000007d
80:a088 0001:00000083
80:a08c 0001:00000083
80:a08d 0001:00000083
80:a095 0001:00000086
80:a0ce 0001:00000089
80:a113 0001:0000008c
91:e164 0001:0000008f
91:e168 0001:0000008f
91:e169 0001:0000008f
a0:fe00 0001:00000094
a0:fe03 0001:00000095
a0:fe05 0001:00000096
a0:fe08 0001:00000097
a0:fe0b 0001:00000099
a0:fe0c 0001:0000009c
a0:fe10 0001:0000009d
a0:fe13 0001:0000009e
a0:fe15 0001:0000009f
a0:fe18 0001:000000a0
a0:fe1b 0001:000000a1
a0:fe1f 0001:000000a3
a0:fe23 0001:000000a4
a0:fe27 0001:000000a5
a0:fe2b 0001:000000a6
a0:fe2f 0001:000000a9
a0:fe33 0001:000000aa
a0:fe36 0001:000000ab
a0:fe38 0001:000000ac
a0:fe3c 0001:000000ad
a0:fe40 0001:000000af
a0:fe44 0001:000000b2
a0:fe48 0001:000000b3
a0:fe49 0001:000000b4
a0:fe4c 0001:000000b5
a0:fe4e 0001:000000b6
a0:fe4f 0001:000000b7
a0:fe53 0001:000000b8
a0:fe57 0001:000000ba
a0:fe58 0001:000000bb
a0:fe5c 0001:000000bc
a0:fe5f 0001:000000bd
a0:fe62 0001:000000be
a0:fe65 0001:000000bf
a0:fe67 0001:000000c0
a0:fe6a 0001:000000c1
a0:fe6d 0001:000000c2
a0:fe6f 0001:000000c3
a0:fe73 0001:000000c6
a0:fe76 0001:000000c7
a0:fe79 0001:000000c8
a0:fe7c 0001:000000c9
a0:fe7f 0001:000000cb
a0:fe82 0001:000000cc
a0:fe85 0001:000000cd
a0:fe89 0001:000000ce
a0:fe8c 0001:000000cf
a0:fe90 0001:000000d1
a0:fe94 0001:000000d4
a0:fe97 0001:000000d5
a0:fe99 0001:000000d6
a0:fe9c 0001:000000d7
a0:fe9f 0001:000000d8
a0:fea2 0001:000000d9
a0:fea5 0001:000000db
a0:fea8 0001:000000dc
a0:feab 0001:000000dd
85:ff00 0002:0000010b
85:ff03 0002:0000010c
85:ff06 0002:0000010d
Expand Down
5 changes: 3 additions & 2 deletions worlds/sm/data/SMBasepatch_prebuilt/sm-basepatch-symbols.json
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,7 @@
"setup_music_quick": "A0:FE0B",
"setup_samus": "A0:FE94",
"setup_samus_normal": "A0:FEA5",
"sm_fix_checksum": "82:FA15",
"sm_fix_checksum": "82:FA27",
"sm_item_graphics": "B8:8800",
"sm_item_plm_pickup_sequence_pointers": "B8:882E",
"sm_save_done_hook": "B8:847B",
Expand All @@ -172,10 +172,11 @@
"write_repeated_memory_loop": "B8:83F4",
"deathhook82": "82:DDC7",
"freespace82_start": "82:F990",
"freespace82_end": "82:FA53",
"freespace82_end": "82:FA65",
"freespacea0": "a0:fe00",
"SRAM_SAVING": "70:2604",
"current_save_slot": "7e:0952",
"sram_save_slot_addresses": "81:812B",
"ITEM_RAM": "7E:09A2",
"SRAM_MW_ITEMS_RECV": "70:2000",
"SRAM_MW_ITEMS_RECV_WCOUNT": "70:2602",
Expand Down
Binary file modified worlds/sm/data/SMBasepatch_prebuilt/variapatches.ips
Binary file not shown.
4 changes: 3 additions & 1 deletion worlds/sm/variaRandomizer/rom/rompatcher.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,9 @@ class RomPatcher:
# faster MB cutscene transitions
'Mother_Brain_Cutscene_Edits',
# "Balanced" suit mode
'Removes_Gravity_Suit_heat_protection'
'Removes_Gravity_Suit_heat_protection',
# new PLMs for indicating the color of the door on the other side
'door_indicators_plms.ips'
],
# VARIA tweaks
'VariaTweaks' : ['WS_Etank', 'LN_Chozo_SpaceJump_Check_Disable', 'ln_chozo_platform.ips', 'bomb_torizo.ips'],
Expand Down
Loading