Skip to content

Fix Crowd Control Wolfos despawning when scene switch 0 is set #6591

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

Open
jaku wants to merge 3 commits into
base: develop
Choose a base branch
from
+3 −0
Open

Fix Crowd Control Wolfos despawning when scene switch 0 is set #6591

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
59ec91a
CC fixes
jaku Mar 9, 2026
2cfbbe7
Merge branch 'HarbourMasters:develop' into develop
jaku May 4, 2026
3d24152
Fix Crowd Control Wolfos using wrong spawn params (0xFF00)
jaku May 4, 2026
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
3 changes: 3 additions & 0 deletions soh/soh/Network/CrowdControl/CrowdControl.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -268,6 +268,9 @@ CrowdControl::Effect* CrowdControl::ParseMessage(nlohmann::json dataReceived) {
break;
case kEffectSpawnWolfos:
effect->spawnParams[0] = ACTOR_EN_WF;
// Match EnEncount1 wolfos spawner (0xFF00): high byte must be 0xFF so EnWf_Init does not treat
// switchFlag 0; Flags_GetSwitch(play, 0) is true in many scenes and would instantly kill the actor.
effect->spawnParams[1] = (0xFF << 8) | 0x00; // normal Wolfos; high byte 0xFF = no switch (vanilla encount)
Copy link
Copy Markdown
Member

@serprex serprex May 4, 2026

Choose a reason for hiding this comment

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

Suggested change
effect->spawnParams[1] = (0xFF << 8) | 0x00; // normal Wolfos; high byte 0xFF = no switch (vanilla encount)
effect->spawnParams[1] = 0xFF00; // normal Wolfos; high byte 0xFF = no switch (vanilla encount)

effect->category = kEffectCatSpawnEnemy;
break;
case kEffectSpawnWallmaster:
Expand Down
Loading