From 81a7f491b7053281ad63f6a13067bd1a36249a73 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Fri, 19 Feb 2021 18:36:48 -0500 Subject: Use WINDOW_NONE constant --- src/starter_choose.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/starter_choose.c') diff --git a/src/starter_choose.c b/src/starter_choose.c index f7ffcfc2c..587169841 100644 --- a/src/starter_choose.c +++ b/src/starter_choose.c @@ -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); -- cgit v1.2.3 From a5852d57d124c49fd1b80510e968c18404a436a3 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Fri, 19 Feb 2021 23:22:26 -0500 Subject: Use TASK_NONE constant --- src/starter_choose.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/starter_choose.c') diff --git a/src/starter_choose.c b/src/starter_choose.c index 587169841..aa8b87237 100644 --- a/src/starter_choose.c +++ b/src/starter_choose.c @@ -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) -- cgit v1.2.3 From b71b10623b31065a9a29b43938cf602087bcfc73 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Wed, 24 Feb 2021 11:01:02 -0500 Subject: Add palette selection constants --- src/starter_choose.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/starter_choose.c') diff --git a/src/starter_choose.c b/src/starter_choose.c index aa8b87237..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); -- cgit v1.2.3