diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2021-11-03 13:56:22 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-11-03 13:56:22 -0400 |
| commit | 3e49ac804b53cdb4d39b4f92de949eb858efcee4 (patch) | |
| tree | f3598d27d0511ad5cd3457edeef60ef96cbb4305 /src/tileset_anims.c | |
| parent | afb9ff3a40dcfb2681ef274752bceb726d14b783 (diff) | |
| parent | e14210ce1f9be3ae894490a4e3050832aecbdde7 (diff) | |
Merge branch 'master' into doc-finalmisc
Diffstat (limited to 'src/tileset_anims.c')
| -rw-r--r-- | src/tileset_anims.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/tileset_anims.c b/src/tileset_anims.c index f566fe3e0..71f8044f9 100644 --- a/src/tileset_anims.c +++ b/src/tileset_anims.c @@ -1169,7 +1169,7 @@ static void BlendAnimPalette_BattleDome_FloorLights(u16 timer) { CpuCopy16(gTilesetAnims_BattleDomeFloorLightPals[timer % 4], gPlttBufferUnfaded + 0x80, 32); BlendPalette(0x80, 16, gPaletteFade.y, gPaletteFade.blendColor & 0x7FFF); - if ((u8)FindTaskIdByFunc(TransitionPhase1_Task_RunFuncs) != TASK_NONE) + if ((u8)FindTaskIdByFunc(Task_BattleTransition_Intro) != TASK_NONE) { sSecondaryTilesetAnimCallback = TilesetAnim_BattleDome2; sSecondaryTilesetAnimCounterMax = 32; @@ -1179,7 +1179,7 @@ static void BlendAnimPalette_BattleDome_FloorLights(u16 timer) static void BlendAnimPalette_BattleDome_FloorLightsNoBlend(u16 timer) { CpuCopy16(gTilesetAnims_BattleDomeFloorLightPals[timer % 4], gPlttBufferUnfaded + 0x80, 32); - if ((u8)FindTaskIdByFunc(TransitionPhase1_Task_RunFuncs) == TASK_NONE) + if ((u8)FindTaskIdByFunc(Task_BattleTransition_Intro) == TASK_NONE) { BlendPalette(0x80, 16, gPaletteFade.y, gPaletteFade.blendColor & 0x7FFF); if (!--sSecondaryTilesetAnimCounterMax) |