Organize ship specific save context additions #4597
Merged
Conversation
This file contains 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
|
The failed linux check here looks real, if you aren't aware. seems to be some LUS thing not liking your changes |
Malkierian
approved these changes
Dec 12, 2024
|
I think that's a straightforward conflict resolution, but just in case I'll have you take care of it, then we'll get it merged. |
aMannus
reviewed
Jan 5, 2025
Comment on lines
401
to
405
| // Sets all rando flags to false | ||
| for (s32 i = 0; i < ARRAY_COUNT(gSaveContext.randomizerInf); i++) { | ||
| gSaveContext.randomizerInf[i] = 0; | ||
| } | ||
|
|
soh/soh/SaveManager.cpp
Outdated
Comment on lines
822
to
826
| for (int flag = 0; flag < ARRAY_COUNT(gSaveContext.randomizerInf); flag++) { | ||
| gSaveContext.randomizerInf[flag] = 0; | ||
| } |
soh/src/code/z_actor.c
Outdated
Comment on lines
4999
to
5004
| if (!IS_RANDO) { | ||
| LUSLOG_ERROR("Tried to set randomizerInf flag \"%d\" outside of rando", flag); | ||
| assert(false); | ||
| return; | ||
| } | ||
|
|
There was a problem hiding this comment.
I understand why this was added while you were already around this code, but I'd suggest to separate this kinda stuff into a different PR down the line.
|
Funnily enough, all those changes were stuff that I forgot to revert after moving the |
|
Once the build succeeds again and conflicts are resolved, I'll look to get this in again. |
aMannus
approved these changes
Jan 15, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
I've left
randomizerInfalone for now, will probably do a followup pr soon.Build Artifacts