diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2019-11-19 11:54:21 -0500 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2019-11-19 11:54:21 -0500 |
| commit | 009732cb4c099c7311410c41a5945a50449c41de (patch) | |
| tree | 73a2391f2c0460573b778794e0b4119886bd9e80 /src | |
| parent | 789eb58882732b74bbe5aebadf3d8ea8ff9e5b7e (diff) | |
EvoGraphicsTaskEvoStop
Diffstat (limited to 'src')
| -rw-r--r-- | src/evolution_graphics.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/evolution_graphics.c b/src/evolution_graphics.c index 7088679ba..175ebf81e 100644 --- a/src/evolution_graphics.c +++ b/src/evolution_graphics.c @@ -493,7 +493,6 @@ static void SpriteCallbackDummy_MonSprites(struct Sprite * sprite) #define tPostEvoScale data[4] #define tDirection data[5] #define tSpeed data[6] -#define tBButtonCancel data[8] u8 LaunchTask_PrePostEvoMonSprites(u8 preEvoSpriteId, u8 postEvoSpriteId) { @@ -519,7 +518,7 @@ u8 LaunchTask_PrePostEvoMonSprites(u8 preEvoSpriteId, u8 postEvoSpriteId) gSprites[postEvoSpriteId].oam.matrixNum = 31; gSprites[postEvoSpriteId].invisible = FALSE; CpuCopy16(palette, &gPlttBufferFaded[256 + 16 * gSprites[postEvoSpriteId].oam.paletteNum], 32); - gTasks[taskId].tBButtonCancel = FALSE; + gTasks[taskId].EvoGraphicsTaskEvoStop = FALSE; return taskId; } @@ -532,7 +531,7 @@ static void EvoTask_PrePostEvoMonSpritesInit(u8 taskId) static void EvoTask_ChooseNextEvoSpriteAnim(u8 taskId) { - if (gTasks[taskId].tBButtonCancel) + if (gTasks[taskId].EvoGraphicsTaskEvoStop) { PreEvoVisible_PostEvoInvisible_KillTask(taskId); } @@ -551,7 +550,7 @@ static void EvoTask_ChooseNextEvoSpriteAnim(u8 taskId) static void EvoTask_ShrinkOrExpandEvoSprites(u8 taskId) { u8 r6; - if (gTasks[taskId].tBButtonCancel) + if (gTasks[taskId].EvoGraphicsTaskEvoStop) { gTasks[taskId].func = PreEvoVisible_PostEvoInvisible_KillTask; } @@ -637,4 +636,3 @@ static void PreEvoVisible_PostEvoInvisible_KillTask(u8 taskId) #undef tPostEvoScale #undef tDirection #undef tSpeed -#undef tBButtonCancel |