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

through AddTextPrinterParameterized2()

Browse Source
This commit is contained in:
jiangzhengwenjz
2019-06-24 14:37:45 +08:00
parent 5b7c34096c
commit efad45497d
52 changed files with 664 additions and 1213 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/item_pc.c
+17 -17
View File
@@ -247,7 +247,7 @@ static void ItemPc_MainCB(void)
RunTasks();
AnimateSprites();
BuildOamBuffer();
do_scheduled_bg_tilemap_copies_to_vram();
DoScheduledBgTilemapCopiesToVram();
UpdatePaletteFade();
}
@@ -276,7 +276,7 @@ static bool8 ItemPc_DoGfxSetup(void)
{
case 0:
SetVBlankHBlankCallbacksToNull();
clear_scheduled_bg_copies_to_vram();
ClearScheduledBgCopiesToVram();
gMain.state++;
break;
case 1:
@@ -423,7 +423,7 @@ static bool8 ItemPc_InitBgs(void)
ResetBgsAndClearDma3BusyFlags(0);
InitBgsFromTemplates(0, sBgTemplates, NELEMS(sBgTemplates));
SetBgTilemapBuffer(1, sBg1TilemapBuffer);
schedule_bg_copy_tilemap_to_vram(1);
ScheduleBgCopyTilemapToVram(1);
SetGpuReg(REG_OFFSET_DISPCNT, DISPCNT_OBJ_1D_MAP | DISPCNT_OBJ_ON);
SetGpuReg(REG_OFFSET_BLDCNT , 0);
ShowBg(0);
@@ -436,12 +436,12 @@ static bool8 ItemPc_LoadGraphics(void)
switch (sStateDataPtr->data[0])
{
case 0:
reset_temp_tile_data_buffers();
decompress_and_copy_tile_data_to_vram(1, gItemPcTiles, 0, 0, 0);
ResetTempTileDataBuffers();
DecompressAndCopyTileDataToVram(1, gItemPcTiles, 0, 0, 0);
sStateDataPtr->data[0]++;
break;
case 1:
if (free_temp_tile_data_buffers_if_possible() != TRUE)
if (FreeTempTileDataBuffersIfPossible() != TRUE)
{
LZDecompressWram(gItemPcTilemap, sBg1TilemapBuffer);
sStateDataPtr->data[0]++;
@@ -710,7 +710,7 @@ static void ItemPc_SetScrollPosition(void)
static void ItemPc_SetMessageWindowPalette(int a0)
{
SetBgRectPal(1, 0, 14, 30, 6, a0 + 1);
schedule_bg_copy_tilemap_to_vram(1);
ScheduleBgCopyTilemapToVram(1);
}
void ItemPc_SetInitializedFlag(u8 a0)
@@ -849,7 +849,7 @@ static void Task_ItemPcSubmenuInit(u8 taskId)
CopyItemName(ItemPc_GetItemIdBySlotId(data[1]), gStringVar1);
StringExpandPlaceholders(gStringVar4, gOtherText_StrVar1);
ItemPc_AddTextPrinterParameterized(windowId, 2, gStringVar4, 0, 2, 1, 0, 0, 1);
schedule_bg_copy_tilemap_to_vram(0);
ScheduleBgCopyTilemapToVram(0);
gTasks[taskId].func = Task_ItemPcSubmenuRun;
}
@@ -881,7 +881,7 @@ static void Task_ItemPcWithdraw(u8 taskId)
if (ItemPc_GetItemQuantityBySlotId(data[1]) == 1)
{
PutWindowTilemap(0);
schedule_bg_copy_tilemap_to_vram(0);
ScheduleBgCopyTilemapToVram(0);
ItemPc_DoWithdraw(taskId);
}
else
@@ -952,7 +952,7 @@ static void Task_ItemPcCleanUpWithdraw(u8 taskId)
ItemPc_SetCursorPosition();
ItemPc_BuildListMenuTemplate();
data[0] = ListMenuInit(&gMultiuseListMenuTemplate, sListMenuState.scroll, sListMenuState.row);
schedule_bg_copy_tilemap_to_vram(0);
ScheduleBgCopyTilemapToVram(0);
ItemPc_ReturnFromSubmenu(taskId);
}
@@ -967,7 +967,7 @@ static void ItemPc_WithdrawMultipleInitWindow(u16 slotId)
StringExpandPlaceholders(gStringVar4, gText_TimesStrVar1);
ItemPc_SetBorderStyleOnWindow(3);
ItemPc_AddTextPrinterParameterized(3, 0, gStringVar4, 8, 10, 1, 0, 0, 1);
schedule_bg_copy_tilemap_to_vram(0);
ScheduleBgCopyTilemapToVram(0);
}
static void sub_810E670(s16 quantity)
@@ -991,7 +991,7 @@ static void Task_ItemPcHandleWithdrawMultiple(u8 taskId)
ClearWindowTilemap(3);
PutWindowTilemap(0);
ItemPc_PrintOrRemoveCursor(data[0], 1);
schedule_bg_copy_tilemap_to_vram(0);
ScheduleBgCopyTilemapToVram(0);
ItemPc_RemoveScrollIndicatorArrowPair();
ItemPc_DoWithdraw(taskId);
}
@@ -1004,7 +1004,7 @@ static void Task_ItemPcHandleWithdrawMultiple(u8 taskId)
PutWindowTilemap(0);
PutWindowTilemap(1);
ItemPc_PrintOrRemoveCursor(data[0], 1);
schedule_bg_copy_tilemap_to_vram(0);
ScheduleBgCopyTilemapToVram(0);
ItemPc_RemoveScrollIndicatorArrowPair();
ItemPc_ReturnFromSubmenu(taskId);
}
@@ -1049,7 +1049,7 @@ static void gTask_ItemPcWaitButtonAndExitSubmenu(u8 taskId)
ClearWindowTilemap(5);
PutWindowTilemap(1);
ItemPc_PrintOrRemoveCursor(data[0], 1);
schedule_bg_copy_tilemap_to_vram(0);
ScheduleBgCopyTilemapToVram(0);
ItemPc_ReturnFromSubmenu(taskId);
}
}
@@ -1064,7 +1064,7 @@ static void Task_ItemPcCancel(u8 taskId)
PutWindowTilemap(0);
PutWindowTilemap(1);
ItemPc_PrintOrRemoveCursor(data[0], 1);
schedule_bg_copy_tilemap_to_vram(0);
ScheduleBgCopyTilemapToVram(0);
ItemPc_ReturnFromSubmenu(taskId);
}
@@ -1084,7 +1084,7 @@ static void ItemPc_InitWindows(void)
FillWindowPixelBuffer(i, 0x00);
PutWindowTilemap(i);
}
schedule_bg_copy_tilemap_to_vram(0);
ScheduleBgCopyTilemapToVram(0);
for (i = 0; i < 3; i++)
sSubmenuWindowIds[i] = 0xFF;
}
@@ -1146,5 +1146,5 @@ static u8 ItemPc_GetSubwindow(u8 idx)
static void ItemPc_PrintOnWindow5WithContinueTask(u8 taskId, const u8 * str, TaskFunc taskFunc)
{
DisplayMessageAndContinueTask(taskId, 5, 0x3AC, 0x0B, 2, GetTextSpeedSetting(), str, taskFunc);
schedule_bg_copy_tilemap_to_vram(0);
ScheduleBgCopyTilemapToVram(0);
}