Merge branch 'master' into doc-binterface

2021-11-09 16:09:48 -05:00
parent adf773f1ed 1c82571fa0
commit 8e424b6985
228 changed files with 3158 additions and 3198 deletions
--- a/src/battle_interface.c
+++ b/src/battle_interface.c
@@ -2535,7 +2535,7 @@ static u8* AddTextPrinterAndCreateWindowOnHealthbox(const u8 *str, u32 x, u32 y,
    color[1] = 1;
    color[2] = 3;

-    AddTextPrinterParameterized4(winId, FONT_SMALL, x, y, 0, 0, color, -1, str);
+    AddTextPrinterParameterized4(winId, FONT_SMALL, x, y, 0, 0, color, TEXT_SKIP_DRAW, str);

    *windowId = winId;
    return (u8*)(GetWindowAttribute(winId, WINDOW_TILE_DATA));