Battle files - review changes

This commit is contained in:
DizzyEggg
2018-07-16 20:47:30 +02:00
parent ea5ffa3375
commit bf0178238a
13 changed files with 95 additions and 82 deletions
+4 -4
View File
@@ -2940,19 +2940,19 @@ static void ChooseTypeOfMoveUsedString(u8* dst)
void BattlePutTextOnWindow(const u8 *text, u8 windowId)
{
const struct BattleWindowText *textInfo = sBattleTextOnWindowsInfo[gBattleScripting.windowsType];
bool32 toVram;
bool32 copyToVram;
struct TextSubPrinter textSubPrinter;
u8 speed;
if (windowId & 0x80)
{
windowId &= ~(0x80);
toVram = FALSE;
copyToVram = FALSE;
}
else
{
FillWindowPixelBuffer(windowId, textInfo[windowId].fillValue);
toVram = TRUE;
copyToVram = TRUE;
}
textSubPrinter.current_text_offset = text;
@@ -3005,7 +3005,7 @@ void BattlePutTextOnWindow(const u8 *text, u8 windowId)
AddTextPrinter(&textSubPrinter, speed, NULL);
if (toVram)
if (copyToVram)
{
PutWindowTilemap(windowId);
CopyWindowToVram(windowId, 3);