thirdpartymirrors/UnleashedRecomp
1
0
Fork 0
mirror of https://github.com/hedge-dev/UnleashedRecomp.git synced 2026-04-27 04:41:39 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

CTitleStateMenu: fix start button opening old options menu

Browse source
This commit is contained in:
Hyper 2024-12-04 22:57:15 +00:00
parent 35990687c6
commit 3ffa807667
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
UnleashedRecomp/patches/ui/CTitleStateMenu_patches.cpp
View file

@ -9,11 +9,12 @@ PPC_FUNC(sub_825882B8)
{
auto pTitleState = (SWA::CTitleStateBase*)g_memory.Translate(ctx.r3.u32);
auto pInputState = SWA::CInputState::GetInstance();
auto& pPadState = pInputState->GetPadState();
auto isOptionsIndex = pTitleState->m_pMember->m_pTitleMenu->m_CursorIndex == 2;
if (!OptionsMenu::s_isVisible && pInputState && isOptionsIndex)
{
if (pInputState->GetPadState().IsTapped(SWA::eKeyState_A))
if (pPadState.IsTapped(SWA::eKeyState_A) || pPadState.IsTapped(SWA::eKeyState_Start))
{
Game_PlaySound("sys_worldmap_window");
Game_PlaySound("sys_worldmap_decide");
@ -27,7 +28,7 @@ PPC_FUNC(sub_825882B8)
if (pInputState && isOptionsIndex)
{
if (OptionsMenu::CanClose() && pInputState->GetPadState().IsTapped(SWA::eKeyState_B))
if (OptionsMenu::CanClose() && pPadState.IsTapped(SWA::eKeyState_B))
{
Game_PlaySound("sys_worldmap_cansel");