add support for explosive data to increment ammo#154
Merged
zarakava merged 4 commits intoMetroidAdvRandomizerSystem:mainfrom Jun 19, 2025
Merged
add support for explosive data to increment ammo#154zarakava merged 4 commits intoMetroidAdvRandomizerSystem:mainfrom
zarakava merged 4 commits intoMetroidAdvRandomizerSystem:mainfrom
Conversation
cluekitty
force-pushed
the
data-increments-ammo
branch
from
427697d to
da5eba3
Compare
cluekitty
commented
Jun 17, 2025
cluekitty
commented
Jun 17, 2025
Comment on lines
+20
to
+24
| TOTAL_METROID_COUNT_ADDR = 0x7FF010 | ||
| REQUIRED_METROID_COUNT_ADDR = 0x7FF010 | ||
| STARTING_LOCATION_ADDR = 0x7FF014 | ||
| CREDITS_END_DELAY_ADDR = 0x7FF018 # TODO: Is this meant to be changed? | ||
| CREDITS_SCROLL_SPEED_ADDR = 0x7FF018 # + 2 TODO: Ditto |
Contributor
Author
There was a problem hiding this comment.
Metroid and Credits Information was bundled into 1 pointer with data following each other sequentially. I almost would have preferred individual pointers so we are not doing arbitrary math, but I left the ASM side up to @zarakava so I worked with what he had presented.
zarakava
approved these changes
Jun 18, 2025
…d constants to use pointers to constants
for more information, see https://pre-commit.ci
cluekitty
force-pushed
the
data-increments-ammo
branch
from
2009c22 to
522ab33
Compare
for more information, see https://pre-commit.ci
zarakava
approved these changes
Jun 19, 2025
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
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.
Also refactors reserved constants to use pointers to constants.
Relates to MetroidAdvRandomizerSystem/mars-fusion-asm#273
Relies on MetroidAdvRandomizerSystem/mars-fusion-asm#274