Merge branch 'master' into tilemap-docs

src/subtask.c

@@ -282,7 +282,7 @@ void Subtask_Die(void) {
         gMain.substate = gUI.pauseFadeIn;
         gUI.nextToLoad = gFadeControl.active;
         gUI.lastState = gFadeControl.active;
-        ResetSystemPriority();
+        ClearEventPriority();
     }
 }