Merge remote-tracking branch 'upstream/master' into berry_crush

This commit is contained in:
Kurausukun
2020-12-10 23:30:52 -05:00
500 changed files with 25386 additions and 24803 deletions

View File

@@ -2994,7 +2994,7 @@ void BattlePutTextOnWindow(const u8 *text, u8 windowId)
printerTemplate.currentY = printerTemplate.y;
printerTemplate.letterSpacing = textInfo[windowId].letterSpacing;
printerTemplate.lineSpacing = textInfo[windowId].lineSpacing;
printerTemplate.style = 0;
printerTemplate.unk = 0;
printerTemplate.fgColor = textInfo[windowId].fgColor;
printerTemplate.bgColor = textInfo[windowId].bgColor;
printerTemplate.shadowColor = textInfo[windowId].shadowColor;