battle labels merge with master

2018-02-09 00:43:07 +01:00
parent 9df5e16343 387dbf48d0
commit bce01bc518
137 changed files with 40431 additions and 35066 deletions
@@ -2425,7 +2425,7 @@ void BattleHandleAddTextPrinter(const u8 *text, u8 arg1)
    textSubPrinter.letterSpacing = r8[(12 * arg1) + 4];
    textSubPrinter.lineSpacing = r8[(12 * arg1) + 5];
    textSubPrinter.fontColor_l = 0;
-    textSubPrinter.fontColor_h = r8[(12 * arg1) + 7];
+    textSubPrinter.fgColor = r8[(12 * arg1) + 7];
    textSubPrinter.bgColor = r8[(12 * arg1) + 8];
    textSubPrinter.shadowColor = r8[(12 * arg1) + 9];