ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2025-02-04 18:30:07 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1545 from sphericalice/pal-constants

Browse Source 
Use relevant constants for BlendPalettes
This commit is contained in:
GriffinR 2021-11-05 18:05:41 -04:00 committed by GitHub
commit 27957b5c1f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/diploma.c
View File

@ -83,7 +83,7 @@ void CB2_ShowDiploma(void)
LZDecompressWram(sDiplomaTilemap, sDiplomaTilemapPtr);
CopyBgTilemapBufferToVram(1);
DisplayDiplomaText();
BlendPalettes(-1, 16, 0);
BlendPalettes(PALETTES_ALL, 16, RGB_BLACK);
BeginNormalPaletteFade(PALETTES_ALL, 0, 16, 0, RGB_BLACK);
EnableInterrupts(1);
SetVBlankCallback(VBlankCB);

2
src/start_menu.c
View File

@ -1200,7 +1200,7 @@ static bool32 InitSaveWindowAfterLinkBattle(u8 *state)
break;
case 3:
ShowBg(0);
BlendPalettes(-1, 16, 0);
BlendPalettes(PALETTES_ALL, 16, RGB_BLACK);
SetVBlankCallback(VBlankCB_LinkBattleSave);
EnableInterrupts(1);
break;