Merged
Conversation
* Changes for LUS renames in ResourceManager and Archive. * Moves WriteSaveFile and ReadSaveFile to SaveManager. * Removes ImGui namespace. * Bump LUS * Update soh/soh/GameMenuBar.cpp * Bump LUS --------- Co-authored-by: briaguya <70942617+briaguya-ai@users.noreply.github.com>
…Mac (#2819) * add header for aligned assets for soh files * remove debug statements * update more string asset usage to aligned vars
* reset trade select when unpausing * move trade select reset to kaleido init and handle when changing pages
* hack that makes it so custom models still work on scene transition * Update soh/soh/OTRGlobals.cpp Co-authored-by: Nicholas Estelami <NEstelami@users.noreply.github.com> * naming/formatting --------- Co-authored-by: briaguya <briaguya@alice> Co-authored-by: Nicholas Estelami <NEstelami@users.noreply.github.com>
Co-authored-by: briaguya <briaguya@alice>
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
6 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.
No description provided.