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

Miscellaneous Bug Fixes #711

Merged
merged 7 commits into from
Dec 20, 2023
Merged

Miscellaneous Bug Fixes #711

merged 7 commits into from
Dec 20, 2023

Conversation

HylianFreddy
Copy link
Collaborator

This PR fixes the following issues:

  • Warping with Farore's Wind would make the Master Sword appear in its scabbard even if Link is swordless, because the spawn animation overwrites the player's draw function. Now the randomizer's PlayerActor_rDraw will be restored if something overwrites it.
  • Quitting to the title screen could show Link with a glitched tunic, because he uses a different object and model compared to regular gameplay. I have added some checks to avoid applying the custom tunic to this model, so Link will appear with the normal green tunic.
  • The fix to put Epona out of bounds so that she could not be reached without the Ocarina was not applied when starting with Epona's Song. I've added the same fix to SaveFile_SetStartingInventory.
  • Ice Traps on dungeon rewards would not trigger if Link spawned in the water after entering the blue warp, because the damage effects don't work in water. This made it look like there was no reward at all. Now they will instead act like traps from NPCs, showing the "FOOL" text and queuing a trap effect for the next time Link is on land.
  • When completing Jabu Jabu as child with no ER, Link spawns at the water's surface, which wasn't enough to be considered "ready in water" because that required being underwater. This means the pending override wouldn't trigger until either diving or reaching land, so it could be permanently missed if the player save-warped. I have removed the underwater check and instead forced the relevant flag to be on before calling SetupItemInWater (this is required to play the correct Get Item animation). As additional safety, I also added a check to disable the start and select buttons if there is a pending override, to prevent save-warping.
  • The long-standing bug with Desert Colossus music should be fixed now. In OoT, when exiting Spirit Temple to the silver gauntlets hand, the music plays for a split second before being overridden by the owl theme. Grezzo probably wanted to avoid this, and made it so that if you've exited Spirit Temple from the hands and you haven't yet talked to the owl, the music won't play in Desert Colossus. In the randomizer that owl never spawns, so the music never returns. The fix is simply to set the owl flag on file creation.

@gymnast86 gymnast86 merged commit d66ab65 into gamestabled:main Dec 20, 2023
2 checks passed
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