Skip to content
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.

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

Fix s036_area3c Gammas Crash #287

Merged
merged 5 commits into from
Feb 24, 2024
Merged

Fix s036_area3c Gammas Crash #287

merged 5 commits into from
Feb 24, 2024

Conversation

dyceron
Copy link
Collaborator

@dyceron dyceron commented Feb 22, 2024

Delaying or removing the CC changes for Gamma_006 until after Gamma_007 is defeated avoids any conflicts and removes the crash/memory errors. I chose the former option since it has the most accurate results in game.

Fixes #286

@dyceron dyceron requested a review from ThanatosGit February 22, 2024 05:32
@dyceron dyceron marked this pull request as draft February 22, 2024 05:48
@ThanatosGit
Copy link
Collaborator

@dyceron can you test this? It's not calling the OnDead anymore after the metroid dies but both rooms (left, right) from the metroid section have a vanilla trigger to call it.
I have no idea if this breaking other stuff! Might even be able to not doing the teleport thing anymore for the other problematic part

@ThanatosGit
Copy link
Collaborator

...and the starter_preset should be reverted if this works on console.

@dyceron
Copy link
Collaborator Author

dyceron commented Feb 22, 2024

Yes I can test it layer. If this works could this be applied to all of the multi room Gammas?

@ThanatosGit
Copy link
Collaborator

I never checked if the radar actually activates again later :D
Probably need to tune that change

@dyceron dyceron requested a review from ThanatosGit February 24, 2024 05:46
@dyceron dyceron marked this pull request as ready for review February 24, 2024 05:46
@dyceron dyceron changed the title Area 3 Gamma_007: Delay subarea changes until after leaving collision_camera_013 Fix s036_area3c Gammas Crash Feb 24, 2024
@ThanatosGit ThanatosGit merged commit b966c0f into main Feb 24, 2024
5 checks passed
ThanatosGit added a commit that referenced this pull request Feb 24, 2024
This reverts commit b966c0f, reversing
changes made to cba7b61.
@ThanatosGit ThanatosGit mentioned this pull request Feb 24, 2024
@dyceron dyceron deleted the fix-a3-gamma-crash branch February 24, 2024 13:28
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.

Crash entering s036_area3c cc14 because of Gamma_007 spawngroup
2 participants