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 take 2

Browse Source
This commit is contained in:
colonelsalt
2021-09-02 12:25:49 +01:00
parent c8c5a06a43
commit ba1a9e36f8
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/oak_speech.c
+10 -10
View File
@@ -1446,8 +1446,8 @@ static void Task_OakSpeech38_1(u8 taskId)
u8 taskId2 = CreateTask(Task_OakSpeech38_sub1, 1); u8 taskId2 = CreateTask(Task_OakSpeech38_sub1, 1);
s16 * data = gTasks[taskId2].data; s16 * data = gTasks[taskId2].data;
data[0] = 0; data[0] = 0;
tTrainerPicPosX = 0; data[1] = 0;
tTrainerPicFadeState = 0; data[2] = 0;
data[15] = 0; data[15] = 0;
BeginNormalPaletteFade(0xFFFF0FCF, 4, 0, 16, RGB_BLACK); BeginNormalPaletteFade(0xFFFF0FCF, 4, 0, 16, RGB_BLACK);
} }
@@ -1457,14 +1457,14 @@ static void Task_OakSpeech38_sub1(u8 taskId)
s16 * data = gTasks[taskId].data; s16 * data = gTasks[taskId].data;
if (!gPaletteFade.active) if (!gPaletteFade.active)
{ {
if (tTrainerPicPosX != 0) if (data[1] != 0)
{ {
DestroyTask(taskId); DestroyTask(taskId);
DestroyLinkedPikaOrGrassPlatformSprites(taskId, 1); DestroyLinkedPikaOrGrassPlatformSprites(taskId, 1);
} }
else else
{ {
tTrainerPicPosX++; data[1]++;
BeginNormalPaletteFade(0x0000F000, 0, 0, 16, RGB_BLACK); BeginNormalPaletteFade(0x0000F000, 0, 0, 16, RGB_BLACK);
} }
} }
@@ -1475,8 +1475,8 @@ static void Task_OakSpeech38_2(u8 taskId)
u8 taskId2 = CreateTask(Task_OakSpeech38_sub2, 2); u8 taskId2 = CreateTask(Task_OakSpeech38_sub2, 2);
s16 * data = gTasks[taskId2].data; s16 * data = gTasks[taskId2].data;
data[0] = 8; data[0] = 8;
tTrainerPicPosX = 0; data[1] = 0;
tTrainerPicFadeState = 8; data[2] = 8;
data[14] = 0; data[14] = 0;
data[15] = 0; data[15] = 0;
} }
@@ -1490,12 +1490,12 @@ static void Task_OakSpeech38_sub2(u8 taskId)
data[0]--; data[0]--;
else else
{ {
if (tTrainerPicPosX <= 0 && tTrainerPicFadeState != 0) if (data[1] <= 0 && data[2] != 0)
tTrainerPicFadeState--; data[2]--;
BlendPalette(0x40, 0x20, data[14], RGB_WHITE); BlendPalette(0x40, 0x20, data[14], RGB_WHITE);
data[14]++; data[14]++;
tTrainerPicPosX--; data[1]--;
data[0] = tTrainerPicFadeState; data[0] = data[2];
if (data[14] > 14) if (data[14] > 14)
{ {
for (i = 0; i < 32; i++) for (i = 0; i < 32; i++)