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

Patch mixed pools grotto and dungeon ER blue warps #70

Merged
merged 2 commits into from
Jul 6, 2022

Conversation

mracsys
Copy link

@mracsys mracsys commented Jul 3, 2022

Blue warp entrance indices are hardcoded in both cutscene commands and the blue warp actor. With non-mixed ER this is handled by modifying the entrance table. With mixed entrance pools, grotto exits are not in the entrance table and cannot be referenced with this method. This PR modifies all hardcoded blue warp entrance indices for blue warps that should lead to grottos. "Normal" entrance indices still use the entrance table as before.

Notes for the cutscene traces to identify the addresses to override are included in the Notes folder.

@Roman971
Copy link
Owner

Roman971 commented Jul 5, 2022

Thank you for the PR, it will be good to have this finally fixed 😅

The changes make sense to me but I feel like the fix should also apply to grotto entrances (ie. indexes above 0x1000). It only matters for decoupled+mixed pools, but in theory a dungeon exit could lead inside a grotto, in which case the entrance table override wouldn't work either if I'm not mistaken

@mracsys
Copy link
Author

mracsys commented Jul 5, 2022

I had hoped it would be as simple as changing the index check to 0x1000, but blue warps to reverse dungeon entrances are going to the warp pad instead of the dungeon exit, affecting the Requiem check and Forest Temple entrance. I'll keep digging.

Related, there is a regression from the mxied pools multiselect that excludes reverse entrance pools from the mixed pool in decoupled. I found it when my plando for dungeon exits to grottos testing failed. I'll make a separate PR with a fix for that.

@mracsys
Copy link
Author

mracsys commented Jul 6, 2022

I was overthinking it. Dungeon ER reverse entrances already swap blue warps with blue warps, that's nothing new.

@Roman971 Roman971 merged commit 5047914 into Roman971:Dev-R Jul 6, 2022
@mracsys mracsys deleted the grotto-exit-fix branch July 9, 2022 15:46
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