github/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright.git synced 2025-08-19 21:03:42 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

"Skip forced dialog" no longer skips optional Navi hints (#4450)

Browse source
This commit is contained in:
Jordan Longstaff 2024-10-30 22:14:22 -04:00 • committed by GitHub
commit 705bbea144
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
soh/soh/Enhancements/timesaver_hook_handlers.cpp
View file

@ -333,8 +333,9 @@ void TimeSaverOnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, va_li
case VB_NAVI_TALK: { case VB_NAVI_TALK: {
if (ForcedDialogIsDisabled(FORCED_DIALOG_SKIP_NAVI)) { if (ForcedDialogIsDisabled(FORCED_DIALOG_SKIP_NAVI)) {
ElfMsg* naviTalk = va_arg(args, ElfMsg*); ElfMsg* naviTalk = va_arg(args, ElfMsg*);
if (((naviTalk->actor.params >> 8) & 0x3F) != 0x3F) { int32_t paramsHighByte = naviTalk->actor.params >> 8;
Flags_SetSwitch(gPlayState, (naviTalk->actor.params >> 8) & 0x3F); if ((paramsHighByte & 0x80) == 0 && (paramsHighByte & 0x3F) != 0x3F) {
Flags_SetSwitch(gPlayState, paramsHighByte & 0x3F);
Actor_Kill(&naviTalk->actor); Actor_Kill(&naviTalk->actor);
*should = false; *should = false;
} }