Skip to content

ztalkbox::stop_wait 100%#594

Merged
SquareMan merged 3 commits intobfbbdecomp:mainfrom
LSLees:zTalkBox
Sep 15, 2025
Merged

ztalkbox::stop_wait 100%#594
SquareMan merged 3 commits intobfbbdecomp:mainfrom
LSLees:zTalkBox

Conversation

@LSLees
Copy link
Contributor

@LSLees LSLees commented Sep 8, 2025

No description provided.

@github-actions
Copy link

github-actions bot commented Sep 8, 2025

⚠️ 🔥

+36 bytes
🆗 Bot Rating: A small contribution, every little bit helps!

Regressions: 23

⚠️ main/SB/Core/x/xGrid - .text -299 bytes -> 34.90%
⚠️ main/SB/Game/zGrid - .data -104 bytes -> 0.00%
⚠️ main/SB/Game/zGrid - .rodata -304 bytes -> 7.16%
⚠️ main/SB/Game/zGrid - .sbss -2 bytes -> 66.67%
⚠️ main/SB/Game/zGrid - .sdata2 -35 bytes -> 0.00%
⚠️ main/SB/Game/zGrid - .text -2088 bytes -> 2.77%
⚠️ main/SB/Core/gc/iTRC - .data -56 bytes -> 0.00%
⚠️ main/SB/Core/gc/iTRC - .rodata -649 bytes -> 0.92%
⚠️ main/SB/Core/gc/iTRC - .sdata2 -3 bytes -> 85.00%
⚠️ main/SB/Core/gc/iTRC - .text -816 bytes -> 73.06%
⚠️ main/SB/Core/x/xGrid - xGridInit(xGrid*, const xBox*, unsigned short, unsigned short, unsigned char) -299 bytes -> 0.00%
⚠️ main/SB/Game/zGrid - hack_flag_shadows(zScene*) -880 bytes -> 0.00%
⚠️ main/SB/Game/zGrid - zGridReset(zScene*) -228 bytes -> 0.00%
⚠️ main/SB/Game/zGrid - zGridInit(zScene*) -608 bytes -> 0.00%
⚠️ main/SB/Game/zGrid - zGridUpdateEnt(xEnt*) -372 bytes -> 0.00%
⚠️ main/SB/Core/gc/iTRC - ROMFont::Init() -24 bytes -> 73.91%
⚠️ main/SB/Core/gc/iTRC - ROMFont::DrawCell(int, int, int, int) -123 bytes -> 37.29%
⚠️ main/SB/Core/gc/iTRC - GXPosition3s16 -20 bytes -> 0.00%
⚠️ main/SB/Core/gc/iTRC - ROMFont::DrawTextBox(int, int, int, int, char*) -31 bytes -> 60.66%
⚠️ main/SB/Core/gc/iTRC - ResetButton::CheckResetButton() -143 bytes -> 30.77%
⚠️ main/SB/Core/gc/iTRC - iTRCDisk::DisplayErrorMessage() -64 bytes -> 63.64%
⚠️ main/SB/Core/gc/iTRC - iTRCDisk::SetDVDState() -212 bytes -> 1.85%
⚠️ main/SB/Core/gc/iTRC - iTRCDisk::CheckDVDAndResetState() -196 bytes -> 2.00%

Progress: 2

📈 main/SB/Game/zTalkBox - .text +36 bytes -> 11.94%
main/SB/Game/zTalkBox - ztalkbox::stop_wait(unsigned int) +36 bytes -> 100.00%

@github-actions
Copy link

github-actions bot commented Sep 8, 2025

🆗 ✅

+36 bytes
🆗 Bot Rating: A small contribution, every little bit helps!

No Regressions 🎉

Progress: 2

📈 main/SB/Game/zTalkBox - .text +36 bytes -> 11.94%
main/SB/Game/zTalkBox - ztalkbox::stop_wait(unsigned int) +36 bytes -> 100.00%

Comment on lines +319 to +328


if (shared.active != this)
{
//shared.unk8D48 |= unk;
return;
}

shared.wait_event_mask = shared.wait_event_mask | x;
return;

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
if (shared.active != this)
{
//shared.unk8D48 |= unk;
return;
}
shared.wait_event_mask = shared.wait_event_mask | x;
return;
if (shared.active == this)
{
shared.wait_event_mask |= x;
}

@SquareMan
Copy link
Member

In addition to what tgsm has reviewed I would suggest setting up clang-format for your editor and having it run on file save. You have a lot of extra empty lines that would be removed by a formatting pass.

@github-actions
Copy link

github-actions bot commented Sep 8, 2025

🆗 ✅

+36 bytes
🆗 Bot Rating: A small contribution, every little bit helps!

No Regressions 🎉

Progress: 2

📈 main/SB/Game/zTalkBox - .text +36 bytes -> 11.94%
main/SB/Game/zTalkBox - ztalkbox::stop_wait(unsigned int) +36 bytes -> 100.00%

@SquareMan SquareMan merged commit ff80fe0 into bfbbdecomp:main Sep 15, 2025
5 checks passed
@LSLees LSLees deleted the zTalkBox branch September 15, 2025 09:40
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants