diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2018-01-14 20:45:44 +0100 |
|---|---|---|
| committer | DizzyEggg <jajkodizzy@wp.pl> | 2018-01-14 20:45:44 +0100 |
| commit | fdbe7fa7de9b2e1f8a22efca87201901fcea32b4 (patch) | |
| tree | f92f0fe65b7204ff5589aad82c1cc3263dcec347 /src/tileset_anims.c | |
| parent | 9106d8df1856c65b2bc85da6d61b6968669814ea (diff) | |
up to 30 battle transitions
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..062647202 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(Phase1_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(Phase1_Task_RunFuncs) == 0xFF ) { BlendPalette(0x80, 0x10, gPaletteFade.y, gPaletteFade.blendColor & 0x7FFF); if (!--sSecondaryTilesetCBBufferSize) |