diff options
| author | huderlem <huderlem@gmail.com> | 2019-04-08 17:30:28 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-04-08 17:30:28 -0500 |
| commit | ce93d3ab9ac460ba771863df60e36be8497b7c78 (patch) | |
| tree | c0b78fe2cd3bd406c16d244dd257ccd5d751f9ef /src/pokeblock.c | |
| parent | c8ce1a0a1f533a265d5134660c31b1ec6e8b86e0 (diff) | |
| parent | 50350cc2e1c26082f9d852e97e1698f7254d4145 (diff) | |
Merge pull request #661 from Phlosioneer/contest-ai-cleanup
contest & contest_ai cleanup
Diffstat (limited to 'src/pokeblock.c')
| -rw-r--r-- | src/pokeblock.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/pokeblock.c b/src/pokeblock.c index 325c2d5d0..0d8469132 100644 --- a/src/pokeblock.c +++ b/src/pokeblock.c @@ -32,6 +32,7 @@ #include "text_window.h" #include "constants/items.h" #include "constants/songs.h" +#include "constants/rgb.h" #define POKEBLOCK_MAX_FEEL 99 #define FIELD_E75_COUNT 7 @@ -585,7 +586,7 @@ static bool8 InitPokeblockMenu(void) gMain.state++; break; case 18: - BeginNormalPaletteFade(0xFFFFFFFF, 0, 0x10, 0, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0x10, 0, RGB_BLACK); gPaletteFade.bufferTransferDisabled = 0; gMain.state++; break; @@ -948,7 +949,7 @@ static void sub_8136470(struct Sprite *sprite) static void FadePaletteAndSetTaskToClosePokeblockCase(u8 taskId) { - BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, RGB_BLACK); gTasks[taskId].func = Task_FreeDataAndExitPokeblockCase; } |