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

Fix: Hyrule Field bridge entrance and sun song placing link out of bounds in Entrance Rando #2457

Merged

Conversation

Archez
Copy link
Contributor

@Archez Archez commented Feb 12, 2023

The "castle guard exit market" enhancement places link at the "Near Drawbridge" entrance instead of the "From Drawbridge" entrance. This is so link does not fall into the water at night as a convenience.

In Overworld shuffle, the "Near Drawbridge" entrance was passed into the override entrance logic instead of "From Drawbridge" resulting in the the vanilla entrance being used. This fixes that to use the proper entrance to get the override value.

I also adjusted the spawn position for "From Drawbridge" for child at night in overworld shuffle to place link just past the bridge so that you also dont fall into the water when going through the normal entrance

It was also reported that if grotto shuffle is on, but warp song shuffle is off, if you leave a grotto -> play a warp song -> then play sun's song, the grotto's coordinates are used as links respawn value. I adjusted the warp song override logic to happen when ER is on in general, rather than only when warp song shuffle is on. This makes it so the ER state is aware that a warpsong was used and so sun song ignores the grotto respawn location.


I also update some scene magic numbers to use proper enums.

Fixes #2443

Build Artifacts

Copy link
Contributor

@briaguya-ai briaguya-ai left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This looks great! one tiny typo in there but once that's fixed let's :shipit:

soh/soh/Enhancements/randomizer/randomizer_entrance.c Outdated Show resolved Hide resolved
Co-authored-by: briaguya <70942617+briaguya-ai@users.noreply.github.com>
@briaguya-ai briaguya-ai merged commit 1e9f8df into HarbourMasters:develop-gibbs Feb 13, 2023
@Archez Archez deleted the couple-entrance-fixes branch February 13, 2023 05:29
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.

None yet

2 participants