diff options
| author | Diegoisawesome <Diegoisawesome@users.noreply.github.com> | 2018-07-15 04:43:03 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-15 04:43:03 -0700 |
| commit | 07ef76277021d5cddf14004e37e785c31fcea69b (patch) | |
| tree | 2ddbc42ed88d41986a5db903ddb06ac5bbed0df3 /src/pokeblock_feed.c | |
| parent | 24f6484643ed3d7115fd4ebd92f254f224f1ca97 (diff) | |
| parent | 731d6d59bc624e0350b3396f135a35f6c9bdc4f8 (diff) | |
Merge pull request #275 from Diegoisawesome/master
Document list_menu.c and main_menu.c
Diffstat (limited to 'src/pokeblock_feed.c')
| -rw-r--r-- | src/pokeblock_feed.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/pokeblock_feed.c b/src/pokeblock_feed.c index db92d56a8..463e821e5 100644 --- a/src/pokeblock_feed.c +++ b/src/pokeblock_feed.c @@ -59,7 +59,7 @@ extern const u16 gUnknown_0860F074[]; extern bool8 sub_81221EC(void); extern void sub_806A068(u16, u8); -extern void sub_809882C(u8, u16, u8); +extern void LoadUserWindowBorderGfx(u8, u16, u8); // this file's functions static void HandleInitBackgrounds(void); @@ -597,7 +597,7 @@ static bool8 TransitionToPokeblockFeedScene(void) gMain.state++; break; case 13: - BeginNormalPaletteFade(-1, 0, 0x10, 0, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0x10, 0, 0); gPaletteFade.bufferTransferDisabled = 0; gMain.state++; break; @@ -706,7 +706,7 @@ static void HandleInitWindows(void) { InitWindows(sWindowTemplates); DeactivateAllTextPrinters(); - sub_809882C(0, 1, 0xE0); + LoadUserWindowBorderGfx(0, 1, 0xE0); LoadPalette(gUnknown_0860F074, 0xF0, 0x20); FillWindowPixelBuffer(0, 0); PutWindowTilemap(0); @@ -811,7 +811,7 @@ static void Task_ReturnAfterPaletteFade(u8 taskId) static void Task_PaletteFadeToReturn(u8 taskId) { - BeginNormalPaletteFade(-1, 0, 0, 0x10, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, 0); gTasks[taskId].func = Task_ReturnAfterPaletteFade; } |