Not enough items (EXPERIMENTAL) - #7
Open
skijer wants to merge 357 commits into
Open
Conversation
The main effect of this PR is completely decoupling OTRGlobals.h from any non-std header making it so that the "everything is being rebuilt because I changed a header that at some point gets included in OTRGlobals" problem doesn't happen anymore.
Identify checks for merchants and deku scrubs to show their prices and non-mysterious checks in the check tracker.
Issue was needing to hook on RSK_SHUFFLE_WARP_SONGS, but cleaned up code
Don't apply transforms when scale 1.0, adjust translation to be gradual
General fix: don't reset timestamp if already set, this is particularly important for retrieving master sword vs ganon Also fix master sword timing not being set when shuffled
standardize on stdint.h over cstdint
HarbourMasters#6661) Set flag on savefile, fill location when freed, don't junk check when card shuffled Also fix other misc issues in fill logic
…s#6679) * DMC logic: wall poh needs climb Include jumpslash as unintuitive jump Leave one note about getting there with hovers or acrobatics * Handle fire temple boulders properly, add some new cases to skip climb with the wall --------- Co-authored-by: Demur Rumed <159546+serprex@users.noreply.github.com>
* remove Roc's GID and prevent OOB from prior versions * change OOB gi to stone of agony
Can't move `IdentifyShopItem` as it's used all over the place.
also unique_ptr
…urMasters#6591) Crowd Control passed actor params 0 for EN_WF, so EnWf_Init treated switchFlag 0 and killed the actor when scene switch 0 was set. Match vanilla EnEncount1 Wolfos spawns: (0xFF << 8) | 0x00 Also prevent crowd control effects from triggering when link is not in controllable state
* Bump ZAPD for maybe the last time * Bump exporter
Fix starting health and music bugs with BetterSaveMenu Better interaction with RememberSaveLocation
Cuccos get destroyed when options turned on
RegisterBetterSave registered its VB_LOAD_SAVE_MENU and VB_DRAW_SAVE_MENU hooks unconditionally, and hardcoded the save/continue text overrides to `true`, so the feature applied regardless of the enable checkbox and toggling it off did nothing. CVAR_BETTERSAVE_VALUE was defined but never read. Gate all five hooks on CVAR_BETTERSAVE_VALUE (COND_VB_SHOULD for the two vanilla-behavior hooks, the condition arg for the three OnOpenText hooks). RegisterShipInitFunc already re-runs RegisterBetterSave when CVAR_BETTERSAVE changes, so the COND_* macros unregister the hooks when it is off and re-register them when it is on. Co-authored-by: Claude Opus 4.8 <noreply@anthropic.com>
…ers#6949) Also lock junk chus behind bombchu bags being on Exclude RG_BOMBCHUS_20 from junk pool for balancing
…rbourMasters#6902) Rewrite Gfx_TexScrollEx / Gfx_TwoTexScrollEx / Gfx_TwoTexScrollEnvColorEx to emit one command per tile instead of one baked tile size per interpolated frame, so texture DL memory no longer scales with InterpolationFPS
…nts (HarbourMasters#6946) Only apply with clear hints & when hint is for a unique RHT
Closes the long-running upstream merge together with the work done on top of it while the merge was still open. Included beyond the merge resolution itself: - FleetShipCombo: continuous Anchor-style state sync (FleetNet) over new shared-memory packet rings, plus the delta-protocol fixes -- arrays travel as whole subtrees so a split packet can no longer unflatten with null gaps, volatile meters are owned by the active game so rupees stop draining, and ApplyShared defaults to the current value instead of 0 under partial deltas. - Magic syncs as its two ownership flags only; magicLevel is the game's own meter-build handshake and is no longer copied across. - Combo incompatible-options table + "Compatibility" panel, driven by the same table that applies the forcing at generation. - NEI custom items: new rewind / target-select / timestop helpers (previously untracked but already #included by tracked code). Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
z64.h pulls in <memory> under C++, and a template cannot have C linkage, so GCC and Clang rejected every TU reaching DesireCompass.h first. MSVC accepts it, which is why only Windows was building. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
…n "C" block z64.h includes <memory> under C++ and a template cannot have C linkage, so a .cpp whose FIRST include lands inside extern "C" fails on GCC/Clang. boss_remains.cpp survives the same pattern only because its own header gets z64.h in first; trutefel_enemies.cpp had nothing before it, which is where all 2745 errors came from. object_tornado.cpp had the same shape and was one include away from it. trutefel_enemies.cpp also needed <math.h> for the sqrtf/fabsf in z_en_sbeetle.c. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
…lare Player_PutAwayHeldItem power_keg.c declared MmForm_GetCurrentForm as returning int while the other two unity-build files used MmPlayerTransformation; same TU, so GCC and Clang reject it. The declaration now lives in transformation_masks.h next to the other MmForm_* entry points. Player_PutAwayHeldItem is defined at z_player.c:1989 but custom_items.c is included at line 68, so it needs a prototype in the existing forward-decl block. Also reflows DesireCompass.h, which the previous commit left unformatted. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
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
20 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.
REGARDLESS OF YOUR OS YOU WILL NEED THIS FOLDER PLACE IT NEXT TO YOUR O2Rs nei.zip
Build Artifacts