Merge branch 'master' into doc-finalmisc

2021-11-03 13:56:22 -04:00
parent afb9ff3a40 e14210ce1f
commit 3e49ac804b
147 changed files with 4789 additions and 4178 deletions
--- a/src/pokeblock_feed.c
+++ b/src/pokeblock_feed.c
@@ -872,7 +872,7 @@ static void Task_PrintAtePokeblockMessage(u8 taskId)
        StringExpandPlaceholders(gStringVar4, gText_Var1DisdainfullyAteVar2);

    gTextFlags.canABSpeedUpPrint = TRUE;
-    AddTextPrinterParameterized2(0, 1, gStringVar4, GetPlayerTextSpeedDelay(), NULL, 2, 1, 3);
+    AddTextPrinterParameterized2(0, FONT_NORMAL, gStringVar4, GetPlayerTextSpeedDelay(), NULL, 2, 1, 3);
    gTasks[taskId].func = Task_WaitForAtePokeblockMessage;
 }