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/egg_hatch.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/egg_hatch.c')
| -rw-r--r-- | src/egg_hatch.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/egg_hatch.c b/src/egg_hatch.c index 1ed38c67e..575050ca5 100644 --- a/src/egg_hatch.c +++ b/src/egg_hatch.c @@ -593,7 +593,7 @@ static void CB2_EggHatch_1(void) switch (sEggHatchData->CB2_state) { case 0: - BeginNormalPaletteFade(-1, 0, 0x10, 0, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0x10, 0, 0); sEggHatchData->eggSpriteID = CreateSprite(&sSpriteTemplate_EggHatch, 120, 75, 5); ShowBg(0); ShowBg(1); @@ -655,7 +655,7 @@ static void CB2_EggHatch_1(void) case 9: if (!IsTextPrinterActive(sEggHatchData->windowId)) { - sub_809882C(sEggHatchData->windowId, 0x140, 0xE0); + LoadUserWindowBorderGfx(sEggHatchData->windowId, 0x140, 0xE0); CreateYesNoMenu(&sYesNoWinTemplate, 0x140, 0xE, 0); sEggHatchData->CB2_state++; } @@ -676,7 +676,7 @@ static void CB2_EggHatch_1(void) } break; case 11: - BeginNormalPaletteFade(-1, 0, 0, 0x10, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, 0); sEggHatchData->CB2_state++; break; case 12: @@ -786,7 +786,7 @@ static void SpriteCB_Egg_4(struct Sprite* sprite) { s16 i; if (sprite->data[0] == 0) - BeginNormalPaletteFade(-1, -1, 0, 0x10, 0xFFFF); + BeginNormalPaletteFade(0xFFFFFFFF, -1, 0, 0x10, 0xFFFF); if (sprite->data[0] < 4u) { for (i = 0; i <= 3; i++) @@ -810,7 +810,7 @@ static void SpriteCB_Egg_5(struct Sprite* sprite) StartSpriteAffineAnim(&gSprites[sEggHatchData->pokeSpriteID], 1); } if (sprite->data[0] == 8) - BeginNormalPaletteFade(-1, -1, 0x10, 0, 0xFFFF); + BeginNormalPaletteFade(0xFFFFFFFF, -1, 0x10, 0, 0xFFFF); if (sprite->data[0] <= 9) gSprites[sEggHatchData->pokeSpriteID].pos1.y -= 1; if (sprite->data[0] > 40) |