summaryrefslogtreecommitdiff
path: root/src/diploma.c
diff options
context:
space:
mode:
authorGarak <thomastaps194@comcast.net>2018-07-17 09:24:30 -0400
committerGitHub <noreply@github.com>2018-07-17 09:24:30 -0400
commit5e46a0fcc57d421879c1f65b40b4692bbe65a813 (patch)
tree398b53f56158397a04e0e8de8159e00eeba9acc3 /src/diploma.c
parente06b63efc9ea39875b17f00e5ff20c2e0fcb0415 (diff)
parent06b3ce408f774c7192202308e783cc22bb8e7643 (diff)
Merge pull request #2 from pret/master
sync with source repo
Diffstat (limited to 'src/diploma.c')
-rw-r--r--src/diploma.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/diploma.c b/src/diploma.c
index 289e0e043..599ceec72 100644
--- a/src/diploma.c
+++ b/src/diploma.c
@@ -89,7 +89,7 @@ void CB2_ShowDiploma(void)
CopyBgTilemapBufferToVram(1);
DisplayDiplomaText();
BlendPalettes(-1, 16, 0);
- BeginNormalPaletteFade(-1, 0, 16, 0, 0);
+ BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, 0);
EnableInterrupts(1);
SetVBlankCallback(VBlankCB);
SetMainCallback2(MainCB2);
@@ -114,7 +114,7 @@ static void Task_DiplomaWaitForKeyPress(u8 taskId)
{
if (gMain.newKeys & (A_BUTTON | B_BUTTON))
{
- BeginNormalPaletteFade(-1, 0, 0, 16, 0);
+ BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, 0);
gTasks[taskId].func = Task_DiplomaFadeOut;
}
}