diff options
| author | PikalaxALT <PikalaxALT@users.noreply.github.com> | 2020-04-12 10:12:37 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-12 10:12:37 -0400 |
| commit | 6001e107993d1da69decdf479abf8a661ad57dda (patch) | |
| tree | 9a430f0b70e0a24965378724f1bd28cd1a193dc1 /src/battle_script_commands.c | |
| parent | 2880cf2a51ea36fa36f00d9ecf07177e5955c882 (diff) | |
| parent | 7a562d6bae78fd7c62ed2f804fd8dcc555d85d18 (diff) | |
Merge pull request #321 from PikalaxALT/modern_gcc
Get pokefirered_modern to build
Diffstat (limited to 'src/battle_script_commands.c')
| -rw-r--r-- | src/battle_script_commands.c | 14 |
1 files changed, 7 insertions, 7 deletions
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) |