From b0001cbf22963534b74f19a4347b7d2e647c6ef4 Mon Sep 17 00:00:00 2001 From: Louis Stockdale-Lees Date: Mon, 8 Sep 2025 13:01:06 +0100 Subject: [PATCH 1/2] stop_wait --- src/SB/Game/zTalkBox.cpp | 15 ++++++++++++--- src/SB/Game/zTalkBox.h | 2 +- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/src/SB/Game/zTalkBox.cpp b/src/SB/Game/zTalkBox.cpp index 96c1c8c6b..342858725 100644 --- a/src/SB/Game/zTalkBox.cpp +++ b/src/SB/Game/zTalkBox.cpp @@ -227,6 +227,7 @@ namespace // HACK return (char*)(asset) + 4; } + } // namespace void ztalkbox::load(const asset_type& tasset) @@ -312,14 +313,22 @@ void ztalkbox::stop_talk() } } -void ztalkbox::stop_wait(U32 unk) + +void ztalkbox::stop_wait(U32 x) { - if (shared.active == this) + + + if (shared.active != this) { - //shared.unk8D48 |= unk; + return; } + + shared.wait_event_mask = shared.wait_event_mask | x; + return; + } + void ztalkbox::show() { flag.visible = true; diff --git a/src/SB/Game/zTalkBox.h b/src/SB/Game/zTalkBox.h index 8f41492af..0783208af 100644 --- a/src/SB/Game/zTalkBox.h +++ b/src/SB/Game/zTalkBox.h @@ -121,7 +121,7 @@ struct ztalkbox : xBase void add_text(U32 textID); void clear_text(); void stop_talk(); - void stop_wait(U32 unk); + void stop_wait(U32 x); void show(); void hide(); }; From 517d1188dfce155f47fc73c70add6d1c1725282d Mon Sep 17 00:00:00 2001 From: Louis Stockdale-Lees Date: Mon, 8 Sep 2025 20:20:34 +0100 Subject: [PATCH 2/2] Clean Up --- src/SB/Game/zTalkBox.cpp | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/src/SB/Game/zTalkBox.cpp b/src/SB/Game/zTalkBox.cpp index 342858725..06f57b979 100644 --- a/src/SB/Game/zTalkBox.cpp +++ b/src/SB/Game/zTalkBox.cpp @@ -313,22 +313,14 @@ void ztalkbox::stop_talk() } } - void ztalkbox::stop_wait(U32 x) { - - - if (shared.active != this) + if (shared.active == this) { - return; + shared.wait_event_mask = shared.wait_event_mask | x; } - - shared.wait_event_mask = shared.wait_event_mask | x; - return; - } - void ztalkbox::show() { flag.visible = true;