Skip to content

Fix: MQ only cutscene crashes#2545

Merged
dcvz merged 1 commit intoHarbourMasters:developfrom
Archez:fix-cutscenes-mq-only
Feb 27, 2023
Merged

Fix: MQ only cutscene crashes#2545
dcvz merged 1 commit intoHarbourMasters:developfrom
Archez:fix-cutscenes-mq-only

Conversation

@Archez
Copy link
Contributor

@Archez Archez commented Feb 27, 2023

After the resource refactor we were no longer accounting from swapping /nonmq/ to /mq/ for cutscene resources, and fetching the cutscene with only a MQ rom loaded would lead to crashes.

This updates the load CS resource function to use the method that handles converting nonmq -> mq paths.

Confirmed fixes #2452, fixes #2473

Build Artifacts

Copy link
Contributor

@dcvz dcvz left a comment

Choose a reason for hiding this comment

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

Great stuff! LGTM 👍

Copy link
Contributor

@briaguya0 briaguya0 left a comment

Choose a reason for hiding this comment

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

Great fix! I got a little confused at first because we have LoadResource in resourcebridge as well as ResourceMgr_LoadResource in OTRGloabals

Glad this sorts it all out!

@dcvz dcvz merged commit c1ddeec into HarbourMasters:develop Feb 27, 2023
@Archez Archez deleted the fix-cutscenes-mq-only branch February 27, 2023 00:48
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Crash when leaving LLR with Epona Crash when entering Kokiri Forest on Gibbs Alfa if only MQ OTR is present

3 participants