diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2021-02-28 10:26:49 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-28 10:26:49 -0500 |
| commit | ea748ff7f51a7c119658930f878d046cc8b83c51 (patch) | |
| tree | 3616ea8ad0a2b3f05482ffd3b9db929a8b5f4573 /src/starter_choose.c | |
| parent | 70c560cc84ec4152438815a7abae673ae6f589f8 (diff) | |
| parent | 293df1887f4b849e96d06530c722bd39afb7b72b (diff) | |
Merge pull request #1344 from GriffinRichards/doc-ec
Document easy chat and mail, script.c cleanup, add/use some general constants
Diffstat (limited to 'src/starter_choose.c')
| -rw-r--r-- | src/starter_choose.c | 6 |
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); |