diff options
| author | Evan <eroelke@gmail.com> | 2019-11-21 09:31:40 -0700 |
|---|---|---|
| committer | Evan <eroelke@gmail.com> | 2019-11-21 09:31:40 -0700 |
| commit | 407d22af8e685076bc92f837266786dfe78e7123 (patch) | |
| tree | 11a039ad7737c105d4b81ae653ba899d342b6e57 /src/evolution_graphics.c | |
| parent | e6bc189a033bb2019233dc99f2c1114053c7650d (diff) | |
| parent | 1234d0252cbe2b0001784b10b75f0d339824632d (diff) | |
fix PR merge conflicts
Diffstat (limited to 'src/evolution_graphics.c')
| -rw-r--r-- | src/evolution_graphics.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/evolution_graphics.c b/src/evolution_graphics.c index 175ebf81e..622b26f8f 100644 --- a/src/evolution_graphics.c +++ b/src/evolution_graphics.c @@ -397,7 +397,7 @@ static void EvoTask_PostEvoSparklesSet2Init(u8 taskId) { SetEvoSparklesMatrices(); gTasks[taskId].data[15] = 0; - sub_80D0474(); + IsMovingBackgroundTaskRunning(); CpuCopy16(&gPlttBufferFaded[32], &gPlttBufferUnfaded[32], 96); BeginNormalPaletteFade(0xFFF90F1C, 0, 0, 16, RGB_WHITE); gTasks[taskId].func = EvoTask_CreatePostEvoSparklesSet2; @@ -448,7 +448,7 @@ static void EvoTask_PostEvoSparklesSet2TradeInit(u8 taskId) { SetEvoSparklesMatrices(); gTasks[taskId].data[15] = 0; - sub_80D0474(); + IsMovingBackgroundTaskRunning(); CpuCopy16(&gPlttBufferFaded[32], &gPlttBufferUnfaded[32], 96); BeginNormalPaletteFade(0xFFF90F00, 0, 0, 16, RGB_WHITE); gTasks[taskId].func = EvoTask_CreatePostEvoSparklesSet2Trade; |