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

Create COPYWIN defines for CopyWindowToVram calls

Browse Source
This commit is contained in:
PikalaxALT
2020-04-10 16:17:46 -04:00
parent a205881ce2
commit aea30489fc
69 changed files with 316 additions and 310 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/oak_speech.c
+9 -9
View File
@@ -584,7 +584,7 @@ static void CreateHelpDocsPage1(void)
PutWindowTilemap(sOakSpeechResources->unk_0014[0]);
FillWindowPixelBuffer(sOakSpeechResources->unk_0014[0], 0x00);
AddTextPrinterParameterized4(sOakSpeechResources->unk_0014[0], 2, 2, 0, 1, 1, sTextColor_HelpSystem, 0, gNewGame_HelpDocs1);
CopyWindowToVram(sOakSpeechResources->unk_0014[0], 3);
CopyWindowToVram(sOakSpeechResources->unk_0014[0], COPYWIN_BOTH);
FillBgTilemapBufferRect_Palette0(1, 0x3000, 1, 3, 5, 16);
CopyBgTilemapBufferToVram(1);
}
@@ -606,7 +606,7 @@ static void Task_OakSpeech4(u8 taskId)
PutWindowTilemap(sOakSpeechResources->unk_0014[i]);
FillWindowPixelBuffer(sOakSpeechResources->unk_0014[i], 0x00);
AddTextPrinterParameterized4(sOakSpeechResources->unk_0014[i], 2, 6, 0, 1, 1, sTextColor_HelpSystem, 0, sHelpDocsPtrs[i + r7 * 3]);
CopyWindowToVram(sOakSpeechResources->unk_0014[i], 3);
CopyWindowToVram(sOakSpeechResources->unk_0014[i], COPYWIN_BOTH);
}
if (sOakSpeechResources->unk_0012 == 1)
@@ -675,7 +675,7 @@ static void Task_OakSpeech3(u8 taskId)
{
FillWindowPixelBuffer(sOakSpeechResources->unk_0014[i], 0x00);
ClearWindowTilemap(sOakSpeechResources->unk_0014[i]);
CopyWindowToVram(sOakSpeechResources->unk_0014[i], 3);
CopyWindowToVram(sOakSpeechResources->unk_0014[i], COPYWIN_BOTH);
RemoveWindow(sOakSpeechResources->unk_0014[i]);
sOakSpeechResources->unk_0014[i] = 0;
}
@@ -699,7 +699,7 @@ static void Task_OakSpeech5(u8 taskId)
{
FillWindowPixelBuffer(sOakSpeechResources->unk_0014[i], 0x00);
ClearWindowTilemap(sOakSpeechResources->unk_0014[i]);
CopyWindowToVram(sOakSpeechResources->unk_0014[i], 3);
CopyWindowToVram(sOakSpeechResources->unk_0014[i], COPYWIN_BOTH);
RemoveWindow(sOakSpeechResources->unk_0014[i]);
sOakSpeechResources->unk_0014[i] = 0;
}
@@ -733,7 +733,7 @@ static void Task_OakSpeech6(u8 taskId)
data[14] = AddWindow(&sNewGameAdventureIntroWindowTemplates[0]);
PutWindowTilemap(data[14]);
FillWindowPixelBuffer(data[14], 0x00);
CopyWindowToVram(data[14], 3);
CopyWindowToVram(data[14], COPYWIN_BOTH);
sOakSpeechResources->unk_0012 = 0;
gMain.state = 0;
data[15] = 16;
@@ -856,7 +856,7 @@ static void Task_OakSpeech8(u8 taskId)
DestroyTopBarWindow();
FillWindowPixelBuffer(data[14], 0x00);
ClearWindowTilemap(data[14]);
CopyWindowToVram(data[14], 3);
CopyWindowToVram(data[14], COPYWIN_BOTH);
RemoveWindow(data[14]);
data[14] = 0;
FillBgTilemapBufferRect_Palette0(1, 0x000, 0, 0, 30, 20);
@@ -902,7 +902,7 @@ static void Task_OakSpeech9(u8 taskId)
{ \
AddTextPrinterParameterized2(0, 4, str, speed, NULL, 2, 1, 3); \
} \
CopyWindowToVram(0, 3); \
CopyWindowToVram(0, COPYWIN_BOTH); \
})
static void Task_OakSpeech10(u8 taskId)
@@ -1072,7 +1072,7 @@ static void Task_OakSpeech19(u8 taskId)
sOakSpeechResources->textColor[2] = 3;
AddTextPrinterParameterized3(gTasks[taskId].data[13], 2, 8, 17, sOakSpeechResources->textColor, 0, gText_Girl);
Menu_InitCursor(gTasks[taskId].data[13], 2, 0, 1, GetFontAttribute(2, 1) + 2, 2, 0);
CopyWindowToVram(gTasks[taskId].data[13], 3);
CopyWindowToVram(gTasks[taskId].data[13], COPYWIN_BOTH);
gTasks[taskId].func = Task_OakSpeech20;
}
}
@@ -1869,7 +1869,7 @@ static void PrintNameChoiceOptions(u8 taskId, u8 state)
AddTextPrinterParameterized(data[13], 2, textPtrs[i], 8, 16 * (i + 1) + 1, 0, NULL);
}
Menu_InitCursor(data[13], 2, 0, 1, 16, 5, 0);
CopyWindowToVram(data[13], 3);
CopyWindowToVram(data[13], COPYWIN_BOTH);
}
static void GetDefaultName(u8 arg0, u8 namePick)