Skip to content

ztalkbox::stop_wait 100% #594

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
SquareMan merged 3 commits into from
Sep 15, 2025
Merged

ztalkbox::stop_wait 100% #594

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b0001cb
stop_wait
LSLees Sep 8, 2025
f693ba9
Merge branch 'bfbbdecomp:main' into zTalkBox
LSLees Sep 8, 2025
517d118
Clean Up
LSLees Sep 8, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions src/SB/Game/zTalkBox.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -227,6 +227,7 @@ namespace
// HACK
return (char*)(asset) + 4;
}

} // namespace

void ztalkbox::load(const asset_type& tasset)
Expand Down Expand Up @@ -312,11 +313,11 @@ void ztalkbox::stop_talk()
}
}

void ztalkbox::stop_wait(U32 unk)
void ztalkbox::stop_wait(U32 x)
{
if (shared.active == this)
{
//shared.unk8D48 |= unk;
shared.wait_event_mask = shared.wait_event_mask | x;
}
}

Expand Down
2 changes: 1 addition & 1 deletion src/SB/Game/zTalkBox.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
};
Expand Down