Fix Crowd Control Wolfos despawning when scene switch 0 is set#6591
Open
jaku wants to merge 3 commits intoHarbourMasters:developfrom
Open
Fix Crowd Control Wolfos despawning when scene switch 0 is set#6591jaku wants to merge 3 commits intoHarbourMasters:developfrom
jaku wants to merge 3 commits intoHarbourMasters:developfrom
Conversation
Crowd Control passed actor params 0 for EN_WF, so EnWf_Init treated switchFlag 0 and killed the actor when scene switch 0 was set. Match vanilla EnEncount1 Wolfos spawns: (0xFF << 8) | 0x00.
serprex
reviewed
May 4, 2026
| 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) |
Member
There was a problem hiding this comment.
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) |
serprex
approved these changes
May 4, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Crowd Control was spawning Wolfos with the wrong settings, so the game could remove them right away. This matches the params the game already uses for Wolfos elsewhere.
Fix: set Crowd Control Wolfos spawnParams[1] to 0xFF00 (same as vanilla EnEncount1 Wolfos spawns).