diff options
| author | jiangzhengwenjz <jiangzhengwenjzw@qq.com> | 2019-10-10 08:34:28 +0800 |
|---|---|---|
| committer | jiangzhengwenjz <jiangzhengwenjzw@qq.com> | 2019-10-10 08:39:00 +0800 |
| commit | 89a377cdd3a24956ff549b0fa69a5a1cc26fe128 (patch) | |
| tree | a5279d2d7224d04f5e39b213d4c18deda54a438e /src/help_system.c | |
| parent | 7b28a3ecfd7c6a7ae73283b298b2f04bbbcc72f0 (diff) | |
| parent | c61603fb3812011981e22478bce93aba8b7ec183 (diff) | |
Merge branch 'master' into battle
Diffstat (limited to 'src/help_system.c')
| -rw-r--r-- | src/help_system.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/src/help_system.c b/src/help_system.c index 2d96ae9d6..4a4d927c5 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; @@ -49,20 +51,20 @@ 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_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(); @@ -110,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; |