dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into doc-pokejump

Browse Source
This commit is contained in:
GriffinR
2021-02-28 10:27:50 -05:00
committed by GitHub
parent 763724a980 ea748ff7f5
commit 3f59362397
165 changed files with 4500 additions and 3973 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pokemon_jump.c
+3 -3
View File
@@ -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;