Fix and Clean Up Swap Age Logic #4061
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
briaguya-ai
reviewed
Apr 20, 2024
briaguya-ai
approved these changes
Apr 20, 2024
| @@ -1436,64 +1436,62 @@ Gfx* Gfx_TextureI8(Gfx* displayListHead, void* texture, s16 textureWidth, s16 te | |||
| return displayListHead; | |||
| } | |||
|
|
|||
| void Inventory_SwapAgeEquipment(void) { | |||
| void Rando_Inventory_SwapAgeEquipment(void) { | |||
There was a problem hiding this comment.
At some point we should make an effort to move this type of thing to a file in soh land
garrettjoecox
approved these changes
Apr 20, 2024
KiritoDv
pushed a commit
to KiritoDv/Shipwright
that referenced
this pull request
May 6, 2024
* Split and clean up swap age logic * reorganise conditions into one statement
briaguya-ai
pushed a commit
to briaguya-ai/Shipwright
that referenced
this pull request
May 9, 2024
* Split and clean up swap age logic * reorganise conditions into one statement
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.
This completely separates out the vanilla flow from the rest of the rando/mods flow path. This will make it easier to make changes to the flow without needing to worry about changing the vanilla code.
This also rewrites how the rando/mods flow work into a more generic function which should cover all scenarios in an appropriate way. It should also keep the childEquips and adultEquips consistent so that it can be used in combination with the vanilla code for the case of mods.
Build Artifacts