Skip to content
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

Misc hints hint area restrictions #1248

Merged
merged 4 commits into from
Feb 27, 2021

Conversation

fenhl
Copy link
Collaborator

@fenhl fenhl commented Feb 22, 2021

This removes the “same hint area” requirements for the potion shop and Impa's house when all hints are off.

Requires #1212 to be merged.

fenhl added a commit to fenhl/OoT-Randomizer that referenced this pull request Feb 22, 2021
@Zannick Zannick merged commit 32f8901 into OoTRandomizer:Dev Feb 27, 2021
@fenhl fenhl deleted the misc-hints-hint-area-restrictions branch February 27, 2021 16:23
@fenhl
Copy link
Collaborator Author

fenhl commented Feb 28, 2021

Hm, looks like GitHub detected this PR as merged somehow but the code isn't actually in Dev. Will resubmit.

@Zannick
Copy link
Collaborator

Zannick commented Feb 28, 2021

Weird. But I don't see any commits in this PR past what I merged for #1212... maybe that's cause you deleted the branch after GitHub thought it was merged, or the commits never got pushed here.

@fenhl
Copy link
Collaborator Author

fenhl commented Feb 28, 2021

I think what happened is that instead of PRing this as a revert of the revert, I sent the original commit, and since that's a parent of the commit merged in #1212 GitHub detected it as merged.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants