summaryrefslogtreecommitdiff
path: root/src/item_use.c
diff options
context:
space:
mode:
authorjiangzhengwenjz <jiangzhengwenjzw@qq.com>2019-10-25 09:22:50 +0800
committerjiangzhengwenjz <jiangzhengwenjzw@qq.com>2019-10-25 09:22:50 +0800
commit2f87855072fb4fdca6ce22d60bfb1b7fdc000134 (patch)
treea3a6d928910ed170904b5b367084afb2d1fb8b3d /src/item_use.c
parent6ca932e5e98fcd69c281d798406e53aee5a4d816 (diff)
parent7579fc65c12bd46c045d10eb8cd9a2320fd1f3f0 (diff)
Merge branch 'master' into battle
Diffstat (limited to 'src/item_use.c')
-rw-r--r--src/item_use.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/item_use.c b/src/item_use.c
index 2a2804510..873ce4ab4 100644
--- a/src/item_use.c
+++ b/src/item_use.c
@@ -397,7 +397,7 @@ void FieldUseFunc_TmCase(u8 taskId)
}
else
{
- sub_80CCB68();
+ StopPokemonLeagueLightingEffectTask();
fade_screen(1, 0);
gTasks[taskId].func = Task_InitTMCaseFromField;
}
@@ -428,7 +428,7 @@ void FieldUseFunc_BerryPouch(u8 taskId)
}
else
{
- sub_80CCB68();
+ StopPokemonLeagueLightingEffectTask();
fade_screen(1, 0);
gTasks[taskId].func = Task_InitBerryPouchFromField;
}
@@ -471,7 +471,7 @@ void FieldUseFunc_TeachyTv(u8 taskId)
}
else
{
- sub_80CCB68();
+ StopPokemonLeagueLightingEffectTask();
fade_screen(1, 0);
gTasks[taskId].func = Task_InitTeachyTvFromField;
}
@@ -601,7 +601,7 @@ void FieldUseFunc_TownMap(u8 taskId)
}
else
{
- sub_80CCB68();
+ StopPokemonLeagueLightingEffectTask();
fade_screen(1, 0);
gTasks[taskId].func = sub_80A1CC0;
}
@@ -633,7 +633,7 @@ void FieldUseFunc_FameChecker(u8 taskId)
}
else
{
- sub_80CCB68();
+ StopPokemonLeagueLightingEffectTask();
fade_screen(1, 0);
gTasks[taskId].func = sub_80A1D68;
}