diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2018-05-23 18:24:30 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-05-23 18:24:30 -0500 |
| commit | de2fe2cbbae599d9b336cb6762e3a03445cd5027 (patch) | |
| tree | d8cea366e68eca40bac0a6c0edf0c85a27eda520 /src/trainer_card.c | |
| parent | 294d223dd0218c64267b6b6851575150e36593fb (diff) | |
| parent | 22e6e3532900b2470d0134f1347981d77828b22c (diff) | |
Merge pull request #616 from huderlem/misc
Misc labeling
Diffstat (limited to 'src/trainer_card.c')
| -rw-r--r-- | src/trainer_card.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/trainer_card.c b/src/trainer_card.c index 599479f16..7c7eb23e2 100644 --- a/src/trainer_card.c +++ b/src/trainer_card.c @@ -673,7 +673,7 @@ bool8 TrainerCard_Init(struct Task *task) ewram0_2.showColon = gSaveBlock2.playTimeSeconds & 1; ewram0_2.frameCounter = gSaveBlock2.playTimeVBlanks; TrainerCard_CreatePrintPlayTimeTask(); - BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, RGB(0, 0, 0)); ewram0_2.current_state++; /* Advance state machine */ return FALSE; } @@ -740,7 +740,7 @@ bool8 TrainerCard_WaitForFlipToFinish(struct Task *task) bool8 TrainerCard_FadeOut(struct Task *task) { TrainerCard_DestoryPlayTimeTask(); - BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, 0); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0)); ewram0_2.current_state++; /* Advance state machine */ return FALSE; } |