Skip to content

Rachael -> Zhora#878

Merged
dcvz merged 18 commits intoHarbourMasters:develop-zhorafrom
dcvz:develop-zhora-merge
Jul 22, 2022
Merged

Rachael -> Zhora#878
dcvz merged 18 commits intoHarbourMasters:develop-zhorafrom
dcvz:develop-zhora-merge

Conversation

@dcvz
Copy link
Contributor

@dcvz dcvz commented Jul 22, 2022

No description provided.

jbodner09 and others added 18 commits July 20, 2022 19:57
Fix Child Zelda Skip rando setting always on
reported on discord, i don't have the ability to reproduce this, but it
appears to be a benign fix, as the only time that the tent2 is checked
down later is guarded by a null check.
* Giant's Knife Behaviour Fixes

Fixes a case where Giant's Knife (specifically, breaking and re-buying it) can behave unexpectedly if you don't have a Kokiri Sword in your inventory.  Also fixes the broken icon not showing up in inventory after you break it.

* less whitespace

* fix 0xE check

Accidentally committed with the wrong check

* Move the grayscale code up

Moved the grayscaling portion up higher in the function and renamed "bool not_acquired" to "bool age_restricted".  Thanks to @vaguerant for the suggestion!
* stop floor under shadow statue opening immediately

* use ActorResetFunc to reset sStatueRotY

Co-authored-by: briaguya <briaguya@alice>
@MelonSpeedruns MelonSpeedruns self-requested a review July 22, 2022 01:00
@dcvz dcvz merged commit d299284 into HarbourMasters:develop-zhora Jul 22, 2022
@dcvz dcvz deleted the develop-zhora-merge branch July 22, 2022 01:01
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.

9 participants