Finish field_specials

2019-10-24 15:28:43 -04:00
parent 0d73967f6c
commit 7c3d9df380
21 changed files with 664 additions and 1550 deletions
@@ -396,7 +396,7 @@ void FieldUseFunc_TmCase(u8 taskId)
    }
    else
    {
-        sub_80CCB68();
+        StopPokemonLeagueLightingEffectTask();
        fade_screen(1, 0);
        gTasks[taskId].func = Task_InitTMCaseFromField;
    }
@@ -427,7 +427,7 @@ void FieldUseFunc_BerryPouch(u8 taskId)
    }
    else
    {
-        sub_80CCB68();
+        StopPokemonLeagueLightingEffectTask();
        fade_screen(1, 0);
        gTasks[taskId].func = Task_InitBerryPouchFromField;
    }
@@ -470,7 +470,7 @@ void FieldUseFunc_TeachyTv(u8 taskId)
    }
    else
    {
-        sub_80CCB68();
+        StopPokemonLeagueLightingEffectTask();
        fade_screen(1, 0);
        gTasks[taskId].func = Task_InitTeachyTvFromField;
    }
@@ -600,7 +600,7 @@ void FieldUseFunc_TownMap(u8 taskId)
    }
    else
    {
-        sub_80CCB68();
+        StopPokemonLeagueLightingEffectTask();
        fade_screen(1, 0);
        gTasks[taskId].func = sub_80A1CC0;
    }
@@ -632,7 +632,7 @@ void FieldUseFunc_FameChecker(u8 taskId)
    }
    else
    {
-        sub_80CCB68();
+        StopPokemonLeagueLightingEffectTask();
        fade_screen(1, 0);
        gTasks[taskId].func = sub_80A1D68;
    }