From 99bd3d91547858203c84cdf7f4ec37effabc0385 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Tue, 8 Oct 2019 10:31:33 -0400 Subject: Finish main menu decomp --- src/help_system.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/help_system.c') diff --git a/src/help_system.c b/src/help_system.c index 2d96ae9d6..7859961db 100644 --- a/src/help_system.c +++ b/src/help_system.c @@ -49,15 +49,15 @@ u8 RunHelpSystemCallback(void) { case 0: sInHelpSystem = 0; - if (gSaveBlock2Ptr->optionsButtonMode != OPTIONS_BUTTON_MODE_NORMAL) + if (gSaveBlock2Ptr->optionsButtonMode != OPTIONS_BUTTON_MODE_HELP) return 0; if (JOY_NEW(R_BUTTON) && gUnknown_203F175 == 1) return 0; if (JOY_NEW(L_BUTTON | R_BUTTON)) { - if (!sub_812B45C() || !gUnknown_3005ECC) + if (!sub_812B45C() || !gHelpSystemEnabled) { - PlaySE(SE_HELP_PAGE); + PlaySE(SE_HELP_ERR); return 0; } m4aMPlayStop(&gMPlayInfo_SE1); -- cgit v1.2.3 From 20efe34745e3f53f6c570a063718972cc50c8a97 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Tue, 8 Oct 2019 13:54:52 -0400 Subject: help_system common syms --- src/help_system.c | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src/help_system.c') diff --git a/src/help_system.c b/src/help_system.c index 7859961db..3ebbcb9ec 100644 --- a/src/help_system.c +++ b/src/help_system.c @@ -16,6 +16,8 @@ extern u8 gGlyphInfo[]; +bool8 gHelpSystemEnabled; + struct HelpSystemVideoState { /*0x00*/ MainCallback savedVblankCb; -- cgit v1.2.3 From 855c052be041ed85789db1e460dd35cab9d12b4f Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Wed, 9 Oct 2019 20:02:59 -0400 Subject: Rename song constants using Japanese sound test menu --- src/help_system.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/help_system.c') diff --git a/src/help_system.c b/src/help_system.c index 3ebbcb9ec..4a4d927c5 100644 --- a/src/help_system.c +++ b/src/help_system.c @@ -59,12 +59,12 @@ u8 RunHelpSystemCallback(void) { if (!sub_812B45C() || !gHelpSystemEnabled) { - PlaySE(SE_HELP_ERR); + PlaySE(SE_HELP_NG); return 0; } m4aMPlayStop(&gMPlayInfo_SE1); m4aMPlayStop(&gMPlayInfo_SE2); - PlaySE(SE_HELP_OPEN); + PlaySE(SE_HELP_OP); if (!gUnknown_203F174) m4aMPlayVolumeControl(&gMPlayInfo_BGM, 0xFFFF, 0x80); SaveCallbacks(); @@ -112,7 +112,7 @@ u8 RunHelpSystemCallback(void) case 5: if (!sub_812BB9C(&gHelpSystemListMenu, gHelpSystemListMenuItems)) { - PlaySE(SE_HELP_CLOSE); + PlaySE(SE_HELP_CL); sVideoState.state = 6; } break; -- cgit v1.2.3