Moved Eggmanland loading transition fix to a code (#401)

This commit is contained in:
Hyper 2025-02-13 18:19:26 +00:00 committed by GitHub
parent 414ccb3637
commit c8feff3f8d
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 12 additions and 8 deletions

View file

@ -27,16 +27,19 @@ PPC_FUNC(sub_824DCF38)
ctx.r4.u32 = SWA::eLoadingDisplayType_Arrows; ctx.r4.u32 = SWA::eLoadingDisplayType_Arrows;
} }
if (auto pGameDocument = SWA::CGameDocument::GetInstance()) if (Config::FixEggmanlandUsingEventGalleryTransition)
{ {
auto stageName = pGameDocument->m_pMember->m_StageName.c_str(); if (auto pGameDocument = SWA::CGameDocument::GetInstance())
if (stageName && strlen(stageName))
{ {
/* Fix restarting Eggmanland as the Werehog auto stageName = pGameDocument->m_pMember->m_StageName.c_str();
erroneously using the Event Gallery transition. */
if (ctx.r4.u32 == SWA::eLoadingDisplayType_EventGallery && !strcmp(stageName, "Act_EggmanLand")) if (stageName && strlen(stageName))
ctx.r4.u32 = SWA::eLoadingDisplayType_NowLoading; {
/* Fix restarting Eggmanland as the Werehog
erroneously using the Event Gallery transition. */
if (ctx.r4.u32 == SWA::eLoadingDisplayType_EventGallery && !strcmp(stageName, "Act_EggmanLand"))
ctx.r4.u32 = SWA::eLoadingDisplayType_NowLoading;
}
} }
} }

View file

@ -79,6 +79,7 @@ CONFIG_DEFINE_HIDDEN("Codes", bool, AllowCancellingUnleash, false);
CONFIG_DEFINE_HIDDEN("Codes", bool, DisableAutoSaveWarning, false); CONFIG_DEFINE_HIDDEN("Codes", bool, DisableAutoSaveWarning, false);
CONFIG_DEFINE_HIDDEN("Codes", bool, DisableDLCIcon, false); CONFIG_DEFINE_HIDDEN("Codes", bool, DisableDLCIcon, false);
CONFIG_DEFINE_HIDDEN("Codes", bool, DisableDWMRoundedCorners, false); CONFIG_DEFINE_HIDDEN("Codes", bool, DisableDWMRoundedCorners, false);
CONFIG_DEFINE_HIDDEN("Codes", bool, FixEggmanlandUsingEventGalleryTransition, false);
CONFIG_DEFINE_HIDDEN("Codes", bool, FixUnleashOutOfControlDrain, false); CONFIG_DEFINE_HIDDEN("Codes", bool, FixUnleashOutOfControlDrain, false);
CONFIG_DEFINE_HIDDEN("Codes", bool, HomingAttackOnJump, false); CONFIG_DEFINE_HIDDEN("Codes", bool, HomingAttackOnJump, false);
CONFIG_DEFINE_HIDDEN("Codes", bool, HUDToggleKey, false); CONFIG_DEFINE_HIDDEN("Codes", bool, HUDToggleKey, false);