Rando: Allows Malon's Item Check to be obtained by pulling out the Ocarina.#659
Rando: Allows Malon's Item Check to be obtained by pulling out the Ocarina.#659leggettc18 wants to merge 1066 commits intoHarbourMasters:developfrom
Conversation
Not quite how N64 rando does it but so far it's the only way I've found to make it trigger without also triggering the time travel again.
Explosion sound doesn't play correctly and I think the debris appears in the wrong place, but the functionality is here.
For rando
skip intro cutscene in dodongo's cavern
…t-skip Skip ruto text box in jabu blue warp
…l-tomb Rando skip royal tomb
Added flags for ruto falling down hole
…lect file select fixes
…lect name entry dropped spoiler logic
…ndo-menu-issue make sure to actually init the cvar
no chime on load
Skip to scream part of the death animation, skipping the text boxes etc. For rando
…-skip Forest Temple Ganondrof cutscene skip
skip owl flight cutscenes in rando
Earlier fix inadvertently applied to some other text as well, changed logic so that only specified sceneNums and textIds can have this enabled, and text skipped by sceneNum can have the skip overriden by textId if needed. Currently there are no overrides so the textId section of the logic is commented out to avoid compilation errors.
…pText variable unchanged, just in case.
…re-prompt-skip Stops Shadow Temple lore prompts from appearing in rando.
…ded-fix Fixes misleading sound effects with Door of Time "Intended" setting
…smalldevmerge Toir hopefullysmalldevmerge
Better dpad items
kind of quick and dirty but it works
ItemTracker: Vanilla + Rando colors for non warp songs
Still some cleanup to do here. For some reason the player can shield before receiving the check. It doesn't set the flag if the player does that so they can still try again, but would prefer a different solution if possible.
|
There may actually be one more commit before this is ready to merge, waiting on a comment here to confirm: https://github.com/briaguya-ai/rando-issue-tracker/issues/86 |
|
I'm not sure why it's showing all those commits, I thought they were already merged in... |
They were squash merged as one giant commit into the develop branch, so they're technically unique commits by which you're ahead of develop, albeit they don't change anything because all those changes already match here. |
|
Oh I know why, I branched this off of the original rando branch and then merged develop into my branch after the rando merge. I think I can redo this on a different branch, if that's necessary, just let me know! |
|
This is going to need at least one more commit regardless, as looking at the code now I'm reasonably confident that using OI will actually softlock you here... |
|
Closing this PR in favor of #672, which does not have the unsquashed commit weirdness. |
Previously, Malon would only grant her item check if you talked to her. This is in contrast to a similarly behaving song-giving NPC, the Windmill man in Kakariko's Windmill, as well as in contrast to the N64 and 3DS randos. This implements the ability for Malon to grant her item check by either talking to her or pulling out the Ocarina.
resolves #671