diff options
| author | PikalaxALT <PikalaxALT@users.noreply.github.com> | 2019-06-23 22:00:47 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-06-23 22:00:47 -0400 |
| commit | 5b7c34096cff301c4d74bb2e67a7164b66bcc5dd (patch) | |
| tree | 6124fc5f2881ec5d698509101b407a36fdb934cd /src/teachy_tv.c | |
| parent | e0a5896de36da0bb83c3983df8b2f47d019a8896 (diff) | |
| parent | 756f2c3a71c8f7e832a9e70a542210f549f4c61b (diff) | |
Merge pull request #74 from jiangzhengwenjz/misc
menu_helpers
Diffstat (limited to 'src/teachy_tv.c')
| -rw-r--r-- | src/teachy_tv.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/teachy_tv.c b/src/teachy_tv.c index efffe2840..eb5a7293d 100644 --- a/src/teachy_tv.c +++ b/src/teachy_tv.c @@ -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 (!RunTextPrinters_CheckActive(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 (!RunTextPrinters_CheckActive(0)) ++data[3]; } |