menu_helpers.c & field_special_scene.c

This commit is contained in:
jiangzhengwenjz
2019-06-24 02:07:25 +08:00
parent 34bebdc56e
commit bc7ff2226d
32 changed files with 6442 additions and 726 deletions
+4 -4
View File
@@ -475,7 +475,7 @@ static void TeachyTvMainCallback(void)
sResources->savedCallback = NULL;
sResources->grassAnimDisabled = 0;
sResources->scrollIndicatorArrowPairId = 0xFF;
VblankHblankHandlerSetZero();
SetVBlankHBlankCallbacksToNull();
clear_scheduled_bg_copies_to_vram();
ScanlineEffect_Stop();
FreeAllSpritePalettes();
@@ -521,7 +521,7 @@ static void TeachyTvMainCallback(void)
static void TeachyTvSetupBg(void)
{
InitBgReg();
ResetAllBgsCoordinatesAndBgCntRegs();
ResetBgsAndClearDma3BusyFlags(0);
InitBgsFromTemplates(0, sBgTemplates, 4);
SetBgTilemapBuffer(1, sResources->buffer1);
@@ -817,7 +817,7 @@ static void TTVcmd_NpcMoveAndSetupTextPrinter(u8 taskId)
static void TTVcmd_IdleIfTextPrinterIsActive(u8 taskId)
{
s16 *data = gTasks[taskId].data;
if (!sub_80BF518(0))
if (!RunTextPrintersRetIsActive(0))
++data[3];
}
@@ -945,7 +945,7 @@ static const u8 sGrassAnimArray[] =
static void TTVcmd_IdleIfTextPrinterIsActive2(u8 taskId)
{
s16 *data = gTasks[taskId].data;
if (!sub_80BF518(0))
if (!RunTextPrintersRetIsActive(0))
++data[3];
}