diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2018-07-16 20:23:05 +0200 |
|---|---|---|
| committer | DizzyEggg <jajkodizzy@wp.pl> | 2018-07-16 20:23:05 +0200 |
| commit | ea5ffa3375f58c3d859f48d220a8a67fcb56fa61 (patch) | |
| tree | e04cbfe52909f094f9b7a0b20e927d0f5851b201 /src/berry_tag_screen.c | |
| parent | ee3d505b585c5d0a8b6a8a68b8ab787d04bdc33a (diff) | |
| parent | 07ef76277021d5cddf14004e37e785c31fcea69b (diff) | |
Merge with master
Diffstat (limited to 'src/berry_tag_screen.c')
| -rw-r--r-- | src/berry_tag_screen.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/berry_tag_screen.c b/src/berry_tag_screen.c index a755f4f44..fb4bf6817 100644 --- a/src/berry_tag_screen.c +++ b/src/berry_tag_screen.c @@ -247,7 +247,7 @@ static bool8 InitBerryTagScreen(void) gMain.state++; break; case 15: - BeginNormalPaletteFade(-1, 0, 0x10, 0, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0x10, 0, 0); gPaletteFade.bufferTransferDisabled = 0; gMain.state++; break; @@ -481,7 +481,7 @@ static void DestroyFlavorCircleSprites(void) static void PrepareToCloseBerryTagScreen(u8 taskId) { PlaySE(SE_SELECT); - BeginNormalPaletteFade(-1, 0, 0, 0x10, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, 0); gTasks[taskId].func = Task_CloseBerryTagScreen; } |