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/mevent.c | |
| parent | 7b28a3ecfd7c6a7ae73283b298b2f04bbbcc72f0 (diff) | |
| parent | c61603fb3812011981e22478bce93aba8b7ec183 (diff) | |
Merge branch 'master' into battle
Diffstat (limited to 'src/mevent.c')
| -rw-r--r-- | src/mevent.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mevent.c b/src/mevent.c index af2006e14..f1c9d8a4c 100644 --- a/src/mevent.c +++ b/src/mevent.c @@ -192,7 +192,7 @@ u32 sub_8143770(u8 * r4, u16 * r5) case 2: if (GetLinkPlayerCount_2() == 2) { - PlaySE(SE_TOY_G); + PlaySE(SE_PINPON); CheckShouldAdvanceLinkState(); *r5 = 0; *r4 = 3; @@ -475,7 +475,7 @@ void sub_8143910(u8 taskId) data->state = 0; break; case 26: - sub_812B484(); + HelpSystem_Enable(); Free(data->t10); DestroyTask(taskId); SetMainCallback2(MainCB_FreeAllBuffersAndReturnToInitTitleScreen); |