summaryrefslogtreecommitdiff
path: root/src/use_pokeblock.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/use_pokeblock.c')
-rw-r--r--src/use_pokeblock.c34
1 files changed, 17 insertions, 17 deletions
diff --git a/src/use_pokeblock.c b/src/use_pokeblock.c
index dcfc27d91..9f8918ba2 100644
--- a/src/use_pokeblock.c
+++ b/src/use_pokeblock.c
@@ -878,7 +878,7 @@ static void AskUsePokeblock(void)
DrawTextBorderOuter(WIN_TEXT, 151, 14);
AddTextPrinterParameterized(WIN_TEXT, FONT_NORMAL, gStringVar4, 0, 1, 0, NULL);
PutWindowTilemap(WIN_TEXT);
- CopyWindowToVram(WIN_TEXT, 3);
+ CopyWindowToVram(WIN_TEXT, COPYWIN_FULL);
CreateYesNoMenu(&sUsePokeblockYesNoWinTemplate, 151, 14, 0);
}
@@ -919,7 +919,7 @@ static void PrintFirstEnhancement(void)
PrintMenuWindowText(gStringVar4);
PutWindowTilemap(WIN_TEXT);
- CopyWindowToVram(WIN_TEXT, 3);
+ CopyWindowToVram(WIN_TEXT, COPYWIN_FULL);
}
static bool8 TryPrintNextEnhancement(void)
@@ -943,7 +943,7 @@ static bool8 TryPrintNextEnhancement(void)
BufferEnhancedStatText(gStringVar4, sInfo->statId, sInfo->enhancements[sInfo->statId]);
PrintMenuWindowText(gStringVar4);
- CopyWindowToVram(WIN_TEXT, 2);
+ CopyWindowToVram(WIN_TEXT, COPYWIN_GFX);
return TRUE;
}
@@ -954,14 +954,14 @@ static void PrintWontEatAnymore(void)
DrawTextBorderOuter(WIN_TEXT, 151, 14);
AddTextPrinterParameterized(WIN_TEXT, FONT_NORMAL, gText_WontEatAnymore, 0, 1, 0, NULL);
PutWindowTilemap(WIN_TEXT);
- CopyWindowToVram(WIN_TEXT, 3);
+ CopyWindowToVram(WIN_TEXT, COPYWIN_FULL);
}
static void EraseMenuWindow(void)
{
rbox_fill_rectangle(WIN_TEXT);
ClearWindowTilemap(WIN_TEXT);
- CopyWindowToVram(WIN_TEXT, 3);
+ CopyWindowToVram(WIN_TEXT, COPYWIN_FULL);
}
static void PrintMenuWindowText(const u8 *message)
@@ -1316,14 +1316,14 @@ static bool8 LoadUsePokeblockMenuGfx(void)
switch (sMenu->info.helperState)
{
case 0:
- ChangeBgX(0, 0, 0);
- ChangeBgY(0, 0, 0);
- ChangeBgX(1, 0, 0);
- ChangeBgY(1, 0, 0);
- ChangeBgX(2, 0, 0);
- ChangeBgY(2, 0, 0);
- ChangeBgX(3, 0, 0);
- ChangeBgY(3, 136 << 6, 0);
+ ChangeBgX(0, 0, BG_COORD_SET);
+ ChangeBgY(0, 0, BG_COORD_SET);
+ ChangeBgX(1, 0, BG_COORD_SET);
+ ChangeBgY(1, 0, BG_COORD_SET);
+ ChangeBgX(2, 0, BG_COORD_SET);
+ ChangeBgY(2, 0, BG_COORD_SET);
+ ChangeBgX(3, 0, BG_COORD_SET);
+ ChangeBgY(3, 136 << 6, BG_COORD_SET);
SetGpuReg(REG_OFFSET_DISPCNT, DISPCNT_OBJ_1D_MAP | DISPCNT_OBJ_ON | DISPCNT_WIN0_ON | DISPCNT_WIN1_ON);
SetGpuReg(REG_OFFSET_BLDCNT, BLDCNT_TGT1_BG2 | BLDCNT_EFFECT_BLEND | BLDCNT_TGT2_BG1);
SetGpuReg(REG_OFFSET_BLDALPHA, BLDALPHA_BLEND(11, 4));
@@ -1399,13 +1399,13 @@ static void UpdateMonInfoText(u16 loadId, bool8 firstPrint)
if (firstPrint)
{
- CopyWindowToVram(WIN_NAME, 3);
- CopyWindowToVram(WIN_NATURE, 3);
+ CopyWindowToVram(WIN_NAME, COPYWIN_FULL);
+ CopyWindowToVram(WIN_NATURE, COPYWIN_FULL);
}
else
{
- CopyWindowToVram(WIN_NAME, 2);
- CopyWindowToVram(WIN_NATURE, 2);
+ CopyWindowToVram(WIN_NAME, COPYWIN_GFX);
+ CopyWindowToVram(WIN_NATURE, COPYWIN_GFX);
}
}