diff options
| author | Diegoisawesome <diego@domoreaweso.me> | 2018-01-18 12:53:45 -0600 |
|---|---|---|
| committer | Diegoisawesome <diego@domoreaweso.me> | 2018-01-18 12:53:45 -0600 |
| commit | 9a65fbd81e03db0a5b473fe95fab2cdab007704c (patch) | |
| tree | 3b45f06c30554fc43d3aa4348ab2183bffe3b6ab /src/tileset_anims.c | |
| parent | b806ee8bedab880066a630a3b68ba9d0c5bdd5c9 (diff) | |
| parent | 24e0edee9f428a68715c47051ebba3cda5a3e5a7 (diff) | |
Merge remote-tracking branch 'pret/master'
Diffstat (limited to 'src/tileset_anims.c')
| -rw-r--r-- | src/tileset_anims.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/tileset_anims.c b/src/tileset_anims.c index 4ad787e1c..f89cfdd2b 100644 --- a/src/tileset_anims.c +++ b/src/tileset_anims.c @@ -5,6 +5,7 @@ #include "blend_palette.h" #include "battle_transition.h" #include "task.h" +#include "battle_transition.h" // Static type declarations @@ -1392,7 +1393,7 @@ static void sub_80A1818(u16 a1) { CpuCopy16(gTilesetAnims_BattleDomePals0[a1 & 0x3], gPlttBufferUnfaded + 0x80, 32); BlendPalette(0x80, 0x10, gPaletteFade.y, gPaletteFade.blendColor & 0x7FFF); - if ((u8)FindTaskIdByFunc(sub_8149DFC) != 0xFF ) + if ((u8)FindTaskIdByFunc(TransitionPhase1_Task_RunFuncs) != 0xFF ) { sSecondaryTilesetCB = sub_80A1670; sSecondaryTilesetCBBufferSize = 0x20; @@ -1402,7 +1403,7 @@ static void sub_80A1818(u16 a1) static void sub_80A1884(u16 a1) { CpuCopy16(gTilesetAnims_BattleDomePals0[a1 & 0x3], gPlttBufferUnfaded + 0x80, 32); - if ((u8)FindTaskIdByFunc(sub_8149DFC) == 0xFF ) + if ((u8)FindTaskIdByFunc(TransitionPhase1_Task_RunFuncs) == 0xFF ) { BlendPalette(0x80, 0x10, gPaletteFade.y, gPaletteFade.blendColor & 0x7FFF); if (!--sSecondaryTilesetCBBufferSize) |