diff options
| author | Diegoisawesome <diego@domoreaweso.me> | 2018-11-06 11:30:21 -0600 |
|---|---|---|
| committer | Diegoisawesome <diego@domoreaweso.me> | 2018-11-06 11:30:21 -0600 |
| commit | f8d337e491f531285f6067e2e7f39a8d606036d6 (patch) | |
| tree | 4e01743813177b9c69bc0e1108a22cc44e6da6c0 /src/battle_message.c | |
| parent | 6d38431c330a79d97bfb72fdaaaa65901ce0fa64 (diff) | |
Finish cleaning up text.c
Diffstat (limited to 'src/battle_message.c')
| -rw-r--r-- | src/battle_message.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/battle_message.c b/src/battle_message.c index 018848218..3b4ad0c21 100644 --- a/src/battle_message.c +++ b/src/battle_message.c @@ -2961,7 +2961,7 @@ void BattlePutTextOnWindow(const u8 *text, u8 windowId) printerTemplate.currentY = printerTemplate.y; printerTemplate.letterSpacing = textInfo[windowId].letterSpacing; printerTemplate.lineSpacing = textInfo[windowId].lineSpacing; - printerTemplate.fontColor_l = 0; + printerTemplate.unk = 0; printerTemplate.fgColor = textInfo[windowId].fgColor; printerTemplate.bgColor = textInfo[windowId].bgColor; printerTemplate.shadowColor = textInfo[windowId].shadowColor; @@ -2974,14 +2974,14 @@ void BattlePutTextOnWindow(const u8 *text, u8 windowId) } if (windowId == 0x16) - gTextFlags.flag_1 = 0; + gTextFlags.useAlternateDownArrow = 0; else - gTextFlags.flag_1 = 1; + gTextFlags.useAlternateDownArrow = 1; if (gBattleTypeFlags & (BATTLE_TYPE_LINK | BATTLE_TYPE_RECORDED)) - gTextFlags.flag_2 = 1; + gTextFlags.autoScroll = 1; else - gTextFlags.flag_2 = 0; + gTextFlags.autoScroll = 0; if (windowId == 0 || windowId == 0x16) { @@ -2990,7 +2990,7 @@ void BattlePutTextOnWindow(const u8 *text, u8 windowId) else if (gBattleTypeFlags & BATTLE_TYPE_RECORDED) speed = sRecordedBattleTextSpeeds[GetTextSpeedInRecordedBattle()]; else - speed = GetPlayerTextSpeed(); + speed = GetPlayerTextSpeedDelay(); gTextFlags.canABSpeedUpPrint = 1; } |