dionmoustos/Pokemon-Firered
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

EvoGraphicsTaskEvoStop

Browse Source
This commit is contained in:
PikalaxALT
2019-11-19 11:54:21 -05:00
parent 789eb58882
commit 009732cb4c
1 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/evolution_graphics.c
+3 -5
View File
@@ -493,7 +493,6 @@ static void SpriteCallbackDummy_MonSprites(struct Sprite * sprite)
#define tPostEvoScale data[4] #define tPostEvoScale data[4]
#define tDirection data[5] #define tDirection data[5]
#define tSpeed data[6] #define tSpeed data[6]
#define tBButtonCancel data[8]
u8 LaunchTask_PrePostEvoMonSprites(u8 preEvoSpriteId, u8 postEvoSpriteId) 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].oam.matrixNum = 31;
gSprites[postEvoSpriteId].invisible = FALSE; gSprites[postEvoSpriteId].invisible = FALSE;
CpuCopy16(palette, &gPlttBufferFaded[256 + 16 * gSprites[postEvoSpriteId].oam.paletteNum], 32); CpuCopy16(palette, &gPlttBufferFaded[256 + 16 * gSprites[postEvoSpriteId].oam.paletteNum], 32);
gTasks[taskId].tBButtonCancel = FALSE; gTasks[taskId].EvoGraphicsTaskEvoStop = FALSE;
return taskId; return taskId;
} }
@@ -532,7 +531,7 @@ static void EvoTask_PrePostEvoMonSpritesInit(u8 taskId)
static void EvoTask_ChooseNextEvoSpriteAnim(u8 taskId) static void EvoTask_ChooseNextEvoSpriteAnim(u8 taskId)
{ {
if (gTasks[taskId].tBButtonCancel) if (gTasks[taskId].EvoGraphicsTaskEvoStop)
{ {
PreEvoVisible_PostEvoInvisible_KillTask(taskId); PreEvoVisible_PostEvoInvisible_KillTask(taskId);
} }
@@ -551,7 +550,7 @@ static void EvoTask_ChooseNextEvoSpriteAnim(u8 taskId)
static void EvoTask_ShrinkOrExpandEvoSprites(u8 taskId) static void EvoTask_ShrinkOrExpandEvoSprites(u8 taskId)
{ {
u8 r6; u8 r6;
if (gTasks[taskId].tBButtonCancel) if (gTasks[taskId].EvoGraphicsTaskEvoStop)
{ {
gTasks[taskId].func = PreEvoVisible_PostEvoInvisible_KillTask; gTasks[taskId].func = PreEvoVisible_PostEvoInvisible_KillTask;
} }
@@ -637,4 +636,3 @@ static void PreEvoVisible_PostEvoInvisible_KillTask(u8 taskId)
#undef tPostEvoScale #undef tPostEvoScale
#undef tDirection #undef tDirection
#undef tSpeed #undef tSpeed
#undef tBButtonCancel