Merge branch 'master' into battle

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;
     }