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

Removed #define access for data array in Oak speech subtasks

Browse Source
This commit is contained in:
colonelsalt
2021-09-02 12:16:40 +01:00
parent 54377a43f5
commit c8c5a06a43
1 changed files with 19 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/oak_speech.c
+19 -17
View File
@@ -1751,12 +1751,14 @@ static void DestroyOaksSpeechTrainerPic(void)
CopyBgTilemapBufferToVram(2); CopyBgTilemapBufferToVram(2);
} }
#define tParentTaskId data[0]
static void Task_SlowFadeIn(u8 taskId) static void Task_SlowFadeIn(u8 taskId)
{ {
u8 i = 0; u8 i = 0;
if (gTasks[taskId].tTrainerPicPosX == 0) if (gTasks[taskId].data[1] == 0)
{ {
gTasks[gTasks[taskId].data[0]].tTrainerPicFadeState = 1; gTasks[gTasks[taskId].tParentTaskId].tTrainerPicFadeState = 1;
DestroyTask(taskId); DestroyTask(taskId);
for (i = 0; i < 3; i++) for (i = 0; i < 3; i++)
{ {
@@ -1770,16 +1772,16 @@ static void Task_SlowFadeIn(u8 taskId)
else else
{ {
gTasks[taskId].data[4] = gTasks[taskId].data[3]; gTasks[taskId].data[4] = gTasks[taskId].data[3];
gTasks[taskId].tTrainerPicPosX--; gTasks[taskId].data[1]--;
gTasks[taskId].tTrainerPicFadeState++; gTasks[taskId].data[2]++;
if (gTasks[taskId].tTrainerPicPosX == 8) if (gTasks[taskId].data[1] == 8)
{ {
for (i = 0; i < 3; i++) for (i = 0; i < 3; i++)
{ {
gSprites[gTasks[taskId].data[7 + i]].invisible ^= TRUE; gSprites[gTasks[taskId].data[7 + i]].invisible ^= TRUE;
} }
} }
SetGpuReg(REG_OFFSET_BLDALPHA, (gTasks[taskId].tTrainerPicFadeState * 256) + gTasks[taskId].tTrainerPicPosX); SetGpuReg(REG_OFFSET_BLDALPHA, (gTasks[taskId].data[2] * 256) + gTasks[taskId].data[1]);
} }
} }
} }
@@ -1794,9 +1796,9 @@ static void CreateFadeInTask(u8 taskId, u8 state)
SetGpuReg(REG_OFFSET_BLDY, 0); SetGpuReg(REG_OFFSET_BLDY, 0);
gTasks[taskId].tTrainerPicFadeState = 0; gTasks[taskId].tTrainerPicFadeState = 0;
taskId2 = CreateTask(Task_SlowFadeIn, 0); taskId2 = CreateTask(Task_SlowFadeIn, 0);
gTasks[taskId2].data[0] = taskId; gTasks[taskId2].tParentTaskId = taskId;
gTasks[taskId2].tTrainerPicPosX = 16; gTasks[taskId2].data[1] = 16;
gTasks[taskId2].tTrainerPicFadeState = 0; gTasks[taskId2].data[2] = 0;
gTasks[taskId2].data[3] = state; gTasks[taskId2].data[3] = state;
gTasks[taskId2].data[4] = state; gTasks[taskId2].data[4] = state;
for (i = 0; i < 3; i++) for (i = 0; i < 3; i++)
@@ -1809,11 +1811,11 @@ static void Task_SlowFadeOut(u8 taskId)
{ {
u8 i = 0; u8 i = 0;
if (gTasks[taskId].tTrainerPicPosX == 16) if (gTasks[taskId].data[1] == 16)
{ {
if (!gPaletteFade.active) if (!gPaletteFade.active)
{ {
gTasks[gTasks[taskId].data[0]].tTrainerPicFadeState = 1; gTasks[gTasks[taskId].tParentTaskId].tTrainerPicFadeState = 1;
DestroyTask(taskId); DestroyTask(taskId);
} }
} }
@@ -1824,8 +1826,8 @@ static void Task_SlowFadeOut(u8 taskId)
else else
{ {
gTasks[taskId].data[4] = gTasks[taskId].data[3]; gTasks[taskId].data[4] = gTasks[taskId].data[3];
gTasks[taskId].tTrainerPicPosX += 2; gTasks[taskId].data[1] += 2;
gTasks[taskId].tTrainerPicFadeState -= 2; gTasks[taskId].data[2] -= 2;
if (gTasks[taskId].tTrainerPicPosX == 8) if (gTasks[taskId].tTrainerPicPosX == 8)
{ {
for (i = 0; i < 3; i++) for (i = 0; i < 3; i++)
@@ -1833,7 +1835,7 @@ static void Task_SlowFadeOut(u8 taskId)
gSprites[gTasks[taskId].data[7 + i]].invisible ^= TRUE; gSprites[gTasks[taskId].data[7 + i]].invisible ^= TRUE;
} }
} }
SetGpuReg(REG_OFFSET_BLDALPHA, (gTasks[taskId].tTrainerPicFadeState * 256) + gTasks[taskId].tTrainerPicPosX); SetGpuReg(REG_OFFSET_BLDALPHA, (gTasks[taskId].data[2] * 256) + gTasks[taskId].data[1]);
} }
} }
} }
@@ -1848,9 +1850,9 @@ static void CreateFadeOutTask(u8 taskId, u8 state)
SetGpuReg(REG_OFFSET_BLDY, 0); SetGpuReg(REG_OFFSET_BLDY, 0);
gTasks[taskId].tTrainerPicFadeState = 0; gTasks[taskId].tTrainerPicFadeState = 0;
taskId2 = CreateTask(Task_SlowFadeOut, 0); taskId2 = CreateTask(Task_SlowFadeOut, 0);
gTasks[taskId2].data[0] = taskId; gTasks[taskId2].tParentTaskId = taskId;
gTasks[taskId2].tTrainerPicPosX = 0; gTasks[taskId2].data[1] = 0;
gTasks[taskId2].tTrainerPicFadeState = 16; gTasks[taskId2].data[2] = 16;
gTasks[taskId2].data[3] = state; gTasks[taskId2].data[3] = state;
gTasks[taskId2].data[4] = state; gTasks[taskId2].data[4] = state;
for (i = 0; i < 3; i++) for (i = 0; i < 3; i++)