From aea30489fc3994a856ba929d075ed762c7fb1967 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Fri, 10 Apr 2020 16:17:46 -0400 Subject: Create COPYWIN defines for CopyWindowToVram calls --- src/battle_script_commands.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'src/battle_script_commands.c') diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c index aacb2fbe4..c88516272 100644 --- a/src/battle_script_commands.c +++ b/src/battle_script_commands.c @@ -5764,7 +5764,7 @@ static void atk6C_drawlvlupbox(void) case 4: DrawLevelUpWindow1(); PutWindowTilemap(12); - CopyWindowToVram(12, 3); + CopyWindowToVram(12, COPYWIN_BOTH); ++gBattleScripting.atk6C_state; break; case 5: @@ -5780,7 +5780,7 @@ static void atk6C_drawlvlupbox(void) { PlaySE(SE_SELECT); DrawLevelUpWindow2(); - CopyWindowToVram(12, 2); + CopyWindowToVram(12, COPYWIN_GFX); ++gBattleScripting.atk6C_state; } break; @@ -5796,9 +5796,9 @@ static void atk6C_drawlvlupbox(void) if (!sub_8026648()) { ClearWindowTilemap(13); - CopyWindowToVram(13, 1); + CopyWindowToVram(13, COPYWIN_MAP); ClearWindowTilemap(12); - CopyWindowToVram(12, 1); + CopyWindowToVram(12, COPYWIN_MAP); SetBgAttribute(2, BG_ATTR_PRIORITY, 2); ShowBg(2); gBattleScripting.atk6C_state = 10; @@ -5840,7 +5840,7 @@ static void sub_8026480(void) LoadPalette(gUnknown_82506D0, 0x60, 0x20); CopyToWindowPixelBuffer(13, gUnknown_82506F0, 0, 0); PutWindowTilemap(13); - CopyWindowToVram(13, 3); + CopyWindowToVram(13, COPYWIN_BOTH); PutMonIconOnLvlUpBox(); } @@ -5909,8 +5909,8 @@ static void PutLevelAndGenderOnLvlUpBox(void) } printerTemplate.y = 10; printerTemplate.currentY = 10; - AddTextPrinter(&printerTemplate, 0xFF, NULL); - CopyWindowToVram(13, 2); + AddTextPrinter(&printerTemplate, TEXT_SPEED_FF, NULL); + CopyWindowToVram(13, COPYWIN_GFX); } static bool8 sub_8026648(void) -- cgit v1.2.3