diff options
| author | aMannus <mannusmenting@gmail.com> | 2023-04-21 22:05:38 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-04-21 16:05:38 -0400 |
| commit | 37c03455298a383789bc91643fe16aeb21611032 (patch) | |
| tree | 298591b247db6c5317acd395f50e9c05fab45fe2 /soh/src/code | |
| parent | 359cc3d5f66e98834223c2da42dd8d336c4b8828 (diff) | |
ImGui Cleanup - Move Experimental entries, clean up presets (#2725)
* ImGui cleanup
* Fix Wii U
* Fix Wii U build 2: Electric Boogaloo
* Review comments
* Review Comments 2: Electric Boogaloo
Diffstat (limited to 'soh/src/code')
| -rw-r--r-- | soh/src/code/z_player_lib.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/soh/src/code/z_player_lib.c b/soh/src/code/z_player_lib.c index 5957b97ca..5bae84443 100644 --- a/soh/src/code/z_player_lib.c +++ b/soh/src/code/z_player_lib.c @@ -660,9 +660,9 @@ s32 func_8008F2F8(PlayState* play) { triggerEntry = &sTextTriggers[var]; if ((triggerEntry->flag != 0) && !(gSaveContext.textTriggerFlags & triggerEntry->flag) && - (((var == 0) && (this->currentTunic != PLAYER_TUNIC_GORON && CVarGetInteger("gSuperTunic", 0) == 0 && CVarGetInteger("gDisableWarningText", 0) == 0)) || + (((var == 0) && (this->currentTunic != PLAYER_TUNIC_GORON && CVarGetInteger("gSuperTunic", 0) == 0 && CVarGetInteger("gDisableTunicWarningText", 0) == 0)) || (((var == 1) || (var == 3)) && (this->currentBoots == PLAYER_BOOTS_IRON) && - (this->currentTunic != PLAYER_TUNIC_ZORA && CVarGetInteger("gSuperTunic", 0) == 0 && CVarGetInteger("gDisableWarningText", 0) == 0)))) { + (this->currentTunic != PLAYER_TUNIC_ZORA && CVarGetInteger("gSuperTunic", 0) == 0 && CVarGetInteger("gDisableTunicWarningText", 0) == 0)))) { Message_StartTextbox(play, triggerEntry->textId, NULL); gSaveContext.textTriggerFlags |= triggerEntry->flag; } |