diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2021-02-28 10:27:50 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-28 10:27:50 -0500 |
| commit | 3f5936239785c8dae923e1f5c4bb91492e67cb5a (patch) | |
| tree | cb0c74dc4a2c09551e1b6699b7c71ed7dc7c85d7 /src/pokemon_jump.c | |
| parent | 763724a98046c81da15dd5a5877ad30adb8129ba (diff) | |
| parent | ea748ff7f51a7c119658930f878d046cc8b83c51 (diff) | |
Merge branch 'master' into doc-pokejump
Diffstat (limited to 'src/pokemon_jump.c')
| -rwxr-xr-x | src/pokemon_jump.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/pokemon_jump.c b/src/pokemon_jump.c index e53efd7ac..4d7efe9ba 100755 --- a/src/pokemon_jump.c +++ b/src/pokemon_jump.c @@ -710,8 +710,8 @@ static void Task_StartPokemonJump(u8 taskId) case 3: if (IsLinkTaskFinished()) { - BlendPalettes(0xFFFFFFFF, 16, RGB_BLACK); - BeginNormalPaletteFade(0xFFFFFFFF, -1, 16, 0, RGB_BLACK); + BlendPalettes(PALETTES_ALL, 16, RGB_BLACK); + BeginNormalPaletteFade(PALETTES_ALL, -1, 16, 0, RGB_BLACK); SetVBlankCallback(VBlankCB_PokemonJump); sPokemonJump->mainState++; } @@ -1591,7 +1591,7 @@ static bool32 ClosePokeJumpLink(void) case 3: if (++sPokemonJump->timer > 120) { - BeginNormalPaletteFade(0xFFFFFFFF, -1, 0, 16, RGB_BLACK); + BeginNormalPaletteFade(PALETTES_ALL, -1, 0, 16, RGB_BLACK); sPokemonJump->helperState++; } break; |