Fix bad duplicate of RC_SPIRIT_TEMPLE_BOULDER_ROOM_SUN_FAIRY#6590
Merged
Conversation
serprex
approved these changes
May 4, 2026
St3ph3nBr00ks
added a commit
to St3ph3nBr00ks/Shipwright
that referenced
this pull request
May 29, 2026
Stage 0 of the sequenced refactor landing plan (Plans/refactor_sequenced_landing_plan_2026-05-29.md). Pulls in 12 upstream commits since merge-base 1a46d2e: b8a3998 Fix master sword timing info (HarbourMasters#6552) 31cbeb9 Fix bean merchant check listing (HarbourMasters#6557) d09cd4f Fix sword scaling (HarbourMasters#6558) a57cdc6 Update Hell Mode Preset (HarbourMasters#6570) 5bccc8a Ganon's Castle blue warp lava fix (HarbourMasters#6647) dc4b27d Fix gossip stone check (HarbourMasters#6648) 0dcd52e Fix warp shuffle without warp hint text (HarbourMasters#6551) e5ad4e6 Fix ending audio shuffle (HarbourMasters#6608) e3ee258 Restore Kokiri Forest quest state hook (HarbourMasters#6614) b728e67 Fix blank text on carpet salesman (HarbourMasters#6605) 37db034 Use singular on message for 1 token (HarbourMasters#6567) 5b4d8ed Fix bad merge with Sun's Song fairy in spirit (HarbourMasters#6590) One conflict resolved in soh/soh/Enhancements/randomizer/randomizer_check_tracker.cpp:1623-1625. Both sides extend the same filter predicate. Combined: kept our RCTYPE_BEGGAR clause AND adopted upstream's RC_ZR_MAGIC_BEAN_SALESMAN exception inside the merchant gate. All three globals (showMerchants, showBeans, showBeggar) are file-scope; no scoping issues. Audit §17.4 / C.8 risk check CLEAR — z_player.c untouched by upstream delta, so the sUpperBodyLimbCopyMap verbatim-duplicate refactor opportunity is not threatened. Not yet merged into development-multiplayer. Per the plan, that gate is build + Stage 1 smoke matrix (Plans/refactor_sequenced_ landing_plan_2026-05-29.md §Stage 1 — SM-1 through SM-6). User: run the standard incremental build: cmake --build build/x64 --config Release If upstream bumped project(Ship VERSION ...) in root CMakeLists.txt (check git log for a 9.2.x bump), also run: cmake --build build/x64 --config Release --target GenerateSohOtr Co-Authored-By: Claude Opus 4.7 (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
2 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.
This caused logic to put things in there thinking child could get them
Build Artifacts