Fixed OrbEffect hanging when follower pokemon is out.

2022-03-15 19:58:48 -04:00 · 2022-03-15 19:58:48 -04:00 · e8f3dcaa79
commit e8f3dcaa79
parent 831c73c18c
1 changed files with 3 additions and 0 deletions
--- a/src/field_screen_effect.c
+++ b/src/field_screen_effect.c
@ -1174,6 +1174,9 @@ static void Task_OrbEffect(u8 taskId)
        tState = 4;
        break;
    case 4:
+        // If the caller script is delayed after starting the orb effect, a `waitstate` might be reached *after*
+        // we enable the ScriptContext in case 2; enabling it here as well avoids softlocks in this scenario
+        EnableBothScriptContexts();
        if (--tShakeDelay == 0)
        {
            s32 panning;