From 0baac02843bb5e3844f7a9207db583d8c1796f8c Mon Sep 17 00:00:00 2001 From: louist103 <35883445+louist103@users.noreply.github.com> Date: Sat, 11 May 2024 15:02:18 -0400 Subject: [PATCH] Really bad fix. --- mm/src/overlays/actors/ovl_En_Po_Composer/z_en_po_composer.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/mm/src/overlays/actors/ovl_En_Po_Composer/z_en_po_composer.c b/mm/src/overlays/actors/ovl_En_Po_Composer/z_en_po_composer.c index c668b054c..00295d5de 100644 --- a/mm/src/overlays/actors/ovl_En_Po_Composer/z_en_po_composer.c +++ b/mm/src/overlays/actors/ovl_En_Po_Composer/z_en_po_composer.c @@ -278,7 +278,11 @@ void EnPoComposer_SetupStartedCutscene(EnPoComposer* this) { this->actionFunc = EnPoComposer_StartedCutscene; } +// #region 2S2H [Port] There is an issue with MSVC where this function is removed in release mode and the check in EnPoComposer_UpdateAction fails. +// We need to do something in this function that has a side effect which will cause MSVC to not remove it. +// This modification seemed cleaner than `volatile int a = 5`. __declspec(noinlne) did not work. void EnPoComposer_StartedCutscene(EnPoComposer* this, PlayState* play) { + sPlayerIsPlayingOcarina = false; } void EnPoComposer_SetupPlayCurse(EnPoComposer* this) {