Merge branch 'master' into doc-ttower

2020-01-24 03:03:45 -05:00
parent ef1f9ead0b 85e5c57e8c
commit 39556605cd
121 changed files with 10876 additions and 19297 deletions
@@ -1049,7 +1049,7 @@ static void sub_811175C(u8 sceneNum, struct UnkStruct_203AE98 * a1)

 static void sub_81118F4(s8 a0)
 {
-    fade_screen(1, a0);
+    FadeScreen(1, a0);
    sQuestLogCB = QuestLog_AdvancePlayhead;
 }

@@ -1309,7 +1309,7 @@ static void QuestLog_CloseTextWindow(void)

 static void QuestLog_SkipToEndOfPlayback(s8 a0)
 {
-    fade_screen(1, a0);
+    FadeScreen(1, a0);
    sQuestLogCB = QuestLog_WaitFadeAndCancelPlayback;
 }