-
Notifications
You must be signed in to change notification settings - Fork 632
Merge develop into develop-rando #3352
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
garrettjoecox
merged 32 commits into
HarbourMasters:develop-rando
from
Archez:mergeDevelopIntoRando4
Nov 5, 2023
Merged
Merge develop into develop-rando #3352
garrettjoecox
merged 32 commits into
HarbourMasters:develop-rando
from
Archez:mergeDevelopIntoRando4
Nov 5, 2023
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
* Progress on SFX cleanup/sorting * Fix crash after dev merge * Rename vars
* Restore RBA Values Matches all rba scenarios achievable in game to their original outcomes. This only ends up affecting certain trade items. * tooltip rewrite * rba cases generalised * re-add to menu bar * better byteswap and checks for endianness * remove leftover defines
…s_Alloc` before and outside of `Main`. (HarbourMasters#3279)
* age req docs * move macros * use decomp names
* The mother of all commits * Removed `GI_SWORD_MASTER`; "Master Sword" Items now actually give MS * Removed dupe MS entries in item pool; updated GIMESSAGE (should stop crashing on non-Windows); re-added MS in item list * Give Adult Link a freebie with shuffle MS on; cihld -> adult no longer gives MS; ToT Master Sword now gives correct item * add master sword GI draw func based on ToT MS object * Force `MasterSword` logic var to only update upon getting MS * Dorf funny line now activates with LA and MS in inv * Apply suggestions * Updated RAND_INF; Check Tracker changes; Gave RAND_INF and ice trap logic to ToT MS check; Fixed swordless behavior for HBA/fishing * ToT MS Check now works in check tracker; Visual bug where box hovers over non-existent MS gone; Fixed RAND_INF check with ToT MS pedestal; Ganon no longer gives free MS * adult equips no longer reset in MS shuffle * Apply (most) locacc review suggestions Co-authored-by: inspectredc <[email protected]> * Reorganized swordless check for interface to fit edge cases; getting master sword no longer highlights box * Edge case for BGS but no bow * Fix implicit declaration error for GI hooks (HarbourMasters#9) * Adjusted `CanAdultAttack/Damage`; applied logic suggestions * Fixed build errors (hopefully) * Cleanup merge * get shit working again * Tidied up remaining uses of DD flag as rando indicator * make master sword invisible and fix ms flag (HarbourMasters#10) * Add text to sheik if go mode is obtained but barrier is still up * overhaul swordless behavior in `func_80083108` * reworked ToT MS Check to have an actual GI * suggestions * Apply suggestions * Better swordless handling with temp B (HarbourMasters#11) * better swordless handling with temp B * prevent auto save in fishing pond * prevent auto save during bombchu bowling * enum fix --------- Co-authored-by: Adam Bird <[email protected]> Co-authored-by: inspectredc <[email protected]> Co-authored-by: RaelCappra <[email protected]> Co-authored-by: Adam Bird <[email protected]>
…ourMasters#3301) * gSaveContext->saveContext for triforce piece save manager save * use an arrow..
…ourMasters#3319) * Fix two missing changes after ms GI enum was changed * Remove unnecessary line break from hint, and fix infinite loop within AutoFormatHintTextString * Update soh/soh/Enhancements/randomizer/3drando/hints.cpp
Move SoH custom assets out of OTRExporter
* bump submodules and use custom assets dir * bump submodules
…ourMasters#3330) * extract using a relative path to xmls * pass xml root for header generation
…nd adds a check to the shuffle function to make sure sequences with `canBeUsedAsReplacement = false` can't be shuffled in. (HarbourMasters#3324)
* Add no rando generated warning * Update texts * Randomizer warning messages (#4) * Fix french typo --------- Co-authored-by: aMannus <[email protected]>
* Adds an easy qpa cheat that gives the glitched damage value of the quick put away glitch * Adds RegisterEzQPA(); under InitMods()
…le Boulder Maze (HarbourMasters#3273) * Add `IsAdult` to Fewer Tunic Requirements check for `FireTimer` in rando logic to preven placing items in lower maze expecting child to get them. * After discussion, decided to change it to lock access only to lower maze so child access with dungeon shuffle remains intact. Also changed the tooltip for Fewer Tunic Requirements to reflect the current status of what the trick enables. * Further update to tooltip.
* Add limb override for Goron shopkeep * Remove extra line breaks * Fix bug with goron neck length --------- Co-authored-by: Garrett Cox <[email protected]>
* Check for zip/rar header in the extractor. * 7z
…arbourMasters#3274) * add safe string copy method * use string copy for save manager * use string copy in spoiler log hint parsing * remove intermediate string vars * more string copy use in randomizer methods * use string copy in gameplay stats * add load char array method to remove string intermediate var * try string.h import instead
* Add gRegEditEnabled * Remove TCRF link
…asters#3254) * Add a (not yet functional) "Navi" option. * It works! * Slightly better name for this menu option. * Revert accidental commit of comments in z_en_elf.c * Renaming and tweaks. * Temporary fix(?) for compile error on non-Windows platforms. * … Just pretend this particular commit doesn't exist. :OHYEAH: * A more suitable fix. + Partial suggestions from review. In-progress implementation of Cosmetics Navi colours. * Convert relevant code to use Color_RGB8 sans alpha, matching the controller LED. Defaults are now labeled for clarity. * Revert back to Color_RGBA8. + Implement Cosmetics Navi colours. Add Color conversion functions. * Tidy comments. * Changed mind yet a third time. Uses Color_RGB8 sans alpha again. Uses CVarGetColor24 instead of CVarGetColor to drop alpha from cosmetics editor values, like how Tunic Colors does it. This of course does require me to go with the prior idea of storing the Navi colours without alpha channels. * Color type conversion functions removed as they're no longer needed. * Tidy up commented out code once more. * Fix a typo * Suggestion from code review. (Yeah nah you're totally right though.) * Correct indentation. * A minor goof in the comments was bothering me.
* hopefully everything * update docs for MS shuffle sections
…rMasters#3295) * Fix Entrance hubs having no HintKey, causing hints to No Item * Add castle grounds hint area to cover the OGC/HC to market entrence
garrettjoecox
approved these changes
Nov 4, 2023
3783c3a to
129f410
Compare
Malkierian
approved these changes
Nov 4, 2023
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 merges in the develop branch into develop-rando
The main source of conflicts here pertain to master sword shuffle. Particularly of note are logic changes due to appending
RG_to logic items, and sheik hint text.REMINDER: DO NOT SQUASH, merge via merge commit to retain commit shas from develop
Build Artifacts