summaryrefslogtreecommitdiff
path: root/src/starter_choose.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/starter_choose.c')
-rw-r--r--src/starter_choose.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/starter_choose.c b/src/starter_choose.c
index f7ffcfc2c..f29023d96 100644
--- a/src/starter_choose.c
+++ b/src/starter_choose.c
@@ -425,7 +425,7 @@ void CB2_ChooseStarter(void)
LoadCompressedSpriteSheet(&sSpriteSheet_PokeballSelect[0]);
LoadCompressedSpriteSheet(&sSpriteSheet_StarterCircle[0]);
LoadSpritePalettes(sSpritePalettes_StarterChoose);
- BeginNormalPaletteFade(0xFFFFFFFF, 0, 0x10, 0, RGB_BLACK);
+ BeginNormalPaletteFade(PALETTES_ALL, 0, 0x10, 0, RGB_BLACK);
EnableInterrupts(DISPSTAT_VBLANK);
SetVBlankCallback(VblankCB_StarterChoose);
@@ -464,7 +464,7 @@ void CB2_ChooseStarter(void)
gSprites[spriteId].sTaskId = taskId;
gSprites[spriteId].sBallId = 2;
- sStarterLabelWindowId = 0xFF;
+ sStarterLabelWindowId = WINDOW_NONE;
}
static void CB2_StarterChoose(void)
@@ -613,7 +613,7 @@ static void ClearStarterLabel(void)
FillWindowPixelBuffer(sStarterLabelWindowId, PIXEL_FILL(0));
ClearWindowTilemap(sStarterLabelWindowId);
RemoveWindow(sStarterLabelWindowId);
- sStarterLabelWindowId = 0xFF;
+ sStarterLabelWindowId = WINDOW_NONE;
SetGpuReg(REG_OFFSET_WIN0H, 0);
SetGpuReg(REG_OFFSET_WIN0V, 0);
ScheduleBgCopyTilemapToVram(0);