Shipwright/soh
Christopher Leggett 3de58774ba
Rando: Allows Malon's Item Check to be obtained by pulling out the Ocarina. [FIXED PR] (#672)
* Fixes using the Ocarina to get the check from Malon.

Still some cleanup to do here. For some reason the player can shield before receiving the check. It doesn't set the flag if the player does that so they can still try again, but would prefer a different solution if possible.

* Prevents Shielding from blocking the Item_Give from happening.

* Code Cleanup and comments explaining the new rando flow.

* Removes inventory check when pulling out Ocarina

This allows OI to properly give the check, which is important for Glitched logic later down the line. Talking to Malon still requires the Ocarina in your inventory.

* Prevents non-malon textboxes from triggering the check.

Also adds a comment explaining the condtional for getting the check from talking to Malon since it got pretty long.

* Actually fixes checking for text boxes.

* Relocates a comment for improved clarity.
2022-07-12 18:50:46 -04:00
..
assets Merge branch 'develop' into z64-devmerge 2022-06-17 00:39:07 -04:00
include Free Camera (#337) 2022-07-12 18:40:18 -04:00
macosx Add Support for macOS (#441) 2022-06-22 14:59:21 -04:00
soh Removed legacy audio mode and fixed ganon sound bug (#657) 2022-07-11 22:37:39 -04:00
src Rando: Allows Malon's Item Check to be obtained by pulling out the Ocarina. [FIXED PR] (#672) 2022-07-12 18:50:46 -04:00
.clang-format git subrepo clone https://github.com/HarbourMasters/soh.git 2022-03-22 02:51:23 +01:00
.clang-tidy git subrepo clone https://github.com/HarbourMasters/soh.git 2022-03-22 02:51:23 +01:00
.gitattributes git subrepo clone https://github.com/HarbourMasters/soh.git 2022-03-22 02:51:23 +01:00
.gitignore Add Support for macOS (#441) 2022-06-22 14:59:21 -04:00
.gitrepo git subrepo clone https://github.com/HarbourMasters/soh.git 2022-03-22 02:51:23 +01:00
Makefile add support for clang compiler (#592) 2022-07-10 10:51:12 -04:00
Resource.rc git subrepo clone https://github.com/HarbourMasters/soh.git 2022-03-22 02:51:23 +01:00
SHIPOFHARKINIAN.ico git subrepo clone https://github.com/HarbourMasters/soh.git 2022-03-22 02:51:23 +01:00
fixbaserom.py git subrepo clone https://github.com/HarbourMasters/soh.git 2022-03-22 02:51:23 +01:00
format.sh git subrepo clone https://github.com/HarbourMasters/soh.git 2022-03-22 02:51:23 +01:00
randomizerTypes.h testing out item replacement (#416) 2022-07-11 20:11:07 -04:00
randomizer_generation.cpp testing out item replacement (#416) 2022-07-11 20:11:07 -04:00
resource.h git subrepo clone https://github.com/HarbourMasters/soh.git 2022-03-22 02:51:23 +01:00
soh.sln Replaced StormLib .lib files with source code. 2022-06-16 20:35:52 -04:00
soh.vcxproj testing out item replacement (#416) 2022-07-11 20:11:07 -04:00
soh.vcxproj.filters testing out item replacement (#416) 2022-07-11 20:11:07 -04:00
soh.vcxproj.user Fix VS stuff 2022-05-15 19:01:19 +02:00