Sram rework #985
Merged
Sram rework #985
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Refactor starting equipment, game state, etc to use initial SRAM table
sporchia
reviewed
Apr 5, 2022
Comment on lines
-213
to
-219
| // force starting bomb and quiver capacities | ||
| $world->setPreCollectedItems(new ItemCollection([ | ||
| Item::get('BombUpgrade10', $world), | ||
| Item::get('ArrowUpgrade10', $world), | ||
| Item::get('ArrowUpgrade10', $world), | ||
| Item::get('ArrowUpgrade10', $world), | ||
| ])); |
Owner
There was a problem hiding this comment.
Are we relying on a different mech? (how does this work with customizer?)
Contributor
Author
There was a problem hiding this comment.
Basically there was a conflict with this and the ammo upgrade counters in SRAM which is why I changed it. So the starting max also gets set separately in the Rom.php (StartingMaxArrows and StartingMaxBombs in tables.asm.) Then it will work as normal with no starting upgrades but they can be added as starting items and will be applied correctly in customizer as well. The world model and filler don't depend on these being pre-collected as far as I can tell.
sporchia
approved these changes
Apr 5, 2022
Remove function for pre-opening lumberjack tree
Owner
|
I updated underlying deps, please fix conflicts so we can merge :) |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Adds an initial SRAM class which computes the state of the first 0x500 bytes of SRAM and writes it to a table in the ROM. Corresponds with ROM changes in KatDevsGames/z3randomizer#159